@aztec/cli 0.0.0-test.0 → 0.0.1-commit.03f7ef2

package/dest/cmds/l1/update_l1_validators.d.ts

@@ -8,6 +8,13 @@ export interface RollupCommandArgs {
     rollupAddress: EthAddress;
     withdrawerAddress?: EthAddress;
 }
+export interface StakingAssetHandlerCommandArgs {
+    rpcUrls: string[];
+    chainId: number;
+    privateKey?: string;
+    mnemonic?: string;
+    stakingAssetHandlerAddress: EthAddress;
+}
 export interface LoggerArgs {
     log: LogFn;
     debugLogger: Logger;
@@ -16,15 +23,23 @@ export declare function generateL1Account(): {
     privateKey: `0x${string}`;
     address: `0x${string}`;
 };
-export declare function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, withdrawerAddress, log, debugLogger, }: RollupCommandArgs & LoggerArgs & {
-    validatorAddress: EthAddress;
+export declare function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, blsSecretKey, log, debugLogger }: StakingAssetHandlerCommandArgs & LoggerArgs & {
+    blsSecretKey: bigint;
+    attesterAddress: EthAddress;
+    proofParams: Buffer;
+    merkleProof: string[];
+}): Promise<void>;
+export declare function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, withdrawerAddress, blsSecretKey, moveWithLatestRollup, rollupAddress, log, debugLogger }: RollupCommandArgs & LoggerArgs & {
+    blsSecretKey: bigint;
+    attesterAddress: EthAddress;
+    moveWithLatestRollup: boolean;
 }): Promise<void>;
-export declare function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger, }: RollupCommandArgs & LoggerArgs & {
+export declare function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger }: RollupCommandArgs & LoggerArgs & {
     validatorAddress: EthAddress;
 }): Promise<void>;
-export declare function pruneRollup({ rpcUrls, chainId, privateKey, mnemonic, rollupAddress, log, debugLogger, }: RollupCommandArgs & LoggerArgs): Promise<void>;
-export declare function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEpochs, log, debugLogger, }: RollupCommandArgs & LoggerArgs & {
+export declare function pruneRollup({ rpcUrls, chainId, privateKey, mnemonic, rollupAddress, log, debugLogger }: RollupCommandArgs & LoggerArgs): Promise<void>;
+export declare function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEpochs, log, debugLogger }: RollupCommandArgs & LoggerArgs & {
     numEpochs: bigint;
 }): Promise<void>;
 export declare function debugRollup({ rpcUrls, chainId, rollupAddress, log }: RollupCommandArgs & LoggerArgs): Promise<void>;
-//# sourceMappingURL=update_l1_validators.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXBkYXRlX2wxX3ZhbGlkYXRvcnMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL2wxL3VwZGF0ZV9sMV92YWxpZGF0b3JzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sS0FBSyxFQUFFLFVBQVUsRUFBRSxNQUFNLCtCQUErQixDQUFDO0FBQ2hFLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQVUzRCxNQUFNLFdBQVcsaUJBQWlCO0lBQ2hDLE9BQU8sRUFBRSxNQUFNLEVBQUUsQ0FBQztJQUNsQixPQUFPLEVBQUUsTUFBTSxDQUFDO0lBQ2hCLFVBQVUsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNwQixRQUFRLENBQUMsRUFBRSxNQUFNLENBQUM7SUFDbEIsYUFBYSxFQUFFLFVBQVUsQ0FBQztJQUMxQixpQkFBaUIsQ0FBQyxFQUFFLFVBQVUsQ0FBQztDQUNoQztBQUVELE1BQU0sV0FBVyw4QkFBOEI7SUFDN0MsT0FBTyxFQUFFLE1BQU0sRUFBRSxDQUFDO0lBQ2xCLE9BQU8sRUFBRSxNQUFNLENBQUM7SUFDaEIsVUFBVSxDQUFDLEVBQUUsTUFBTSxDQUFDO0lBQ3BCLFFBQVEsQ0FBQyxFQUFFLE1BQU0sQ0FBQztJQUNsQiwwQkFBMEIsRUFBRSxVQUFVLENBQUM7Q0FDeEM7QUFFRCxNQUFNLFdBQVcsVUFBVTtJQUN6QixHQUFHLEVBQUUsS0FBSyxDQUFDO0lBQ1gsV0FBVyxFQUFFLE1BQU0sQ0FBQztDQUNyQjtBQUVELHdCQUFnQixpQkFBaUI7OztFQVFoQztBQUVELHdCQUFzQixjQUFjLENBQUMsRUFDbkMsT0FBTyxFQUNQLE9BQU8sRUFDUCxVQUFVLEVBQ1YsUUFBUSxFQUNSLGVBQWUsRUFDZiwwQkFBMEIsRUFDMUIsV0FBVyxFQUNYLFdBQVcsRUFDWCxZQUFZLEVBQ1osR0FBRyxFQUNILFdBQVcsRUFDWixFQUFFLDhCQUE4QixHQUMvQixVQUFVLEdBQUc7SUFDWCxZQUFZLEVBQUUsTUFBTSxDQUFDO0lBQ3JCLGVBQWUsRUFBRSxVQUFVLENBQUM7SUFDNUIsV0FBVyxFQUFFLE1BQU0sQ0FBQztJQUNwQixXQUFXLEVBQUUsTUFBTSxFQUFFLENBQUM7Q0FDdkIsaUJBNERGO0FBRUQsd0JBQXNCLHVCQUF1QixDQUFDLEVBQzVDLE9BQU8sRUFDUCxPQUFPLEVBQ1AsVUFBVSxFQUNWLFFBQVEsRUFDUixlQUFlLEVBQ2YsaUJBQWlCLEVBQ2pCLFlBQVksRUFDWixvQkFBb0IsRUFDcEIsYUFBYSxFQUNiLEdBQUcsRUFDSCxXQUFXLEVBQ1osRUFBRSxpQkFBaUIsR0FDbEIsVUFBVSxHQUFHO0lBQ1gsWUFBWSxFQUFFLE1BQU0sQ0FBQztJQUNyQixlQUFlLEVBQUUsVUFBVSxDQUFDO0lBQzVCLG9CQUFvQixFQUFFLE9BQU8sQ0FBQztDQUMvQixpQkF1REY7QUFFRCx3QkFBc0IsaUJBQWlCLENBQUMsRUFDdEMsT0FBTyxFQUNQLE9BQU8sRUFDUCxVQUFVLEVBQ1YsUUFBUSxFQUNSLGdCQUFnQixFQUNoQixhQUFhLEVBQ2IsR0FBRyxFQUNILFdBQVcsRUFDWixFQUFFLGlCQUFpQixHQUFHLFVBQVUsR0FBRztJQUFFLGdCQUFnQixFQUFFLFVBQVUsQ0FBQTtDQUFFLGlCQWlCbkU7QUFFRCx3QkFBc0IsV0FBVyxDQUFDLEVBQ2hDLE9BQU8sRUFDUCxPQUFPLEVBQ1AsVUFBVSxFQUNWLFFBQVEsRUFDUixhQUFhLEVBQ2IsR0FBRyxFQUNILFdBQVcsRUFDWixFQUFFLGlCQUFpQixHQUFHLFVBQVUsaUJBZ0JoQztBQUVELHdCQUFzQixpQkFBaUIsQ0FBQyxFQUN0QyxPQUFPLEVBQ1AsT0FBTyxFQUNQLGFBQWEsRUFDYixTQUFTLEVBQ1QsR0FBRyxFQUNILFdBQVcsRUFDWixFQUFFLGlCQUFpQixHQUFHLFVBQVUsR0FBRztJQUFFLFNBQVMsRUFBRSxNQUFNLENBQUE7Q0FBRSxpQkF5QnhEO0FBRUQsd0JBQXNCLFdBQVcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxPQUFPLEVBQUUsYUFBYSxFQUFFLEdBQUcsRUFBRSxFQUFFLGlCQUFpQixHQUFHLFVBQVUsaUJBd0J6RyJ9

package/dest/cmds/l1/update_l1_validators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update_l1_validators.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/update_l1_validators.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAM3D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,UAAU,CAAC;IAC1B,iBAAiB,CAAC,EAAE,UAAU,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,iBAAiB;;;EAQhC;AAED,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,gBAAgB,EAAE,UAAU,CAAA;CAAE,iBA+CnE;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,gBAAgB,EAAE,UAAU,CAAA;CAAE,iBAcnE;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,iBAchC;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,aAAa,EACb,SAAS,EACT,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAyBxD;AAED,wBAAsB,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,iBAAiB,GAAG,UAAU,iBA4BzG"}
+{"version":3,"file":"update_l1_validators.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/update_l1_validators.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAU3D,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,UAAU,CAAC;IAC1B,iBAAiB,CAAC,EAAE,UAAU,CAAC;CAChC;AAED,MAAM,WAAW,8BAA8B;IAC7C,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0BAA0B,EAAE,UAAU,CAAC;CACxC;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,KAAK,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,iBAAiB;;;EAQhC;AAED,wBAAsB,cAAc,CAAC,EACnC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,eAAe,EACf,0BAA0B,EAC1B,WAAW,EACX,WAAW,EACX,YAAY,EACZ,GAAG,EACH,WAAW,EACZ,EAAE,8BAA8B,GAC/B,UAAU,GAAG;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,UAAU,CAAC;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,iBA4DF;AAED,wBAAsB,uBAAuB,CAAC,EAC5C,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,eAAe,EACf,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,aAAa,EACb,GAAG,EACH,WAAW,EACZ,EAAE,iBAAiB,GAClB,UAAU,GAAG;IACX,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,UAAU,CAAC;IAC5B,oBAAoB,EAAE,OAAO,CAAC;CAC/B,iBAuDF;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,gBAAgB,EAChB,aAAa,EACb,GAAG,EACH,WAAW,EACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,gBAAgB,EAAE,UAAU,CAAA;CAAE,iBAiBnE;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,EACH,WAAW,EACZ,EAAE,iBAAiB,GAAG,UAAU,iBAgBhC;AAED,wBAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,OAAO,EACP,aAAa,EACb,SAAS,EACT,GAAG,EACH,WAAW,EACZ,EAAE,iBAAiB,GAAG,UAAU,GAAG;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBAyBxD;AAED,wBAAsB,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,iBAAiB,GAAG,UAAU,iBAwBzG"}

package/dest/cmds/l1/update_l1_validators.js

@@ -1,7 +1,15 @@
-import { EthCheatCodes, createEthereumChain, getExpectedAddress, getL1ContractsConfigEnvVars, isAnvilTestChain } from '@aztec/ethereum';
-import { ForwarderAbi, ForwarderBytecode, RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
-import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
+import { createEthereumChain, isAnvilTestChain } from '@aztec/ethereum/chain';
+import { createExtendedL1Client, getPublicClient } from '@aztec/ethereum/client';
+import { getL1ContractsConfigEnvVars } from '@aztec/ethereum/config';
+import { GSEContract, RollupContract } from '@aztec/ethereum/contracts';
+import { createL1TxUtilsFromViemWallet } from '@aztec/ethereum/l1-tx-utils';
+import { EthCheatCodes } from '@aztec/ethereum/test';
+import { DateProvider } from '@aztec/foundation/timer';
+import { RollupAbi, StakingAssetHandlerAbi } from '@aztec/l1-artifacts';
+import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
+import { encodeFunctionData, formatEther, getContract } from 'viem';
 import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
+import { addLeadingHex } from '../../utils/aztec.js';
 export function generateL1Account() {
     const privateKey = generatePrivateKey();
     const account = privateKeyToAccount(privateKey);
@@ -11,106 +19,171 @@ export function generateL1Account() {
         address: account.address
     };
 }
-export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, withdrawerAddress, log, debugLogger }) {
-    const config = getL1ContractsConfigEnvVars();
+export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, blsSecretKey, log, debugLogger }) {
     const dualLog = makeDualLog(log, debugLogger);
-    const publicClient = getPublicClient(rpcUrls, chainId);
-    const walletClient = getWalletClient(rpcUrls, chainId, privateKey, mnemonic);
+    const account = getAccount(privateKey, mnemonic);
+    const chain = createEthereumChain(rpcUrls, chainId);
+    const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
+    const stakingAssetHandler = getContract({
+        address: stakingAssetHandlerAddress.toString(),
+        abi: StakingAssetHandlerAbi,
+        client: l1Client
+    });
+    const rollupAddress = await stakingAssetHandler.read.getRollup();
+    dualLog(`Adding validator ${attesterAddress} to rollup ${rollupAddress.toString()}`);
     const rollup = getContract({
-        address: rollupAddress.toString(),
+        address: rollupAddress,
         abi: RollupAbi,
-        client: walletClient
-    });
-    const stakingAsset = getContract({
-        address: await rollup.read.getStakingAsset(),
-        abi: TestERC20Abi,
-        client: walletClient
-    });
-    await Promise.all([
-        await stakingAsset.write.mint([
-            walletClient.account.address,
-            config.minimumStake
-        ], {}),
-        await stakingAsset.write.approve([
-            rollupAddress.toString(),
-            config.minimumStake
-        ], {})
-    ].map((txHash)=>publicClient.waitForTransactionReceipt({
-            hash: txHash
-        })));
-    dualLog(`Adding validator ${validatorAddress.toString()} to rollup ${rollupAddress.toString()}`);
-    const txHash = await rollup.write.deposit([
-        validatorAddress.toString(),
-        // TODO(#11451): custom forwarders
-        getExpectedAddress(ForwarderAbi, ForwarderBytecode, [
-            validatorAddress.toString()
-        ], validatorAddress.toString()).address,
-        withdrawerAddress?.toString() ?? validatorAddress.toString(),
-        config.minimumStake
-    ]);
-    dualLog(`Transaction hash: ${txHash}`);
-    await publicClient.waitForTransactionReceipt({
-        hash: txHash
+        client: l1Client
+    });
+    const gseAddress = await rollup.read.getGSE();
+    const gse = new GSEContract(l1Client, gseAddress);
+    const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
+    });
+    const proofParamsObj = ZkPassportProofParams.fromBuffer(proofParams);
+    const merkleProofArray = merkleProof.map((proof)=>addLeadingHex(proof));
+    const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
+        to: stakingAssetHandlerAddress.toString(),
+        data: encodeFunctionData({
+            abi: StakingAssetHandlerAbi,
+            functionName: 'addValidator',
+            args: [
+                attesterAddress.toString(),
+                merkleProofArray,
+                proofParamsObj.toViem(),
+                registrationTuple.publicKeyInG1,
+                registrationTuple.publicKeyInG2,
+                registrationTuple.proofOfPossession
+            ]
+        }),
+        abi: StakingAssetHandlerAbi
+    });
+    dualLog(`Transaction hash: ${receipt.transactionHash}`);
+    await l1Client.waitForTransactionReceipt({
+        hash: receipt.transactionHash
     });
     if (isAnvilTestChain(chainId)) {
         dualLog(`Funding validator on L1`);
-        const cheatCodes = new EthCheatCodes(rpcUrls, debugLogger);
-        await cheatCodes.setBalance(validatorAddress, 10n ** 20n);
+        const cheatCodes = new EthCheatCodes(rpcUrls, new DateProvider(), debugLogger);
+        await cheatCodes.setBalance(attesterAddress, 10n ** 20n);
     } else {
-        const balance = await publicClient.getBalance({
-            address: validatorAddress.toString()
+        const balance = await l1Client.getBalance({
+            address: attesterAddress.toString()
         });
-        const balanceInEth = Number(balance) / 10 ** 18;
-        dualLog(`Validator balance: ${balanceInEth.toFixed(6)} ETH`);
-        if (balanceInEth === 0) {
-            dualLog(`WARNING: Validator has no balance. Remember to fund it!`);
+        dualLog(`Validator balance: ${formatEther(balance)} ETH`);
+        if (balance === 0n) {
+            dualLog(`WARNING: Proposer has no balance. Remember to fund it!`);
         }
     }
 }
-export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger }) {
+export async function addL1ValidatorViaRollup({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, withdrawerAddress, blsSecretKey, moveWithLatestRollup, rollupAddress, log, debugLogger }) {
     const dualLog = makeDualLog(log, debugLogger);
-    const publicClient = getPublicClient(rpcUrls, chainId);
-    const walletClient = getWalletClient(rpcUrls, chainId, privateKey, mnemonic);
+    const account = getAccount(privateKey, mnemonic);
+    const chain = createEthereumChain(rpcUrls, chainId);
+    const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
+    dualLog(`Adding validator ${attesterAddress} to rollup ${rollupAddress.toString()} via direct deposit`);
+    if (!withdrawerAddress) {
+        throw new Error(`Withdrawer address required`);
+    }
     const rollup = getContract({
         address: rollupAddress.toString(),
         abi: RollupAbi,
-        client: walletClient
+        client: l1Client
+    });
+    const gseAddress = await rollup.read.getGSE();
+    const gse = new GSEContract(l1Client, gseAddress);
+    const registrationTuple = await gse.makeRegistrationTuple(blsSecretKey);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
+    });
+    const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
+        to: rollupAddress.toString(),
+        data: encodeFunctionData({
+            abi: RollupAbi,
+            functionName: 'deposit',
+            args: [
+                attesterAddress.toString(),
+                withdrawerAddress.toString(),
+                registrationTuple.publicKeyInG1,
+                registrationTuple.publicKeyInG2,
+                registrationTuple.proofOfPossession,
+                moveWithLatestRollup
+            ]
+        }),
+        abi: StakingAssetHandlerAbi
+    });
+    dualLog(`Transaction hash: ${receipt.transactionHash}`);
+    await l1Client.waitForTransactionReceipt({
+        hash: receipt.transactionHash
+    });
+    if (isAnvilTestChain(chainId)) {
+        dualLog(`Funding validator on L1`);
+        const cheatCodes = new EthCheatCodes(rpcUrls, new DateProvider(), debugLogger);
+        await cheatCodes.setBalance(attesterAddress, 10n ** 20n);
+    } else {
+        const balance = await l1Client.getBalance({
+            address: attesterAddress.toString()
+        });
+        dualLog(`Validator balance: ${formatEther(balance)} ETH`);
+        if (balance === 0n) {
+            dualLog(`WARNING: Proposer has no balance. Remember to fund it!`);
+        }
+    }
+}
+export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger }) {
+    const dualLog = makeDualLog(log, debugLogger);
+    const account = getAccount(privateKey, mnemonic);
+    const chain = createEthereumChain(rpcUrls, chainId);
+    const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
     });
     dualLog(`Removing validator ${validatorAddress.toString()} from rollup ${rollupAddress.toString()}`);
-    const txHash = await rollup.write.initiateWithdraw([
-        validatorAddress.toString(),
-        validatorAddress.toString()
-    ]);
-    dualLog(`Transaction hash: ${txHash}`);
-    await publicClient.waitForTransactionReceipt({
-        hash: txHash
+    const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
+        to: rollupAddress.toString(),
+        data: encodeFunctionData({
+            abi: RollupAbi,
+            functionName: 'initiateWithdraw',
+            args: [
+                validatorAddress.toString(),
+                validatorAddress.toString()
+            ]
+        })
     });
+    dualLog(`Transaction hash: ${receipt.transactionHash}`);
 }
 export async function pruneRollup({ rpcUrls, chainId, privateKey, mnemonic, rollupAddress, log, debugLogger }) {
     const dualLog = makeDualLog(log, debugLogger);
-    const publicClient = getPublicClient(rpcUrls, chainId);
-    const walletClient = getWalletClient(rpcUrls, chainId, privateKey, mnemonic);
-    const rollup = getContract({
-        address: rollupAddress.toString(),
-        abi: RollupAbi,
-        client: walletClient
+    const account = getAccount(privateKey, mnemonic);
+    const chain = createEthereumChain(rpcUrls, chainId);
+    const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
+    const l1TxUtils = createL1TxUtilsFromViemWallet(l1Client, {
+        logger: debugLogger
     });
     dualLog(`Trying prune`);
-    const txHash = await rollup.write.prune();
-    dualLog(`Transaction hash: ${txHash}`);
-    await publicClient.waitForTransactionReceipt({
-        hash: txHash
+    const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
+        to: rollupAddress.toString(),
+        data: encodeFunctionData({
+            abi: RollupAbi,
+            functionName: 'prune'
+        })
     });
+    dualLog(`Transaction hash: ${receipt.transactionHash}`);
 }
 export async function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEpochs, log, debugLogger }) {
     const dualLog = makeDualLog(log, debugLogger);
-    const publicClient = getPublicClient(rpcUrls, chainId);
+    const publicClient = getPublicClient({
+        l1RpcUrls: rpcUrls,
+        l1ChainId: chainId
+    });
     const rollup = getContract({
         address: rollupAddress.toString(),
         abi: RollupAbi,
         client: publicClient
     });
-    const cheatCodes = new EthCheatCodes(rpcUrls, debugLogger);
+    const cheatCodes = new EthCheatCodes(rpcUrls, new DateProvider(), debugLogger);
     const currentSlot = await rollup.read.getCurrentSlot();
     const l2SlotsInEpoch = await rollup.read.getEpochDuration();
     const timestamp = await rollup.read.getTimestampForSlot([
@@ -118,7 +191,9 @@ export async function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEp
     ]);
     dualLog(`Fast forwarding ${numEpochs} epochs to ${timestamp}`);
     try {
-        await cheatCodes.warp(Number(timestamp));
+        await cheatCodes.warp(Number(timestamp), {
+            resetBlockInterval: true
+        });
         dualLog(`Fast forwarded ${numEpochs} epochs to ${timestamp}`);
     } catch (error) {
         if (error instanceof Error && error.message.includes("is lower than or equal to previous block's timestamp")) {
@@ -131,32 +206,29 @@ export async function fastForwardEpochs({ rpcUrls, chainId, rollupAddress, numEp
 }
 export async function debugRollup({ rpcUrls, chainId, rollupAddress, log }) {
     const config = getL1ContractsConfigEnvVars();
-    const publicClient = getPublicClient(rpcUrls, chainId);
-    const rollup = getContract({
-        address: rollupAddress.toString(),
-        abi: RollupAbi,
-        client: publicClient
+    const publicClient = getPublicClient({
+        l1RpcUrls: rpcUrls,
+        l1ChainId: chainId
     });
-    const pendingNum = await rollup.read.getPendingBlockNumber();
+    const rollup = new RollupContract(publicClient, rollupAddress);
+    const pendingNum = await rollup.getCheckpointNumber();
     log(`Pending block num: ${pendingNum}`);
-    const provenNum = await rollup.read.getProvenBlockNumber();
+    const provenNum = await rollup.getProvenCheckpointNumber();
     log(`Proven block num: ${provenNum}`);
-    const validators = await rollup.read.getAttesters();
+    const validators = await rollup.getAttesters();
     log(`Validators: ${validators.map((v)=>v.toString()).join(', ')}`);
-    const committee = await rollup.read.getCurrentEpochCommittee();
-    log(`Committee: ${committee.map((v)=>v.toString()).join(', ')}`);
-    const archive = await rollup.read.archive();
+    const committee = await rollup.getCurrentEpochCommittee();
+    log(`Committee: ${committee?.map((v)=>v.toString()).join(', ')}`);
+    const archive = await rollup.archive();
     log(`Archive: ${archive}`);
-    const epochNum = await rollup.read.getCurrentEpoch();
+    const epochNum = await rollup.getCurrentEpochNumber();
     log(`Current epoch: ${epochNum}`);
-    const slot = await rollup.read.getCurrentSlot();
+    const slot = await rollup.getSlotNumber();
     log(`Current slot: ${slot}`);
-    const proposerDuringPrevL1Block = await rollup.read.getCurrentProposer();
+    const proposerDuringPrevL1Block = await rollup.getCurrentProposer();
     log(`Proposer during previous L1 block: ${proposerDuringPrevL1Block}`);
     const nextBlockTS = BigInt((await publicClient.getBlock()).timestamp + BigInt(config.ethereumSlotDuration));
-    const proposer = await rollup.read.getProposerAt([
-        nextBlockTS
-    ]);
+    const proposer = await rollup.getProposerAt(nextBlockTS);
     log(`Proposer NOW: ${proposer.toString()}`);
 }
 function makeDualLog(log, debugLogger) {
@@ -165,22 +237,10 @@ function makeDualLog(log, debugLogger) {
         debugLogger.info(msg);
     };
 }
-function getPublicClient(rpcUrls, chainId) {
-    const chain = createEthereumChain(rpcUrls, chainId);
-    return createPublicClient({
-        chain: chain.chainInfo,
-        transport: fallback(rpcUrls.map((url)=>http(url)))
-    });
-}
-function getWalletClient(rpcUrls, chainId, privateKey, mnemonic) {
+function getAccount(privateKey, mnemonic) {
     if (!privateKey && !mnemonic) {
         throw new Error('Either privateKey or mnemonic must be provided to create a wallet client');
     }
-    const chain = createEthereumChain(rpcUrls, chainId);
     const account = !privateKey ? mnemonicToAccount(mnemonic) : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}`);
-    return createWalletClient({
-        account,
-        chain: chain.chainInfo,
-        transport: fallback(rpcUrls.map((url)=>http(url)))
-    });
+    return account;
 }

package/dest/cmds/misc/compute_selector.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn } from '@aztec/foundation/log';
 export declare function computeSelector(functionSignature: string, log: LogFn): Promise<void>;
-//# sourceMappingURL=compute_selector.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcHV0ZV9zZWxlY3Rvci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NtZHMvbWlzYy9jb21wdXRlX3NlbGVjdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sS0FBSyxFQUFFLEtBQUssRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR25ELHdCQUFzQixlQUFlLENBQUMsaUJBQWlCLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxLQUFLLGlCQUcxRSJ9

package/dest/cmds/misc/example_contracts.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn } from '@aztec/foundation/log';
 export declare function exampleContracts(log: LogFn): Promise<void>;
-//# sourceMappingURL=example_contracts.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXhhbXBsZV9jb250cmFjdHMuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL21pc2MvZXhhbXBsZV9jb250cmFjdHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFJbkQsd0JBQXNCLGdCQUFnQixDQUFDLEdBQUcsRUFBRSxLQUFLLGlCQU9oRCJ9

package/dest/cmds/misc/generate_bootnode_enr.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn } from '@aztec/foundation/log';
-export declare function generateEncodedBootnodeENR(privateKey: string, udpAnnounceAddress: string, l1ChainId: number, log: LogFn): Promise<void>;
-//# sourceMappingURL=generate_bootnode_enr.d.ts.map
+export declare function generateEncodedBootnodeENR(privateKey: string, p2pIp: string, p2pPort: number, l1ChainId: number, log: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVfYm9vdG5vZGVfZW5yLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy9taXNjL2dlbmVyYXRlX2Jvb3Rub2RlX2Vuci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUduRCx3QkFBc0IsMEJBQTBCLENBQzlDLFVBQVUsRUFBRSxNQUFNLEVBQ2xCLEtBQUssRUFBRSxNQUFNLEVBQ2IsT0FBTyxFQUFFLE1BQU0sRUFDZixTQUFTLEVBQUUsTUFBTSxFQUNqQixHQUFHLEVBQUUsS0FBSyxpQkFJWCJ9

package/dest/cmds/misc/generate_bootnode_enr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate_bootnode_enr.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/generate_bootnode_enr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,kBAAkB,EAAE,MAAM,EAC1B,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,KAAK,iBAIX"}
+{"version":3,"file":"generate_bootnode_enr.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/generate_bootnode_enr.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,wBAAsB,0BAA0B,CAC9C,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,KAAK,iBAIX"}

package/dest/cmds/misc/generate_bootnode_enr.js

@@ -1,5 +1,5 @@
 import { createBootnodeENRandPeerId } from '@aztec/p2p/enr';
-export async function generateEncodedBootnodeENR(privateKey, udpAnnounceAddress, l1ChainId, log) {
-    const { enr } = await createBootnodeENRandPeerId(privateKey, udpAnnounceAddress, l1ChainId);
+export async function generateEncodedBootnodeENR(privateKey, p2pIp, p2pPort, l1ChainId, log) {
+    const { enr } = await createBootnodeENRandPeerId(privateKey, p2pIp, p2pPort, l1ChainId);
     log(`ENR: ${enr.encodeTxt()}`);
 }

package/dest/cmds/misc/generate_p2p_private_key.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn } from '@aztec/foundation/log';
 export declare function generateP2PPrivateKey(log: LogFn): Promise<void>;
-//# sourceMappingURL=generate_p2p_private_key.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVfcDJwX3ByaXZhdGVfa2V5LmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy9taXNjL2dlbmVyYXRlX3AycF9wcml2YXRlX2tleS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUluRCx3QkFBc0IscUJBQXFCLENBQUMsR0FBRyxFQUFFLEtBQUssaUJBS3JEIn0=

package/dest/cmds/misc/generate_secret_and_hash.d.ts

@@ -1,3 +1,3 @@
 import type { LogFn } from '@aztec/foundation/log';
-export declare function generateSecretAndHash(log: LogFn): void;
-//# sourceMappingURL=generate_secret_and_hash.d.ts.map
+export declare function generateSecretAndHash(log: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVfc2VjcmV0X2FuZF9oYXNoLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY21kcy9taXNjL2dlbmVyYXRlX3NlY3JldF9hbmRfaGFzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQUVuRCx3QkFBc0IscUJBQXFCLENBQUMsR0FBRyxFQUFFLEtBQUssaUJBVXJEIn0=

package/dest/cmds/misc/generate_secret_and_hash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate_secret_and_hash.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/generate_secret_and_hash.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,KAAK,QAU/C"}
+{"version":3,"file":"generate_secret_and_hash.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/generate_secret_and_hash.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,qBAAqB,CAAC,GAAG,EAAE,KAAK,iBAUrD"}

package/dest/cmds/misc/generate_secret_and_hash.js

@@ -1,9 +1,9 @@
-import { computeSecretHash } from '@aztec/aztec.js';
-import { Fr } from '@aztec/foundation/fields';
-export function generateSecretAndHash(log) {
+import { computeSecretHash } from '@aztec/aztec.js/crypto';
+import { Fr } from '@aztec/foundation/curves/bn254';
+export async function generateSecretAndHash(log) {
     const secret = Fr.random();
     // We hash this the same way that aztec nr hash does.
-    const secretHash = computeSecretHash(secret);
+    const secretHash = await computeSecretHash(secret);
     log(`
     Secret: ${secret}
     Secret hash: ${secretHash}

package/dest/cmds/misc/generate_secret_key.d.ts

@@ -1,5 +1,5 @@
-import { Fr } from '@aztec/aztec.js';
+import { Fr } from '@aztec/aztec.js/fields';
 export declare function generateSecretKey(): {
     secretKey: Fr;
 };
-//# sourceMappingURL=generate_secret_key.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdGVfc2VjcmV0X2tleS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NtZHMvbWlzYy9nZW5lcmF0ZV9zZWNyZXRfa2V5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUU1Qyx3QkFBZ0IsaUJBQWlCOztFQUVoQyJ9

package/dest/cmds/misc/generate_secret_key.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate_secret_key.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/generate_secret_key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAErC,wBAAgB,iBAAiB;;EAEhC"}
+{"version":3,"file":"generate_secret_key.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/generate_secret_key.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAE5C,wBAAgB,iBAAiB;;EAEhC"}

package/dest/cmds/misc/generate_secret_key.js

@@ -1,4 +1,4 @@
-import { Fr } from '@aztec/aztec.js';
+import { Fr } from '@aztec/aztec.js/fields';
 export function generateSecretKey() {
     return {
         secretKey: Fr.random()

package/dest/cmds/misc/get_canonical_sponsored_fpc_address.d.ts

@@ -0,0 +1,3 @@
+import type { LogFn } from '@aztec/foundation/log';
+export declare function getCanonicalSponsoredFPCAddress(log: LogFn): Promise<void>;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0X2Nhbm9uaWNhbF9zcG9uc29yZWRfZnBjX2FkZHJlc3MuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL21pc2MvZ2V0X2Nhbm9uaWNhbF9zcG9uc29yZWRfZnBjX2FkZHJlc3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFJbkQsd0JBQXNCLCtCQUErQixDQUFDLEdBQUcsRUFBRSxLQUFLLGlCQUUvRCJ9

package/dest/cmds/misc/get_canonical_sponsored_fpc_address.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get_canonical_sponsored_fpc_address.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/get_canonical_sponsored_fpc_address.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAInD,wBAAsB,+BAA+B,CAAC,GAAG,EAAE,KAAK,iBAE/D"}

package/dest/cmds/misc/get_canonical_sponsored_fpc_address.js

@@ -0,0 +1,4 @@
+import { getSponsoredFPCAddress } from '../../utils/setup_contracts.js';
+export async function getCanonicalSponsoredFPCAddress(log) {
+    log(`Canonical SponsoredFPC Address: ${(await getSponsoredFPCAddress()).toString()}`);
+}

package/dest/cmds/misc/index.d.ts

@@ -1,4 +1,4 @@
 import type { LogFn } from '@aztec/foundation/log';
 import type { Command } from 'commander';
 export declare function injectCommands(program: Command, log: LogFn): Command;
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbWRzL21pc2MvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFFbkQsT0FBTyxLQUFLLEVBQUUsT0FBTyxFQUFFLE1BQU0sV0FBVyxDQUFDO0FBSXpDLHdCQUFnQixjQUFjLENBQUMsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsS0FBSyxXQThGMUQifQ==

package/dest/cmds/misc/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,WAoF1D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/misc/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAIzC,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,WA8F1D"}

package/dest/cmds/misc/index.js

@@ -1,4 +1,3 @@
-import { printENR } from '@aztec/p2p/enr';
 import { l1ChainIdOption, prettyPrintJSON } from '../../utils/commands.js';
 export function injectCommands(program, log) {
     program.command('generate-keys').summary('Generates encryption and signing private keys.').description('Generates and encryption and signing private key pair.').option('--json', 'Output the keys in JSON format').action(async ({ json })=>{
@@ -16,11 +15,12 @@ export function injectCommands(program, log) {
         const { generateP2PPrivateKey } = await import('./generate_p2p_private_key.js');
         await generateP2PPrivateKey(log);
     });
-    program.command('generate-bootnode-enr').summary('Generates the encoded ENR record for a bootnode.').description('Generates the encoded ENR record for a bootnode.').argument('<privateKey>', 'The peer id private key of the bootnode').argument('<udpAnnounceAddress>', 'The bootnode UDP announce address').addOption(l1ChainIdOption).action(async (privateKey, udpAnnounceAddress, options)=>{
+    program.command('generate-bootnode-enr').summary('Generates the encoded ENR record for a bootnode.').description('Generates the encoded ENR record for a bootnode.').argument('<privateKey>', 'The peer id private key of the bootnode').argument('<p2pIp>', 'The bootnode P2P IP address').argument('<p2pPort>', 'The bootnode P2P port').addOption(l1ChainIdOption).action(async (privateKey, p2pIp, p2pPort, options)=>{
         const { generateEncodedBootnodeENR } = await import('./generate_bootnode_enr.js');
-        await generateEncodedBootnodeENR(privateKey, udpAnnounceAddress, options.l1ChainId, log);
+        await generateEncodedBootnodeENR(privateKey, p2pIp, p2pPort, options.l1ChainId, log);
     });
     program.command('decode-enr').summary('Decodes an ENR record').description('Decodes and ENR record').argument('<enr>', 'The encoded ENR string').action(async (enr)=>{
+        const { printENR } = await import('@aztec/p2p/enr');
         await printENR(enr, log);
     });
     program.command('example-contracts').description('Lists the example contracts available to deploy from @aztec/noir-contracts.js').action(async ()=>{
@@ -33,7 +33,11 @@ export function injectCommands(program, log) {
     });
     program.command('generate-secret-and-hash').description('Generates an arbitrary secret (Fr), and its hash (using aztec-nr defaults)').action(async ()=>{
         const { generateSecretAndHash } = await import('./generate_secret_and_hash.js');
-        generateSecretAndHash(log);
+        await generateSecretAndHash(log);
+    });
+    program.command('get-canonical-sponsored-fpc-address').description('Gets the canonical SponsoredFPC address for this any testnet running on the same version as this CLI').action(async ()=>{
+        const { getCanonicalSponsoredFPCAddress } = await import('./get_canonical_sponsored_fpc_address.js');
+        await getCanonicalSponsoredFPCAddress(log);
     });
     program.command('update').description('Updates Nodejs and Noir dependencies').argument('[projectPath]', 'Path to the project directory', process.cwd()).option('--contract [paths...]', 'Paths to contracts to update dependencies', []).option('--aztec-version <semver>', 'The version to update Aztec packages to. Defaults to latest', 'latest').action(async (projectPath, options)=>{
         const { updateProject } = await import('./update.js');

package/dest/cmds/misc/update/common.d.ts

@@ -14,4 +14,4 @@ export type DependencyChanges = {
         to: string;
     }>;
 };
-//# sourceMappingURL=common.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tbW9uLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY21kcy9taXNjL3VwZGF0ZS9jb21tb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7O0dBRUc7QUFDSCxNQUFNLE1BQU0saUJBQWlCLEdBQUc7SUFDOUIsNkJBQTZCO0lBQzdCLElBQUksRUFBRSxNQUFNLENBQUM7SUFDYiwrQkFBK0I7SUFDL0IsWUFBWSxFQUFFLEtBQUssQ0FBQztRQUNsQiwyQ0FBMkM7UUFDM0MsSUFBSSxFQUFFLE1BQU0sQ0FBQztRQUNiLHlDQUF5QztRQUN6QyxJQUFJLEVBQUUsTUFBTSxDQUFDO1FBQ2IsdURBQXVEO1FBQ3ZELEVBQUUsRUFBRSxNQUFNLENBQUM7S0FDWixDQUFDLENBQUM7Q0FDSixDQUFDIn0=

package/dest/cmds/misc/update/github.d.ts

@@ -1,4 +1,3 @@
 export declare const GITHUB_OWNER = "AztecProtocol";
 export declare const GITHUB_REPO = "aztec-packages";
-export declare const GITHUB_TAG_PREFIX = "aztec-packages";
-//# sourceMappingURL=github.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0aHViLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY21kcy9taXNjL3VwZGF0ZS9naXRodWIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZUFBTyxNQUFNLFlBQVksa0JBQWtCLENBQUM7QUFDNUMsZUFBTyxNQUFNLFdBQVcsbUJBQW1CLENBQUMifQ==

package/dest/cmds/misc/update/github.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../../../../src/cmds/misc/update/github.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,kBAAkB,CAAC;AAC5C,eAAO,MAAM,WAAW,mBAAmB,CAAC;AAC5C,eAAO,MAAM,iBAAiB,mBAAmB,CAAC"}
+{"version":3,"file":"github.d.ts","sourceRoot":"","sources":["../../../../src/cmds/misc/update/github.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,kBAAkB,CAAC;AAC5C,eAAO,MAAM,WAAW,mBAAmB,CAAC"}

package/dest/cmds/misc/update/github.js

@@ -1,3 +1,2 @@
 export const GITHUB_OWNER = 'AztecProtocol';
 export const GITHUB_REPO = 'aztec-packages';
-export const GITHUB_TAG_PREFIX = 'aztec-packages';

package/dest/cmds/misc/update/noir.d.ts

@@ -7,4 +7,4 @@ import type { DependencyChanges } from './common.js';
  * @param log - Logging function
  */
 export declare function updateAztecNr(contractPath: string, tag: string, log: LogFn): Promise<DependencyChanges>;
-//# sourceMappingURL=noir.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibm9pci5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL2NtZHMvbWlzYy91cGRhdGUvbm9pci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQztBQU9uRCxPQUFPLEtBQUssRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUdyRDs7Ozs7R0FLRztBQUNILHdCQUFzQixhQUFhLENBQUMsWUFBWSxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxLQUFLLEdBQUcsT0FBTyxDQUFDLGlCQUFpQixDQUFDLENBd0M3RyJ9

package/dest/cmds/misc/update/npm.d.ts

@@ -31,4 +31,4 @@ export declare function updateAztecDeps(projectPath: string, aztecVersion: SemVe
  * @param projectPath - Path to Nodejs project
  */
 export declare function updateLockfile(projectPath: string, log: LogFn): void;
-//# sourceMappingURL=npm.d.ts.map
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvY21kcy9taXNjL3VwZGF0ZS9ucG0udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsS0FBSyxFQUFFLE1BQU0sdUJBQXVCLENBQUM7QUFNbkQsT0FBTyxFQUFFLEtBQUssTUFBTSxFQUFTLE1BQU0sUUFBUSxDQUFDO0FBRTVDLE9BQU8sS0FBSyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sYUFBYSxDQUFDO0FBWXJEOzs7O0dBSUc7QUFDSCx3QkFBc0IsZUFBZSxDQUFDLFdBQVcsRUFBRSxNQUFNLEdBQUcsT0FBTyxDQUFDO0lBQ2xFLG1CQUFtQjtJQUNuQixZQUFZLENBQUMsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0lBQ3RDLHNCQUFzQjtJQUN0QixlQUFlLENBQUMsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0NBQzFDLENBQUMsQ0FLRDtBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQXNCLGdCQUFnQixDQUFDLFdBQVcsRUFBRSxNQUFNLEVBQUUsT0FBTyxTQUFXLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQWMvRjtBQUVEOzs7OztHQUtHO0FBQ0gsd0JBQXNCLGVBQWUsQ0FDbkMsV0FBVyxFQUFFLE1BQU0sRUFDbkIsWUFBWSxFQUFFLE1BQU0sRUFDcEIsR0FBRyxFQUFFLEtBQUssR0FDVCxPQUFPLENBQUMsaUJBQWlCLENBQUMsQ0F1RDVCO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQWdCLGNBQWMsQ0FBQyxXQUFXLEVBQUUsTUFBTSxFQUFFLEdBQUcsRUFBRSxLQUFLLEdBQUcsSUFBSSxDQXVCcEUifQ==

package/dest/cmds/misc/update/npm.js

@@ -6,7 +6,7 @@ import { parse } from 'semver';
 import { atomicUpdateFile } from './utils.js';
 const deprecatedNpmPackages = new Set([
     '@aztec/cli',
-    '@aztec/aztec-sandbox'
+    '@aztec/aztec-local-network'
 ]);
 const npmDeprecationMessage = `
 The following packages have been deprecated and will no longer be updated on the npm registry: