Skip to content

Commit 7f82cc8

Browse files
AztecBotLHerskind
andcommitted
chore: handover to governance
Adds a test to se if we are correctly updating the ownerships and handings things over to governance. Updated part of the deployment setup to properly hand over things. Fixed an issue with return values as we did not actually return the coinissuer but just whoever owned the fee asset - which were not the same because it was not handed over. Co-authored-by: LHerskind <[email protected]>
1 parent 152eadf commit 7f82cc8

40 files changed

+379
-185
lines changed

aztec-up/test/bridge_and_claim.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ aztec-wallet \
4242
--register-only
4343

4444
aztec-wallet \
45-
bridge-fee-juice 1000000000000000000 accounts:main \
45+
bridge-fee-juice 1000000000000000000000 accounts:main \
4646
--mint \
4747
--no-wait
4848

docs/docs/developers/guides/js_apps/how_to_pay_fees.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ import { L1FeeJuicePortalManager } from "@aztec/aztec.js";
100100
**CLI:**
101101

102102
```bash
103-
aztec-wallet bridge-fee-juice 1000000000000000000 myAccount --mint --no-wait
103+
aztec-wallet bridge-fee-juice 1000000000000000000000 myAccount --mint --no-wait
104104
```
105105

106106
### Testnet
@@ -114,7 +114,7 @@ cast call $FEE_ASSET_HANDLER_CONTRACT "mint(address)" $MY_L1_ADDRESS --rpc-url <
114114
Then bridge with CLI:
115115

116116
```bash
117-
aztec-wallet bridge-fee-juice 1000000000000000000 myAccount --no-wait \
117+
aztec-wallet bridge-fee-juice 1000000000000000000000 myAccount --no-wait \
118118
--l1-rpc-urls https://rpc.sepolia.ethpandaops.io \
119119
--l1-chain-id 11155111 \
120120
--l1-private-key <YOUR_L1_PRIVATE_KEY>

docs/versioned_docs/version-v1.2.0/developers/reference/environment_reference/cli_wallet_reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ First register an account, mint the fee asset on L1 and bridge it to fee juice:
143143

144144
```bash title="bridge-fee-juice" showLineNumbers
145145
aztec-wallet create-account -a main --register-only
146-
aztec-wallet bridge-fee-juice 1000000000000000000 main --mint --no-wait
146+
aztec-wallet bridge-fee-juice 1000000000000000000000 main --mint --no-wait
147147
```
148148

149149
> <sup><sub><a href="https://github.com/AztecProtocol/aztec-packages/blob/v1.2.0/yarn-project/cli-wallet/test/flows/create_account_pay_native.sh#L8-L11" target="_blank" rel="noopener noreferrer">Source code: yarn-project/cli-wallet/test/flows/create_account_pay_native.sh#L8-L11</a></sub></sup>

docs/versioned_docs/version-v1.2.0/developers/tutorials/codealong/first_fees.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,13 @@ aztec-wallet create-account -a accBFJ --register-only
307307
If using the Sandbox, free-minting is allowed from it's anvil L1 to be bridged and claimed on its Aztec node:
308308

309309
```bash
310-
aztec-wallet bridge-fee-juice 1000000000000000000 accBFJ --mint --no-wait
310+
aztec-wallet bridge-fee-juice 1000000000000000000000 accBFJ --mint --no-wait
311311
```
312312

313313
If using Aztec testnet, you'll first need an L1 account with sepolia, and additional params for the bridge-fee-juice command:
314314

315315
```bash
316-
aztec-wallet bridge-fee-juice 1000000000000000000 accBFJ --mint --no-wait \
316+
aztec-wallet bridge-fee-juice 1000000000000000000000 accBFJ --mint --no-wait \
317317
--l1-rpc-urls <See https://chainlist.org/chain/11155111> \ # eg https://rpc.sepolia.ethpandaops.io
318318
--l1-chain-id 11155111 \
319319
--l1-private-key <L1 private key of account holding sepolia>

l1-contracts/src/mock/TestERC20.sol

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@ contract TestERC20 is ERC20, IMintableERC20, Ownable2Step {
3434
}
3535

3636
function acceptOwnership() public virtual override(Ownable2Step) {
37-
address oldOwner = owner();
3837
address newOwner = pendingOwner();
3938
super.acceptOwnership();
40-
41-
removeMinter(oldOwner);
4239
addMinter(newOwner);
4340
}
4441
}

l1-contracts/test/test_erc20/transferOwnership.t.sol

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ contract TransferOwnershipTest is TestERC20TestBase {
6464

6565
assertEq(testERC20.owner(), _newOwner);
6666
assertEq(testERC20.minters(_newOwner), true);
67-
if (_newOwner != oldOwner) {
68-
assertEq(testERC20.minters(oldOwner), false);
69-
}
67+
assertEq(testERC20.minters(oldOwner), true);
7068
}
7169
}

spartan/devnet-smoke-tests/create_new_accounts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if [ "$total_account_count" -lt "$max_accounts" ]; then
3535
-u $FAUCET_URL
3636

3737
aztec-wallet \
38-
bridge-fee-juice 1000000000000000000 accounts:main \
38+
bridge-fee-juice 1000000000000000000000 accounts:main \
3939
--mint \
4040
--l1-rpc-urls $L1_URL \
4141
--l1-chain-id 1337 \

yarn-project/aztec-faucet/terraform/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ resource "aws_ecs_task_definition" "aztec-faucet" {
148148
},
149149
{
150150
name = "EXTRA_ASSET_AMOUNT",
151-
value = "1000000000000000000"
151+
value = "1000000000000000000000"
152152
}
153153
]
154154
logConfiguration = {

yarn-project/cli-wallet/test/flows/create_account_pay_native.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ test_title "Create an account and deploy using native fee payment with bridging"
77

88
# docs:start:bridge-fee-juice
99
aztec-wallet create-account -a main --register-only
10-
aztec-wallet bridge-fee-juice 1000000000000000000 main --mint --no-wait
10+
aztec-wallet bridge-fee-juice 1000000000000000000000 main --mint --no-wait
1111
# docs:end:bridge-fee-juice
1212

1313

yarn-project/cli-wallet/test/flows/shared/create_funded_account.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ALIAS=$1
33
section "Creating a funded account (alias: $ALIAS)"
44

55
aztec-wallet create-account -a $ALIAS --register-only
6-
aztec-wallet bridge-fee-juice 1000000000000000000 $ALIAS --mint --no-wait
6+
aztec-wallet bridge-fee-juice 1000000000000000000000 $ALIAS --mint --no-wait
77

88
# The following produces two blocks, allowing the claim to be used in the next block.
99
source $flows/shared/deploy_token.sh tmp-token-$ALIAS $ALIAS

0 commit comments

Comments
 (0)