batch,dtl: Update ethers.js to 6.16.0 and refactor L1BeaconClient

package.json

@@ -48,7 +48,7 @@
     "release": "yarn build && yarn changeset publish"
   },
   "dependencies": {
-    "ethersv6": "github:ericlee42/ethers#metis"
+    "ethersv6": "npm:ethers@^6.16.0"
   },
   "resolutions": {
     "node-gyp": "^9.4.0"

packages/batch-submitter/package.json

@@ -44,7 +44,7 @@
     "bluebird": "^3.7.2",
     "c-kzg": "^4.0.1",
     "dotenv": "^10.0.0",
-    "ethersv6": "github:ericlee42/ethers#metis",
+    "ethersv6": "npm:ethers@^6.16.0",
     "lodash": "^4.17.21",
     "old-contracts": "npm:@eth-optimism/contracts@^0.0.2-alpha.7",
     "prom-client": "^13.1.0",

packages/batch-submitter/src/batch-submitter/state-batch-submitter.ts

@@ -323,7 +323,7 @@ export class StateBatchSubmitter extends BatchSubmitter {
       if (!mpcInfo || !mpcInfo.mpc_address) {
         throw new Error('MPC 1 info get failed')
       }
-      const txUnsign: ethers.TransactionRequest = {
+      const txUnsign: ethers.TransactionLike = {
         type: 2,
         to: tx.to,
         data: tx.data,

packages/batch-submitter/src/batch-submitter/tx-batch-submitter-inbox.ts

@@ -12,15 +12,13 @@ import {
   zlibCompressHexString,
 } from '@metis.io/core-utils'
 import { Promise as bPromise } from 'bluebird'
-import * as kzg from 'c-kzg'
 import {
   ethers,
   Provider,
   Signer,
   toBeHex,
   toBigInt,
   TransactionReceipt,
-  TransactionRequest,
 } from 'ethersv6'
 
 /* Internal Imports */
@@ -146,7 +144,6 @@ export class TransactionBatchSubmitterInbox {
     }
     metrics.numTxPerBatch.observe(endBlock - startBlock)
     this.logger.info('Submitting batch to inbox', {
-      meta: batchParams.inputMeta,
       useBlob,
       blobTxes: batchParams.blobTxData.length,
       batchSizeInBytes,
@@ -157,7 +154,7 @@ export class TransactionBatchSubmitterInbox {
       nextBatchIndex,
       {
         input: batchParams.inputData,
-        blobs: batchParams.blobTxData.map((tx) => tx.blobs.map((b) => b.data)),
+        blobs: batchParams.blobTxData.map((tx) => tx.blobs),
         txHashes: [],
       },
       signer,
@@ -197,7 +194,7 @@ export class TransactionBatchSubmitterInbox {
     ) => Promise<TransactionReceipt>
   ): Promise<TransactionReceipt> {
     const { chainId } = await signer.provider.getNetwork()
-    const inboxTx: TransactionRequest = {
+    const inboxTx: ethers.TransactionLike = {
       type: 2,
       chainId,
       to: this.inboxAddress,
@@ -244,7 +241,7 @@ export class TransactionBatchSubmitterInbox {
           continue
         }
 
-        const blobTx: ethers.TransactionRequest = {
+        const blobTx: ethers.TransactionLike = {
           type: 3, // 3 for blob tx type
           to: this.inboxAddress,
           // since we are using blob tx, call data will be empty,
@@ -253,7 +250,7 @@ export class TransactionBatchSubmitterInbox {
           chainId,
           nonce: await signer.provider.getTransactionCount(signerAddress),
           blobs,
-          blobVersion: 1, // Osaka is enabled on all the chains
+          blobWrapperVersion: 1, // Osaka is enabled on all the chains
         }
 
         const replaced = await setTxEIP1559Fees(
@@ -285,9 +282,8 @@ export class TransactionBatchSubmitterInbox {
 
                   // need to append the blob sidecar to the signed tx
                   const signedTxUnmarshaled = ethers.Transaction.from(signedTx)
-                  signedTxUnmarshaled.type = 3
-                  signedTxUnmarshaled.kzg = kzg
-                  signedTxUnmarshaled.blobVersion = blobTx.blobVersion
+                  signedTxUnmarshaled.blobWrapperVersion =
+                    blobTx.blobWrapperVersion
                   signedTxUnmarshaled.blobs = blobTx.blobs
                   // repack the tx
                   return signedTxUnmarshaled.serialized
@@ -661,13 +657,6 @@ export class TransactionBatchSubmitterInbox {
 
     encoded = `${da}${compressType}${batchIndex}${l2Start}${totalElements}${compressedEncoded}`
     return {
-      inputMeta: {
-        da,
-        compressType,
-        batchIndex,
-        l2Start,
-        totalElements,
-      },
       inputData: encoded,
       batch: blocks,
       blobTxData,

packages/batch-submitter/src/batch-submitter/tx-batch-submitter.ts

@@ -581,7 +581,7 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
     //     this.encodeSequencerBatchOptions
     //   )
     // unsigned tx
-    const tx: ethers.TransactionRequest = {
+    const tx: ethers.TransactionLike = {
       to: this.useMinio
         ? await this.mvmCtcContract.getAddress()
         : await this.chainContract.getAddress(),

packages/batch-submitter/src/da/blob.ts

@@ -1,40 +1,32 @@
 import {
   blobToKzgCommitment,
-  Bytes48,
-  Blob as CBlob,
-  computeBlobKzgProof,
-  verifyBlobKzgProof,
+  computeCellsAndKzgProofs,
+  KZGCommitment,
+  KZGProof,
 } from 'c-kzg'
 import { createHash } from 'crypto'
 import { Frame } from './types'
 
 const BlobSize = 4096 * 32
 const MaxBlobDataSize = (4 * 31 + 3) * 1024 - 4
 const EncodingVersion = 0
-const VersionOffset = 1
+// const VersionOffset = 1
 const Rounds = 1024
 
 export class Blob {
   public readonly data: Uint8Array = new Uint8Array(BlobSize)
-  public readonly commitment: Bytes48 = new Uint8Array(48)
-  public readonly proof: Bytes48 = new Uint8Array(48)
+  public readonly commitment: KZGCommitment = new Uint8Array(48)
+  // cell proofs
+  public readonly proof: KZGProof = new Uint8Array(48 * 128)
   public versionedHash: string = ''
 
-  static kzgToVersionedHash(commitment: Bytes48): string {
+  static kzgToVersionedHash(commitment: KZGCommitment): string {
     const hasher = createHash('sha256')
     hasher.update(commitment)
     // versioned hash = [1 byte version][31 byte hash]
     return '0x01' + hasher.digest('hex').substring(2)
   }
 
-  static verifyBlobProof(
-    blob: Blob,
-    commitment: Bytes48,
-    proof: Bytes48
-  ): boolean {
-    return verifyBlobKzgProof(blob.data as CBlob, commitment, proof)
-  }
-
   marshalFrame(frame: Frame): Uint8Array {
     const buffer = new ArrayBuffer(16 + 2 + 4 + frame.data.length + 1)
     const view = new DataView(buffer)
@@ -158,8 +150,14 @@ export class Blob {
       )
     }
 
-    this.commitment.set(blobToKzgCommitment(this.data as CBlob))
-    this.proof.set(computeBlobKzgProof(this.data as CBlob, this.commitment))
+    this.commitment.set(blobToKzgCommitment(this.data))
+    const proofs = Buffer.concat(computeCellsAndKzgProofs(this.data)[1])
+    if (proofs.length !== this.proof.length) {
+      throw new Error(
+        `Invalid proof length: expected ${this.proof.length}, got ${proofs.length}`
+      )
+    }
+    this.proof.set(proofs)
     this.versionedHash = Blob.kzgToVersionedHash(this.commitment)
 
     return this

packages/batch-submitter/src/da/channel.ts

@@ -1,15 +1,16 @@
 // channel.ts
+import { Logger } from '@eth-optimism/common-ts'
 import { ethers } from 'ethersv6'
+import { Blob } from './blob'
 import { ChannelBuilder } from './channel-builder'
 import {
   BatchToInboxElement,
+  BlobLike,
   ChannelConfig,
   Frame,
   RollupConfig,
   TxData,
 } from './types'
-import { Blob } from './blob'
-import { Logger } from '@eth-optimism/common-ts'
 
 export class Channel {
   private channelBuilder: ChannelBuilder
@@ -82,8 +83,15 @@ export class Channel {
         return sb
       },
 
-      get blobs(): Blob[] {
-        return this.frames.map((f: Frame) => new Blob().fromFrame(f))
+      get blobs(): BlobLike[] {
+        return this.frames.map((f: Frame) => {
+          const blob = new Blob().fromFrame(f)
+          return {
+            data: blob.data,
+            proof: blob.proof,
+            commitment: blob.commitment,
+          }
+        })
       },
     }
     this.pendingTransactions.set(txData.id, txData)

packages/batch-submitter/src/da/consts.ts

@@ -1,6 +1,6 @@
 export const FRAME_OVERHEAD_SIZE = 200
 export const MAX_RLP_BYTES_PER_CHANNEL = 100_000_000
 export const MAX_BLOB_SIZE = (4 * 31 + 3) * 1024 - 4
-export const MAX_BLOB_NUM_PER_TX = 7
+export const MAX_BLOB_NUM_PER_TX = 6
 export const TX_GAS = 21_000
 export const CHANNEL_FULL_ERR = new Error('Channel is full')

packages/batch-submitter/src/da/types.ts

@@ -1,6 +1,5 @@
 // types.ts
 import { BytesLike, ethers, getBytes } from 'ethersv6'
-import { Blob } from './blob'
 
 export interface RollupConfig {
   l1ChainID: bigint
@@ -49,12 +48,18 @@ export interface Frame {
   isLast: boolean
 }
 
+export type BlobLike = {
+  data: BytesLike
+  proof: BytesLike
+  commitment: BytesLike
+}
+
 export interface TxData {
   frames: Frame[]
   asBlob: boolean
 
   get id(): string
-  get blobs(): Blob[]
+  get blobs(): BlobLike[]
 }
 
 export interface L1BlockInfo {
@@ -153,18 +158,10 @@ export interface BatchToInboxElement {
   extraData: string
   txs: BatchToInboxRawTx[]
 }
-export declare type BatchToInbox = BatchToInboxElement[]
 
-export interface InboxInputMeta {
-  da: string
-  compressType: string
-  batchIndex: string
-  l2Start: string
-  totalElements: string
-}
+export declare type BatchToInbox = BatchToInboxElement[]
 
 export interface InboxBatchParams {
-  inputMeta: InboxInputMeta
   inputData: string
   batch: BatchToInbox
   blobTxData: TxData[]

packages/batch-submitter/src/storage/inbox-storage.ts

@@ -1,12 +1,13 @@
 /* Imports: External */
 import { Logger } from '@eth-optimism/common-ts'
-import { BytesLike, toNumber } from 'ethersv6'
+import { toNumber } from 'ethersv6'
 import * as fs from 'fs/promises'
 import * as path from 'path'
+import { BlobLike } from '../da/types'
 
 const INBOX_OK_FILE = 'inbox_ok.json'
 const INBOX_FAIL_FILE = 'inbox_fail.json'
-const STEPS_FILE = 'steps.json'
+const STEPS_FILE = 'inbox_blobs.json'
 
 export interface InboxRecordInfo {
   batchIndex: number | bigint
@@ -16,7 +17,7 @@ export interface InboxRecordInfo {
 
 export interface InboxSteps {
   input: string // the inbox tx data input
-  blobs: Array<Array<BytesLike>> // array of blob tx data
+  blobs: Array<Array<BlobLike>> // array of blob tx data
   txHashes: Array<string> // blob tx hashes + inbox tx hash
 }
 
@@ -75,15 +76,25 @@ export class InboxStorage {
   }
 
   public async insertStep(jsonData: InboxSteps) {
-    const data = {
+    const data: InboxSteps = {
       input: jsonData.input,
       txHashes: jsonData.txHashes,
       blobs: jsonData.blobs.map((blobArray) =>
         blobArray.map((blob) => {
-          if (typeof blob === 'string') {
-            return blob
+          return {
+            data:
+              typeof blob.data === 'string'
+                ? blob.data
+                : '0x' + Buffer.from(blob.data).toString('hex'),
+            proof:
+              typeof blob.proof === 'string'
+                ? blob.proof
+                : '0x' + Buffer.from(blob.proof).toString('hex'),
+            commitment:
+              typeof blob.commitment === 'string'
+                ? blob.commitment
+                : '0x' + Buffer.from(blob.commitment).toString('hex'),
           }
-          return '0x' + Buffer.from(blob).toString('hex')
         })
       ),
     }
@@ -97,8 +108,15 @@ export class InboxStorage {
     if (!(await this.fileExists(filePath))) {
       return null
     }
-    const data = await fs.readFile(filePath, 'utf-8')
-    return JSON.parse(data)
+    const raw = await fs.readFile(filePath, 'utf-8')
+    const parsed: InboxSteps = JSON.parse(raw)
+    if (!Array.isArray(parsed.blobs)) {
+      throw new Error('Invalid steps file format: blobs is not an array')
+    }
+    if (!Array.isArray(parsed.txHashes)) {
+      throw new Error('Invalid steps file format: txHashes is not an array')
+    }
+    return parsed
   }
 
   private async fileExists(filePath) {