@aztec/stdlib 0.85.0-alpha-testnet.4 → 0.85.0-alpha-testnet.7

package/dest/block/published_l2_block.d.ts

@@ -1,6 +1,7 @@
 import { Signature } from '@aztec/foundation/eth-signature';
 import { L2Block } from '@aztec/stdlib/block';
 import { z } from 'zod';
+import { BlockAttestation } from '../p2p/block_attestation.js';
 export type L1PublishedData = {
     blockNumber: bigint;
     timestamp: bigint;
@@ -85,5 +86,5 @@ export declare const PublishedL2BlockSchema: z.ZodObject<{
     };
     signatures: string[];
 }>;
-export declare function randomPublishedL2Block(l2BlockNumber: number): Promise<PublishedL2Block>;
+export declare function getAttestationsFromPublishedL2Block(block: PublishedL2Block): BlockAttestation[];
 //# sourceMappingURL=published_l2_block.d.ts.map

package/dest/block/published_l2_block.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"published_l2_block.d.ts","sourceRoot":"","sources":["../../src/block/published_l2_block.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,OAAO,CAAC;IACf,EAAE,EAAE,eAAe,CAAC;IACpB,UAAU,EAAE,SAAS,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQjC,CAAC;AAEH,wBAAsB,sBAAsB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAa7F"}
+{"version":3,"file":"published_l2_block.d.ts","sourceRoot":"","sources":["../../src/block/published_l2_block.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAG/D,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,OAAO,CAAC;IACf,EAAE,EAAE,eAAe,CAAC;IACpB,UAAU,EAAE,SAAS,EAAE,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAQjC,CAAC;AAEH,wBAAgB,mCAAmC,CAAC,KAAK,EAAE,gBAAgB,sBAG1E"}

package/dest/block/published_l2_block.js

@@ -1,10 +1,9 @@
-import { Buffer32 } from '@aztec/foundation/buffer';
-import { times } from '@aztec/foundation/collection';
-import { Secp256k1Signer } from '@aztec/foundation/crypto';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { schemas } from '@aztec/foundation/schemas';
 import { L2Block } from '@aztec/stdlib/block';
 import { z } from 'zod';
+import { BlockAttestation } from '../p2p/block_attestation.js';
+import { ConsensusPayload } from '../p2p/consensus_payload.js';
 export const PublishedL2BlockSchema = z.object({
     block: L2Block.schema,
     l1: z.object({
@@ -14,19 +13,7 @@ export const PublishedL2BlockSchema = z.object({
     }),
     signatures: z.array(Signature.schema)
 });
-export async function randomPublishedL2Block(l2BlockNumber) {
-    const block = await L2Block.random(l2BlockNumber);
-    const l1 = {
-        blockNumber: BigInt(block.number),
-        timestamp: block.header.globalVariables.timestamp.toBigInt(),
-        blockHash: Buffer32.random().toString()
-    };
-    // Create valid signatures
-    const signers = times(3, ()=>Secp256k1Signer.random());
-    const signatures = await Promise.all(times(3, async (i)=>signers[i].signMessage(Buffer32.fromField(await block.hash()))));
-    return {
-        block,
-        l1,
-        signatures
-    };
+export function getAttestationsFromPublishedL2Block(block) {
+    const payload = ConsensusPayload.fromBlock(block.block);
+    return block.signatures.filter((sig)=>!sig.isEmpty).map((signature)=>new BlockAttestation(payload, signature));
 }

package/dest/errors/simulation_error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simulation_error.d.ts","sourceRoot":"","sources":["../../src/errors/simulation_error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAW,MAAM,qBAAqB,CAAC;AAE3D;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,eAAe,EAAE,YAAY,CAAC;IAC9B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB;AAUD;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,kBAAkB,EAAE,GAAG,cAAc,EAAE,CAAC;AAIpE;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,aAAa,GAAG,SAAS,IAAI,cAAc,EAAE,CAEjG;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,KAAK;IAItC,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IACnB,UAAU,EAAE,EAAE,EAAE;IACvB,OAAO,CAAC,cAAc,CAAC;IANzB,OAAO,CAAC,YAAY,CAAc;gBAGxB,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,eAAe,EAAE,EACtC,UAAU,GAAE,EAAE,EAAO,EACpB,cAAc,CAAC,2BAAe,EACtC,OAAO,CAAC,EAAE,YAAY;IAuCxB,UAAU;IASV,kBAAkB;IAIlB,kBAAkB,CAAC,OAAO,EAAE,MAAM;IAIlC;;;;OAIG;IACH,sBAAsB,CAAC,eAAe,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM;IAQ1E;;;;;OAKG;IACH,sBAAsB,CAAC,eAAe,EAAE,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM;IAY9G,QAAQ;IAqBR;;OAEG;IACH,YAAY,IAAI,eAAe,EAAE;IAIjC;;;OAGG;IACH,gBAAgB,IAAI,aAAa;IAIjC;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,aAAa;IAIzC,eAAe,CAAC,OAAO,EAAE,MAAM;IAI/B,MAAM;;;;;;IASN,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,CAmB3C;WAEY,MAAM;CAKpB"}
+{"version":3,"file":"simulation_error.d.ts","sourceRoot":"","sources":["../../src/errors/simulation_error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAInD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAqB,MAAM,qBAAqB,CAAC;AAErE;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,eAAe,EAAE,YAAY,CAAC;IAC9B;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB;AAUD;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,kBAAkB,EAAE,GAAG,cAAc,EAAE,CAAC;AAIpE;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,aAAa,GAAG,SAAS,IAAI,cAAc,EAAE,CAEjG;AAED;;GAEG;AACH,qBAAa,eAAgB,SAAQ,KAAK;IAItC,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,kBAAkB;IACnB,UAAU,EAAE,EAAE,EAAE;IACvB,OAAO,CAAC,cAAc,CAAC;IANzB,OAAO,CAAC,YAAY,CAAc;gBAGxB,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,eAAe,EAAE,EACtC,UAAU,GAAE,EAAE,EAAO,EACpB,cAAc,CAAC,2BAAe,EACtC,OAAO,CAAC,EAAE,YAAY;IAuCxB,UAAU;IASV,kBAAkB;IAIlB,kBAAkB,CAAC,OAAO,EAAE,MAAM;IAIlC;;;;OAIG;IACH,sBAAsB,CAAC,eAAe,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM;IAQ1E;;;;;OAKG;IACH,sBAAsB,CAAC,eAAe,EAAE,YAAY,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM;IAY9G,QAAQ;IAqBR;;OAEG;IACH,YAAY,IAAI,eAAe,EAAE;IAIjC;;;OAGG;IACH,gBAAgB,IAAI,aAAa;IAIjC;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,aAAa;IAIzC,eAAe,CAAC,OAAO,EAAE,MAAM;IAI/B,MAAM;;;;;;IASN,MAAM,KAAK,MAAM,IAAI,MAAM,CAAC,eAAe,CAAC,CAmB3C;WAEY,MAAM;CAKpB"}

package/dest/errors/simulation_error.js

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { FunctionSelector } from '../abi/function_selector.js';
 import { AztecAddress } from '../aztec-address/index.js';
-import { schemas } from '../schemas/index.js';
+import { optional, schemas } from '../schemas/index.js';
 const SourceCodeLocationSchema = z.object({
     filePath: z.string(),
     line: z.number().int().nonnegative(),
@@ -144,7 +144,7 @@ const NoirCallStackSchema = z.union([
             functionErrorStack: z.array(z.object({
                 contractAddress: schemas.AztecAddress,
                 contractName: z.string().optional(),
-                functionSelector: schemas.FunctionSelector,
+                functionSelector: optional(schemas.FunctionSelector),
                 functionName: z.string().optional()
             })),
             noirErrorStack: NoirCallStackSchema.optional(),

package/dest/p2p/block_proposal.d.ts

@@ -3,8 +3,9 @@
 import { Buffer32 } from '@aztec/foundation/buffer';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
-import type { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader } from '@aztec/foundation/serialize';
+import { Tx } from '../tx/tx.js';
 import { ConsensusPayload } from './consensus_payload.js';
 import { Gossipable } from './gossipable.js';
 export declare class BlockProposalHash extends Buffer32 {
@@ -21,18 +22,22 @@ export declare class BlockProposal extends Gossipable {
     readonly payload: ConsensusPayload;
     /** The signer of the BlockProposal over the header of the new block*/
     readonly signature: Signature;
+    /** The transactions in the block */
+    readonly txs?: Tx[] | undefined;
     static p2pTopic: string;
     private sender;
     constructor(
     /** The payload of the message, and what the signature is over */
     payload: ConsensusPayload, 
     /** The signer of the BlockProposal over the header of the new block*/
-    signature: Signature);
+    signature: Signature, 
+    /** The transactions in the block */
+    txs?: Tx[] | undefined);
     p2pMessageIdentifier(): Promise<Buffer32>;
     get archive(): Fr;
     get slotNumber(): Fr;
     get blockNumber(): Fr;
-    static createProposalFromSigner(payload: ConsensusPayload, payloadSigner: (payload: Buffer32) => Promise<Signature>): Promise<BlockProposal>;
+    static createProposalFromSigner(payload: ConsensusPayload, txs: Tx[], payloadSigner: (payload: Buffer32) => Promise<Signature>): Promise<BlockProposal>;
     /**Get Sender
      * Lazily evaluate the sender of the proposal; result is cached
      */

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,KAAK,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,YAAY,EAAqB,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAQ7C,qBAAa,iBAAkB,SAAQ,QAAQ;gBACjC,IAAI,EAAE,MAAM;CAGzB;AAED;;;;;GAKG;AACH,qBAAa,aAAc,SAAQ,UAAU;IAMzC,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;aACtD,SAAS,EAAE,SAAS;IATtC,OAAgB,QAAQ,SAA+C;IAEvE,OAAO,CAAC,MAAM,CAAyB;;IAGrC,iEAAiE;IACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;IACtD,SAAS,EAAE,SAAS;IAK7B,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC;IAIlD,IAAI,OAAO,IAAI,EAAE,CAEhB;IAED,IAAI,UAAU,IAAI,EAAE,CAEnB;IAED,IAAI,WAAW,IAAI,EAAE,CAEpB;WAEY,wBAAwB,CACnC,OAAO,EAAE,gBAAgB,EACzB,aAAa,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC;IAQ1D;;OAEG;IACG,SAAS;IAaf,UAAU;IAIV,QAAQ,IAAI,MAAM;IAIlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAK5D,OAAO,IAAI,MAAM;CAGlB"}
+{"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;AAQ7C,qBAAa,iBAAkB,SAAQ,QAAQ;gBACjC,IAAI,EAAE,MAAM;CAGzB;AAED;;;;;GAKG;AACH,qBAAa,aAAc,SAAQ,UAAU;IAMzC,iEAAiE;aACjD,OAAO,EAAE,gBAAgB;IAEzC,sEAAsE;aACtD,SAAS,EAAE,SAAS;IAGpC,oCAAoC;aACpB,GAAG,CAAC;IAbtB,OAAgB,QAAQ,SAA+C;IAEvE,OAAO,CAAC,MAAM,CAAyB;;IAGrC,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;IAED,IAAI,WAAW,IAAI,EAAE,CAEpB;WAEY,wBAAwB,CACnC,OAAO,EAAE,gBAAgB,EAEzB,GAAG,EAAE,EAAE,EAAE,EACT,aAAa,EAAE,CAAC,OAAO,EAAE,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC;IAQ1D;;OAEG;IACG,SAAS;IAaf,UAAU;IAIV,QAAQ,IAAI,MAAM;IASlB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa;IAa5D,OAAO,IAAI,MAAM;CAOlB"}

package/dest/p2p/block_proposal.js

@@ -2,6 +2,7 @@ import { Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256, recoverAddress } from '@aztec/foundation/crypto';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
+import { Tx } from '../tx/tx.js';
 import { ConsensusPayload } from './consensus_payload.js';
 import { Gossipable } from './gossipable.js';
 import { SignatureDomainSeparator, getHashedSignaturePayload, getHashedSignaturePayloadEthSignedMessage } from './signature_utils.js';
@@ -19,10 +20,12 @@ export class BlockProposalHash extends Buffer32 {
  */ export class BlockProposal extends Gossipable {
     payload;
     signature;
+    txs;
     static p2pTopic = createTopicString(TopicType.block_proposal);
     sender;
-    constructor(/** The payload of the message, and what the signature is over */ payload, /** The signer of the BlockProposal over the header of the new block*/ signature){
-        super(), this.payload = payload, this.signature = signature;
+    constructor(/** The payload of the message, and what the signature is over */ payload, /** The signer of the BlockProposal over the header of the new block*/ signature, // Note(md): this is placed after the txs payload in order to be backwards compatible with previous versions
+    /** The transactions in the block */ txs){
+        super(), this.payload = payload, this.signature = signature, this.txs = txs;
     }
     p2pMessageIdentifier() {
         return Promise.resolve(new BlockProposalHash(keccak256(this.signature.toBuffer())));
@@ -36,10 +39,11 @@ export class BlockProposalHash extends Buffer32 {
     get blockNumber() {
         return this.payload.header.globalVariables.blockNumber;
     }
-    static async createProposalFromSigner(payload, payloadSigner) {
+    static async createProposalFromSigner(payload, // Note(md): Provided seperately to tx hashes such that this function can be optional
+    txs, payloadSigner) {
         const hashed = await getHashedSignaturePayload(payload, SignatureDomainSeparator.blockProposal);
         const sig = await payloadSigner(hashed);
-        return new BlockProposal(payload, sig);
+        return new BlockProposal(payload, sig, txs);
     }
     /**Get Sender
    * Lazily evaluate the sender of the proposal; result is cached
@@ -55,16 +59,27 @@ export class BlockProposalHash extends Buffer32 {
         return this.payload.getPayloadToSign(SignatureDomainSeparator.blockProposal);
     }
     toBuffer() {
-        return serializeToBuffer([
+        const buffer = [
             this.payload,
             this.signature
-        ]);
+        ];
+        if (this.txs) {
+            buffer.push(this.txs.length);
+            buffer.push(this.txs);
+        }
+        return serializeToBuffer(buffer);
     }
     static fromBuffer(buf) {
         const reader = BufferReader.asReader(buf);
-        return new BlockProposal(reader.readObject(ConsensusPayload), reader.readObject(Signature));
+        const payload = reader.readObject(ConsensusPayload);
+        const sig = reader.readObject(Signature);
+        if (!reader.isEmpty()) {
+            const txs = reader.readArray(reader.readNumber(), Tx);
+            return new BlockProposal(payload, sig, txs);
+        }
+        return new BlockProposal(payload, sig);
     }
     getSize() {
-        return this.payload.getSize() + this.signature.getSize();
+        return this.payload.getSize() + this.signature.getSize() + (this.txs ? this.txs.reduce((acc, tx)=>acc + tx.getSize(), 0) : 0);
     }
 }

package/dest/p2p/interface.d.ts

@@ -13,6 +13,6 @@ export declare const TopicTypeMap: Record<string, typeof Gossipable>;
  * Used in msgIdFn libp2p to get the p2pMessageIdentifier from a message
  */
 export declare const TopicToDeserializer: {
-    [x: string]: typeof BlockAttestation.fromBuffer | typeof BlockProposal.fromBuffer | typeof Tx.fromBuffer;
+    [x: string]: typeof Tx.fromBuffer | typeof BlockAttestation.fromBuffer | typeof BlockProposal.fromBuffer;
 };
 //# sourceMappingURL=interface.d.ts.map

package/dest/tests/mocks.d.ts

@@ -2,6 +2,7 @@ import { Secp256k1Signer } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import type { ContractArtifact } from '../abi/abi.js';
 import { AztecAddress } from '../aztec-address/index.js';
+import type { PublishedL2Block } from '../block/published_l2_block.js';
 import type { ContractInstanceWithAddress } from '../contract/index.js';
 import { GasFees } from '../gas/gas_fees.js';
 import { ExtendedNote, UniqueNote } from '../note/extended_note.js';
@@ -43,7 +44,11 @@ export interface MakeConsensusPayloadOptions {
     header?: BlockHeader;
     archive?: Fr;
     txHashes?: TxHash[];
+    txs?: Tx[];
 }
 export declare const makeBlockProposal: (options?: MakeConsensusPayloadOptions) => Promise<BlockProposal>;
 export declare const makeBlockAttestation: (options?: MakeConsensusPayloadOptions) => Promise<BlockAttestation>;
+export declare function randomPublishedL2Block(l2BlockNumber: number, opts?: {
+    signers?: Secp256k1Signer[];
+}): Promise<PublishedL2Block>;
 //# sourceMappingURL=mocks.d.ts.map

package/dest/tests/mocks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../src/tests/mocks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAe,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAS7C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAoE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAEnH,OAAO,EAAE,kBAAkB,EAAiC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,eAAO,MAAM,YAAY,QAAO,MAAyB,CAAC;AAE1D,eAAO,MAAM,kBAAkB,gEAM5B,QAAQ,YAAY,CAAC,0BAQvB,CAAC;AAEF,eAAO,MAAM,gBAAgB,uEAO1B,QAAQ,UAAU,CAAC,wBASrB,CAAC;AAEF,eAAO,MAAM,MAAM,gSAed;IACD,uCAAuC,CAAC,EAAE,MAAM,CAAC;IACjD,oCAAoC,CAAC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,UAAU,CAAC,EAAE,EAAE,CAAC;IAChB,wBAAwB,CAAC,EAAE,EAAE,CAAC;CAC/B,gBAyDF,CAAC;AAEF,eAAO,MAAM,eAAe,yBAAoB,WAAW,aAAa,CAAC,CAAC,CAAC,CAAC,gBACoC,CAAC;AAkBjH,eAAO,MAAM,eAAe,gDAgB3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAAO,gBAWxC,CAAC;AAEH,eAAO,MAAM,iCAAiC,UACtC;IAAE,eAAe,CAAC,EAAE,EAAE,CAAA;CAAE,YACpB,YAAY,KACrB,QAAQ,2BAA2B,CAUrC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;EAIlC,CAAC;AAEF,MAAM,WAAW,2BAA2B;IAC1C,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAyBD,eAAO,MAAM,iBAAiB,aAAoB,2BAA2B,KAAG,QAAQ,aAAa,CAGpG,CAAC;AAGF,eAAO,MAAM,oBAAoB,aAAoB,2BAA2B,KAAG,QAAQ,gBAAgB,CAG1G,CAAC"}
+{"version":3,"file":"mocks.d.ts","sourceRoot":"","sources":["../../src/tests/mocks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAe,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAE9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAIvE,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAS7C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAoE,EAAE,EAAE,MAAM,gBAAgB,CAAC;AAEnH,OAAO,EAAE,kBAAkB,EAAiC,MAAM,uBAAuB,CAAC;AAE1F,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAG1C,eAAO,MAAM,YAAY,QAAO,MAAyB,CAAC;AAE1D,eAAO,MAAM,kBAAkB,gEAM5B,QAAQ,YAAY,CAAC,0BAQvB,CAAC;AAEF,eAAO,MAAM,gBAAgB,uEAO1B,QAAQ,UAAU,CAAC,wBASrB,CAAC;AAEF,eAAO,MAAM,MAAM,gSAed;IACD,uCAAuC,CAAC,EAAE,MAAM,CAAC;IACjD,oCAAoC,CAAC,EAAE,MAAM,CAAC;IAC9C,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,UAAU,CAAC,EAAE,EAAE,CAAC;IAChB,wBAAwB,CAAC,EAAE,EAAE,CAAC;CAC/B,gBAyDF,CAAC;AAEF,eAAO,MAAM,eAAe,yBAAoB,WAAW,aAAa,CAAC,CAAC,CAAC,CAAC,gBACoC,CAAC;AAkBjH,eAAO,MAAM,eAAe,gDAgB3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,QAAO,gBAWxC,CAAC;AAEH,eAAO,MAAM,iCAAiC,UACtC;IAAE,eAAe,CAAC,EAAE,EAAE,CAAA;CAAE,YACpB,YAAY,KACrB,QAAQ,2BAA2B,CAUrC,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;EAIlC,CAAC;AAEF,MAAM,WAAW,2BAA2B;IAC1C,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC;CACZ;AAyBD,eAAO,MAAM,iBAAiB,aAAoB,2BAA2B,KAAG,QAAQ,aAAa,CAGpG,CAAC;AAGF,eAAO,MAAM,oBAAoB,aAAoB,2BAA2B,KAAG,QAAQ,gBAAgB,CAG1G,CAAC;AAEF,wBAAsB,sBAAsB,CAC1C,aAAa,EAAE,MAAM,EACrB,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,eAAe,EAAE,CAAA;CAAO,GACzC,OAAO,CAAC,gBAAgB,CAAC,CAqB3B"}

package/dest/tests/mocks.js

@@ -1,8 +1,10 @@
 import { MAX_ENQUEUED_CALLS_PER_TX } from '@aztec/constants';
+import { Buffer32 } from '@aztec/foundation/buffer';
 import { times } from '@aztec/foundation/collection';
 import { Secp256k1Signer, randomBytes } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { AztecAddress } from '../aztec-address/index.js';
+import { L2Block } from '../block/l2_block.js';
 import { computeContractAddressFromInstance } from '../contract/contract_address.js';
 import { getContractClassFromArtifact } from '../contract/contract_class.js';
 import { SerializableContractInstance } from '../contract/contract_instance.js';
@@ -145,10 +147,31 @@ const makeAndSignConsensusPayload = async (domainSeparator, options)=>{
 };
 export const makeBlockProposal = async (options)=>{
     const { payload, signature } = await makeAndSignConsensusPayload(SignatureDomainSeparator.blockProposal, options);
-    return new BlockProposal(payload, signature);
+    return new BlockProposal(payload, signature, options?.txs ?? []);
 };
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8028)
 export const makeBlockAttestation = async (options)=>{
     const { payload, signature } = await makeAndSignConsensusPayload(SignatureDomainSeparator.blockAttestation, options);
     return new BlockAttestation(payload, signature);
 };
+export async function randomPublishedL2Block(l2BlockNumber, opts = {}) {
+    const block = await L2Block.random(l2BlockNumber);
+    const l1 = {
+        blockNumber: BigInt(block.number),
+        timestamp: block.header.globalVariables.timestamp.toBigInt(),
+        blockHash: Buffer32.random().toString()
+    };
+    const signers = opts.signers ?? times(3, ()=>Secp256k1Signer.random());
+    const attestations = await Promise.all(signers.map((signer)=>makeBlockAttestation({
+            signer,
+            header: block.header,
+            archive: block.archive.root,
+            txHashes: block.body.txEffects.map((tx)=>tx.txHash)
+        })));
+    const signatures = attestations.map((attestation)=>attestation.signature);
+    return {
+        block,
+        l1,
+        signatures
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/stdlib",
-  "version": "0.85.0-alpha-testnet.4",
+  "version": "0.85.0-alpha-testnet.7",
   "type": "module",
   "inherits": [
     "../package.common.json",
@@ -68,12 +68,12 @@
     "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules ../node_modules/.bin/jest --passWithNoTests --maxWorkers=${JEST_MAX_WORKERS:-8}"
   },
   "dependencies": {
-    "@aztec/bb.js": "0.85.0-alpha-testnet.4",
-    "@aztec/blob-lib": "0.85.0-alpha-testnet.4",
-    "@aztec/constants": "0.85.0-alpha-testnet.4",
-    "@aztec/ethereum": "0.85.0-alpha-testnet.4",
-    "@aztec/foundation": "0.85.0-alpha-testnet.4",
-    "@aztec/noir-noirc_abi": "0.85.0-alpha-testnet.4",
+    "@aztec/bb.js": "0.85.0-alpha-testnet.7",
+    "@aztec/blob-lib": "0.85.0-alpha-testnet.7",
+    "@aztec/constants": "0.85.0-alpha-testnet.7",
+    "@aztec/ethereum": "0.85.0-alpha-testnet.7",
+    "@aztec/foundation": "0.85.0-alpha-testnet.7",
+    "@aztec/noir-noirc_abi": "0.85.0-alpha-testnet.7",
     "@google-cloud/storage": "^7.15.0",
     "lodash.chunk": "^4.2.0",
     "lodash.isequal": "^4.5.0",

package/src/block/published_l2_block.ts

@@ -1,12 +1,12 @@
-import { Buffer32 } from '@aztec/foundation/buffer';
-import { times } from '@aztec/foundation/collection';
-import { Secp256k1Signer } from '@aztec/foundation/crypto';
 import { Signature } from '@aztec/foundation/eth-signature';
 import { schemas } from '@aztec/foundation/schemas';
 import { L2Block } from '@aztec/stdlib/block';
 
 import { z } from 'zod';
 
+import { BlockAttestation } from '../p2p/block_attestation.js';
+import { ConsensusPayload } from '../p2p/consensus_payload.js';
+
 export type L1PublishedData = {
   blockNumber: bigint;
   timestamp: bigint;
@@ -29,17 +29,7 @@ export const PublishedL2BlockSchema = z.object({
   signatures: z.array(Signature.schema),
 });
 
-export async function randomPublishedL2Block(l2BlockNumber: number): Promise<PublishedL2Block> {
-  const block = await L2Block.random(l2BlockNumber);
-  const l1 = {
-    blockNumber: BigInt(block.number),
-    timestamp: block.header.globalVariables.timestamp.toBigInt(),
-    blockHash: Buffer32.random().toString(),
-  };
-  // Create valid signatures
-  const signers = times(3, () => Secp256k1Signer.random());
-  const signatures = await Promise.all(
-    times(3, async i => signers[i].signMessage(Buffer32.fromField(await block.hash()))),
-  );
-  return { block, l1, signatures };
+export function getAttestationsFromPublishedL2Block(block: PublishedL2Block) {
+  const payload = ConsensusPayload.fromBlock(block.block);
+  return block.signatures.filter(sig => !sig.isEmpty).map(signature => new BlockAttestation(payload, signature));
 }

package/src/errors/simulation_error.ts

@@ -5,7 +5,7 @@ import { z } from 'zod';
 import type { OpcodeLocation } from '../abi/abi.js';
 import { FunctionSelector } from '../abi/function_selector.js';
 import { AztecAddress } from '../aztec-address/index.js';
-import { type ZodFor, schemas } from '../schemas/index.js';
+import { type ZodFor, optional, schemas } from '../schemas/index.js';
 
 /**
  * Address and selector of a function that failed during simulation.
@@ -240,7 +240,7 @@ export class SimulationError extends Error {
           z.object({
             contractAddress: schemas.AztecAddress,
             contractName: z.string().optional(),
-            functionSelector: schemas.FunctionSelector,
+            functionSelector: optional(schemas.FunctionSelector),
             functionName: z.string().optional(),
           }),
         ),

package/src/p2p/block_proposal.ts

@@ -2,9 +2,10 @@ import { Buffer32 } from '@aztec/foundation/buffer';
 import { keccak256, recoverAddress } from '@aztec/foundation/crypto';
 import type { EthAddress } from '@aztec/foundation/eth-address';
 import { Signature } from '@aztec/foundation/eth-signature';
-import type { Fr } from '@aztec/foundation/fields';
+import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, serializeToBuffer } from '@aztec/foundation/serialize';
 
+import { Tx } from '../tx/tx.js';
 import { ConsensusPayload } from './consensus_payload.js';
 import { Gossipable } from './gossipable.js';
 import {
@@ -37,6 +38,10 @@ export class BlockProposal extends Gossipable {
 
     /** The signer of the BlockProposal over the header of the new block*/
     public readonly signature: Signature,
+
+    // Note(md): this is placed after the txs payload in order to be backwards compatible with previous versions
+    /** The transactions in the block */
+    public readonly txs?: Tx[],
   ) {
     super();
   }
@@ -59,12 +64,14 @@ export class BlockProposal extends Gossipable {
 
   static async createProposalFromSigner(
     payload: ConsensusPayload,
+    // Note(md): Provided seperately to tx hashes such that this function can be optional
+    txs: Tx[],
     payloadSigner: (payload: Buffer32) => Promise<Signature>,
   ) {
     const hashed = await getHashedSignaturePayload(payload, SignatureDomainSeparator.blockProposal);
     const sig = await payloadSigner(hashed);
 
-    return new BlockProposal(payload, sig);
+    return new BlockProposal(payload, sig, txs);
   }
 
   /**Get Sender
@@ -88,15 +95,32 @@ export class BlockProposal extends Gossipable {
   }
 
   toBuffer(): Buffer {
-    return serializeToBuffer([this.payload, this.signature]);
+    const buffer: any[] = [this.payload, this.signature];
+    if (this.txs) {
+      buffer.push(this.txs.length);
+      buffer.push(this.txs);
+    }
+    return serializeToBuffer(buffer);
   }
 
   static fromBuffer(buf: Buffer | BufferReader): BlockProposal {
     const reader = BufferReader.asReader(buf);
-    return new BlockProposal(reader.readObject(ConsensusPayload), reader.readObject(Signature));
+    const payload = reader.readObject(ConsensusPayload);
+    const sig = reader.readObject(Signature);
+
+    if (!reader.isEmpty()) {
+      const txs = reader.readArray(reader.readNumber(), Tx);
+      return new BlockProposal(payload, sig, txs);
+    }
+
+    return new BlockProposal(payload, sig);
   }
 
   getSize(): number {
-    return this.payload.getSize() + this.signature.getSize();
+    return (
+      this.payload.getSize() +
+      this.signature.getSize() +
+      (this.txs ? this.txs.reduce((acc, tx) => acc + tx.getSize(), 0) : 0)
+    );
   }
 }

package/src/tests/mocks.ts

@@ -1,10 +1,13 @@
 import { MAX_ENQUEUED_CALLS_PER_TX } from '@aztec/constants';
+import { Buffer32 } from '@aztec/foundation/buffer';
 import { times } from '@aztec/foundation/collection';
 import { Secp256k1Signer, randomBytes } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 
 import type { ContractArtifact } from '../abi/abi.js';
 import { AztecAddress } from '../aztec-address/index.js';
+import { L2Block } from '../block/l2_block.js';
+import type { PublishedL2Block } from '../block/published_l2_block.js';
 import { computeContractAddressFromInstance } from '../contract/contract_address.js';
 import { getContractClassFromArtifact } from '../contract/contract_class.js';
 import { SerializableContractInstance } from '../contract/contract_instance.js';
@@ -231,6 +234,7 @@ export interface MakeConsensusPayloadOptions {
   header?: BlockHeader;
   archive?: Fr;
   txHashes?: TxHash[];
+  txs?: Tx[];
 }
 
 const makeAndSignConsensusPayload = async (
@@ -258,7 +262,7 @@ const makeAndSignConsensusPayload = async (
 
 export const makeBlockProposal = async (options?: MakeConsensusPayloadOptions): Promise<BlockProposal> => {
   const { payload, signature } = await makeAndSignConsensusPayload(SignatureDomainSeparator.blockProposal, options);
-  return new BlockProposal(payload, signature);
+  return new BlockProposal(payload, signature, options?.txs ?? []);
 };
 
 // TODO(https://github.com/AztecProtocol/aztec-packages/issues/8028)
@@ -266,3 +270,29 @@ export const makeBlockAttestation = async (options?: MakeConsensusPayloadOptions
   const { payload, signature } = await makeAndSignConsensusPayload(SignatureDomainSeparator.blockAttestation, options);
   return new BlockAttestation(payload, signature);
 };
+
+export async function randomPublishedL2Block(
+  l2BlockNumber: number,
+  opts: { signers?: Secp256k1Signer[] } = {},
+): Promise<PublishedL2Block> {
+  const block = await L2Block.random(l2BlockNumber);
+  const l1 = {
+    blockNumber: BigInt(block.number),
+    timestamp: block.header.globalVariables.timestamp.toBigInt(),
+    blockHash: Buffer32.random().toString(),
+  };
+
+  const signers = opts.signers ?? times(3, () => Secp256k1Signer.random());
+  const attestations = await Promise.all(
+    signers.map(signer =>
+      makeBlockAttestation({
+        signer,
+        header: block.header,
+        archive: block.archive.root,
+        txHashes: block.body.txEffects.map(tx => tx.txHash),
+      }),
+    ),
+  );
+  const signatures = attestations.map(attestation => attestation.signature);
+  return { block, l1, signatures };
+}