Merge 99541c0 into c243e14

starcoinorg · Jul 22, 2022 · f19de5e · f19de5e
2 parents c243e14 + 99541c0
commit f19de5e
Show file tree

Hide file tree

Showing 32 changed files with 729 additions and 473 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/abi/decoder/Cargo.toml b/abi/decoder/Cargo.toml
@@ -1,24 +1,24 @@
 [package]
-name = "starcoin-abi-decoder"
-version = "1.11.11"
 authors = ["Starcoin Core Dev <dev@starcoin.org>"]
-license = "Apache-2.0"
 edition = "2021"
+license = "Apache-2.0"
+name = "starcoin-abi-decoder"
+version = "1.11.11"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-serde_json = "1.0"
-serde = { version = "1.0.130", features = ["derive", "rc"] }
-serde_bytes = "0.11"
 anyhow = "1.0.41"
-hex = "0.4.3"
-move-binary-format = {git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
-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"
+bcs-ext = {path = "../../commons/bcs_ext"}
+hex = "0.4.3"
+move-binary-format = {git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
 ordinal = "0.3.1"
 schemars = {git = "https://github.com/starcoinorg/schemars", rev = "6972da92f4360e1779168bb3fe0274c521d324e2"}
+serde = {version = "1.0.130", features = ["derive", "rc"]}
+serde_bytes = "0.11"
+serde_json = "1.0"
+starcoin-abi-resolver = {path = "../resolver"}
+starcoin-abi-types = {path = "../types"}
+starcoin-resource-viewer = {path = "../../vm/resource-viewer"}
+starcoin-vm-types = {path = "../../vm/types"}
diff --git a/abi/resolver/Cargo.toml b/abi/resolver/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
-name = "starcoin-abi-resolver"
-version = "1.11.11"
 authors = ["Starcoin Core Dev <dev@starcoin.org>"]
 edition = "2021"
+name = "starcoin-abi-resolver"
+version = "1.11.11"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-starcoin-vm-types = {path = "../../vm/types"}
+anyhow = "~1"
+move-model = {git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
 starcoin-abi-types = {path = "../types"}
-anyhow="~1"
 starcoin-resource-viewer = {path = "../../vm/resource-viewer"}
-move-model = { git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
+starcoin-vm-types = {path = "../../vm/types"}
 [dev-dependencies]
-stdlib = {path = "../../vm/stdlib"}
 serde_json = "1"
-test-helper= {path = "../../test-helper"}
+stdlib = {path = "../../vm/stdlib"}
+test-helper = {path = "../../test-helper"}
diff --git a/cmd/starcoin/Cargo.toml b/cmd/starcoin/Cargo.toml
@@ -1,64 +1,64 @@
 [package]
-name = "starcoin-cmd"
-version = "1.11.11"
 authors = ["Starcoin Core Dev <dev@starcoin.org>"]
+edition = "2021"
 license = "Apache-2.0"
+name = "starcoin-cmd"
 publish = false
-edition = "2021"
+version = "1.11.11"
 
 [dependencies]
 anyhow = "1.0.41"
-rand = "0.8.5"
-serde = { version = "1.0.130" }
-serde_json = { version="1.0", features = ["arbitrary_precision"]}
+bcs-ext = {package = "bcs-ext", path = "../../commons/bcs_ext"}
+clap = {version = "3", features = ["derive"]}
 crossbeam-channel = "0.5.5"
-tokio = {version = "^1", features = ["full"] }
+forkable-jellyfish-merkle = {path = "../../commons/forkable-jellyfish-merkle"}
 futures = "0.3.12"
-bcs-ext = { package="bcs-ext", path = "../../commons/bcs_ext" }
+hex = {version = "0.4.3", default-features = false}
 itertools = "0.10.3"
-clap = { version = "3", features = ["derive"] }
-starcoin-logger = { path = "../../commons/logger" }
-starcoin-config = { path = "../../config"}
-starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc"}
-starcoin-types = { path = "../../types"}
-starcoin-rpc-api = { path = "../../rpc/api"}
-starcoin-rpc-client = { path = "../../rpc/client" }
-starcoin-node-api = { path = "../../node/api" }
-starcoin-node = { path = "../../node" }
+move-command-line-common = {git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
+move-errmapgen = {git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
+network-api = {path = "../../network/api", package = "network-api"}
+network-p2p-types = {path = "../../network-p2p/types"}
+rand = "0.8.5"
+scmd = {path = "../../commons/scmd"}
+serde = {version = "1.0.130"}
+serde_json = {version = "1.0", features = ["arbitrary_precision"]}
+starcoin-abi-decoder = {path = "../../abi/decoder"}
+starcoin-abi-resolver = {path = "../../abi/resolver"}
+starcoin-abi-types = {path = "../../abi/types"}
+starcoin-account-api = {path = "../../account/api"}
+starcoin-account-provider = {path = "../../account/provider"}
+starcoin-chain-api = {path = "../../chain/api"}
+starcoin-config = {path = "../../config"}
 starcoin-consensus = {path = "../../consensus"}
+starcoin-crypto = {git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc"}
+starcoin-dev = {path = "../../vm/dev"}
 starcoin-executor = {path = "../../executor"}
+starcoin-genesis = {path = "../../genesis"}
+starcoin-logger = {path = "../../commons/logger"}
+starcoin-move-compiler = {path = "../../vm/compiler"}
+starcoin-move-explain = {path = "../../vm/move-explain"}
+starcoin-network-rpc-api = {path = "../../network-rpc/api"}
+starcoin-node = {path = "../../node"}
+starcoin-node-api = {path = "../../node/api"}
+starcoin-resource-viewer = {path = "../../vm/resource-viewer"}
+starcoin-rpc-api = {path = "../../rpc/api"}
+starcoin-rpc-client = {path = "../../rpc/client"}
+starcoin-service-registry = {path = "../../commons/service-registry"}
 starcoin-state-api = {path = "../../state/api"}
 starcoin-sync-api = {path = "../../sync/api"}
-starcoin-account-api = {path = "../../account/api"}
-starcoin-account-provider={path = "../../account/provider"}
-starcoin-chain-api = {path = "../../chain/api"}
-network-p2p-types = {path = "../../network-p2p/types"}
-scmd = { path = "../../commons/scmd" }
-stdlib = {path = "../../vm/stdlib"}
-starcoin-vm-types = {path = "../../vm/types"}
-starcoin-vm-runtime = {path = "../../vm/vm-runtime"}
 starcoin-transaction-builder = {path = "../../vm/transaction-builder"}
-forkable-jellyfish-merkle = { path = "../../commons/forkable-jellyfish-merkle"}
-hex = { version = "0.4.3", default-features = false }
-starcoin-move-compiler = { path = "../../vm/compiler"}
-starcoin-dev= {path = "../../vm/dev"}
-starcoin-txpool-api = { path = "../../txpool/api" }
-starcoin-genesis = { path = "../../genesis" }
-starcoin-resource-viewer = { path = "../../vm/resource-viewer" }
-starcoin-service-registry = { path = "../../commons/service-registry" }
-starcoin-move-explain = { path = "../../vm/move-explain" }
+starcoin-txpool-api = {path = "../../txpool/api"}
+starcoin-types = {path = "../../types"}
+starcoin-vm-runtime = {path = "../../vm/vm-runtime"}
+starcoin-vm-types = {path = "../../vm/types"}
+stdlib = {path = "../../vm/stdlib"}
+tokio = {version = "^1", features = ["full"]}
 vm-status-translator = {path = "../../vm/vm-status-translator"}
-move-errmapgen = { git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
-network-api = {path = "../../network/api", package="network-api"}
-starcoin-network-rpc-api = {path = "../../network-rpc/api"}
-starcoin-abi-decoder = {path = "../../abi/decoder"}
-starcoin-abi-resolver = {path = "../../abi/resolver"}
-starcoin-abi-types = {path = "../../abi/types"}
-move-command-line-common = {git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d" }
 
 [dev-dependencies]
-test-helper= {path = "../../test-helper"}
-stest = { path = "../../commons/stest" }
+stest = {path = "../../commons/stest"}
+test-helper = {path = "../../test-helper"}
 
 [[bin]]
 name = "starcoin"

diff --git a/commons/proptest-helpers/Cargo.toml b/commons/proptest-helpers/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
-name = "starcoin-proptest-helpers"
-version = "1.11.11"
 authors = ["Starcoin Core Dev <dev@starcoin.org>"]
+edition = "2021"
 license = "Apache-2.0"
+name = "starcoin-proptest-helpers"
 publish = false
-edition = "2021"
+version = "1.11.11"
 
 [dependencies]
 crossbeam = "0.7.3"
-diem-proptest-helpers = { package="diem-proptest-helpers",  git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
+diem-proptest-helpers = {package = "diem-proptest-helpers", git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
 
 proptest = "1.0.0"
 proptest-derive = "0.3.0"
diff --git a/devtools/x/Cargo.toml b/devtools/x/Cargo.toml
@@ -1,29 +1,29 @@
 [package]
-name = "starcoin-x"
-version = "1.11.11"
 authors = ["Starcoin Core Dev <dev@starcoin.org>"]
+edition = "2021"
 license = "Apache-2.0"
+name = "starcoin-x"
 publish = false
-edition = "2021"
+version = "1.11.11"
 
 [dependencies]
-determinator = "0.4.0"
-serde = { version = "1.0.130", features = ["derive"] }
-serde_json = "1.0.61"
-clap = { version = "3", features = ["derive"] }
 anyhow = "1.0.41"
+camino = {version = "1"}
+chrono = "0.4.19"
+clap = {version = "3", features = ["derive"]}
 colored-diff = "0.2.2"
-guppy = { version = "0.9.0", features = ["summaries"] }
-indoc = "1.0.3"
-toml = "0.5.9"
+determinator = "0.4.0"
 env_logger = "0.9.0"
-log = "0.4.16"
-chrono = "0.4.19"
 globset = "0.4.8"
-regex = "1.6.0"
-rayon = "1.5.1"
+guppy = {version = "0.9.0", features = ["summaries"]}
 indexmap = "1.6.2"
-camino = { version = "1" }
-x-core = { package="x-core", git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
-x-lint = { package="x-lint", git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
-x = { package="x", git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
+indoc = "1.0.3"
+log = "0.4.16"
+rayon = "1.5.1"
+regex = "1.6.0"
+serde = {version = "1.0.130", features = ["derive"]}
+serde_json = "1.0.61"
+toml = "0.5.9"
+x = {package = "x", git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
+x-core = {package = "x-core", git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
+x-lint = {package = "x-lint", git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
diff --git a/rpc/api/src/lib.rs b/rpc/api/src/lib.rs
@@ -4,6 +4,7 @@
 use jsonrpc_core::{BoxFuture, Error};
 
 pub type FutureResult<T> = BoxFuture<Result<T, Error>>;
+pub use jsonrpc_core::Params;
 
 pub mod account;
 pub mod chain;

diff --git a/vm/compiler/Cargo.toml b/vm/compiler/Cargo.toml
@@ -1,26 +1,26 @@
 [package]
-name = "starcoin-move-compiler"
-version = "1.11.11"
 authors = ["Starcoin Core Dev <dev@starcoin.org>"]
+edition = "2021"
 license = "Apache-2.0"
+name = "starcoin-move-compiler"
 publish = false
-edition = "2021"
+version = "1.11.11"
 
 [dependencies]
 anyhow = "1.0.41"
+itertools = "0.10.3"
+move-binary-format = {git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
+move-command-line-common = {git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
+move-compiler = {package = "move-compiler", git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
 once_cell = "1.13.0"
-tempfile = "3.1.0"
-regex = { version = "1.6.0", default-features = false, features = ["std", "perf"] }
-move-compiler = { package="move-compiler", git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
-move-command-line-common = {git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"}
-move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
 petgraph = "0.5.1"
-walkdir = "2.3"
 rayon = "1.5.1"
-itertools = "0.10.3"
-starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc"}
-starcoin-vm-types = { path = "../types"}
-starcoin-logger = { path = "../../commons/logger"}
+regex = {version = "1.6.0", default-features = false, features = ["std", "perf"]}
+starcoin-crypto = {git = "https://github.com/starcoinorg/starcoin-crypto", rev = "d871dfb4216f034ee334a575926c101574d9d6dc"}
+starcoin-logger = {path = "../../commons/logger"}
+starcoin-vm-types = {path = "../types"}
+tempfile = "3.1.0"
+walkdir = "2.3"
 
 [dev-dependencies]
 stest = {path = "../../commons/stest"}
diff --git a/vm/move-coverage/Cargo.toml b/vm/move-coverage/Cargo.toml
@@ -1,25 +1,24 @@
 [package]
-name = "move-coverage"
-version = "1.11.11"
 authors = ["Diem Association <opensource@diem.org>", "Starcoin Core Dev <dev@starcoin.org>"]
 description = "starcoin Move VM code coverage"
+edition = "2021"
 license = "Apache-2.0"
+name = "move-coverage"
 publish = false
-edition = "2021"
+version = "1.11.11"
 
 [dependencies]
-petgraph = "0.5.1"
-clap = { version = "3", features = ["derive"] }
-serde = { version = "1.0.130", default-features = false }
 anyhow = "1.0.41"
-codespan = { version = "0.8.0", features = ["serialization"] }
-colored = "2.0.0"
 bcs = "0.1.2"
+clap = {version = "3", features = ["derive"]}
+codespan = {version = "0.8.0", features = ["serialization"]}
+colored = "2.0.0"
+petgraph = "0.5.1"
+serde = {version = "1.0.130", default-features = false}
 
-move-bytecode-source-map = { git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
-move-coverage = { git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
-move-binary-format = { git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
-move-command-line-common = { git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d"  }
+move-binary-format = {git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
+move-bytecode-source-map = {git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
+move-command-line-common = {git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
+move-coverage = {git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
 [features]
 default = []
-
diff --git a/vm/move-explain/Cargo.toml b/vm/move-explain/Cargo.toml
@@ -1,19 +1,19 @@
 [package]
-name = "starcoin-move-explain"
-version = "1.11.11"
 authors = ["Diem Association <opensource@diem.org>"]
 description = "Diem Move abort code explanations"
-repository = "https://github.com/diem/diem"
+edition = "2021"
 homepage = "https://diem.org"
 license = "Apache-2.0"
+name = "starcoin-move-explain"
 publish = false
-edition = "2021"
+repository = "https://github.com/diem/diem"
+version = "1.11.11"
 
 [dependencies]
-clap = { version = "3", features = ["derive"] }
-stdlib = { package="stdlib", path = "../stdlib"}
-move-core-types = { git = "https://github.com/starcoinorg/move", rev = "69db2858761045f19935f3aaf43f04a1910ae74d" }
-bcs-ext = { package="bcs-ext", path = "../../commons/bcs_ext" }
+bcs-ext = {package = "bcs-ext", path = "../../commons/bcs_ext"}
+clap = {version = "3", features = ["derive"]}
+move-core-types = {git = "https://github.com/starcoinorg/move", rev = "09e1a360c9749c8c58fe33ec6f312adab0541e9b"}
+stdlib = {package = "stdlib", path = "../stdlib"}
 
 [features]
 default = []