[pull] develop from ethereum-optimism:develop

.changeset/dull-fishes-type.md → .changeset/spotty-drinks-bathe.md

@@ -2,4 +2,4 @@
 '@eth-optimism/data-transport-layer': patch
 ---
 
-Represent gaslimit as a string to avoid an overflow
+incorrect parsing of eth_getBlockRange result

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

.github/workflows/integration.yml

@@ -93,3 +93,21 @@ jobs:
           yarn compile
           yarn compile:ovm
           yarn test:integration:ovm
+
+      - name: Collect docker logs on failure
+        if: failure()
+        uses: jwalton/gh-docker-logs@v1
+        with:
+          images: 'ethereumoptimism/builder,ethereumoptimism/hardhat,ethereumoptimism/deployer,ethereumoptimism/data-transport-layer,ethereumoptimism/l2geth,ethereumoptimism/message-relayer,ethereumoptimism/batch-submitter,ethereumoptimism/l2geth,ethereumoptimism/integration-tests'
+          dest: './logs'
+
+      - name: Tar logs
+        if: failure()
+        run: tar cvzf ./logs.tgz ./logs
+
+      - name: Upload logs to GitHub
+        if: failure()
+        uses: actions/upload-artifact@master
+        with:
+          name: logs.tgz
+          path: ./logs.tgz

.github/workflows/publish-canary.yml

@@ -155,7 +155,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.message-relayer
           push: true
-          tags: ethereumoptimism/message-relayer:${{ needs.builder.outputs.message-relayer }}
+          tags: ethereumoptimism/message-relayer:${{ GITHUB_SHA::8 }}
 
   batch-submitter:
     name: Publish Batch Submitter Version ${{ needs.builder.outputs.batch-submitter }}
@@ -181,7 +181,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.batch-submitter
           push: true
-          tags: ethereumoptimism/batch-submitter:${{ needs.builder.outputs.batch-submitter }}
+          tags: ethereumoptimism/batch-submitter:${{ GITHUB_SHA::8 }}
 
   data-transport-layer:
     name: Publish Data Transport Layer Version ${{ needs.builder.outputs.data-transport-layer }}
@@ -207,7 +207,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.data-transport-layer
           push: true
-          tags: ethereumoptimism/data-transport-layer:${{ needs.builder.outputs.data-transport-layer }}
+          tags: ethereumoptimism/data-transport-layer:${{ GITHUB_SHA::8 }}
 
   contracts:
     name: Publish Deployer Version ${{ needs.builder.outputs.contracts }}
@@ -233,7 +233,7 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.deployer
           push: true
-          tags: ethereumoptimism/deployer:${{ needs.builder.outputs.contracts }}
+          tags: ethereumoptimism/deployer:${{ GITHUB_SHA::8 }}
 
   integration_tests:
     name: Publish Integration tests ${{ needs.builder.outputs.integration-tests }}
@@ -259,4 +259,4 @@ jobs:
           context: .
           file: ./ops/docker/Dockerfile.integration-tests
           push: true
-          tags: ethereumoptimism/integration-tests:${{ needs.builder.outputs.integration-tests }}
+          tags: ethereumoptimism/integration-tests:${{ GITHUB_SHA::8 }}

.github/workflows/release.yml

@@ -92,6 +92,14 @@ jobs:
           push: true
           tags: ethereumoptimism/l2geth:${{ needs.release.outputs.l2geth }}
 
+      - name: Publish rpc-proxy
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./ops/docker/Dockerfile.rpc-proxy
+          push: true
+          tags: ethereumoptimism/rpc-proxy:${{ needs.release.outputs.l2geth }}
+
   # pushes the base builder image to dockerhub
   builder:
     name: Prepare the base builder image for the services

.github/workflows/static-analysis.yml

@@ -0,0 +1,61 @@
+name: Static analysis
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+  workflow_dispatch:
+
+env:
+  PYTEST_ADDOPTS: "--color=yes"
+
+jobs:
+  slither:
+    name: Slither run
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Fetch history
+        run: git fetch
+
+      - name: Setup node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '12.x'
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: Install Dependencies
+        # only install dependencies if there was a change in the deps
+        # if: steps.yarn-cache.outputs.cache-hit != 'true'
+        run: yarn install
+
+      - name: Build
+        run: yarn build
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+
+      - name: Install Slither
+        run: pip3 install slither-analyzer
+
+      - name: Run analysis
+        working-directory: ./packages/contracts
+        shell: bash
+        run: yarn test:slither
+        continue-on-error: true

.github/workflows/sync-tests.yml

@@ -0,0 +1,44 @@
+name: sync-tests
+
+on:
+  push:
+    branches:
+      - 'master'
+      - 'develop'
+      - 'regenesis/*'
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  integration-sync-test:
+    runs-on: ubuntu-latest
+    env:
+        DOCKER_BUILDKIT: 1
+        COMPOSE_DOCKER_CLI_BUILD: 1
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v2
+        id: yarn-cache
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - name: Build the services
+        working-directory: ./ops
+        run: ./scripts/build-ci.sh
+
+      - name: Bring the stack up
+        working-directory: ./ops
+        run: docker-compose up -d && ./scripts/wait-for-sequencer.sh
+
+      - name: Run the sync tests
+        working-directory: ./integration-tests
+        run: |
+          yarn
+          yarn test:sync

.gitignore

@@ -14,6 +14,9 @@ cache-ovm
 l2geth/build/bin
 packages/contracts/deployments/custom
 packages/contracts/coverage*
+packages/contracts/@ens*
+packages/contracts/@openzeppelin*
+packages/contracts/hardhat*
 
 packages/data-transport-layer/db
 

.nvmrc

@@ -0,0 +1 @@
+14.17.0

README.md

@@ -23,14 +23,14 @@ Extensive documentation is available [here](http://community.optimism.io/docs/)
     * [`message-relayer`](./packages/message-relayer): Service for relaying L2 messages to L1
 * [`l2geth`](./l2geth): Fork of [go-ethereum v1.9.10](https://github.com/ethereum/go-ethereum/tree/v1.9.10) implementing the [OVM](https://research.paradigm.xyz/optimism#optimistic-geth).
 * [`integration-tests`](./integration-tests): Integration tests between a L1 testnet, `l2geth`,
-* [`ops`](./ops): Contains Dockerfiles for containerizing each service involved in the protocol, 
+* [`ops`](./ops): Contains Dockerfiles for containerizing each service involved in the protocol,
 as well as a docker-compose file for bringing up local testnets easily
 
 ## Quickstart
 
 ### Installation
 
-Dependency management is done using `yarn`. 
+Dependency management is done using `yarn`.
 
 ```bash
 git clone [email protected]:ethereum-optimism/optimism.git
@@ -67,7 +67,7 @@ you can run `yarn lerna run test --parallel --since master`
 #### Running the integration tests
 
 The integration tests first require bringing up the Optimism stack. This is done via
-a Docker Compose network. For better performance, we also recommend enabling Docker 
+a Docker Compose network. For better performance, we also recommend enabling Docker
 BuildKit
 
 ```bash
@@ -110,3 +110,11 @@ can be hard to filter through. In order to view the logs from a specific service
 ```
 docker-compose logs --follow <service name>
 ```
+### Static analysis
+
+To run `slither` locally in `./packages/contracts` do
+
+```
+pip3 install slither-analyzer
+yarn test:slither
+```

examples/truffle/truffle-config-ovm.js

@@ -17,6 +17,7 @@ module.exports = {
       host: '127.0.0.1',
       port: 8545,
       gasPrice: 0,
+      gas: 54180127,
     }
   },
   compilers: {
@@ -31,4 +32,4 @@ module.exports = {
       }
     }
   }
-}
+}

integration-tests/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @eth-optimism/integration-tests
 
+## 0.0.7
+
+### Patch Changes
+
+- d1680052: Reduce test timeout from 100 to 20 seconds
+- c2b6e14b: Implement the latest fee spec such that the L2 gas limit is scaled and the tx.gasPrice/tx.gasLimit show correctly in metamask
+- 77108d37: Add verifier sync test and extra docker-compose functions
+
 ## 0.0.6
 
 ### Patch Changes

integration-tests/hardhat.config.ts

@@ -10,7 +10,7 @@ const enableGasReport = !!process.env.ENABLE_GAS_REPORT
 
 const config: HardhatUserConfig = {
   mocha: {
-    timeout: 100000,
+    timeout: 20000,
   },
   networks: {
     optimism: {

integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eth-optimism/integration-tests",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "[Optimism] Integration Tests",
   "private": true,
   "author": "Optimism PBC",
@@ -17,8 +17,8 @@
     "clean": "rimraf cache artifacts artifacts-ovm cache-ovm"
   },
   "devDependencies": {
-    "@eth-optimism/contracts": "^0.3.4",
-    "@eth-optimism/core-utils": "^0.4.4",
+    "@eth-optimism/contracts": "^0.3.5",
+    "@eth-optimism/core-utils": "^0.4.5",
     "@eth-optimism/hardhat-ovm": "^0.2.2",
     "@ethersproject/providers": "^5.0.24",
     "@nomiclabs/hardhat-ethers": "^2.0.2",

integration-tests/sync-tests/sync-verifier.spec.ts

@@ -60,7 +60,7 @@ describe('Syncing a verifier', () => {
   })
 
   describe('Basic transactions', () => {
-    afterEach(async () => {
+    after(async () => {
       await verifier.stop('verifier')
       await verifier.rm()
     })
@@ -97,5 +97,13 @@ describe('Syncing a verifier', () => {
         latestSequencerBlock.stateRoot
       )
     })
+
+    it('should have matching block data', async () => {
+      const sequencerTip = await sequencerProvider.getBlock('latest')
+      const verifierTip = await provider.getBlock('latest')
+
+      expect(sequencerTip.number).to.deep.eq(verifierTip.number)
+      expect(sequencerTip.hash).to.deep.eq(verifierTip.hash)
+    })
   })
 })

integration-tests/test/erc20.spec.ts

@@ -1,5 +1,6 @@
 import { Contract, ContractFactory, Wallet } from 'ethers'
 import { ethers } from 'hardhat'
+import { TxGasLimit, TxGasPrice } from '@eth-optimism/core-utils'
 import chai, { expect } from 'chai'
 import { GWEI } from './shared/utils'
 import { OptimismEnv } from './shared/env'
@@ -64,7 +65,10 @@ describe('Basic ERC20 interactions', async () => {
     const receipt = await transfer.wait()
 
     // The expected fee paid is the value returned by eth_estimateGas
-    const expectedFeePaid = await ERC20.estimateGas.transfer(other.address, 100)
+    const gasLimit = await ERC20.estimateGas.transfer(other.address, 100)
+    const gasPrice = await wallet.getGasPrice()
+    expect(gasPrice).to.deep.equal(TxGasPrice)
+    const expectedFeePaid = gasLimit.mul(gasPrice)
 
     // There are two events from the transfer with the first being
     // the ETH fee paid and the second of the value transfered (100)