@aztec/blob-lib 0.0.1-fake-c83136db25 → 0.0.1-fake-ceab37513c

package/dest/sponge_blob.js

@@ -1,32 +1,31 @@
-import { TWO_POW_64 } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
 import { poseidon2Permutation } from '@aztec/foundation/crypto';
 import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 /**
- * A Poseidon2 sponge used to accumulate data that will be added to blobs.
+ * A Poseidon2 sponge used to accumulate data that will be added to a blob.
  * See noir-projects/noir-protocol-circuits/crates/types/src/abis/sponge_blob.nr.
  */ export class SpongeBlob {
     sponge;
-    numAbsorbedFields;
-    numExpectedFields;
-    constructor(/** Sponge with absorbed fields that will go into one or more blobs. */ sponge, /** Number of effects absorbed so far. */ numAbsorbedFields, /** Number of effects that will be absorbed. */ numExpectedFields){
+    fields;
+    expectedFields;
+    constructor(/** Sponge with absorbed tx effects that will go into a blob. */ sponge, /** Number of effects absorbed so far. */ fields, /** Number of effects that will be absorbed. */ expectedFields){
         this.sponge = sponge;
-        this.numAbsorbedFields = numAbsorbedFields;
-        this.numExpectedFields = numExpectedFields;
+        this.fields = fields;
+        this.expectedFields = expectedFields;
     }
     static fromBuffer(buffer) {
         const reader = BufferReader.asReader(buffer);
         return new SpongeBlob(reader.readObject(Poseidon2Sponge), reader.readNumber(), reader.readNumber());
     }
     toBuffer() {
-        return serializeToBuffer(...SpongeBlob.getFields(this));
+        return serializeToBuffer(this.sponge, this.fields, this.expectedFields);
     }
     static getFields(fields) {
         return [
             fields.sponge,
-            fields.numAbsorbedFields,
-            fields.numExpectedFields
+            fields.fields,
+            fields.expectedFields
         ];
     }
     toFields() {
@@ -40,16 +39,16 @@ import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from
         return SpongeBlob.fromBuffer(this.toBuffer());
     }
     async absorb(fields) {
-        if (this.numAbsorbedFields + fields.length > this.numExpectedFields) {
-            throw new Error(`Attempted to fill spongeBlob with ${this.numAbsorbedFields + fields.length}, but it has a max of ${this.numExpectedFields}`);
+        if (this.fields + fields.length > this.expectedFields) {
+            throw new Error(`Attempted to fill spongeblob with ${this.fields + fields.length}, but it has a max of ${this.expectedFields}`);
         }
         await this.sponge.absorb(fields);
-        this.numAbsorbedFields += fields.length;
+        this.fields += fields.length;
     }
     async squeeze() {
         // If the blob sponge is not 'full', we append 1 to match Poseidon2::hash_internal()
         // NB: There is currently no use case in which we don't 'fill' a blob sponge, but adding for completeness
-        if (this.numAbsorbedFields != this.numExpectedFields) {
+        if (this.fields != this.expectedFields) {
             await this.sponge.absorb([
                 Fr.ONE
             ]);
@@ -59,18 +58,8 @@ import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from
     static empty() {
         return new SpongeBlob(Poseidon2Sponge.empty(), 0, 0);
     }
-    /**
-   * Initialize the sponge blob with the number of expected fields in the checkpoint and absorb it as the first field.
-   * Note: `numExpectedFields` includes the first field absorbed in this method.
-   */ static async init(numExpectedFields) {
-        // This must match what the checkpoint root rollup circuit expects.
-        // See noir-projects/noir-protocol-circuits/types/src/abis/sponge_blob.nr -> init_for_checkpoint.
-        const sponge = Poseidon2Sponge.init(numExpectedFields);
-        await sponge.absorb([
-            new Fr(numExpectedFields)
-        ]);
-        const numAbsorbedFields = 1;
-        return new SpongeBlob(sponge, numAbsorbedFields, numExpectedFields);
+    static init(expectedFields) {
+        return new SpongeBlob(Poseidon2Sponge.init(expectedFields), 0, expectedFields);
     }
 }
 // This is just noir's stdlib version of the poseidon2 sponge. We use it for a blob-specific implmentation of the hasher.
@@ -110,8 +99,8 @@ export class Poseidon2Sponge {
     static empty() {
         return new Poseidon2Sponge(makeTuple(3, ()=>Fr.ZERO), makeTuple(4, ()=>Fr.ZERO), 0, false);
     }
-    static init(numExpectedFields) {
-        const iv = new Fr(numExpectedFields).mul(new Fr(TWO_POW_64));
+    static init(expectedFields) {
+        const iv = new Fr(expectedFields).mul(new Fr(BigInt('18446744073709551616')));
         const sponge = Poseidon2Sponge.empty();
         sponge.state[3] = iv;
         return sponge;

package/dest/testing.d.ts

@@ -1,6 +1,7 @@
 import { Fr } from '@aztec/foundation/fields';
 import { Blob } from './blob.js';
 import { BatchedBlobAccumulator } from './blob_batching.js';
+import { BlockBlobPublicInputs } from './blob_batching_public_inputs.js';
 import { SpongeBlob } from './sponge_blob.js';
 /**
  * Makes arbitrary poseidon sponge for blob inputs.
@@ -16,9 +17,13 @@ export declare function makeSpongeBlob(seed?: number): SpongeBlob;
  * @returns A blob accumulator instance.
  */
 export declare function makeBatchedBlobAccumulator(seed?: number): BatchedBlobAccumulator;
-export declare function makeEncodedTxBlobFields(length: number): Fr[];
-export declare function makeEncodedBlockBlobFields(...lengths: number[]): Fr[];
-export declare function makeEncodedBlobFields(length: number): Fr[];
+/**
+ * Makes arbitrary block blob public inputs.
+ * Note: will not verify inside the circuit.
+ * @param seed - The seed to use for generating the blob inputs.
+ * @returns A block blob public inputs instance.
+ */
+export declare function makeBlockBlobPublicInputs(seed?: number): BlockBlobPublicInputs;
 /**
  * Make an encoded blob with the given length
  *
@@ -26,14 +31,14 @@ export declare function makeEncodedBlobFields(length: number): Fr[];
  * @param length
  * @returns
  */
-export declare function makeEncodedBlob(length: number): Blob;
-export declare function makeEncodedBlobs(length: number): Blob[];
+export declare function makeEncodedBlob(length: number): Promise<Blob>;
 /**
- * Make a blob with random fields.
+ * Make an unencoded blob with the given length
  *
  * This will fail deserialisation in the archiver
  * @param length
  * @returns
  */
-export declare function makeRandomBlob(length: number): Blob;
+export declare function makeUnencodedBlob(length: number): Promise<Blob>;
+export declare function makeEncodedBlobFields(fields: Fr[]): Promise<Blob>;
 //# sourceMappingURL=testing.d.ts.map

package/dest/testing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAI5D,OAAO,EAAmB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE/D;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,SAAI,GAAG,UAAU,CAWnD;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,SAAI,GAAG,sBAAsB,CAW3E;AAED,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,CAoB5D;AAED,wBAAgB,0BAA0B,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,CAMrE;AAGD,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,CAO1D;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAMpD;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,EAAE,CAGvD;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAEnD"}
+{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAEA,OAAO,EAAuB,EAAE,EAAE,MAAM,0BAA0B,CAAC;AAEnE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,sBAAsB,EAA+B,MAAM,oBAAoB,CAAC;AACzF,OAAO,EAA+B,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAEtG,OAAO,EAAmB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE/D;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,SAAI,GAAG,UAAU,CAWnD;AAED;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,SAAI,GAAG,sBAAsB,CAW3E;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,SAAI,GAAG,qBAAqB,CAOzE;AAmBD;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7D;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/D;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAEjE"}

package/dest/testing.js

@@ -1,12 +1,10 @@
-import { FIELDS_PER_BLOB } from '@aztec/constants';
 import { makeTuple } from '@aztec/foundation/array';
-import { randomInt } from '@aztec/foundation/crypto';
+import { toBufferBE } from '@aztec/foundation/bigint-buffer';
 import { BLS12Fr, BLS12Point, Fr } from '@aztec/foundation/fields';
 import { Blob } from './blob.js';
-import { BatchedBlobAccumulator } from './blob_batching.js';
-import { getBlobsPerL1Block } from './blob_utils.js';
-import { FinalBlobBatchingChallenges } from './circuit_types/index.js';
-import { createBlockEndMarker, encodeTxStartMarker } from './encoding.js';
+import { BatchedBlobAccumulator, FinalBlobBatchingChallenges } from './blob_batching.js';
+import { BlobAccumulatorPublicInputs, BlockBlobPublicInputs } from './blob_batching_public_inputs.js';
+import { TX_START_PREFIX, TX_START_PREFIX_BYTES_LENGTH } from './encoding.js';
 import { Poseidon2Sponge, SpongeBlob } from './sponge_blob.js';
 /**
  * Makes arbitrary poseidon sponge for blob inputs.
@@ -24,45 +22,30 @@ import { Poseidon2Sponge, SpongeBlob } from './sponge_blob.js';
  */ export function makeBatchedBlobAccumulator(seed = 1) {
     return new BatchedBlobAccumulator(new Fr(seed), new Fr(seed + 1), new BLS12Fr(seed + 2), BLS12Point.random(), BLS12Point.random(), new Fr(seed + 3), new BLS12Fr(seed + 4), new FinalBlobBatchingChallenges(new Fr(seed + 5), new BLS12Fr(seed + 6)));
 }
-export function makeEncodedTxBlobFields(length) {
-    const txStartMarker = {
-        numBlobFields: length,
-        // The rest of the values don't matter. The test components using it do not try to deserialize everything.
-        // Only `checkBlobFieldsEncoding` is used and it only looks at `numBlobFields`. This might change in the future
-        // when we add more thorough checks to `checkBlobFieldsEncoding`.
-        revertCode: 0,
-        numNoteHashes: 0,
-        numNullifiers: 0,
-        numL2ToL1Msgs: 0,
-        numPublicDataWrites: 0,
-        numPrivateLogs: 0,
-        publicLogsLength: 0,
-        contractClassLogLength: 0
-    };
-    return [
-        encodeTxStartMarker(txStartMarker),
-        ...Array.from({
-            length: length - 1
-        }, ()=>new Fr(randomInt(Number.MAX_SAFE_INTEGER)))
-    ];
-}
-export function makeEncodedBlockBlobFields(...lengths) {
-    return [
-        ...lengths.length > 0 ? makeEncodedTxBlobFields(lengths[0] - 1) : [],
-        ...lengths.slice(1).flatMap((length)=>makeEncodedTxBlobFields(length)),
-        createBlockEndMarker(lengths.length)
-    ];
+/**
+ * Makes arbitrary block blob public inputs.
+ * Note: will not verify inside the circuit.
+ * @param seed - The seed to use for generating the blob inputs.
+ * @returns A block blob public inputs instance.
+ */ export function makeBlockBlobPublicInputs(seed = 1) {
+    const startBlobAccumulator = makeBatchedBlobAccumulator(seed);
+    return new BlockBlobPublicInputs(BlobAccumulatorPublicInputs.fromBatchedBlobAccumulator(startBlobAccumulator), BlobAccumulatorPublicInputs.fromBatchedBlobAccumulator(makeBatchedBlobAccumulator(seed + 1)), startBlobAccumulator.finalBlobChallenges);
 }
-// Create blob fields for a checkpoint with a single block.
-export function makeEncodedBlobFields(length) {
-    if (length <= 2) {
-        throw new Error('Encoded blob fields length must be greater than 2');
-    }
-    const checkpointPrefix = new Fr(length);
-    return [
-        checkpointPrefix,
-        ...makeEncodedBlockBlobFields(length - 1)
-    ]; // -1 to account for the checkpoint prefix.
+// TODO: copied form stdlib tx effect
+function encodeFirstField(length) {
+    const lengthBuf = Buffer.alloc(2);
+    lengthBuf.writeUInt16BE(length, 0);
+    return new Fr(Buffer.concat([
+        toBufferBE(TX_START_PREFIX, TX_START_PREFIX_BYTES_LENGTH),
+        Buffer.alloc(1),
+        lengthBuf,
+        Buffer.alloc(1),
+        Buffer.from([
+            1
+        ]),
+        Buffer.alloc(1),
+        Buffer.alloc(1)
+    ]));
 }
 /**
  * Make an encoded blob with the given length
@@ -71,25 +54,29 @@ export function makeEncodedBlobFields(length) {
  * @param length
  * @returns
  */ export function makeEncodedBlob(length) {
-    if (length > FIELDS_PER_BLOB) {
-        throw new Error(`A single encoded blob must be less than ${FIELDS_PER_BLOB} fields`);
-    }
-    return Blob.fromFields(makeEncodedBlobFields(length));
-}
-export function makeEncodedBlobs(length) {
-    const fields = makeEncodedBlobFields(length);
-    return getBlobsPerL1Block(fields);
+    return Blob.fromFields([
+        encodeFirstField(length + 1),
+        ...Array.from({
+            length: length
+        }, ()=>Fr.random())
+    ]);
 }
 /**
- * Make a blob with random fields.
+ * Make an unencoded blob with the given length
  *
  * This will fail deserialisation in the archiver
  * @param length
  * @returns
- */ export function makeRandomBlob(length) {
+ */ export function makeUnencodedBlob(length) {
     return Blob.fromFields([
         ...Array.from({
             length: length
         }, ()=>Fr.random())
     ]);
 }
+export function makeEncodedBlobFields(fields) {
+    return Blob.fromFields([
+        encodeFirstField(fields.length + 1),
+        ...fields
+    ]);
+}

package/dest/types.d.ts

@@ -1,5 +1,3 @@
-export * from './circuit_types/index.js';
-export * from './interface.js';
 export * from './sponge_blob.js';
 /**
  * Type definition for the KZG instance returned by Blob.getViemKzgInstance().

package/dest/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AAEjC;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,wDAAwD;IACxD,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAAC;IAClD,kDAAkD;IAClD,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,UAAU,CAAC;IAC1E,8FAA8F;IAC9F,wBAAwB,CAAC,IAAI,EAAE,UAAU,GAAG,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;CAC1E"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AAIjC;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B,wDAAwD;IACxD,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAAC;IAClD,kDAAkD;IAClD,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,GAAG,UAAU,CAAC;IAC1E,8FAA8F;IAC9F,wBAAwB,CAAC,IAAI,EAAE,UAAU,GAAG,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;CAC1E"}

package/dest/types.js

@@ -1,3 +1 @@
-export * from './circuit_types/index.js';
-export * from './interface.js';
 export * from './sponge_blob.js';

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@aztec/blob-lib",
-  "version": "0.0.1-fake-c83136db25",
+  "version": "0.0.1-fake-ceab37513c",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
-    "./encoding": "./dest/encoding.js",
     "./types": "./dest/types.js",
     "./testing": "./dest/testing.js"
   },
@@ -27,9 +26,9 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/constants": "0.0.1-fake-c83136db25",
-    "@aztec/foundation": "0.0.1-fake-c83136db25",
-    "@crate-crypto/node-eth-kzg": "^0.10.0",
+    "@aztec/constants": "0.0.1-fake-ceab37513c",
+    "@aztec/foundation": "0.0.1-fake-ceab37513c",
+    "c-kzg": "4.1.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {