Merge 1ed7200 into 07fea8b

starcoinorg · Mar 12, 2021 · 5c5f3d5 · 5c5f3d5
2 parents 07fea8b + 1ed7200
commit 5c5f3d5
Show file tree

Hide file tree

Showing 212 changed files with 933 additions and 1,983 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cmd/starcoin/Cargo.toml b/cmd/starcoin/Cargo.toml
@@ -44,10 +44,10 @@ starcoin-genesis = { path = "../../core/genesis" }
 starcoin-resource-viewer = { path = "../../vm/resource-viewer" }
 starcoin-service-registry = { path = "../../commons/service-registry" }
 starcoin-move-explain = { path = "../../vm/move-explain" }
-errmapgen = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+errmapgen = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
 network-api = {path = "../../network/api", package="network-api"}
 starcoin-network-rpc-api = {path = "../../network-rpc/api"}
-short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
 
 
 [dev-dependencies]

diff --git a/commons/crypto/Cargo.toml b/commons/crypto/Cargo.toml
@@ -11,8 +11,8 @@ serde = { version = "1.0.124" }
 serde_bytes = "0.11.5"
 hex = "0.4.3"
 anyhow = "1.0"
-diem-crypto = { package="diem-crypto",  git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686", features = ["fuzzing"] }
-diem-crypto-derive = { package="diem-crypto-derive",  git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+diem-crypto = { package="diem-crypto",  git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5", features = ["fuzzing"] }
+diem-crypto-derive = { package="diem-crypto-derive",  git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
 bcs-ext = { package="bcs-ext", path = "../bcs_ext" }
 crypto-macro = { package="starcoin-crypto-macro", path = "./crypto-macro"}
 rand = "0.8.3"

diff --git a/commons/proptest-helpers/Cargo.toml b/commons/proptest-helpers/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 crossbeam = "0.7.3"
-diem-proptest-helpers = { package="diem-proptest-helpers",  git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+diem-proptest-helpers = { package="diem-proptest-helpers",  git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
 
 proptest = "1.0.0"
 proptest-derive = "0.3.0"
diff --git a/config/Cargo.toml b/config/Cargo.toml
@@ -30,7 +30,7 @@ starcoin-vm-types = { path = "../vm/types" }
 starcoin-uint = { path = "../types/uint" }
 network-p2p-types = { path = "../network-p2p/types"}
 starcoin-logger = {path = "../commons/logger", package="starcoin-logger"}
-diem-temppath = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+diem-temppath = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
 starcoin-system = {path = "../commons/system", package="starcoin-system"}
 network-api = {path = "../network/api", package="network-api"}
 stdlib = { path = "../vm/stdlib"}
diff --git a/core/forkable-jellyfish-merkle/Cargo.toml b/core/forkable-jellyfish-merkle/Cargo.toml
@@ -24,7 +24,7 @@ tiny-keccak = "1.5"
 hex= "0.4.3"
 once_cell = "1.7.2"
 bcs-ext = { path = "../../commons/bcs_ext", package = "bcs-ext" }
-short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
 
 [dev-dependencies]
 rand = "0.8.3"

diff --git a/core/genesis/generated/halley/genesis b/core/genesis/generated/halley/genesis
diff --git a/core/genesis/generated/proxima/genesis b/core/genesis/generated/proxima/genesis
diff --git a/devtools/x/Cargo.toml b/devtools/x/Cargo.toml
@@ -23,7 +23,7 @@ globset = "0.4.6"
 regex = "1.4.3"
 rayon = "1.5.0"
 indexmap = "1.6.2"
-x-core = { package="x-core", git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
-x-lint = { package="x-lint", git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
-diem-workspace-hack = { package="diem-workspace-hack", git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
-diem-x = { package="x", git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+x-core = { package="x-core", git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
+x-lint = { package="x-lint", git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
+diem-workspace-hack = { package="diem-workspace-hack", git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
+diem-x = { package="x", git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
diff --git a/executor/src/module_compatibility_test.rs b/executor/src/module_compatibility_test.rs
@@ -67,13 +67,13 @@ module_compatibility_test!(
     duplicate_module,
     "
     module M {
-        resource struct T { f: u64 }
+        struct T has key,store { f: u64 }
         public fun f() { return }
     }
     ",
     "
     module M {
-        resource struct T { f: u64 }
+        struct T has key,store { f: u64 }
         public fun f() { return }
     }
     ",
@@ -89,7 +89,7 @@ module_compatibility_test!(
     ",
     "
     module M {
-        resource struct T { f: u64 }
+        struct T has key,store { f: u64 }
     }
     ",
     Executed
@@ -115,12 +115,12 @@ module_compatibility_test!(
     layout_incompatible_module_with_new_field,
     "
     module M {
-        resource struct T { f: u64 }
+        struct T has key,store { f: u64 }
     }
     ",
     "
     module M {
-        resource struct T { f: u64, g: bool }
+        struct T has key,store { f: u64, g: bool }
     }
     ",
     MiscellaneousError
@@ -130,12 +130,12 @@ module_compatibility_test!(
     layout_incompatible_module_with_changed_field,
     "
     module M {
-        resource struct T { f: u64 }
+        struct T has key,store { f: u64 }
     }
     ",
     "
     module M {
-        resource struct T { f: bool }
+        struct T has key,store { f: bool }
     }
     ",
     MiscellaneousError
@@ -145,12 +145,12 @@ module_compatibility_test!(
     layout_incompatible_module_with_removed_field,
     "
     module M {
-        resource struct T { f: u64 }
+        struct T has key,store { f: u64 }
     }
     ",
     "
     module M {
-        resource struct T {}
+        struct T has key,store {}
     }
     ",
     MiscellaneousError
@@ -160,7 +160,7 @@ module_compatibility_test!(
     layout_incompatible_module_with_removed_struct,
     "
     module M {
-        resource struct T { f: u64 }
+        struct T has key,store { f: u64 }
     }
     ",
     "

diff --git a/executor/src/readonly_function_call_test.rs b/executor/src/readonly_function_call_test.rs
@@ -30,11 +30,11 @@ fn test_readonly_function_call() -> Result<()> {
     let module_source = r#"
         module A {
 
-        struct S {
+        struct S has copy,drop,store {
             f1: u64,
         }
 
-        resource struct R {
+        struct R has key,store {
             f1: u64,
         }
 

diff --git a/vm/compiler/Cargo.toml b/vm/compiler/Cargo.toml
@@ -11,8 +11,8 @@ anyhow = "1.0.38"
 once_cell = "1.7.2"
 tempfile = "3.1.0"
 regex = { version = "1.4.3", default-features = false, features = ["std", "perf"] }
-move-lang = { package="move-lang", git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
-move-lang-test-utils = { package="move-lang-test-utils", git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+move-lang = { package="move-lang", git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
+move-lang-test-utils = { package="move-lang-test-utils", git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
 starcoin-crypto = { path = "../../commons/crypto"}
 starcoin-vm-types = { path = "../types"}
 starcoin-logger = { path = "../../commons/logger"}

diff --git a/vm/functional-tests/Cargo.toml b/vm/functional-tests/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.38"
 tempfile = "3.1.0"
-datatest-stable = {git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+datatest-stable = {git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
 stdlib = { package="stdlib", path = "../stdlib"}
 once_cell = "1.7.2"
 regex = { version = "1.4.3", default-features = false, features = ["std", "perf"] }
@@ -30,7 +30,7 @@ executor = { package="starcoin-executor", path = "../../executor"}
 starcoin-genesis = { path = "../../core/genesis" }
 starcoin-consensus = { path = "../../consensus" }
 starcoin-account-api = { path = "../../account/api" }
-move-lang = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
+move-lang = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
 
 [dev-dependencies]
 starcoin-vm-types = { path = "../types"}

diff --git a/vm/functional-tests/tests/testsuite/account/basic.move b/vm/functional-tests/tests/testsuite/account/basic.move
@@ -4,15 +4,15 @@
 module Holder {
     use 0x1::Signer;
 
-    resource struct Hold<T> {
+    struct Hold<T> has key, store {
         x: T
     }
 
-    public fun hold<T>(account: &signer, x: T) {
+    public fun hold<T: store>(account: &signer, x: T) {
         move_to(account, Hold<T>{x})
     }
 
-    public fun get<T>(account: &signer): T
+    public fun get<T: store>(account: &signer): T
     acquires Hold {
         let Hold {x} = move_from<Hold<T>>(Signer::address_of(account));
         x

diff --git a/vm/functional-tests/tests/testsuite/account/withdraw_capability.move b/vm/functional-tests/tests/testsuite/account/withdraw_capability.move
@@ -6,7 +6,7 @@
 module SillyColdWallet {
     use 0x1::Account;
 
-    resource struct T {
+    struct T has key, store {
         cap: Account::WithdrawCapability,
         owner: address,
     }

diff --git a/vm/functional-tests/tests/testsuite/box/box.move b/vm/functional-tests/tests/testsuite/box/box.move
@@ -2,7 +2,7 @@
 //! account: alice, 100000 0x1::STC::STC
 
 module TestR {
-    resource struct TestR{id: u64}
+    struct TestR has key, store {id: u64}
 
     public fun new(id: u64): TestR{
         TestR{

diff --git a/vm/functional-tests/tests/testsuite/check/delta_size_check.move b/vm/functional-tests/tests/testsuite/check/delta_size_check.move
@@ -4,7 +4,7 @@
 //! sender: alice
 
 module A {
-    resource struct Coin {
+    struct Coin has key, store {
         u: u64,
     }
 
@@ -29,7 +29,7 @@ module A {
 module Tester {
     use {{alice}}::A;
 
-    resource struct Pair { x: A::Coin, y: A::Coin }
+    struct Pair has key, store { x: A::Coin, y: A::Coin }
 
     public fun test(account: &signer) {
         move_to<Pair>(account, Pair { x: A::new(), y: A::new() });

diff --git a/vm/functional-tests/tests/testsuite/check/resource_move_to_or_from.move b/vm/functional-tests/tests/testsuite/check/resource_move_to_or_from.move
@@ -8,7 +8,7 @@
 module M {
     use 0x1::Signer;
 
-    resource struct Cup {
+    struct Cup has key, store {
         a: u64,
     }
     public fun new(): Cup {

diff --git a/vm/functional-tests/tests/testsuite/dao/test_dao_config.move b/vm/functional-tests/tests/testsuite/dao/test_dao_config.move
@@ -6,7 +6,7 @@ module MyToken {
     use 0x1::Token;
     use 0x1::Dao;
 
-    struct MyToken { }
+    struct MyToken has copy, drop, store { }
 
     public fun init(account: &signer) {
         Token::register_token<MyToken>(

diff --git a/vm/functional-tests/tests/testsuite/dao/test_mint_dao_proposal.move b/vm/functional-tests/tests/testsuite/dao/test_mint_dao_proposal.move
@@ -7,7 +7,7 @@ module MyToken {
     use 0x1::MintDaoProposal;
     use 0x1::Dao;
 
-    struct MyToken { }
+    struct MyToken has copy, drop, store { }
 
     public fun init(account: &signer) {
         Token::register_token<MyToken>(

diff --git a/vm/functional-tests/tests/testsuite/debug/debug.move b/vm/functional-tests/tests/testsuite/debug/debug.move
@@ -4,9 +4,9 @@ module M {
     use 0x1::Debug;
     use 0x1::Vector;
 
-    struct Foo { x: bool }
-    struct Bar { x: u128, y: Foo, z: bool }
-    struct Box<T> { x: T }
+    struct Foo has copy, drop, store { x: bool }
+    struct Bar has copy, drop, store { x: u128, y: Foo, z: bool }
+    struct Box<T> has copy, drop, store { x: T }
 
     public fun test() {
         let x: u64;