dtl: remove stringify from db logic + more overflow protection (#1010)

* dtl: remove stringify from db logic * l2geth: overflow protection * dtl: overflow protection * chore: add changeset
ethereum-optimism · Jun 25, 2021 · 2b855e2 · 2b855e2
1 parent 87002d1
commit 2b855e2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 34 deletions.
diff --git a/.changeset/cold-ways-grow.md b/.changeset/cold-ways-grow.md
@@ -0,0 +1,6 @@
+---
+'@eth-optimism/l2geth': patch
+'@eth-optimism/data-transport-layer': patch
+---
+
+Add extra overflow protection for the DTL types
diff --git a/l2geth/rollup/client.go b/l2geth/rollup/client.go
@@ -104,8 +104,8 @@ type decoded struct {
 	Signature signature       `json:"sig"`
 	Value     hexutil.Uint64  `json:"value"`
 	GasLimit  uint64          `json:"gasLimit,string"`
-	GasPrice  uint64          `json:"gasPrice"`
-	Nonce     uint64          `json:"nonce"`
+	GasPrice  uint64          `json:"gasPrice,string"`
+	Nonce     uint64          `json:"nonce,string"`
 	Target    *common.Address `json:"target"`
 	Data      hexutil.Bytes   `json:"data"`
 }

diff --git a/packages/data-transport-layer/src/db/transport-db.ts b/packages/data-transport-layer/src/db/transport-db.ts
@@ -379,38 +379,14 @@ export class TransportDB {
     if (index === null) {
       return null
     }
-    let entry = await this.db.get<TEntry>(`${key}:index`, index)
-    entry = stringify(entry)
-    return entry
+    return this.db.get<TEntry>(`${key}:index`, index)
   }
 
   private async _getEntries<TEntry extends Indexed>(
     key: string,
     startIndex: number,
     endIndex: number
   ): Promise<TEntry[] | []> {
-    const entries = await this.db.range<TEntry>(
-      `${key}:index`,
-      startIndex,
-      endIndex
-    )
-    const results = []
-    for (const entry of entries) {
-      results.push(stringify(entry))
-    }
-    return results
-  }
-}
-
-const stringify = (entry) => {
-  if (entry === null || entry === undefined) {
-    return entry
-  }
-  if (entry.gasLimit) {
-    entry.gasLimit = BigNumber.from(entry.gasLimit).toString()
-  }
-  if (entry.decoded) {
-    entry.decoded.gasLimit = BigNumber.from(entry.decoded.gasLimit).toString()
+    return this.db.range<TEntry>(`${key}:index`, startIndex, endIndex)
   }
-  return entry
 }
diff --git a/packages/data-transport-layer/src/services/l1-ingestion/handlers/sequencer-batch-appended.ts b/packages/data-transport-layer/src/services/l1-ingestion/handlers/sequencer-batch-appended.ts
@@ -257,8 +257,8 @@ const maybeDecodeSequencerBatchTransaction = (
     const decodedTx = ethers.utils.parseTransaction(transaction)
 
     return {
-      nonce: BigNumber.from(decodedTx.nonce).toNumber(),
-      gasPrice: BigNumber.from(decodedTx.gasPrice).toNumber(),
+      nonce: BigNumber.from(decodedTx.nonce).toString(),
+      gasPrice: BigNumber.from(decodedTx.gasPrice).toString(),
       gasLimit: BigNumber.from(decodedTx.gasLimit).toString(),
       value: toRpcHexString(decodedTx.value),
       target: toHexString(decodedTx.to), // Maybe null this out for creations?

diff --git a/packages/data-transport-layer/src/services/l2-ingestion/handlers/transaction.ts b/packages/data-transport-layer/src/services/l2-ingestion/handlers/transaction.ts
@@ -50,8 +50,8 @@ export const handleSequencerBlock = {
         },
         value: transaction.value,
         gasLimit: BigNumber.from(transaction.gas).toString(),
-        gasPrice: BigNumber.from(transaction.gasPrice).toNumber(), // ?
-        nonce: BigNumber.from(transaction.nonce).toNumber(),
+        gasPrice: BigNumber.from(transaction.gasPrice).toString(),
+        nonce: BigNumber.from(transaction.nonce).toString(),
         target: transaction.to,
         data: transaction.input,
       }

diff --git a/packages/data-transport-layer/src/types/database-types.ts b/packages/data-transport-layer/src/types/database-types.ts
@@ -6,8 +6,8 @@ export interface DecodedSequencerBatchTransaction {
   }
   value: string
   gasLimit: string
-  gasPrice: number
-  nonce: number
+  gasPrice: string
+  nonce: string
   target: string
   data: string
 }