Skip to content

Commit ec73ce7

Browse files
AztecBotludamadspypsyspalladinoalexghr
authored
chore: Accumulated backports to v2 (#18530)
This PR accumulates backport commits throughout the day and will be auto-merged overnight. Latest backport: #18525 - chore: loudly fail in network config 🤖 This PR is managed automatically by the backport workflow. - #18529 - chore: remove --funding-account option until it's implemented - #18540 - fix: max gas can have fractional part - #18553 - fix: priority fee fractional part --------- Co-authored-by: ludamad <[email protected]> Co-authored-by: spypsy <[email protected]> Co-authored-by: Santiago Palladino <[email protected]> Co-authored-by: alexghr <[email protected]> Co-authored-by: PhilWindle <[email protected]>
1 parent 2fa7ef4 commit ec73ce7

File tree

44 files changed

+889
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+889
-93
lines changed

aztec-up/bin/aztec

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,12 @@ case ${1:-} in
212212
-v $(realpath $(dirname $2))/:/tmp \
213213
$DOCKER_REPO:$VERSION /tmp/$(basename $2) $3
214214
;;
215+
valkeys|valKeys|validator-keys)
216+
# Special case for validator keys command to inject LEGACY_BLS_CLI environment variable
217+
export ENV_VARS_TO_INJECT="LEGACY_BLS_CLI"
218+
exec $(dirname $0)/.aztec-run aztec \
219+
node --no-warnings /usr/src/yarn-project/aztec/dest/bin/index.js "$@"
220+
;;
215221
*)
216222
export ENV_VARS_TO_INJECT="SECRET_KEY"
217223
exec $(dirname $0)/.aztec-run aztec \

yarn-project/archiver/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"lodash.omit": "^4.5.0",
8383
"tsc-watch": "^6.0.0",
8484
"tslib": "^2.5.0",
85-
"viem": "npm:@spalladino/[email protected].2-eip7594.2"
85+
"viem": "npm:@aztec/[email protected]"
8686
},
8787
"devDependencies": {
8888
"@jest/globals": "^30.0.0",

yarn-project/aztec-faucet/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"koa": "^2.16.1",
7171
"koa-bodyparser": "^4.4.1",
7272
"koa-router": "^13.1.1",
73-
"viem": "npm:@spalladino/[email protected].2-eip7594.2",
73+
"viem": "npm:@aztec/[email protected]",
7474
"zod": "^3.23.8"
7575
},
7676
"devDependencies": {

yarn-project/aztec-node/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
"koa": "^2.16.1",
9393
"koa-router": "^13.1.1",
9494
"tslib": "^2.4.0",
95-
"viem": "npm:@spalladino/[email protected].2-eip7594.2"
95+
"viem": "npm:@aztec/[email protected]"
9696
},
9797
"devDependencies": {
9898
"@jest/globals": "^30.0.0",

yarn-project/aztec.js/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@
9090
"@aztec/stdlib": "workspace:^",
9191
"axios": "^1.12.0",
9292
"tslib": "^2.4.0",
93-
"viem": "npm:@spalladino/[email protected]"
93+
"viem": "npm:@aztec/[email protected]",
94+
"zod": "^3.23.8"
9495
},
9596
"devDependencies": {
9697
"@jest/globals": "^30.0.0",

yarn-project/aztec/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"commander": "^12.1.0",
6666
"koa": "^2.16.1",
6767
"koa-router": "^13.1.1",
68-
"viem": "npm:@spalladino/[email protected].2-eip7594.2"
68+
"viem": "npm:@aztec/[email protected]"
6969
},
7070
"files": [
7171
"dest",

yarn-project/bb-prover/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"jest-mock-extended": "^4.0.0",
100100
"ts-node": "^10.9.1",
101101
"typescript": "^5.3.3",
102-
"viem": "npm:@spalladino/[email protected].2-eip7594.2"
102+
"viem": "npm:@aztec/[email protected]"
103103
},
104104
"files": [
105105
"dest",

yarn-project/blob-sink/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"snappy": "^7.2.2",
6969
"source-map-support": "^0.5.21",
7070
"tslib": "^2.4.0",
71-
"viem": "npm:@spalladino/[email protected].2-eip7594.2",
71+
"viem": "npm:@aztec/[email protected]",
7272
"zod": "^3.23.8"
7373
},
7474
"devDependencies": {

yarn-project/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"semver": "^7.5.4",
9494
"source-map-support": "^0.5.21",
9595
"tslib": "^2.4.0",
96-
"viem": "npm:@spalladino/[email protected].2-eip7594.2"
96+
"viem": "npm:@aztec/[email protected]"
9797
},
9898
"devDependencies": {
9999
"@aztec/accounts": "workspace:^",

yarn-project/cli/src/cmds/validator_keys/add.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ export async function addValidatorKeys(existing: string, options: AddValidatorKe
4242
json,
4343
feeRecipient: feeRecipientOpt,
4444
coinbase: coinbaseOpt,
45-
fundingAccount: fundingAccountOpt,
4645
remoteSigner: remoteSignerOpt,
4746
password,
4847
encryptedKeystoreDir,
@@ -63,8 +62,6 @@ export async function addValidatorKeys(existing: string, options: AddValidatorKe
6362
throw new Error('feeRecipient is required (either present in existing file or via --fee-recipient)');
6463
}
6564
const coinbase = (coinbaseOpt as EthAddress | undefined) ?? (first.coinbase as EthAddress | undefined);
66-
const fundingAccount =
67-
(fundingAccountOpt as EthAddress | undefined) ?? (first.fundingAccount as EthAddress | undefined);
6865
const derivedRemoteSigner = (first.attester as any)?.remoteSignerUrl || (first.attester as any)?.eth?.remoteSignerUrl;
6966
const remoteSigner = remoteSignerOpt ?? derivedRemoteSigner;
7067

@@ -87,7 +84,6 @@ export async function addValidatorKeys(existing: string, options: AddValidatorKe
8784
feeRecipient,
8885
coinbase,
8986
remoteSigner,
90-
fundingAccount,
9187
});
9288

9389
keystore.validators.push(...validators);

0 commit comments

Comments
 (0)