@aztec/cli 1.0.0-staging.0 → 1.0.0-staging.2

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

@@ -1,5 +1,5 @@
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { type Command } from 'commander';
-export { addL1ValidatorToQueue, dripQueue } from './update_l1_validators.js';
+export { addL1Validator } from './update_l1_validators.js';
 export declare function injectCommands(program: Command, log: LogFn, debugLogger: Logger): Command;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAajD,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAW7E,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAiiB/E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,EAAE,KAAK,OAAO,EAAU,MAAM,WAAW,CAAC;AAajD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAW3D,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,WAuiB/E"}

package/dest/cmds/l1/index.js

@@ -2,7 +2,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { withoutHexPrefix } from '@aztec/foundation/string';
 import { Option } from 'commander';
 import { ETHEREUM_HOSTS, MNEMONIC, PRIVATE_KEY, l1ChainIdOption, parseAztecAddress, parseBigint, parseEthereumAddress, pxeOption } from '../../utils/commands.js';
-export { addL1ValidatorToQueue, dripQueue } from './update_l1_validators.js';
+export { addL1Validator } from './update_l1_validators.js';
 const l1RpcUrlsOption = new Option('--l1-rpc-urls <string>', 'List of Ethereum host URLs. Chain identifiers localhost and testnet can be used (comma separated)').env('ETHEREUM_HOSTS').default([
     ETHEREUM_HOSTS
 ]).makeOptionMandatory(true).argParser((arg)=>arg.split(',').map((url)=>url.trim()));
@@ -95,15 +95,16 @@ export function injectCommands(program, log, debugLogger) {
         const account = generateL1Account();
         log(JSON.stringify(account, null, 2));
     });
-    program.command('add-l1-validator-to-queue').description('Adds a validator to the L1 rollup contract.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use sending the transaction', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use sending the transaction', 'test test test test test test test test test test test junk').addOption(l1ChainIdOption).option('--attester <address>', 'ethereum address of the attester', parseEthereumAddress).option('--staking-asset-handler <address>', 'ethereum address of the staking asset handler', parseEthereumAddress).option('--proof <buffer>', 'The proof to use for the attestation', (arg)=>Buffer.from(withoutHexPrefix(arg), 'hex')).action(async (options)=>{
-        const { addL1ValidatorToQueue } = await import('./update_l1_validators.js');
-        await addL1ValidatorToQueue({
+    program.command('add-l1-validator').description('Adds a validator to the L1 rollup contract.').addOption(l1RpcUrlsOption).option('-pk, --private-key <string>', 'The private key to use sending the transaction', PRIVATE_KEY).option('-m, --mnemonic <string>', 'The mnemonic to use sending the transaction', 'test test test test test test test test test test test junk').addOption(l1ChainIdOption).option('--attester <address>', 'ethereum address of the attester', parseEthereumAddress).option('--staking-asset-handler <address>', 'ethereum address of the staking asset handler', parseEthereumAddress).option('--proof <buffer>', 'The proof to use for the attestation', (arg)=>Buffer.from(withoutHexPrefix(arg), 'hex')).option('--merkle-proof <string>', 'The merkle proof to use for the attestation (comma separated list of 32 byte buffers)', (arg)=>arg.split(',')).action(async (options)=>{
+        const { addL1Validator } = await import('./update_l1_validators.js');
+        await addL1Validator({
             rpcUrls: options.l1RpcUrls,
             chainId: options.l1ChainId,
             privateKey: options.privateKey,
             mnemonic: options.mnemonic,
             attesterAddress: options.attester,
             stakingAssetHandlerAddress: options.stakingAssetHandler,
+            merkleProof: options.merkleProof,
             proofParams: options.proof,
             log,
             debugLogger

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

@@ -23,11 +23,11 @@ export declare function generateL1Account(): {
     privateKey: `0x${string}`;
     address: `0x${string}`;
 };
-export declare function addL1ValidatorToQueue({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, proofParams, log, debugLogger, }: StakingAssetHandlerCommandArgs & LoggerArgs & {
+export declare function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, log, debugLogger, }: StakingAssetHandlerCommandArgs & LoggerArgs & {
     attesterAddress: EthAddress;
     proofParams: Buffer;
+    merkleProof: string[];
 }): Promise<void>;
-export declare function dripQueue({ rpcUrls, chainId, privateKey, mnemonic, stakingAssetHandlerAddress, log, debugLogger, }: StakingAssetHandlerCommandArgs & LoggerArgs): Promise<void>;
 export declare function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger, }: RollupCommandArgs & LoggerArgs & {
     validatorAddress: EthAddress;
 }): Promise<void>;

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":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAO3D,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,qBAAqB,CAAC,EAC1C,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,eAAe,EACf,0BAA0B,EAC1B,WAAW,EACX,GAAG,EACH,WAAW,GACZ,EAAE,8BAA8B,GAAG,UAAU,GAAG;IAAE,eAAe,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,iBAwCpG;AAED,wBAAsB,SAAS,CAAC,EAC9B,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,0BAA0B,EAC1B,GAAG,EACH,WAAW,GACZ,EAAE,8BAA8B,GAAG,UAAU,iBA0B7C;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,iBAiBnE;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,iBAgBhC;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,iBAwBzG"}
+{"version":3,"file":"update_l1_validators.d.ts","sourceRoot":"","sources":["../../../src/cmds/l1/update_l1_validators.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAS3D,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,GAAG,EACH,WAAW,GACZ,EAAE,8BAA8B,GAC/B,UAAU,GAAG;IAAE,eAAe,EAAE,UAAU,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,EAAE,CAAA;CAAE,iBAyCzF;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,iBAiBnE;AAED,wBAAsB,WAAW,CAAC,EAChC,OAAO,EACP,OAAO,EACP,UAAU,EACV,QAAQ,EACR,aAAa,EACb,GAAG,EACH,WAAW,GACZ,EAAE,iBAAiB,GAAG,UAAU,iBAgBhC;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,iBAwBzG"}

package/dest/cmds/l1/update_l1_validators.js

@@ -3,6 +3,7 @@ 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);
@@ -12,7 +13,7 @@ export function generateL1Account() {
         address: account.address
     };
 }
-export async function addL1ValidatorToQueue({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, proofParams, log, debugLogger }) {
+export async function addL1Validator({ rpcUrls, chainId, privateKey, mnemonic, attesterAddress, stakingAssetHandlerAddress, merkleProof, proofParams, log, debugLogger }) {
     const dualLog = makeDualLog(log, debugLogger);
     const account = getAccount(privateKey, mnemonic);
     const chain = createEthereumChain(rpcUrls, chainId);
@@ -26,13 +27,15 @@ export async function addL1ValidatorToQueue({ rpcUrls, chainId, privateKey, mnem
     dualLog(`Adding validator ${attesterAddress} to rollup ${rollup.toString()}`);
     const l1TxUtils = new L1TxUtils(l1Client, 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: 'addValidatorToQueue',
+            functionName: 'addValidator',
             args: [
                 attesterAddress.toString(),
+                merkleProofArray,
                 proofParamsObj.toViem()
             ]
         }),
@@ -56,29 +59,6 @@ export async function addL1ValidatorToQueue({ rpcUrls, chainId, privateKey, mnem
         }
     }
 }
-export async function dripQueue({ rpcUrls, chainId, privateKey, mnemonic, stakingAssetHandlerAddress, log, debugLogger }) {
-    const dualLog = makeDualLog(log, debugLogger);
-    const account = getAccount(privateKey, mnemonic);
-    const chain = createEthereumChain(rpcUrls, chainId);
-    const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
-    dualLog('Dripping Queue');
-    const l1TxUtils = new L1TxUtils(l1Client, debugLogger);
-    const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
-        to: stakingAssetHandlerAddress.toString(),
-        data: encodeFunctionData({
-            abi: StakingAssetHandlerAbi,
-            functionName: 'dripQueue',
-            args: []
-        }),
-        abi: StakingAssetHandlerAbi
-    });
-    dualLog(`Receipt: ${receipt.transactionHash}`);
-    if (receipt.status === 'success') {
-        dualLog('Queue dripped successfully');
-    } else {
-        dualLog('Queue drip failed');
-    }
-}
 export async function removeL1Validator({ rpcUrls, chainId, privateKey, mnemonic, validatorAddress, rollupAddress, log, debugLogger }) {
     const dualLog = makeDualLog(log, debugLogger);
     const account = getAccount(privateKey, mnemonic);

package/dest/utils/aztec.d.ts

@@ -54,10 +54,11 @@ export declare function prepTx(contractFile: string, functionName: string, _func
  */
 export declare const stripLeadingHex: (hex: string) => string;
 /**
- * Pretty prints Nargo.toml contents to a string
- * @param config - Nargo.toml contents
- * @returns The Nargo.toml contents as a string
+ * Adds a leading 0x to a hex string. If a leading 0x is already present the string is returned unchanged.
+ * @param hex - A hex string
+ * @returns A new string with leading 0x added
  */
+export declare const addLeadingHex: (hex: string) => `0x${string}`;
 export declare function prettyPrintNargoToml(config: NoirPackageConfig): string;
 /**
  * Checks that Private eXecution Environment (PXE) version matches the expected one by this CLI. Throws if not.

package/dest/utils/aztec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,cAAc,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAShE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CA6BtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CAoCtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,WAK1C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE;AAKD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,iBAyB9E"}
+{"version":3,"file":"aztec.d.ts","sourceRoot":"","sources":["../../src/utils/aztec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,WAAW,EAIjB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACb,cAAc,EACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAShE;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,CAMtF;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,0BAA0B,EAAE,OAAO,EACnC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC,CA6BtC;AAED,wBAAsB,wBAAwB,CAC5C,eAAe,EAAE,UAAU,EAC3B,OAAO,EAAE,MAAM,EAAE,EACjB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,iBAAiB,EAAE,QAAQ,EAAE,EAC7B,kBAAkB,EAAE,EAAE,EACtB,4BAA4B,EAAE,MAAM,EACpC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,OAAO,EACrB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,cAAc,CAAC;IAAC,mBAAmB,EAAE,UAAU,CAAA;CAAE,CAAC,CAoCtE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAKjE;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,6BA4BpE;AAED;;;;;;;GAOG;AACH,wBAAsB,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,KAAK;;;;GAO3G;AAED;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,KAAK,MAAM,KAAG,MAK7C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,KAAG,KAAK,MAAM,EAKtD,CAAC;AAOF,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM,CAUtE;AAKD;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,oBAAoB,EAAE,MAAM,iBAyB9E"}

package/dest/utils/aztec.js

@@ -28,7 +28,7 @@ import { encodeArgs } from './encoding.js';
     const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
     const account = !privateKey ? mnemonicToAccount(mnemonic, {
         addressIndex: mnemonicIndex
-    }) : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}`);
+    }) : privateKeyToAccount(addLeadingHex(privateKey));
     const chain = createEthereumChain(rpcUrls, chainId);
     const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
     return await deployL1Contracts(chain.rpcUrls, account, chain.chainInfo, debugLogger, {
@@ -49,7 +49,7 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId
     const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
     const account = !privateKey ? mnemonicToAccount(mnemonic, {
         addressIndex: mnemonicIndex
-    }) : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}`);
+    }) : privateKeyToAccount(addLeadingHex(privateKey));
     const chain = createEthereumChain(rpcUrls, chainId);
     const client = createExtendedL1Client(rpcUrls, account, chain.chainInfo, undefined, mnemonicIndex);
     if (!initialValidators || initialValidators.length === 0) {
@@ -149,6 +149,16 @@ export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId
     return hex;
 };
 /**
+ * Adds a leading 0x to a hex string. If a leading 0x is already present the string is returned unchanged.
+ * @param hex - A hex string
+ * @returns A new string with leading 0x added
+ */ export const addLeadingHex = (hex)=>{
+    if (hex.length > 2 && hex.startsWith('0x')) {
+        return hex;
+    }
+    return `0x${hex}`;
+};
+/*
  * Pretty prints Nargo.toml contents to a string
  * @param config - Nargo.toml contents
  * @returns The Nargo.toml contents as a string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "1.0.0-staging.0",
+  "version": "1.0.0-staging.2",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -69,15 +69,15 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "1.0.0-staging.0",
-    "@aztec/aztec.js": "1.0.0-staging.0",
-    "@aztec/constants": "1.0.0-staging.0",
-    "@aztec/entrypoints": "1.0.0-staging.0",
-    "@aztec/foundation": "1.0.0-staging.0",
-    "@aztec/l1-artifacts": "1.0.0-staging.0",
-    "@aztec/p2p": "1.0.0-staging.0",
-    "@aztec/stdlib": "1.0.0-staging.0",
-    "@aztec/world-state": "1.0.0-staging.0",
+    "@aztec/archiver": "1.0.0-staging.2",
+    "@aztec/aztec.js": "1.0.0-staging.2",
+    "@aztec/constants": "1.0.0-staging.2",
+    "@aztec/entrypoints": "1.0.0-staging.2",
+    "@aztec/foundation": "1.0.0-staging.2",
+    "@aztec/l1-artifacts": "1.0.0-staging.2",
+    "@aztec/p2p": "1.0.0-staging.2",
+    "@aztec/stdlib": "1.0.0-staging.2",
+    "@aztec/world-state": "1.0.0-staging.2",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
     "commander": "^12.1.0",
@@ -89,9 +89,9 @@
     "viem": "2.23.7"
   },
   "devDependencies": {
-    "@aztec/accounts": "1.0.0-staging.0",
-    "@aztec/ethereum": "1.0.0-staging.0",
-    "@aztec/protocol-contracts": "1.0.0-staging.0",
+    "@aztec/accounts": "1.0.0-staging.2",
+    "@aztec/ethereum": "1.0.0-staging.2",
+    "@aztec/protocol-contracts": "1.0.0-staging.2",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -107,15 +107,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "1.0.0-staging.0",
-    "@aztec/bb-prover": "1.0.0-staging.0",
-    "@aztec/ethereum": "1.0.0-staging.0",
-    "@aztec/l1-artifacts": "1.0.0-staging.0",
-    "@aztec/noir-contracts.js": "1.0.0-staging.0",
-    "@aztec/noir-protocol-circuits-types": "1.0.0-staging.0",
-    "@aztec/noir-test-contracts.js": "1.0.0-staging.0",
-    "@aztec/protocol-contracts": "1.0.0-staging.0",
-    "@aztec/stdlib": "1.0.0-staging.0"
+    "@aztec/accounts": "1.0.0-staging.2",
+    "@aztec/bb-prover": "1.0.0-staging.2",
+    "@aztec/ethereum": "1.0.0-staging.2",
+    "@aztec/l1-artifacts": "1.0.0-staging.2",
+    "@aztec/noir-contracts.js": "1.0.0-staging.2",
+    "@aztec/noir-protocol-circuits-types": "1.0.0-staging.2",
+    "@aztec/noir-test-contracts.js": "1.0.0-staging.2",
+    "@aztec/protocol-contracts": "1.0.0-staging.2",
+    "@aztec/stdlib": "1.0.0-staging.2"
   },
   "files": [
     "dest",

package/src/cmds/l1/index.ts

@@ -15,7 +15,7 @@ import {
   pxeOption,
 } from '../../utils/commands.js';
 
-export { addL1ValidatorToQueue, dripQueue } from './update_l1_validators.js';
+export { addL1Validator } from './update_l1_validators.js';
 
 const l1RpcUrlsOption = new Option(
   '--l1-rpc-urls <string>',
@@ -282,7 +282,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     });
 
   program
-    .command('add-l1-validator-to-queue')
+    .command('add-l1-validator')
     .description('Adds a validator to the L1 rollup contract.')
     .addOption(l1RpcUrlsOption)
     .option('-pk, --private-key <string>', 'The private key to use sending the transaction', PRIVATE_KEY)
@@ -297,15 +297,21 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: Logger
     .option('--proof <buffer>', 'The proof to use for the attestation', arg =>
       Buffer.from(withoutHexPrefix(arg), 'hex'),
     )
+    .option(
+      '--merkle-proof <string>',
+      'The merkle proof to use for the attestation (comma separated list of 32 byte buffers)',
+      arg => arg.split(','),
+    )
     .action(async options => {
-      const { addL1ValidatorToQueue } = await import('./update_l1_validators.js');
-      await addL1ValidatorToQueue({
+      const { addL1Validator } = await import('./update_l1_validators.js');
+      await addL1Validator({
         rpcUrls: options.l1RpcUrls,
         chainId: options.l1ChainId,
         privateKey: options.privateKey,
         mnemonic: options.mnemonic,
         attesterAddress: options.attester,
         stakingAssetHandlerAddress: options.stakingAssetHandler,
+        merkleProof: options.merkleProof,
         proofParams: options.proof,
         log,
         debugLogger,

package/src/cmds/l1/update_l1_validators.ts

@@ -16,6 +16,8 @@ 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 interface RollupCommandArgs {
   rpcUrls: string[];
   chainId: number;
@@ -48,17 +50,19 @@ export function generateL1Account() {
   };
 }
 
-export async function addL1ValidatorToQueue({
+export async function addL1Validator({
   rpcUrls,
   chainId,
   privateKey,
   mnemonic,
   attesterAddress,
   stakingAssetHandlerAddress,
+  merkleProof,
   proofParams,
   log,
   debugLogger,
-}: StakingAssetHandlerCommandArgs & LoggerArgs & { attesterAddress: EthAddress; proofParams: Buffer }) {
+}: StakingAssetHandlerCommandArgs &
+  LoggerArgs & { attesterAddress: EthAddress; proofParams: Buffer; merkleProof: string[] }) {
   const dualLog = makeDualLog(log, debugLogger);
   const account = getAccount(privateKey, mnemonic);
   const chain = createEthereumChain(rpcUrls, chainId);
@@ -75,13 +79,14 @@ export async function addL1ValidatorToQueue({
 
   const l1TxUtils = new L1TxUtils(l1Client, 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: 'addValidatorToQueue',
-      args: [attesterAddress.toString(), proofParamsObj.toViem()],
+      functionName: 'addValidator',
+      args: [attesterAddress.toString(), merkleProofArray, proofParamsObj.toViem()],
     }),
     abi: StakingAssetHandlerAbi,
   });
@@ -100,42 +105,6 @@ export async function addL1ValidatorToQueue({
   }
 }
 
-export async function dripQueue({
-  rpcUrls,
-  chainId,
-  privateKey,
-  mnemonic,
-  stakingAssetHandlerAddress,
-  log,
-  debugLogger,
-}: StakingAssetHandlerCommandArgs & LoggerArgs) {
-  const dualLog = makeDualLog(log, debugLogger);
-  const account = getAccount(privateKey, mnemonic);
-  const chain = createEthereumChain(rpcUrls, chainId);
-  const l1Client = createExtendedL1Client(rpcUrls, account, chain.chainInfo);
-
-  dualLog('Dripping Queue');
-
-  const l1TxUtils = new L1TxUtils(l1Client, debugLogger);
-
-  const { receipt } = await l1TxUtils.sendAndMonitorTransaction({
-    to: stakingAssetHandlerAddress.toString(),
-    data: encodeFunctionData({
-      abi: StakingAssetHandlerAbi,
-      functionName: 'dripQueue',
-      args: [],
-    }),
-    abi: StakingAssetHandlerAbi,
-  });
-  dualLog(`Receipt: ${receipt.transactionHash}`);
-
-  if (receipt.status === 'success') {
-    dualLog('Queue dripped successfully');
-  } else {
-    dualLog('Queue drip failed');
-  }
-}
-
 export async function removeL1Validator({
   rpcUrls,
   chainId,

package/src/utils/aztec.ts

@@ -64,7 +64,7 @@ export async function deployAztecContracts(
 
   const account = !privateKey
     ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
-    : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}` as `0x${string}`);
+    : privateKeyToAccount(addLeadingHex(privateKey));
   const chain = createEthereumChain(rpcUrls, chainId);
 
   const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
@@ -110,7 +110,7 @@ export async function deployNewRollupContracts(
 
   const account = !privateKey
     ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
-    : privateKeyToAccount(`${privateKey.startsWith('0x') ? '' : '0x'}${privateKey}` as `0x${string}`);
+    : privateKeyToAccount(addLeadingHex(privateKey));
   const chain = createEthereumChain(rpcUrls, chainId);
   const client = createExtendedL1Client(rpcUrls, account, chain.chainInfo, undefined, mnemonicIndex);
 
@@ -209,7 +209,7 @@ export async function prepTx(contractFile: string, functionName: string, _functi
  * @param hex - A hex string
  * @returns A new string with leading 0x removed
  */
-export const stripLeadingHex = (hex: string) => {
+export const stripLeadingHex = (hex: string): string => {
   if (hex.length > 2 && hex.startsWith('0x')) {
     return hex.substring(2);
   }
@@ -217,6 +217,18 @@ export const stripLeadingHex = (hex: string) => {
 };
 
 /**
+ * Adds a leading 0x to a hex string. If a leading 0x is already present the string is returned unchanged.
+ * @param hex - A hex string
+ * @returns A new string with leading 0x added
+ */
+export const addLeadingHex = (hex: string): `0x${string}` => {
+  if (hex.length > 2 && hex.startsWith('0x')) {
+    return hex as `0x${string}`;
+  }
+  return `0x${hex}`;
+};
+
+/*
  * Pretty prints Nargo.toml contents to a string
  * @param config - Nargo.toml contents
  * @returns The Nargo.toml contents as a string