@aztec/aztec 1.2.1 → 2.0.0-nightly.20250813

package/dest/testing/aztec_cheat_codes.js

@@ -0,0 +1,62 @@
+import { Fr } from '@aztec/foundation/fields';
+import { createLogger } from '@aztec/foundation/log';
+import { deriveStorageSlotInMap } from '@aztec/stdlib/hash';
+/**
+ * A class that provides utility functions for interacting with the aztec chain.
+ */ export class AztecCheatCodes {
+    pxe;
+    logger;
+    constructor(/**
+     * The PXE Service to use for interacting with the chain
+     */ pxe, /**
+     * The logger to use for the aztec cheatcodes
+     */ logger = createLogger('aztecjs:cheat_codes')){
+        this.pxe = pxe;
+        this.logger = logger;
+    }
+    /**
+   * Computes the slot value for a given map and key.
+   * @param mapSlot - The slot of the map (specified in Aztec.nr contract)
+   * @param key - The key to lookup in the map
+   * @returns The storage slot of the value in the map
+   */ computeSlotInMap(mapSlot, key) {
+        const keyFr = typeof key === 'bigint' ? new Fr(key) : key.toField();
+        return deriveStorageSlotInMap(mapSlot, keyFr);
+    }
+    /**
+   * Get the current blocknumber
+   * @returns The current block number
+   */ async blockNumber() {
+        return await this.pxe.getBlockNumber();
+    }
+    /**
+   * Get the current timestamp
+   * @returns The current timestamp
+   */ async timestamp() {
+        const res = await this.pxe.getBlock(await this.blockNumber());
+        return Number(res?.header.globalVariables.timestamp ?? 0);
+    }
+    /**
+   * Loads the value stored at the given slot in the public storage of the given contract.
+   * @param who - The address of the contract
+   * @param slot - The storage slot to lookup
+   * @returns The value stored at the given slot
+   */ async loadPublic(who, slot) {
+        const storageValue = await this.pxe.getPublicStorageAt(who, new Fr(slot));
+        return storageValue;
+    }
+    /**
+   * Loads the value stored at the given slot in the private storage of the given contract.
+   * @param contract - The address of the contract
+   * @param recipient - The address whose public key was used to encrypt the note
+   * @param slot - The storage slot to lookup
+   * @returns The notes stored at the given slot
+   */ async loadPrivate(recipient, contract, slot) {
+        const extendedNotes = await this.pxe.getNotes({
+            recipient,
+            contractAddress: contract,
+            storageSlot: new Fr(slot)
+        });
+        return extendedNotes.map((extendedNote)=>extendedNote.note);
+    }
+}

package/dest/testing/cheat_codes.d.ts

@@ -0,0 +1,44 @@
+import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+import type { SequencerClient } from '@aztec/sequencer-client';
+import type { AztecNode, PXE } from '@aztec/stdlib/interfaces/client';
+import { AztecCheatCodes } from './aztec_cheat_codes.js';
+/**
+ * A class that provides utility functions for interacting with the chain.
+ */
+export declare class CheatCodes {
+    /** Cheat codes for L1.*/
+    eth: EthCheatCodes;
+    /** Cheat codes for Aztec L2. */
+    aztec: AztecCheatCodes;
+    /** Cheat codes for the Aztec Rollup contract on L1. */
+    rollup: RollupCheatCodes;
+    constructor(
+    /** Cheat codes for L1.*/
+    eth: EthCheatCodes, 
+    /** Cheat codes for Aztec L2. */
+    aztec: AztecCheatCodes, 
+    /** Cheat codes for the Aztec Rollup contract on L1. */
+    rollup: RollupCheatCodes);
+    static create(rpcUrls: string[], pxe: PXE): Promise<CheatCodes>;
+    /**
+     * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
+     * the target timestamp. L2 timestamp is not advanced exactly to the target timestamp because it is determined
+     * by the slot number, which advances in fixed intervals.
+     * This is useful for testing time-dependent contract behavior.
+     * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
+     * @param node - The Aztec node used to query if a new block has been mined.
+     * @param targetTimestamp - The target timestamp to warp to (in seconds)
+     */
+    warpL2TimeAtLeastTo(sequencerClient: SequencerClient, node: AztecNode, targetTimestamp: bigint | number): Promise<void>;
+    /**
+     * Warps the L1 timestamp forward by a specified duration and mines an L2 block that advances the L2 timestamp at
+     * least by the duration. L2 timestamp is not advanced exactly by the duration because it is determined by the slot
+     * number, which advances in fixed intervals.
+     * This is useful for testing time-dependent contract behavior.
+     * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
+     * @param node - The Aztec node used to query if a new block has been mined.
+     * @param duration - The duration to advance time by (in seconds)
+     */
+    warpL2TimeAtLeastBy(sequencerClient: SequencerClient, node: AztecNode, duration: bigint | number): Promise<void>;
+}
+//# sourceMappingURL=cheat_codes.d.ts.map

package/dest/testing/cheat_codes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cheat_codes.d.ts","sourceRoot":"","sources":["../../src/testing/cheat_codes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;GAEG;AACH,qBAAa,UAAU;IAEnB,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,gCAAgC;IACzB,KAAK,EAAE,eAAe;IAC7B,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;;IAL/B,yBAAyB;IAClB,GAAG,EAAE,aAAa;IACzB,gCAAgC;IACzB,KAAK,EAAE,eAAe;IAC7B,uDAAuD;IAChD,MAAM,EAAE,gBAAgB;WAGpB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAUrE;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM;IAyB7G;;;;;;;;OAQG;IACG,mBAAmB,CAAC,eAAe,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;CAKvG"}

package/dest/testing/cheat_codes.js

@@ -0,0 +1,63 @@
+import { retryUntil } from '@aztec/aztec.js';
+import { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+import { AztecCheatCodes } from './aztec_cheat_codes.js';
+/**
+ * A class that provides utility functions for interacting with the chain.
+ */ export class CheatCodes {
+    eth;
+    aztec;
+    rollup;
+    constructor(/** Cheat codes for L1.*/ eth, /** Cheat codes for Aztec L2. */ aztec, /** Cheat codes for the Aztec Rollup contract on L1. */ rollup){
+        this.eth = eth;
+        this.aztec = aztec;
+        this.rollup = rollup;
+    }
+    static async create(rpcUrls, pxe) {
+        const ethCheatCodes = new EthCheatCodes(rpcUrls);
+        const aztecCheatCodes = new AztecCheatCodes(pxe);
+        const rollupCheatCodes = new RollupCheatCodes(ethCheatCodes, await pxe.getNodeInfo().then((n)=>n.l1ContractAddresses));
+        return new CheatCodes(ethCheatCodes, aztecCheatCodes, rollupCheatCodes);
+    }
+    /**
+   * Warps the L1 timestamp to a target timestamp and mines an L2 block that advances the L2 timestamp to at least
+   * the target timestamp. L2 timestamp is not advanced exactly to the target timestamp because it is determined
+   * by the slot number, which advances in fixed intervals.
+   * This is useful for testing time-dependent contract behavior.
+   * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
+   * @param node - The Aztec node used to query if a new block has been mined.
+   * @param targetTimestamp - The target timestamp to warp to (in seconds)
+   */ async warpL2TimeAtLeastTo(sequencerClient, node, targetTimestamp) {
+        const currentL2BlockNumber = await node.getBlockNumber();
+        // We warp the L1 timestamp
+        await this.eth.warp(targetTimestamp, {
+            resetBlockInterval: true
+        });
+        // Wait until an L2 block is mined
+        const sequencer = sequencerClient.getSequencer();
+        const minTxsPerBlock = sequencer.getConfig().minTxsPerBlock;
+        sequencer.updateConfig({
+            minTxsPerBlock: 0
+        });
+        await retryUntil(async ()=>{
+            const newL2BlockNumber = await node.getBlockNumber();
+            return newL2BlockNumber > currentL2BlockNumber;
+        }, 'new block after warping L2 time', 36, 1);
+        // Restore original minTxsPerBlock
+        sequencer.updateConfig({
+            minTxsPerBlock
+        });
+    }
+    /**
+   * Warps the L1 timestamp forward by a specified duration and mines an L2 block that advances the L2 timestamp at
+   * least by the duration. L2 timestamp is not advanced exactly by the duration because it is determined by the slot
+   * number, which advances in fixed intervals.
+   * This is useful for testing time-dependent contract behavior.
+   * @param sequencerClient - The sequencer client to use to force an empty block to be mined.
+   * @param node - The Aztec node used to query if a new block has been mined.
+   * @param duration - The duration to advance time by (in seconds)
+   */ async warpL2TimeAtLeastBy(sequencerClient, node, duration) {
+        const currentTimestamp = await this.eth.timestamp();
+        const targetTimestamp = BigInt(currentTimestamp) + BigInt(duration);
+        await this.warpL2TimeAtLeastTo(sequencerClient, node, targetTimestamp);
+    }
+}

package/dest/testing/index.d.ts

@@ -0,0 +1,5 @@
+export { AnvilTestWatcher } from './anvil_test_watcher.js';
+export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+export { AztecCheatCodes } from './aztec_cheat_codes.js';
+export { CheatCodes } from './cheat_codes.js';
+//# sourceMappingURL=index.d.ts.map

package/dest/testing/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC"}

package/dest/testing/index.js

@@ -0,0 +1,4 @@
+export { AnvilTestWatcher } from './anvil_test_watcher.js';
+export { EthCheatCodes, RollupCheatCodes } from '@aztec/ethereum/test';
+export { AztecCheatCodes } from './aztec_cheat_codes.js';
+export { CheatCodes } from './cheat_codes.js';

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@aztec/aztec",
-  "version": "1.2.1",
+  "version": "2.0.0-nightly.20250813",
   "type": "module",
   "exports": {
-    ".": "./dest/index.js"
+    ".": "./dest/index.js",
+    "./testing": "./dest/testing/index.js"
   },
   "bin": "./dest/bin/index.js",
   "typedocOptions": {
@@ -27,35 +28,36 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/accounts": "1.2.1",
-    "@aztec/archiver": "1.2.1",
-    "@aztec/aztec-faucet": "1.2.1",
-    "@aztec/aztec-node": "1.2.1",
-    "@aztec/aztec.js": "1.2.1",
-    "@aztec/bb-prover": "1.2.1",
-    "@aztec/bb.js": "1.2.1",
-    "@aztec/blob-sink": "1.2.1",
-    "@aztec/bot": "1.2.1",
-    "@aztec/builder": "1.2.1",
-    "@aztec/cli": "1.2.1",
-    "@aztec/cli-wallet": "1.2.1",
-    "@aztec/constants": "1.2.1",
-    "@aztec/entrypoints": "1.2.1",
-    "@aztec/ethereum": "1.2.1",
-    "@aztec/foundation": "1.2.1",
-    "@aztec/kv-store": "1.2.1",
-    "@aztec/noir-contracts.js": "1.2.1",
-    "@aztec/noir-protocol-circuits-types": "1.2.1",
-    "@aztec/p2p": "1.2.1",
-    "@aztec/p2p-bootstrap": "1.2.1",
-    "@aztec/protocol-contracts": "1.2.1",
-    "@aztec/prover-client": "1.2.1",
-    "@aztec/prover-node": "1.2.1",
-    "@aztec/pxe": "1.2.1",
-    "@aztec/stdlib": "1.2.1",
-    "@aztec/telemetry-client": "1.2.1",
-    "@aztec/txe": "1.2.1",
-    "@aztec/world-state": "1.2.1",
+    "@aztec/accounts": "2.0.0-nightly.20250813",
+    "@aztec/archiver": "2.0.0-nightly.20250813",
+    "@aztec/aztec-faucet": "2.0.0-nightly.20250813",
+    "@aztec/aztec-node": "2.0.0-nightly.20250813",
+    "@aztec/aztec.js": "2.0.0-nightly.20250813",
+    "@aztec/bb-prover": "2.0.0-nightly.20250813",
+    "@aztec/bb.js": "2.0.0-nightly.20250813",
+    "@aztec/blob-sink": "2.0.0-nightly.20250813",
+    "@aztec/bot": "2.0.0-nightly.20250813",
+    "@aztec/builder": "2.0.0-nightly.20250813",
+    "@aztec/cli": "2.0.0-nightly.20250813",
+    "@aztec/cli-wallet": "2.0.0-nightly.20250813",
+    "@aztec/constants": "2.0.0-nightly.20250813",
+    "@aztec/entrypoints": "2.0.0-nightly.20250813",
+    "@aztec/ethereum": "2.0.0-nightly.20250813",
+    "@aztec/foundation": "2.0.0-nightly.20250813",
+    "@aztec/kv-store": "2.0.0-nightly.20250813",
+    "@aztec/l1-artifacts": "2.0.0-nightly.20250813",
+    "@aztec/noir-contracts.js": "2.0.0-nightly.20250813",
+    "@aztec/noir-protocol-circuits-types": "2.0.0-nightly.20250813",
+    "@aztec/p2p": "2.0.0-nightly.20250813",
+    "@aztec/p2p-bootstrap": "2.0.0-nightly.20250813",
+    "@aztec/protocol-contracts": "2.0.0-nightly.20250813",
+    "@aztec/prover-client": "2.0.0-nightly.20250813",
+    "@aztec/prover-node": "2.0.0-nightly.20250813",
+    "@aztec/pxe": "2.0.0-nightly.20250813",
+    "@aztec/stdlib": "2.0.0-nightly.20250813",
+    "@aztec/telemetry-client": "2.0.0-nightly.20250813",
+    "@aztec/txe": "2.0.0-nightly.20250813",
+    "@aztec/world-state": "2.0.0-nightly.20250813",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",

package/src/cli/chain_l2_config.ts

@@ -8,6 +8,7 @@ import path, { dirname, join } from 'path';
 
 import publicIncludeMetrics from '../../public_include_metric_prefixes.json' with { type: 'json' };
 
+// REFACTOR: We should be `pick`ing keys from existing config types
 export type L2ChainConfig = {
   l1ChainId: number;
   testAccounts: boolean;
@@ -41,9 +42,9 @@ export type L2ChainConfig = {
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: number;
   /** The deposit amount for a validator */
-  depositAmount: bigint;
+  activationThreshold: bigint;
   /** The minimum stake for a validator. */
-  minimumStake: bigint;
+  ejectionThreshold: bigint;
   /** The slashing quorum */
   slashingQuorum: number;
   /** The slashing round size */
@@ -70,6 +71,10 @@ export type L2ChainConfig = {
   slashInvalidBlockEnabled: boolean;
   slashInvalidBlockPenalty: bigint;
   slashInvalidBlockMaxPenalty: bigint;
+  slashProposeInvalidAttestationsPenalty: bigint;
+  slashProposeInvalidAttestationsMaxPenalty: bigint;
+  slashAttestDescendantOfInvalidPenalty: bigint;
+  slashAttestDescendantOfInvalidMaxPenalty: bigint;
   // control whether sentinel is enabled or not. Needed for slashing
   sentinelEnabled: boolean;
 };
@@ -103,9 +108,9 @@ export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: 1,
   /** The deposit amount for a validator */
-  depositAmount: DefaultL1ContractsConfig.depositAmount,
+  activationThreshold: DefaultL1ContractsConfig.activationThreshold,
   /** The minimum stake for a validator. */
-  minimumStake: DefaultL1ContractsConfig.minimumStake,
+  ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
   /** The slashing quorum */
   slashingQuorum: DefaultL1ContractsConfig.slashingQuorum,
   /** The slashing round size */
@@ -132,6 +137,10 @@ export const testnetIgnitionL2ChainConfig: L2ChainConfig = {
   slashPruneMaxPenalty: 0n,
   slashInvalidBlockPenalty: 0n,
   slashInvalidBlockMaxPenalty: 0n,
+  slashProposeInvalidAttestationsPenalty: 0n,
+  slashProposeInvalidAttestationsMaxPenalty: 0n,
+  slashAttestDescendantOfInvalidPenalty: 0n,
+  slashAttestDescendantOfInvalidMaxPenalty: 0n,
   sentinelEnabled: false,
 };
 
@@ -167,9 +176,9 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = {
   /** The number of epochs after an epoch ends that proofs are still accepted. */
   aztecProofSubmissionEpochs: 1,
   /** The deposit amount for a validator */
-  depositAmount: DefaultL1ContractsConfig.depositAmount,
+  activationThreshold: DefaultL1ContractsConfig.activationThreshold,
   /** The minimum stake for a validator. */
-  minimumStake: DefaultL1ContractsConfig.minimumStake,
+  ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
   /** The slashing quorum */
   slashingQuorum: 101,
   /** The slashing round size */
@@ -186,16 +195,20 @@ export const alphaTestnetL2ChainConfig: L2ChainConfig = {
   // slashing stuff
   slashPayloadTtlSeconds: 36 * 32 * 24, // 24 epochs
   slashPruneEnabled: true,
-  slashPrunePenalty: 17n * (DefaultL1ContractsConfig.depositAmount / 100n),
-  slashPruneMaxPenalty: 17n * (DefaultL1ContractsConfig.depositAmount / 100n),
+  slashPrunePenalty: 17n * (DefaultL1ContractsConfig.activationThreshold / 100n),
+  slashPruneMaxPenalty: 17n * (DefaultL1ContractsConfig.activationThreshold / 100n),
   slashInactivityEnabled: true,
   slashInactivityCreateTargetPercentage: 1,
   slashInactivitySignalTargetPercentage: 0.67,
-  slashInactivityCreatePenalty: 17n * (DefaultL1ContractsConfig.depositAmount / 100n),
-  slashInactivityMaxPenalty: 17n * (DefaultL1ContractsConfig.depositAmount / 100n),
+  slashInactivityCreatePenalty: 17n * (DefaultL1ContractsConfig.activationThreshold / 100n),
+  slashInactivityMaxPenalty: 17n * (DefaultL1ContractsConfig.activationThreshold / 100n),
   slashInvalidBlockEnabled: true,
-  slashInvalidBlockPenalty: DefaultL1ContractsConfig.depositAmount,
-  slashInvalidBlockMaxPenalty: DefaultL1ContractsConfig.depositAmount,
+  slashInvalidBlockPenalty: DefaultL1ContractsConfig.activationThreshold,
+  slashInvalidBlockMaxPenalty: DefaultL1ContractsConfig.activationThreshold,
+  slashProposeInvalidAttestationsPenalty: DefaultL1ContractsConfig.activationThreshold,
+  slashProposeInvalidAttestationsMaxPenalty: DefaultL1ContractsConfig.activationThreshold,
+  slashAttestDescendantOfInvalidPenalty: DefaultL1ContractsConfig.activationThreshold,
+  slashAttestDescendantOfInvalidMaxPenalty: DefaultL1ContractsConfig.activationThreshold,
   sentinelEnabled: true,
 };
 
@@ -336,8 +349,8 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
   enrichVar('AZTEC_EPOCH_DURATION', config.aztecEpochDuration.toString());
   enrichVar('AZTEC_TARGET_COMMITTEE_SIZE', config.aztecTargetCommitteeSize.toString());
   enrichVar('AZTEC_PROOF_SUBMISSION_EPOCHS', config.aztecProofSubmissionEpochs.toString());
-  enrichVar('AZTEC_DEPOSIT_AMOUNT', config.depositAmount.toString());
-  enrichVar('AZTEC_MINIMUM_STAKE', config.minimumStake.toString());
+  enrichVar('AZTEC_ACTIVATION_THRESHOLD', config.activationThreshold.toString());
+  enrichVar('AZTEC_EJECTION_THRESHOLD', config.ejectionThreshold.toString());
   enrichVar('AZTEC_SLASHING_QUORUM', config.slashingQuorum.toString());
   enrichVar('AZTEC_SLASHING_ROUND_SIZE', config.slashingRoundSize.toString());
   enrichVar('AZTEC_GOVERNANCE_PROPOSER_QUORUM', config.governanceProposerQuorum.toString());
@@ -358,5 +371,16 @@ export async function enrichEnvironmentWithChainConfig(networkName: NetworkNames
   enrichVar('SLASH_INVALID_BLOCK_ENABLED', config.slashInvalidBlockEnabled.toString());
   enrichVar('SLASH_INVALID_BLOCK_PENALTY', config.slashInvalidBlockPenalty.toString());
   enrichVar('SLASH_INVALID_BLOCK_MAX_PENALTY', config.slashInvalidBlockMaxPenalty.toString());
+  enrichVar('SLASH_PROPOSE_INVALID_ATTESTATIONS_PENALTY', config.slashProposeInvalidAttestationsPenalty.toString());
+  enrichVar(
+    'SLASH_PROPOSE_INVALID_ATTESTATIONS_MAX_PENALTY',
+    config.slashProposeInvalidAttestationsMaxPenalty.toString(),
+  );
+  enrichVar('SLASH_ATTEST_DESCENDANT_OF_INVALID_PENALTY', config.slashAttestDescendantOfInvalidPenalty.toString());
+  enrichVar(
+    'SLASH_ATTEST_DESCENDANT_OF_INVALID_MAX_PENALTY',
+    config.slashAttestDescendantOfInvalidMaxPenalty.toString(),
+  );
+
   enrichVar('SENTINEL_ENABLED', config.sentinelEnabled.toString());
 }

package/src/cli/cmds/start_node.ts

@@ -6,6 +6,7 @@ import { NULL_KEY, getAddressFromPrivateKey, getPublicClient } from '@aztec/ethe
 import { SecretValue } from '@aztec/foundation/config';
 import type { NamespacedApiHandlers } from '@aztec/foundation/json-rpc/server';
 import type { LogFn } from '@aztec/foundation/log';
+import { bufferToHex } from '@aztec/foundation/string';
 import { AztecNodeAdminApiSchema, AztecNodeApiSchema, type PXE } from '@aztec/stdlib/interfaces/client';
 import { P2PApiSchema } from '@aztec/stdlib/interfaces/server';
 import {
@@ -117,7 +118,6 @@ export async function startNode(
     };
   }
 
-  // if no publisher private key, then use l1Mnemonic
   if (!options.archiver) {
     // expect archiver url in node config
     const archiverUrl = nodeConfig.archiverUrl;
@@ -137,7 +137,7 @@ export async function startNode(
     };
     let account;
     if (sequencerConfig.publisherPrivateKey.getValue() === NULL_KEY) {
-      if (sequencerConfig.validatorPrivateKeys.getValue().length) {
+      if (sequencerConfig.validatorPrivateKeys?.getValue().length) {
         sequencerConfig.publisherPrivateKey = new SecretValue(sequencerConfig.validatorPrivateKeys.getValue()[0]);
       } else if (!options.l1Mnemonic) {
         userLog(
@@ -154,6 +154,12 @@ export async function startNode(
     nodeConfig.coinbase ??= EthAddress.fromString(getAddressFromPrivateKey(nodeConfig.publisherPrivateKey.getValue()));
   }
 
+  // If we dont have a slasher private key, derive one from the mnemonic if provided, using account index 1 (zero was used for the sequencer)
+  if (options.l1Mnemonic && (!nodeConfig.slasherPrivateKey || nodeConfig.slasherPrivateKey.getValue() === NULL_KEY)) {
+    const account = mnemonicToAccount(options.l1Mnemonic, { accountIndex: 1 });
+    nodeConfig.slasherPrivateKey = new SecretValue(bufferToHex(Buffer.from(account.getHdKey().privateKey!)));
+  }
+
   if (nodeConfig.p2pEnabled) {
     // ensure bootstrapNodes is an array
     if (nodeConfig.bootstrapNodes && typeof nodeConfig.bootstrapNodes === 'string') {

package/src/cli/cmds/start_p2p_bootstrap.ts

@@ -5,7 +5,11 @@ import { createStore } from '@aztec/kv-store/lmdb-v2';
 import { type BootnodeConfig, BootstrapNode, bootnodeConfigMappings } from '@aztec/p2p';
 import { emptyChainConfig } from '@aztec/stdlib/config';
 import { P2PBootstrapApiSchema } from '@aztec/stdlib/interfaces/server';
-import { getConfigEnvVars as getTelemetryClientConfig, initTelemetryClient } from '@aztec/telemetry-client';
+import {
+  type TelemetryClientConfig,
+  initTelemetryClient,
+  telemetryClientConfigMappings,
+} from '@aztec/telemetry-client';
 
 import { extractRelevantOptions } from '../util.js';
 
@@ -19,7 +23,10 @@ export async function startP2PBootstrap(
   const config = extractRelevantOptions<BootnodeConfig>(options, bootnodeConfigMappings, 'p2p');
   const safeConfig = { ...config, peerIdPrivateKey: '<redacted>' };
   userLog(`Starting P2P bootstrap node with config: ${jsonStringify(safeConfig)}`);
-  const telemetryClient = initTelemetryClient(getTelemetryClientConfig());
+
+  const telemetryConfig = extractRelevantOptions<TelemetryClientConfig>(options, telemetryClientConfigMappings, 'tel');
+  const telemetryClient = initTelemetryClient(telemetryConfig);
+
   const store = await createStore('p2p-bootstrap', 1, config, createLogger('p2p:bootstrap:store'));
   const node = new BootstrapNode(store, telemetryClient);
   await node.start(config);

package/src/cli/cmds/start_prover_agent.ts

@@ -28,12 +28,6 @@ export async function startProverAgent(
     process.exit(1);
   }
 
-  // Check if running on ARM and fast-fail if so.
-  if (process.arch.startsWith('arm')) {
-    userLog(`Prover agent is not supported on ARM architecture (detected: ${process.arch}). Exiting.`);
-    process.exit(1);
-  }
-
   const config = {
     ...getProverNodeAgentConfigFromEnv(), // get default config from env
     ...extractRelevantOptions<ProverAgentConfig>(options, proverAgentConfigMappings, 'proverAgent'), // override with command line options

package/src/cli/cmds/start_prover_node.ts

@@ -35,12 +35,6 @@ export async function startProverNode(
     process.exit(1);
   }
 
-  // Check if running on ARM and fast-fail if so.
-  if (process.arch.startsWith('arm')) {
-    userLog(`Prover node is not supported on ARM architecture (detected: ${process.arch}). Exiting.`);
-    process.exit(1);
-  }
-
   let proverConfig = {
     ...getProverNodeConfigFromEnv(), // get default config from env
     ...extractRelevantOptions<ProverNodeConfig>(options, proverNodeConfigMappings, 'proverNode'), // override with command line options
@@ -118,7 +112,7 @@ export async function startProverNode(
   services.proverNode = [proverNode, ProverNodeApiSchema];
 
   if (proverNode.getP2P()) {
-    services.p2p = [proverNode.getP2P()!, P2PApiSchema];
+    services.p2p = [proverNode.getP2P(), P2PApiSchema];
   }
 
   if (!proverConfig.proverBrokerUrl) {

package/src/examples/token.ts

@@ -19,13 +19,15 @@ async function main() {
   logger.info('Running token contract test on HTTP interface.');
 
   const [aliceWallet, bobWallet] = await getDeployedTestAccountsWallets(pxe);
-  const alice = aliceWallet.getCompleteAddress();
-  const bob = bobWallet.getCompleteAddress();
+  const alice = aliceWallet.getAddress();
+  const bob = bobWallet.getAddress();
 
-  logger.info(`Fetched Alice and Bob accounts: ${alice.address.toString()}, ${bob.address.toString()}`);
+  logger.info(`Fetched Alice and Bob accounts: ${alice.toString()}, ${bob.toString()}`);
 
   logger.info('Deploying Token...');
-  const token = await TokenContract.deploy(aliceWallet, alice, 'TokenName', 'TokenSymbol', 18).send().deployed();
+  const token = await TokenContract.deploy(aliceWallet, alice, 'TokenName', 'TokenSymbol', 18)
+    .send({ from: alice })
+    .deployed();
   logger.info('Token deployed');
 
   // Create the contract abstraction and link it to Alice's and Bob's wallet for future signing
@@ -34,23 +36,22 @@ async function main() {
 
   // Mint tokens to Alice
   logger.info(`Minting ${ALICE_MINT_BALANCE} more coins to Alice...`);
-  const from = aliceWallet.getAddress(); // we are setting from to Alice here because we need a sender to calculate the tag
-  await tokenAlice.methods.mint_to_private(from, aliceWallet.getAddress(), ALICE_MINT_BALANCE).send().wait();
+  await tokenAlice.methods.mint_to_private(alice, ALICE_MINT_BALANCE).send({ from: alice }).wait();
 
   logger.info(`${ALICE_MINT_BALANCE} tokens were successfully minted by Alice and transferred to private`);
 
-  const balanceAfterMint = await tokenAlice.methods.balance_of_private(alice).simulate();
+  const balanceAfterMint = await tokenAlice.methods.balance_of_private(alice).simulate({ from: alice });
   logger.info(`Tokens successfully minted. New Alice's balance: ${balanceAfterMint}`);
 
   // We will now transfer tokens from Alice to Bob
   logger.info(`Transferring ${TRANSFER_AMOUNT} tokens from Alice to Bob...`);
-  await tokenAlice.methods.transfer(bob, TRANSFER_AMOUNT).send().wait();
+  await tokenAlice.methods.transfer(bob, TRANSFER_AMOUNT).send({ from: alice }).wait();
 
   // Check the new balances
-  const aliceBalance = await tokenAlice.methods.balance_of_private(alice).simulate();
+  const aliceBalance = await tokenAlice.methods.balance_of_private(alice).simulate({ from: alice });
   logger.info(`Alice's balance ${aliceBalance}`);
 
-  const bobBalance = await tokenBob.methods.balance_of_private(bob).simulate();
+  const bobBalance = await tokenBob.methods.balance_of_private(bob).simulate({ from: bob });
   logger.info(`Bob's balance ${bobBalance}`);
 }
 

package/src/sandbox/banana_fpc.ts

@@ -5,7 +5,7 @@ import type { LogFn } from '@aztec/foundation/log';
 import { FPCContract } from '@aztec/noir-contracts.js/FPC';
 import { TokenContract } from '@aztec/noir-contracts.js/Token';
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { type ContractInstanceWithAddress, getContractInstanceFromDeployParams } from '@aztec/stdlib/contract';
+import { type ContractInstanceWithAddress, getContractInstanceFromInstantiationParams } from '@aztec/stdlib/contract';
 import type { PXE } from '@aztec/stdlib/interfaces/client';
 
 const BANANA_COIN_SALT = new Fr(0);
@@ -23,7 +23,7 @@ function getBananaAdmin(initialAccounts: InitialAccountData[]): AztecAddress {
 
 async function getBananaCoinInstance(initialAccounts: InitialAccountData[]): Promise<ContractInstanceWithAddress> {
   const admin = getBananaAdmin(initialAccounts);
-  return await getContractInstanceFromDeployParams(TokenContract.artifact, {
+  return await getContractInstanceFromInstantiationParams(TokenContract.artifact, {
     constructorArgs: [admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal],
     salt: BANANA_COIN_SALT,
   });
@@ -36,7 +36,7 @@ export async function getBananaCoinAddress(initialAccounts: InitialAccountData[]
 async function getBananaFPCInstance(initialAccounts: InitialAccountData[]): Promise<ContractInstanceWithAddress> {
   const bananaCoin = await getBananaCoinAddress(initialAccounts);
   const admin = getBananaAdmin(initialAccounts);
-  return await getContractInstanceFromDeployParams(FPCContract.artifact, {
+  return await getContractInstanceFromInstantiationParams(FPCContract.artifact, {
     constructorArgs: [bananaCoin, admin],
     salt: BANANA_FPC_SALT,
   });
@@ -51,10 +51,10 @@ export async function setupBananaFPC(initialAccounts: InitialAccountData[], depl
   const admin = getBananaAdmin(initialAccounts);
   const [bananaCoin, fpc] = await Promise.all([
     TokenContract.deploy(deployer, admin, bananaCoinArgs.name, bananaCoinArgs.symbol, bananaCoinArgs.decimal)
-      .send({ contractAddressSalt: BANANA_COIN_SALT, universalDeploy: true })
+      .send({ from: admin, contractAddressSalt: BANANA_COIN_SALT, universalDeploy: true })
       .deployed(),
     FPCContract.deploy(deployer, bananaCoinAddress, admin)
-      .send({ contractAddressSalt: BANANA_FPC_SALT, universalDeploy: true })
+      .send({ from: admin, contractAddressSalt: BANANA_FPC_SALT, universalDeploy: true })
       .deployed(),
   ]);
 

package/src/sandbox/sandbox.ts

@@ -2,7 +2,6 @@
 import { getSchnorrWallet } from '@aztec/accounts/schnorr';
 import { deployFundedSchnorrAccounts, getInitialTestAccounts } from '@aztec/accounts/testing';
 import { type AztecNodeConfig, AztecNodeService, getConfigEnvVars } from '@aztec/aztec-node';
-import { AnvilTestWatcher, EthCheatCodes } from '@aztec/aztec.js/testing';
 import { type BlobSinkClientInterface, createBlobSinkClient } from '@aztec/blob-sink/client';
 import { setupSponsoredFPC } from '@aztec/cli/cli-utils';
 import { GENESIS_ARCHIVE_ROOT } from '@aztec/constants';
@@ -14,6 +13,7 @@ import {
   getL1ContractsConfigEnvVars,
   waitForPublicClient,
 } from '@aztec/ethereum';
+import { EthCheatCodes } from '@aztec/ethereum/test';
 import { SecretValue } from '@aztec/foundation/config';
 import { Fr } from '@aztec/foundation/fields';
 import { type LogFn, createLogger } from '@aztec/foundation/log';
@@ -36,6 +36,7 @@ import { foundry } from 'viem/chains';
 
 import { createAccountLogs } from '../cli/util.js';
 import { DefaultMnemonic } from '../mnemonic.js';
+import { AnvilTestWatcher } from '../testing/anvil_test_watcher.js';
 import { getBananaFPCAddress, setupBananaFPC } from './banana_fpc.js';
 import { getSponsoredFPCAddress } from './sponsored_fpc.js';
 
@@ -124,10 +125,15 @@ export async function createSandbox(config: Partial<SandboxConfig> = {}, userLog
     const privKey = hdAccount.getHdKey().privateKey;
     aztecNodeConfig.publisherPrivateKey = new SecretValue(`0x${Buffer.from(privKey!).toString('hex')}` as const);
   }
-  if (!aztecNodeConfig.validatorPrivateKeys.getValue().length) {
+  if (!aztecNodeConfig.validatorPrivateKeys?.getValue().length) {
     const privKey = hdAccount.getHdKey().privateKey;
     aztecNodeConfig.validatorPrivateKeys = new SecretValue([`0x${Buffer.from(privKey!).toString('hex')}`]);
   }
+  if (!aztecNodeConfig.slasherPrivateKey?.getValue() || aztecNodeConfig.slasherPrivateKey?.getValue() === NULL_KEY) {
+    const account = mnemonicToAccount(config.l1Mnemonic || DefaultMnemonic, { accountIndex: 1 });
+    const privKey = account.getHdKey().privateKey;
+    aztecNodeConfig.slasherPrivateKey = new SecretValue(`0x${Buffer.from(privKey!).toString('hex')}` as const);
+  }
 
   const initialAccounts = await (async () => {
     if (config.testAccounts === true || config.testAccounts === undefined) {

package/src/sandbox/sponsored_fpc.ts

@@ -1,9 +1,14 @@
-import { type ContractInstanceWithAddress, Fr, type PXE, getContractInstanceFromDeployParams } from '@aztec/aztec.js';
+import {
+  type ContractInstanceWithAddress,
+  Fr,
+  type PXE,
+  getContractInstanceFromInstantiationParams,
+} from '@aztec/aztec.js';
 import { SPONSORED_FPC_SALT } from '@aztec/constants';
 import { SponsoredFPCContract } from '@aztec/noir-contracts.js/SponsoredFPC';
 
 async function getSponsoredFPCInstance(): Promise<ContractInstanceWithAddress> {
-  return await getContractInstanceFromDeployParams(SponsoredFPCContract.artifact, {
+  return await getContractInstanceFromInstantiationParams(SponsoredFPCContract.artifact, {
     salt: new Fr(SPONSORED_FPC_SALT),
   });
 }