fix: fusaka

spypsy · spypsy · commit 96ab80d48251 · 2025-10-14T17:49:28.000Z
diff --git a/yarn-project/.yarn/patches/viem-npm-2.23.7-0552761b08.patch b/yarn-project/.yarn/patches/viem-npm-2.23.7-0552761b08.patch
diff --git a/yarn-project/archiver/package.json b/yarn-project/archiver/package.json
@@ -82,7 +82,7 @@
     "lodash.omit": "^4.5.0",
     "tsc-watch": "^6.0.0",
     "tslib": "^2.5.0",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
diff --git a/yarn-project/aztec-faucet/package.json b/yarn-project/aztec-faucet/package.json
@@ -70,7 +70,7 @@
     "koa": "^2.16.1",
     "koa-bodyparser": "^4.4.1",
     "koa-router": "^13.1.1",
-    "viem": "2.23.7",
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch",
     "zod": "^3.23.8"
   },
   "devDependencies": {
diff --git a/yarn-project/aztec-node/package.json b/yarn-project/aztec-node/package.json
@@ -92,7 +92,7 @@
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
diff --git a/yarn-project/aztec.js/package.json b/yarn-project/aztec.js/package.json
@@ -90,7 +90,7 @@
     "@aztec/stdlib": "workspace:^",
     "axios": "^1.12.0",
     "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
diff --git a/yarn-project/aztec/package.json b/yarn-project/aztec/package.json
@@ -65,7 +65,7 @@
     "commander": "^12.1.0",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "files": [
     "dest",
diff --git a/yarn-project/bb-prover/package.json b/yarn-project/bb-prover/package.json
@@ -99,7 +99,7 @@
     "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "files": [
     "dest",
diff --git a/yarn-project/blob-lib/package.json b/yarn-project/blob-lib/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@aztec/constants": "workspace:^",
     "@aztec/foundation": "workspace:^",
-    "c-kzg": "4.0.0-alpha.1",
+    "c-kzg": "4.1.0",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
diff --git a/yarn-project/blob-lib/src/blob.test.ts b/yarn-project/blob-lib/src/blob.test.ts
@@ -21,7 +21,7 @@ const {
 } = cKzg;
 
 try {
-  loadTrustedSetup();
+  loadTrustedSetup(8);
 } catch (error: any) {
   if (error.message.includes('trusted setup is already loaded')) {
     // NB: The c-kzg lib has no way of checking whether the setup is loaded or not,
diff --git a/yarn-project/blob-lib/src/blob.ts b/yarn-project/blob-lib/src/blob.ts
@@ -279,6 +279,7 @@ export class Blob {
     return {
       blobToKzgCommitment: cKzg.blobToKzgCommitment,
       computeBlobKzgProof: cKzg.computeBlobKzgProof,
+      computeCellsAndKzgProofs: cKzg.computeCellsAndKzgProofs,
     };
   }
 
diff --git a/yarn-project/blob-lib/src/blob_batching.test.ts b/yarn-project/blob-lib/src/blob_batching.test.ts
@@ -19,7 +19,7 @@ const trustedSetup = JSON.parse(
 const { FIELD_ELEMENTS_PER_BLOB, computeKzgProof, loadTrustedSetup, verifyKzgProof } = cKzg;
 
 try {
-  loadTrustedSetup();
+  loadTrustedSetup(8);
 } catch (error: any) {
   if (error.message.includes('trusted setup is already loaded')) {
     // NB: The c-kzg lib has no way of checking whether the setup is loaded or not,
diff --git a/yarn-project/blob-lib/src/blob_batching_public_inputs.test.ts b/yarn-project/blob-lib/src/blob_batching_public_inputs.test.ts
@@ -15,7 +15,7 @@ import {
 import { makeBatchedBlobAccumulator, makeBlockBlobPublicInputs } from './testing.js';
 
 try {
-  cKzg.loadTrustedSetup();
+  cKzg.loadTrustedSetup(8);
 } catch (error: any) {
   if (error.message.includes('trusted setup is already loaded')) {
     // NB: The c-kzg lib has no way of checking whether the setup is loaded or not,
diff --git a/yarn-project/blob-lib/src/index.ts b/yarn-project/blob-lib/src/index.ts
@@ -11,7 +11,7 @@ export * from './blob_batching_public_inputs.js';
 export * from './sponge_blob.js';
 
 try {
-  loadTrustedSetup();
+  loadTrustedSetup(8);
 } catch (error: any) {
   if (error.message.includes('trusted setup is already loaded')) {
     // NB: The c-kzg lib has no way of checking whether the setup is loaded or not,
diff --git a/yarn-project/blob-lib/src/types.ts b/yarn-project/blob-lib/src/types.ts
@@ -11,4 +11,5 @@ export interface BlobKzgInstance {
   blobToKzgCommitment(blob: Uint8Array): Uint8Array;
   /** Function to compute KZG proof for blob data */
   computeBlobKzgProof(blob: Uint8Array, commitment: Uint8Array): Uint8Array;
+  computeCellsAndKzgProofs(blob: Uint8Array): [Uint8Array[], Uint8Array[]];
 }
diff --git a/yarn-project/blob-sink/package.json b/yarn-project/blob-sink/package.json
@@ -68,7 +68,7 @@
     "snappy": "^7.2.2",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
-    "viem": "2.23.7",
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch",
     "zod": "^3.23.8"
   },
   "devDependencies": {
diff --git a/yarn-project/cli/package.json b/yarn-project/cli/package.json
@@ -89,7 +89,7 @@
     "semver": "^7.5.4",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "devDependencies": {
     "@aztec/accounts": "workspace:^",
diff --git a/yarn-project/end-to-end/package.json b/yarn-project/end-to-end/package.json
@@ -96,7 +96,7 @@
     "tslib": "^2.4.0",
     "typescript": "^5.3.3",
     "util": "^0.12.5",
-    "viem": "2.23.7",
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch",
     "zod": "^3.23.8"
   },
   "devDependencies": {
diff --git a/yarn-project/epoch-cache/package.json b/yarn-project/epoch-cache/package.json
@@ -35,7 +35,7 @@
     "get-port": "^7.1.0",
     "jest-mock-extended": "^4.0.0",
     "tslib": "^2.4.0",
-    "viem": "2.23.7",
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch",
     "zod": "^3.23.8"
   },
   "devDependencies": {
diff --git a/yarn-project/ethereum/package.json b/yarn-project/ethereum/package.json
@@ -40,7 +40,7 @@
     "lodash.chunk": "^4.2.0",
     "lodash.pickby": "^4.5.0",
     "tslib": "^2.4.0",
-    "viem": "2.23.7",
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch",
     "zod": "^3.23.8"
   },
   "devDependencies": {
diff --git a/yarn-project/ethereum/src/l1_tx_utils/l1_tx_utils.ts b/yarn-project/ethereum/src/l1_tx_utils/l1_tx_utils.ts
@@ -5,6 +5,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { type Logger, createLogger } from '@aztec/foundation/log';
 import { retryUntil } from '@aztec/foundation/retry';
 import { sleep } from '@aztec/foundation/sleep';
+import { bufferToHex } from '@aztec/foundation/string';
 import { DateProvider } from '@aztec/foundation/timer';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
 
@@ -22,6 +23,7 @@ import {
   formatGwei,
   serializeTransaction,
 } from 'viem';
+import { defaultPrepareTransactionRequestParameters } from 'viem/actions';
 import { jsonRpc } from 'viem/nonce';
 
 import type { ViemClient } from '../types.js';
@@ -157,11 +159,23 @@ export class L1TxUtils extends ReadOnlyL1TxUtils {
 
   private async signTransaction(txRequest: TransactionSerializable): Promise<`0x${string}`> {
     const signature = await this.signer(txRequest, this.getSenderAddress());
-    return serializeTransaction(txRequest, signature);
+    const res = serializeTransaction(txRequest, signature);
+    return res;
   }
 
   protected async prepareSignedTransaction(txData: PrepareTransactionRequestRequest) {
-    const txRequest = await this.client.prepareTransactionRequest(txData);
+    const txRequest = await this.client.prepareTransactionRequest({
+      ...txData,
+      parameters: [...defaultPrepareTransactionRequestParameters, 'sidecars'],
+    });
+    const kzg = txData.kzg! as any;
+
+    for (let i = 0; i < txData.blobs!.length; i++) {
+      const blob = txData.blobs![i];
+      const [_, cellProofs] = kzg.computeCellsAndKzgProofs(blob) as [Uint8Array[], Uint8Array[]];
+      txRequest.sidecars![i]!.proof = cellProofs.map(el => bufferToHex(Buffer.from(el))) as any;
+      i++;
+    }
     return await this.signTransaction(txRequest as TransactionSerializable);
   }
 
diff --git a/yarn-project/foundation/package.json b/yarn-project/foundation/package.json
@@ -153,7 +153,7 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3",
     "typescript-eslint": "^8.32.1",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "files": [
     "dest",
diff --git a/yarn-project/node-keystore/package.json b/yarn-project/node-keystore/package.json
@@ -67,7 +67,7 @@
     "@aztec/stdlib": "workspace:^",
     "@ethersproject/wallet": "^5.7.0",
     "tslib": "^2.4.0",
-    "viem": "2.23.7",
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch",
     "zod": "^3.23.8"
   },
   "devDependencies": {
diff --git a/yarn-project/p2p/package.json b/yarn-project/p2p/package.json
@@ -117,7 +117,7 @@
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3",
     "uint8arrays": "^5.0.3",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "files": [
     "dest",
diff --git a/yarn-project/prover-node/package.json b/yarn-project/prover-node/package.json
@@ -79,7 +79,7 @@
     "@aztec/world-state": "workspace:^",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
diff --git a/yarn-project/pxe/package.json b/yarn-project/pxe/package.json
@@ -82,7 +82,7 @@
     "lodash.omit": "^4.5.0",
     "sha3": "^2.1.4",
     "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "devDependencies": {
     "@aztec/merkle-tree": "workspace:^",
diff --git a/yarn-project/sequencer-client/package.json b/yarn-project/sequencer-client/package.json
@@ -52,7 +52,7 @@
     "@aztec/world-state": "workspace:^",
     "lodash.chunk": "^4.2.0",
     "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "devDependencies": {
     "@aztec/archiver": "workspace:^",
diff --git a/yarn-project/simulator/package.json b/yarn-project/simulator/package.json
@@ -91,7 +91,7 @@
     "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",
     "typescript": "^5.3.3",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "files": [
     "dest",
diff --git a/yarn-project/slasher/package.json b/yarn-project/slasher/package.json
@@ -63,7 +63,7 @@
     "@aztec/telemetry-client": "workspace:^",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
-    "viem": "2.23.7",
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch",
     "zod": "^3.23.8"
   },
   "devDependencies": {
diff --git a/yarn-project/stdlib/package.json b/yarn-project/stdlib/package.json
@@ -87,7 +87,7 @@
     "msgpackr": "^1.11.2",
     "pako": "^2.1.0",
     "tslib": "^2.4.0",
-    "viem": "2.23.7",
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch",
     "zod": "^3.23.8"
   },
   "devDependencies": {
diff --git a/yarn-project/telemetry-client/package.json b/yarn-project/telemetry-client/package.json
@@ -42,7 +42,7 @@
     "@opentelemetry/sdk-trace-node": "^1.28.0",
     "@opentelemetry/semantic-conventions": "^1.28.0",
     "prom-client": "^15.1.3",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
diff --git a/yarn-project/validator-client/package.json b/yarn-project/validator-client/package.json
@@ -77,7 +77,7 @@
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
     "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "viem": "patch:viem@npm%3A2.23.7#~/.yarn/patches/viem-npm-2.23.7-0552761b08.patch"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",
diff --git a/yarn-project/yarn.lock b/yarn-project/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,7 @@ export class Blob {`
`279`	`279`	`return {`
`280`	`280`	`blobToKzgCommitment: cKzg.blobToKzgCommitment,`
`281`	`281`	`computeBlobKzgProof: cKzg.computeBlobKzgProof,`
	`282`	`+ computeCellsAndKzgProofs: cKzg.computeCellsAndKzgProofs,`
`282`	`283`	`};`
`283`	`284`	`}`
`284`	`285`