@aztec/foundation 3.0.0-canary.a9708bd → 3.0.0-devnet.3

package/dest/trees/unbalanced_merkle_tree_calculator.js

@@ -1,132 +1,162 @@
-import { serializeToBuffer } from '@aztec/foundation/serialize';
-import { SiblingPath } from '@aztec/foundation/trees';
 import { sha256Trunc } from '../crypto/index.js';
-const indexToKeyHash = (level, index)=>`${level}:${index}`;
+import { SiblingPath } from './sibling_path.js';
+import { UnbalancedTreeStore } from './unbalanced_tree_store.js';
+export function computeCompressedUnbalancedMerkleTreeRoot(leaves, valueToCompress = Buffer.alloc(32), hasher) {
+    const calculator = UnbalancedMerkleTreeCalculator.create(leaves, valueToCompress, hasher);
+    return calculator.getRoot();
+}
 /**
  * An ephemeral unbalanced Merkle tree implementation.
  * Follows the rollup implementation which greedily hashes pairs of nodes up the tree.
  * Remaining rightmost nodes are shifted up until they can be paired.
+ * The values that match the `valueToCompress` are skipped and the sibling of the compressed leaf are shifted up until
+ * they can be paired.
  * If there is only one leaf, the root is the leaf.
  */ export class UnbalancedMerkleTreeCalculator {
-    maxDepth;
+    leaves;
+    valueToCompress;
     hasher;
-    // This map stores index and depth -> value
-    cache;
-    // This map stores value -> index and depth, since we have variable depth
-    valueCache;
-    size;
-    root;
-    constructor(maxDepth, hasher){
-        this.maxDepth = maxDepth;
+    store;
+    leafLocations;
+    constructor(leaves, valueToCompress, hasher){
+        this.leaves = leaves;
+        this.valueToCompress = valueToCompress;
         this.hasher = hasher;
-        this.cache = {};
-        this.valueCache = {};
-        this.size = 0n;
-        this.root = Buffer.alloc(32);
+        this.leafLocations = [];
+        if (leaves.length === 0) {
+            throw Error('Cannot create a compressed unbalanced tree with 0 leaves.');
+        }
+        this.store = new UnbalancedTreeStore(leaves.length);
+        this.buildTree();
     }
-    static create(height, hasher = (left, right)=>Promise.resolve(sha256Trunc(Buffer.concat([
+    static create(leaves, valueToCompress = Buffer.alloc(0), hasher = (left, right)=>sha256Trunc(Buffer.concat([
             left,
             right
-        ])))) {
-        return new UnbalancedMerkleTreeCalculator(height, hasher);
+        ]))) {
+        return new UnbalancedMerkleTreeCalculator(leaves, valueToCompress, hasher);
     }
     /**
    * Returns the root of the tree.
    * @returns The root of the tree.
    */ getRoot() {
-        return this.root;
+        return this.store.getRoot().value;
     }
     /**
-   * Returns a sibling path for the element at the given index.
+   * Returns a sibling path for the element.
    * @param value - The value of the element.
    * @returns A sibling path for the element.
    * Note: The sibling path is an array of sibling hashes, with the lowest hash (leaf hash) first, and the highest hash last.
    */ getSiblingPath(value) {
-        if (this.size === 1n) {
-            return Promise.resolve(new SiblingPath(0, []));
-        }
-        const path = [];
-        const [depth, _index] = this.valueCache[serializeToBuffer(value).toString('hex')].split(':');
-        let level = parseInt(depth, 10);
-        let index = BigInt(_index);
-        while(level > 0){
-            const isRight = index & 0x01n;
-            const key = indexToKeyHash(level, isRight ? index - 1n : index + 1n);
-            const sibling = this.cache[key];
-            path.push(sibling);
-            level -= 1;
-            index >>= 1n;
+        const leafIndex = this.leaves.findIndex((leaf)=>leaf.equals(value));
+        if (leafIndex === -1) {
+            throw Error(`Leaf value ${value.toString('hex')} not found in tree.`);
         }
-        return Promise.resolve(new SiblingPath(parseInt(depth, 10), path));
+        return this.getSiblingPathByLeafIndex(leafIndex);
     }
     /**
-   * Appends the given leaves to the tree.
-   * @param leaves - The leaves to append.
-   * @returns Empty promise.
-   */ async appendLeaves(leaves) {
-        if (this.size != BigInt(0)) {
-            throw Error(`Can't re-append to an unbalanced tree. Current has ${this.size} leaves.`);
+   * Returns a sibling path for the leaf at the given index.
+   * @param leafIndex - The index of the leaf.
+   * @returns A sibling path for the leaf.
+   */ getSiblingPathByLeafIndex(leafIndex) {
+        if (leafIndex >= this.leaves.length) {
+            throw Error(`Leaf index ${leafIndex} out of bounds. Tree has ${this.leaves.length} leaves.`);
         }
-        if (leaves.length === 0) {
-            throw Error(`Can't append 0 leaves to an unbalanced tree.`);
+        const leaf = this.leaves[leafIndex];
+        if (leaf.equals(this.valueToCompress)) {
+            throw Error(`Leaf at index ${leafIndex} has been compressed.`);
         }
-        if (leaves.length === 1) {
-            this.root = leaves[0];
-        } else {
-            this.root = await this.batchInsert(leaves);
+        const path = [];
+        let location = this.leafLocations[leafIndex];
+        while(location.level > 0){
+            const sibling = this.store.getSibling(location);
+            path.push(sibling.value);
+            location = this.store.getParentLocation(location);
         }
-        this.size = BigInt(leaves.length);
-        return Promise.resolve();
+        return new SiblingPath(path.length, path);
+    }
+    getLeafLocation(leafIndex) {
+        return this.leafLocations[leafIndex];
     }
     /**
-   * Calculates root while adding leaves and nodes to the cache.
-   * @param leaves - The leaves to append.
-   * @returns Resulting root of the tree.
-   */ async batchInsert(_leaves) {
-        // If we have an even number of leaves, hash them all in pairs
-        // Otherwise, store the final leaf to be shifted up to the next odd sized level
-        let [layerWidth, nodeToShift] = _leaves.length & 1 ? [
-            _leaves.length - 1,
-            serializeToBuffer(_leaves[_leaves.length - 1])
-        ] : [
-            _leaves.length,
-            Buffer.alloc(0)
-        ];
-        // Allocate this layer's leaves and init the next layer up
-        let thisLayer = _leaves.slice(0, layerWidth).map((l)=>serializeToBuffer(l));
-        let nextLayer = [];
-        // Store the bottom level leaves
-        thisLayer.forEach((leaf, i)=>this.storeNode(leaf, this.maxDepth, BigInt(i)));
-        for(let i = 0; i < this.maxDepth; i++){
-            for(let j = 0; j < layerWidth; j += 2){
-                // Store the hash of each pair one layer up
-                nextLayer[j / 2] = await this.hasher(serializeToBuffer(thisLayer[j]), serializeToBuffer(thisLayer[j + 1]));
-                this.storeNode(nextLayer[j / 2], this.maxDepth - i - 1, BigInt(j >> 1));
-            }
-            layerWidth /= 2;
-            if (layerWidth & 1) {
-                if (nodeToShift.length) {
-                    // If the next layer has odd length, and we have a node that needs to be shifted up, add it here
-                    nextLayer.push(serializeToBuffer(nodeToShift));
-                    this.storeNode(nodeToShift, this.maxDepth - i - 1, BigInt(layerWidth * 2 >> 1));
-                    layerWidth += 1;
-                    nodeToShift = Buffer.alloc(0);
+   * Adds leaves and nodes to the store. Updates the leafLocations.
+   * @param leaves - The leaves of the tree.
+   */ buildTree() {
+        this.leafLocations = this.leaves.map((value, i)=>this.store.setLeaf(i, {
+                value,
+                leafIndex: i
+            }));
+        // Start with the leaves that are not compressed.
+        let toProcess = this.leafLocations.filter((_, i)=>!this.leaves[i].equals(this.valueToCompress));
+        if (!toProcess.length) {
+            // All leaves are compressed. Set 0 to the root.
+            this.store.setNode({
+                level: 0,
+                index: 0
+            }, {
+                value: Buffer.alloc(32)
+            });
+            return;
+        }
+        const level = toProcess[0].level;
+        for(let i = level; i > 0; i--){
+            const toProcessNext = [];
+            for (const location of toProcess){
+                if (location.level !== i) {
+                    toProcessNext.push(location);
+                    continue;
+                }
+                const parentLocation = this.store.getParentLocation(location);
+                if (this.store.getNode(parentLocation)) {
+                    continue;
+                }
+                const sibling = this.store.getSibling(location);
+                // If sibling is undefined, all its children are compressed.
+                const shouldShiftUp = !sibling || sibling.value.equals(this.valueToCompress);
+                if (shouldShiftUp) {
+                    // The node becomes the parent if the sibling is a compressed leaf.
+                    const isLeaf = this.shiftNodeUp(location, parentLocation);
+                    if (!isLeaf) {
+                        this.shiftChildrenUp(location);
+                    }
                 } else {
-                    // If we don't have a node waiting to be shifted, store the next layer's final node to be shifted
-                    layerWidth -= 1;
-                    nodeToShift = nextLayer[layerWidth];
+                    // Hash the value with the (right) sibling and update the parent node.
+                    const node = this.store.getNode(location);
+                    const parentValue = this.hasher(node.value, sibling.value);
+                    this.store.setNode(parentLocation, {
+                        value: parentValue
+                    });
                 }
+                // Add the parent location to be processed next.
+                toProcessNext.push(parentLocation);
             }
-            // reset the layers
-            thisLayer = nextLayer;
-            nextLayer = [];
+            toProcess = toProcessNext;
         }
-        // return the root
-        return thisLayer[0];
     }
-    storeNode(value, depth, index) {
-        const key = indexToKeyHash(depth, index);
-        this.cache[key] = value;
-        this.valueCache[value.toString('hex')] = key;
+    shiftNodeUp(fromLocation, toLocation) {
+        const node = this.store.getNode(fromLocation);
+        this.store.setNode(toLocation, node);
+        const isLeaf = node.leafIndex !== undefined;
+        if (isLeaf) {
+            // Update the location if the node is a leaf.
+            this.leafLocations[node.leafIndex] = toLocation;
+        }
+        return isLeaf;
+    }
+    shiftChildrenUp(parent) {
+        const [left, right] = this.store.getChildLocations(parent);
+        const level = parent.level;
+        const groupSize = 2 ** level;
+        const computeNewLocation = (index)=>({
+                level,
+                index: Math.floor(index / (groupSize * 2)) * groupSize + index % groupSize
+            });
+        const isLeftLeaf = this.shiftNodeUp(left, computeNewLocation(left.index));
+        const isRightLeaf = this.shiftNodeUp(right, computeNewLocation(right.index));
+        if (!isLeftLeaf) {
+            this.shiftChildrenUp(left);
+        }
+        if (!isRightLeaf) {
+            this.shiftChildrenUp(right);
+        }
     }
 }

package/dest/trees/unbalanced_tree_store.d.ts

@@ -12,6 +12,7 @@ export declare class UnbalancedTreeStore<T> {
     getChildLocations({ level, index }: TreeNodeLocation): [TreeNodeLocation, TreeNodeLocation];
     getLeaf(leafIndex: number): T | undefined;
     getNode(location: TreeNodeLocation): T | undefined;
+    getRoot(): T | undefined;
     getParent(location: TreeNodeLocation): T | undefined;
     getSibling(location: TreeNodeLocation): T | undefined;
     getChildren(location: TreeNodeLocation): [T | undefined, T | undefined];

package/dest/trees/unbalanced_tree_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unbalanced_tree_store.d.ts","sourceRoot":"","sources":["../../src/trees/unbalanced_tree_store.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAOD,qBAAa,mBAAmB,CAAC,CAAC;;gBAIpB,SAAS,EAAE,MAAM;IAI7B,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,gBAAgB;IAiBtD,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAWpD,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,gBAAgB;IAQvE,kBAAkB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,gBAAgB;IAQxE,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAM3F,OAAO,CAAC,SAAS,EAAE,MAAM;IASzB,OAAO,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS;IAIlD,SAAS,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS;IAKpD,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS;IAKrD,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC;CAQxE"}
+{"version":3,"file":"unbalanced_tree_store.d.ts","sourceRoot":"","sources":["../../src/trees/unbalanced_tree_store.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;CACf;AAOD,qBAAa,mBAAmB,CAAC,CAAC;;gBAIpB,SAAS,EAAE,MAAM;IAI7B,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,gBAAgB;IAiBtD,OAAO,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC;IAWpD,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,gBAAgB;IAQvE,kBAAkB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,gBAAgB;IAQxE,iBAAiB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,gBAAgB,GAAG,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAM3F,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IASzC,OAAO,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS;IAIlD,OAAO,IAAI,CAAC,GAAG,SAAS;IAIxB,SAAS,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS;IAKpD,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,GAAG,SAAS;IAKrD,WAAW,CAAC,QAAQ,EAAE,gBAAgB,GAAG,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,GAAG,SAAS,CAAC;CAQxE"}

package/dest/trees/unbalanced_tree_store.js

@@ -73,6 +73,12 @@ export class UnbalancedTreeStore {
     getNode(location) {
         return this.#nodeMapping.get(this.#getKey(location))?.value;
     }
+    getRoot() {
+        return this.getNode({
+            level: 0,
+            index: 0
+        });
+    }
     getParent(location) {
         const parentLocation = this.getParentLocation(location);
         return this.getNode(parentLocation);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/foundation",
-  "version": "3.0.0-canary.a9708bd",
+  "version": "3.0.0-devnet.3",
   "type": "module",
   "main": "./dest/index.js",
   "types": "./dest/index.d.ts",
@@ -47,6 +47,7 @@
     "./noir": "./dest/noir/index.js",
     "./testing": "./dest/testing/index.js",
     "./testing/files": "./dest/testing/files/index.js",
+    "./profiler": "./dest/profiler/index.js",
     "./array": "./dest/array/index.js",
     "./validation": "./dest/validation/index.js",
     "./promise": "./dest/promise/index.js",
@@ -102,7 +103,7 @@
     "testEnvironment": "../../foundation/src/jest/env.mjs"
   },
   "dependencies": {
-    "@aztec/bb.js": "3.0.0-canary.a9708bd",
+    "@aztec/bb.js": "3.0.0-devnet.3",
     "@koa/cors": "^5.0.0",
     "@noble/curves": "=1.7.0",
     "bn.js": "^5.2.1",
@@ -112,7 +113,7 @@
     "koa": "^2.16.1",
     "koa-bodyparser": "^4.4.0",
     "koa-compress": "^5.1.0",
-    "koa-router": "^12.0.0",
+    "koa-router": "^13.1.1",
     "leveldown": "^6.1.1",
     "lodash.chunk": "^4.2.0",
     "lodash.clonedeepwith": "^4.5.0",
@@ -153,7 +154,7 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.32.1",
-    "viem": "2.23.7"
+    "viem": "npm:@spalladino/viem@2.38.2-eip7594.0"
   },
   "files": [
     "dest",

package/src/collection/object.ts

@@ -79,3 +79,11 @@ export function assertRequired<T extends object>(obj: T): Required<T> {
   }
   return obj as Required<T>;
 }
+
+/** Returns the result of merging two objects ignoring properties with undefined values. */
+export function merge<T extends object, U extends object>(
+  obj1: T,
+  obj2: U | undefined,
+): T & { [P in keyof U]+?: Exclude<U[P], undefined> } {
+  return { ...obj1, ...compact(obj2 ?? {}) };
+}

package/src/config/env_var.ts

@@ -1,7 +1,9 @@
 export type EnvVar =
+  | 'REGISTRY_CONTRACT_ADDRESS'
+  | 'FEE_ASSET_HANDLER_CONTRACT_ADDRESS'
+  | 'SLASH_FACTORY_CONTRACT_ADDRESS'
   | 'ACVM_BINARY_PATH'
   | 'ACVM_WORKING_DIRECTORY'
-  | 'GOVERNANCE_CONTRACT_ADDRESS'
   | 'API_KEY'
   | 'API_PREFIX'
   | 'ARCHIVER_MAX_LOGS'
@@ -9,7 +11,6 @@ export type EnvVar =
   | 'ARCHIVER_URL'
   | 'ARCHIVER_VIEM_POLLING_INTERVAL_MS'
   | 'ARCHIVER_BATCH_SIZE'
-  | 'ASSUME_PROVEN_THROUGH_BLOCK_NUMBER'
   | 'AZTEC_ADMIN_PORT'
   | 'AZTEC_NODE_ADMIN_URL'
   | 'AZTEC_NODE_URL'
@@ -25,6 +26,7 @@ export type EnvVar =
   | 'BLOB_SINK_URL'
   | 'BOT_DA_GAS_LIMIT'
   | 'BOT_FEE_PAYMENT_METHOD'
+  | 'BOT_BASE_FEE_PADDING'
   | 'BOT_FLUSH_SETUP_TRANSACTIONS'
   | 'BOT_FOLLOW_CHAIN'
   | 'BOT_L2_GAS_LIMIT'
@@ -37,7 +39,6 @@ export type EnvVar =
   | 'BOT_ACCOUNT_SALT'
   | 'BOT_PRIVATE_TRANSFERS_PER_TX'
   | 'BOT_PUBLIC_TRANSFERS_PER_TX'
-  | 'BOT_PXE_URL'
   | 'BOT_RECIPIENT_ENCRYPTION_SECRET'
   | 'BOT_TOKEN_CONTRACT'
   | 'BOT_TOKEN_SALT'
@@ -64,13 +65,9 @@ export type EnvVar =
   | 'DEBUG_P2P_DISABLE_COLOCATION_PENALTY'
   | 'DEPLOY_AZTEC_CONTRACTS_SALT'
   | 'ETHEREUM_HOSTS'
-  | 'FEE_JUICE_CONTRACT_ADDRESS'
-  | 'FEE_JUICE_PORTAL_CONTRACT_ADDRESS'
   | 'FEE_RECIPIENT'
   | 'FORCE_COLOR'
-  | 'GOVERNANCE_PROPOSER_CONTRACT_ADDRESS'
   | 'GOVERNANCE_PROPOSER_PAYLOAD_ADDRESS'
-  | 'INBOX_CONTRACT_ADDRESS'
   | 'KEY_STORE_DIRECTORY'
   | 'L1_CHAIN_ID'
   | 'L1_CONSENSUS_HOST_URLS'
@@ -81,8 +78,8 @@ export type EnvVar =
   | 'LOG_LEVEL'
   | 'MNEMONIC'
   | 'NETWORK'
+  | 'NETWORK_CONFIG_LOCATION'
   | 'NO_PXE'
-  | 'COIN_ISSUER_CONTRACT_ADDRESS'
   | 'USE_GCLOUD_LOGGING'
   | 'OTEL_EXPORTER_OTLP_METRICS_ENDPOINT'
   | 'OTEL_EXPORTER_OTLP_TRACES_ENDPOINT'
@@ -94,7 +91,6 @@ export type EnvVar =
   | 'PUBLIC_OTEL_INCLUDE_METRICS'
   | 'PUBLIC_OTEL_COLLECT_FROM'
   | 'PUBLIC_OTEL_OPT_OUT'
-  | 'OUTBOX_CONTRACT_ADDRESS'
   | 'P2P_BLOCK_CHECK_INTERVAL_MS'
   | 'P2P_BLOCK_REQUEST_BATCH_SIZE'
   | 'P2P_BOOTSTRAP_NODE_ENR_VERSION_CHECK'
@@ -139,6 +135,7 @@ export type EnvVar =
   | 'P2P_SEEN_MSG_CACHE_SIZE'
   | 'P2P_DROP_TX'
   | 'P2P_DROP_TX_CHANCE'
+  | 'P2P_TX_POOL_DELETE_TXS_AFTER_REORG'
   | 'PEER_ID_PRIVATE_KEY'
   | 'PEER_ID_PRIVATE_KEY_PATH'
   | 'PROVER_AGENT_COUNT'
@@ -154,6 +151,7 @@ export type EnvVar =
   | 'PROVER_COORDINATION_NODE_URLS'
   | 'PROVER_FAILED_PROOF_STORE'
   | 'PROVER_NODE_FAILED_EPOCH_STORE'
+  | 'PROVER_NODE_DISABLE_PROOF_PUBLISH'
   | 'PROVER_ID'
   | 'PROVER_NODE_POLLING_INTERVAL_MS'
   | 'PROVER_NODE_MAX_PENDING_JOBS'
@@ -162,40 +160,39 @@ export type EnvVar =
   | 'PROVER_NODE_TX_GATHERING_BATCH_SIZE'
   | 'PROVER_NODE_TX_GATHERING_MAX_PARALLEL_REQUESTS_PER_NODE'
   | 'PROVER_NODE_TX_GATHERING_TIMEOUT_MS'
-  | 'PROVER_PUBLISH_RETRY_INTERVAL_MS'
   | 'PROVER_PUBLISHER_PRIVATE_KEY'
   | 'PROVER_PUBLISHER_PRIVATE_KEYS'
   | 'PROVER_PUBLISHER_ADDRESSES'
+  | 'PROVER_PUBLISHER_ALLOW_INVALID_STATES'
   | 'PROVER_REAL_PROOFS'
   | 'PROVER_TEST_DELAY_FACTOR'
   | 'PROVER_TEST_DELAY_MS'
   | 'PROVER_TEST_DELAY_TYPE'
   | 'PXE_L2_BLOCK_BATCH_SIZE'
   | 'PXE_PROVER_ENABLED'
-  | 'REGISTRY_CONTRACT_ADDRESS'
-  | 'ROLLUP_CONTRACT_ADDRESS'
   | 'RPC_MAX_BATCH_SIZE'
   | 'RPC_MAX_BODY_SIZE'
   | 'RPC_SIMULATE_PUBLIC_MAX_GAS_LIMIT'
+  | 'RPC_SIMULATE_PUBLIC_MAX_DEBUG_LOG_MEMORY_READS'
   | 'SENTINEL_ENABLED'
   | 'SENTINEL_HISTORY_LENGTH_IN_EPOCHS'
+  | 'SENTINEL_HISTORIC_PROVEN_PERFORMANCE_LENGTH_IN_EPOCHS'
   | 'SEQ_MAX_BLOCK_SIZE_IN_BYTES'
   | 'SEQ_MAX_TX_PER_BLOCK'
   | 'SEQ_MIN_TX_PER_BLOCK'
   | 'SEQ_PUBLISH_TXS_WITH_PROPOSALS'
   | 'SEQ_MAX_DA_BLOCK_GAS'
   | 'SEQ_MAX_L2_BLOCK_GAS'
-  | 'SEQ_PUBLISH_RETRY_INTERVAL_MS'
   | 'SEQ_PUBLISHER_PRIVATE_KEY'
   | 'SEQ_PUBLISHER_PRIVATE_KEYS'
   | 'SEQ_PUBLISHER_ADDRESSES'
+  | 'SEQ_PUBLISHER_ALLOW_INVALID_STATES'
   | 'SEQ_TX_POLLING_INTERVAL_MS'
   | 'SEQ_ENFORCE_TIME_TABLE'
   | 'SEQ_MAX_L1_TX_INCLUSION_TIME_INTO_SLOT'
   | 'SEQ_ATTESTATION_PROPAGATION_TIME'
   | 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_COMMITTEE_MEMBER'
   | 'SEQ_SECONDS_BEFORE_INVALIDATING_BLOCK_AS_NON_COMMITTEE_MEMBER'
-  | 'SLASH_FACTORY_CONTRACT_ADDRESS'
   | 'SLASH_MIN_PENALTY_PERCENTAGE'
   | 'SLASH_MAX_PENALTY_PERCENTAGE'
   | 'SLASH_VALIDATORS_ALWAYS'
@@ -213,11 +210,10 @@ export type EnvVar =
   | 'SLASH_GRACE_PERIOD_L2_SLOTS'
   | 'SLASH_OFFENSE_EXPIRATION_ROUNDS'
   | 'SLASH_MAX_PAYLOAD_SIZE'
-  | 'STAKING_ASSET_CONTRACT_ADDRESS'
-  | 'STAKING_ASSET_HANDLER_CONTRACT_ADDRESS'
+  | 'SLASH_EXECUTE_ROUNDS_LOOK_BACK'
   | 'SYNC_MODE'
+  | 'SYNC_SNAPSHOTS_URLS'
   | 'SYNC_SNAPSHOTS_URL'
-  | 'REWARD_DISTRIBUTOR_CONTRACT_ADDRESS'
   | 'TELEMETRY'
   | 'TEST_ACCOUNTS'
   | 'SPONSORED_FPC'
@@ -251,9 +247,11 @@ export type EnvVar =
   | 'AZTEC_SLOT_DURATION'
   | 'AZTEC_EPOCH_DURATION'
   | 'AZTEC_TARGET_COMMITTEE_SIZE'
+  | 'AZTEC_LAG_IN_EPOCHS'
   | 'AZTEC_PROOF_SUBMISSION_EPOCHS'
   | 'AZTEC_ACTIVATION_THRESHOLD'
   | 'AZTEC_EJECTION_THRESHOLD'
+  | 'AZTEC_LOCAL_EJECTION_THRESHOLD'
   | 'AZTEC_MANA_TARGET'
   | 'AZTEC_PROVING_COST_PER_MANA'
   | 'AZTEC_SLASHING_QUORUM'
@@ -262,6 +260,7 @@ export type EnvVar =
   | 'AZTEC_SLASHING_EXECUTION_DELAY_IN_ROUNDS'
   | 'AZTEC_SLASHING_VETOER'
   | 'AZTEC_SLASHING_OFFSET_IN_ROUNDS'
+  | 'AZTEC_SLASHING_DISABLE_DURATION'
   | 'AZTEC_SLASH_AMOUNT_SMALL'
   | 'AZTEC_SLASH_AMOUNT_MEDIUM'
   | 'AZTEC_SLASH_AMOUNT_LARGE'
@@ -279,8 +278,9 @@ export type EnvVar =
   | 'L1_TX_MONITOR_CHECK_INTERVAL_MS'
   | 'L1_TX_MONITOR_STALL_TIME_MS'
   | 'L1_TX_MONITOR_TX_TIMEOUT_MS'
-  | 'L1_TX_PROPAGATION_MAX_QUERY_ATTEMPTS'
   | 'L1_TX_MONITOR_CANCEL_TX_ON_TIMEOUT'
+  | 'L1_TX_MONITOR_TX_CANCELLATION_TIMEOUT_MS'
+  | 'L1_TX_MONITOR_TX_UNSEEN_CONSIDERED_DROPPED_MS'
   | 'FAUCET_MNEMONIC_ADDRESS_INDEX'
   | 'FAUCET_ETH_AMOUNT'
   | 'FAUCET_INTERVAL_MS'
@@ -288,9 +288,8 @@ export type EnvVar =
   | 'K8S_POD_NAME'
   | 'K8S_POD_UID'
   | 'K8S_NAMESPACE_NAME'
-  | 'CUSTOM_FORWARDER_CONTRACT_ADDRESS'
-  | 'FEE_ASSET_HANDLER_CONTRACT_ADDRESS'
   | 'VALIDATOR_REEXECUTE_DEADLINE_MS'
+  | 'ALWAYS_REEXECUTE_BLOCK_PROPOSALS'
   | 'AUTO_UPDATE'
   | 'AUTO_UPDATE_URL'
   | 'WEB3_SIGNER_URL';

package/src/config/index.ts

@@ -5,6 +5,8 @@ import { SecretValue } from './secret_value.js';
 
 export { SecretValue, getActiveNetworkName };
 export type { EnvVar, NetworkNames };
+export type { NetworkConfig, NetworkConfigMap } from './network_config.js';
+export { NetworkConfigMapSchema, NetworkConfigSchema } from './network_config.js';
 
 export interface ConfigMapping {
   env?: EnvVar;
@@ -259,7 +261,7 @@ export function secretFrConfigHelper(defaultValue?: Fr): Required<
   return {
     parseEnv: parse,
     parseVal: parse,
-    defaultValue: typeof defaultValue ? new SecretValue(defaultValue) : undefined,
+    defaultValue: defaultValue !== undefined ? new SecretValue(defaultValue) : undefined,
     isBoolean: true,
   };
 }

package/src/config/network_config.ts

@@ -0,0 +1,16 @@
+import { z } from 'zod';
+
+export const NetworkConfigSchema = z
+  .object({
+    bootnodes: z.array(z.string()),
+    snapshots: z.array(z.string()),
+    registryAddress: z.string(),
+    feeAssetHandlerAddress: z.string().optional(),
+    l1ChainId: z.number(),
+  })
+  .passthrough(); // Allow additional unknown fields to pass through
+
+export const NetworkConfigMapSchema = z.record(z.string(), NetworkConfigSchema);
+
+export type NetworkConfig = z.infer<typeof NetworkConfigSchema>;
+export type NetworkConfigMap = z.infer<typeof NetworkConfigMapSchema>;

package/src/config/network_name.ts

@@ -1,13 +1,28 @@
-export type NetworkNames = 'local' | 'testnet-ignition' | 'alpha-testnet' | 'testnet';
+export type NetworkNames =
+  | 'local'
+  | 'staging-ignition'
+  | 'staging-public'
+  | 'testnet'
+  | 'mainnet'
+  | 'next-net'
+  | 'devnet';
 
 export function getActiveNetworkName(name?: string): NetworkNames {
   const network = name || process.env.NETWORK;
   if (!network || network === '' || network === 'local') {
     return 'local';
-  } else if (network === 'testnet-ignition') {
+  } else if (network === 'staging-ignition') {
     return network;
-  } else if (network === 'alpha-testnet' || network === 'testnet') {
+  } else if (network === 'staging-public') {
     return network;
+  } else if (network === 'testnet' || network === 'alpha-testnet') {
+    return 'testnet';
+  } else if (network === 'mainnet') {
+    return 'mainnet';
+  } else if (network === 'next-net') {
+    return 'next-net';
+  } else if (network === 'devnet') {
+    return 'devnet';
   }
   throw new Error(`Unknown network: ${network}`);
 }

package/src/crypto/aes128/index.ts

@@ -1,4 +1,4 @@
-import { BarretenbergSync, RawBuffer } from '@aztec/bb.js';
+import { BarretenbergSync } from '@aztec/bb.js';
 
 import { Buffer } from 'buffer';
 
@@ -22,10 +22,15 @@ export class Aes128 {
     paddingBuffer.fill(numPaddingBytes);
     const input = Buffer.concat([data, paddingBuffer]);
 
-    const api = await BarretenbergSync.initSingleton(process.env.BB_WASM_PATH);
-    return Buffer.from(
-      api.aesEncryptBufferCbc(new RawBuffer(input), new RawBuffer(iv), new RawBuffer(key), input.length),
-    );
+    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    const api = BarretenbergSync.getSingleton();
+    const response = api.aesEncrypt({
+      plaintext: input,
+      iv,
+      key,
+      length: input.length,
+    });
+    return Buffer.from(response.ciphertext);
   }
 
   /**
@@ -37,11 +42,15 @@ export class Aes128 {
    * @returns Decrypted data.
    */
   public async decryptBufferCBCKeepPadding(data: Uint8Array, iv: Uint8Array, key: Uint8Array): Promise<Buffer> {
-    const api = await BarretenbergSync.initSingleton(process.env.BB_WASM_PATH);
-    const paddedBuffer = Buffer.from(
-      api.aesDecryptBufferCbc(new RawBuffer(data), new RawBuffer(iv), new RawBuffer(key), data.length),
-    );
-    return paddedBuffer;
+    await BarretenbergSync.initSingleton({ wasmPath: process.env.BB_WASM_PATH });
+    const api = BarretenbergSync.getSingleton();
+    const response = api.aesDecrypt({
+      ciphertext: data,
+      iv,
+      key,
+      length: data.length,
+    });
+    return Buffer.from(response.plaintext);
   }
 
   /**