@aztec/cli 2.1.0-rc.12 → 2.1.0-rc.14

package/dest/cmds/infrastructure/sequencers.js

@@ -1,8 +1,8 @@
 import { Fr, createCompatibleClient } from '@aztec/aztec.js';
 import { GSEContract, RollupContract, createEthereumChain, getL1ContractsConfigEnvVars } from '@aztec/ethereum';
 import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
-import { createPublicClient, createWalletClient, fallback, getContract, http } from '@spalladino/viem';
-import { mnemonicToAccount } from '@spalladino/viem/accounts';
+import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
+import { mnemonicToAccount } from 'viem/accounts';
 export async function sequencers(opts) {
     const { command, who: maybeWho, mnemonic, bn254SecretKey, rpcUrl, l1RpcUrls, chainId, log, debugLogger } = opts;
     const client = await createCompatibleClient(rpcUrl, debugLogger);

package/dest/cmds/l1/create_l1_account.js

@@ -1,4 +1,4 @@
-import { generatePrivateKey, privateKeyToAccount } from '@spalladino/viem/accounts';
+import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 import { prettyPrintJSON } from '../../utils/commands.js';
 export function createL1Account(json, log) {
     const privateKey = generatePrivateKey();

package/dest/cmds/l1/get_l1_addresses.js

@@ -1,5 +1,5 @@
 import { RegistryContract, createEthereumChain } from '@aztec/ethereum';
-import { createPublicClient, fallback, http } from '@spalladino/viem';
+import { createPublicClient, fallback, http } from 'viem';
 export async function getL1Addresses(registryAddress, rollupVersion, rpcUrls, chainId, json, log) {
     const chain = createEthereumChain(rpcUrls, chainId);
     const publicClient = createPublicClient({

package/dest/cmds/l1/get_l1_balance.js

@@ -1,6 +1,6 @@
 import { createEthereumChain } from '@aztec/ethereum';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
-import { createPublicClient, fallback, getContract, http } from '@spalladino/viem';
+import { createPublicClient, fallback, getContract, http } from 'viem';
 import { prettyPrintJSON } from '../../utils/commands.js';
 export async function getL1Balance(who, token, l1RpcUrls, chainId, json, log) {
     const chain = createEthereumChain(l1RpcUrls, chainId);

package/dest/cmds/l1/prover_stats.js

@@ -5,9 +5,9 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { createLogger } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
-import { createPublicClient, fallback, getAbiItem, getAddress, http } from '@spalladino/viem';
 import chunk from 'lodash.chunk';
 import groupBy from 'lodash.groupby';
+import { createPublicClient, fallback, getAbiItem, getAddress, http } from 'viem';
 export async function proverStats(opts) {
     const debugLog = createLogger('cli:prover_stats');
     const { startBlock, chainId, l1RpcUrls, l1RollupAddress, batchSize, nodeUrl, provingTimeout, endBlock, rawLogs, log } = opts;

package/dest/cmds/l1/trigger_seed_snapshot.js

@@ -1,6 +1,6 @@
 import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
-import { getContract } from '@spalladino/viem';
+import { getContract } from 'viem';
 export async function triggerSeedSnapshot({ rpcUrls, chainId, privateKey, mnemonic, rollupAddress, log }) {
     const chain = createEthereumChain(rpcUrls, chainId);
     const client = createExtendedL1Client(rpcUrls, privateKey ?? mnemonic, chain.chainInfo);

package/dest/cmds/l1/update_l1_validators.js

@@ -2,8 +2,8 @@ import { GSEContract, RollupContract, createEthereumChain, createExtendedL1Clien
 import { EthCheatCodes } from '@aztec/ethereum/test';
 import { RollupAbi, StakingAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
-import { encodeFunctionData, formatEther, getContract } from '@spalladino/viem';
-import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from '@spalladino/viem/accounts';
+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();

package/dest/utils/aztec.js

@@ -27,7 +27,7 @@ import { encodeArgs } from './encoding.js';
  * @param mnemonic - The mnemonic to be used in contract deployment.
  */ export async function deployAztecContracts(rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, acceleratedTestDeployments, config, existingToken, realVerifier, createVerificationJson, debugLogger) {
     const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
-    const { mnemonicToAccount, privateKeyToAccount } = await import('@spalladino/viem/accounts');
+    const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
     const account = !privateKey ? mnemonicToAccount(mnemonic, {
         addressIndex: mnemonicIndex
     }) : privateKeyToAccount(addLeadingHex(privateKey));
@@ -49,7 +49,7 @@ import { encodeArgs } from './encoding.js';
 }
 export async function deployNewRollupContracts(registryAddress, rpcUrls, chainId, privateKey, mnemonic, mnemonicIndex, salt, initialValidators, genesisArchiveRoot, feeJuicePortalInitialBalance, config, realVerifier, logger) {
     const { createEthereumChain, deployRollupForUpgrade, createExtendedL1Client } = await import('@aztec/ethereum');
-    const { mnemonicToAccount, privateKeyToAccount } = await import('@spalladino/viem/accounts');
+    const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
     const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
     const account = !privateKey ? mnemonicToAccount(mnemonic, {
         addressIndex: mnemonicIndex

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/cli",
-  "version": "2.1.0-rc.12",
+  "version": "2.1.0-rc.14",
   "type": "module",
   "exports": {
     "./contracts": "./dest/cmds/contracts/index.js",
@@ -70,30 +70,30 @@
     ]
   },
   "dependencies": {
-    "@aztec/archiver": "2.1.0-rc.12",
-    "@aztec/aztec.js": "2.1.0-rc.12",
-    "@aztec/constants": "2.1.0-rc.12",
-    "@aztec/entrypoints": "2.1.0-rc.12",
-    "@aztec/ethereum": "2.1.0-rc.12",
-    "@aztec/foundation": "2.1.0-rc.12",
-    "@aztec/l1-artifacts": "2.1.0-rc.12",
-    "@aztec/node-lib": "2.1.0-rc.12",
-    "@aztec/p2p": "2.1.0-rc.12",
-    "@aztec/stdlib": "2.1.0-rc.12",
-    "@aztec/world-state": "2.1.0-rc.12",
+    "@aztec/archiver": "2.1.0-rc.14",
+    "@aztec/aztec.js": "2.1.0-rc.14",
+    "@aztec/constants": "2.1.0-rc.14",
+    "@aztec/entrypoints": "2.1.0-rc.14",
+    "@aztec/ethereum": "2.1.0-rc.14",
+    "@aztec/foundation": "2.1.0-rc.14",
+    "@aztec/l1-artifacts": "2.1.0-rc.14",
+    "@aztec/node-lib": "2.1.0-rc.14",
+    "@aztec/p2p": "2.1.0-rc.14",
+    "@aztec/stdlib": "2.1.0-rc.14",
+    "@aztec/world-state": "2.1.0-rc.14",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
-    "@spalladino/viem": "2.38.2-eip7594.0",
     "commander": "^12.1.0",
     "lodash.chunk": "^4.2.0",
     "lodash.groupby": "^4.6.0",
     "semver": "^7.5.4",
     "source-map-support": "^0.5.21",
-    "tslib": "^2.4.0"
+    "tslib": "^2.4.0",
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "devDependencies": {
-    "@aztec/accounts": "2.1.0-rc.12",
-    "@aztec/protocol-contracts": "2.1.0-rc.12",
+    "@aztec/accounts": "2.1.0-rc.14",
+    "@aztec/protocol-contracts": "2.1.0-rc.14",
     "@jest/globals": "^30.0.0",
     "@types/jest": "^30.0.0",
     "@types/lodash.chunk": "^4.2.9",
@@ -109,15 +109,15 @@
     "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "@aztec/accounts": "2.1.0-rc.12",
-    "@aztec/bb-prover": "2.1.0-rc.12",
-    "@aztec/ethereum": "2.1.0-rc.12",
-    "@aztec/l1-artifacts": "2.1.0-rc.12",
-    "@aztec/noir-contracts.js": "2.1.0-rc.12",
-    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.12",
-    "@aztec/noir-test-contracts.js": "2.1.0-rc.12",
-    "@aztec/protocol-contracts": "2.1.0-rc.12",
-    "@aztec/stdlib": "2.1.0-rc.12"
+    "@aztec/accounts": "2.1.0-rc.14",
+    "@aztec/bb-prover": "2.1.0-rc.14",
+    "@aztec/ethereum": "2.1.0-rc.14",
+    "@aztec/l1-artifacts": "2.1.0-rc.14",
+    "@aztec/noir-contracts.js": "2.1.0-rc.14",
+    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.14",
+    "@aztec/noir-test-contracts.js": "2.1.0-rc.14",
+    "@aztec/protocol-contracts": "2.1.0-rc.14",
+    "@aztec/stdlib": "2.1.0-rc.14"
   },
   "files": [
     "dest",

package/src/cmds/infrastructure/sequencers.ts

@@ -3,8 +3,8 @@ import { GSEContract, RollupContract, createEthereumChain, getL1ContractsConfigE
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 
-import { createPublicClient, createWalletClient, fallback, getContract, http } from '@spalladino/viem';
-import { mnemonicToAccount } from '@spalladino/viem/accounts';
+import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
+import { mnemonicToAccount } from 'viem/accounts';
 
 export async function sequencers(opts: {
   command: 'list' | 'add' | 'remove' | 'who-next' | 'flush';

package/src/cmds/l1/create_l1_account.ts

@@ -1,6 +1,6 @@
 import type { LogFn } from '@aztec/foundation/log';
 
-import { generatePrivateKey, privateKeyToAccount } from '@spalladino/viem/accounts';
+import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
 
 import { prettyPrintJSON } from '../../utils/commands.js';
 

package/src/cmds/l1/get_l1_addresses.ts

@@ -2,7 +2,7 @@ import { EthAddress } from '@aztec/aztec.js';
 import { RegistryContract, type ViemPublicClient, createEthereumChain } from '@aztec/ethereum';
 import type { LogFn } from '@aztec/foundation/log';
 
-import { createPublicClient, fallback, http } from '@spalladino/viem';
+import { createPublicClient, fallback, http } from 'viem';
 
 export async function getL1Addresses(
   registryAddress: EthAddress,

package/src/cmds/l1/get_l1_balance.ts

@@ -3,7 +3,7 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn } from '@aztec/foundation/log';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
 
-import { createPublicClient, fallback, getContract, http } from '@spalladino/viem';
+import { createPublicClient, fallback, getContract, http } from 'viem';
 
 import { prettyPrintJSON } from '../../utils/commands.js';
 

package/src/cmds/l1/prover_stats.ts

@@ -6,9 +6,9 @@ import { type LogFn, type Logger, createLogger } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 
-import { createPublicClient, fallback, getAbiItem, getAddress, http } from '@spalladino/viem';
 import chunk from 'lodash.chunk';
 import groupBy from 'lodash.groupby';
+import { createPublicClient, fallback, getAbiItem, getAddress, http } from 'viem';
 
 export async function proverStats(opts: {
   l1RpcUrls: string[];

package/src/cmds/l1/trigger_seed_snapshot.ts

@@ -2,7 +2,7 @@ import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import type { LogFn } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
 
-import { getContract } from '@spalladino/viem';
+import { getContract } from 'viem';
 
 import type { RollupCommandArgs } from './update_l1_validators.js';
 

package/src/cmds/l1/update_l1_validators.ts

@@ -14,8 +14,8 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
 import { RollupAbi, StakingAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
 
-import { encodeFunctionData, formatEther, getContract } from '@spalladino/viem';
-import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from '@spalladino/viem/accounts';
+import { encodeFunctionData, formatEther, getContract } from 'viem';
+import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
 
 import { addLeadingHex } from '../../utils/aztec.js';
 

package/src/utils/aztec.ts

@@ -63,7 +63,7 @@ export async function deployAztecContracts(
   debugLogger: Logger,
 ): Promise<DeployL1ContractsReturnType> {
   const { createEthereumChain, deployL1Contracts } = await import('@aztec/ethereum');
-  const { mnemonicToAccount, privateKeyToAccount } = await import('@spalladino/viem/accounts');
+  const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
 
   const account = !privateKey
     ? mnemonicToAccount(mnemonic!, { addressIndex: mnemonicIndex })
@@ -112,7 +112,7 @@ export async function deployNewRollupContracts(
   logger: Logger,
 ): Promise<{ rollup: RollupContract; slashFactoryAddress: EthAddress }> {
   const { createEthereumChain, deployRollupForUpgrade, createExtendedL1Client } = await import('@aztec/ethereum');
-  const { mnemonicToAccount, privateKeyToAccount } = await import('@spalladino/viem/accounts');
+  const { mnemonicToAccount, privateKeyToAccount } = await import('viem/accounts');
   const { getVKTreeRoot } = await import('@aztec/noir-protocol-circuits-types/vk-tree');
 
   const account = !privateKey