Implement generational storage

.github/workflows/tests.yml

@@ -8,18 +8,26 @@ jobs:
     steps:
       - name: Clone the repository
         uses: actions/checkout@v2
+      - name: Cache Cargo artifacts
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            target
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
       - name: Install the toolchain
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: nightly-2021-03-25
           override: true
-      - run: make release
-      - run: ls -lH release.wasm
+      - run: make test-build
       - name: Run cargo test
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --verbose
+          args: --locked --verbose
 env:
   CARGO_TERM_COLOR: always
+  CARGO_INCREMENTAL: 0

.gitignore

@@ -13,6 +13,7 @@
 # Rust artifacts
 /*.wasm
 /target/
+etc/state-migration-test/target/
 
 node_modules/
 artifacts/

Cargo.toml

@@ -54,6 +54,7 @@ wee_alloc = { version = "0.4.5", default-features = false }
 lunarity-lexer = { git = "https://github.com/ilblackdragon/lunarity", rev = "5201d9a76f7e491082b7f74af7e64049271e387f", default-features = false }
 ethabi = { git = "https://github.com/darwinia-network/ethabi", branch = "xavier-no-std", default-features = false }
 hex = { version = "0.4", default-features = false, features = ["alloc"] }
+byte-slice-cast = { version = "1.0", default-features = false }
 rjson = { version = "0.3.1", default-features = false }
 
 [dev-dependencies]
@@ -76,5 +77,9 @@ git2 = "0.13"
 default = ["sha2", "std"]
 std = ["borsh/std", "evm/std", "primitive-types/std", "rlp/std", "sha3/std", "ethabi/std", "lunarity-lexer/std", "bn/std"]
 testnet = []
-contract = []
+engine = []
+contract = ["engine"]
 evm_bully = []
+log = []
+exit-precompiles = ["contract"]
+integration-test = ["log"]

Makefile

@@ -1,6 +1,6 @@
 CARGO = cargo
 NEAR  = near
-FEATURES = contract
+FEATURES = contract,log
 
 ifeq ($(evm-bully),yes)
   FEATURES := $(FEATURES),evm_bully
@@ -15,6 +15,7 @@ release.wasm: target/wasm32-unknown-unknown/release/aurora_engine.wasm
 
 target/wasm32-unknown-unknown/release/aurora_engine.wasm: Cargo.toml Cargo.lock $(wildcard src/*.rs)
 	RUSTFLAGS='-C link-arg=-s' $(CARGO) build --target wasm32-unknown-unknown --release --no-default-features --features=$(FEATURES) -Z avoid-dev-deps
+	ls -l target/wasm32-unknown-unknown/release/aurora_engine.wasm 
 
 debug: debug.wasm
 
@@ -24,8 +25,10 @@ debug.wasm: target/wasm32-unknown-unknown/debug/aurora_engine.wasm
 target/wasm32-unknown-unknown/debug/aurora_engine.wasm: Cargo.toml Cargo.lock $(wildcard src/*.rs)
 	$(CARGO) build --target wasm32-unknown-unknown --no-default-features --features=$(FEATURES) -Z avoid-dev-deps
 
-etc/eth-contracts/artifacts/contracts/StateTest.sol/SelfDestructFactory.json: etc/eth-contracts/contracts/StateTest.sol
-	cd etc/eth-contracts && yarn && yarn compile
+test-build:
+	RUSTFLAGS='-C link-arg=-s' $(CARGO) build --target wasm32-unknown-unknown --release --no-default-features --features=contract,integration-test -Z avoid-dev-deps
+	ln -sf target/wasm32-unknown-unknown/release/aurora_engine.wasm release.wasm 
+	ls -l target/wasm32-unknown-unknown/release/aurora_engine.wasm 
 
 .PHONY: all release debug
 
@@ -38,10 +41,10 @@ check-format:
 	$(CARGO) fmt -- --check
 
 check-clippy:
-	$(CARGO) +nightly clippy --no-default-features --features=$(FEATURES) -- -D warnings
+	$(CARGO) clippy --no-default-features --features=$(FEATURES) -- -D warnings
 
 # test depends on release since `tests/test_upgrade.rs` includes `release.wasm`
-test: release etc/eth-contracts/artifacts/contracts/StateTest.sol/SelfDestructFactory.json
+test: test-build
 	$(CARGO) test
 
 format:

README.md

@@ -118,6 +118,11 @@ aurora deploy-code 0x600060005560648060106000396000f360e060020a6000350480638ada0
 
 ### Examining EVM contract state
 
+```console
+$ aurora encode-address test.near
+0xCBdA96B3F2B8eb962f97AE50C3852CA976740e2B
+```
+
 ```sh
 aurora get-nonce 0xCBdA96B3F2B8eb962f97AE50C3852CA976740e2B
 aurora get-balance 0xCBdA96B3F2B8eb962f97AE50C3852CA976740e2B
@@ -127,6 +132,11 @@ aurora get-storage-at 0xFc481F4037887e10708552c0D7563Ec6858640d6 0
 
 ### Calling an EVM contract read-only
 
+```console
+$ aurora encode-address test.near
+0xCBdA96B3F2B8eb962f97AE50C3852CA976740e2B
+```
+
 ```sh
 aurora view --sender 0xCBdA96B3F2B8eb962f97AE50C3852CA976740e2B 0xFc481F4037887e10708552c0D7563Ec6858640d6 0x8ada066e  # getCounter()
 aurora view --sender 0xCBdA96B3F2B8eb962f97AE50C3852CA976740e2B 0xFc481F4037887e10708552c0D7563Ec6858640d6 0xd09de08a  # increment()

doc/eth-connector.md

@@ -0,0 +1,42 @@
+# ETH connector
+
+## Build
+1. For production set in the Makefile
+    ```   
+       FEATURES = contract
+    ```
+    1.1. For **development and testing** set in the Makefile
+    ```
+       FEATURES = contract,integration-test
+    ```
+2. Build release: `$ make release`
+3. Run tests: `$ cargo test` 
+4. Deploying process is common for Aurora itself. Please reference [README.md](../README.md)
+
+## Initialize eth-conenctor
+With `near-cli` run:
+```
+$ near call <NEAR_ACC> new_eth_connector '{"prover_account": "<PROVER_NEAR_ACCOUNT>", "eth_custodian_address": "<ETH_ADDRESS>"}' --account-id <NEAR_ACC>
+
+```
+
+## ETH connector specific methods
+* new_eth_connector (call once)
+* deposit (mutable)  
+* withdraw (mutable, payable)
+* finish_deposit_near (private, mutable)
+* ft_total_supply (view)
+* ft_total_supply_near (view)
+* ft_total_supply_eth (view)
+* ft_balance_of (view)
+* ft_balance_of_eth (view)
+* ft_transfer (mutable, payable)
+* ft_resolve_transfer (private, mutable)
+* ft_transfer_call (mutable, payable)
+* ft_on_transfer (private, mutable)
+* storage_deposit (mutable)
+* storage_withdraw (mutable, payable)
+* storage_balance_of (view)
+
+## Ethereum specific flow
+Follow by [this instruction](https://github.com/aurora-is-near/eth-connector/blob/master/README.md).