@aztec/stdlib 0.86.0-nightly.20250513 → 0.86.0-nightly.20250514

package/dest/abi/contract_artifact.js

@@ -166,29 +166,16 @@ import { AZTEC_INITIALIZER_ATTRIBUTE, AZTEC_INTERNAL_ATTRIBUTE, AZTEC_PRIVATE_AT
     };
 }
 function getFunctionType(fn) {
-    if (fn.custom_attributes.some((attr)=>attr.endsWith(AZTEC_PRIVATE_ATTRIBUTE))) {
+    if (fn.custom_attributes.includes(AZTEC_PRIVATE_ATTRIBUTE)) {
         return FunctionType.PRIVATE;
-    } else if (fn.custom_attributes.some((attr)=>attr.endsWith(AZTEC_PUBLIC_ATTRIBUTE))) {
+    } else if (fn.custom_attributes.includes(AZTEC_PUBLIC_ATTRIBUTE)) {
         return FunctionType.PUBLIC;
-    } else if (fn.custom_attributes.some((attr)=>attr.endsWith(AZTEC_UTILITY_ATTRIBUTE))) {
+    } else if (fn.custom_attributes.includes(AZTEC_UTILITY_ATTRIBUTE)) {
         return FunctionType.UTILITY;
     } else {
         throw new Error(`Invalid function type for a noir contract function ${fn.name}`);
     }
 }
-// TODO(https://github.com/noir-lang/noir/issues/7912): Replace the above function with this one once the linked issue
-// is fixed.
-// function getFunctionType(fn: NoirCompiledContractFunction): FunctionType {
-//   if (fn.custom_attributes.includes(AZTEC_PRIVATE_ATTRIBUTE)) {
-//     return FunctionType.PRIVATE;
-//   } else if (fn.custom_attributes.includes(AZTEC_PUBLIC_ATTRIBUTE)) {
-//     return FunctionType.PUBLIC;
-//   } else if (fn.custom_attributes.includes(AZTEC_UTILITY_ATTRIBUTE)) {
-//     return FunctionType.UTILITY;
-//   } else {
-//     throw new Error(`Invalid function type for a noir contract function ${fn.name}`);
-//   }
-// }
 /**
  * Returns true if the first parameter is kernel function inputs.
  *

package/dest/file-store/http.d.ts

@@ -5,6 +5,7 @@ import type { ReadOnlyFileStore } from './interface.js';
 export declare class HttpFileStore implements ReadOnlyFileStore {
     private readonly baseUrl;
     private readonly log;
+    private readonly axiosInstance;
     private readonly fetch;
     constructor(baseUrl: string, log?: Logger);
     read(pathOrUrl: string): Promise<Buffer>;

package/dest/file-store/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/file-store/http.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AASlE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,qBAAa,aAAc,YAAW,iBAAiB;IAGzC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAU,OAAO,CAAC,QAAQ,CAAC,GAAG;IAFlE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAe;gBAER,OAAO,EAAE,MAAM,EAAmB,GAAG,GAAE,MAA+C;IAYtG,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUxC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY5D,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMxD,OAAO,CAAC,MAAM;CAGf"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/file-store/http.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,KAAK,MAAM,EAAgB,MAAM,uBAAuB,CAAC;AAUlE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAExD,qBAAa,aAAc,YAAW,iBAAiB;IAIzC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAU,OAAO,CAAC,QAAQ,CAAC,GAAG;IAHlE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA+D;gBAExD,OAAO,EAAE,MAAM,EAAmB,GAAG,GAAE,MAA+C;IAatG,IAAI,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAUxC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW5D,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUxD,OAAO,CAAC,MAAM;CAGf"}

package/dest/file-store/http.js

@@ -1,19 +1,21 @@
 import { createLogger } from '@aztec/foundation/log';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
+import axios from 'axios';
 import { createWriteStream } from 'fs';
 import { mkdir } from 'fs/promises';
 import { dirname } from 'path';
-import { Readable } from 'stream';
 import { finished } from 'stream/promises';
 export class HttpFileStore {
     baseUrl;
     log;
+    axiosInstance;
     fetch;
     constructor(baseUrl, log = createLogger('stdlib:http-file-store')){
         this.baseUrl = baseUrl;
         this.log = log;
-        this.fetch = async (...args)=>{
-            return await retry(()=>fetch(...args), `Fetching ${args[0]}`, makeBackoff([
+        this.axiosInstance = axios.create();
+        this.fetch = async (config)=>{
+            return await retry(()=>this.axiosInstance.request(config), `Fetching ${config.url}`, makeBackoff([
                 1,
                 1,
                 3
@@ -22,30 +24,44 @@ export class HttpFileStore {
     }
     async read(pathOrUrl) {
         const url = this.getUrl(pathOrUrl);
-        const response = await this.fetch(url);
-        if (response.ok) {
-            return Buffer.from(await response.arrayBuffer());
-        } else {
-            throw new Error(`Error fetching file from ${url}: ${response.statusText}`);
+        try {
+            const response = await this.fetch({
+                url,
+                method: 'GET',
+                responseType: 'arraybuffer'
+            });
+            return Buffer.from(response.data);
+        } catch (error) {
+            throw new Error(`Error fetching file from ${url}: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
     async download(pathOrUrl, destPath) {
         const url = this.getUrl(pathOrUrl);
-        const response = await this.fetch(url);
-        if (response.ok) {
+        try {
+            const response = await this.fetch({
+                url,
+                method: 'GET',
+                responseType: 'stream'
+            });
             await mkdir(dirname(destPath), {
                 recursive: true
             });
-            // Typescript complains about Readable.fromWeb, hence the cast
-            await finished(Readable.fromWeb(response.body).pipe(createWriteStream(destPath)));
-        } else {
-            throw new Error(`Error fetching file from ${url}: ${response.statusText}`);
+            await finished(response.data.pipe(createWriteStream(destPath)));
+        } catch (error) {
+            throw new Error(`Error fetching file from ${url}: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
     async exists(pathOrUrl) {
         const url = this.getUrl(pathOrUrl);
-        const response = await this.fetch(url);
-        return response.ok;
+        try {
+            await this.fetch({
+                url,
+                method: 'HEAD'
+            });
+            return true;
+        } catch (error) {
+            return false;
+        }
     }
     getUrl(path) {
         return URL.canParse(path) ? path : `${this.baseUrl.replace(/\/$/, '')}/${path}`;

package/dest/messaging/inbox_leaf.d.ts

@@ -15,5 +15,10 @@ export declare class InboxLeaf {
     toBuffer(): Buffer;
     fromBuffer(buffer: Buffer | BufferReader): InboxLeaf;
     static smallestIndexFromL2Block(l2block: bigint): bigint;
+    /**
+     * Returns the range of valid indices for a given L2 block.
+     * Start index is inclusive, end index is exclusive.
+     */
+    static indexRangeFromL2Block(l2block: bigint): [bigint, bigint];
 }
 //# sourceMappingURL=inbox_leaf.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"inbox_leaf.d.ts","sourceRoot":"","sources":["../../src/messaging/inbox_leaf.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,qBAAa,SAAS;IAElB,2CAA2C;aAC3B,KAAK,EAAE,MAAM;IAC7B,wCAAwC;aACxB,IAAI,EAAE,EAAE;;IAHxB,2CAA2C;IAC3B,KAAK,EAAE,MAAM;IAC7B,wCAAwC;IACxB,IAAI,EAAE,EAAE;IAG1B,QAAQ,IAAI,MAAM;IAIlB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAOpD,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;CAGzD"}
+{"version":3,"file":"inbox_leaf.d.ts","sourceRoot":"","sources":["../../src/messaging/inbox_leaf.ts"],"names":[],"mappings":";;AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,qBAAa,SAAS;IAElB,2CAA2C;aAC3B,KAAK,EAAE,MAAM;IAC7B,wCAAwC;aACxB,IAAI,EAAE,EAAE;;IAHxB,2CAA2C;IAC3B,KAAK,EAAE,MAAM;IAC7B,wCAAwC;IACxB,IAAI,EAAE,EAAE;IAG1B,QAAQ,IAAI,MAAM;IAIlB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAOpD,MAAM,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAIxD;;;OAGG;IACH,MAAM,CAAC,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;CAKhE"}

package/dest/messaging/inbox_leaf.js

@@ -24,4 +24,15 @@ export class InboxLeaf {
     static smallestIndexFromL2Block(l2block) {
         return (l2block - BigInt(INITIAL_L2_BLOCK_NUM)) * BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
     }
+    /**
+   * Returns the range of valid indices for a given L2 block.
+   * Start index is inclusive, end index is exclusive.
+   */ static indexRangeFromL2Block(l2block) {
+        const start = this.smallestIndexFromL2Block(l2block);
+        const end = start + BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+        return [
+            start,
+            end
+        ];
+    }
 }

package/dest/p2p/block_attestation.d.ts

@@ -35,7 +35,7 @@ export declare class BlockAttestation extends Gossipable {
     /** The signature of the block attester */
     signature: Signature);
     static get schema(): ZodFor<BlockAttestation>;
-    p2pMessageIdentifier(): Promise<Buffer32>;
+    generateP2PMessageIdentifier(): Promise<Buffer32>;
     get archive(): Fr;
     get slotNumber(): Fr;
     /**Get sender

package/dest/p2p/block_attestation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block_attestation.d.ts","sourceRoot":"","sources":["../../src/p2p/block_attestation.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAI9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,oBAAqB,SAAQ,QAAQ;gBACpC,IAAI,EAAE,MAAM;CAGzB;AAED;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;IAM5C,2CAA2C;aAC3B,WAAW,EAAE,EAAE;IAE/B,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;aAC1B,SAAS,EAAE,SAAS;IAZtC,OAAgB,QAAQ,YAA+B;IAEvD,OAAO,CAAC,MAAM,CAAyB;;IAGrC,2CAA2C;IAC3B,WAAW,EAAE,EAAE;IAE/B,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;IAC1B,SAAS,EAAE,SAAS;IAKtC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAQ5C;IAEQ,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIlD,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,EAAE,CAEnB;IAED;;;;OAIG;IACH,SAAS,IAAI,UAAU;IAWvB,UAAU,IAAI,MAAM;IAIpB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAS/D,MAAM,CAAC,KAAK,IAAI,gBAAgB;IAIhC,OAAO,IAAI,MAAM;CAGlB"}
+{"version":3,"file":"block_attestation.d.ts","sourceRoot":"","sources":["../../src/p2p/block_attestation.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAI9E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,oBAAqB,SAAQ,QAAQ;gBACpC,IAAI,EAAE,MAAM;CAGzB;AAED;;;;;GAKG;AACH,qBAAa,gBAAiB,SAAQ,UAAU;IAM5C,2CAA2C;aAC3B,WAAW,EAAE,EAAE;IAE/B,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;aAC1B,SAAS,EAAE,SAAS;IAZtC,OAAgB,QAAQ,YAA+B;IAEvD,OAAO,CAAC,MAAM,CAAyB;;IAGrC,2CAA2C;IAC3B,WAAW,EAAE,EAAE;IAE/B,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,0CAA0C;IAC1B,SAAS,EAAE,SAAS;IAKtC,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAQ5C;IAEQ,4BAA4B,IAAI,OAAO,CAAC,QAAQ,CAAC;IAI1D,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,EAAE,CAEnB;IAED;;;;OAIG;IACH,SAAS,IAAI,UAAU;IAWvB,UAAU,IAAI,MAAM;IAIpB,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,gBAAgB;IAS/D,MAAM,CAAC,KAAK,IAAI,gBAAgB;IAIhC,OAAO,IAAI,MAAM;CAGlB"}

package/dest/p2p/block_attestation.js

@@ -34,7 +34,7 @@ export class BlockAttestationHash extends Buffer32 {
             signature: Signature.schema
         }).transform((obj)=>new BlockAttestation(obj.blockNumber, obj.payload, obj.signature));
     }
-    p2pMessageIdentifier() {
+    generateP2PMessageIdentifier() {
         return Promise.resolve(new BlockAttestationHash(keccak256(this.signature.toBuffer())));
     }
     get archive() {

package/dest/p2p/block_proposal.d.ts

@@ -38,7 +38,7 @@ export declare class BlockProposal extends Gossipable {
     signature: Signature, 
     /** The transactions in the block */
     txs?: Tx[] | undefined);
-    p2pMessageIdentifier(): Promise<Buffer32>;
+    generateP2PMessageIdentifier(): Promise<Buffer32>;
     get archive(): Fr;
     get slotNumber(): Fr;
     static createProposalFromSigner(blockNumber: Fr, payload: ConsensusPayload, txs: Tx[], payloadSigner: (payload: Buffer32) => Promise<Signature>): Promise<BlockProposal>;

package/dest/p2p/block_proposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"block_proposal.d.ts","sourceRoot":"","sources":["../../src/p2p/block_proposal.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,iBAAkB,SAAQ,QAAQ;gBACjC,IAAI,EAAE,MAAM;CAGzB;AAED;;;;;GAKG;AACH,qBAAa,aAAc,SAAQ,UAAU;IAMzC,8BAA8B;aACd,WAAW,EAAE,EAAE;IAE/B,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;aACtD,SAAS,EAAE,SAAS;IAGpC,oCAAoC;aACpB,GAAG,CAAC;IAhBtB,OAAgB,QAAQ,YAA4B;IAEpD,OAAO,CAAC,MAAM,CAAyB;;IAGrC,8BAA8B;IACd,WAAW,EAAE,EAAE;IAE/B,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;IACtD,SAAS,EAAE,SAAS;IAGpC,oCAAoC;IACpB,GAAG,CAAC,kBAAM;IAKnB,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIlD,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,EAAE,CAEnB;WAEY,wBAAwB,CACnC,WAAW,EAAE,EAAE,EACf,OAAO,EAAE,gBAAgB,EAEzB,GAAG,EAAE,EAAE,EAAE,EACT,aAAa,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC;IAQ1D;;OAEG;IACH,SAAS;IAUT,UAAU;IAIV,QAAQ,IAAI,MAAM;IASlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAe5D,OAAO,IAAI,MAAM;CAQlB"}
+{"version":3,"file":"block_proposal.d.ts","sourceRoot":"","sources":["../../src/p2p/block_proposal.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qBAAa,iBAAkB,SAAQ,QAAQ;gBACjC,IAAI,EAAE,MAAM;CAGzB;AAED;;;;;GAKG;AACH,qBAAa,aAAc,SAAQ,UAAU;IAMzC,8BAA8B;aACd,WAAW,EAAE,EAAE;IAE/B,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;aACtD,SAAS,EAAE,SAAS;IAGpC,oCAAoC;aACpB,GAAG,CAAC;IAhBtB,OAAgB,QAAQ,YAA4B;IAEpD,OAAO,CAAC,MAAM,CAAyB;;IAGrC,8BAA8B;IACd,WAAW,EAAE,EAAE;IAE/B,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;IACtD,SAAS,EAAE,SAAS;IAGpC,oCAAoC;IACpB,GAAG,CAAC,kBAAM;IAKnB,4BAA4B,IAAI,OAAO,CAAC,QAAQ,CAAC;IAI1D,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,EAAE,CAEnB;WAEY,wBAAwB,CACnC,WAAW,EAAE,EAAE,EACf,OAAO,EAAE,gBAAgB,EAEzB,GAAG,EAAE,EAAE,EAAE,EACT,aAAa,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC;IAQ1D;;OAEG;IACH,SAAS;IAUT,UAAU;IAIV,QAAQ,IAAI,MAAM;IASlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAe5D,OAAO,IAAI,MAAM;CAQlB"}

package/dest/p2p/block_proposal.js

@@ -29,7 +29,7 @@ export class BlockProposalHash extends Buffer32 {
     /** The transactions in the block */ txs){
         super(), this.blockNumber = blockNumber, this.payload = payload, this.signature = signature, this.txs = txs;
     }
-    p2pMessageIdentifier() {
+    generateP2PMessageIdentifier() {
         return Promise.resolve(new BlockProposalHash(keccak256(this.signature.toBuffer())));
     }
     get archive() {

package/dest/p2p/gossipable.d.ts

@@ -1,13 +1,23 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="node" resolution-mode="require"/>
-import type { Buffer32 } from '@aztec/foundation/buffer';
+import { Buffer32 } from '@aztec/foundation/buffer';
 import type { TopicType } from './topic_type.js';
+export declare class P2PMessage {
+    readonly publishTime: Date;
+    readonly id: Buffer32;
+    readonly payload: Buffer;
+    constructor(publishTime: Date, id: Buffer32, payload: Buffer);
+    static fromGossipable(message: Gossipable): Promise<P2PMessage>;
+    static fromMessageData(messageData: Buffer): P2PMessage;
+    toMessageData(): Buffer;
+}
 /**
  * Gossipable
  *
  * Any class which extends gossipable will be able to be Gossiped over the p2p network
  */
 export declare abstract class Gossipable {
+    private cachedId;
     /** p2p Topic
      *
      * - The p2p topic identifier, this determines how the message is handled
@@ -17,12 +27,14 @@ export declare abstract class Gossipable {
      *
      *  - A digest of the message information, this key is used for deduplication
      */
-    abstract p2pMessageIdentifier(): Promise<Buffer32>;
+    p2pMessageIdentifier(): Promise<Buffer32>;
+    abstract generateP2PMessageIdentifier(): Promise<Buffer32>;
     /** To Buffer
      *
      * - Serialization method
      */
     abstract toBuffer(): Buffer;
+    toMessage(): Buffer;
     /**
      * Get the size of the gossipable object.
      *

package/dest/p2p/gossipable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gossipable.d.ts","sourceRoot":"","sources":["../../src/p2p/gossipable.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD;;;;GAIG;AACH,8BAAsB,UAAU;IAC9B;;;OAGG;IACH,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;IAE3B;;;OAGG;IACH,QAAQ,CAAC,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAElD;;;OAGG;IACH,QAAQ,CAAC,QAAQ,IAAI,MAAM;IAE3B;;;;OAIG;IACH,QAAQ,CAAC,OAAO,IAAI,MAAM;CAC3B"}
+{"version":3,"file":"gossipable.d.ts","sourceRoot":"","sources":["../../src/p2p/gossipable.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAGpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,qBAAa,UAAU;aACO,WAAW,EAAE,IAAI;aAAkB,EAAE,EAAE,QAAQ;aAAkB,OAAO,EAAE,MAAM;gBAAhF,WAAW,EAAE,IAAI,EAAkB,EAAE,EAAE,QAAQ,EAAkB,OAAO,EAAE,MAAM;WAE/F,cAAc,CAAC,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAIrE,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,UAAU;IAQvD,aAAa,IAAI,MAAM;CAOxB;AAED;;;;GAIG;AACH,8BAAsB,UAAU;IAC9B,OAAO,CAAC,QAAQ,CAAuB;IACvC;;;OAGG;IACH,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;IAE3B;;;OAGG;IACG,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAQ/C,QAAQ,CAAC,4BAA4B,IAAI,OAAO,CAAC,QAAQ,CAAC;IAE1D;;;OAGG;IACH,QAAQ,CAAC,QAAQ,IAAI,MAAM;IAE3B,SAAS,IAAI,MAAM;IAInB;;;;OAIG;IACH,QAAQ,CAAC,OAAO,IAAI,MAAM;CAC3B"}

package/dest/p2p/gossipable.js

@@ -1,10 +1,53 @@
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { BufferReader, bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
+export class P2PMessage {
+    publishTime;
+    id;
+    payload;
+    constructor(publishTime, id, payload){
+        this.publishTime = publishTime;
+        this.id = id;
+        this.payload = payload;
+    }
+    static async fromGossipable(message) {
+        return new P2PMessage(new Date(), await message.p2pMessageIdentifier(), message.toBuffer());
+    }
+    static fromMessageData(messageData) {
+        const reader = new BufferReader(messageData);
+        const publishTime = reader.readUInt64();
+        const id = Buffer32.fromBuffer(reader);
+        const payload = reader.readBuffer();
+        return new P2PMessage(new Date(Number(publishTime)), id, payload);
+    }
+    toMessageData() {
+        return serializeToBuffer([
+            bigintToUInt64BE(BigInt(this.publishTime.getTime())),
+            this.id,
+            serializeToBuffer(this.payload.length, this.payload)
+        ]);
+    }
+}
 /**
  * Gossipable
  *
  * Any class which extends gossipable will be able to be Gossiped over the p2p network
  */ export class Gossipable {
+    cachedId;
     /** p2p Topic
    *
    * - The p2p topic identifier, this determines how the message is handled
    */ static p2pTopic;
+    /** p2p Message Identifier
+   *
+   *  - A digest of the message information, this key is used for deduplication
+   */ async p2pMessageIdentifier() {
+        if (this.cachedId) {
+            return this.cachedId;
+        }
+        this.cachedId = await this.generateP2PMessageIdentifier();
+        return this.cachedId;
+    }
+    toMessage() {
+        return this.toBuffer();
+    }
 }

package/dest/tx/tx.d.ts

@@ -61,7 +61,7 @@ export declare class Tx extends Gossipable {
      * An array of calldata for the enqueued public function calls and the teardown function call.
      */
     publicFunctionCalldata: HashedValues[]);
-    p2pMessageIdentifier(): Promise<Buffer32>;
+    generateP2PMessageIdentifier(): Promise<Buffer32>;
     hasPublicCalls(): boolean;
     numberOfPublicCalls(): number;
     getNonRevertiblePublicCallRequestsWithCalldata(): PublicCallRequestWithCalldata[];

package/dest/tx/tx.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/tx/tx.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tx.d.ts","sourceRoot":"","sources":["../../src/tx/tx.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAC9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAyD,MAAM,6BAA6B,CAAC;AAClH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,oCAAoC,EAAE,MAAM,wDAAwD,CAAC;AAC9G,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC;;GAEG;AACH,qBAAa,EAAG,SAAQ,UAAU;;IAO9B;;OAEG;aACa,IAAI,EAAE,oCAAoC;IAC1D;;;OAGG;aACa,cAAc,EAAE,cAAc;IAC9C;;OAEG;IACI,iBAAiB,EAAE,sBAAsB,EAAE;IAClD;;OAEG;IACI,sBAAsB,EAAE,YAAY,EAAE;IAtB/C,OAAgB,QAAQ,YAAgB;IAExC,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,WAAW,CAAgC;;IAGjD;;OAEG;IACa,IAAI,EAAE,oCAAoC;IAC1D;;;OAGG;IACa,cAAc,EAAE,cAAc;IAC9C;;OAEG;IACI,iBAAiB,EAAE,sBAAsB,EAAE;IAClD;;OAEG;IACI,sBAAsB,EAAE,YAAY,EAAE;IAMhC,4BAA4B,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIhE,cAAc;IAId,mBAAmB;IAInB,8CAA8C,IAAI,6BAA6B,EAAE;IAIjF,2CAA2C,IAAI,6BAA6B,EAAE;IAI9E,wCAAwC,IAAI,6BAA6B,GAAG,SAAS;IAKrF,iCAAiC,IAAI,6BAA6B,EAAE;IAUpE,2BAA2B,IAAI,MAAM;IAIrC,cAAc,IAAI,WAAW;IAI7B;;;;OAIG;IACH,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,EAAE;IAUpD;;;OAGG;IACH,QAAQ;IASR,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC,CAS9B;IAED,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC;IAIhC;;;;OAIG;IACU,aAAa,CAAC,UAAU,EAAE,YAAY,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAIpF;;;;OAIG;IACG,yBAAyB,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,GAAE,OAAe,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAWxG;;;;;OAKG;IACG,uBAAuB,CAAC,SAAS,EAAE,aAAa,EAAE,EAAE,IAAI,GAAE,OAAe,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAiB7G;;;OAGG;IACG,SAAS,CAAC,cAAc,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAUxD;;;;;OAKG;IACH,SAAS,CAAC,IAAI,EAAE,MAAM;IAItB,cAAc,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC;IAUnC,mCAAmC;IAC7B,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAmBlC,OAAO;IASP;;;OAGG;IACH,gCAAgC;IAShC;;;;OAIG;WACU,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAIvD;;;;OAIG;WACU,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIhE;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE;IAaxB;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,WAAW,UAAQ;IASjC;;;;;;;;;;OAUG;IAEU,kBAAkB;CAWhC;AAED,uEAAuE;AACvE,KAAK,OAAO,GAAG;IAAqB,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC"}

package/dest/tx/tx.js

@@ -35,7 +35,7 @@ import { TxHash } from './tx_hash.js';
         super(), this.data = data, this.clientIvcProof = clientIvcProof, this.contractClassLogs = contractClassLogs, this.publicFunctionCalldata = publicFunctionCalldata;
     }
     // Gossipable method
-    async p2pMessageIdentifier() {
+    async generateP2PMessageIdentifier() {
         return new Buffer32((await this.getTxHash()).toBuffer());
     }
     hasPublicCalls() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "0.86.0-nightly.20250513",
+  "version": "0.86.0-nightly.20250514",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -66,13 +66,14 @@
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "dependencies": {
-    "@aztec/bb.js": "0.86.0-nightly.20250513",
-    "@aztec/blob-lib": "0.86.0-nightly.20250513",
-    "@aztec/constants": "0.86.0-nightly.20250513",
-    "@aztec/ethereum": "0.86.0-nightly.20250513",
-    "@aztec/foundation": "0.86.0-nightly.20250513",
-    "@aztec/noir-noirc_abi": "0.86.0-nightly.20250513",
+    "@aztec/bb.js": "0.86.0-nightly.20250514",
+    "@aztec/blob-lib": "0.86.0-nightly.20250514",
+    "@aztec/constants": "0.86.0-nightly.20250514",
+    "@aztec/ethereum": "0.86.0-nightly.20250514",
+    "@aztec/foundation": "0.86.0-nightly.20250514",
+    "@aztec/noir-noirc_abi": "0.86.0-nightly.20250514",
     "@google-cloud/storage": "^7.15.0",
+    "axios": "^1.9.0",
     "lodash.chunk": "^4.2.0",
     "lodash.isequal": "^4.5.0",
     "lodash.omit": "^4.5.0",

package/src/abi/contract_artifact.ts

@@ -216,31 +216,17 @@ function generateFunctionArtifact(
 }
 
 function getFunctionType(fn: NoirCompiledContractFunction): FunctionType {
-  if (fn.custom_attributes.some(attr => attr.endsWith(AZTEC_PRIVATE_ATTRIBUTE))) {
+  if (fn.custom_attributes.includes(AZTEC_PRIVATE_ATTRIBUTE)) {
     return FunctionType.PRIVATE;
-  } else if (fn.custom_attributes.some(attr => attr.endsWith(AZTEC_PUBLIC_ATTRIBUTE))) {
+  } else if (fn.custom_attributes.includes(AZTEC_PUBLIC_ATTRIBUTE)) {
     return FunctionType.PUBLIC;
-  } else if (fn.custom_attributes.some(attr => attr.endsWith(AZTEC_UTILITY_ATTRIBUTE))) {
+  } else if (fn.custom_attributes.includes(AZTEC_UTILITY_ATTRIBUTE)) {
     return FunctionType.UTILITY;
   } else {
     throw new Error(`Invalid function type for a noir contract function ${fn.name}`);
   }
 }
 
-// TODO(https://github.com/noir-lang/noir/issues/7912): Replace the above function with this one once the linked issue
-// is fixed.
-// function getFunctionType(fn: NoirCompiledContractFunction): FunctionType {
-//   if (fn.custom_attributes.includes(AZTEC_PRIVATE_ATTRIBUTE)) {
-//     return FunctionType.PRIVATE;
-//   } else if (fn.custom_attributes.includes(AZTEC_PUBLIC_ATTRIBUTE)) {
-//     return FunctionType.PUBLIC;
-//   } else if (fn.custom_attributes.includes(AZTEC_UTILITY_ATTRIBUTE)) {
-//     return FunctionType.UTILITY;
-//   } else {
-//     throw new Error(`Invalid function type for a noir contract function ${fn.name}`);
-//   }
-// }
-
 /**
  * Returns true if the first parameter is kernel function inputs.
  *

package/src/file-store/http.ts

@@ -1,6 +1,7 @@
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
 
+import axios, { type AxiosInstance, type AxiosRequestConfig, type AxiosResponse } from 'axios';
 import { createWriteStream } from 'fs';
 import { mkdir } from 'fs/promises';
 import { dirname } from 'path';
@@ -10,13 +11,15 @@ import { finished } from 'stream/promises';
 import type { ReadOnlyFileStore } from './interface.js';
 
 export class HttpFileStore implements ReadOnlyFileStore {
-  private readonly fetch: typeof fetch;
+  private readonly axiosInstance: AxiosInstance;
+  private readonly fetch: <T>(config: AxiosRequestConfig) => Promise<AxiosResponse<T>>;
 
   constructor(private readonly baseUrl: string, private readonly log: Logger = createLogger('stdlib:http-file-store')) {
-    this.fetch = async (...args: Parameters<typeof fetch>): Promise<Response> => {
+    this.axiosInstance = axios.create();
+    this.fetch = async <T>(config: AxiosRequestConfig) => {
       return await retry(
-        () => fetch(...args),
-        `Fetching ${args[0]}`,
+        () => this.axiosInstance.request<T>(config),
+        `Fetching ${config.url}`,
         makeBackoff([1, 1, 3]),
         this.log,
         /*failSilently=*/ true,
@@ -26,30 +29,33 @@ export class HttpFileStore implements ReadOnlyFileStore {
 
   public async read(pathOrUrl: string): Promise<Buffer> {
     const url = this.getUrl(pathOrUrl);
-    const response = await this.fetch(url);
-    if (response.ok) {
-      return Buffer.from(await response.arrayBuffer());
-    } else {
-      throw new Error(`Error fetching file from ${url}: ${response.statusText}`);
+    try {
+      const response = await this.fetch<ArrayBuffer>({ url, method: 'GET', responseType: 'arraybuffer' });
+      return Buffer.from(response.data);
+    } catch (error) {
+      throw new Error(`Error fetching file from ${url}: ${error instanceof Error ? error.message : String(error)}`);
     }
   }
 
   public async download(pathOrUrl: string, destPath: string): Promise<void> {
     const url = this.getUrl(pathOrUrl);
-    const response = await this.fetch(url);
-    if (response.ok) {
+    try {
+      const response = await this.fetch<Readable>({ url, method: 'GET', responseType: 'stream' });
       await mkdir(dirname(destPath), { recursive: true });
-      // Typescript complains about Readable.fromWeb, hence the cast
-      await finished(Readable.fromWeb(response.body! as any).pipe(createWriteStream(destPath)));
-    } else {
-      throw new Error(`Error fetching file from ${url}: ${response.statusText}`);
+      await finished(response.data.pipe(createWriteStream(destPath)));
+    } catch (error) {
+      throw new Error(`Error fetching file from ${url}: ${error instanceof Error ? error.message : String(error)}`);
     }
   }
 
   public async exists(pathOrUrl: string): Promise<boolean> {
     const url = this.getUrl(pathOrUrl);
-    const response = await this.fetch(url);
-    return response.ok;
+    try {
+      await this.fetch<unknown>({ url, method: 'HEAD' });
+      return true;
+    } catch (error) {
+      return false;
+    }
   }
 
   private getUrl(path: string): string {

package/src/messaging/inbox_leaf.ts

@@ -25,4 +25,14 @@ export class InboxLeaf {
   static smallestIndexFromL2Block(l2block: bigint): bigint {
     return (l2block - BigInt(INITIAL_L2_BLOCK_NUM)) * BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
   }
+
+  /**
+   * Returns the range of valid indices for a given L2 block.
+   * Start index is inclusive, end index is exclusive.
+   */
+  static indexRangeFromL2Block(l2block: bigint): [bigint, bigint] {
+    const start = this.smallestIndexFromL2Block(l2block);
+    const end = start + BigInt(NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP);
+    return [start, end];
+  }
 }

package/src/p2p/block_attestation.ts

@@ -53,7 +53,7 @@ export class BlockAttestation extends Gossipable {
       .transform(obj => new BlockAttestation(obj.blockNumber, obj.payload, obj.signature));
   }
 
-  override p2pMessageIdentifier(): Promise<Buffer32> {
+  override generateP2PMessageIdentifier(): Promise<Buffer32> {
     return Promise.resolve(new BlockAttestationHash(keccak256(this.signature.toBuffer())));
   }
 

package/src/p2p/block_proposal.ts

@@ -49,7 +49,7 @@ export class BlockProposal extends Gossipable {
     super();
   }
 
-  override p2pMessageIdentifier(): Promise<Buffer32> {
+  override generateP2PMessageIdentifier(): Promise<Buffer32> {
     return Promise.resolve(new BlockProposalHash(keccak256(this.signature.toBuffer())));
   }
 

package/src/p2p/gossipable.ts

@@ -1,13 +1,39 @@
-import type { Buffer32 } from '@aztec/foundation/buffer';
+import { Buffer32 } from '@aztec/foundation/buffer';
+import { BufferReader, bigintToUInt64BE, serializeToBuffer } from '@aztec/foundation/serialize';
 
 import type { TopicType } from './topic_type.js';
 
+export class P2PMessage {
+  constructor(public readonly publishTime: Date, public readonly id: Buffer32, public readonly payload: Buffer) {}
+
+  static async fromGossipable(message: Gossipable): Promise<P2PMessage> {
+    return new P2PMessage(new Date(), await message.p2pMessageIdentifier(), message.toBuffer());
+  }
+
+  static fromMessageData(messageData: Buffer): P2PMessage {
+    const reader = new BufferReader(messageData);
+    const publishTime = reader.readUInt64();
+    const id = Buffer32.fromBuffer(reader);
+    const payload = reader.readBuffer();
+    return new P2PMessage(new Date(Number(publishTime)), id, payload);
+  }
+
+  toMessageData(): Buffer {
+    return serializeToBuffer([
+      bigintToUInt64BE(BigInt(this.publishTime.getTime())),
+      this.id,
+      serializeToBuffer(this.payload.length, this.payload),
+    ]);
+  }
+}
+
 /**
  * Gossipable
  *
  * Any class which extends gossipable will be able to be Gossiped over the p2p network
  */
 export abstract class Gossipable {
+  private cachedId: Buffer32 | undefined;
   /** p2p Topic
    *
    * - The p2p topic identifier, this determines how the message is handled
@@ -18,7 +44,15 @@ export abstract class Gossipable {
    *
    *  - A digest of the message information, this key is used for deduplication
    */
-  abstract p2pMessageIdentifier(): Promise<Buffer32>;
+  async p2pMessageIdentifier(): Promise<Buffer32> {
+    if (this.cachedId) {
+      return this.cachedId;
+    }
+    this.cachedId = await this.generateP2PMessageIdentifier();
+    return this.cachedId;
+  }
+
+  abstract generateP2PMessageIdentifier(): Promise<Buffer32>;
 
   /** To Buffer
    *
@@ -26,6 +60,10 @@ export abstract class Gossipable {
    */
   abstract toBuffer(): Buffer;
 
+  toMessage(): Buffer {
+    return this.toBuffer();
+  }
+
   /**
    * Get the size of the gossipable object.
    *

package/src/tx/tx.ts

@@ -54,7 +54,7 @@ export class Tx extends Gossipable {
   }
 
   // Gossipable method
-  override async p2pMessageIdentifier(): Promise<Buffer32> {
+  override async generateP2PMessageIdentifier(): Promise<Buffer32> {
     return new Buffer32((await this.getTxHash()).toBuffer());
   }