Develop -> Master PR

.changeset/few-comics-fly.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Introduce the Drippie peripheral contract for managing ETH drips

.changeset/green-phones-shop.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/l2geth': patch
+---
+
+Rerelease the previous version

.changeset/shy-panthers-hear.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/core-utils': patch
+---
+
+Update geth genesis type

.changeset/wise-rabbits-drive.md

@@ -0,0 +1,5 @@
+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Initial release

.circleci/config.yml

@@ -63,7 +63,7 @@ jobs:
 
   yarn-monorepo:
     docker:
-      - image: ethereumoptimism/js-builder:latest
+      - image: ethereumoptimism/js-builder:nightly
     steps:
       - restore_cache:
           keys:
@@ -87,6 +87,7 @@ jobs:
             - node_modules
             - packages/common-ts/node_modules
             - packages/contracts/node_modules
+            - packages/contracts-bedrock/node_modules
             - packages/contracts-periphery/node_modules
             - packages/core-utils/node_modules
             - packages/data-transport-layer/node_modules
@@ -97,7 +98,8 @@ jobs:
             - integration-tests/node_modules
       - run:
           name: Build monorepo
-          command: yarn build
+          command: |
+            yarn build
       - save_cache:
           key: v2-cache-yarn-build-{{ .Revision }}
           paths:
@@ -116,6 +118,19 @@ jobs:
           command: yarn test:slither
           working_directory: packages/contracts
 
+  contracts-periphery-slither:
+    docker:
+      - image: ethereumoptimism/js-builder:latest
+    steps:
+      - restore_cache:
+          keys:
+            - v2-cache-yarn-build-{{ .Revision }}
+      - checkout
+      - run:
+          name: Run Slither
+          command: yarn test:slither
+          working_directory: packages/contracts-periphery
+
   contracts-tests:
     docker:
       - image: ethereumoptimism/js-builder:latest
@@ -155,6 +170,10 @@ jobs:
           name: Lint
           command: yarn lint:check
           working_directory: packages/contracts-periphery
+      - run:
+          name: Slither
+          command: yarn test:slither
+          working_directory: packages/contracts
       - run:
           name: Test
           command: yarn test:coverage
@@ -349,46 +368,36 @@ jobs:
 
   bedrock-solidity:
     docker:
-      - image: ethereumoptimism/js-builder:0.0.4
+      - image: ethereumoptimism/js-builder:nightly
     steps:
       - checkout
-      - run:
-          name: init submodules
-          command: |
-            git submodule sync --recursive
-            git submodule update --recursive --init
       - run:
           name: install
           command: yarn install
-          working_directory: contracts-bedrock
+          working_directory: packages/contracts-bedrock
       - run:
           name: lint
-          command: |
-            # remove prettierrc in root of repo since it doesn't work with non-Lerna packages
-            mv ../.eslintrc.js ../.eslintrc.bak
-            yarn lint:check
-            mv ../.eslintrc.bak ../.eslintrc.js
-          working_directory: contracts-bedrock
+          command: yarn lint:check
+          working_directory: packages/contracts-bedrock
       - run:
           name: slither
           command: yarn slither || exit 0
-          working_directory: contracts-bedrock
+          working_directory: packages/contracts-bedrock
       - run:
-          name: build forge
-          command: yarn build:forge
-          working_directory: contracts-bedrock
+          name: build
+          command: yarn build
+          working_directory: packages/contracts-bedrock
       - run:
-          name: test forge
-          command: yarn test:forge
-          working_directory: contracts-bedrock
+          name: test
+          command: yarn test
+          working_directory: packages/contracts-bedrock
       - run:
           name: gas snapshot
-          command: forge snapshot
-          working_directory: contracts-bedrock
+          command: forge snapshot && git diff --exit-code
+          working_directory: packages/contracts-bedrock
       - run:
           name: check go bindings
-          command: |
-            make && git diff --exit-code
+          command: make && git diff --exit-code
           working_directory: op-bindings
 
   bedrock-go-tests:
@@ -459,24 +468,13 @@ jobs:
 
   bedrock-integration-tests:
     machine:
-      image: ubuntu-2004:202111-02
+      image: ethereumoptimism/js-builder:nightly
       docker_layer_caching: true
     steps:
       - checkout
-      - run:
-          name: init submodules
-          command: |
-            git submodule sync --recursive
-            git submodule update --recursive --init
       - node/install:
           install-yarn: true
           node-version: '16.13'
-      - run:
-          name: install Foundry
-          command: |
-            curl -L https://foundry.paradigm.xyz | bash
-            source /home/circleci/.bashrc
-            foundryup
       - run:
           name: build typescript
           command: make build-ts

.eslintrc.js

@@ -6,11 +6,12 @@ module.exports = {
   },
   ignorePatterns: ['dist', 'coverage', 'packages/contracts/hardhat'],
   extends: ['plugin:prettier/recommended'],
-  parser: 'babel-eslint',
+  parser: '@babel/eslint-parser',
   parserOptions: {
     es6: true,
     ecmaVersion: 6,
     sourceType: 'module',
+    requireConfigFile: false,
   },
   plugins: [
     'eslint-plugin-import',
@@ -25,7 +26,7 @@ module.exports = {
       files: ['**/*.ts'],
       parser: '@typescript-eslint/parser',
       parserOptions: {
-        project: 'tsconfig.json',
+        project: './packages/**/tsconfig.json',
         sourceType: 'module',
         allowAutomaticSingleRunInference: true,
       },

.github/workflows/publish-canary.yml

@@ -58,6 +58,11 @@ jobs:
       - name: Install Dependencies
         run: yarn
 
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
       - name: Build
         run: yarn build
 

.github/workflows/release.yml

@@ -55,6 +55,11 @@ jobs:
       - name: Install Dependencies
         run: yarn
 
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+
       - name: Publish To NPM or Create Release Pull Request
         uses: changesets/action@v1
         id: changesets
@@ -94,7 +99,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          file: ./ops/docker/Dockerfile
+          file: ./l2geth/Dockerfile
           push: true
           tags: ethereumoptimism/l2geth:${{ needs.release.outputs.l2geth }},ethereumoptimism/l2geth:latest
 

.gitignore

@@ -27,6 +27,9 @@ packages/data-transport-layer/db
 packages/integration-tests-bedrock/cache
 packages/integration-tests-bedrock/artifacts
 
+packages/contracts-bedrock/deployments/devnetL1
+packages/contracts-bedrock/deployments/anvil
+
 # vim
 *.sw*
 

.gitmodules

@@ -1,12 +1,3 @@
 [submodule "tests"]
 	path = l2geth/tests/testdata
 	url = https://github.com/ethereum/tests
-[submodule "packages/contracts-bedrock/lib/forge-std"]
-	path = contracts-bedrock/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std.git
-[submodule "packages/contracts-bedrock/lib/solmate"]
-	path = contracts-bedrock/lib/solmate
-	url = https://github.com/rari-capital/solmate.git
-[submodule "packages/contracts-bedrock/lib/ds-test"]
-	path = contracts-bedrock/lib/ds-test
-	url = https://github.com/dapphub/ds-test.git

.prettierrc.js

@@ -17,7 +17,7 @@ module.exports = {
         bracketSpacing: true,
         // These options are specific to the Solidity Plugin
         explicitTypes: 'always',
-        compiler: '0.8.9',
+        compiler: '>=0.8.10',
       },
     },
   ],

go.work.sum

@@ -1,7 +1,9 @@
+github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
 github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d h1:t5Wuyh53qYyg9eqn4BbnlIT+vmhyww0TatL+zT3uWgI=
 github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220512193241-32ef0bba48ce h1:Wa0BVNdeyzIoJkrZtI7o2NEw8F98vVIzkPpiFACbdCA=
 github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220512193241-32ef0bba48ce/go.mod h1:zwRwhzbX7GhQgG12DdrLr9aRGGLObKwmZxYrCLICIRc=
-github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
+github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220518163235-a32d414959ea h1:xGKKbowc5Q2d4VEYMkJg6E3h5ki2Kgi2r+qxaTHCnxc=
+github.com/ethereum-optimism/reference-optimistic-geth v0.0.0-20220518163235-a32d414959ea/go.mod h1:zwRwhzbX7GhQgG12DdrLr9aRGGLObKwmZxYrCLICIRc=
 github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5 h1:2U0HzY8BJ8hVwDKIzp7y4voR9CX/nvcfymLmg2UiOio=
 github.com/klauspost/cpuid v1.2.1 h1:vJi+O/nMdFt0vqm8NZBI6wzALWdA2X+egi0ogNyrC/w=
 github.com/libp2p/go-yamux v1.4.1 h1:P1Fe9vF4th5JOxxgQvfbOHkrGqIZniTLf+ddhZp8YTI=

integration-tests/package.json

@@ -28,6 +28,7 @@
     "url": "https://github.com/ethereum-optimism/optimism.git"
   },
   "devDependencies": {
+    "@babel/eslint-parser": "^7.5.4",
     "@eth-optimism/contracts": "0.5.25",
     "@eth-optimism/core-utils": "0.8.5",
     "@eth-optimism/sdk": "1.1.6",
@@ -47,20 +48,19 @@
     "@uniswap/v3-periphery": "^1.0.1",
     "@uniswap/v3-sdk": "^3.6.2",
     "async-mutex": "^0.3.2",
-    "babel-eslint": "^10.1.0",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "commander": "^8.3.0",
     "dotenv": "^10.0.0",
     "envalid": "^7.1.0",
     "eslint": "^7.27.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsdoc": "^35.1.2",
     "eslint-plugin-prefer-arrow": "^1.2.3",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-react": "^7.24.0",
-    "eslint-plugin-unicorn": "^32.0.1",
+    "eslint-plugin-unicorn": "^42.0.0",
     "ethereum-waffle": "^3.3.0",
     "ethers": "^5.6.8",
     "hardhat": "^2.9.6",