Upgrade to VM 1.3 (#89)

boozook · borispovod · web-flow · commit 8f10f0ae1c1d · 2021-08-31T12:25:01.000+03:00
* update dove &amp; stdlib version

* fix move syntax

* update VM dep version

* add missed error statuses

* update stdlib

* fix tests

Co-authored-by: borispovod &lt;boris@wings.ai&gt;
diff --git a/.build/Dockerfile b/.build/Dockerfile
@@ -17,8 +17,8 @@ RUN rustup update nightly && \
 SHELL ["/bin/bash", "-c"]
 
 WORKDIR /opt/build
-ARG DOVE_RELEASE=1.2.8
-ARG DOVE_VERSION=1.2.8
+ARG DOVE_RELEASE=1.3.0
+ARG DOVE_VERSION=1.3.0
 # add dove
 RUN curl -sL --fail -o "/usr/local/bin/dove" "https://github.com/pontem-network/move-tools/releases/download/${DOVE_RELEASE}/dove-${DOVE_VERSION}-linux-x86_64" && \
 	chmod +x /usr/local/bin/dove && \
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -27,7 +27,7 @@ jobs:
         cfg:
           - os: self-hosted
             grcov: grcov-linux-x86_64.tar.bz2
-            dove: 1.2.8
+            dove: 1.3.0
 
     env:
       SKIP_WASM_BUILD: 1
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -26,9 +26,9 @@ jobs:
       matrix:
         cfg:
           - os: macos-latest
-            dove: 1.2.8
+            dove: 1.3.0
           - os: ubuntu-latest
-            dove: 1.2.8
+            dove: 1.3.0
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -84,7 +84,7 @@ jobs:
         os:
           - ubuntu-latest
         dove:
-          - 1.2.8
+          - 1.3.0
 
     steps:
       - name: Checkout repository
@@ -136,7 +136,7 @@ jobs:
           - macos-latest
           - ubuntu-latest
         dove:
-          - 1.2.8
+          - 1.3.0
 
     steps:
       - name: Checkout repository
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -10,7 +10,6 @@ check:
 	cargo check --all
 	cargo check --all --tests
 	make check-no-std
-	#make check-benchmarks
 
 .PHONY: check-benchmarks
 check-benchmarks:
@@ -85,12 +84,3 @@ coverage:
 		-o ./target/debug/coverage/
 	# to produce html report add:
 	# -t html
-
-# .PHONY: coverage2
-# coverage2:
-# 	export SKIP_WASM_BUILD=1
-# 	export CARGO_INCREMENTAL=0
-# 	export RUSTFLAGS="-Zinstrument-coverage"
-# 	pushd pallets/sp-mvm && cargo build
-# 	export LLVM_PROFILE_FILE="your_name-%p-%m.profraw"
-# 	pushd pallets/sp-mvm && cargo test
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -24,6 +24,7 @@ stdlib-fetch = { path = "../utils/stdlib-fetch" }
 jsonrpc-core = '15.1.0'
 serde_json = '1.0'
 structopt = '0.3.8'
+# TODO: update parity-scale-codec to 2.2.0
 codec = { package = 'parity-scale-codec', version = '2.0.0' }
 log = "0.4"
 serde = { version = "1.0", features = ["derive"]}
@@ -102,7 +103,7 @@ polkadot-cli = { git = 'http://github.com/paritytech/polkadot.git', branch = 're
 [dependencies.move-vm]
 package = "mvm"
 git = "https://github.com/pontem-network/sp-move-vm.git"
-rev = "e84b6eab01fb6e2520d86ba6a5fe9466404b12fe"
+rev = "7fc50f5aa43962e47584bbe714232fea476639cb"
 default-features = false
 features = [ "move_stdlib" ]
 
diff --git a/node/build.rs b/node/build.rs
@@ -8,7 +8,7 @@ fn main() {
 
     fetch(FetchConfig {
         git_repo: "https://github.com/pontem-network/move-stdlib.git",
-        rev: Some("7f200e70d2fc98863ecc8e004e9ee2255e97bf5a"),
+        rev: Some("34cedad7436f7dad6c9a521f3f6199324737d69f"),
         path_to_clone: "./move/stdlib",
         build_with_dove: true,
     })
diff --git a/pallets/author-mapping/Cargo.toml b/pallets/author-mapping/Cargo.toml
@@ -10,6 +10,7 @@ log = { version="0.4", default-features=false }
 nimbus-primitives = { git="https://github.com/purestake/cumulus", branch="joshy-np098", default-features=false }
 frame-support = { git="https://github.com/paritytech/substrate", branch="polkadot-v0.9.8", default-features=false }
 frame-system = { git="https://github.com/paritytech/substrate", branch="polkadot-v0.9.8", default-features=false }
+# TODO: update parity-scale-codec to 2.2.0
 parity-scale-codec = { version="2.0.0", default-features=false, features=["derive"] }
 serde = { version="1.0.101", optional=true }
 sp-std = { git="https://github.com/paritytech/substrate", branch="polkadot-v0.9.8", default-features=false }
diff --git a/pallets/multisig/Cargo.toml b/pallets/multisig/Cargo.toml
@@ -14,6 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 serde = { version = "1.0.101", optional = true }
+# TODO: update parity-scale-codec to 2.2.0
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
 frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
diff --git a/pallets/parachain-staking/Cargo.toml b/pallets/parachain-staking/Cargo.toml
@@ -12,6 +12,7 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk
 log = "0.4"
 nimbus-primitives = { git = "https://github.com/purestake/cumulus", branch = "joshy-np098", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
+# TODO: update parity-scale-codec to 2.2.0
 parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
 sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.8", default-features = false }
diff --git a/pallets/sp-mvm/Cargo.toml b/pallets/sp-mvm/Cargo.toml
@@ -29,29 +29,15 @@ package = "parity-scale-codec-derive"
 [dependencies.move-vm]
 package = "mvm"
 git = "https://github.com/pontem-network/sp-move-vm.git"
-rev = "231b333e6830a50cadbf6b338ca4a7f33216522b"
+rev = "7fc50f5aa43962e47584bbe714232fea476639cb"
 default-features = false
 features = [ "move_stdlib" ]
 
-[dependencies.vm]
-git = "https://github.com/pontem-network/sp-move-vm.git"
-rev = "231b333e6830a50cadbf6b338ca4a7f33216522b"
-default-features = false
-
-[dependencies.move-vm-runtime]
-git = "https://github.com/pontem-network/sp-move-vm.git"
-rev = "231b333e6830a50cadbf6b338ca4a7f33216522b"
-default-features = false
-
 [dependencies.move-core-types]
 git = "https://github.com/pontem-network/sp-move-vm.git"
-rev = "231b333e6830a50cadbf6b338ca4a7f33216522b"
+rev = "7fc50f5aa43962e47584bbe714232fea476639cb"
 default-features = false
 
-[dependencies.move-vm-types]
-git = "https://github.com/pontem-network/sp-move-vm.git"
-rev = "231b333e6830a50cadbf6b338ca4a7f33216522b"
-default-features = false
 
 [dependencies]
 serde = { version = "1.0", optional = true }
@@ -78,7 +64,7 @@ serde-alt = { version = "1", default-features = false, package = "alt_serde", fe
 package = "bcs"
 default-features = false
 git = "https://github.com/pontem-network/sp-move-vm.git"
-rev = "e84b6eab01fb6e2520d86ba6a5fe9466404b12fe"
+rev = "7fc50f5aa43962e47584bbe714232fea476639cb"
 optional = true
 
 
@@ -90,9 +76,9 @@ bcs = { package = "bcs", version = "0.1" }
 env_logger = "*"
 test-env-log = "*"
 
-[dependencies.diem-types]
+[dev-dependencies.move-vm-runtime]
 git = "https://github.com/pontem-network/sp-move-vm.git"
-rev = "e84b6eab01fb6e2520d86ba6a5fe9466404b12fe"
+rev = "7fc50f5aa43962e47584bbe714232fea476639cb"
 default-features = false
 
 
@@ -105,7 +91,6 @@ std = [
     "serde",
     "log/std",
     "once_cell/std",
-    "vm/std",
     "move-vm/std",
     "move-vm-runtime/std",
     "move-core-types/std",
@@ -118,7 +103,6 @@ std = [
     "frame-support/std",
     "frame-system/std",
     "frame-benchmarking/std",
-    "move-vm-types/std",
     "timestamp/std",
     "getrandom/js",
     "balances/std",
diff --git a/pallets/sp-mvm/rpc/Cargo.toml b/pallets/sp-mvm/rpc/Cargo.toml
@@ -19,6 +19,7 @@ sp-api = { version = "3.0.0", git = 'https://github.com/paritytech/substrate.git
 frame-support = { version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
 sp-blockchain = { version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
 sp-mvm-rpc-runtime = { version = "0.2.2", path = "./runtime" }
+# TODO: update parity-scale-codec to 2.2.0
 codec = { package = "parity-scale-codec", version = "2.0.0" }
 serde = { version = "1.0.119", features = [ "derive" ] } # / 1.0.101
 fc-rpc-core = { version = "1.0.0" }
diff --git a/pallets/sp-mvm/rpc/runtime/Cargo.toml b/pallets/sp-mvm/rpc/runtime/Cargo.toml
@@ -15,6 +15,7 @@ sp-api = { default-features = false, version = '3.0.0', git = 'https://github.co
 frame-support = { default-features = false, version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
 sp-mvm = { default-features = false, path = "../../" }
 sp-runtime = { default-features = false, version = "3.0.0", git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.8' }
+# TODO: update parity-scale-codec to 2.2.0
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
 [features]
diff --git a/pallets/sp-mvm/src/lib.rs b/pallets/sp-mvm/src/lib.rs
@@ -868,6 +868,10 @@ pub mod pallet {
         UnknownAbility,
         // Documentation_missing
         InvalidFlagBits,
+        // Wrong secondary keys addresses count
+        SecondaryKeysAddressesCountMismatch,
+        // List of signers contain duplicates
+        SignersContainDuplicates,
     }
 }
 
diff --git a/pallets/sp-mvm/src/result.rs b/pallets/sp-mvm/src/result.rs
@@ -330,6 +330,10 @@ impl<T: Config> From<StatusCode> for Error<T> {
             StatusCode::CYCLIC_MODULE_FRIENDSHIP => Self::CyclicModuleFriendship,
             StatusCode::UNKNOWN_ABILITY => Self::UnknownAbility,
             StatusCode::INVALID_FLAG_BITS => Self::InvalidFlagBits,
+            StatusCode::SECONDARY_KEYS_ADDRESSES_COUNT_MISMATCH => {
+                Self::SecondaryKeysAddressesCountMismatch
+            }
+            StatusCode::SIGNERS_CONTAIN_DUPLICATES => Self::SignersContainDuplicates,
         }
     }
 }
diff --git a/pallets/sp-mvm/tests/assets/build_assets.sh b/pallets/sp-mvm/tests/assets/build_assets.sh
@@ -2,7 +2,7 @@
 rm -rf ./stdlib
 git clone https://github.com/pontem-network/move-stdlib.git ./stdlib
 pushd ./stdlib
-git checkout 7f200e70d2fc98863ecc8e004e9ee2255e97bf5a
+git checkout 34cedad7436f7dad6c9a521f3f6199324737d69f
 dove build --package
 popd
 
diff --git a/pallets/sp-mvm/tests/assets/root/Dove.toml b/pallets/sp-mvm/tests/assets/root/Dove.toml
@@ -1,7 +1,7 @@
 [package]
 name = "assets"
 dialect = "pont"
-dove_version = ">=1.2.8"
+dove_version = ">=1.3.0"
 
 # account_address = "0x0" # dev/null
 account_address = "0x1" # std
@@ -10,5 +10,5 @@ account_address = "0x1" # std
 # account_address = "0x8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48" # Bob
 
 dependencies = [
-    { git = "https://github.com/pontem-network/move-stdlib.git", rev = "7f200e70d2fc98863ecc8e004e9ee2255e97bf5a" }
+    { git = "https://github.com/pontem-network/move-stdlib.git", rev = "34cedad7436f7dad6c9a521f3f6199324737d69f" },
 ]
diff --git a/pallets/sp-mvm/tests/assets/root/modules/EventProxy.move b/pallets/sp-mvm/tests/assets/root/modules/EventProxy.move
@@ -1,3 +1,4 @@
+address {{sender}} {
 module EventProxy {
     use 0x01::Event;
 
@@ -12,3 +13,4 @@ module EventProxy {
         Event::destroy_handle(event_handle);
     }
 }
+}
diff --git a/pallets/sp-mvm/tests/assets/root/modules/Store.move b/pallets/sp-mvm/tests/assets/root/modules/Store.move
@@ -1,3 +1,4 @@
+address {{sender}} {
 module Store {
     struct U64 has key { val: u64 }
 
@@ -27,3 +28,4 @@ module Store {
         move_to<VectorU8>(account, vec);
     }
 }
+}
diff --git a/pallets/sp-mvm/tests/assets/user/Dove.toml b/pallets/sp-mvm/tests/assets/user/Dove.toml
@@ -1,7 +1,7 @@
 [package]
 name = "assets"
 dialect = "pont"
-dove_version = ">=1.2.8"
+dove_version = ">=1.3.0"
 
 # account_address = "0x0" # dev/null
 # account_address = "0x1" # std
@@ -10,5 +10,5 @@ account_address = "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty" # Bob
 # account_address = "0x8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48" # Bob
 
 dependencies = [
-    { git = "https://github.com/pontem-network/move-stdlib.git", rev = "7f200e70d2fc98863ecc8e004e9ee2255e97bf5a" }
+    { git = "https://github.com/pontem-network/move-stdlib.git", rev = "34cedad7436f7dad6c9a521f3f6199324737d69f" }
 ]
diff --git a/pallets/sp-mvm/tests/assets/user/modules/EventProxy.move b/pallets/sp-mvm/tests/assets/user/modules/EventProxy.move
@@ -1,3 +1,4 @@
+address {{sender}} {
 module EventProxy {
     use 0x01::Event;
 
@@ -13,4 +14,5 @@ module EventProxy {
         );
         Event::destroy_handle(event_handle);
     }
-}
+}
+}
diff --git a/pallets/sp-mvm/tests/assets/user/modules/Store.move b/pallets/sp-mvm/tests/assets/user/modules/Store.move
@@ -1,4 +1,4 @@
-address 5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty {
+address {{sender}} {
 module Store {
     struct U64 has key { val: u64 }
 
@@ -28,4 +28,4 @@ module Store {
         move_to<VectorU8>(account, vec);
     }
 }
-}
+}
diff --git a/pallets/sp-mvm/tests/assets/user/scripts/MultisigTest.move b/pallets/sp-mvm/tests/assets/user/scripts/MultisigTest.move
@@ -3,7 +3,7 @@ script {
 
     fun multisig_test(account1: signer, account2: signer) {
         // signers are sorted lexicographically
-        assert(Signer::address_of(&account1) == 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY, 1); // Alice
-        assert(Signer::address_of(&account2) == 5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty, 1); // Bob
+        assert(Signer::address_of(&account1) == @5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY, 1); // Alice
+        assert(Signer::address_of(&account2) == @5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty, 1); // Bob
     }
 }
diff --git a/pallets/sp-mvm/tests/benchmark_assets/Dove.toml b/pallets/sp-mvm/tests/benchmark_assets/Dove.toml
@@ -1,6 +1,8 @@
 [package]
 name = "benchmark_assets"
+dialect = "pont"
+dove_version = ">=1.3.0"
 
 dependencies = [
-    { git = "https://github.com/pontem-network/move-stdlib.git", rev = "7f200e70d2fc98863ecc8e004e9ee2255e97bf5a" }
+    { git = "https://github.com/pontem-network/move-stdlib.git", rev = "34cedad7436f7dad6c9a521f3f6199324737d69f" }
 ]
diff --git a/pallets/sp-mvm/tests/benchmark_assets/build_assets.sh b/pallets/sp-mvm/tests/benchmark_assets/build_assets.sh
@@ -2,7 +2,7 @@
 rm -rf ./stdlib
 git clone https://github.com/pontem-network/move-stdlib.git ./stdlib
 pushd ./stdlib
-git checkout 7f200e70d2fc98863ecc8e004e9ee2255e97bf5a
+git checkout 34cedad7436f7dad6c9a521f3f6199324737d69f
 dove build
 popd
 
diff --git a/pallets/sp-mvm/tests/benchmark_assets/modules/store.move b/pallets/sp-mvm/tests/benchmark_assets/modules/store.move
@@ -47,11 +47,11 @@ address 0x1 {
         }
 
         public fun exisit(): bool {
-            exists<Container>(0x1)
+            exists<Container>(@0x1)
         }
 
         public fun borrow() acquires Container {
-            let _c = borrow_global_mut<Container>(0x1);
+            let _c = borrow_global_mut<Container>(@0x1);
         }
 
     }
diff --git a/pallets/sp-mvm/tests/common/assets.rs b/pallets/sp-mvm/tests/common/assets.rs
@@ -15,7 +15,7 @@ const USR_PACKAGES_MODULES: &[&[&str]] = &[&["Store", "EventProxy"]];
 const USER_MODULES: &[&str] = &["Store", "EventProxy"];
 const USER_BYTECODE: &[&[u8]] = &[
     include_bytes!("../assets/user/artifacts/modules/2_Store.mv"),
-    include_bytes!("../assets/user/artifacts/modules/46_EventProxy.mv"),
+    include_bytes!("../assets/user/artifacts/modules/47_EventProxy.mv"),
 ];
 
 const ROOT_MODULES: &[&str] = &["Store", "EventProxy"];
diff --git a/pallets/sp-mvm/tests/common/utils.rs b/pallets/sp-mvm/tests/common/utils.rs
@@ -8,7 +8,7 @@ use move_core_types::language_storage::ModuleId;
 use move_core_types::language_storage::StructTag;
 use move_core_types::language_storage::TypeTag;
 use move_vm::io::state::State;
-use move_vm_runtime::data_cache::RemoteCache;
+use move_vm_runtime::data_cache::MoveStorage;
 use move_vm::types::ModulePackage;
 
 use sp_mvm::storage::MoveVmStorage;
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -13,6 +13,7 @@ targets = ['x86_64-unknown-linux-gnu']
 [build-dependencies]
 substrate-wasm-builder = '4.0.0'
 
+# TODO: update parity-scale-codec to 2.2.0
 [dependencies.codec]
 default-features = false
 features = [ 'derive' ]
