Skip to content

Commit

Permalink
merge all diem patches into several major ones (#2219)
Browse files Browse the repository at this point in the history
  • Loading branch information
@guangyuz
guangyuz authored Feb 26, 2021
1 parent 177b1ab commit 90eb734
Show file tree
Hide file tree
Showing 16 changed files with 82 additions and 83 deletions.
75 changes: 37 additions & 38 deletions Cargo.lock
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions cmd/starcoin/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions commons/crypto/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion commons/proptest-helpers/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion config/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
2 changes: 1 addition & 1 deletion core/forkable-jellyfish-merkle/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions devtools/x/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
4 changes: 2 additions & 2 deletions vm/compiler/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
4 changes: 2 additions & 2 deletions vm/functional-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -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"}
Expand Down
4 changes: 2 additions & 2 deletions vm/move-coverage/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down
6 changes: 3 additions & 3 deletions vm/move-explain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
28 changes: 14 additions & 14 deletions vm/move-prover/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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]]
Expand Down
4 changes: 2 additions & 2 deletions vm/stdlib/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
4 changes: 2 additions & 2 deletions vm/transaction-builder-generator/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
12 changes: 6 additions & 6 deletions vm/types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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"}

Expand Down
2 changes: 1 addition & 1 deletion vm/vm-runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down

0 comments on commit 90eb734

Please sign in to comment.