@aztec/cli 0.82.2 → 0.82.3

package/dest/cmds/devnet/bootstrap_network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap_network.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/bootstrap_network.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAqB3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,EACvC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,MAAM,iBA4EjB"}
+{"version":3,"file":"bootstrap_network.d.ts","sourceRoot":"","sources":["../../../src/cmds/devnet/bootstrap_network.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAqB3D,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EAAE,EAChB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,KAAK,MAAM,EAAE,GAAG,SAAS,EACvC,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,OAAO,EACb,GAAG,EAAE,KAAK,EACV,QAAQ,EAAE,MAAM,iBAiFjB"}

package/dest/cmds/devnet/bootstrap_network.js

@@ -1,4 +1,4 @@
-import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
+import { getInitialTestAccountsManagers } from '@aztec/accounts/testing';
 import { BatchCall, Fr, L1FeeJuicePortalManager, createCompatibleClient, retryUntil, waitForProven } from '@aztec/aztec.js';
 import { createEthereumChain, createL1Clients, deployL1Contract } from '@aztec/ethereum';
 import { getContract } from 'viem';
@@ -13,7 +13,11 @@ const provenWaitOpts = {
 };
 export async function bootstrapNetwork(pxeUrl, l1Urls, l1ChainId, l1PrivateKey, l1Mnemonic, addressIndex, json, log, debugLog) {
     const pxe = await createCompatibleClient(pxeUrl, debugLog);
-    const [wallet] = await getDeployedTestAccountsWallets(pxe);
+    // We assume here that the initial test accounts were prefunded with deploy-l1-contracts, and deployed with setup-l2-contracts
+    // so all we need to do is register them to our pxe.
+    const [accountManager] = await getInitialTestAccountsManagers(pxe);
+    await accountManager.register();
+    const wallet = await accountManager.getWallet();
     const l1Clients = createL1Clients(l1Urls, l1PrivateKey ? privateKeyToAccount(l1PrivateKey) : // Note that this account needs to be funded on L1 !
     mnemonicToAccount(l1Mnemonic, {
         addressIndex

package/dest/cmds/l1/governance_utils.js

@@ -5,7 +5,7 @@ export async function depositGovernanceTokens({ registryAddress, rpcUrls, chainI
     const { publicClient, walletClient } = createL1Clients(rpcUrls, privateKey ?? mnemonic, chain.chainInfo, mnemonicIndex);
     const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, 'canonical');
     const governanceAddress = addresses.governanceAddress.toString();
-    const tokenAddress = addresses.feeJuiceAddress.toString();
+    const tokenAddress = addresses.stakingAssetAddress.toString();
     const feeJuice = new FeeJuiceContract(tokenAddress, publicClient, walletClient);
     const governance = new GovernanceContract(governanceAddress, publicClient, walletClient);
     if (mint) {

package/dest/cmds/l1/index.js

@@ -9,7 +9,7 @@ export function injectCommands(program, log, debugLogger) {
     program.command('deploy-l1-contracts').description('Deploys all necessary Ethereum contracts for Aztec.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').option('--sponsored-fpc', 'Populate genesis state with a testing sponsored FPC contract').option('--accelerated-test-deployments', 'Fire and forget deployment transactions, use in testing only', false).action(async (options)=>{
         const { deployL1Contracts } = await import('./deploy_l1_contracts.js');
         const initialValidators = options.validators?.split(',').map((validator)=>EthAddress.fromString(validator)) || [];
-        await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFPC, options.acceleratedTestDeployments, options.json, initialValidators, log, debugLogger);
+        await deployL1Contracts(options.l1RpcUrls, options.l1ChainId, options.privateKey, options.mnemonic, options.mnemonicIndex, options.salt, options.testAccounts, options.sponsoredFpc, options.acceleratedTestDeployments, options.json, initialValidators, log, debugLogger);
     });
     program.command('deploy-new-rollup').description('Deploys a new rollup contract and a payload to upgrade the registry with it.').requiredOption('-r, --registry-address <string>', 'The address of the registry contract', parseEthereumAddress).addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use for deployment', PRIVATE_KEY).option('--validators <string>', 'Comma separated list of validators').option('-m, --mnemonic <string>', 'The mnemonic to use in deployment', 'test test test test test test test test test test test junk').option('-i, --mnemonic-index <number>', 'The index of the mnemonic to use in deployment', (arg)=>parseInt(arg), 0).addOption(l1ChainIdOption).option('--salt <number>', 'The optional salt to use in deployment', (arg)=>parseInt(arg)).option('--json', 'Output the contract addresses in JSON format').option('--test-accounts', 'Populate genesis state with initial fee juice for test accounts').action(async (options)=>{
         const { deployNewRollup } = await import('./deploy_new_rollup.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "0.82.2",
+  "version": "0.82.3",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -67,15 +67,15 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "0.82.2",
-    "@aztec/aztec.js": "0.82.2",
-    "@aztec/constants": "0.82.2",
-    "@aztec/entrypoints": "0.82.2",
-    "@aztec/foundation": "0.82.2",
-    "@aztec/l1-artifacts": "0.82.2",
-    "@aztec/p2p": "0.82.2",
-    "@aztec/stdlib": "0.82.2",
-    "@aztec/world-state": "0.82.2",
+    "@aztec/archiver": "0.82.3",
+    "@aztec/aztec.js": "0.82.3",
+    "@aztec/constants": "0.82.3",
+    "@aztec/entrypoints": "0.82.3",
+    "@aztec/foundation": "0.82.3",
+    "@aztec/l1-artifacts": "0.82.3",
+    "@aztec/p2p": "0.82.3",
+    "@aztec/stdlib": "0.82.3",
+    "@aztec/world-state": "0.82.3",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^12.1.0",
@@ -87,9 +87,9 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/accounts": "0.82.2",
-    "@aztec/ethereum": "0.82.2",
-    "@aztec/protocol-contracts": "0.82.2",
+    "@aztec/accounts": "0.82.3",
+    "@aztec/ethereum": "0.82.3",
+    "@aztec/protocol-contracts": "0.82.3",
     "@jest/globals": "^29.5.0",
     "@types/jest": "^29.5.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -105,14 +105,14 @@
     "typescript": "^5.0.4"
   },
   "peerDependencies": {
-    "@aztec/accounts": "0.82.2",
-    "@aztec/bb-prover": "0.82.2",
-    "@aztec/ethereum": "0.82.2",
-    "@aztec/l1-artifacts": "0.82.2",
-    "@aztec/noir-contracts.js": "0.82.2",
-    "@aztec/noir-protocol-circuits-types": "0.82.2",
-    "@aztec/protocol-contracts": "0.82.2",
-    "@aztec/stdlib": "0.82.2"
+    "@aztec/accounts": "0.82.3",
+    "@aztec/bb-prover": "0.82.3",
+    "@aztec/ethereum": "0.82.3",
+    "@aztec/l1-artifacts": "0.82.3",
+    "@aztec/noir-contracts.js": "0.82.3",
+    "@aztec/noir-protocol-circuits-types": "0.82.3",
+    "@aztec/protocol-contracts": "0.82.3",
+    "@aztec/stdlib": "0.82.3"
   },
   "files": [
     "dest",

package/src/cmds/devnet/bootstrap_network.ts

@@ -1,4 +1,4 @@
-import { getDeployedTestAccountsWallets } from '@aztec/accounts/testing';
+import { getInitialTestAccountsManagers } from '@aztec/accounts/testing';
 import {
   AztecAddress,
   BatchCall,
@@ -54,7 +54,12 @@ export async function bootstrapNetwork(
 ) {
   const pxe = await createCompatibleClient(pxeUrl, debugLog);
 
-  const [wallet] = await getDeployedTestAccountsWallets(pxe);
+  // We assume here that the initial test accounts were prefunded with deploy-l1-contracts, and deployed with setup-l2-contracts
+  // so all we need to do is register them to our pxe.
+  const [accountManager] = await getInitialTestAccountsManagers(pxe);
+  await accountManager.register();
+
+  const wallet = await accountManager.getWallet();
 
   const l1Clients = createL1Clients(
     l1Urls,

package/src/cmds/l1/governance_utils.ts

@@ -42,7 +42,7 @@ export async function depositGovernanceTokens({
 
   const addresses = await RegistryContract.collectAddresses(publicClient, registryAddress, 'canonical');
   const governanceAddress = addresses.governanceAddress.toString();
-  const tokenAddress = addresses.feeJuiceAddress.toString();
+  const tokenAddress = addresses.stakingAssetAddress.toString();
 
   const feeJuice = new FeeJuiceContract(tokenAddress, publicClient, walletClient);
   const governance = new GovernanceContract(governanceAddress, publicClient, walletClient);

package/src/cmds/l1/index.ts

@@ -57,7 +57,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
         options.mnemonicIndex,
         options.salt,
         options.testAccounts,
-        options.sponsoredFPC,
+        options.sponsoredFpc,
         options.acceleratedTestDeployments,
         options.json,
         initialValidators,