Update to use diem latest code (starcoinorg#3109)

* merge diem 1.5

* vmconfig: add new instruction gascost

* make mpm work

* mpm: make move package manager work

* stdlib[genesis]:set move lang version to 4

* update dev_setup to use cvc5

* transactional-test: finally work

* migrate functional test to transactional test

* cleanup code

* support pacakge release

* fmt check

* use StarcoinFramework

* dev_setup: ignore nodejs

* update ci runner

* use cvc5 for ci dockerfile

* work around on x

* update ci docker image

* change std to starcoin_framewrok in txn test

* move std address to compiler

* contrib-contracts udpate

* fail fast when run test

* fix intergrate test

* update deps to merge into master

* change starcoin-stdlib to StarcoinFramework

* [ci] Update ci script and runner config.

Co-authored-by: jolestar <[email protected]>

Author: nanne007

Cargo.lock

@@ -68,7 +68,7 @@ members = [
     "rpc/client",
     "rpc/server",
     "vm/types",
-    "vm/functional-tests",
+
     "vm/vm-runtime",
     "vm/natives",
     "vm/stdlib",
@@ -80,8 +80,10 @@ members = [
     "vm/resource-viewer",
     "vm/dev",
     "vm/move-explain",
-    "vm/move-cli",
+    "vm/move-package-manager",
     "vm/vm-status-translator",
+    "vm/starcoin-transactional-test-harness",
+    "vm/transactional-tests",
     "abi/types",
     "abi/decoder",
     "abi/resolver",
@@ -170,7 +172,7 @@ default-members = [
     "rpc/client",
     "rpc/server",
     "vm/types",
-    "vm/functional-tests",
+    "vm/transactional-tests",
     "vm/vm-runtime",
     "vm/natives",
     "vm/stdlib",
@@ -182,8 +184,9 @@ default-members = [
     "vm/resource-viewer",
     "vm/dev",
     "vm/move-explain",
-    "vm/move-cli",
+    "vm/move-package-manager",
     "vm/vm-status-translator",
+    "vm/starcoin-transactional-test-harness",
     "abi/types",
     "abi/decoder",
     "abi/resolver",
@@ -232,3 +235,36 @@ starcoin-vm-runtime.debug = 1
 
 [profile.release.package."*"]
 debug = false
+
+#[patch."https://github.com/starcoinorg/diem"]
+#move-bytecode-source-map = {git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-bytecode-verifier = { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#diem-crypto = { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#diem-crypto-derive = { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#diem-proptest-helpers = { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#diem-temppath = { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#diem-workspace-hack = { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-disassembler = { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-docgen = { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-errmapgen = { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-binary-format = { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-command-line-common = { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-transactional-test-runner= { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-core-types={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-coverage={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-ir-types={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-compiler={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-model={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-prover={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-prover-test-utils={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-stdlib={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-unit-test={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-vm-runtime={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-vm-types={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#short-hex-str={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#x = { git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#x-core={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#x-lint={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-resource-viewer={ git = "https://github.com/lerencao/libra", branch="merge-main"  }
+#move-cli = { git = "https://github.com/lerencao/libra", branch="merge-main" }
+#move-package = { git = "https://github.com/lerencao/libra", branch="merge-main" }

Cargo.toml

@@ -14,11 +14,11 @@ serde_bytes = "0.11"
 anyhow = "1.0.41"
 once_cell = "1.8.0"
 hex = "0.4.3"
-move-binary-format = {git = "https://github.com/starcoinorg/diem", rev="6b1533f22b3075cc15ff68db21b5b84e6baa2955"  }
+move-binary-format = {git = "https://github.com/starcoinorg/diem", rev="bdb6f73f3a196f9f80ea8ae09a859c6a3579d702"  }
 starcoin-resource-viewer = {path = "../../vm/resource-viewer"}
 starcoin-vm-types = { path = "../../vm/types" }
 starcoin-abi-types = {path = "../types"}
 starcoin-abi-resolver = {path = "../resolver"}
 bcs-ext = {path = "../../commons/bcs_ext"}
 bcs = "0.1"
-schemars = {git = "https://github.com/starcoinorg/schemars", rev="3f8ecc27f02b27d56c716de58d7880ae7816390c"}
+schemars = {git = "https://github.com/starcoinorg/schemars", rev="fa9abf1ea670677f0d628112c83d08937c743bad"}

abi/decoder/Cargo.toml

@@ -11,7 +11,7 @@ starcoin-vm-types = {path = "../../vm/types"}
 starcoin-abi-types = {path = "../types"}
 anyhow="~1"
 starcoin-resource-viewer = {path = "../../vm/resource-viewer"}
-move-model = { git = "https://github.com/starcoinorg/diem", rev="6b1533f22b3075cc15ff68db21b5b84e6baa2955"  }
+move-model = { git = "https://github.com/starcoinorg/diem", rev="bdb6f73f3a196f9f80ea8ae09a859c6a3579d702"  }
 [dev-dependencies]
 stdlib = {path = "../../vm/stdlib"}
 serde_json = "1"

abi/resolver/Cargo.toml

@@ -14,4 +14,4 @@ serde="~1"
 serde_bytes = "0.11"
 serde_json = "~1"
 hex = "0.4"
-schemars = {git = "https://github.com/starcoinorg/schemars", rev="3f8ecc27f02b27d56c716de58d7880ae7816390c"}
+schemars = {git = "https://github.com/starcoinorg/schemars", rev="fa9abf1ea670677f0d628112c83d08937c743bad"}

abi/types/Cargo.toml

@@ -21,7 +21,7 @@ rand = "0.8.4"
 rand_core = { version = "0.6.3", default-features = false }
 futures = "0.3.12"
 starcoin-service-registry = { path = "../../commons/service-registry" }
-schemars = {git = "https://github.com/starcoinorg/schemars", rev="3f8ecc27f02b27d56c716de58d7880ae7816390c"}
+schemars = {git = "https://github.com/starcoinorg/schemars", rev="fa9abf1ea670677f0d628112c83d08937c743bad"}
 
 [dev-dependencies]
 

account/api/Cargo.toml

@@ -219,10 +219,12 @@ impl BlockRelayer {
                     warn!("Block is failed block : {:?}", block_id);
                 }
             } else {
-                let peer = network
-                    .get_peer(peer_id.clone())
-                    .await?
-                    .ok_or_else(|| format_err!("CompatBlockMessage's peer {} is not connected"))?;
+                let peer = network.get_peer(peer_id.clone()).await?.ok_or_else(|| {
+                    format_err!(
+                        "CompatBlockMessage's peer {} is not connected",
+                        peer_id.clone()
+                    )
+                })?;
                 let peer_selector = PeerSelector::new(vec![peer], PeerStrategy::default(), None);
                 let rpc_client = VerifiedRpcClient::new(peer_selector, network);
                 let _timer = metrics

block-relayer/src/block_relayer.rs

@@ -44,7 +44,6 @@ proptest-derive = { version = "0.3.0" }
 test-helper = { path = "../test-helper" }
 starcoin-chain-mock = { path = "./mock" }
 starcoin-types = { path = "../types", package = "starcoin-types", features = ["fuzzing"]}
-starcoin-functional-tests = { path = "../vm/functional-tests"}
 starcoin-resource-viewer = {path = "../vm/resource-viewer"}
 starcoin-transaction-builder = { path = "../vm/transaction-builder"}
 

chain/Cargo.toml

@@ -15,7 +15,7 @@ starcoin-vm-types = {path = "../../vm/types"}
 bcs-ext = {path = "../../commons/bcs_ext"}
 anyhow = "~1"
 async-trait = "~0.1"
-clap = "3.0.0-beta.2"
+clap = { version = "3.0.0-rc.7", features=["derive"] }
 elasticsearch = "7.10.0-alpha.1"
 serde = "1.0.130"
 serde_json = "~1"

cmd/airdrop/Cargo.toml

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use bcs_ext::BCSCodec;
-use clap::Clap;
+use clap::Parser;
 use jsonrpc_core_client::{RpcChannel, RpcError};
 use serde::Deserialize;
 use starcoin_crypto::{HashValue, ValidCryptoMaterialStringExt};
@@ -23,8 +23,7 @@ use starcoin_vm_types::value::MoveValue;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::time::Duration;
-
-#[derive(Clap, Debug, Clone)]
+#[derive(Parser, Debug, Clone)]
 #[clap(version = "0.1.0", author = "Starcoin Core Dev <[email protected]>")]
 pub struct Options {
     #[clap(long, default_value = "http://localhost:9850")]