@aztec-labs/stdlib 6.0.0-rc.2 → 6.0.0-rc.3

package/dest/contract/contract_address.d.ts

@@ -8,7 +8,7 @@ import type { PartialAddress } from './partial_address.js';
  * ```
  * salted_initialization_hash = poseidon2(DOM_SEP__SALTED_INITIALIZATION_HASH, [salt, initialization_hash, deployer, immutables_hash])
  * partial_address = poseidon2(DOM_SEP__PARTIAL_ADDRESS, [contract_class_id, salted_initialization_hash])
- * address = ((poseidon2(DOM_SEP__CONTRACT_ADDRESS_V2, [public_keys_hash, partial_address]) * G) + ivpk_m).x <- the x-coordinate of the address point
+ * address = ((poseidon2(DOM_SEP__CONTRACT_ADDRESS_V3, [public_keys_hash, partial_address]) * G) + ivpk_m).x <- the x-coordinate of the address point
  * ```
  * @param instance - A contract instance for which to calculate the deployment address.
  */

package/dest/contract/contract_address.js

@@ -10,7 +10,7 @@ import { computeAddress } from '../keys/index.js';
  * ```
  * salted_initialization_hash = poseidon2(DOM_SEP__SALTED_INITIALIZATION_HASH, [salt, initialization_hash, deployer, immutables_hash])
  * partial_address = poseidon2(DOM_SEP__PARTIAL_ADDRESS, [contract_class_id, salted_initialization_hash])
- * address = ((poseidon2(DOM_SEP__CONTRACT_ADDRESS_V2, [public_keys_hash, partial_address]) * G) + ivpk_m).x <- the x-coordinate of the address point
+ * address = ((poseidon2(DOM_SEP__CONTRACT_ADDRESS_V3, [public_keys_hash, partial_address]) * G) + ivpk_m).x <- the x-coordinate of the address point
  * ```
  * @param instance - A contract instance for which to calculate the deployment address.
  */ export async function computeContractAddressFromInstance(instance) {

package/dest/gas/fee_math.d.ts

@@ -3,8 +3,8 @@
  * Used to predict worst-case min fees over a future window of L2 slots.
  */
 export declare const MINIMUM_CONGESTION_MULTIPLIER = 1000000000n;
-export declare const L1_GAS_PER_CHECKPOINT_PROPOSED = 500000n;
-export declare const L1_GAS_PER_EPOCH_VERIFIED = 4000000n;
+export declare const L1_GAS_PER_CHECKPOINT_PROPOSED = 520000n;
+export declare const L1_GAS_PER_EPOCH_VERIFIED = 2500000n;
 export declare const BLOBS_PER_CHECKPOINT = 3n;
 export declare const BLOB_GAS_PER_BLOB: bigint;
 export declare const MAGIC_CONGESTION_VALUE_MULTIPLIER = 854700854n;

package/dest/gas/fee_math.js

@@ -3,8 +3,8 @@
  * Used to predict worst-case min fees over a future window of L2 slots.
  */ // Constants matching FeeLib.sol
 export const MINIMUM_CONGESTION_MULTIPLIER = 1_000_000_000n;
-export const L1_GAS_PER_CHECKPOINT_PROPOSED = 500_000n;
-export const L1_GAS_PER_EPOCH_VERIFIED = 4_000_000n;
+export const L1_GAS_PER_CHECKPOINT_PROPOSED = 520_000n;
+export const L1_GAS_PER_EPOCH_VERIFIED = 2_500_000n;
 export const BLOBS_PER_CHECKPOINT = 3n;
 export const BLOB_GAS_PER_BLOB = 2n ** 17n;
 export const MAGIC_CONGESTION_VALUE_MULTIPLIER = 854_700_854n;

package/dest/keys/derivation.js

@@ -59,11 +59,11 @@ export function computePreaddress(publicKeysHash, partialAddress) {
     return poseidon2HashWithSeparator([
         publicKeysHash,
         partialAddress
-    ], DomainSeparator.CONTRACT_ADDRESS_V2);
+    ], DomainSeparator.CONTRACT_ADDRESS_V3);
 }
 export async function computeAddress(publicKeys, partialAddress) {
     // Given public keys and a partial address, we can compute our address in the following steps.
-    // 1. preaddress = poseidon2([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V2);
+    // 1. preaddress = poseidon2([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V3);
     // 2. addressPoint = (preaddress * G) + ivpk_m
     // 3. address = addressPoint.x
     const preaddress = await computePreaddress(await publicKeys.hash(), partialAddress);

package/dest/messaging/l1_to_l2_message.d.ts

@@ -61,10 +61,29 @@ export interface UnsiloedMessageNullifier {
  * in the nullifier tree.
  */
 export declare function computeFeeJuiceMessageNullifier(messageHash: Fr, secret: Fr): Promise<Fr>;
+/** The outcome of {@link lookUpL1ToL2MessageWitness}. */
+export type L1ToL2MessageWitnessLookup = 
+/** The message is in the tree and, if a nullifier was given, has not been consumed. */
+{
+    type: 'found';
+    witness: [bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>];
+}
+/** The message is not in the tree. */
+ | {
+    type: 'missing';
+}
+/** A nullifier was given and the message has been consumed. */
+ | {
+    type: 'nullified';
+};
+/**
+ * Looks up the membership witness of an L1 to L2 message in the L1 to L2 message tree at `referenceBlock`.
+ */
+export declare function lookUpL1ToL2MessageWitness(node: AztecNode, messageHash: Fr, unsiloedNullifier: UnsiloedMessageNullifier | undefined, referenceBlock: BlockParameter): Promise<L1ToL2MessageWitnessLookup>;
 /**
  * Fetches the membership witness of an L1 to L2 message. When `unsiloedNullifier` is provided, the message is
  * additionally required to be un-nullified.
  */
 export declare function getL1ToL2MessageWitness(node: AztecNode, messageHash: Fr, unsiloedNullifier?: UnsiloedMessageNullifier, referenceBlock?: BlockParameter): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>]>;
 export declare function getNonNullifiedL1ToL2MessageWitness(node: AztecNode, contractAddress: AztecAddress, messageHash: Fr, secret: Fr, referenceBlock?: BlockParameter): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>]>;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfbWVzc2FnZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21lc3NhZ2luZy9sMV90b19sMl9tZXNzYWdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBbUIsS0FBSyx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3ZGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUN6RCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLGtDQUFrQyxDQUFDO0FBRW5GLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUUzRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVsRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUU3RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFeEM7O0dBRUc7QUFDSCxxQkFBYSxhQUFhO0lBRXRCLHVDQUF1QzthQUN2QixNQUFNLEVBQUUsT0FBTztJQUMvQiwwQ0FBMEM7YUFDMUIsU0FBUyxFQUFFLE9BQU87SUFDbEMsMkJBQTJCO2FBQ1gsT0FBTyxFQUFFLEVBQUU7SUFDM0IsdUNBQXVDO2FBQ3ZCLFVBQVUsRUFBRSxFQUFFO0lBQzlCLGdEQUFnRDthQUNoQyxLQUFLLEVBQUUsRUFBRTtJQVYzQjtJQUNFLHVDQUF1QztJQUN2QixNQUFNLEVBQUUsT0FBTztJQUMvQiwwQ0FBMEM7SUFDMUIsU0FBUyxFQUFFLE9BQU87SUFDbEMsMkJBQTJCO0lBQ1gsT0FBTyxFQUFFLEVBQUU7SUFDM0IsdUNBQXVDO0lBQ3ZCLFVBQVUsRUFBRSxFQUFFO0lBQzlCLGdEQUFnRDtJQUNoQyxLQUFLLEVBQUUsRUFBRSxFQUN2QjtJQUVKOzs7T0FHRztJQUNILFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsSUFBSSxJQUFJLEVBQUUsQ0FFVDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsYUFBYSxDQVE5RDtJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLGFBQWEsQ0FHN0M7SUFFRCxNQUFNLENBQUMsS0FBSyxJQUFJLGFBQWEsQ0FFNUI7SUFFRCxPQUFhLE1BQU0sSUFBSSxPQUFPLENBQUMsYUFBYSxDQUFDLENBRTVDO0NBQ0Y7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyx3QkFBd0I7SUFDdkMsZUFBZSxFQUFFLFlBQVksQ0FBQztJQUM5QixTQUFTLEVBQUUsRUFBRSxDQUFDO0NBQ2Y7QUFFRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQWdCLCtCQUErQixDQUFDLFdBQVcsRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBRXhGO0FBRUQ7OztHQUdHO0FBQ0gsd0JBQXNCLHVCQUF1QixDQUMzQyxJQUFJLEVBQUUsU0FBUyxFQUNmLFdBQVcsRUFBRSxFQUFFLEVBQ2YsaUJBQWlCLENBQUMsRUFBRSx3QkFBd0IsRUFDNUMsY0FBYyxHQUFFLGNBQXlCLEdBQ3hDLE9BQU8sQ0FBQyxDQUFDLE1BQU0sRUFBRSxXQUFXLENBQUMsT0FBTyx3QkFBd0IsQ0FBQyxDQUFDLENBQUMsQ0FvQmpFO0FBR0Qsd0JBQXNCLG1DQUFtQyxDQUN2RCxJQUFJLEVBQUUsU0FBUyxFQUNmLGVBQWUsRUFBRSxZQUFZLEVBQzdCLFdBQVcsRUFBRSxFQUFFLEVBQ2YsTUFBTSxFQUFFLEVBQUUsRUFDVixjQUFjLEdBQUUsY0FBeUIsR0FDeEMsT0FBTyxDQUFDLENBQUMsTUFBTSxFQUFFLFdBQVcsQ0FBQyxPQUFPLHdCQUF3QixDQUFDLENBQUMsQ0FBQyxDQUdqRSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibDFfdG9fbDJfbWVzc2FnZS5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21lc3NhZ2luZy9sMV90b19sMl9tZXNzYWdlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBbUIsS0FBSyx3QkFBd0IsRUFBRSxNQUFNLHVCQUF1QixDQUFDO0FBR3ZGLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUN6RCxPQUFPLEVBQUUsWUFBWSxFQUFxQixNQUFNLGtDQUFrQyxDQUFDO0FBRW5GLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSw4QkFBOEIsQ0FBQztBQUUzRCxPQUFPLEtBQUssRUFBRSxZQUFZLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQztBQUM5RCxPQUFPLEtBQUssRUFBRSxjQUFjLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUVsRSxPQUFPLEtBQUssRUFBRSxTQUFTLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUU3RCxPQUFPLEVBQUUsT0FBTyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFFeEM7O0dBRUc7QUFDSCxxQkFBYSxhQUFhO0lBRXRCLHVDQUF1QzthQUN2QixNQUFNLEVBQUUsT0FBTztJQUMvQiwwQ0FBMEM7YUFDMUIsU0FBUyxFQUFFLE9BQU87SUFDbEMsMkJBQTJCO2FBQ1gsT0FBTyxFQUFFLEVBQUU7SUFDM0IsdUNBQXVDO2FBQ3ZCLFVBQVUsRUFBRSxFQUFFO0lBQzlCLGdEQUFnRDthQUNoQyxLQUFLLEVBQUUsRUFBRTtJQVYzQjtJQUNFLHVDQUF1QztJQUN2QixNQUFNLEVBQUUsT0FBTztJQUMvQiwwQ0FBMEM7SUFDMUIsU0FBUyxFQUFFLE9BQU87SUFDbEMsMkJBQTJCO0lBQ1gsT0FBTyxFQUFFLEVBQUU7SUFDM0IsdUNBQXVDO0lBQ3ZCLFVBQVUsRUFBRSxFQUFFO0lBQzlCLGdEQUFnRDtJQUNoQyxLQUFLLEVBQUUsRUFBRSxFQUN2QjtJQUVKOzs7T0FHRztJQUNILFFBQVEsSUFBSSxFQUFFLEVBQUUsQ0FFZjtJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsSUFBSSxJQUFJLEVBQUUsQ0FFVDtJQUVELE1BQU0sQ0FBQyxVQUFVLENBQUMsTUFBTSxFQUFFLE1BQU0sR0FBRyxZQUFZLEdBQUcsYUFBYSxDQVE5RDtJQUVELFFBQVEsSUFBSSxNQUFNLENBRWpCO0lBRUQsTUFBTSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsTUFBTSxHQUFHLGFBQWEsQ0FHN0M7SUFFRCxNQUFNLENBQUMsS0FBSyxJQUFJLGFBQWEsQ0FFNUI7SUFFRCxPQUFhLE1BQU0sSUFBSSxPQUFPLENBQUMsYUFBYSxDQUFDLENBRTVDO0NBQ0Y7QUFFRDs7R0FFRztBQUNILE1BQU0sV0FBVyx3QkFBd0I7SUFDdkMsZUFBZSxFQUFFLFlBQVksQ0FBQztJQUM5QixTQUFTLEVBQUUsRUFBRSxDQUFDO0NBQ2Y7QUFFRDs7Ozs7OztHQU9HO0FBQ0gsd0JBQWdCLCtCQUErQixDQUFDLFdBQVcsRUFBRSxFQUFFLEVBQUUsTUFBTSxFQUFFLEVBQUUsR0FBRyxPQUFPLENBQUMsRUFBRSxDQUFDLENBRXhGO0FBRUQseURBQXlEO0FBQ3pELE1BQU0sTUFBTSwwQkFBMEI7QUFDcEMsdUZBQXVGO0FBQ3JGO0lBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQztJQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRSxXQUFXLENBQUMsT0FBTyx3QkFBd0IsQ0FBQyxDQUFDLENBQUE7Q0FBRTtBQUNwRixzQ0FBc0M7R0FDcEM7SUFBRSxJQUFJLEVBQUUsU0FBUyxDQUFBO0NBQUU7QUFDckIsK0RBQStEO0dBQzdEO0lBQUUsSUFBSSxFQUFFLFdBQVcsQ0FBQTtDQUFFLENBQUM7QUFFMUI7O0dBRUc7QUFDSCx3QkFBc0IsMEJBQTBCLENBQzlDLElBQUksRUFBRSxTQUFTLEVBQ2YsV0FBVyxFQUFFLEVBQUUsRUFDZixpQkFBaUIsRUFBRSx3QkFBd0IsR0FBRyxTQUFTLEVBQ3ZELGNBQWMsRUFBRSxjQUFjLEdBQzdCLE9BQU8sQ0FBQywwQkFBMEIsQ0FBQyxDQW1CckM7QUFFRDs7O0dBR0c7QUFDSCx3QkFBc0IsdUJBQXVCLENBQzNDLElBQUksRUFBRSxTQUFTLEVBQ2YsV0FBVyxFQUFFLEVBQUUsRUFDZixpQkFBaUIsQ0FBQyxFQUFFLHdCQUF3QixFQUM1QyxjQUFjLEdBQUUsY0FBeUIsR0FDeEMsT0FBTyxDQUFDLENBQUMsTUFBTSxFQUFFLFdBQVcsQ0FBQyxPQUFPLHdCQUF3QixDQUFDLENBQUMsQ0FBQyxDQVVqRTtBQUdELHdCQUFzQixtQ0FBbUMsQ0FDdkQsSUFBSSxFQUFFLFNBQVMsRUFDZixlQUFlLEVBQUUsWUFBWSxFQUM3QixXQUFXLEVBQUUsRUFBRSxFQUNmLE1BQU0sRUFBRSxFQUFFLEVBQ1YsY0FBYyxHQUFFLGNBQXlCLEdBQ3hDLE9BQU8sQ0FBQyxDQUFDLE1BQU0sRUFBRSxXQUFXLENBQUMsT0FBTyx3QkFBd0IsQ0FBQyxDQUFDLENBQUMsQ0FHakUifQ==

package/dest/messaging/l1_to_l2_message.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l1_to_l2_message.d.ts","sourceRoot":"","sources":["../../src/messaging/l1_to_l2_message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAGvF,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAE,YAAY,EAAqB,MAAM,kCAAkC,CAAC;AAEnF,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAE3D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAElE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAExC;;GAEG;AACH,qBAAa,aAAa;IAEtB,uCAAuC;aACvB,MAAM,EAAE,OAAO;IAC/B,0CAA0C;aAC1B,SAAS,EAAE,OAAO;IAClC,2BAA2B;aACX,OAAO,EAAE,EAAE;IAC3B,uCAAuC;aACvB,UAAU,EAAE,EAAE;IAC9B,gDAAgD;aAChC,KAAK,EAAE,EAAE;IAV3B;IACE,uCAAuC;IACvB,MAAM,EAAE,OAAO;IAC/B,0CAA0C;IAC1B,SAAS,EAAE,OAAO;IAClC,2BAA2B;IACX,OAAO,EAAE,EAAE;IAC3B,uCAAuC;IACvB,UAAU,EAAE,EAAE;IAC9B,gDAAgD;IAChC,KAAK,EAAE,EAAE,EACvB;IAEJ;;;OAGG;IACH,QAAQ,IAAI,EAAE,EAAE,CAEf;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,IAAI,IAAI,EAAE,CAET;IAED,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa,CAQ9D;IAED,QAAQ,IAAI,MAAM,CAEjB;IAED,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAG7C;IAED,MAAM,CAAC,KAAK,IAAI,aAAa,CAE5B;IAED,OAAa,MAAM,IAAI,OAAO,CAAC,aAAa,CAAC,CAE5C;CACF;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,eAAe,EAAE,YAAY,CAAC;IAC9B,SAAS,EAAE,EAAE,CAAC;CACf;AAED;;;;;;;GAOG;AACH,wBAAgB,+BAA+B,CAAC,WAAW,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAExF;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,SAAS,EACf,WAAW,EAAE,EAAE,EACf,iBAAiB,CAAC,EAAE,wBAAwB,EAC5C,cAAc,GAAE,cAAyB,GACxC,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC,CAoBjE;AAGD,wBAAsB,mCAAmC,CACvD,IAAI,EAAE,SAAS,EACf,eAAe,EAAE,YAAY,EAC7B,WAAW,EAAE,EAAE,EACf,MAAM,EAAE,EAAE,EACV,cAAc,GAAE,cAAyB,GACxC,OAAO,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC,CAGjE"}
+{"version":3,"file":"l1_to_l2_message.d.ts","sourceRoot":"","sources":["../../src/messaging/l1_to_l2_message.ts"],"names":[],"mappings":"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"}

package/dest/messaging/l1_to_l2_message.js

@@ -78,23 +78,45 @@ import { L2Actor } from './l2_actor.js';
     ], DomainSeparator.MESSAGE_NULLIFIER);
 }
 /**
- * Fetches the membership witness of an L1 to L2 message. When `unsiloedNullifier` is provided, the message is
- * additionally required to be un-nullified.
- */ export async function getL1ToL2MessageWitness(node, messageHash, unsiloedNullifier, referenceBlock = 'latest') {
+ * Looks up the membership witness of an L1 to L2 message in the L1 to L2 message tree at `referenceBlock`.
+ */ export async function lookUpL1ToL2MessageWitness(node, messageHash, unsiloedNullifier, referenceBlock) {
     // Both requests are dispatched before awaiting so they run concurrently.
     const l1ToL2ResponsePromise = node.getL1ToL2MessageMembershipWitness(referenceBlock, messageHash);
     const nullifierResponsePromise = unsiloedNullifier ? siloNullifier(unsiloedNullifier.contractAddress, unsiloedNullifier.nullifier).then((siloed)=>node.findLeavesIndexes(referenceBlock, MerkleTreeId.NULLIFIER_TREE, [
             siloed
         ])) : undefined;
-    const l1ToL2Response = await l1ToL2ResponsePromise;
+    const [l1ToL2Response, nullifierResponse] = await Promise.all([
+        l1ToL2ResponsePromise,
+        nullifierResponsePromise
+    ]);
     if (!l1ToL2Response) {
-        throw new Error(`No L1 to L2 message found for message hash ${messageHash.toString()}`);
+        return {
+            type: 'missing'
+        };
     }
-    const nullifierResponse = await nullifierResponsePromise;
     if (nullifierResponse?.[0] !== undefined) {
-        throw new Error(`No non-nullified L1 to L2 message found for message hash ${messageHash.toString()}`);
+        return {
+            type: 'nullified'
+        };
+    }
+    return {
+        type: 'found',
+        witness: l1ToL2Response
+    };
+}
+/**
+ * Fetches the membership witness of an L1 to L2 message. When `unsiloedNullifier` is provided, the message is
+ * additionally required to be un-nullified.
+ */ export async function getL1ToL2MessageWitness(node, messageHash, unsiloedNullifier, referenceBlock = 'latest') {
+    const lookup = await lookUpL1ToL2MessageWitness(node, messageHash, unsiloedNullifier, referenceBlock);
+    switch(lookup.type){
+        case 'missing':
+            throw new Error(`No L1 to L2 message found for message hash ${messageHash.toString()}`);
+        case 'nullified':
+            throw new Error(`No non-nullified L1 to L2 message found for message hash ${messageHash.toString()}`);
+        case 'found':
+            return lookup.witness;
     }
-    return l1ToL2Response;
 }
 // This functionality is not on the node because we do not want to pass the node the secret, and give the node the ability to derive a valid nullifer for an L1 to L2 message.
 export async function getNonNullifiedL1ToL2MessageWitness(node, contractAddress, messageHash, secret, referenceBlock = 'latest') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec-labs/stdlib",
-  "version": "6.0.0-rc.2",
+  "version": "6.0.0-rc.3",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -92,12 +92,12 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.892.0",
-    "@aztec-foundation/bb.js": "6.0.0-rc.5",
-    "@aztec-foundation/noir-noirc_abi": "6.0.0-rc.5",
-    "@aztec-labs/blob-lib": "6.0.0-rc.2",
-    "@aztec-labs/constants": "6.0.0-rc.2",
-    "@aztec-labs/ethereum": "6.0.0-rc.2",
-    "@aztec-labs/foundation": "6.0.0-rc.2",
+    "@aztec-foundation/bb.js": "6.0.0-rc.6",
+    "@aztec-foundation/noir-noirc_abi": "6.0.0-rc.6",
+    "@aztec-labs/blob-lib": "6.0.0-rc.3",
+    "@aztec-labs/constants": "6.0.0-rc.3",
+    "@aztec-labs/ethereum": "6.0.0-rc.3",
+    "@aztec-labs/foundation": "6.0.0-rc.3",
     "@google-cloud/storage": "^7.15.0",
     "axios": "^1.15.1",
     "json-stringify-deterministic": "1.0.12",

package/src/contract/contract_address.ts

@@ -16,7 +16,7 @@ import type { PartialAddress } from './partial_address.js';
  * ```
  * salted_initialization_hash = poseidon2(DOM_SEP__SALTED_INITIALIZATION_HASH, [salt, initialization_hash, deployer, immutables_hash])
  * partial_address = poseidon2(DOM_SEP__PARTIAL_ADDRESS, [contract_class_id, salted_initialization_hash])
- * address = ((poseidon2(DOM_SEP__CONTRACT_ADDRESS_V2, [public_keys_hash, partial_address]) * G) + ivpk_m).x <- the x-coordinate of the address point
+ * address = ((poseidon2(DOM_SEP__CONTRACT_ADDRESS_V3, [public_keys_hash, partial_address]) * G) + ivpk_m).x <- the x-coordinate of the address point
  * ```
  * @param instance - A contract instance for which to calculate the deployment address.
  */

package/src/gas/README.md

@@ -208,8 +208,8 @@ itself, before actual teardown consumption is known.
 
 | Constant                        | Value          |
 | ------------------------------- | -------------- |
-| `L1_GAS_PER_CHECKPOINT_PROPOSED` | 500,000       |
-| `L1_GAS_PER_EPOCH_VERIFIED`     | 4,000,000      |
+| `L1_GAS_PER_CHECKPOINT_PROPOSED` | 520,000       |
+| `L1_GAS_PER_EPOCH_VERIFIED`     | 2,500,000      |
 | `BLOBS_PER_CHECKPOINT` (FeeLib) | 3              |
 | `BLOB_GAS_PER_BLOB`             | 2^17           |
 | `MINIMUM_CONGESTION_MULTIPLIER` | 1e9            |

package/src/gas/fee_math.ts

@@ -5,8 +5,8 @@
 
 // Constants matching FeeLib.sol
 export const MINIMUM_CONGESTION_MULTIPLIER = 1_000_000_000n;
-export const L1_GAS_PER_CHECKPOINT_PROPOSED = 500_000n;
-export const L1_GAS_PER_EPOCH_VERIFIED = 4_000_000n;
+export const L1_GAS_PER_CHECKPOINT_PROPOSED = 520_000n;
+export const L1_GAS_PER_EPOCH_VERIFIED = 2_500_000n;
 export const BLOBS_PER_CHECKPOINT = 3n;
 export const BLOB_GAS_PER_BLOB = 2n ** 17n;
 export const MAGIC_CONGESTION_VALUE_MULTIPLIER = 854_700_854n;

package/src/keys/derivation.ts

@@ -51,12 +51,12 @@ export function deriveMasterFallbackSecretKey(secretKey: Fr): GrumpkinScalar {
 }
 
 export function computePreaddress(publicKeysHash: Fr, partialAddress: Fr) {
-  return poseidon2HashWithSeparator([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V2);
+  return poseidon2HashWithSeparator([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V3);
 }
 
 export async function computeAddress(publicKeys: PublicKeys, partialAddress: Fr): Promise<AztecAddress> {
   // Given public keys and a partial address, we can compute our address in the following steps.
-  // 1. preaddress = poseidon2([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V2);
+  // 1. preaddress = poseidon2([publicKeysHash, partialAddress], DomainSeparator.CONTRACT_ADDRESS_V3);
   // 2. addressPoint = (preaddress * G) + ivpk_m
   // 3. address = addressPoint.x
   const preaddress = await computePreaddress(await publicKeys.hash(), partialAddress);

package/src/messaging/l1_to_l2_message.ts

@@ -95,16 +95,24 @@ export function computeFeeJuiceMessageNullifier(messageHash: Fr, secret: Fr): Pr
   return poseidon2HashWithSeparator([messageHash, secret], DomainSeparator.MESSAGE_NULLIFIER);
 }
 
+/** The outcome of {@link lookUpL1ToL2MessageWitness}. */
+export type L1ToL2MessageWitnessLookup =
+  /** The message is in the tree and, if a nullifier was given, has not been consumed. */
+  | { type: 'found'; witness: [bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>] }
+  /** The message is not in the tree. */
+  | { type: 'missing' }
+  /** A nullifier was given and the message has been consumed. */
+  | { type: 'nullified' };
+
 /**
- * Fetches the membership witness of an L1 to L2 message. When `unsiloedNullifier` is provided, the message is
- * additionally required to be un-nullified.
+ * Looks up the membership witness of an L1 to L2 message in the L1 to L2 message tree at `referenceBlock`.
  */
-export async function getL1ToL2MessageWitness(
+export async function lookUpL1ToL2MessageWitness(
   node: AztecNode,
   messageHash: Fr,
-  unsiloedNullifier?: UnsiloedMessageNullifier,
-  referenceBlock: BlockParameter = 'latest',
-): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>]> {
+  unsiloedNullifier: UnsiloedMessageNullifier | undefined,
+  referenceBlock: BlockParameter,
+): Promise<L1ToL2MessageWitnessLookup> {
   // Both requests are dispatched before awaiting so they run concurrently.
   const l1ToL2ResponsePromise = node.getL1ToL2MessageMembershipWitness(referenceBlock, messageHash);
   const nullifierResponsePromise = unsiloedNullifier
@@ -113,17 +121,37 @@ export async function getL1ToL2MessageWitness(
       )
     : undefined;
 
-  const l1ToL2Response = await l1ToL2ResponsePromise;
+  const [l1ToL2Response, nullifierResponse] = await Promise.all([l1ToL2ResponsePromise, nullifierResponsePromise]);
   if (!l1ToL2Response) {
-    throw new Error(`No L1 to L2 message found for message hash ${messageHash.toString()}`);
+    return { type: 'missing' };
   }
 
-  const nullifierResponse = await nullifierResponsePromise;
   if (nullifierResponse?.[0] !== undefined) {
-    throw new Error(`No non-nullified L1 to L2 message found for message hash ${messageHash.toString()}`);
+    return { type: 'nullified' };
   }
 
-  return l1ToL2Response;
+  return { type: 'found', witness: l1ToL2Response };
+}
+
+/**
+ * Fetches the membership witness of an L1 to L2 message. When `unsiloedNullifier` is provided, the message is
+ * additionally required to be un-nullified.
+ */
+export async function getL1ToL2MessageWitness(
+  node: AztecNode,
+  messageHash: Fr,
+  unsiloedNullifier?: UnsiloedMessageNullifier,
+  referenceBlock: BlockParameter = 'latest',
+): Promise<[bigint, SiblingPath<typeof L1_TO_L2_MSG_TREE_HEIGHT>]> {
+  const lookup = await lookUpL1ToL2MessageWitness(node, messageHash, unsiloedNullifier, referenceBlock);
+  switch (lookup.type) {
+    case 'missing':
+      throw new Error(`No L1 to L2 message found for message hash ${messageHash.toString()}`);
+    case 'nullified':
+      throw new Error(`No non-nullified L1 to L2 message found for message hash ${messageHash.toString()}`);
+    case 'found':
+      return lookup.witness;
+  }
 }
 
 // This functionality is not on the node because we do not want to pass the node the secret, and give the node the ability to derive a valid nullifer for an L1 to L2 message.