From 90eb734b01bfda7699b69e52b4fb698274af0280 Mon Sep 17 00:00:00 2001 From: Guangyu Zhu Date: Fri, 26 Feb 2021 18:59:24 +0800 Subject: [PATCH] merge all diem patches into several major ones (#2219) --- Cargo.lock | 75 ++++++++++----------- cmd/starcoin/Cargo.toml | 4 +- commons/crypto/Cargo.toml | 4 +- commons/proptest-helpers/Cargo.toml | 2 +- config/Cargo.toml | 2 +- core/forkable-jellyfish-merkle/Cargo.toml | 2 +- devtools/x/Cargo.toml | 8 +-- vm/compiler/Cargo.toml | 4 +- vm/functional-tests/Cargo.toml | 4 +- vm/move-coverage/Cargo.toml | 4 +- vm/move-explain/Cargo.toml | 6 +- vm/move-prover/Cargo.toml | 28 ++++---- vm/stdlib/Cargo.toml | 4 +- vm/transaction-builder-generator/Cargo.toml | 4 +- vm/types/Cargo.toml | 12 ++-- vm/vm-runtime/Cargo.toml | 2 +- 16 files changed, 82 insertions(+), 83 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cedde293ec..9193d8f13f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,7 +5,7 @@ version = 3 [[package]] name = "abigen" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "bcs", @@ -880,7 +880,7 @@ dependencies = [ [[package]] name = "boogie-backend" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "async-trait", @@ -909,7 +909,7 @@ dependencies = [ [[package]] name = "borrow-graph" version = "0.0.1" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "diem-workspace-hack", "mirai-annotations", @@ -970,7 +970,7 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytecode" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "borrow-graph", "bytecode-verifier", @@ -991,7 +991,7 @@ dependencies = [ [[package]] name = "bytecode-source-map" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "bcs", @@ -1008,7 +1008,7 @@ dependencies = [ [[package]] name = "bytecode-verifier" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "borrow-graph", @@ -1850,7 +1850,7 @@ checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" [[package]] name = "datatest-stable" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "diem-workspace-hack", "regex", @@ -1943,7 +1943,7 @@ dependencies = [ [[package]] name = "diem-crypto" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "aes-gcm 0.8.0", "anyhow", @@ -1975,7 +1975,7 @@ dependencies = [ [[package]] name = "diem-crypto-derive" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "diem-workspace-hack", "proc-macro2 1.0.24", @@ -1986,7 +1986,7 @@ dependencies = [ [[package]] name = "diem-infallible" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "diem-workspace-hack", ] @@ -1994,7 +1994,7 @@ dependencies = [ [[package]] name = "diem-log-derive" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "diem-workspace-hack", "proc-macro2 1.0.24", @@ -2005,7 +2005,7 @@ dependencies = [ [[package]] name = "diem-logger" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "backtrace", "chrono", @@ -2023,7 +2023,7 @@ dependencies = [ [[package]] name = "diem-network-address" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "aes-gcm 0.8.0", "bcs", @@ -2039,7 +2039,7 @@ dependencies = [ [[package]] name = "diem-proptest-helpers" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "crossbeam 0.8.0", "diem-workspace-hack", @@ -2050,7 +2050,7 @@ dependencies = [ [[package]] name = "diem-temppath" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "diem-workspace-hack", "hex", @@ -2060,7 +2060,7 @@ dependencies = [ [[package]] name = "diem-types" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "bcs", @@ -2088,7 +2088,7 @@ dependencies = [ [[package]] name = "diem-workspace-hack" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "byteorder", "bytes 1.0.1", @@ -2223,7 +2223,7 @@ dependencies = [ [[package]] name = "docgen" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "bytecode", @@ -2380,7 +2380,7 @@ dependencies = [ [[package]] name = "errmapgen" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "bcs", @@ -2437,7 +2437,7 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "fallible" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "diem-workspace-hack", "thiserror", @@ -3546,7 +3546,7 @@ checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" [[package]] name = "ir-to-bytecode" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "bytecode-source-map", @@ -3566,7 +3566,7 @@ dependencies = [ [[package]] name = "ir-to-bytecode-syntax" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "codespan", @@ -4554,7 +4554,7 @@ checksum = "b48e78b8626927bd980dff38d8147006323f5d7634d7bc9e31c3a59e07da1b28" [[package]] name = "move-core-types" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "bcs", @@ -4594,7 +4594,7 @@ dependencies = [ [[package]] name = "move-ir-types" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "codespan", @@ -4609,7 +4609,7 @@ dependencies = [ [[package]] name = "move-lang" version = "0.0.1" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "bcs", @@ -4618,7 +4618,6 @@ dependencies = [ "bytecode-verifier", "codespan", "codespan-reporting", - "diem-temppath", "diem-types", "diem-workspace-hack", "difference", @@ -4638,7 +4637,7 @@ dependencies = [ [[package]] name = "move-lang-test-utils" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "datatest-stable", "diem-workspace-hack", @@ -4647,7 +4646,7 @@ dependencies = [ [[package]] name = "move-model" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "bytecode-source-map", @@ -4712,7 +4711,7 @@ dependencies = [ [[package]] name = "move-prover-test-utils" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "diem-workspace-hack", @@ -4723,7 +4722,7 @@ dependencies = [ [[package]] name = "move-vm-natives" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "diem-crypto", "diem-workspace-hack", @@ -4739,7 +4738,7 @@ dependencies = [ [[package]] name = "move-vm-runtime" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "bytecode-verifier", "diem-crypto", @@ -4758,7 +4757,7 @@ dependencies = [ [[package]] name = "move-vm-types" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "bcs", "diem-crypto", @@ -5206,7 +5205,7 @@ dependencies = [ [[package]] name = "num-variants" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "diem-workspace-hack", "proc-macro2 1.0.24", @@ -7085,7 +7084,7 @@ checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" [[package]] name = "short-hex-str" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "diem-workspace-hack", "mirai-annotations", @@ -10178,7 +10177,7 @@ checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" [[package]] name = "vm" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "diem-crypto", @@ -10545,7 +10544,7 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" [[package]] name = "x" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "anyhow", "chrono", @@ -10571,7 +10570,7 @@ dependencies = [ [[package]] name = "x-core" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "determinator 0.2.1", "guppy 0.7.2", @@ -10588,7 +10587,7 @@ dependencies = [ [[package]] name = "x-lint" version = "0.1.0" -source = "git+https://github.com/starcoinorg/diem?rev=8c4da62a52f4a30533e2deebfc33cfdbdef6c52f#8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" +source = "git+https://github.com/starcoinorg/diem?rev=b42f4aa6c021eed055b3841da94318559e1e0bbb#b42f4aa6c021eed055b3841da94318559e1e0bbb" dependencies = [ "guppy 0.7.2", "hakari", diff --git a/cmd/starcoin/Cargo.toml b/cmd/starcoin/Cargo.toml index cce2f31af3..b8842d4895 100644 --- a/cmd/starcoin/Cargo.toml +++ b/cmd/starcoin/Cargo.toml @@ -44,9 +44,9 @@ 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="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +errmapgen = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } network-api = {path = "../../network/api", package="network-api"} -short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } [dev-dependencies] diff --git a/commons/crypto/Cargo.toml b/commons/crypto/Cargo.toml index 7155d36642..b657adfe99 100644 --- a/commons/crypto/Cargo.toml +++ b/commons/crypto/Cargo.toml @@ -11,8 +11,8 @@ serde = { version = "1.0.123" } serde_bytes = "0.11.5" hex = "0.4.2" anyhow = "1.0" -diem-crypto = { package="diem-crypto", git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f", features = ["fuzzing"] } -diem-crypto-derive = { package="diem-crypto-derive", git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +diem-crypto = { package="diem-crypto", git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb", features = ["fuzzing"] } +diem-crypto-derive = { package="diem-crypto-derive", git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } 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 index ee1bc52d23..d1116e8979 100644 --- 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="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +diem-proptest-helpers = { package="diem-proptest-helpers", git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } proptest = "0.10.1" proptest-derive = "0.3.0" diff --git a/config/Cargo.toml b/config/Cargo.toml index 295b320390..e74fe97385 100644 --- a/config/Cargo.toml +++ b/config/Cargo.toml @@ -29,6 +29,6 @@ starcoin-types = { path = "../types" } starcoin-vm-types = { path = "../vm/types" } network-p2p-types = { path = "../network-p2p/types"} starcoin-logger = {path = "../commons/logger", package="starcoin-logger"} -diem-temppath = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +diem-temppath = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } starcoin-system = {path = "../commons/system", package="starcoin-system"} network-api = {path = "../network/api", package="network-api"} \ No newline at end of file diff --git a/core/forkable-jellyfish-merkle/Cargo.toml b/core/forkable-jellyfish-merkle/Cargo.toml index 990ece48cc..28b6edaa5b 100644 --- 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.2" once_cell = "1.7.0" bcs-ext = { path = "../../commons/bcs_ext", package = "bcs-ext" } -short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +short-hex-str = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } [dev-dependencies] rand = "0.8.3" diff --git a/devtools/x/Cargo.toml b/devtools/x/Cargo.toml index bca8b76c11..ffb446618b 100644 --- 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.1" -x-core = { package="x-core", git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -x-lint = { package="x-lint", git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -diem-workspace-hack = { package="diem-workspace-hack", git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -diem-x = { package="x", git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +x-core = { package="x-core", git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +x-lint = { package="x-lint", git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +diem-workspace-hack = { package="diem-workspace-hack", git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +diem-x = { package="x", git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } diff --git a/vm/compiler/Cargo.toml b/vm/compiler/Cargo.toml index ca5dc0c06d..8b139e8e64 100644 --- a/vm/compiler/Cargo.toml +++ b/vm/compiler/Cargo.toml @@ -11,8 +11,8 @@ anyhow = "1.0.38" once_cell = "1.7.0" 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="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -move-lang-test-utils = { package="move-lang-test-utils", git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +move-lang = { package="move-lang", git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +move-lang-test-utils = { package="move-lang-test-utils", git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } 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 index 4ad6994765..ff218631dd 100644 --- 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="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +datatest-stable = {git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } stdlib = { package="stdlib", path = "../stdlib"} once_cell = "1.7.0" 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="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +move-lang = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } [dev-dependencies] starcoin-vm-types = { path = "../types"} diff --git a/vm/move-coverage/Cargo.toml b/vm/move-coverage/Cargo.toml index aafb04904b..d1b657068c 100644 --- a/vm/move-coverage/Cargo.toml +++ b/vm/move-coverage/Cargo.toml @@ -18,8 +18,8 @@ colored = "2.0.0" bcs-ext = { package="bcs-ext", path = "../../commons/bcs_ext" } starcoin-types = { path = "../../types"} starcoin-vm-types = { path = "../types"} -bytecode-source-map = { package = "bytecode-source-map", version = "0.1.0", git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -bytecode-verifier = { package = "bytecode-verifier", version = "0.1.0", git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +bytecode-source-map = { package = "bytecode-source-map", version = "0.1.0", git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +bytecode-verifier = { package = "bytecode-verifier", version = "0.1.0", git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } [features] default = [] diff --git a/vm/move-explain/Cargo.toml b/vm/move-explain/Cargo.toml index aaacc1191e..f1b89d742b 100644 --- a/vm/move-explain/Cargo.toml +++ b/vm/move-explain/Cargo.toml @@ -12,9 +12,9 @@ edition = "2018" [dependencies] structopt = "0.3.21" stdlib = { package="stdlib", path = "../stdlib"} -diem-workspace-hack = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -errmapgen = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -move-core-types = { git = "https://github.com/starcoinorg/diem", rev = "8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +diem-workspace-hack = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +errmapgen = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +move-core-types = { git = "https://github.com/starcoinorg/diem", rev = "b42f4aa6c021eed055b3841da94318559e1e0bbb" } bcs-ext = { package="bcs-ext", path = "../../commons/bcs_ext" } [features] diff --git a/vm/move-prover/Cargo.toml b/vm/move-prover/Cargo.toml index 3b21c6732f..26a320aa98 100644 --- a/vm/move-prover/Cargo.toml +++ b/vm/move-prover/Cargo.toml @@ -8,18 +8,18 @@ license = "Apache-2.0" [dependencies] # diem dependencies -boogie-backend = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -move-lang = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -move-model = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -docgen = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -errmapgen = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -bytecode = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -vm = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -diem-temppath = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -diem-workspace-hack = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -bytecode-source-map = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -move-ir-types = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -abigen = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +boogie-backend = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +move-lang = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +move-model = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +docgen = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +errmapgen = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +bytecode = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +vm = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +diem-temppath = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +diem-workspace-hack = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +bytecode-source-map = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +move-ir-types = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +abigen = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } # external dependencies async-trait = "0.1.42" @@ -44,8 +44,8 @@ tokio = { version = "0.2", features = ["full"] } toml = "0.5.8" [dev-dependencies] -datatest-stable = {git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -move-prover-test-utils = {git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +datatest-stable = {git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +move-prover-test-utils = {git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } shell-words = "1.0.0" [[test]] diff --git a/vm/stdlib/Cargo.toml b/vm/stdlib/Cargo.toml index 427bab03b7..2712a8a9e6 100644 --- a/vm/stdlib/Cargo.toml +++ b/vm/stdlib/Cargo.toml @@ -8,8 +8,8 @@ edition = "2018" [dependencies] anyhow = "1.0.38" -bytecode-verifier = { package="bytecode-verifier", git = "https://github.com/starcoinorg/diem", version = "0.1.0",rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -datatest-stable = { package="datatest-stable", git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +bytecode-verifier = { package="bytecode-verifier", git = "https://github.com/starcoinorg/diem", version = "0.1.0",rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +datatest-stable = { package="datatest-stable", git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } starcoin-crypto = { path = "../../commons/crypto"} starcoin-vm-types = { path = "../types"} bcs-ext = { package="bcs-ext", path = "../../commons/bcs_ext" } diff --git a/vm/transaction-builder-generator/Cargo.toml b/vm/transaction-builder-generator/Cargo.toml index 9320c6b15c..3588a203b4 100644 --- a/vm/transaction-builder-generator/Cargo.toml +++ b/vm/transaction-builder-generator/Cargo.toml @@ -17,8 +17,8 @@ serde-generate = {git="https://github.com/starcoinorg/serde-reflection" , rev="f serde-reflection = {git="https://github.com/starcoinorg/serde-reflection" , rev="f2b44e0455ca19cda822523e3038d6b6bae78b28"} starcoin-vm-types = { path = "../types"} -diem-workspace-hack = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -move-core-types = {git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +diem-workspace-hack = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } +move-core-types = {git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } bcs = "0.1.2" [dev-dependencies] diff --git a/vm/types/Cargo.toml b/vm/types/Cargo.toml index 3c4ca12199..5fc7cbbf6a 100644 --- a/vm/types/Cargo.toml +++ b/vm/types/Cargo.toml @@ -22,11 +22,11 @@ log = "0.4.14" proptest = { version = "0.10.1", default-features = false, optional = true } proptest-derive = { version = "0.3.0", default-features = false, optional = true } -move-core-types = { git = "https://github.com/starcoinorg/diem", rev = "8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -move-vm-types = { git = "https://github.com/starcoinorg/diem", rev = "8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -bytecode-verifier = { git = "https://github.com/starcoinorg/diem", rev = "8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } -vm = { git = "https://github.com/starcoinorg/diem", rev = "8c4da62a52f4a30533e2deebfc33cfdbdef6c52f"} -move-ir-types = { git = "https://github.com/starcoinorg/diem", rev = "8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +move-core-types = { git = "https://github.com/starcoinorg/diem", rev = "b42f4aa6c021eed055b3841da94318559e1e0bbb" } +move-vm-types = { git = "https://github.com/starcoinorg/diem", rev = "b42f4aa6c021eed055b3841da94318559e1e0bbb" } +bytecode-verifier = { git = "https://github.com/starcoinorg/diem", rev = "b42f4aa6c021eed055b3841da94318559e1e0bbb" } +vm = { git = "https://github.com/starcoinorg/diem", rev = "b42f4aa6c021eed055b3841da94318559e1e0bbb"} +move-ir-types = { git = "https://github.com/starcoinorg/diem", rev = "b42f4aa6c021eed055b3841da94318559e1e0bbb" } bcs-ext = { package = "bcs-ext", path = "../../commons/bcs_ext" } starcoin-proptest-helpers = { path = "../../commons/proptest-helpers", optional = true } @@ -39,7 +39,7 @@ forkable-jellyfish-merkle = { path = "../../core/forkable-jellyfish-merkle"} [dev-dependencies] proptest = "0.10.1" proptest-derive = "0.3.0" -vm = { git = "https://github.com/starcoinorg/diem", rev = "8c4da62a52f4a30533e2deebfc33cfdbdef6c52f", features = ["fuzzing"]} +vm = { git = "https://github.com/starcoinorg/diem", rev = "b42f4aa6c021eed055b3841da94318559e1e0bbb", features = ["fuzzing"]} starcoin-crypto = { path = "../../commons/crypto", features = ["fuzzing"] } starcoin-proptest-helpers = { path = "../../commons/proptest-helpers"} diff --git a/vm/vm-runtime/Cargo.toml b/vm/vm-runtime/Cargo.toml index 3bb75314fc..05b4846dcd 100644 --- a/vm/vm-runtime/Cargo.toml +++ b/vm/vm-runtime/Cargo.toml @@ -11,7 +11,7 @@ anyhow = "1.0.38" once_cell = "1.7.0" prometheus = "0.10" starcoin-types = { path = "../../types"} -move-vm-runtime = { git = "https://github.com/starcoinorg/diem", rev="8c4da62a52f4a30533e2deebfc33cfdbdef6c52f" } +move-vm-runtime = { git = "https://github.com/starcoinorg/diem", rev="b42f4aa6c021eed055b3841da94318559e1e0bbb" } starcoin-state-api = {path="../../state/api"} starcoin-config = { path = "../../config"} starcoin-logger = {path = "../../commons/logger"}