@aztec/protocol-contracts 0.76.3 → 0.76.4-devnet-test

package/dest/build_protocol_contract_tree.d.ts

@@ -1,6 +1,6 @@
-import { type AztecAddress, type Fr, type MerkleTree } from '@aztec/circuits.js';
+import { type AztecAddress, type Fr, type IndexedMerkleTree, PROTOCOL_CONTRACT_TREE_HEIGHT, ProtocolContractLeafPreimage } from '@aztec/circuits.js';
 export declare function buildProtocolContractTree(contracts: {
     address: AztecAddress;
     leaf: Fr;
-}[]): Promise<MerkleTree>;
+}[]): Promise<IndexedMerkleTree<ProtocolContractLeafPreimage, typeof PROTOCOL_CONTRACT_TREE_HEIGHT>>;
 //# sourceMappingURL=build_protocol_contract_tree.d.ts.map

package/dest/build_protocol_contract_tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build_protocol_contract_tree.d.ts","sourceRoot":"","sources":["../src/build_protocol_contract_tree.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,EAAE,EACP,KAAK,UAAU,EAGhB,MAAM,oBAAoB,CAAC;AAG5B,wBAAsB,yBAAyB,CAAC,SAAS,EAAE;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,EAAE,CAAA;CAAE,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAarH"}
+{"version":3,"file":"build_protocol_contract_tree.d.ts","sourceRoot":"","sources":["../src/build_protocol_contract_tree.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,EAAE,EACP,KAAK,iBAAiB,EAGtB,6BAA6B,EAC7B,4BAA4B,EAC7B,MAAM,oBAAoB,CAAC;AAG5B,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,EAAE,CAAA;CAAE,EAAE,GAC/C,OAAO,CAAC,iBAAiB,CAAC,4BAA4B,EAAE,OAAO,6BAA6B,CAAC,CAAC,CAmBhG"}

package/dest/build_protocol_contract_tree.js

@@ -1,12 +1,16 @@
-import { MerkleTreeCalculator, PROTOCOL_CONTRACT_TREE_HEIGHT, } from '@aztec/circuits.js';
+import { IndexedMerkleTreeCalculator, MAX_PROTOCOL_CONTRACTS, PROTOCOL_CONTRACT_TREE_HEIGHT, ProtocolContractLeafPreimage, } from '@aztec/circuits.js';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 export async function buildProtocolContractTree(contracts) {
-    const calculator = await MerkleTreeCalculator.create(PROTOCOL_CONTRACT_TREE_HEIGHT, Buffer.alloc(32), async (a, b) => (await poseidon2Hash([a, b])).toBuffer());
-    const leaves = new Array(2 ** PROTOCOL_CONTRACT_TREE_HEIGHT).fill(Buffer.alloc(32));
+    const hasher = {
+        hash: async (l, r) => (await poseidon2Hash([l, r])).toBuffer(),
+        hashInputs: async (i) => (await poseidon2Hash(i)).toBuffer(),
+    };
+    const calculator = await IndexedMerkleTreeCalculator.create(PROTOCOL_CONTRACT_TREE_HEIGHT, hasher, ProtocolContractLeafPreimage);
+    const leaves = new Array(MAX_PROTOCOL_CONTRACTS).fill(Buffer.alloc(32));
     for (const contract of contracts) {
         const index = contract.address.toField().toNumber();
-        leaves[index] = contract.leaf;
+        leaves[index] = contract.leaf.toBuffer();
     }
     return calculator.computeTree(leaves);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRfcHJvdG9jb2xfY29udHJhY3RfdHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9idWlsZF9wcm90b2NvbF9jb250cmFjdF90cmVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFJTCxvQkFBb0IsRUFDcEIsNkJBQTZCLEdBQzlCLE1BQU0sb0JBQW9CLENBQUM7QUFDNUIsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBRXpELE1BQU0sQ0FBQyxLQUFLLFVBQVUseUJBQXlCLENBQUMsU0FBZ0Q7SUFDOUYsTUFBTSxVQUFVLEdBQUcsTUFBTSxvQkFBb0IsQ0FBQyxNQUFNLENBQUMsNkJBQTZCLEVBQUUsTUFBTSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQ25ILENBQUMsTUFBTSxhQUFhLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUN6QyxDQUFDO0lBRUYsTUFBTSxNQUFNLEdBQUcsSUFBSSxLQUFLLENBQUMsQ0FBQyxJQUFJLDZCQUE2QixDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUVwRixLQUFLLE1BQU0sUUFBUSxJQUFJLFNBQVMsRUFBRSxDQUFDO1FBQ2pDLE1BQU0sS0FBSyxHQUFHLFFBQVEsQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsUUFBUSxFQUFFLENBQUM7UUFDcEQsTUFBTSxDQUFDLEtBQUssQ0FBQyxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUM7SUFDaEMsQ0FBQztJQUVELE9BQU8sVUFBVSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN4QyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYnVpbGRfcHJvdG9jb2xfY29udHJhY3RfdHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9idWlsZF9wcm90b2NvbF9jb250cmFjdF90cmVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFJTCwyQkFBMkIsRUFDM0Isc0JBQXNCLEVBQ3RCLDZCQUE2QixFQUM3Qiw0QkFBNEIsR0FDN0IsTUFBTSxvQkFBb0IsQ0FBQztBQUM1QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sMEJBQTBCLENBQUM7QUFFekQsTUFBTSxDQUFDLEtBQUssVUFBVSx5QkFBeUIsQ0FDN0MsU0FBZ0Q7SUFFaEQsTUFBTSxNQUFNLEdBQUc7UUFDYixJQUFJLEVBQUUsS0FBSyxFQUFFLENBQVMsRUFBRSxDQUFTLEVBQUUsRUFBRSxDQUFDLENBQUMsTUFBTSxhQUFhLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtRQUM5RSxVQUFVLEVBQUUsS0FBSyxFQUFFLENBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQyxNQUFNLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRTtLQUN2RSxDQUFDO0lBQ0YsTUFBTSxVQUFVLEdBQUcsTUFBTSwyQkFBMkIsQ0FBQyxNQUFNLENBQ3pELDZCQUE2QixFQUM3QixNQUFNLEVBQ04sNEJBQTRCLENBQzdCLENBQUM7SUFFRixNQUFNLE1BQU0sR0FBRyxJQUFJLEtBQUssQ0FBQyxzQkFBc0IsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFFeEUsS0FBSyxNQUFNLFFBQVEsSUFBSSxTQUFTLEVBQUUsQ0FBQztRQUNqQyxNQUFNLEtBQUssR0FBRyxRQUFRLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRSxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ3BELE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxRQUFRLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzNDLENBQUM7SUFFRCxPQUFPLFVBQVUsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDeEMsQ0FBQyJ9

package/dest/protocol_contract_data.d.ts

@@ -3,7 +3,7 @@ export declare const protocolContractNames: readonly ["AuthRegistry", "ContractI
 export type ProtocolContractName = (typeof protocolContractNames)[number];
 export declare const ProtocolContractSalt: Record<ProtocolContractName, Fr>;
 export declare const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress>;
-export declare const ProtocolContractLeaf: {
+export declare const ProtocolContractLeaves: {
     AuthRegistry: Fr;
     ContractInstanceDeployer: Fr;
     ContractClassRegisterer: Fr;

package/dest/protocol_contract_data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol_contract_data.d.ts","sourceRoot":"","sources":["../src/protocol_contract_data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAEtD,eAAO,MAAM,qBAAqB,+HAOxB,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1E,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,EAAE,EAAE,CAOjE,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAO9E,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;;CAOhC,CAAC;AAEF,eAAO,MAAM,wBAAwB,IAEpC,CAAC;AAEF,eAAO,MAAM,wCAAwC,IAEpD,CAAC;AACF,eAAO,MAAM,2CAA2C,IAEvD,CAAC;AACF,eAAO,MAAM,iDAAiD,IAE7D,CAAC;AACF,eAAO,MAAM,uCAAuC,IAEnD,CAAC"}
+{"version":3,"file":"protocol_contract_data.d.ts","sourceRoot":"","sources":["../src/protocol_contract_data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAEtD,eAAO,MAAM,qBAAqB,+HAOxB,CAAC;AAEX,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,qBAAqB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1E,eAAO,MAAM,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,EAAE,EAAE,CAOjE,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAO9E,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;CAOlC,CAAC;AAEF,eAAO,MAAM,wBAAwB,IAEpC,CAAC;AAEF,eAAO,MAAM,wCAAwC,IAEpD,CAAC;AACF,eAAO,MAAM,2CAA2C,IAEvD,CAAC;AACF,eAAO,MAAM,iDAAiD,IAE7D,CAAC;AACF,eAAO,MAAM,uCAAuC,IAEnD,CAAC"}

package/dest/protocol_contract_data.js

@@ -24,17 +24,17 @@ export const ProtocolContractAddress = {
     FeeJuice: AztecAddress.fromBigInt(5n),
     Router: AztecAddress.fromBigInt(6n),
 };
-export const ProtocolContractLeaf = {
+export const ProtocolContractLeaves = {
     AuthRegistry: Fr.fromHexString('0x2e9b53693d0b765a2b3ba243a294d01280ad7cd80014562779c0e3fa7769c6c0'),
     ContractInstanceDeployer: Fr.fromHexString('0x1665c5fbc1e58ba19c82f64c0402d29e8bbf94b1fde1a056280d081c15b0dac1'),
     ContractClassRegisterer: Fr.fromHexString('0x1a11045c0895e4ba1d6bd55c52e7b493c301c079234354dd85f113903f0a8270'),
     MultiCallEntrypoint: Fr.fromHexString('0x237a0bac451ebac796b96dbe27ccfda5230e8c962b391b84b0304c3775e9e0c0'),
-    FeeJuice: Fr.fromHexString('0x2946115660107c3ca9bea1e486452595999c3677e7aaeaa9ca898e0fbba0051a'),
+    FeeJuice: Fr.fromHexString('0x0bd5f44eb8429a4ea8ca193232e5ee576b300995ce5f88935aa03b0869fe13d5'),
     Router: Fr.fromHexString('0x1281e0c1842212e79fa2249877524dda4f07f3d42cb502097302737bd3177550'),
 };
-export const protocolContractTreeRoot = Fr.fromHexString('0x16302d6e5de3b53d9f936790a52a80a26b2c2a9c262392872e77c7e317fb4c10');
+export const protocolContractTreeRoot = Fr.fromHexString('0x26d63d5bcf09b75cc6e123b591dd3e327347d30fe236061f7613ba8d7c5fdac6');
 export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = new Fr(11121068431693264234253912047066709627593769337094408533543930778360n);
 export const REGISTERER_PRIVATE_FUNCTION_BROADCASTED_TAG = new Fr(2889881020989534926461066592611988634597302675057895885580456197069n);
 export const REGISTERER_UNCONSTRAINED_FUNCTION_BROADCASTED_TAG = new Fr(24399338136397901754495080759185489776044879232766421623673792970137n);
 export const DEPLOYER_CONTRACT_INSTANCE_DEPLOYED_TAG = Fr.fromHexString('0x2ec28b91a5f838506d6042915005ff55cf7a0a5f889a83b11faed33a31b486f2');
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdG9jb2xfY29udHJhY3RfZGF0YS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wcm90b2NvbF9jb250cmFjdF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRFQUE0RTtBQUM1RSxPQUFPLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXRELE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHO0lBQ25DLGNBQWM7SUFDZCwwQkFBMEI7SUFDMUIseUJBQXlCO0lBQ3pCLHFCQUFxQjtJQUNyQixVQUFVO0lBQ1YsUUFBUTtDQUNBLENBQUM7QUFJWCxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBcUM7SUFDcEUsWUFBWSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztJQUN2Qix3QkFBd0IsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDbkMsdUJBQXVCLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ2xDLG1CQUFtQixFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztJQUM5QixRQUFRLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ25CLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7Q0FDbEIsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLHVCQUF1QixHQUErQztJQUNqRixZQUFZLEVBQUUsWUFBWSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7SUFDekMsd0JBQXdCLEVBQUUsWUFBWSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7SUFDckQsdUJBQXVCLEVBQUUsWUFBWSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7SUFDcEQsbUJBQW1CLEVBQUUsWUFBWSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7SUFDaEQsUUFBUSxFQUFFLFlBQVksQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO0lBQ3JDLE1BQU0sRUFBRSxZQUFZLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztDQUNwQyxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sb0JBQW9CLEdBQUc7SUFDbEMsWUFBWSxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsb0VBQW9FLENBQUM7SUFDcEcsd0JBQXdCLEVBQUUsRUFBRSxDQUFDLGFBQWEsQ0FBQyxvRUFBb0UsQ0FBQztJQUNoSCx1QkFBdUIsRUFBRSxFQUFFLENBQUMsYUFBYSxDQUFDLG9FQUFvRSxDQUFDO0lBQy9HLG1CQUFtQixFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsb0VBQW9FLENBQUM7SUFDM0csUUFBUSxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsb0VBQW9FLENBQUM7SUFDaEcsTUFBTSxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsb0VBQW9FLENBQUM7Q0FDL0YsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLHdCQUF3QixHQUFHLEVBQUUsQ0FBQyxhQUFhLENBQ3RELG9FQUFvRSxDQUNyRSxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sd0NBQXdDLEdBQUcsSUFBSSxFQUFFLENBQzVELHFFQUFxRSxDQUN0RSxDQUFDO0FBQ0YsTUFBTSxDQUFDLE1BQU0sMkNBQTJDLEdBQUcsSUFBSSxFQUFFLENBQy9ELG9FQUFvRSxDQUNyRSxDQUFDO0FBQ0YsTUFBTSxDQUFDLE1BQU0saURBQWlELEdBQUcsSUFBSSxFQUFFLENBQ3JFLHFFQUFxRSxDQUN0RSxDQUFDO0FBQ0YsTUFBTSxDQUFDLE1BQU0sdUNBQXVDLEdBQUcsRUFBRSxDQUFDLGFBQWEsQ0FDckUsb0VBQW9FLENBQ3JFLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdG9jb2xfY29udHJhY3RfZGF0YS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wcm90b2NvbF9jb250cmFjdF9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDRFQUE0RTtBQUM1RSxPQUFPLEVBQUUsWUFBWSxFQUFFLEVBQUUsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRXRELE1BQU0sQ0FBQyxNQUFNLHFCQUFxQixHQUFHO0lBQ25DLGNBQWM7SUFDZCwwQkFBMEI7SUFDMUIseUJBQXlCO0lBQ3pCLHFCQUFxQjtJQUNyQixVQUFVO0lBQ1YsUUFBUTtDQUNBLENBQUM7QUFJWCxNQUFNLENBQUMsTUFBTSxvQkFBb0IsR0FBcUM7SUFDcEUsWUFBWSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztJQUN2Qix3QkFBd0IsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDbkMsdUJBQXVCLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ2xDLG1CQUFtQixFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsQ0FBQztJQUM5QixRQUFRLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQ25CLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDLENBQUM7Q0FDbEIsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLHVCQUF1QixHQUErQztJQUNqRixZQUFZLEVBQUUsWUFBWSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7SUFDekMsd0JBQXdCLEVBQUUsWUFBWSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7SUFDckQsdUJBQXVCLEVBQUUsWUFBWSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7SUFDcEQsbUJBQW1CLEVBQUUsWUFBWSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUM7SUFDaEQsUUFBUSxFQUFFLFlBQVksQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDO0lBQ3JDLE1BQU0sRUFBRSxZQUFZLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQztDQUNwQyxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sc0JBQXNCLEdBQUc7SUFDcEMsWUFBWSxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsb0VBQW9FLENBQUM7SUFDcEcsd0JBQXdCLEVBQUUsRUFBRSxDQUFDLGFBQWEsQ0FBQyxvRUFBb0UsQ0FBQztJQUNoSCx1QkFBdUIsRUFBRSxFQUFFLENBQUMsYUFBYSxDQUFDLG9FQUFvRSxDQUFDO0lBQy9HLG1CQUFtQixFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsb0VBQW9FLENBQUM7SUFDM0csUUFBUSxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsb0VBQW9FLENBQUM7SUFDaEcsTUFBTSxFQUFFLEVBQUUsQ0FBQyxhQUFhLENBQUMsb0VBQW9FLENBQUM7Q0FDL0YsQ0FBQztBQUVGLE1BQU0sQ0FBQyxNQUFNLHdCQUF3QixHQUFHLEVBQUUsQ0FBQyxhQUFhLENBQ3RELG9FQUFvRSxDQUNyRSxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sd0NBQXdDLEdBQUcsSUFBSSxFQUFFLENBQzVELHFFQUFxRSxDQUN0RSxDQUFDO0FBQ0YsTUFBTSxDQUFDLE1BQU0sMkNBQTJDLEdBQUcsSUFBSSxFQUFFLENBQy9ELG9FQUFvRSxDQUNyRSxDQUFDO0FBQ0YsTUFBTSxDQUFDLE1BQU0saURBQWlELEdBQUcsSUFBSSxFQUFFLENBQ3JFLHFFQUFxRSxDQUN0RSxDQUFDO0FBQ0YsTUFBTSxDQUFDLE1BQU0sdUNBQXVDLEdBQUcsRUFBRSxDQUFDLGFBQWEsQ0FDckUsb0VBQW9FLENBQ3JFLENBQUMifQ==

package/dest/protocol_contract_tree.d.ts

@@ -1,3 +1,6 @@
-import { type AztecAddress, Fr } from '@aztec/circuits.js';
-export declare function getProtocolContractSiblingPath(address: AztecAddress): Promise<[Fr, Fr, Fr]>;
+import { type AztecAddress, type ProtocolContractLeafPreimage } from '@aztec/circuits.js';
+export declare function getProtocolContractLeafAndMembershipWitness(address: AztecAddress): Promise<{
+    lowLeaf: ProtocolContractLeafPreimage;
+    witness: import("@aztec/circuits.js").MembershipWitness<3>;
+}>;
 //# sourceMappingURL=protocol_contract_tree.d.ts.map

package/dest/protocol_contract_tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protocol_contract_tree.d.ts","sourceRoot":"","sources":["../src/protocol_contract_tree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,EAAE,EAAkD,MAAM,oBAAoB,CAAC;AAmB3G,wBAAsB,8BAA8B,CAAC,OAAO,EAAE,YAAY,yBAOzE"}
+{"version":3,"file":"protocol_contract_tree.d.ts","sourceRoot":"","sources":["../src/protocol_contract_tree.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EAGjB,KAAK,4BAA4B,EAClC,MAAM,oBAAoB,CAAC;AAsB5B,wBAAsB,2CAA2C,CAAC,OAAO,EAAE,YAAY;;;GActF"}

package/dest/protocol_contract_tree.js

@@ -1,21 +1,32 @@
-import { Fr, PROTOCOL_CONTRACT_TREE_HEIGHT } from '@aztec/circuits.js';
-import { assertLength } from '@aztec/foundation/serialize';
+import { poseidon2Hash } from '@aztec/foundation/crypto';
 import { buildProtocolContractTree } from './build_protocol_contract_tree.js';
-import { ProtocolContractAddress, ProtocolContractLeaf, protocolContractNames } from './protocol_contract_data.js';
+import { isProtocolContract } from './protocol_contract.js';
+import { ProtocolContractAddress, ProtocolContractLeaves, protocolContractNames } from './protocol_contract_data.js';
 let protocolContractTree;
 async function getTree() {
     if (!protocolContractTree) {
         const leaves = protocolContractNames.map(name => ({
             address: ProtocolContractAddress[name],
-            leaf: ProtocolContractLeaf[name],
+            leaf: ProtocolContractLeaves[name],
         }));
         protocolContractTree = await buildProtocolContractTree(leaves);
     }
     return protocolContractTree;
 }
-export async function getProtocolContractSiblingPath(address) {
+export async function getProtocolContractLeafAndMembershipWitness(address) {
     const tree = await getTree();
-    const index = address.toField().toNumber();
-    return assertLength(tree.getSiblingPath(index).map(buf => new Fr(buf)), PROTOCOL_CONTRACT_TREE_HEIGHT);
+    let lowLeaf;
+    let witness;
+    if (isProtocolContract(address)) {
+        const index = address.toField().toNumber();
+        lowLeaf = tree.leafPreimages[index];
+        witness = tree.getMembershipWitness(index);
+    }
+    else {
+        lowLeaf = tree.getLowLeaf(address.toBigInt());
+        const hashed = (await poseidon2Hash(lowLeaf.toHashInputs())).toBuffer();
+        witness = tree.getMembershipWitness(hashed);
+    }
+    return { lowLeaf, witness };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdG9jb2xfY29udHJhY3RfdHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wcm90b2NvbF9jb250cmFjdF90cmVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBcUIsRUFBRSxFQUFtQiw2QkFBNkIsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBQzNHLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUUzRCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUM5RSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsb0JBQW9CLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVuSCxJQUFJLG9CQUE0QyxDQUFDO0FBRWpELEtBQUssVUFBVSxPQUFPO0lBQ3BCLElBQUksQ0FBQyxvQkFBb0IsRUFBRSxDQUFDO1FBQzFCLE1BQU0sTUFBTSxHQUFHLHFCQUFxQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDaEQsT0FBTyxFQUFFLHVCQUF1QixDQUFDLElBQUksQ0FBQztZQUN0QyxJQUFJLEVBQUUsb0JBQW9CLENBQUMsSUFBSSxDQUFDO1NBQ2pDLENBQUMsQ0FBQyxDQUFDO1FBQ0osb0JBQW9CLEdBQUcsTUFBTSx5QkFBeUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztJQUNqRSxDQUFDO0lBQ0QsT0FBTyxvQkFBb0IsQ0FBQztBQUM5QixDQUFDO0FBRUQsTUFBTSxDQUFDLEtBQUssVUFBVSw4QkFBOEIsQ0FBQyxPQUFxQjtJQUN4RSxNQUFNLElBQUksR0FBRyxNQUFNLE9BQU8sRUFBRSxDQUFDO0lBQzdCLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQztJQUMzQyxPQUFPLFlBQVksQ0FDakIsSUFBSSxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUNsRCw2QkFBNkIsQ0FDOUIsQ0FBQztBQUNKLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdG9jb2xfY29udHJhY3RfdHJlZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wcm90b2NvbF9jb250cmFjdF90cmVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQU1BLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSwwQkFBMEIsQ0FBQztBQUV6RCxPQUFPLEVBQUUseUJBQXlCLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUM5RSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSx3QkFBd0IsQ0FBQztBQUM1RCxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsc0JBQXNCLEVBQUUscUJBQXFCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVySCxJQUFJLG9CQUVTLENBQUM7QUFFZCxLQUFLLFVBQVUsT0FBTztJQUNwQixJQUFJLENBQUMsb0JBQW9CLEVBQUUsQ0FBQztRQUMxQixNQUFNLE1BQU0sR0FBRyxxQkFBcUIsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1lBQ2hELE9BQU8sRUFBRSx1QkFBdUIsQ0FBQyxJQUFJLENBQUM7WUFDdEMsSUFBSSxFQUFFLHNCQUFzQixDQUFDLElBQUksQ0FBQztTQUNuQyxDQUFDLENBQUMsQ0FBQztRQUNKLG9CQUFvQixHQUFHLE1BQU0seUJBQXlCLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDakUsQ0FBQztJQUNELE9BQU8sb0JBQW9CLENBQUM7QUFDOUIsQ0FBQztBQUVELE1BQU0sQ0FBQyxLQUFLLFVBQVUsMkNBQTJDLENBQUMsT0FBcUI7SUFDckYsTUFBTSxJQUFJLEdBQUcsTUFBTSxPQUFPLEVBQUUsQ0FBQztJQUM3QixJQUFJLE9BQU8sQ0FBQztJQUNaLElBQUksT0FBTyxDQUFDO0lBQ1osSUFBSSxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1FBQ2hDLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxPQUFPLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUMzQyxPQUFPLEdBQUcsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNwQyxPQUFPLEdBQUcsSUFBSSxDQUFDLG9CQUFvQixDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzdDLENBQUM7U0FBTSxDQUFDO1FBQ04sT0FBTyxHQUFHLElBQUksQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRSxDQUFDLENBQUM7UUFDOUMsTUFBTSxNQUFNLEdBQUcsQ0FBQyxNQUFNLGFBQWEsQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO1FBQ3hFLE9BQU8sR0FBRyxJQUFJLENBQUMsb0JBQW9CLENBQUMsTUFBTSxDQUFDLENBQUM7SUFDOUMsQ0FBQztJQUNELE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLENBQUM7QUFDOUIsQ0FBQyJ9

package/package.json

@@ -2,7 +2,7 @@
   "name": "@aztec/protocol-contracts",
   "homepage": "https://github.com/AztecProtocol/aztec-packages/tree/master/yarn-project/protocol-contracts",
   "description": "Canonical Noir contracts for the Aztec Network",
-  "version": "0.76.3",
+  "version": "0.76.4-devnet-test",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -69,9 +69,9 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuits.js": "0.76.3",
-    "@aztec/foundation": "0.76.3",
-    "@aztec/types": "0.76.3",
+    "@aztec/circuits.js": "0.76.4-devnet-test",
+    "@aztec/foundation": "0.76.4-devnet-test",
+    "@aztec/types": "0.76.4-devnet-test",
     "lodash.chunk": "^4.2.0",
     "lodash.omit": "^4.5.0",
     "tslib": "^2.4.0"

package/src/build_protocol_contract_tree.ts

@@ -1,22 +1,32 @@
 import {
   type AztecAddress,
   type Fr,
-  type MerkleTree,
-  MerkleTreeCalculator,
+  type IndexedMerkleTree,
+  IndexedMerkleTreeCalculator,
+  MAX_PROTOCOL_CONTRACTS,
   PROTOCOL_CONTRACT_TREE_HEIGHT,
+  ProtocolContractLeafPreimage,
 } from '@aztec/circuits.js';
 import { poseidon2Hash } from '@aztec/foundation/crypto';
 
-export async function buildProtocolContractTree(contracts: { address: AztecAddress; leaf: Fr }[]): Promise<MerkleTree> {
-  const calculator = await MerkleTreeCalculator.create(PROTOCOL_CONTRACT_TREE_HEIGHT, Buffer.alloc(32), async (a, b) =>
-    (await poseidon2Hash([a, b])).toBuffer(),
+export async function buildProtocolContractTree(
+  contracts: { address: AztecAddress; leaf: Fr }[],
+): Promise<IndexedMerkleTree<ProtocolContractLeafPreimage, typeof PROTOCOL_CONTRACT_TREE_HEIGHT>> {
+  const hasher = {
+    hash: async (l: Buffer, r: Buffer) => (await poseidon2Hash([l, r])).toBuffer(),
+    hashInputs: async (i: Buffer[]) => (await poseidon2Hash(i)).toBuffer(),
+  };
+  const calculator = await IndexedMerkleTreeCalculator.create(
+    PROTOCOL_CONTRACT_TREE_HEIGHT,
+    hasher,
+    ProtocolContractLeafPreimage,
   );
 
-  const leaves = new Array(2 ** PROTOCOL_CONTRACT_TREE_HEIGHT).fill(Buffer.alloc(32));
+  const leaves = new Array(MAX_PROTOCOL_CONTRACTS).fill(Buffer.alloc(32));
 
   for (const contract of contracts) {
     const index = contract.address.toField().toNumber();
-    leaves[index] = contract.leaf;
+    leaves[index] = contract.leaf.toBuffer();
   }
 
   return calculator.computeTree(leaves);

package/src/protocol_contract_data.ts

@@ -30,17 +30,17 @@ export const ProtocolContractAddress: Record<ProtocolContractName, AztecAddress>
   Router: AztecAddress.fromBigInt(6n),
 };
 
-export const ProtocolContractLeaf = {
+export const ProtocolContractLeaves = {
   AuthRegistry: Fr.fromHexString('0x2e9b53693d0b765a2b3ba243a294d01280ad7cd80014562779c0e3fa7769c6c0'),
   ContractInstanceDeployer: Fr.fromHexString('0x1665c5fbc1e58ba19c82f64c0402d29e8bbf94b1fde1a056280d081c15b0dac1'),
   ContractClassRegisterer: Fr.fromHexString('0x1a11045c0895e4ba1d6bd55c52e7b493c301c079234354dd85f113903f0a8270'),
   MultiCallEntrypoint: Fr.fromHexString('0x237a0bac451ebac796b96dbe27ccfda5230e8c962b391b84b0304c3775e9e0c0'),
-  FeeJuice: Fr.fromHexString('0x2946115660107c3ca9bea1e486452595999c3677e7aaeaa9ca898e0fbba0051a'),
+  FeeJuice: Fr.fromHexString('0x0bd5f44eb8429a4ea8ca193232e5ee576b300995ce5f88935aa03b0869fe13d5'),
   Router: Fr.fromHexString('0x1281e0c1842212e79fa2249877524dda4f07f3d42cb502097302737bd3177550'),
 };
 
 export const protocolContractTreeRoot = Fr.fromHexString(
-  '0x16302d6e5de3b53d9f936790a52a80a26b2c2a9c262392872e77c7e317fb4c10',
+  '0x26d63d5bcf09b75cc6e123b591dd3e327347d30fe236061f7613ba8d7c5fdac6',
 );
 
 export const REGISTERER_CONTRACT_CLASS_REGISTERED_TAG = new Fr(

package/src/protocol_contract_tree.ts

@@ -1,27 +1,42 @@
-import { type AztecAddress, Fr, type MerkleTree, PROTOCOL_CONTRACT_TREE_HEIGHT } from '@aztec/circuits.js';
-import { assertLength } from '@aztec/foundation/serialize';
+import {
+  type AztecAddress,
+  type IndexedMerkleTree,
+  type PROTOCOL_CONTRACT_TREE_HEIGHT,
+  type ProtocolContractLeafPreimage,
+} from '@aztec/circuits.js';
+import { poseidon2Hash } from '@aztec/foundation/crypto';
 
 import { buildProtocolContractTree } from './build_protocol_contract_tree.js';
-import { ProtocolContractAddress, ProtocolContractLeaf, protocolContractNames } from './protocol_contract_data.js';
+import { isProtocolContract } from './protocol_contract.js';
+import { ProtocolContractAddress, ProtocolContractLeaves, protocolContractNames } from './protocol_contract_data.js';
 
-let protocolContractTree: MerkleTree | undefined;
+let protocolContractTree:
+  | IndexedMerkleTree<ProtocolContractLeafPreimage, typeof PROTOCOL_CONTRACT_TREE_HEIGHT>
+  | undefined;
 
 async function getTree() {
   if (!protocolContractTree) {
     const leaves = protocolContractNames.map(name => ({
       address: ProtocolContractAddress[name],
-      leaf: ProtocolContractLeaf[name],
+      leaf: ProtocolContractLeaves[name],
     }));
     protocolContractTree = await buildProtocolContractTree(leaves);
   }
   return protocolContractTree;
 }
 
-export async function getProtocolContractSiblingPath(address: AztecAddress) {
+export async function getProtocolContractLeafAndMembershipWitness(address: AztecAddress) {
   const tree = await getTree();
-  const index = address.toField().toNumber();
-  return assertLength<Fr, typeof PROTOCOL_CONTRACT_TREE_HEIGHT>(
-    tree.getSiblingPath(index).map(buf => new Fr(buf)),
-    PROTOCOL_CONTRACT_TREE_HEIGHT,
-  );
+  let lowLeaf;
+  let witness;
+  if (isProtocolContract(address)) {
+    const index = address.toField().toNumber();
+    lowLeaf = tree.leafPreimages[index];
+    witness = tree.getMembershipWitness(index);
+  } else {
+    lowLeaf = tree.getLowLeaf(address.toBigInt());
+    const hashed = (await poseidon2Hash(lowLeaf.toHashInputs())).toBuffer();
+    witness = tree.getMembershipWitness(hashed);
+  }
+  return { lowLeaf, witness };
 }