Skip to content

Commit

Permalink
Merge c53bcf9 into 07fea8b
Browse files Browse the repository at this point in the history
  • Loading branch information
guangyuz authored Mar 12, 2021
2 parents 07fea8b + c53bcf9 commit a6f4225
Show file tree
Hide file tree
Showing 156 changed files with 666 additions and 713 deletions.
365 changes: 159 additions & 206 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions cmd/starcoin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions commons/crypto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion commons/proptest-helpers/Cargo.toml
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="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"
2 changes: 1 addition & 1 deletion config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
2 changes: 1 addition & 1 deletion core/forkable-jellyfish-merkle/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions devtools/x/Cargo.toml
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.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" }
4 changes: 2 additions & 2 deletions vm/compiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
4 changes: 2 additions & 2 deletions vm/functional-tests/Cargo.toml
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="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"] }
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="da7a2d8f2d91223a0c891561812757029b613686" }
move-lang = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }

[dev-dependencies]
starcoin-vm-types = { path = "../types"}
Expand Down
4 changes: 2 additions & 2 deletions vm/move-coverage/Cargo.toml
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="da7a2d8f2d91223a0c891561812757029b613686" }
bytecode-verifier = { package = "bytecode-verifier", version = "0.1.0", git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
bytecode-source-map = { package = "bytecode-source-map", version = "0.1.0", git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
bytecode-verifier = { package = "bytecode-verifier", version = "0.1.0", git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }

[features]
default = []
Expand Down
6 changes: 3 additions & 3 deletions vm/move-explain/Cargo.toml
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="da7a2d8f2d91223a0c891561812757029b613686" }
errmapgen = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
move-core-types = { git = "https://github.com/starcoinorg/diem", rev = "da7a2d8f2d91223a0c891561812757029b613686" }
diem-workspace-hack = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
errmapgen = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
move-core-types = { git = "https://github.com/starcoinorg/diem", rev = "35b83099823d040a310a52f96622ab5e97aed0f5" }
bcs-ext = { package="bcs-ext", path = "../../commons/bcs_ext" }

[features]
Expand Down
28 changes: 14 additions & 14 deletions vm/move-prover/Cargo.toml
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="da7a2d8f2d91223a0c891561812757029b613686" }
move-lang = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
move-model = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
docgen = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
errmapgen = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
bytecode = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
vm = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
diem-temppath = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
diem-workspace-hack = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
bytecode-source-map = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
move-ir-types = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
abigen = { git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
boogie-backend = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
move-lang = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
move-model = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
docgen = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
errmapgen = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
bytecode = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
vm = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
diem-temppath = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
diem-workspace-hack = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
bytecode-source-map = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
move-ir-types = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
abigen = { git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }

# external dependencies
async-trait = "0.1.48"
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="da7a2d8f2d91223a0c891561812757029b613686" }
move-prover-test-utils = {git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
datatest-stable = {git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
move-prover-test-utils = {git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
shell-words = "1.0.0"

[[test]]
Expand Down
4 changes: 2 additions & 2 deletions vm/stdlib/Cargo.toml
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="da7a2d8f2d91223a0c891561812757029b613686" }
datatest-stable = { package="datatest-stable", git = "https://github.com/starcoinorg/diem", rev="da7a2d8f2d91223a0c891561812757029b613686" }
bytecode-verifier = { package="bytecode-verifier", git = "https://github.com/starcoinorg/diem", version = "0.1.0",rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
datatest-stable = { package="datatest-stable", git = "https://github.com/starcoinorg/diem", rev="35b83099823d040a310a52f96622ab5e97aed0f5" }
starcoin-crypto = { path = "../../commons/crypto"}
starcoin-vm-types = { path = "../types"}
bcs-ext = { package="bcs-ext", path = "../../commons/bcs_ext" }
Expand Down
Binary file modified vm/stdlib/compiled/latest/stdlib/10_Event.mv
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/stdlib/11_Token.mv
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/stdlib/13_Config.mv
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/stdlib/16_PackageTxnManager.mv
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/stdlib/17_Dao.mv
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/stdlib/22_OnChainConfigDao.mv
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/stdlib/23_ModifyDaoConfigProposal.mv
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/stdlib/25_STC.mv
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/stdlib/29_Account.mv
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/stdlib/30_Block.mv
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/stdlib/31_BlockReward.mv
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/stdlib/35_ConsensusStrategy.mv
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/stdlib/37_Epoch.mv
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified vm/stdlib/compiled/latest/transaction_scripts/abi/cast_vote.abi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit a6f4225

Please sign in to comment.