Merge pull request #593 from OffchainLabs/develop

Next Arbitrum Release

.circleci/config.yml

@@ -38,6 +38,7 @@ workflows:
       - cpp-avm
       - frontend
       - ethbridge
+      - ethbridge-coverage
       - backend:
           requires:
             - go-deps
@@ -85,6 +86,7 @@ jobs:
   ethbridge:
     docker:
       - image: offchainlabs/ethbridge-base:0.2.1
+      - image: offchainlabs/geth-dev:0.1.0
     environment: # environment variables for the build itself
       TEST_RESULTS: *test-path # path to where test results will be saved
     steps:
@@ -97,19 +99,6 @@ jobs:
             yarn install --cache-folder ~/.cache/yarn
             yarn build
           working_directory: /home/user/project
-      - run:
-          name: test arb-bridge-eth
-          command: |
-            yarn test:coverage
-            yarn lint:js --format junit -o ${TEST_RESULTS}/arb-bridge-eth-lint.xml
-            yarn lint:solidity
-          environment:
-            MOCHA_FILE: *ethbridge-test-path
-          working_directory: /home/user/project/packages/arb-bridge-eth
-      - run:
-          command: yarn buidler node
-          background: true
-          working_directory: /home/user/project/packages/arb-bridge-eth
       - run: while ! nc -z localhost 8545; do sleep 2; done
       - run:
           name: test arb-bridge-eth gas usage
@@ -120,6 +109,33 @@ jobs:
           name: codechecks
           command: npx codechecks
           working_directory: /home/user/project
+      - store_test_results:
+          path: *test-path
+
+  ethbridge-coverage:
+    docker:
+      - image: offchainlabs/ethbridge-base:0.2.1
+    environment: # environment variables for the build itself
+      TEST_RESULTS: *test-path # path to where test results will be saved
+    steps:
+      - checkout
+      - run: mkdir -p $TEST_RESULTS
+      - restore_cache: *restore_yarn_cache
+      - run:
+          name: install
+          command: |
+            yarn install --cache-folder ~/.cache/yarn
+            yarn build
+          working_directory: /home/user/project
+      - run:
+          name: test arb-bridge-eth
+          command: |
+            yarn test:coverage
+            yarn lint:js --format junit -o ${TEST_RESULTS}/arb-bridge-eth-lint.xml
+            yarn lint:solidity
+          environment:
+            MOCHA_FILE: *ethbridge-test-path
+          working_directory: /home/user/project/packages/arb-bridge-eth
       - run:
           name: Upload Coverage to Codecov
           command: codecovbash -R /home/user/project -c -F unit

.circleci/images/geth-dev/Dockerfile

@@ -0,0 +1,3 @@
+FROM ethereum/client-go:v1.9.21
+EXPOSE 8545
+ENTRYPOINT ["/usr/local/bin/geth", "--dev", "--rpc", "--rpcaddr=0.0.0.0", "--rpccorsdomain='*'", "--rpcvhosts=*"]

.gitmodules

@@ -19,3 +19,6 @@
 [submodule "packages/arb-avm-cpp/cmake/cable"]
 	path = packages/arb-avm-cpp/cmake/cable
 	url = https://github.com/ethereum/cable
+[submodule "packages/arb-avm-cpp/external/PicoSHA2"]
+	path = packages/arb-avm-cpp/external/PicoSHA2
+	url = https://github.com/okdshin/PicoSHA2