Skip to content

Commit

Permalink
V2.1 testnet (#1380)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
Co-authored-by: iAmMichaelConnor <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Lasse Herskind <[email protected]>
Co-authored-by: Jonathan Bursztyn <[email protected]>
Co-authored-by: Zachary James Williamson <[email protected]>
Co-authored-by: Josh <[email protected]>
Co-authored-by: iAmMichaelConnor <[email protected]>
Co-authored-by: Joe Andrews <[email protected]>
Co-authored-by: Leila Wang <[email protected]>
  • Loading branch information
9 people authored Sep 7, 2022
1 parent ddf7ae7 commit c161fd0
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions barretenberg/src/aztec/rollup/proofs/account/account.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@ void account_circuit(Composer& composer, account_tx const& tx)

// 3 modes
// 1: create (create from scratch)
// 2: update (add spending key to existing acct)
// 3: migrate (change pubkey linked to an alias hash)
// 2: update (add a spending_public_key to an existing account)
// 3: migrate (change account_public_key linked to an alias_hash)

// 1: create = migrate == 0
// 3: migrate = migragte == 1
// 2: update = migrate == 0 && ???
// 1: create: create == 1 && migrate == 0
// 2: update = create == 0 && migrate == 0
// 3: migrate = create == 0 && migrate == 1

// Extract witnesses
const auto data_tree_root = field_ct(witness_ct(&composer, tx.merkle_root));
Expand All @@ -75,14 +75,14 @@ void account_circuit(Composer& composer, account_tx const& tx)
const auto output_note_2 =
account_note(output_account_alias_hash.value, new_account_public_key, spending_public_key_2);

// @dev unlimited zero-valued nullifiers are permitted by the rollup circuit (e.g. if migrate == 0).
// @dev unlimited zero-valued nullifiers are permitted by the rollup circuit (e.g. if create == 0).
const auto nullifier_1 = compute_account_alias_hash_nullifier(alias_hash) * create;

// if create or migrate, nullifier_2 = nullifier of the public key being registered
// If create or migrate, nullifier_2 = nullifier of the account_public_key being registered.
field_ct nullifier_2 = field_ct::conditional_assign(
(create || migrate), compute_account_public_key_nullifier(new_account_public_key), 0);

// If creating an acct from scratch, sign against the account private key, else sign with the spending key of the
// If creating an account from scratch, sign against the account private key, else sign with the spending key of the
// input note
const point_ct signer = point_ct::conditional_assign(create, account_public_key, signing_pub_key);

Expand Down

0 comments on commit c161fd0

Please sign in to comment.