@aztec/aztec 2.0.3 → 2.1.0-rc.10

package/dest/bin/index.js

@@ -2,9 +2,8 @@
 //
 import { injectCommands as injectBuilderCommands } from '@aztec/builder';
 import { injectCommands as injectWalletCommands } from '@aztec/cli-wallet';
-import { enrichEnvironmentWithChainConfig } from '@aztec/cli/config';
+import { enrichEnvironmentWithChainConfig, enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config';
 import { injectCommands as injectContractCommands } from '@aztec/cli/contracts';
-import { injectCommands as injectDevnetCommands } from '@aztec/cli/devnet';
 import { injectCommands as injectInfrastructureCommands } from '@aztec/cli/infrastructure';
 import { injectCommands as injectL1Commands } from '@aztec/cli/l1';
 import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
@@ -30,7 +29,9 @@ const debugLogger = createLogger('cli');
     if (networkIndex !== -1) {
         networkValue = args[networkIndex].split('=')[1] || args[networkIndex + 1];
     }
-    await enrichEnvironmentWithChainConfig(getActiveNetworkName(networkValue));
+    const networkName = getActiveNetworkName(networkValue);
+    await enrichEnvironmentWithChainConfig(networkName);
+    await enrichEnvironmentWithNetworkConfig(networkName);
     const cliVersion = getCliVersion();
     let program = new Command('aztec');
     program.description('Aztec command line interface').version(cliVersion);
@@ -41,7 +42,6 @@ const debugLogger = createLogger('cli');
     program = injectL1Commands(program, userLog, debugLogger);
     program = injectPXECommands(program, userLog, debugLogger);
     program = injectMiscCommands(program, userLog);
-    program = injectDevnetCommands(program, userLog, debugLogger);
     program = injectWalletCommands(program, userLog, debugLogger);
     await program.parseAsync(process.argv);
 }

package/dest/cli/aztec_start_options.js

@@ -76,7 +76,7 @@ export const aztecStartOptions = {
         configToFlag('--auto-update', sharedNodeConfigMappings.autoUpdate),
         configToFlag('--auto-update-url', sharedNodeConfigMappings.autoUpdateUrl),
         configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
-        configToFlag('--snapshots-url', sharedNodeConfigMappings.snapshotsUrl)
+        configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls)
     ],
     SANDBOX: [
         {
@@ -140,7 +140,7 @@ export const aztecStartOptions = {
     ],
     'L1 CONTRACTS': [
         configToFlag('--registry-address', l1ContractAddressesMapping.registryAddress),
-        configToFlag('--rollup-version', chainConfigMappings.rollupVersion, 'canonical')
+        configToFlag('--rollup-version', chainConfigMappings.rollupVersion)
     ],
     STORAGE: [
         configToFlag('--data-directory', dataConfigMappings.dataDirectory),

package/dest/cli/cmds/start_prover_agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_prover_agent.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_agent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAgBnD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBA2Df"}
+{"version":3,"file":"start_prover_agent.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_agent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAgBnD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,iBAgEf"}

package/dest/cli/cmds/start_prover_agent.js

@@ -25,9 +25,18 @@ export async function startProverAgent(options, signalHandlers, services, userLo
         process.exit(1);
     }
     await preloadCrsDataForServerSideProving(config, userLog);
-    const fetch = makeTracedFetch([
+    const fetch = makeTracedFetch(// retry connections every 3s, up to 30s before giving up
+    [
         1,
         2,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
+        3,
         3
     ], false, makeUndiciFetch(new Agent({
         connections: 10

package/dest/cli/cmds/start_prover_broker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_prover_broker.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_broker.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAKxE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC,CA+BnE"}
+{"version":3,"file":"start_prover_broker.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_broker.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EACL,KAAK,kBAAkB,EAIxB,MAAM,6BAA6B,CAAC;AAErC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAKxE,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAC;IAAC,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC,CA4CnE"}

package/dest/cli/cmds/start_prover_broker.js

@@ -1,8 +1,9 @@
 import { getL1Config } from '@aztec/cli/config';
+import { getPublicClient } from '@aztec/ethereum';
 import { ProvingJobBrokerSchema, createAndStartProvingBroker, proverBrokerConfigMappings } from '@aztec/prover-client/broker';
 import { getProverNodeBrokerConfigFromEnv } from '@aztec/prover-node';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
-import { extractRelevantOptions } from '../util.js';
+import { extractRelevantOptions, setupUpdateMonitor } from '../util.js';
 export async function startProverBroker(options, signalHandlers, services, userLog) {
     if (options.node || options.sequencer || options.pxe || options.p2pBootstrap || options.txe) {
         userLog(`Starting a prover broker with --node, --sequencer, --pxe, --p2p-bootstrap, or --txe is not supported.`);
@@ -15,11 +16,15 @@ export async function startProverBroker(options, signalHandlers, services, userL
     if (!config.l1Contracts.registryAddress || config.l1Contracts.registryAddress.isZero()) {
         throw new Error('L1 registry address is required to start Aztec Node without --deploy-aztec-contracts option');
     }
+    const followsCanonicalRollup = typeof config.rollupVersion !== 'number';
     const { addresses, config: rollupConfig } = await getL1Config(config.l1Contracts.registryAddress, config.l1RpcUrls, config.l1ChainId, config.rollupVersion);
     config.l1Contracts = addresses;
     config.rollupVersion = rollupConfig.rollupVersion;
     const client = initTelemetryClient(getTelemetryClientConfig());
     const broker = await createAndStartProvingBroker(config, client);
+    if (options.autoUpdate !== 'disabled' && options.autoUpdateUrl) {
+        await setupUpdateMonitor(options.autoUpdate, new URL(options.autoUpdateUrl), followsCanonicalRollup, getPublicClient(config), config.l1Contracts.registryAddress, signalHandlers);
+    }
     services.proverBroker = [
         broker,
         ProvingJobBrokerSchema

package/dest/cli/cmds/start_prover_node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"start_prover_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_node.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EACL,KAAK,gBAAgB,EAItB,MAAM,oBAAoB,CAAC;AAS5B,wBAAsB,eAAe,CACnC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAA;CAAE,CAAC,CA0FvC"}
+{"version":3,"file":"start_prover_node.d.ts","sourceRoot":"","sources":["../../../src/cli/cmds/start_prover_node.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE/E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EACL,KAAK,gBAAgB,EAItB,MAAM,oBAAoB,CAAC;AAS5B,wBAAsB,eAAe,CACnC,OAAO,EAAE,GAAG,EACZ,cAAc,EAAE,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,EACvC,QAAQ,EAAE,qBAAqB,EAC/B,OAAO,EAAE,KAAK,GACb,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAA;CAAE,CAAC,CA+FvC"}

package/dest/cli/cmds/start_prover_node.js

@@ -48,9 +48,18 @@ export async function startProverNode(options, signalHandlers, services, userLog
     if (proverConfig.proverBrokerUrl) {
         // at 1TPS we'd enqueue ~1k tube proofs and ~1k AVM proofs immediately
         // set a lower connection limit such that we don't overload the server
+        // Keep retrying up to 30s
         const fetch = makeTracedFetch([
             1,
             2,
+            3,
+            3,
+            3,
+            3,
+            3,
+            3,
+            3,
+            3,
             3
         ], false, makeUndiciFetch(new Agent({
             connections: 100

package/dest/examples/util.d.ts

@@ -1,7 +1,7 @@
 import { EthAddress } from '@aztec/aztec.js';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum';
+import type { Hex } from '@spalladino/viem';
 import type { Abi, Narrow } from 'abitype';
-import type { Hex } from 'viem';
 /**
  * Helper function to deploy ETH contracts.
  * @param l1Client - A viem WalletClient extended with public actions.

package/dest/examples/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/examples/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAGhE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,OAAO,EAAE,CAAC,EACrC,QAAQ,EAAE,GAAG,EACb,IAAI,GAAE,SAAS,OAAO,EAAO,GAC5B,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/examples/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAGhE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAE3C;;;;;;;GAOG;AACH,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,wBAAwB,EAClC,GAAG,EAAE,MAAM,CAAC,GAAG,GAAG,SAAS,OAAO,EAAE,CAAC,EACrC,QAAQ,EAAE,GAAG,EACb,IAAI,GAAE,SAAS,OAAO,EAAO,GAC5B,OAAO,CAAC,UAAU,CAAC,CAcrB;AAED;;;GAGG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C"}

package/dest/sandbox/sandbox.d.ts

@@ -9,7 +9,7 @@ import { type PXEServiceConfig } from '@aztec/pxe/server';
 import type { AztecNode } from '@aztec/stdlib/interfaces/client';
 import type { PublicDataTreeLeaf } from '@aztec/stdlib/trees';
 import { type TelemetryClient } from '@aztec/telemetry-client';
-import { type HDAccount, type PrivateKeyAccount } from 'viem';
+import { type HDAccount, type PrivateKeyAccount } from '@spalladino/viem';
 /**
  * Function to deploy our L1 contracts to the sandbox L1
  * @param aztecNodeConfig - The Aztec Node Config
@@ -38,6 +38,7 @@ export declare function deployContractsToL1(aztecNodeConfig: AztecNodeConfig, hd
     stakingAssetHandlerAddress?: EthAddress | undefined;
     zkPassportVerifierAddress?: EthAddress | undefined;
     gseAddress?: EthAddress | undefined;
+    dateGatedRelayerAddress?: EthAddress | undefined;
 } & {
     rollupAddress: EthAddress;
 } & {

package/dest/sandbox/sandbox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/sandbox/sandbox.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAa7F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAGzE,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,iBAAiB,EAA2D,MAAM,MAAM,CAAC;AAcvH;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,mCAAS,EAC7B,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;GAkCP;AAED,wBAAwB;AACxB,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG;IAC5C,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,wBAAwB,EAAE,MAAM,CAAC;IACjC,qDAAqD;IACrD,KAAK,EAAE,OAAO,CAAC;IACf,uDAAuD;IACvD,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,YAAK,EAAE,OAAO,EAAE,KAAK;;;;GA4GtF;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACjH,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,GAAE,OAAO,CAAC,gBAAgB,CAAM,mDAI3F"}
+{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../src/sandbox/sandbox.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAoB,MAAM,mBAAmB,CAAC;AAC7F,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,KAAK,uBAAuB,EAAwB,MAAM,yBAAyB,CAAC;AAa7F,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,KAAK,KAAK,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,YAAY,EAAoB,MAAM,yBAAyB,CAAC;AAGzE,OAAO,EAAE,KAAK,gBAAgB,EAAyC,MAAM,mBAAmB,CAAC;AACjG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EACL,KAAK,eAAe,EAGrB,MAAM,yBAAyB,CAAC;AAGjC,OAAO,EACL,KAAK,SAAS,EACd,KAAK,iBAAiB,EAIvB,MAAM,kBAAkB,CAAC;AAc1B;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,eAAe,EAAE,eAAe,EAChC,SAAS,EAAE,SAAS,GAAG,iBAAiB,EACxC,oBAAoB,mCAAS,EAC7B,IAAI,GAAE;IACJ,8BAA8B,CAAC,EAAE,MAAM,CAAC;IACxC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,EAAE,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;CAClC;;;;;;;;;;;;;;;;;;;;;;;GAkCP;AAED,wBAAwB;AACxB,MAAM,MAAM,aAAa,GAAG,eAAe,GAAG;IAC5C,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,uCAAuC;IACvC,wBAAwB,EAAE,MAAM,CAAC;IACjC,qDAAqD;IACrD,KAAK,EAAE,OAAO,CAAC;IACf,uDAAuD;IACvD,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,YAAK,EAAE,OAAO,EAAE,KAAK;;;;GA4GtF;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,GAAE,OAAO,CAAC,eAAe,CAAM,EACrC,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,eAAe,CAAC;IAAC,cAAc,CAAC,EAAE,uBAAuB,CAAC;IAAC,YAAY,CAAC,EAAE,YAAY,CAAA;CAAO,EACjH,OAAO,GAAE;IAAE,mBAAmB,CAAC,EAAE,kBAAkB,EAAE,CAAA;CAAO,6BAW7D;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,GAAE,OAAO,CAAC,gBAAgB,CAAM,mDAI3F"}

package/dest/sandbox/sandbox.js

@@ -17,9 +17,9 @@ import { protocolContractTreeRoot } from '@aztec/protocol-contracts';
 import { createPXEService, getPXEServiceConfig } from '@aztec/pxe/server';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
 import { getGenesisValues } from '@aztec/world-state/testing';
-import { createPublicClient, fallback, http as httpViemTransport } from 'viem';
-import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
-import { foundry } from 'viem/chains';
+import { createPublicClient, fallback, http as httpViemTransport } from '@spalladino/viem';
+import { mnemonicToAccount, privateKeyToAddress } from '@spalladino/viem/accounts';
+import { foundry } from '@spalladino/viem/chains';
 import { createAccountLogs } from '../cli/util.js';
 import { DefaultMnemonic } from '../mnemonic.js';
 import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';

package/dest/testing/anvil_test_watcher.js

@@ -2,7 +2,7 @@ import { RollupCheatCodes } from '@aztec/ethereum/test';
 import { createLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
-import { getAddress, getContract } from 'viem';
+import { getAddress, getContract } from '@spalladino/viem';
 /**
  * Represents a watcher for a rollup contract.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/aztec",
-  "version": "2.0.3",
+  "version": "2.1.0-rc.10",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -28,44 +28,44 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "2.0.3",
-    "@aztec/archiver": "2.0.3",
-    "@aztec/aztec-faucet": "2.0.3",
-    "@aztec/aztec-node": "2.0.3",
-    "@aztec/aztec.js": "2.0.3",
-    "@aztec/bb-prover": "2.0.3",
-    "@aztec/bb.js": "2.0.3",
-    "@aztec/blob-sink": "2.0.3",
-    "@aztec/bot": "2.0.3",
-    "@aztec/builder": "2.0.3",
-    "@aztec/cli": "2.0.3",
-    "@aztec/cli-wallet": "2.0.3",
-    "@aztec/constants": "2.0.3",
-    "@aztec/entrypoints": "2.0.3",
-    "@aztec/ethereum": "2.0.3",
-    "@aztec/foundation": "2.0.3",
-    "@aztec/kv-store": "2.0.3",
-    "@aztec/l1-artifacts": "2.0.3",
-    "@aztec/node-lib": "2.0.3",
-    "@aztec/noir-contracts.js": "2.0.3",
-    "@aztec/noir-protocol-circuits-types": "2.0.3",
-    "@aztec/p2p": "2.0.3",
-    "@aztec/p2p-bootstrap": "2.0.3",
-    "@aztec/protocol-contracts": "2.0.3",
-    "@aztec/prover-client": "2.0.3",
-    "@aztec/prover-node": "2.0.3",
-    "@aztec/pxe": "2.0.3",
-    "@aztec/stdlib": "2.0.3",
-    "@aztec/telemetry-client": "2.0.3",
-    "@aztec/txe": "2.0.3",
-    "@aztec/world-state": "2.0.3",
+    "@aztec/accounts": "2.1.0-rc.10",
+    "@aztec/archiver": "2.1.0-rc.10",
+    "@aztec/aztec-faucet": "2.1.0-rc.10",
+    "@aztec/aztec-node": "2.1.0-rc.10",
+    "@aztec/aztec.js": "2.1.0-rc.10",
+    "@aztec/bb-prover": "2.1.0-rc.10",
+    "@aztec/bb.js": "2.1.0-rc.10",
+    "@aztec/blob-sink": "2.1.0-rc.10",
+    "@aztec/bot": "2.1.0-rc.10",
+    "@aztec/builder": "2.1.0-rc.10",
+    "@aztec/cli": "2.1.0-rc.10",
+    "@aztec/cli-wallet": "2.1.0-rc.10",
+    "@aztec/constants": "2.1.0-rc.10",
+    "@aztec/entrypoints": "2.1.0-rc.10",
+    "@aztec/ethereum": "2.1.0-rc.10",
+    "@aztec/foundation": "2.1.0-rc.10",
+    "@aztec/kv-store": "2.1.0-rc.10",
+    "@aztec/l1-artifacts": "2.1.0-rc.10",
+    "@aztec/node-lib": "2.1.0-rc.10",
+    "@aztec/noir-contracts.js": "2.1.0-rc.10",
+    "@aztec/noir-protocol-circuits-types": "2.1.0-rc.10",
+    "@aztec/p2p": "2.1.0-rc.10",
+    "@aztec/p2p-bootstrap": "2.1.0-rc.10",
+    "@aztec/protocol-contracts": "2.1.0-rc.10",
+    "@aztec/prover-client": "2.1.0-rc.10",
+    "@aztec/prover-node": "2.1.0-rc.10",
+    "@aztec/pxe": "2.1.0-rc.10",
+    "@aztec/stdlib": "2.1.0-rc.10",
+    "@aztec/telemetry-client": "2.1.0-rc.10",
+    "@aztec/txe": "2.1.0-rc.10",
+    "@aztec/world-state": "2.1.0-rc.10",
+    "@spalladino/viem": "2.38.2-eip7594.0",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "koa": "^2.16.1",
-    "koa-router": "^12.0.0",
-    "viem": "2.23.7"
+    "koa-router": "^13.1.1"
   },
   "files": [
     "dest",

package/src/bin/index.ts

@@ -2,9 +2,8 @@
 //
 import { injectCommands as injectBuilderCommands } from '@aztec/builder';
 import { injectCommands as injectWalletCommands } from '@aztec/cli-wallet';
-import { enrichEnvironmentWithChainConfig } from '@aztec/cli/config';
+import { enrichEnvironmentWithChainConfig, enrichEnvironmentWithNetworkConfig } from '@aztec/cli/config';
 import { injectCommands as injectContractCommands } from '@aztec/cli/contracts';
-import { injectCommands as injectDevnetCommands } from '@aztec/cli/devnet';
 import { injectCommands as injectInfrastructureCommands } from '@aztec/cli/infrastructure';
 import { injectCommands as injectL1Commands } from '@aztec/cli/l1';
 import { injectCommands as injectMiscCommands } from '@aztec/cli/misc';
@@ -39,7 +38,9 @@ async function main() {
     networkValue = args[networkIndex].split('=')[1] || args[networkIndex + 1];
   }
 
-  await enrichEnvironmentWithChainConfig(getActiveNetworkName(networkValue));
+  const networkName = getActiveNetworkName(networkValue);
+  await enrichEnvironmentWithChainConfig(networkName);
+  await enrichEnvironmentWithNetworkConfig(networkName);
 
   const cliVersion = getCliVersion();
   let program = new Command('aztec');
@@ -51,7 +52,6 @@ async function main() {
   program = injectL1Commands(program, userLog, debugLogger);
   program = injectPXECommands(program, userLog, debugLogger);
   program = injectMiscCommands(program, userLog);
-  program = injectDevnetCommands(program, userLog, debugLogger);
   program = injectWalletCommands(program, userLog, debugLogger);
 
   await program.parseAsync(process.argv);

package/src/cli/aztec_start_options.ts

@@ -106,7 +106,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
     configToFlag('--auto-update-url', sharedNodeConfigMappings.autoUpdateUrl),
 
     configToFlag('--sync-mode', sharedNodeConfigMappings.syncMode),
-    configToFlag('--snapshots-url', sharedNodeConfigMappings.snapshotsUrl),
+    configToFlag('--snapshots-urls', sharedNodeConfigMappings.snapshotsUrls),
   ],
   SANDBOX: [
     {
@@ -168,7 +168,7 @@ export const aztecStartOptions: { [key: string]: AztecStartOption[] } = {
   ],
   'L1 CONTRACTS': [
     configToFlag('--registry-address', l1ContractAddressesMapping.registryAddress),
-    configToFlag('--rollup-version', chainConfigMappings.rollupVersion, 'canonical'),
+    configToFlag('--rollup-version', chainConfigMappings.rollupVersion),
   ],
   STORAGE: [
     configToFlag('--data-directory', dataConfigMappings.dataDirectory),

package/src/cli/cmds/start_prover_agent.ts

@@ -45,7 +45,12 @@ export async function startProverAgent(
 
   await preloadCrsDataForServerSideProving(config, userLog);
 
-  const fetch = makeTracedFetch([1, 2, 3], false, makeUndiciFetch(new Agent({ connections: 10 })));
+  const fetch = makeTracedFetch(
+    // retry connections every 3s, up to 30s before giving up
+    [1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3],
+    false,
+    makeUndiciFetch(new Agent({ connections: 10 })),
+  );
   const broker = createProvingJobBrokerClient(config.proverBrokerUrl, getVersions(), fetch);
 
   const telemetry = initTelemetryClient(extractRelevantOptions(options, telemetryClientConfigMappings, 'tel'));

package/src/cli/cmds/start_prover_broker.ts

@@ -1,4 +1,5 @@
 import { getL1Config } from '@aztec/cli/config';
+import { getPublicClient } from '@aztec/ethereum';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
 import {
@@ -11,7 +12,7 @@ import { getProverNodeBrokerConfigFromEnv } from '@aztec/prover-node';
 import type { ProvingJobBroker } from '@aztec/stdlib/interfaces/server';
 import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
 
-import { extractRelevantOptions } from '../util.js';
+import { extractRelevantOptions, setupUpdateMonitor } from '../util.js';
 
 export async function startProverBroker(
   options: any,
@@ -33,6 +34,7 @@ export async function startProverBroker(
     throw new Error('L1 registry address is required to start Aztec Node without --deploy-aztec-contracts option');
   }
 
+  const followsCanonicalRollup = typeof config.rollupVersion !== 'number';
   const { addresses, config: rollupConfig } = await getL1Config(
     config.l1Contracts.registryAddress,
     config.l1RpcUrls,
@@ -45,6 +47,18 @@ export async function startProverBroker(
 
   const client = initTelemetryClient(getTelemetryClientConfig());
   const broker = await createAndStartProvingBroker(config, client);
+
+  if (options.autoUpdate !== 'disabled' && options.autoUpdateUrl) {
+    await setupUpdateMonitor(
+      options.autoUpdate,
+      new URL(options.autoUpdateUrl),
+      followsCanonicalRollup,
+      getPublicClient(config),
+      config.l1Contracts.registryAddress,
+      signalHandlers,
+    );
+  }
+
   services.proverBroker = [broker, ProvingJobBrokerSchema];
   signalHandlers.push(() => broker.stop());
 

package/src/cli/cmds/start_prover_node.ts

@@ -73,7 +73,12 @@ export async function startProverNode(
   if (proverConfig.proverBrokerUrl) {
     // at 1TPS we'd enqueue ~1k tube proofs and ~1k AVM proofs immediately
     // set a lower connection limit such that we don't overload the server
-    const fetch = makeTracedFetch([1, 2, 3], false, makeUndiciFetch(new Agent({ connections: 100 })));
+    // Keep retrying up to 30s
+    const fetch = makeTracedFetch(
+      [1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3],
+      false,
+      makeUndiciFetch(new Agent({ connections: 100 })),
+    );
     broker = createProvingJobBrokerClient(proverConfig.proverBrokerUrl, getVersions(proverConfig), fetch);
   } else if (options.proverBroker) {
     ({ broker } = await startProverBroker(options, signalHandlers, services, userLog));

package/src/examples/util.ts

@@ -2,8 +2,8 @@ import { EthAddress } from '@aztec/aztec.js';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 
+import type { Hex } from '@spalladino/viem';
 import type { Abi, Narrow } from 'abitype';
-import type { Hex } from 'viem';
 
 /**
  * Helper function to deploy ETH contracts.

package/src/sandbox/sandbox.ts

@@ -31,9 +31,15 @@ import {
 } from '@aztec/telemetry-client';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
-import { type HDAccount, type PrivateKeyAccount, createPublicClient, fallback, http as httpViemTransport } from 'viem';
-import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
-import { foundry } from 'viem/chains';
+import {
+  type HDAccount,
+  type PrivateKeyAccount,
+  createPublicClient,
+  fallback,
+  http as httpViemTransport,
+} from '@spalladino/viem';
+import { mnemonicToAccount, privateKeyToAddress } from '@spalladino/viem/accounts';
+import { foundry } from '@spalladino/viem/chains';
 
 import { createAccountLogs } from '../cli/util.js';
 import { DefaultMnemonic } from '../mnemonic.js';

package/src/testing/anvil_test_watcher.ts

@@ -6,7 +6,7 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
 import type { TestDateProvider } from '@aztec/foundation/timer';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
 
-import { type GetContractReturnType, getAddress, getContract } from 'viem';
+import { type GetContractReturnType, getAddress, getContract } from '@spalladino/viem';
 
 /**
  * Represents a watcher for a rollup contract.