diff --git a/Cargo.lock b/Cargo.lock index 18c688226c..54128544c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -389,7 +389,7 @@ dependencies = [ [[package]] name = "aptos-crypto" version = "0.0.3" -source = "git+https://github.com/starcoinorg/starcoin-crypto?rev=2e8b5525258838236b87e9345002ef5b2c1f8796#2e8b5525258838236b87e9345002ef5b2c1f8796" +source = "git+https://github.com/starcoinorg/starcoin-crypto?rev=5ab51764db7202d4adfdbfd5cf1db9d125fd8971#5ab51764db7202d4adfdbfd5cf1db9d125fd8971" dependencies = [ "aes-gcm 0.10.3", "anyhow", @@ -443,7 +443,7 @@ dependencies = [ [[package]] name = "aptos-crypto-derive" version = "0.0.3" -source = "git+https://github.com/starcoinorg/starcoin-crypto?rev=2e8b5525258838236b87e9345002ef5b2c1f8796#2e8b5525258838236b87e9345002ef5b2c1f8796" +source = "git+https://github.com/starcoinorg/starcoin-crypto?rev=5ab51764db7202d4adfdbfd5cf1db9d125fd8971#5ab51764db7202d4adfdbfd5cf1db9d125fd8971" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.36", @@ -1198,29 +1198,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.59.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "clap 2.34.0", - "env_logger", - "lazy_static", - "lazycell", - "log 0.4.22", - "peeking_take_while", - "proc-macro2 1.0.86", - "quote 1.0.36", - "regex", - "rustc-hash", - "shlex", - "which", -] - [[package]] name = "bindgen" version = "0.65.1" @@ -2444,20 +2421,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "curve25519-dalek-fiat" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44339b9ecede7f72a0d3b012bf9bb5a616dc8bfde23ce544e42da075c87198f0" -dependencies = [ - "byteorder", - "digest 0.9.0", - "fiat-crypto", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - [[package]] name = "curve25519-dalek-ng" version = "4.1.1" @@ -2988,51 +2951,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" -[[package]] -name = "diem-crypto" -version = "0.0.3" -source = "git+https://github.com/starcoinorg/starcoin-crypto?rev=2e8b5525258838236b87e9345002ef5b2c1f8796#2e8b5525258838236b87e9345002ef5b2c1f8796" -dependencies = [ - "aes-gcm 0.8.0", - "anyhow", - "bcs 0.1.5", - "bindgen 0.59.2", - "bytes 1.6.1", - "cc", - "curve25519-dalek-fiat", - "diem-crypto-derive", - "digest 0.9.0", - "ed25519-dalek-fiat", - "hex", - "hkdf 0.10.0", - "libc", - "mirai-annotations", - "once_cell", - "openrpc-schema", - "proptest", - "proptest-derive 0.3.0", - "rand 0.8.5", - "rand_core 0.6.4", - "serde", - "serde-name", - "serde_bytes", - "sha2 0.9.9", - "static_assertions", - "thiserror", - "tiny-keccak", - "x25519-dalek-fiat", -] - -[[package]] -name = "diem-crypto-derive" -version = "0.0.3" -source = "git+https://github.com/starcoinorg/starcoin-crypto?rev=2e8b5525258838236b87e9345002ef5b2c1f8796#2e8b5525258838236b87e9345002ef5b2c1f8796" -dependencies = [ - "proc-macro2 1.0.86", - "quote 1.0.36", - "syn 1.0.107", -] - [[package]] name = "difference" version = "2.0.0" @@ -3173,21 +3091,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ed25519-dalek-fiat" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c6ac152eba578c1c53d2cefe8ad02e239e3d6f971b0f1ef3cb54cd66037fa0" -dependencies = [ - "curve25519-dalek-fiat", - "ed25519", - "rand 0.8.5", - "serde", - "serde_bytes", - "sha2 0.9.9", - "zeroize", -] - [[package]] name = "either" version = "1.8.1" @@ -3295,19 +3198,6 @@ dependencies = [ "syn 1.0.107", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log 0.4.22", - "regex", - "termcolor", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -5514,7 +5404,7 @@ version = "0.11.0+8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" dependencies = [ - "bindgen 0.65.1", + "bindgen", "bzip2-sys", "cc", "glob", @@ -10668,14 +10558,12 @@ dependencies = [ [[package]] name = "starcoin-crypto" version = "1.10.0-rc.2" -source = "git+https://github.com/starcoinorg/starcoin-crypto?rev=2e8b5525258838236b87e9345002ef5b2c1f8796#2e8b5525258838236b87e9345002ef5b2c1f8796" +source = "git+https://github.com/starcoinorg/starcoin-crypto?rev=5ab51764db7202d4adfdbfd5cf1db9d125fd8971#5ab51764db7202d4adfdbfd5cf1db9d125fd8971" dependencies = [ "anyhow", "aptos-crypto", "aptos-crypto-derive", "bcs 0.1.4", - "diem-crypto", - "diem-crypto-derive", "hex", "once_cell", "rand 0.7.3", @@ -10689,7 +10577,7 @@ dependencies = [ [[package]] name = "starcoin-crypto-macro" version = "1.10.0-rc.2" -source = "git+https://github.com/starcoinorg/starcoin-crypto?rev=2e8b5525258838236b87e9345002ef5b2c1f8796#2e8b5525258838236b87e9345002ef5b2c1f8796" +source = "git+https://github.com/starcoinorg/starcoin-crypto?rev=5ab51764db7202d4adfdbfd5cf1db9d125fd8971#5ab51764db7202d4adfdbfd5cf1db9d125fd8971" dependencies = [ "proc-macro2 1.0.86", "quote 1.0.36", @@ -14905,17 +14793,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "x25519-dalek-fiat" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3519d56987103ef084eba6ddfc3be45b7eaee08f2d60bc8495cdca30362a32" -dependencies = [ - "curve25519-dalek-fiat", - "rand_core 0.6.4", - "zeroize", -] - [[package]] name = "x509-parser" version = "0.13.2" diff --git a/Cargo.toml b/Cargo.toml index 87aa62c9a0..346a6e484b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -358,7 +358,9 @@ jsonrpc-client-transports = "18" jsonrpc-core = "18" jsonrpc-core-client = "18" jsonrpc-derive = "18" -openrpc-derive = { git = "https://github.com/starcoinorg/openrpc-rs", rev = "f8ab047e30927cdf2f605b61a219c975d6c4f666", features = ["jsonrpc"] } +openrpc-derive = { git = "https://github.com/starcoinorg/openrpc-rs", rev = "f8ab047e30927cdf2f605b61a219c975d6c4f666", features = [ + "jsonrpc", +] } openrpc-schema = { git = "https://github.com/starcoinorg/openrpc-rs", rev = "f8ab047e30927cdf2f605b61a219c975d6c4f666" } jsonrpc-http-server = "18" @@ -370,7 +372,21 @@ jsonrpc-ws-server = "18" lazy_static = "1.4.0" libc = "^0.2" libloading = "0.7.2" -libp2p = { version = "0.50.0", features = ["dns", "identify", "kad", "macros", "mdns", "mplex", "noise", "ping", "tcp", "tokio", "yamux", "websocket", "secp256k1"] } +libp2p = { version = "0.50.0", features = [ + "dns", + "identify", + "kad", + "macros", + "mdns", + "mplex", + "noise", + "ping", + "tcp", + "tokio", + "yamux", + "websocket", + "secp256k1", +] } libp2p-core = { version = "0.50.0" } libsecp256k1 = "0.7.1" linked-hash-map = "0.5.6" @@ -410,11 +426,15 @@ move-prover-test-utils = { git = "https://github.com/starcoinorg/move", rev = "3 move-resource-viewer = { git = "https://github.com/starcoinorg/move", rev = "3ca902f6d22f47eb86474801c9f702d628bc9aee" } move-stdlib = { git = "https://github.com/starcoinorg/move", rev = "3ca902f6d22f47eb86474801c9f702d628bc9aee" } move-transactional-test-runner = { git = "https://github.com/starcoinorg/move", rev = "3ca902f6d22f47eb86474801c9f702d628bc9aee" } -move-unit-test = { git = "https://github.com/starcoinorg/move", rev = "3ca902f6d22f47eb86474801c9f702d628bc9aee", features = ["table-extension"] } +move-unit-test = { git = "https://github.com/starcoinorg/move", rev = "3ca902f6d22f47eb86474801c9f702d628bc9aee", features = [ + "table-extension", +] } move-vm-runtime = { git = "https://github.com/starcoinorg/move", rev = "3ca902f6d22f47eb86474801c9f702d628bc9aee" } move-vm-types = { git = "https://github.com/starcoinorg/move", rev = "3ca902f6d22f47eb86474801c9f702d628bc9aee" } move-table-extension = { git = "https://github.com/starcoinorg/move", rev = "3ca902f6d22f47eb86474801c9f702d628bc9aee" } -move-vm-test-utils = { git = "https://github.com/starcoinorg/move", rev = "3ca902f6d22f47eb86474801c9f702d628bc9aee", features = ["table-extension"] } +move-vm-test-utils = { git = "https://github.com/starcoinorg/move", rev = "3ca902f6d22f47eb86474801c9f702d628bc9aee", features = [ + "table-extension", +] } names = { version = "0.14.0", default-features = false } network-api = { path = "network/api", package = "network-api" } @@ -498,7 +518,7 @@ starcoin-chain-service = { path = "chain/service" } starcoin-cmd = { path = "cmd/starcoin" } starcoin-config = { path = "config" } starcoin-consensus = { path = "consensus" } -starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "2e8b5525258838236b87e9345002ef5b2c1f8796" } +starcoin-crypto = { git = "https://github.com/starcoinorg/starcoin-crypto", rev = "5ab51764db7202d4adfdbfd5cf1db9d125fd8971" } starcoin-decrypt = { path = "commons/decrypt" } starcoin-dev = { path = "vm/dev" } @@ -594,7 +614,9 @@ unsigned-varint = { version = "0.6.0", features = [ "futures", "asynchronous_codec", ] } -vm = { package = "move-binary-format", git = "https://github.com/starcoinorg/move", rev = "3ca902f6d22f47eb86474801c9f702d628bc9aee", features = ["fuzzing"] } +vm = { package = "move-binary-format", git = "https://github.com/starcoinorg/move", rev = "3ca902f6d22f47eb86474801c9f702d628bc9aee", features = [ + "fuzzing", +] } vm-status-translator = { path = "vm/vm-status-translator" } void = "1.0.2" walkdir = "2.3.1" diff --git a/vm/framework/move-stdlib/doc/features.md b/vm/framework/move-stdlib/doc/features.md index 1f95a91b08..78d19cc78c 100644 --- a/vm/framework/move-stdlib/doc/features.md +++ b/vm/framework/move-stdlib/doc/features.md @@ -724,7 +724,7 @@ Lifetime: transient -Whether enable paritial governance voting on aptos_governance. +Whether enable paritial governance voting on starcoin_governance. Lifetime: transient