Merge branch 'develop' into regenesis/0.4.0

ethereum-optimism · Jun 2, 2021 · e410362 · e410362
2 parents c4c7bea + 5e3c5d1
commit e410362
Show file tree

Hide file tree

Showing 23 changed files with 1,085 additions and 21 deletions.
diff --git a/.changeset/cool-baboons-guess.md b/.changeset/cool-baboons-guess.md
@@ -0,0 +1,5 @@
+---
+'@eth-optimism/smock': patch
+---
+
+Fixes a bug that would break call assertions for overloaded smocked functions
diff --git a/.changeset/nasty-dots-grow.md b/.changeset/nasty-dots-grow.md
@@ -0,0 +1,6 @@
+---
+'@eth-optimism/l2geth': patch
+'@eth-optimism/data-transport-layer': patch
+---
+
+Fix gasLimit overflow
diff --git a/.changeset/sharp-files-knock.md b/.changeset/sharp-files-knock.md
@@ -0,0 +1,5 @@
+---
+'@eth-optimism/message-relayer': patch
+---
+
+Adds a new set of tools for generating messages to be relayed and their proofs
diff --git a/l2geth/rollup/client.go b/l2geth/rollup/client.go
@@ -69,7 +69,7 @@ type transaction struct {
 	BlockNumber uint64          `json:"blockNumber"`
 	Timestamp   uint64          `json:"timestamp"`
 	Value       hexutil.Uint64  `json:"value"`
-	GasLimit    uint64          `json:"gasLimit"`
+	GasLimit    uint64          `json:"gasLimit,string"`
 	Target      common.Address  `json:"target"`
 	Origin      *common.Address `json:"origin"`
 	Data        hexutil.Bytes   `json:"data"`
@@ -83,7 +83,7 @@ type Enqueue struct {
 	Index       *uint64         `json:"ctcIndex"`
 	Target      *common.Address `json:"target"`
 	Data        *hexutil.Bytes  `json:"data"`
-	GasLimit    *uint64         `json:"gasLimit"`
+	GasLimit    *uint64         `json:"gasLimit,string"`
 	Origin      *common.Address `json:"origin"`
 	BlockNumber *uint64         `json:"blockNumber"`
 	Timestamp   *uint64         `json:"timestamp"`

diff --git a/packages/data-transport-layer/src/db/transport-db.ts b/packages/data-transport-layer/src/db/transport-db.ts
@@ -379,15 +379,38 @@ export class TransportDB {
     if (index === null) {
       return null
     }
-
-    return this.db.get<TEntry>(`${key}:index`, index)
+    let entry = await this.db.get<TEntry>(`${key}:index`, index)
+    entry = stringify(entry)
+    return entry
   }
 
   private async _getEntries<TEntry extends Indexed>(
     key: string,
     startIndex: number,
     endIndex: number
   ): Promise<TEntry[] | []> {
-    return this.db.range<TEntry>(`${key}:index`, startIndex, endIndex)
+    const entries = await this.db.range<TEntry>(
+      `${key}:index`,
+      startIndex,
+      endIndex
+    )
+    const results = []
+    for (const entry of entries) {
+      results.push(stringify(entry))
+    }
+    return results
+  }
+}
+
+function 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 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
@@ -69,7 +69,7 @@ export const handleEventsSequencerBatchAppended: EventHandlerSet<
       submitter: l1Transaction.from,
       l1TransactionHash: l1Transaction.hash,
       l1TransactionData: l1Transaction.data,
-      gasLimit: SEQUENCER_GAS_LIMIT,
+      gasLimit: `${SEQUENCER_GAS_LIMIT}`,
 
       prevTotalElements: batchSubmissionEvent.args._prevTotalElements,
       batchIndex: batchSubmissionEvent.args._batchIndex,
@@ -115,7 +115,7 @@ export const handleEventsSequencerBatchAppended: EventHandlerSet<
           batchIndex: extraData.batchIndex.toNumber(),
           blockNumber: BigNumber.from(context.blockNumber).toNumber(),
           timestamp: BigNumber.from(context.timestamp).toNumber(),
-          gasLimit: BigNumber.from(extraData.gasLimit).toNumber(),
+          gasLimit: BigNumber.from(extraData.gasLimit).toString(),
           target: SEQUENCER_ENTRYPOINT_ADDRESS,
           origin: null,
           data: toHexString(sequencerTransaction),
@@ -147,7 +147,7 @@ export const handleEventsSequencerBatchAppended: EventHandlerSet<
           batchIndex: extraData.batchIndex.toNumber(),
           blockNumber: BigNumber.from(0).toNumber(),
           timestamp: BigNumber.from(0).toNumber(),
-          gasLimit: BigNumber.from(0).toNumber(),
+          gasLimit: BigNumber.from(0).toString(),
           target: constants.AddressZero,
           origin: constants.AddressZero,
           data: '0x',

diff --git a/packages/data-transport-layer/src/services/l1-ingestion/handlers/transaction-enqueued.ts b/packages/data-transport-layer/src/services/l1-ingestion/handlers/transaction-enqueued.ts
@@ -17,7 +17,7 @@ export const handleEventsTransactionEnqueued: EventHandlerSet<
       index: event.args._queueIndex.toNumber(),
       target: event.args._target,
       data: event.args._data,
-      gasLimit: event.args._gasLimit.toNumber(),
+      gasLimit: event.args._gasLimit.toString(),
       origin: event.args._l1TxOrigin,
       blockNumber: BigNumber.from(event.blockNumber).toNumber(),
       timestamp: event.args._timestamp.toNumber(),

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
@@ -57,7 +57,7 @@ export const handleSequencerBlock = {
 
       transactionEntry = {
         ...transactionEntry,
-        gasLimit: SEQUENCER_GAS_LIMIT, // ?
+        gasLimit: `${SEQUENCER_GAS_LIMIT}`, // ?
         target: SEQUENCER_ENTRYPOINT_ADDRESS,
         origin: null,
         data: serialize(
@@ -82,7 +82,7 @@ export const handleSequencerBlock = {
     } else {
       transactionEntry = {
         ...transactionEntry,
-        gasLimit: BigNumber.from(transaction.gas).toNumber(),
+        gasLimit: BigNumber.from(transaction.gas).toString(),
         target: ethers.utils.getAddress(transaction.to),
         origin: ethers.utils.getAddress(transaction.l1TxOrigin),
         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
@@ -16,7 +16,7 @@ export interface EnqueueEntry {
   index: number
   target: string
   data: string
-  gasLimit: number
+  gasLimit: string
   origin: string
   blockNumber: number
   timestamp: number
@@ -28,7 +28,7 @@ export interface TransactionEntry {
   data: string
   blockNumber: number
   timestamp: number
-  gasLimit: number
+  gasLimit: string
   target: string
   origin: string
   value: string

diff --git a/packages/data-transport-layer/src/types/event-handler-types.ts b/packages/data-transport-layer/src/types/event-handler-types.ts
@@ -40,7 +40,7 @@ export interface SequencerBatchAppendedExtraData {
   submitter: string
   l1TransactionData: string
   l1TransactionHash: string
-  gasLimit: number
+  gasLimit: string
 
   // Stuff from TransactionBatchAppended.
   prevTotalElements: BigNumber

diff --git a/...ort-layer/test/unit-tests/services/l1-ingestion/handlers/sequencer-batch-appended.spec.ts b/...ort-layer/test/unit-tests/services/l1-ingestion/handlers/sequencer-batch-appended.spec.ts
@@ -18,7 +18,7 @@ describe('Event Handlers: OVM_CanonicalTransactionChain.SequencerBatchAppended',
       submitter: '0xfd7d4de366850c08ee2cba32d851385a3071ec8d',
       l1TransactionHash:
         '0x6effe006836b841205ace4d99d7ae1b74ee96aac499a3f358b97fccd32ee9af2',
-      gasLimit: 548976,
+      gasLimit: '548976',
       prevTotalElements: BigNumber.from(73677),
       batchIndex: BigNumber.from(743),
       batchSize: BigNumber.from(101),

diff --git a/...ansport-layer/test/unit-tests/services/l1-ingestion/handlers/transaction-enqueued.spec.ts b/...ansport-layer/test/unit-tests/services/l1-ingestion/handlers/transaction-enqueued.spec.ts
@@ -93,7 +93,7 @@ describe('Event Handlers: OVM_CanonicalTransactionChain.TransactionEnqueued', ()
       }
     })
 
-    it('should have a gasLimit equal to the integer value of the _gasLimit argument', () => {
+    it('should have a gasLimit equal to the string value of the _gasLimit argument', () => {
       for (
         let i = 0;
         i < Number.MAX_SAFE_INTEGER;
@@ -113,7 +113,7 @@ describe('Event Handlers: OVM_CanonicalTransactionChain.TransactionEnqueued', ()
 
         const output1 = handleEventsTransactionEnqueued.parseEvent(...input1)
 
-        const expected1 = BigNumber.from(i).toNumber()
+        const expected1 = BigNumber.from(i).toString()
 
         expect(output1).to.have.property('gasLimit', expected1)
       }

diff --git a/packages/message-relayer/hardhat.config.ts b/packages/message-relayer/hardhat.config.ts
@@ -0,0 +1,15 @@
+import { HardhatUserConfig } from 'hardhat/config'
+
+import '@nomiclabs/hardhat-ethers'
+import '@nomiclabs/hardhat-waffle'
+
+const config: HardhatUserConfig = {
+  paths: {
+    sources: './test/test-contracts',
+  },
+  solidity: {
+    version: '0.7.6',
+  },
+}
+
+export default config
diff --git a/packages/message-relayer/package.json b/packages/message-relayer/package.json
@@ -14,7 +14,8 @@
     "clean": "rimraf  dist/ ./tsconfig.build.tsbuildinfo",
     "lint": "yarn lint:fix && yarn lint:check",
     "lint:fix": "prettier --config .prettierrc.json --write \"{src,exec,test}/**/*.ts\"",
-    "lint:check": "tslint --format stylish --project ."
+    "lint:check": "tslint --format stylish --project .",
+    "test": "hardhat test --show-stack-traces"
   },
   "keywords": [
     "optimism",
@@ -30,16 +31,28 @@
   },
   "dependencies": {
     "@eth-optimism/common-ts": "^0.1.2",
-    "bcfg": "^0.1.6",
     "@eth-optimism/contracts": "^0.3.3",
     "@eth-optimism/core-utils": "^0.4.3",
+    "bcfg": "^0.1.6",
     "dotenv": "^8.2.0",
     "ethers": "^5.1.0",
     "google-spreadsheet": "^3.1.15",
     "merkletreejs": "^0.2.18",
     "rlp": "^2.2.6"
   },
   "devDependencies": {
+    "@eth-optimism/smock": "^1.1.4",
+    "@nomiclabs/hardhat-ethers": "^2.0.2",
+    "@nomiclabs/hardhat-waffle": "^2.0.1",
+    "@types/chai": "^4.2.18",
+    "@types/chai-as-promised": "^7.1.4",
+    "@types/mocha": "^8.2.2",
+    "chai": "^4.3.4",
+    "chai-as-promised": "^7.1.1",
+    "ethereum-waffle": "^3.3.0",
+    "hardhat": "^2.3.0",
+    "lodash": "^4.17.21",
+    "mocha": "^8.4.0",
     "prettier": "^2.2.1",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0",

diff --git a/packages/message-relayer/src/index.ts b/packages/message-relayer/src/index.ts
@@ -0,0 +1 @@
+export * from './relay-tx'