fix: Update viem to PeerDAS fork

yarn-project/archiver/package.json

@@ -78,11 +78,11 @@
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/stdlib": "workspace:^",
     "@aztec/telemetry-client": "workspace:^",
+    "@spalladino/viem": "2.38.2-eip7594.0",
     "lodash.groupby": "^4.6.0",
     "lodash.omit": "^4.5.0",
     "tsc-watch": "^6.0.0",
-    "tslib": "^2.5.0",
-    "viem": "2.23.7"
+    "tslib": "^2.5.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",

yarn-project/archiver/src/archiver/archiver.test.ts

@@ -28,9 +28,16 @@ import { makeAndSignCommitteeAttestationsAndSigners, makeBlockAttestationFromBlo
 import { getTelemetryClient } from '@aztec/telemetry-client';
 
 import { jest } from '@jest/globals';
+import {
+  type FormattedBlock,
+  type Log,
+  type Transaction,
+  encodeFunctionData,
+  multicall3Abi,
+  toHex,
+} from '@spalladino/viem';
 import assert from 'assert';
 import { type MockProxy, mock } from 'jest-mock-extended';
-import { type FormattedBlock, type Log, type Transaction, encodeFunctionData, multicall3Abi, toHex } from 'viem';
 
 import { Archiver } from './archiver.js';
 import type { ArchiverDataStore } from './archiver_store.js';

yarn-project/archiver/src/archiver/archiver.ts

@@ -72,9 +72,9 @@ import {
   trackSpan,
 } from '@aztec/telemetry-client';
 
+import { type GetContractReturnType, createPublicClient, fallback, http } from '@spalladino/viem';
 import { EventEmitter } from 'events';
 import groupBy from 'lodash.groupby';
-import { type GetContractReturnType, createPublicClient, fallback, http } from 'viem';
 
 import type { ArchiverDataStore, ArchiverL1SynchPoint } from './archiver_store.js';
 import type { ArchiverConfig } from './config.js';

yarn-project/archiver/src/archiver/data_retrieval.ts

@@ -28,7 +28,7 @@ import {
   getAbiItem,
   hexToBytes,
   multicall3Abi,
-} from 'viem';
+} from '@spalladino/viem';
 
 import { NoBlobBodiesFoundError } from './errors.js';
 import type { DataRetrieval } from './structs/data_retrieval.js';

yarn-project/aztec-faucet/package.json

@@ -67,10 +67,10 @@
     "@aztec/foundation": "workspace:^",
     "@aztec/l1-artifacts": "workspace:^",
     "@koa/cors": "^5.0.0",
+    "@spalladino/viem": "2.38.2-eip7594.0",
     "koa": "^2.16.1",
     "koa-bodyparser": "^4.4.1",
     "koa-router": "^13.1.1",
-    "viem": "2.23.7",
     "zod": "^3.23.8"
   },
   "devDependencies": {

yarn-project/aztec-faucet/src/faucet.ts

@@ -12,8 +12,8 @@ import {
   type WalletClient,
   getContract,
   parseEther,
-} from 'viem';
-import { mnemonicToAccount } from 'viem/accounts';
+} from '@spalladino/viem';
+import { mnemonicToAccount } from '@spalladino/viem/accounts';
 
 import type { FaucetConfig, L1AssetConfig } from './config.js';
 

yarn-project/aztec-node/package.json

@@ -89,10 +89,10 @@
     "@aztec/telemetry-client": "workspace:^",
     "@aztec/validator-client": "workspace:^",
     "@aztec/world-state": "workspace:^",
+    "@spalladino/viem": "2.38.2-eip7594.0",
     "koa": "^2.16.1",
     "koa-router": "^13.1.1",
-    "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",

yarn-project/aztec-node/src/aztec-node/config.test.ts

@@ -5,8 +5,8 @@ import type { SequencerClientConfig, TxSenderConfig } from '@aztec/sequencer-cli
 import { AztecAddress } from '@aztec/stdlib/aztec-address';
 import type { ValidatorClientConfig } from '@aztec/validator-client/config';
 
-import type { Hex } from 'viem';
-import { generatePrivateKey, privateKeyToAddress } from 'viem/accounts';
+import type { Hex } from '@spalladino/viem';
+import { generatePrivateKey, privateKeyToAddress } from '@spalladino/viem/accounts';
 
 import { createKeyStoreForValidator } from './config.js';
 

yarn-project/aztec-node/src/aztec-node/config.ts

@@ -29,7 +29,7 @@ import type { SlasherConfig } from '@aztec/stdlib/interfaces/server';
 import { type ValidatorClientConfig, validatorClientConfigMappings } from '@aztec/validator-client/config';
 import { type WorldStateConfig, worldStateConfigMappings } from '@aztec/world-state/config';
 
-import { privateKeyToAddress } from 'viem/accounts';
+import { privateKeyToAddress } from '@spalladino/viem/accounts';
 
 import { type SentinelConfig, sentinelConfigMappings } from '../sentinel/config.js';
 

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -115,7 +115,7 @@ import {
 } from '@aztec/validator-client';
 import { createWorldStateSynchronizer } from '@aztec/world-state';
 
-import { createPublicClient, fallback, http } from 'viem';
+import { createPublicClient, fallback, http } from '@spalladino/viem';
 
 import { createSentinel } from '../sentinel/factory.js';
 import { Sentinel } from '../sentinel/sentinel.js';

yarn-project/aztec.js/package.json

@@ -88,9 +88,9 @@
     "@aztec/l1-artifacts": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
     "@aztec/stdlib": "workspace:^",
+    "@spalladino/viem": "2.38.2-eip7594.0",
     "axios": "^1.12.0",
-    "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@jest/globals": "^30.0.0",

yarn-project/aztec.js/src/ethereum/portal_manager.ts

@@ -15,7 +15,7 @@ import { computeL2ToL1MessageHash, computeSecretHash } from '@aztec/stdlib/hash'
 import type { PXE } from '@aztec/stdlib/interfaces/client';
 import { getL2ToL1MessageLeafId } from '@aztec/stdlib/messaging';
 
-import { type Hex, getContract, toFunctionSelector } from 'viem';
+import { type Hex, getContract, toFunctionSelector } from '@spalladino/viem';
 
 import type { Wallet } from '../index.js';
 

yarn-project/aztec/package.json

@@ -59,13 +59,13 @@
     "@aztec/telemetry-client": "workspace:^",
     "@aztec/txe": "workspace:^",
     "@aztec/world-state": "workspace:^",
+    "@spalladino/viem": "2.38.2-eip7594.0",
     "@types/chalk": "^2.2.0",
     "abitype": "^0.8.11",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "koa": "^2.16.1",
-    "koa-router": "^13.1.1",
-    "viem": "2.23.7"
+    "koa-router": "^13.1.1"
   },
   "files": [
     "dest",

yarn-project/aztec/src/examples/util.ts

@@ -2,8 +2,8 @@ import { EthAddress } from '@aztec/aztec.js';
 import type { ExtendedViemWalletClient } from '@aztec/ethereum';
 import { jsonStringify } from '@aztec/foundation/json-rpc';
 
+import type { Hex } from '@spalladino/viem';
 import type { Abi, Narrow } from 'abitype';
-import type { Hex } from 'viem';
 
 /**
  * Helper function to deploy ETH contracts.

yarn-project/aztec/src/sandbox/sandbox.ts

@@ -31,9 +31,15 @@ import {
 } from '@aztec/telemetry-client';
 import { getGenesisValues } from '@aztec/world-state/testing';
 
-import { type HDAccount, type PrivateKeyAccount, createPublicClient, fallback, http as httpViemTransport } from 'viem';
-import { mnemonicToAccount, privateKeyToAddress } from 'viem/accounts';
-import { foundry } from 'viem/chains';
+import {
+  type HDAccount,
+  type PrivateKeyAccount,
+  createPublicClient,
+  fallback,
+  http as httpViemTransport,
+} from '@spalladino/viem';
+import { mnemonicToAccount, privateKeyToAddress } from '@spalladino/viem/accounts';
+import { foundry } from '@spalladino/viem/chains';
 
 import { createAccountLogs } from '../cli/util.js';
 import { DefaultMnemonic } from '../mnemonic.js';

yarn-project/aztec/src/testing/anvil_test_watcher.ts

@@ -6,7 +6,7 @@ import { RunningPromise } from '@aztec/foundation/running-promise';
 import type { TestDateProvider } from '@aztec/foundation/timer';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
 
-import { type GetContractReturnType, getAddress, getContract } from 'viem';
+import { type GetContractReturnType, getAddress, getContract } from '@spalladino/viem';
 
 /**
  * Represents a watcher for a rollup contract.

yarn-project/bb-prover/package.json

@@ -92,14 +92,14 @@
     "@aztec/noir-test-contracts.js": "workspace:^",
     "@aztec/protocol-contracts": "workspace:^",
     "@jest/globals": "^30.0.0",
+    "@spalladino/viem": "2.38.2-eip7594.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.17",
     "@types/source-map-support": "^0.5.10",
     "jest": "^30.0.0",
     "jest-mock-extended": "^4.0.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.3.3",
-    "viem": "2.23.7"
+    "typescript": "^5.3.3"
   },
   "files": [
     "dest",

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": {

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,

yarn-project/blob-lib/src/blob.ts

@@ -279,6 +279,7 @@ export class Blob {
     return {
       blobToKzgCommitment: cKzg.blobToKzgCommitment,
       computeBlobKzgProof: cKzg.computeBlobKzgProof,
+      computeCellsAndKzgProofs: cKzg.computeCellsAndKzgProofs,
     };
   }
 

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,

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,

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); // See https://notes.ethereum.org/@jtraglia/windowed_multiplications
 } 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,

yarn-project/blob-lib/src/types.ts

@@ -11,4 +11,6 @@ export interface BlobKzgInstance {
   blobToKzgCommitment(blob: Uint8Array): Uint8Array;
   /** Function to compute KZG proof for blob data */
   computeBlobKzgProof(blob: Uint8Array, commitment: Uint8Array): Uint8Array;
+  /** Function to compute both blob data cells and their corresponding KZG proofs for EIP7594 */
+  computeCellsAndKzgProofs(blob: Uint8Array): [Uint8Array[], Uint8Array[]];
 }

yarn-project/blob-sink/package.json

@@ -64,11 +64,11 @@
     "@aztec/kv-store": "workspace:*",
     "@aztec/stdlib": "workspace:^",
     "@aztec/telemetry-client": "workspace:*",
+    "@spalladino/viem": "2.38.2-eip7594.0",
     "express": "^4.21.2",
     "snappy": "^7.2.2",
     "source-map-support": "^0.5.21",
     "tslib": "^2.4.0",
-    "viem": "2.23.7",
     "zod": "^3.23.8"
   },
   "devDependencies": {

yarn-project/blob-sink/src/client/http.ts

@@ -3,7 +3,7 @@ import { type Logger, createLogger } from '@aztec/foundation/log';
 import { makeBackoff, retry } from '@aztec/foundation/retry';
 import { bufferToHex } from '@aztec/foundation/string';
 
-import { type RpcBlock, createPublicClient, fallback, http } from 'viem';
+import { type RpcBlock, createPublicClient, fallback, http } from '@spalladino/viem';
 
 import { createBlobArchiveClient } from '../archive/factory.js';
 import type { BlobArchiveClient } from '../archive/interface.js';

yarn-project/blob-sink/src/client/tests.ts

@@ -1,6 +1,6 @@
 import { makeEncodedBlob } from '@aztec/blob-lib/testing';
 
-import type { Hex } from 'viem';
+import type { Hex } from '@spalladino/viem';
 
 import type { BlobSinkClientInterface } from './interface.js';
 

yarn-project/blob-sink/src/types/api.ts

@@ -1,4 +1,4 @@
-import type { Hex } from 'viem';
+import type { Hex } from '@spalladino/viem';
 import { z } from 'zod';
 
 export interface PostBlobSidecarRequest {

yarn-project/cli/package.json

@@ -83,13 +83,13 @@
     "@aztec/world-state": "workspace:^",
     "@iarna/toml": "^2.2.5",
     "@libp2p/peer-id-factory": "^3.0.4",
+    "@spalladino/viem": "2.38.2-eip7594.0",
     "commander": "^12.1.0",
     "lodash.chunk": "^4.2.0",
     "lodash.groupby": "^4.6.0",
     "semver": "^7.5.4",
     "source-map-support": "^0.5.21",
-    "tslib": "^2.4.0",
-    "viem": "2.23.7"
+    "tslib": "^2.4.0"
   },
   "devDependencies": {
     "@aztec/accounts": "workspace:^",

yarn-project/cli/src/cmds/infrastructure/sequencers.ts

@@ -3,8 +3,8 @@ import { GSEContract, RollupContract, createEthereumChain, getL1ContractsConfigE
 import type { LogFn, Logger } from '@aztec/foundation/log';
 import { RollupAbi, TestERC20Abi } from '@aztec/l1-artifacts';
 
-import { createPublicClient, createWalletClient, fallback, getContract, http } from 'viem';
-import { mnemonicToAccount } from 'viem/accounts';
+import { createPublicClient, createWalletClient, fallback, getContract, http } from '@spalladino/viem';
+import { mnemonicToAccount } from '@spalladino/viem/accounts';
 
 export async function sequencers(opts: {
   command: 'list' | 'add' | 'remove' | 'who-next' | 'flush';

yarn-project/cli/src/cmds/l1/create_l1_account.ts

@@ -1,6 +1,6 @@
 import type { LogFn } from '@aztec/foundation/log';
 
-import { generatePrivateKey, privateKeyToAccount } from 'viem/accounts';
+import { generatePrivateKey, privateKeyToAccount } from '@spalladino/viem/accounts';
 
 import { prettyPrintJSON } from '../../utils/commands.js';
 

yarn-project/cli/src/cmds/l1/get_l1_addresses.ts

@@ -2,7 +2,7 @@ import { EthAddress } from '@aztec/aztec.js';
 import { RegistryContract, type ViemPublicClient, createEthereumChain } from '@aztec/ethereum';
 import type { LogFn } from '@aztec/foundation/log';
 
-import { createPublicClient, fallback, http } from 'viem';
+import { createPublicClient, fallback, http } from '@spalladino/viem';
 
 export async function getL1Addresses(
   registryAddress: EthAddress,

yarn-project/cli/src/cmds/l1/get_l1_balance.ts

@@ -3,7 +3,7 @@ import type { EthAddress } from '@aztec/foundation/eth-address';
 import type { LogFn } from '@aztec/foundation/log';
 import { TestERC20Abi } from '@aztec/l1-artifacts';
 
-import { createPublicClient, fallback, getContract, http } from 'viem';
+import { createPublicClient, fallback, getContract, http } from '@spalladino/viem';
 
 import { prettyPrintJSON } from '../../utils/commands.js';
 

yarn-project/cli/src/cmds/l1/prover_stats.ts

@@ -6,9 +6,9 @@ import { type LogFn, type Logger, createLogger } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { createAztecNodeClient } from '@aztec/stdlib/interfaces/client';
 
+import { createPublicClient, fallback, getAbiItem, getAddress, http } from '@spalladino/viem';
 import chunk from 'lodash.chunk';
 import groupBy from 'lodash.groupby';
-import { createPublicClient, fallback, getAbiItem, getAddress, http } from 'viem';
 
 export async function proverStats(opts: {
   l1RpcUrls: string[];

yarn-project/cli/src/cmds/l1/trigger_seed_snapshot.ts

@@ -2,7 +2,7 @@ import { createEthereumChain, createExtendedL1Client } from '@aztec/ethereum';
 import type { LogFn } from '@aztec/foundation/log';
 import { RollupAbi } from '@aztec/l1-artifacts/RollupAbi';
 
-import { getContract } from 'viem';
+import { getContract } from '@spalladino/viem';
 
 import type { RollupCommandArgs } from './update_l1_validators.js';
 

yarn-project/cli/src/cmds/l1/update_l1_validators.ts

@@ -14,8 +14,8 @@ import type { LogFn, Logger } from '@aztec/foundation/log';
 import { RollupAbi, StakingAssetHandlerAbi } from '@aztec/l1-artifacts';
 import { ZkPassportProofParams } from '@aztec/stdlib/zkpassport';
 
-import { encodeFunctionData, formatEther, getContract } from 'viem';
-import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from 'viem/accounts';
+import { encodeFunctionData, formatEther, getContract } from '@spalladino/viem';
+import { generatePrivateKey, mnemonicToAccount, privateKeyToAccount } from '@spalladino/viem/accounts';
 
 import { addLeadingHex } from '../../utils/aztec.js';