@aztec-labs/blob-lib 6.0.0-rc.1 → 6.0.0-rc.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dest/blob_batching.d.ts +3 -2
- package/dest/blob_batching.d.ts.map +1 -1
- package/dest/blob_batching.js +11 -5
- package/dest/encoding/tx_blob_data.d.ts +1 -1
- package/dest/encoding/tx_blob_data.d.ts.map +1 -1
- package/dest/encoding/tx_blob_data.js +14 -0
- package/dest/hash.js +1 -1
- package/package.json +3 -3
- package/src/blob_batching.ts +10 -6
- package/src/encoding/tx_blob_data.ts +27 -0
- package/src/hash.ts +1 -1
package/dest/blob_batching.d.ts
CHANGED
|
@@ -84,9 +84,10 @@ export declare class BatchedBlobAccumulator {
|
|
|
84
84
|
/**
|
|
85
85
|
* Given blob i, accumulate all state.
|
|
86
86
|
* We assume the input blob has not been evaluated at z.
|
|
87
|
+
* @param isCheckpointStart - Whether the blob is the first of its checkpoint. The first blob of the epoch always is.
|
|
87
88
|
* @returns An updated blob accumulator.
|
|
88
89
|
*/
|
|
89
|
-
accumulateBlob(blob: Blob, blobFieldsHash: Fr): Promise<BatchedBlobAccumulator>;
|
|
90
|
+
accumulateBlob(blob: Blob, blobFieldsHash: Fr, isCheckpointStart: boolean): Promise<BatchedBlobAccumulator>;
|
|
90
91
|
/**
|
|
91
92
|
* Given blobs, accumulate all state.
|
|
92
93
|
* We assume the input blobs have not been evaluated at z.
|
|
@@ -115,4 +116,4 @@ export declare class BatchedBlobAccumulator {
|
|
|
115
116
|
toBlobAccumulator(): BlobAccumulator;
|
|
116
117
|
toFinalBlobAccumulator(): FinalBlobAccumulator;
|
|
117
118
|
}
|
|
118
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
119
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmxvYl9iYXRjaGluZy5kLnRzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2Jsb2JfYmF0Y2hpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBR0EsT0FBTyxFQUFFLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUMxRSxPQUFPLEVBQUUsRUFBRSxFQUFFLE1BQU0scUNBQXFDLENBQUM7QUFFekQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ2hELE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxXQUFXLENBQUM7QUFFakMsT0FBTyxFQUFFLGVBQWUsRUFBRSxvQkFBb0IsRUFBRSwyQkFBMkIsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBSTlHOzs7R0FHRztBQUNILHFCQUFhLHNCQUFzQjtJQUUvQiw4Q0FBOEM7YUFDOUIsc0JBQXNCLEVBQUUsRUFBRTtJQUMxQyxzRUFBc0U7YUFDdEQsSUFBSSxFQUFFLEVBQUU7SUFDeEIseUdBQXlHO2FBQ3pGLElBQUksRUFBRSxPQUFPO0lBQzdCLHFHQUFxRzthQUNyRixJQUFJLEVBQUUsVUFBVTtJQUNoQyxvR0FBb0c7YUFDcEYsSUFBSSxFQUFFLFVBQVU7SUFDaEM7Ozs7T0FJRzthQUNhLFFBQVEsRUFBRSxFQUFFO0lBQzVCLHVHQUF1RzthQUN2RixRQUFRLEVBQUUsT0FBTztJQUNqQyxvR0FBb0c7YUFDcEYsbUJBQW1CLEVBQUUsMkJBQTJCO0lBcEJsRTtJQUNFLDhDQUE4QztJQUM5QixzQkFBc0IsRUFBRSxFQUFFO0lBQzFDLHNFQUFzRTtJQUN0RCxJQUFJLEVBQUUsRUFBRTtJQUN4Qix5R0FBeUc7SUFDekYsSUFBSSxFQUFFLE9BQU87SUFDN0IscUdBQXFHO0lBQ3JGLElBQUksRUFBRSxVQUFVO0lBQ2hDLG9HQUFvRztJQUNwRixJQUFJLEVBQUUsVUFBVTtJQUNoQzs7OztPQUlHO0lBQ2EsUUFBUSxFQUFFLEVBQUU7SUFDNUIsdUdBQXVHO0lBQ3ZGLFFBQVEsRUFBRSxPQUFPO0lBQ2pDLG9HQUFvRztJQUNwRixtQkFBbUIsRUFBRSwyQkFBMkIsRUFDOUQ7SUFFSjs7O09BR0c7SUFDSCxNQUFNLENBQUMsaUJBQWlCLENBQUMsbUJBQW1CLEVBQUUsMkJBQTJCLEdBQUcsc0JBQXNCLENBV2pHO0lBRUQ7Ozs7T0FJRztJQUNILE9BQWEsY0FBYyxDQUFDLHVCQUF1QixFQUFFLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLHNCQUFzQixDQUFDLENBRzVGO0lBRUQ7Ozs7OztPQU1HO0lBQ0gsT0FBYSxLQUFLLENBQUMsdUJBQXVCLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxXQUFXLFVBQVEsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBZTdGO0lBRUQ7Ozs7Ozs7Ozs7O09BV0c7SUFDSCxPQUFhLCtCQUErQixDQUFDLHVCQUF1QixFQUFFLEVBQUUsRUFBRSxFQUFFLEdBQUcsT0FBTyxDQUFDLDJCQUEyQixDQUFDLENBbUNsSDtJQUVEOzs7OztPQUtHO0lBQ0csY0FBYyxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsY0FBYyxFQUFFLEVBQUUsRUFBRSxpQkFBaUIsRUFBRSxPQUFPLG1DQXlDOUU7SUFFRDs7Ozs7T0FLRztJQUNHLGdCQUFnQixDQUFDLFVBQVUsRUFBRSxFQUFFLEVBQUUsbUNBbUJ0QztJQUVEOzs7Ozs7Ozs7Ozs7O09BYUc7SUFDRyxRQUFRLENBQUMsV0FBVyxVQUFRLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQXlCeEQ7SUFFRCxNQUFNLFlBT0w7SUFFRCxZQUFZLFlBVVg7SUFFRCxLQUFLLDJCQVdKO0lBRUQsaUJBQWlCLG9CQVNoQjtJQUVELHNCQUFzQix5QkFFckI7Q0FDRiJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blob_batching.d.ts","sourceRoot":"","sources":["../src/blob_batching.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAEzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAI9G;;;GAGG;AACH,qBAAa,sBAAsB;IAE/B,8CAA8C;aAC9B,sBAAsB,EAAE,EAAE;IAC1C,sEAAsE;aACtD,IAAI,EAAE,EAAE;IACxB,yGAAyG;aACzF,IAAI,EAAE,OAAO;IAC7B,qGAAqG;aACrF,IAAI,EAAE,UAAU;IAChC,oGAAoG;aACpF,IAAI,EAAE,UAAU;IAChC;;;;OAIG;aACa,QAAQ,EAAE,EAAE;IAC5B,uGAAuG;aACvF,QAAQ,EAAE,OAAO;IACjC,oGAAoG;aACpF,mBAAmB,EAAE,2BAA2B;IApBlE;IACE,8CAA8C;IAC9B,sBAAsB,EAAE,EAAE;IAC1C,sEAAsE;IACtD,IAAI,EAAE,EAAE;IACxB,yGAAyG;IACzF,IAAI,EAAE,OAAO;IAC7B,qGAAqG;IACrF,IAAI,EAAE,UAAU;IAChC,oGAAoG;IACpF,IAAI,EAAE,UAAU;IAChC;;;;OAIG;IACa,QAAQ,EAAE,EAAE;IAC5B,uGAAuG;IACvF,QAAQ,EAAE,OAAO;IACjC,oGAAoG;IACpF,mBAAmB,EAAE,2BAA2B,EAC9D;IAEJ;;;OAGG;IACH,MAAM,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,2BAA2B,GAAG,sBAAsB,CAWjG;IAED;;;;OAIG;IACH,OAAa,cAAc,CAAC,uBAAuB,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAG5F;IAED;;;;;;OAMG;IACH,OAAa,KAAK,CAAC,uBAAuB,EAAE,EAAE,EAAE,EAAE,EAAE,WAAW,UAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAe7F;IAED;;;;;;;;;;;OAWG;IACH,OAAa,+BAA+B,CAAC,uBAAuB,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAmClH;IAED
|
|
1
|
+
{"version":3,"file":"blob_batching.d.ts","sourceRoot":"","sources":["../src/blob_batching.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AAEzD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAI9G;;;GAGG;AACH,qBAAa,sBAAsB;IAE/B,8CAA8C;aAC9B,sBAAsB,EAAE,EAAE;IAC1C,sEAAsE;aACtD,IAAI,EAAE,EAAE;IACxB,yGAAyG;aACzF,IAAI,EAAE,OAAO;IAC7B,qGAAqG;aACrF,IAAI,EAAE,UAAU;IAChC,oGAAoG;aACpF,IAAI,EAAE,UAAU;IAChC;;;;OAIG;aACa,QAAQ,EAAE,EAAE;IAC5B,uGAAuG;aACvF,QAAQ,EAAE,OAAO;IACjC,oGAAoG;aACpF,mBAAmB,EAAE,2BAA2B;IApBlE;IACE,8CAA8C;IAC9B,sBAAsB,EAAE,EAAE;IAC1C,sEAAsE;IACtD,IAAI,EAAE,EAAE;IACxB,yGAAyG;IACzF,IAAI,EAAE,OAAO;IAC7B,qGAAqG;IACrF,IAAI,EAAE,UAAU;IAChC,oGAAoG;IACpF,IAAI,EAAE,UAAU;IAChC;;;;OAIG;IACa,QAAQ,EAAE,EAAE;IAC5B,uGAAuG;IACvF,QAAQ,EAAE,OAAO;IACjC,oGAAoG;IACpF,mBAAmB,EAAE,2BAA2B,EAC9D;IAEJ;;;OAGG;IACH,MAAM,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,2BAA2B,GAAG,sBAAsB,CAWjG;IAED;;;;OAIG;IACH,OAAa,cAAc,CAAC,uBAAuB,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAG5F;IAED;;;;;;OAMG;IACH,OAAa,KAAK,CAAC,uBAAuB,EAAE,EAAE,EAAE,EAAE,EAAE,WAAW,UAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAe7F;IAED;;;;;;;;;;;OAWG;IACH,OAAa,+BAA+B,CAAC,uBAAuB,EAAE,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAmClH;IAED;;;;;OAKG;IACG,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,iBAAiB,EAAE,OAAO,mCAyC9E;IAED;;;;;OAKG;IACG,gBAAgB,CAAC,UAAU,EAAE,EAAE,EAAE,mCAmBtC;IAED;;;;;;;;;;;;;OAaG;IACG,QAAQ,CAAC,WAAW,UAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,CAyBxD;IAED,MAAM,YAOL;IAED,YAAY,YAUX;IAED,KAAK,2BAWJ;IAED,iBAAiB,oBAShB;IAED,sBAAsB,yBAErB;CACF"}
|
package/dest/blob_batching.js
CHANGED
|
@@ -124,8 +124,9 @@ import { getKzg } from './kzg_context.js';
|
|
|
124
124
|
/**
|
|
125
125
|
* Given blob i, accumulate all state.
|
|
126
126
|
* We assume the input blob has not been evaluated at z.
|
|
127
|
+
* @param isCheckpointStart - Whether the blob is the first of its checkpoint. The first blob of the epoch always is.
|
|
127
128
|
* @returns An updated blob accumulator.
|
|
128
|
-
*/ async accumulateBlob(blob, blobFieldsHash) {
|
|
129
|
+
*/ async accumulateBlob(blob, blobFieldsHash, isCheckpointStart) {
|
|
129
130
|
const { proof, y: thisY } = await blob.evaluate(this.finalBlobChallenges.z);
|
|
130
131
|
const thisC = BLS12Point.decompress(blob.commitment);
|
|
131
132
|
const thisQ = BLS12Point.decompress(proof);
|
|
@@ -133,19 +134,23 @@ import { getKzg } from './kzg_context.js';
|
|
|
133
134
|
if (this.isEmptyState()) {
|
|
134
135
|
/**
|
|
135
136
|
* Init the first accumulation state of the epoch.
|
|
136
|
-
* - v_acc := sha256(C_0)
|
|
137
|
+
* - v_acc := sha256(0x01, C_0)
|
|
137
138
|
* - z_acc := z_0
|
|
138
139
|
* - y_acc := gamma^0 * y_0 = y_0
|
|
139
140
|
* - c_acc := gamma^0 * c_0 = c_0
|
|
140
141
|
* - gamma_acc := poseidon2(y_0.limbs)
|
|
141
142
|
* - gamma^(i + 1) = gamma^1 = gamma // denoted gamma_pow_acc
|
|
142
|
-
*/ return new BatchedBlobAccumulator(
|
|
143
|
+
*/ return new BatchedBlobAccumulator(// true, serialized as the byte 0x01: the checkpoint-start flag, which lets the hash bind how the epoch's blobs
|
|
144
|
+
// split into checkpoints. The epoch's first blob always starts a checkpoint.
|
|
145
|
+
sha256ToField([
|
|
146
|
+
true,
|
|
143
147
|
blob.commitment
|
|
144
148
|
]), blobChallengeZ, thisY, thisC, thisQ, await hashBlobYLimbs(thisY), this.finalBlobChallenges.gamma, this.finalBlobChallenges);
|
|
145
149
|
} else {
|
|
146
150
|
// Moving from i - 1 to i, so:
|
|
147
151
|
return new BatchedBlobAccumulator(sha256ToField([
|
|
148
152
|
this.blobCommitmentsHashAcc,
|
|
153
|
+
isCheckpointStart,
|
|
149
154
|
blob.commitment
|
|
150
155
|
]), await poseidon2HashWithSeparator([
|
|
151
156
|
this.zAcc,
|
|
@@ -170,8 +175,9 @@ import { getKzg } from './kzg_context.js';
|
|
|
170
175
|
const blobFieldsHash = await computeBlobFieldsHash(blobFields);
|
|
171
176
|
// Initialize the acc to iterate over:
|
|
172
177
|
let acc = this.clone();
|
|
173
|
-
for (const blob of blobs){
|
|
174
|
-
|
|
178
|
+
for (const [i, blob] of blobs.entries()){
|
|
179
|
+
// Flags this checkpoint's first blob, matching the circuits and the flag L1 sets on each proposal's first blob.
|
|
180
|
+
acc = await acc.accumulateBlob(blob, blobFieldsHash, i === 0);
|
|
175
181
|
}
|
|
176
182
|
return acc;
|
|
177
183
|
}
|
|
@@ -22,4 +22,4 @@ export declare function decodeTxBlobData(fields: Fr[] | FieldReader): TxBlobData
|
|
|
22
22
|
/** Minimum blob footprint of a transaction with one mandatory nullifier and no other effects. */
|
|
23
23
|
export declare const MIN_TX_BLOB_FIELDS: number;
|
|
24
24
|
export declare function getNumTxBlobFields(txStartMarker: Omit<TxStartMarker, 'revertCode' | 'numBlobFields'>): number;
|
|
25
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
25
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHhfYmxvYl9kYXRhLmQudHMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZW5jb2RpbmcvdHhfYmxvYl9kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVdBLE9BQU8sRUFBRSxFQUFFLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQztBQUN6RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sa0NBQWtDLENBQUM7QUFHL0QsT0FBTyxFQUFFLEtBQUssYUFBYSxFQUE0QyxNQUFNLHNCQUFzQixDQUFDO0FBSXBHLE1BQU0sV0FBVyxVQUFVO0lBQ3pCLGFBQWEsRUFBRSxhQUFhLENBQUM7SUFDN0IsTUFBTSxFQUFFLEVBQUUsQ0FBQztJQUNYLGNBQWMsRUFBRSxFQUFFLENBQUM7SUFDbkIsVUFBVSxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQ2pCLFVBQVUsRUFBRSxFQUFFLEVBQUUsQ0FBQztJQUNqQixVQUFVLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFDakIsZ0JBQWdCLEVBQUUsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQUUsQ0FBQztJQUM3QixXQUFXLEVBQUUsRUFBRSxFQUFFLEVBQUUsQ0FBQztJQUNwQixVQUFVLEVBQUUsRUFBRSxFQUFFLENBQUM7SUFDakIsZ0JBQWdCLEVBQUUsRUFBRSxFQUFFLENBQUM7Q0FDeEI7QUFFRCxvR0FBb0c7QUFDcEcsd0JBQWdCLGdDQUFnQyxDQUFDLGdCQUFnQixFQUFFLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxFQUFFLEdBQUcsRUFBRSxFQUFFLENBRW5GO0FBRUQsd0dBQXdHO0FBQ3hHLHdCQUFnQiwyQkFBMkIsQ0FBQyxXQUFXLEVBQUUsRUFBRSxFQUFFLEVBQUUsR0FBRyxFQUFFLEVBQUUsQ0FFckU7QUFFRCx3QkFBZ0IsZ0JBQWdCLENBQUMsVUFBVSxFQUFFLFVBQVUsR0FBRyxFQUFFLEVBQUUsQ0FhN0Q7QUFFRCx3QkFBZ0IsZ0JBQWdCLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxHQUFHLFdBQVcsR0FBRyxVQUFVLENBOEV2RTtBQUVELGlHQUFpRztBQUNqRyxlQUFPLE1BQU0sa0JBQWtCLFFBUzdCLENBQUM7QUFFSCx3QkFBZ0Isa0JBQWtCLENBQUMsYUFBYSxFQUFFLElBQUksQ0FBQyxhQUFhLEVBQUUsWUFBWSxHQUFHLGVBQWUsQ0FBQyxVQWVwRyJ9
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tx_blob_data.d.ts","sourceRoot":"","sources":["../../src/encoding/tx_blob_data.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tx_blob_data.d.ts","sourceRoot":"","sources":["../../src/encoding/tx_blob_data.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,EAAE,EAAE,MAAM,qCAAqC,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAG/D,OAAO,EAAE,KAAK,aAAa,EAA4C,MAAM,sBAAsB,CAAC;AAIpG,MAAM,WAAW,UAAU;IACzB,aAAa,EAAE,aAAa,CAAC;IAC7B,MAAM,EAAE,EAAE,CAAC;IACX,cAAc,EAAE,EAAE,CAAC;IACnB,UAAU,EAAE,EAAE,EAAE,CAAC;IACjB,UAAU,EAAE,EAAE,EAAE,CAAC;IACjB,UAAU,EAAE,EAAE,EAAE,CAAC;IACjB,gBAAgB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;IAC7B,WAAW,EAAE,EAAE,EAAE,EAAE,CAAC;IACpB,UAAU,EAAE,EAAE,EAAE,CAAC;IACjB,gBAAgB,EAAE,EAAE,EAAE,CAAC;CACxB;AAED,oGAAoG;AACpG,wBAAgB,gCAAgC,CAAC,gBAAgB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CAEnF;AAED,wGAAwG;AACxG,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,CAErE;AAED,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,UAAU,GAAG,EAAE,EAAE,CAa7D;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,WAAW,GAAG,UAAU,CA8EvE;AAED,iGAAiG;AACjG,eAAO,MAAM,kBAAkB,QAS7B,CAAC;AAEH,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,YAAY,GAAG,eAAe,CAAC,UAepG"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { CONTRACT_CLASS_LOG_SIZE_IN_FIELDS, FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH, MAX_L2_TO_L1_MSGS_PER_TX, MAX_NOTE_HASHES_PER_TX, MAX_NULLIFIERS_PER_TX, MAX_PRIVATE_LOGS_PER_TX, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PRIVATE_LOG_SIZE_IN_FIELDS } from '@aztec-labs/constants';
|
|
1
2
|
import { chunk } from '@aztec-labs/foundation/collection';
|
|
2
3
|
import { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
3
4
|
import { FieldReader } from '@aztec-labs/foundation/serialize';
|
|
@@ -32,6 +33,18 @@ export function decodeTxBlobData(fields) {
|
|
|
32
33
|
throw new BlobDeserializationError(`Incorrect encoding of blob fields: not enough fields for tx blob data.`);
|
|
33
34
|
}
|
|
34
35
|
const txStartMarker = decodeTxStartMarker(reader.readField());
|
|
36
|
+
const checkMaxCount = (count, max, type)=>{
|
|
37
|
+
if (count > max) {
|
|
38
|
+
throw new BlobDeserializationError(`Incorrect encoding of blob fields: too many ${type}. Got ${count}, maximum is ${max}.`);
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
checkMaxCount(txStartMarker.numNoteHashes, MAX_NOTE_HASHES_PER_TX, 'note hashes');
|
|
42
|
+
checkMaxCount(txStartMarker.numNullifiers, MAX_NULLIFIERS_PER_TX, 'nullifiers');
|
|
43
|
+
checkMaxCount(txStartMarker.numL2ToL1Msgs, MAX_L2_TO_L1_MSGS_PER_TX, 'l2-to-l1 messages');
|
|
44
|
+
checkMaxCount(txStartMarker.numPublicDataWrites, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, 'public data writes');
|
|
45
|
+
checkMaxCount(txStartMarker.numPrivateLogs, MAX_PRIVATE_LOGS_PER_TX, 'private logs');
|
|
46
|
+
checkMaxCount(txStartMarker.publicLogsLength, FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH, 'public log fields');
|
|
47
|
+
checkMaxCount(txStartMarker.contractClassLogLength, CONTRACT_CLASS_LOG_SIZE_IN_FIELDS, 'contract class log fields');
|
|
35
48
|
const checkRemainingFields = (requiredFields, type)=>{
|
|
36
49
|
if (requiredFields > reader.remainingFields()) {
|
|
37
50
|
throw new BlobDeserializationError(`Incorrect encoding of blob fields: not enough fields for ${type}. Expected ${requiredFields} fields, only ${reader.remainingFields()} remaining.`);
|
|
@@ -53,6 +66,7 @@ export function decodeTxBlobData(fields) {
|
|
|
53
66
|
length: txStartMarker.numPrivateLogs
|
|
54
67
|
}, ()=>{
|
|
55
68
|
const length = reader.readU32();
|
|
69
|
+
checkMaxCount(length, PRIVATE_LOG_SIZE_IN_FIELDS, 'private log fields');
|
|
56
70
|
checkRemainingFields(length, 'private log');
|
|
57
71
|
return reader.readFieldArray(length);
|
|
58
72
|
});
|
package/dest/hash.js
CHANGED
|
@@ -14,7 +14,7 @@ const VERSIONED_HASH_VERSION_KZG = 0x01;
|
|
|
14
14
|
}
|
|
15
15
|
// TODO(#13430): The blobsHash is confusingly similar to blobCommitmentsHash, calculated from below blobCommitments:
|
|
16
16
|
// - blobsHash := sha256([blobhash_0, ..., blobhash_m]) = a hash of all blob hashes in a block with m+1 blobs inserted into the header, exists so a user can cross check blobs.
|
|
17
|
-
// - blobCommitmentsHash := sha256( ...sha256(sha256(C_0), C_1) ... C_n) = iteratively calculated hash of all blob commitments in an epoch with n+1 blobs (see calculateBlobCommitmentsHash()),
|
|
17
|
+
// - blobCommitmentsHash := sha256( ...sha256(sha256(s_0, C_0), s_1, C_1) ... s_n, C_n) = iteratively calculated hash of all blob commitments in an epoch with n+1 blobs, where s_i is the byte 0x01 for each checkpoint's first blob and 0x00 otherwise (see calculateBlobCommitmentsHash()),
|
|
18
18
|
// exists so we can validate injected commitments to the rollup circuits correspond to the correct real blobs.
|
|
19
19
|
// We may be able to combine these values e.g. blobCommitmentsHash := sha256( ...sha256(sha256(blobshash_0), blobshash_1) ... blobshash_l) for an epoch with l+1 blocks.
|
|
20
20
|
export function computeBlobsHash(evmVersionedBlobHashes) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aztec-labs/blob-lib",
|
|
3
|
-
"version": "6.0.0-rc.
|
|
3
|
+
"version": "6.0.0-rc.3",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./dest/index.js",
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
"../package.common.json"
|
|
28
28
|
],
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@aztec-labs/constants": "6.0.0-rc.
|
|
31
|
-
"@aztec-labs/foundation": "6.0.0-rc.
|
|
30
|
+
"@aztec-labs/constants": "6.0.0-rc.3",
|
|
31
|
+
"@aztec-labs/foundation": "6.0.0-rc.3",
|
|
32
32
|
"@crate-crypto/node-eth-kzg": "^0.10.0",
|
|
33
33
|
"tslib": "^2.4.0"
|
|
34
34
|
},
|
package/src/blob_batching.ts
CHANGED
|
@@ -142,9 +142,10 @@ export class BatchedBlobAccumulator {
|
|
|
142
142
|
/**
|
|
143
143
|
* Given blob i, accumulate all state.
|
|
144
144
|
* We assume the input blob has not been evaluated at z.
|
|
145
|
+
* @param isCheckpointStart - Whether the blob is the first of its checkpoint. The first blob of the epoch always is.
|
|
145
146
|
* @returns An updated blob accumulator.
|
|
146
147
|
*/
|
|
147
|
-
async accumulateBlob(blob: Blob, blobFieldsHash: Fr) {
|
|
148
|
+
async accumulateBlob(blob: Blob, blobFieldsHash: Fr, isCheckpointStart: boolean) {
|
|
148
149
|
const { proof, y: thisY } = await blob.evaluate(this.finalBlobChallenges.z);
|
|
149
150
|
const thisC = BLS12Point.decompress(blob.commitment);
|
|
150
151
|
const thisQ = BLS12Point.decompress(proof);
|
|
@@ -153,7 +154,7 @@ export class BatchedBlobAccumulator {
|
|
|
153
154
|
if (this.isEmptyState()) {
|
|
154
155
|
/**
|
|
155
156
|
* Init the first accumulation state of the epoch.
|
|
156
|
-
* - v_acc := sha256(C_0)
|
|
157
|
+
* - v_acc := sha256(0x01, C_0)
|
|
157
158
|
* - z_acc := z_0
|
|
158
159
|
* - y_acc := gamma^0 * y_0 = y_0
|
|
159
160
|
* - c_acc := gamma^0 * c_0 = c_0
|
|
@@ -161,7 +162,9 @@ export class BatchedBlobAccumulator {
|
|
|
161
162
|
* - gamma^(i + 1) = gamma^1 = gamma // denoted gamma_pow_acc
|
|
162
163
|
*/
|
|
163
164
|
return new BatchedBlobAccumulator(
|
|
164
|
-
|
|
165
|
+
// true, serialized as the byte 0x01: the checkpoint-start flag, which lets the hash bind how the epoch's blobs
|
|
166
|
+
// split into checkpoints. The epoch's first blob always starts a checkpoint.
|
|
167
|
+
sha256ToField([true, blob.commitment]), // blobCommitmentsHashAcc = sha256(0x01, C_0)
|
|
165
168
|
blobChallengeZ, // zAcc = z_0
|
|
166
169
|
thisY, // yAcc = gamma^0 * y_0 = 1 * y_0
|
|
167
170
|
thisC, // cAcc = gamma^0 * C_0 = 1 * C_0
|
|
@@ -173,7 +176,7 @@ export class BatchedBlobAccumulator {
|
|
|
173
176
|
} else {
|
|
174
177
|
// Moving from i - 1 to i, so:
|
|
175
178
|
return new BatchedBlobAccumulator(
|
|
176
|
-
sha256ToField([this.blobCommitmentsHashAcc, blob.commitment]), // blobCommitmentsHashAcc := sha256(blobCommitmentsHashAcc, C_i)
|
|
179
|
+
sha256ToField([this.blobCommitmentsHashAcc, isCheckpointStart, blob.commitment]), // blobCommitmentsHashAcc := sha256(blobCommitmentsHashAcc, 0x01 if checkpoint start else 0x00, C_i)
|
|
177
180
|
await poseidon2HashWithSeparator([this.zAcc, blobChallengeZ], DomainSeparator.BLOB_Z_ACC), // zAcc := poseidon2(BLOB_Z_ACC, zAcc, z_i)
|
|
178
181
|
this.yAcc.add(thisY.mul(this.gammaPow)), // yAcc := yAcc + (gamma^i * y_i)
|
|
179
182
|
this.cAcc.add(thisC.mul(this.gammaPow)), // cAcc := cAcc + (gamma^i * C_i)
|
|
@@ -205,8 +208,9 @@ export class BatchedBlobAccumulator {
|
|
|
205
208
|
|
|
206
209
|
// Initialize the acc to iterate over:
|
|
207
210
|
let acc: BatchedBlobAccumulator = this.clone();
|
|
208
|
-
for (const blob of blobs) {
|
|
209
|
-
|
|
211
|
+
for (const [i, blob] of blobs.entries()) {
|
|
212
|
+
// Flags this checkpoint's first blob, matching the circuits and the flag L1 sets on each proposal's first blob.
|
|
213
|
+
acc = await acc.accumulateBlob(blob, blobFieldsHash, i === 0);
|
|
210
214
|
}
|
|
211
215
|
return acc;
|
|
212
216
|
}
|
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
import {
|
|
2
|
+
CONTRACT_CLASS_LOG_SIZE_IN_FIELDS,
|
|
3
|
+
FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH,
|
|
4
|
+
MAX_L2_TO_L1_MSGS_PER_TX,
|
|
5
|
+
MAX_NOTE_HASHES_PER_TX,
|
|
6
|
+
MAX_NULLIFIERS_PER_TX,
|
|
7
|
+
MAX_PRIVATE_LOGS_PER_TX,
|
|
8
|
+
MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX,
|
|
9
|
+
PRIVATE_LOG_SIZE_IN_FIELDS,
|
|
10
|
+
} from '@aztec-labs/constants';
|
|
1
11
|
import { chunk } from '@aztec-labs/foundation/collection';
|
|
2
12
|
import { Fr } from '@aztec-labs/foundation/curves/bn254';
|
|
3
13
|
import { FieldReader } from '@aztec-labs/foundation/serialize';
|
|
@@ -54,6 +64,22 @@ export function decodeTxBlobData(fields: Fr[] | FieldReader): TxBlobData {
|
|
|
54
64
|
|
|
55
65
|
const txStartMarker = decodeTxStartMarker(reader.readField());
|
|
56
66
|
|
|
67
|
+
const checkMaxCount = (count: number, max: number, type: string) => {
|
|
68
|
+
if (count > max) {
|
|
69
|
+
throw new BlobDeserializationError(
|
|
70
|
+
`Incorrect encoding of blob fields: too many ${type}. Got ${count}, maximum is ${max}.`,
|
|
71
|
+
);
|
|
72
|
+
}
|
|
73
|
+
};
|
|
74
|
+
|
|
75
|
+
checkMaxCount(txStartMarker.numNoteHashes, MAX_NOTE_HASHES_PER_TX, 'note hashes');
|
|
76
|
+
checkMaxCount(txStartMarker.numNullifiers, MAX_NULLIFIERS_PER_TX, 'nullifiers');
|
|
77
|
+
checkMaxCount(txStartMarker.numL2ToL1Msgs, MAX_L2_TO_L1_MSGS_PER_TX, 'l2-to-l1 messages');
|
|
78
|
+
checkMaxCount(txStartMarker.numPublicDataWrites, MAX_TOTAL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, 'public data writes');
|
|
79
|
+
checkMaxCount(txStartMarker.numPrivateLogs, MAX_PRIVATE_LOGS_PER_TX, 'private logs');
|
|
80
|
+
checkMaxCount(txStartMarker.publicLogsLength, FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH, 'public log fields');
|
|
81
|
+
checkMaxCount(txStartMarker.contractClassLogLength, CONTRACT_CLASS_LOG_SIZE_IN_FIELDS, 'contract class log fields');
|
|
82
|
+
|
|
57
83
|
const checkRemainingFields = (requiredFields: number, type: string) => {
|
|
58
84
|
if (requiredFields > reader.remainingFields()) {
|
|
59
85
|
throw new BlobDeserializationError(
|
|
@@ -82,6 +108,7 @@ export function decodeTxBlobData(fields: Fr[] | FieldReader): TxBlobData {
|
|
|
82
108
|
|
|
83
109
|
const privateLogs = Array.from({ length: txStartMarker.numPrivateLogs }, () => {
|
|
84
110
|
const length = reader.readU32();
|
|
111
|
+
checkMaxCount(length, PRIVATE_LOG_SIZE_IN_FIELDS, 'private log fields');
|
|
85
112
|
checkRemainingFields(length, 'private log');
|
|
86
113
|
return reader.readFieldArray(length);
|
|
87
114
|
});
|
package/src/hash.ts
CHANGED
|
@@ -20,7 +20,7 @@ export function computeEthVersionedBlobHash(commitment: Buffer): Buffer {
|
|
|
20
20
|
|
|
21
21
|
// TODO(#13430): The blobsHash is confusingly similar to blobCommitmentsHash, calculated from below blobCommitments:
|
|
22
22
|
// - blobsHash := sha256([blobhash_0, ..., blobhash_m]) = a hash of all blob hashes in a block with m+1 blobs inserted into the header, exists so a user can cross check blobs.
|
|
23
|
-
// - blobCommitmentsHash := sha256( ...sha256(sha256(C_0), C_1) ... C_n) = iteratively calculated hash of all blob commitments in an epoch with n+1 blobs (see calculateBlobCommitmentsHash()),
|
|
23
|
+
// - blobCommitmentsHash := sha256( ...sha256(sha256(s_0, C_0), s_1, C_1) ... s_n, C_n) = iteratively calculated hash of all blob commitments in an epoch with n+1 blobs, where s_i is the byte 0x01 for each checkpoint's first blob and 0x00 otherwise (see calculateBlobCommitmentsHash()),
|
|
24
24
|
// exists so we can validate injected commitments to the rollup circuits correspond to the correct real blobs.
|
|
25
25
|
// We may be able to combine these values e.g. blobCommitmentsHash := sha256( ...sha256(sha256(blobshash_0), blobshash_1) ... blobshash_l) for an epoch with l+1 blocks.
|
|
26
26
|
export function computeBlobsHash(evmVersionedBlobHashes: Buffer[]): Fr {
|