git subrepo pull (merge) circuits/cpp/barretenberg #1380
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
subrepo: subdir: "circuits/cpp/barretenberg" merged: "96fb60558" upstream: origin: "https://github.com/AztecProtocol/barretenberg" branch: "master" commit: "d4ade2a5f" git-subrepo: version: "0.4.6" origin: "???" commit: "???"
codygunton
pushed a commit
that referenced
this pull request
Jan 23, 2024
* Audit preperation (#1305) * compiler warnings * add solhint + fix small linter issues * remove skipped tests * update rollup address * add underscores on arguments in IVerifier * JB/Move global error to toast group (#1251) * Move global error message inside toast group * Mini refactor * Mini refactor * Add deferrals * Blockchain test jest -> mocha update (#1314) * run jest-to-mocha script * Manually fix the last test + add coverage + formatting * extend mocha timeout + bump optimizer runs * decrease optimizer runs to deploy old rollup processor in testing * remove coverage package, install on demand * make solidity-coverage import a comment in hardhat config * JB/Fix settlement times (#1315) Fix batched time, fix button regression * JB/Allow for debug to be exportable (#1313) * Allow for debug to be exportable * Remove exportable debug * Rollback * Refactor * Tweak export logs * Upgrade to latest bridge clients (#1319) - Align with interface on latest bridge-clients - Correct stETH address - Calc element ROI via getTermAPR - Calc stETH via getUnderlyingAsset * Explain when to squash vs merge (#1302) * Zw/update aztec connect specs (#1048) * updated account circuit * updated account circuit formatting * updated schnorr spec * updated intro * fix typo * updates in line with PR comments and rebase Co-authored-by: Josh <critesjosh@gmail.com> Co-authored-by: iAmMichaelConnor <mike@aztecprotocol.com> * Implemented rate limiting of deposits and address blacklist (#1323) * Implemented rate limiting of deposits and address blacklist * Cleanup * Additionally check num deposits in tx receiver (#1326) * Additionally check num deposits in tx receiver * Sanity check input * Additional tests (#1327) * JB/Connect yearn bridge (#1334) * Add yearn recipe * Connect yearn bridge * Fix toast z-index * Fix price estimation for yearn bridge * Take out console log * Set up yvDAI bridge config * Add styling for yearn (wip) * Add price fetcher for yvDAI and yvETH * Fix icon * Fix exit modal * Fixes and improvements * Add collapse button to Toast component (#1322) * don't expose blacklist (#1352) * don't expose blacklist * don't use delete keyword * fix status endpoint types * format * fix server * fix server * Expose blacklist as undefined from public api. Co-authored-by: Leila Wang <leizciw@gmail.com> * Jcf/hotfix yearn exit (#1356) * - allow exiting via a different bridgeAddressId - fix incorrect batch info shown for exiting - more explicit name: useDefaultEnterBridgeCallData - fix wstETH price fetch regression * upgrade bridge clients * explicitly upgrade ethers * Jcf/element hotfixes (#1377) - safe number to bigint conversion - fix default element term apr when entering - infer async from recipe, not interaction result Co-authored-by: joss-aztec <94053499+joss-aztec@users.noreply.github.com> Co-authored-by: Lasse Herskind <16536249+LHerskind@users.noreply.github.com> Co-authored-by: Jonathan Bursztyn <jobur93@gmail.com> Co-authored-by: Zachary James Williamson <blorktronics@gmail.com> Co-authored-by: Josh <critesjosh@gmail.com> Co-authored-by: iAmMichaelConnor <mike@aztecprotocol.com> Co-authored-by: Joe Andrews <joe@creditmint.io> Co-authored-by: Leila Wang <leizciw@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix the barretenberg mirror action. Looks like commits went in too close together, see #1382
./scripts/git_subrepo.sh pull circuits/cpp/barretenberggit checkout origin/master -- .gitmodulesgit commitThis should always work if anyone needs to do this again. In more complicated cases you may be instructed to do a merge. In this case the commit just became overwritten.