Upgrade 7

.github/workflows/ci.yml

@@ -1,6 +1,7 @@
 name: CI
 
 on:
+  workflow_dispatch:
   pull_request:
   push:
     branches:
@@ -32,14 +33,15 @@ jobs:
         with:
           command: fmt
           args: --all -- --check
-
+          
   test:
     name: Test with ${{ matrix.rust }} rust on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        rust: [stable, beta]
+        rust: [stable, nightly]
+      fail-fast: false
 
     steps:
       - name: Checkout
@@ -50,12 +52,21 @@ jobs:
           sudo apt-get update && sudo apt-get install -y \
             libasound2-dev libudev-dev build-essential pkg-config libssl-dev
 
-      - name: Install Rust ${{ matrix.rust }}
+      - name: Install rust ${{ matrix.rust }}
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: ${{ matrix.rust }}
           override: true
+          components: ${{ matrix.rust == 'nightly' && 'llvm-tools-preview' || '' }}
+
+      - name: Install grcov if supported for rust ${{ matrix.rust }}
+        uses: actions-rs/[email protected]
+        if: matrix.rust == 'nightly'
+        with:
+          crate: grcov
+          version: latest
+          use-tool-cache: true
 
       - name: Cache rust build products
         uses: actions/cache@v2
@@ -74,12 +85,87 @@ jobs:
           command: build
           args: --all
 
+      - name: Set up code-coverage instrumentation if supported for rust ${{ matrix.rust }}
+        if: matrix.rust == 'nightly'
+        run: |
+          echo LLVM_PROFILE_FILE="your_name-%p-%m.profraw" >> $GITHUB_ENV
+          echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV
+          echo RUSTFLAGS="-Zinstrument-coverage" >> $GITHUB_ENV
+          echo RUSTDOCFLAGS="-Cpanic=abort" >> $GITHUB_ENV
+
       - name: Install npm dependencies
         run: |
           sudo npm install -g yarn && cd contracts && yarn install
 
-      - name: Make and test ArbOs
+      - name: Make and test ArbOS
         run: make clean && make
 
       - name: Check if ArbOS changed
         run: git update-index --refresh && git diff-index HEAD --
+
+      - name: Create code-coverage files if supported for rust ${{ matrix.rust }}
+        if: matrix.rust == 'nightly'
+        run: |
+          grcov . --binary-path ./target/release/ -s . -t lcov --branch --ignore-not-existing --ignore "/*" -o lcov.info
+          make coverage
+
+      - name: Upload to codecov.io
+        uses: codecov/codecov-action@v1
+        if: matrix.rust == 'nightly'
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./lcov.info,./lcov-mini.info
+          fail_ci_if_error: true
+          verbose: false
+
+  node:
+    name: Node integration test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+
+      - name: Install dependencies
+        run: |
+          sudo add-apt-repository -y ppa:longsleep/golang-backports
+          sudo apt-get update && sudo apt-get install -y \
+            autoconf automake cmake libboost-dev libboost-filesystem-dev libgmp-dev \
+            librocksdb-dev libssl-dev libgflags-dev libsnappy-dev zlib1g-dev libbz2-dev \
+            liblz4-dev libzstd-dev libtool golang-go clang-format cmake
+          sudo apt-get install librocksdb-dev
+          #
+          # If apt's rocksdb is ever out of date, we'll need to use the following
+          #   git clone -b v6.11.4 https://github.com/facebook/rocksdb
+          #   cd rocksdb && make shared_lib && sudo make install
+          #
+
+      - name: Clone Arbitrum
+        run: |
+          git clone --recursive https://github.com/OffchainLabs/arbitrum.git
+          cd arbitrum && git submodule update --init --recursive
+
+      - name: Copy over this branch's ArbOS
+        run: |
+          rm -r arbitrum/packages/arb-os/*
+          mv * arbitrum/packages/arb-os/ || true
+
+      - name: Build Arbitrum
+        run: |
+          mkdir arbitrum/packages/arb-avm-cpp/debug/
+          cd $_
+          cmake .. -DCMAKE_BUILD_TYPE=Debug
+          make -j
+
+      - name: Test Node's C++ Database
+        run: |
+          ./arbitrum/packages/arb-avm-cpp/debug/bin/avm_tests
+
+      - name: Test Node's RPC
+        run: |
+          cd arbitrum/packages/arb-rpc-node/
+          go test ./...
+
+      - name: Test Node's Core
+        run: |
+          cd arbitrum/packages/arb-node-core/
+          go test ./...

.gitignore

@@ -18,6 +18,11 @@ arb_os/contractTemplates.mini
 .idea
 evm-tests/.travis.yml
 evm-test-logs/*
+**.cov
+**.bkp
+**~
+lcov.info
+lcov-mini.info
 
 # Files generated by Hardhat
 contracts/artifacts

Makefile

@@ -12,7 +12,7 @@ ACBUILDDIR = $(ARTIFACTDIR)/builtin
 ARBOS = $(ARBOSDIR)/arbos.mexe
 
 TEMPLATES = $(ARBOSDIR)/contractTemplates.mini
-TESTFILES = $(BUILTINDIR)/kvstest.mexe $(STDDIR)/queuetest.mexe $(BUILTINDIR)/arraytest.mexe $(BUILTINDIR)/globaltest.mexe $(STDDIR)/priorityqtest.mexe $(STDDIR)/bytearraytest.mexe $(STDDIR)/keccaktest.mexe $(STDDIR)/biguinttest.mexe $(STDDIR)/rlptest.mexe $(STDDIR)/storageMapTest.mexe $(BUILTINDIR)/maptest.mexe $(STDDIR)/sha256test.mexe $(STDDIR)/ripemd160test.mexe minitests/codeloadtest.mexe $(STDDIR)/fixedpointtest.mexe $(STDDIR)/blstest.mexe
+TESTFILES = $(BUILTINDIR)/kvstest.mexe $(STDDIR)/queuetest.mexe $(BUILTINDIR)/arraytest.mexe $(BUILTINDIR)/globaltest.mexe $(STDDIR)/priorityqtest.mexe $(STDDIR)/bytearraytest.mexe $(STDDIR)/keccaktest.mexe $(STDDIR)/biguinttest.mexe $(STDDIR)/rlptest.mexe $(STDDIR)/storageMapTest.mexe $(BUILTINDIR)/maptest.mexe $(STDDIR)/sha256test.mexe $(STDDIR)/ripemd160test.mexe $(STDDIR)/fixedpointtest.mexe $(STDDIR)/blstest.mexe $(STDDIR)/expandingIntArrayTest.mexe minitests/codeloadtest.mexe minitests/simple-closure.mexe minitests/closure.mexe
 TESTCONTRACTSPURE = $(TCBUILDDIR)/Add.sol/Add.json $(TCBUILDDIR)/Fibonacci.sol/Fibonacci.json $(TCBUILDDIR)/PaymentChannel.sol/PaymentChannel.json $(TCBUILDDIR)/Underfunded.sol/Underfunded.json $(TCBUILDDIR)/ReverterFactory.sol/ReverterFactory.json $(TCBUILDDIR)/Callback.sol/Callback.json
 TESTCONTRACTS = $(ACBUILDDIR)/ArbSys.sol/ArbSys.json $(TESTCONTRACTSPURE)
 UPGRADEFILES = $(UPGRADETESTDIR)/regcopy_old.mexe $(UPGRADETESTDIR)/regcopy_new.mexe $(UPGRADETESTDIR)/upgrade1_old.mexe $(UPGRADETESTDIR)/upgrade1_new.mexe $(UPGRADETESTDIR)/upgrade2_new.mexe
@@ -30,7 +30,7 @@ contracts: $(TESTCONTRACTS) $(ARBOSCONTRACTS)
 $(ARBOSDIR)/contractTemplates.mini: compiler $(ARBOSCONTRACTS)
 	$(CARGORUN) make-templates
 
-$(BUILTINDIR)/kvstest.mexe: compiler $(BUILTINDIR)/kvstest.mini
+$(BUILTINDIR)/kvstest.mexe: compiler $(BUILTINDIR)/kvstest.mini $(BUILTINDIR)/kvs.mini
 	$(CARGORUN) compile $(BUILTINDIR)/kvstest.mini -o $(BUILTINDIR)/kvstest.mexe $(COMPILEFLAGS) -t
 
 $(STDDIR)/queuetest.mexe: compiler $(STDDIR)/queuetest.mini
@@ -48,6 +48,9 @@ $(STDDIR)/priorityqtest.mexe: compiler $(STDDIR)/priorityqtest.mini
 $(STDDIR)/storageMapTest.mexe: compiler $(STDDIR)/storageMapTest.mini
 	$(CARGORUN) compile $(STDDIR)/storageMapTest.mini -o $(STDDIR)/storageMapTest.mexe $(COMPILEFLAGS) -t
 
+$(STDDIR)/expandingIntArrayTest.mexe: compiler $(STDDIR)/storageMapTest.mini
+	$(CARGORUN) compile $(STDDIR)/expandingIntArrayTest.mini -o $(STDDIR)/expandingIntArrayTest.mexe $(COMPILEFLAGS) -t
+
 $(STDDIR)/bytearraytest.mexe: compiler $(STDDIR)/bytearraytest.mini
 	$(CARGORUN) compile $(STDDIR)/bytearraytest.mini -o $(STDDIR)/bytearraytest.mexe $(COMPILEFLAGS) -t
 
@@ -66,6 +69,12 @@ $(STDDIR)/bufferopcodetest.mexe: compiler $(BUILTINMAOS) $(STDDIR)/bufferopcodet
 minitests/codeloadtest.mexe: compiler minitests/codeloadtest.mini
 	$(CARGORUN) compile minitests/codeloadtest.mini -o minitests/codeloadtest.mexe $(COMPILEFLAGS) -t
 
+minitests/simple-closure.mexe: compiler minitests/simple-closure.mini
+	$(CARGORUN) compile minitests/simple-closure.mini -o minitests/simple-closure.mexe $(COMPILEFLAGS) -t
+
+minitests/closure.mexe: compiler minitests/closure.mini
+	$(CARGORUN) compile minitests/closure.mini -o minitests/closure.mexe $(COMPILEFLAGS) -t
+
 $(STDDIR)/keccaktest.mexe: compiler $(STDDIR)/keccaktest.mini $(STDDIR)/keccak.mini $(STDDIR)/bytearray.mini $(STDDIR)/expandingIntArray.mini
 	$(CARGORUN) compile $(STDDIR)/keccaktest.mini -o $(STDDIR)/keccaktest.mexe $(COMPILEFLAGS) -t
 
@@ -138,7 +147,17 @@ run: compiler
 	$(CARGORUN) run "arb_os/arbos.mexe"
 
 test:
-	cargo test --release 
+	cargo test --release
+
+coverage: alltests.cov
+
+alltests.cov: compiler contracts
+	cd coverage && grep avmcodebuilder test_upgrade_arbos_to_different_version.cov > avmcodebuilder.cov
+	rm coverage/test_upgrade_arbos_to_different_version.cov
+#	rm coverage/small_upgrade_auto_remap.cov
+#	rm coverage/small_upgrade.cov
+	cat coverage/*.cov | sort -r | uniq | sort | uniq -f 1 | sort -k2,2 -k3,3n | grep -v test | grep -v Test > coverage/alltests.cov
+	./coverage/mini-coverage.sh ./coverage/alltests.cov > lcov-mini.info
 
 evmtest: compiler $(ARBOS)
 
@@ -165,5 +184,5 @@ benchmark: compiler $(TEMPLATES) $(ARBOS)
 	cargo build --release
 
 clean:
-	rm -f $(BUILTINDIR)/*.mexe $(STDDIR)/*.mexe $(UPGRADETESTDIR)/*.mexe $(ARBOSDIR)/arbos.mexe $(ARBOSDIR)/arbos-upgrade.mexe $(ARBOSDIR)/upgrade.json minitests/*.mexe $(ARBOSDIR)/contractTemplates.mini
+	rm -f $(BUILTINDIR)/*.mexe $(STDDIR)/*.mexe *.cov coverage/*.cov $(BUILTINDIR)/*.cov $(STDDIR)/*.cov $(UPGRADETESTDIR)/*.mexe $(ARBOSDIR)/arbos.mexe $(ARBOSDIR)/arbos-upgrade.mexe $(ARBOSDIR)/upgrade.json minitests/*.mexe $(ARBOSDIR)/contractTemplates.mini lcov.info lcov-mini.info
 	rm -rf contracts/artifacts contracts/cache