@aztec/cli 0.0.1-commit.8f9871590 → 0.0.1-commit.934299a21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dest/cmds/l1/update_l1_validators.js +5 -5
  2. package/dest/config/chain_l2_config.d.ts +1 -1
  3. package/dest/config/chain_l2_config.d.ts.map +1 -1
  4. package/dest/config/chain_l2_config.js +3 -1
  5. package/package.json +30 -30
  6. package/src/cmds/l1/update_l1_validators.ts +5 -5
  7. package/src/config/chain_l2_config.ts +3 -1
package/dest/cmds/l1/update_l1_validators.js CHANGED
@@ -2,7 +2,7 @@ import { createEthereumChain, isAnvilTestChain } from '@aztec/ethereum/chain';
2
2
  import { createExtendedL1Client, getPublicClient } from '@aztec/ethereum/client';
3
3
  import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
4
4
  import { GSEContract, RollupContract } from '@aztec/ethereum/contracts';
5
- import { createL1TxUtilsFromViemWallet } from '@aztec/ethereum/l1-tx-utils';
5
+ import { createL1TxUtils } from '@aztec/ethereum/l1-tx-utils';
6
6
  import { EthCheatCodes } from '@aztec/ethereum/test';
7
7
  import { DateProvider } from '@aztec/foundation/timer';
8
8
  import { RollupAbi, StakingAssetHandlerAbi, TestERC20Abi } from '@aztec/l1-artifacts';
@@ -38,7 +38,7 @@ export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, a
38
38
  const gseAddress = await rollup.read.getGSE();
39
39
  const gse = new GSEContract(l1Client, gseAddress);
40
40
  const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
41
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
41
+ const l1TxUtils = createL1TxUtils(l1Client, {
42
42
  logger: debugLogger
43
43
  });
44
44
  const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
@@ -130,7 +130,7 @@ export async function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mn
130
130
  const gseAddress = await rollup.read.getGSE();
131
131
  const gse = new GSEContract(l1Client, gseAddress);
132
132
  const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
133
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
133
+ const l1TxUtils = createL1TxUtils(l1Client, {
134
134
  logger: debugLogger
135
135
  });
136
136
  const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
@@ -172,7 +172,7 @@ export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic
172
172
  const account = getAccount(privateKey, mnemonic);
173
173
  const chain = createEthereumChain(rpcUrls, chainId);
174
174
  const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
175
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
175
+ const l1TxUtils = createL1TxUtils(l1Client, {
176
176
  logger: debugLogger
177
177
  });
178
178
  dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
@@ -194,7 +194,7 @@ export async function pruneRollup({ rpcUrls, chainId, privateKey, mnemonic, roll
194
194
  const account = getAccount(privateKey, mnemonic);
195
195
  const chain = createEthereumChain(rpcUrls, chainId);
196
196
  const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
197
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
197
+ const l1TxUtils = createL1TxUtils(l1Client, {
198
198
  logger: debugLogger
199
199
  });
200
200
  dualLog(`Trying prune`);
package/dest/config/chain_l2_config.d.ts CHANGED
@@ -11,4 +11,4 @@ import type { NetworkNames } from '@aztec/foundation/config';
11
11
  * @param networkName - The network name
12
12
  */
13
13
  export declare function enrichEnvironmentWithChainName(networkName: NetworkNames): void;
14
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbDJfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NoYWluX2wyX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQTBCN0Q7Ozs7Ozs7Ozs7R0FVRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FBQyxXQUFXLEVBQUUsWUFBWSxRQW1CdkUifQ==
14
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhaW5fbDJfY29uZmlnLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29uZmlnL2NoYWluX2wyX2NvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQTBCN0Q7Ozs7Ozs7Ozs7R0FVRztBQUNILHdCQUFnQiw4QkFBOEIsQ0FBQyxXQUFXLEVBQUUsWUFBWSxRQXFCdkUifQ==
package/dest/config/chain_l2_config.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AA0B7D;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAmBvE"}
1
+ {"version":3,"file":"chain_l2_config.d.ts","sourceRoot":"","sources":["../../src/config/chain_l2_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AA0B7D;;;;;;;;;;GAUG;AACH,wBAAgB,8BAA8B,CAAC,WAAW,EAAE,YAAY,QAqBvE"}
package/dest/config/chain_l2_config.js CHANGED
@@ -34,7 +34,9 @@ function getDefaultDataDir(networkName) {
34
34
  return;
35
35
  }
36
36
  // Apply generated network config from defaults.yml
37
- const generatedConfig = NetworkConfigs[networkName];
37
+ // For devnet iterations (v4-devnet-1, etc.), use the base devnet config
38
+ const configKey = /^v\d+-devnet-\d+$/.test(networkName) ? 'devnet' : networkName;
39
+ const generatedConfig = NetworkConfigs[configKey];
38
40
  if (generatedConfig) {
39
41
  enrichEnvironmentWithNetworkConfig(generatedConfig);
40
42
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aztec/cli",
3
- "version": "0.0.1-commit.8f9871590",
3
+ "version": "0.0.1-commit.934299a21",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  "./contracts": "./dest/cmds/contracts/index.js",
@@ -77,23 +77,23 @@
77
77
  ]
78
78
  },
79
79
  "dependencies": {
80
- "@aztec/accounts": "0.0.1-commit.8f9871590",
81
- "@aztec/archiver": "0.0.1-commit.8f9871590",
82
- "@aztec/aztec.js": "0.0.1-commit.8f9871590",
83
- "@aztec/constants": "0.0.1-commit.8f9871590",
84
- "@aztec/entrypoints": "0.0.1-commit.8f9871590",
85
- "@aztec/ethereum": "0.0.1-commit.8f9871590",
86
- "@aztec/foundation": "0.0.1-commit.8f9871590",
87
- "@aztec/l1-artifacts": "0.0.1-commit.8f9871590",
88
- "@aztec/node-keystore": "0.0.1-commit.8f9871590",
89
- "@aztec/node-lib": "0.0.1-commit.8f9871590",
90
- "@aztec/p2p": "0.0.1-commit.8f9871590",
91
- "@aztec/protocol-contracts": "0.0.1-commit.8f9871590",
92
- "@aztec/sequencer-client": "0.0.1-commit.8f9871590",
93
- "@aztec/slasher": "0.0.1-commit.8f9871590",
94
- "@aztec/stdlib": "0.0.1-commit.8f9871590",
95
- "@aztec/wallets": "0.0.1-commit.8f9871590",
96
- "@aztec/world-state": "0.0.1-commit.8f9871590",
80
+ "@aztec/accounts": "0.0.1-commit.934299a21",
81
+ "@aztec/archiver": "0.0.1-commit.934299a21",
82
+ "@aztec/aztec.js": "0.0.1-commit.934299a21",
83
+ "@aztec/constants": "0.0.1-commit.934299a21",
84
+ "@aztec/entrypoints": "0.0.1-commit.934299a21",
85
+ "@aztec/ethereum": "0.0.1-commit.934299a21",
86
+ "@aztec/foundation": "0.0.1-commit.934299a21",
87
+ "@aztec/l1-artifacts": "0.0.1-commit.934299a21",
88
+ "@aztec/node-keystore": "0.0.1-commit.934299a21",
89
+ "@aztec/node-lib": "0.0.1-commit.934299a21",
90
+ "@aztec/p2p": "0.0.1-commit.934299a21",
91
+ "@aztec/protocol-contracts": "0.0.1-commit.934299a21",
92
+ "@aztec/sequencer-client": "0.0.1-commit.934299a21",
93
+ "@aztec/slasher": "0.0.1-commit.934299a21",
94
+ "@aztec/stdlib": "0.0.1-commit.934299a21",
95
+ "@aztec/wallets": "0.0.1-commit.934299a21",
96
+ "@aztec/world-state": "0.0.1-commit.934299a21",
97
97
  "@ethersproject/wallet": "^5.8.0",
98
98
  "@iarna/toml": "^2.2.5",
99
99
  "@libp2p/peer-id-factory": "^3.0.4",
@@ -107,9 +107,9 @@
107
107
  "viem": "npm:@aztec/viem@2.38.2"
108
108
  },
109
109
  "devDependencies": {
110
- "@aztec/aztec-node": "0.0.1-commit.8f9871590",
111
- "@aztec/kv-store": "0.0.1-commit.8f9871590",
112
- "@aztec/telemetry-client": "0.0.1-commit.8f9871590",
110
+ "@aztec/aztec-node": "0.0.1-commit.934299a21",
111
+ "@aztec/kv-store": "0.0.1-commit.934299a21",
112
+ "@aztec/telemetry-client": "0.0.1-commit.934299a21",
113
113
  "@jest/globals": "^30.0.0",
114
114
  "@types/jest": "^30.0.0",
115
115
  "@types/lodash.chunk": "^4.2.9",
@@ -126,15 +126,15 @@
126
126
  "typescript": "^5.3.3"
127
127
  },
128
128
  "peerDependencies": {
129
- "@aztec/accounts": "0.0.1-commit.8f9871590",
130
- "@aztec/bb-prover": "0.0.1-commit.8f9871590",
131
- "@aztec/ethereum": "0.0.1-commit.8f9871590",
132
- "@aztec/l1-artifacts": "0.0.1-commit.8f9871590",
133
- "@aztec/noir-contracts.js": "0.0.1-commit.8f9871590",
134
- "@aztec/noir-protocol-circuits-types": "0.0.1-commit.8f9871590",
135
- "@aztec/noir-test-contracts.js": "0.0.1-commit.8f9871590",
136
- "@aztec/protocol-contracts": "0.0.1-commit.8f9871590",
137
- "@aztec/stdlib": "0.0.1-commit.8f9871590"
129
+ "@aztec/accounts": "0.0.1-commit.934299a21",
130
+ "@aztec/bb-prover": "0.0.1-commit.934299a21",
131
+ "@aztec/ethereum": "0.0.1-commit.934299a21",
132
+ "@aztec/l1-artifacts": "0.0.1-commit.934299a21",
133
+ "@aztec/noir-contracts.js": "0.0.1-commit.934299a21",
134
+ "@aztec/noir-protocol-circuits-types": "0.0.1-commit.934299a21",
135
+ "@aztec/noir-test-contracts.js": "0.0.1-commit.934299a21",
136
+ "@aztec/protocol-contracts": "0.0.1-commit.934299a21",
137
+ "@aztec/stdlib": "0.0.1-commit.934299a21"
138
138
  },
139
139
  "files": [
140
140
  "dest",
package/src/cmds/l1/update_l1_validators.ts CHANGED
@@ -2,7 +2,7 @@ import { createEthereumChain, isAnvilTestChain } from '@aztec/ethereum/chain';
2
2
  import { createExtendedL1Client, getPublicClient } from '@aztec/ethereum/client';
3
3
  import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
4
4
  import { GSEContract, RollupContract } from '@aztec/ethereum/contracts';
5
- import { createL1TxUtilsFromViemWallet } from '@aztec/ethereum/l1-tx-utils';
5
+ import { createL1TxUtils } from '@aztec/ethereum/l1-tx-utils';
6
6
  import { EthCheatCodes } from '@aztec/ethereum/test';
7
7
  import type { EthAddress } from '@aztec/foundation/eth-address';
8
8
  import type { LogFn, Logger } from '@aztec/foundation/log';
@@ -88,7 +88,7 @@ export async function addL1Validator({
88
88
  const gse = new GSEContract(l1Client, gseAddress);
89
89
  const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
90
90
 
91
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
91
+ const l1TxUtils = createL1TxUtils(l1Client, { logger: debugLogger });
92
92
  const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
93
93
 
94
94
  // Step 1: Claim STK tokens from the faucet
@@ -194,7 +194,7 @@ export async function addL1ValidatorViaRollup({
194
194
 
195
195
  const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
196
196
 
197
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
197
+ const l1TxUtils = createL1TxUtils(l1Client, { logger: debugLogger });
198
198
 
199
199
  const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
200
200
  to: rollupAddress.toString(),
@@ -241,7 +241,7 @@ export async function removeL1Validator({
241
241
  const account = getAccount(privateKey, mnemonic);
242
242
  const chain = createEthereumChain(rpcUrls, chainId);
243
243
  const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
244
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
244
+ const l1TxUtils = createL1TxUtils(l1Client, { logger: debugLogger });
245
245
 
246
246
  dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
247
247
  const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
@@ -268,7 +268,7 @@ export async function pruneRollup({
268
268
  const account = getAccount(privateKey, mnemonic);
269
269
  const chain = createEthereumChain(rpcUrls, chainId);
270
270
  const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
271
- const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, { logger: debugLogger });
271
+ const l1TxUtils = createL1TxUtils(l1Client, { logger: debugLogger });
272
272
 
273
273
  dualLog(`Trying prune`);
274
274
  const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
package/src/config/chain_l2_config.ts CHANGED
@@ -45,7 +45,9 @@ export function enrichEnvironmentWithChainName(networkName: NetworkNames) {
45
45
  }
46
46
 
47
47
  // Apply generated network config from defaults.yml
48
- const generatedConfig = NetworkConfigs[networkName];
48
+ // For devnet iterations (v4-devnet-1, etc.), use the base devnet config
49
+ const configKey = /^v\d+-devnet-\d+$/.test(networkName) ? 'devnet' : networkName;
50
+ const generatedConfig = NetworkConfigs[configKey];
49
51
  if (generatedConfig) {
50
52
  enrichEnvironmentWithNetworkConfig(generatedConfig);
51
53
  }