From 8a22aa49a18e2ede4899d8a2244795dbaad5268f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 26 Jan 2021 15:56:00 +0000 Subject: [PATCH] Bump parity-scale-codec from 1.3.6 to 2.0.0 Bumps [parity-scale-codec](https://github.com/paritytech/parity-scale-codec) from 1.3.6 to 2.0.0. - [Release notes](https://github.com/paritytech/parity-scale-codec/releases) - [Changelog](https://github.com/paritytech/parity-scale-codec/blob/master/CHANGELOG.md) - [Commits](https://github.com/paritytech/parity-scale-codec/commits) Signed-off-by: dependabot-preview[bot] --- Cargo.lock | 42 ++++++++++++++----- chain-abci/Cargo.toml | 2 +- chain-core/Cargo.toml | 2 +- chain-storage/Cargo.toml | 2 +- chain-tx-enclave-next/mls/Cargo.toml | 2 +- .../tdbe/enclave-app/Cargo.toml | 2 +- .../tdbe/tdbe-common/Cargo.toml | 2 +- .../tx-query-next/enclave-app/Cargo.toml | 2 +- .../tx-validation-next/Cargo.toml | 2 +- chain-tx-enclave/mock-utils/Cargo.toml | 2 +- chain-tx-filter/Cargo.toml | 2 +- chain-tx-validation/Cargo.toml | 2 +- client-common/Cargo.toml | 2 +- client-core/Cargo.toml | 2 +- client-network/Cargo.toml | 2 +- client-rpc/Cargo.toml | 2 +- cro-clib/Cargo.toml | 2 +- dev-utils/Cargo.toml | 2 +- enclave-protocol/Cargo.toml | 2 +- test-common/Cargo.toml | 2 +- 20 files changed, 50 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ac6bcb792..23919639c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -379,12 +379,14 @@ checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "bitvec" -version = "0.17.4" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" +checksum = "f5011ffc90248764d7005b0e10c7294f5aa1bd87d9dd7248f4ad475b347c294d" dependencies = [ - "either", + "funty", "radium", + "tap", + "wyz", ] [[package]] @@ -479,9 +481,9 @@ checksum = "12ae9db68ad7fac5fe51304d20f016c911539251075a214f8e663babefa35187" [[package]] name = "byte-slice-cast" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" +checksum = "65c1bf4a04a88c54f589125563643d773f3254b5c38571395e2b591c693bbc81" [[package]] name = "byte-tools" @@ -1764,6 +1766,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +[[package]] +name = "funty" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + [[package]] name = "futures" version = "0.1.29" @@ -3292,9 +3300,9 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "1.3.6" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79602888a81ace83e3d1d4b2873286c1f5f906c84db667594e8db8da3506c383" +checksum = "75c823fdae1bb5ff5708ee61a62697e6296175dc671710876871c853f48592b3" dependencies = [ "arrayvec 0.5.1", "bitvec", @@ -3305,9 +3313,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "1.2.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "198db82bb1c18fc00176004462dd809b2a6d851669550aa17af6dacd21ae0c14" +checksum = "9029e65297c7fd6d7013f0579e193ec2b34ae78eabca854c9417504ad8a2d214" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3842,9 +3850,9 @@ dependencies = [ [[package]] name = "radium" -version = "0.3.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" +checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" [[package]] name = "rand" @@ -4869,6 +4877,12 @@ dependencies = [ "chrono", ] +[[package]] +name = "tap" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e" + [[package]] name = "tdb-enclave-app" version = "0.6.0" @@ -5990,6 +6004,12 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" + [[package]] name = "x509-parser" version = "0.8.2" diff --git a/chain-abci/Cargo.toml b/chain-abci/Cargo.toml index 34e0b4d96..bb75c3877 100644 --- a/chain-abci/Cargo.toml +++ b/chain-abci/Cargo.toml @@ -37,7 +37,7 @@ protobuf = "2.16.2" integer-encoding = "3.0.1" structopt = "0.3" secp256k1 = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "1aae6edc5f1de0bbdcdb26f1f1d8b00ca28e012a", features = ["recovery", "endomorphism", "global-context"] } -parity-scale-codec = { features = ["derive"], version = "1.3" } +parity-scale-codec = { features = ["derive"], version = "2.0" } thiserror = "1.0" kvdb = "0.7" itertools = "0.10" diff --git a/chain-core/Cargo.toml b/chain-core/Cargo.toml index 95b904a10..95280aef7 100644 --- a/chain-core/Cargo.toml +++ b/chain-core/Cargo.toml @@ -21,7 +21,7 @@ hex = { version = "0.4", optional = true } secp256k1 = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", default-features = false, rev = "1aae6edc5f1de0bbdcdb26f1f1d8b00ca28e012a", features = ["recovery", "endomorphism", "schnorrsig", "global-context"] } serde = { version = "1.0", features = ["derive"], optional = true } blake3 = { version = "0.3.7", default-features = false } -parity-scale-codec = { features = ["derive"], version = "1.3" } +parity-scale-codec = { features = ["derive"], version = "2.0" } base64 = { version = "0.13", optional = true } static_assertions = { version = "1.1.0", default-features = false} bech32 = { version = "0.7.2", optional = true } diff --git a/chain-storage/Cargo.toml b/chain-storage/Cargo.toml index 4c44b0af1..dc5a20982 100644 --- a/chain-storage/Cargo.toml +++ b/chain-storage/Cargo.toml @@ -13,7 +13,7 @@ kvdb-rocksdb = { version = "0.9", optional = true } kvdb-memorydb = "0.7" chain-core = { path = "../chain-core" } bit-vec = { version = "0.6.3", features = ["serde_no_std"] } -parity-scale-codec = { features = ["derive"], version = "1.3" } +parity-scale-codec = { features = ["derive"], version = "2.0" } integer-encoding = "3.0.1" anyhow = "1.0" jellyfish-merkle = { git = "https://github.com/crypto-com/jellyfish-merkle-tree.git", rev = "a5dac3bb8d2a4f96f9cb853e6e80751589b0c095" } diff --git a/chain-tx-enclave-next/mls/Cargo.toml b/chain-tx-enclave-next/mls/Cargo.toml index 6cbb32914..309037c01 100644 --- a/chain-tx-enclave-next/mls/Cargo.toml +++ b/chain-tx-enclave-next/mls/Cargo.toml @@ -25,7 +25,7 @@ chain-util = { path = "../../chain-util" } elliptic-curve = "0.5.0" p256 = { version = "0.4.1", features = ["arithmetic", "zeroize"] } zeroize = "1.2" -parity-scale-codec = { features = ["derive"], version = "1.3" } +parity-scale-codec = { features = ["derive"], version = "2.0" } once_cell = "1.5" generic-array = "0.14" static_assertions = "1.1" diff --git a/chain-tx-enclave-next/tdbe/enclave-app/Cargo.toml b/chain-tx-enclave-next/tdbe/enclave-app/Cargo.toml index 1e8c961fd..f74d989c3 100644 --- a/chain-tx-enclave-next/tdbe/enclave-app/Cargo.toml +++ b/chain-tx-enclave-next/tdbe/enclave-app/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" enclave-macro = { path = "../../../chain-tx-enclave/enclave-macro", default-features = false } env_logger = { version = "0.8", default-features = false } log = "0.4" -parity-scale-codec = "1.3" +parity-scale-codec = "2.0" rs-libc = "0.2" rustls = "0.19" sgx-isa = { version = "0.3", features = ["sgxstd"] } diff --git a/chain-tx-enclave-next/tdbe/tdbe-common/Cargo.toml b/chain-tx-enclave-next/tdbe/tdbe-common/Cargo.toml index 11d52888b..a511ca94e 100644 --- a/chain-tx-enclave-next/tdbe/tdbe-common/Cargo.toml +++ b/chain-tx-enclave-next/tdbe/tdbe-common/Cargo.toml @@ -8,4 +8,4 @@ edition = "2018" [dependencies] chain-core = { path = "../../../chain-core" } -parity-scale-codec = "1.3" +parity-scale-codec = "2.0" diff --git a/chain-tx-enclave-next/tx-query-next/enclave-app/Cargo.toml b/chain-tx-enclave-next/tx-query-next/enclave-app/Cargo.toml index b5b96e63f..5ac16c2c5 100644 --- a/chain-tx-enclave-next/tx-query-next/enclave-app/Cargo.toml +++ b/chain-tx-enclave-next/tx-query-next/enclave-app/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [target.'cfg(target_env = "sgx")'.dependencies] env_logger = { version = "0.8", default-features = false } log = "0.4" -parity-scale-codec = "1.3" +parity-scale-codec = "2.0" rand = "0.7" rs-libc = "0.2" rustls = "0.19" diff --git a/chain-tx-enclave-next/tx-validation-next/Cargo.toml b/chain-tx-enclave-next/tx-validation-next/Cargo.toml index 8dadbf498..5551ea26a 100644 --- a/chain-tx-enclave-next/tx-validation-next/Cargo.toml +++ b/chain-tx-enclave-next/tx-validation-next/Cargo.toml @@ -12,7 +12,7 @@ chain-tx-validation = { path = "../../chain-tx-validation" } chain-core = { path = "../../chain-core" } # TODO: "rand" feature may only be dev-dependency / needed for tests secp256k1 = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "1aae6edc5f1de0bbdcdb26f1f1d8b00ca28e012a", features = ["recovery", "endomorphism", "lowmemory", "schnorrsig", "rand", "global-context"] } -parity-scale-codec = { version = "1.3" } +parity-scale-codec = { version = "2.0" } enclave-protocol = { path = "../../enclave-protocol" } chain-tx-filter = { path = "../../chain-tx-filter" } aes-gcm-siv = "0.9" diff --git a/chain-tx-enclave/mock-utils/Cargo.toml b/chain-tx-enclave/mock-utils/Cargo.toml index 75d8688cd..7ca0560fe 100644 --- a/chain-tx-enclave/mock-utils/Cargo.toml +++ b/chain-tx-enclave/mock-utils/Cargo.toml @@ -11,4 +11,4 @@ edition = "2018" [dependencies] chain-core = { path = "../../chain-core" } chain-tx-validation = { path = "../../chain-tx-validation" } -parity-scale-codec = { features = ["derive"], version = "1.3" } +parity-scale-codec = { features = ["derive"], version = "2.0" } diff --git a/chain-tx-filter/Cargo.toml b/chain-tx-filter/Cargo.toml index b1d9833af..001210e66 100644 --- a/chain-tx-filter/Cargo.toml +++ b/chain-tx-filter/Cargo.toml @@ -11,7 +11,7 @@ default = ["bit-vec/std", "chain-core/default"] [dependencies] chain-core = { default-features = false, path = "../chain-core" } -parity-scale-codec = { version = "1.3" } +parity-scale-codec = { version = "2.0" } secp256k1 = { default-features = false, git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "1aae6edc5f1de0bbdcdb26f1f1d8b00ca28e012a", features = ["endomorphism", "global-context"] } bit-vec = { default-features = false, version = "0.6" } diff --git a/chain-tx-validation/Cargo.toml b/chain-tx-validation/Cargo.toml index 9f61464a2..0d6e66043 100644 --- a/chain-tx-validation/Cargo.toml +++ b/chain-tx-validation/Cargo.toml @@ -12,7 +12,7 @@ default = ["chain-core/default", "thiserror"] [dependencies] chain-core = { path = "../chain-core", default-features = false } secp256k1 = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", default-features = false, rev = "1aae6edc5f1de0bbdcdb26f1f1d8b00ca28e012a", features = ["recovery", "endomorphism", "schnorrsig", "global-context"] } -parity-scale-codec = { features = ["derive"], version = "1.3" } +parity-scale-codec = { features = ["derive"], version = "2.0" } thiserror = { version = "1.0", default-features = false, optional = true } [dev-dependencies] diff --git a/client-common/Cargo.toml b/client-common/Cargo.toml index b98299102..9667acbeb 100644 --- a/client-common/Cargo.toml +++ b/client-common/Cargo.toml @@ -29,7 +29,7 @@ itertools = "0.10" num-bigint = "0.2.5" log = "0.4.13" once_cell = "1.5" -parity-scale-codec = { features = ["derive"], version = "1.3" } +parity-scale-codec = { features = ["derive"], version = "2.0" } rand = "0.7" rust-argon2 = "0.8" rustls = { version = "0.19", features = ["dangerous_configuration"] } diff --git a/client-core/Cargo.toml b/client-core/Cargo.toml index f4ff705c9..b79d926ad 100644 --- a/client-core/Cargo.toml +++ b/client-core/Cargo.toml @@ -22,7 +22,7 @@ ledger-transport = { git = "https://github.com/crypto-com/ledger-rs", rev = "8d9 # secp256k1experimental = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "cccfdb77c068b9cefa07b6884849f8473683d6d4", features = ["serde", "zeroize", "rand", "recovery", "endomorphism", "musig"] } secp256k1 = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "1aae6edc5f1de0bbdcdb26f1f1d8b00ca28e012a", features = ["serde", "rand", "recovery", "endomorphism", "schnorrsig", "global-context"] } -parity-scale-codec = { features = ["derive"], version = "1.3" } +parity-scale-codec = { features = ["derive"], version = "2.0" } chrono = { version = "0.4", features = ["serde"] } rand = "0.7" hex = "0.4" diff --git a/client-network/Cargo.toml b/client-network/Cargo.toml index 7cdc10a3b..e12ef54e6 100644 --- a/client-network/Cargo.toml +++ b/client-network/Cargo.toml @@ -15,7 +15,7 @@ client-core = { path = "../client-core" } secstr = { version = "0.4.0", features = ["serde"] } base64 = "0.13" chrono = { version = "0.4", features = ["serde"] } -parity-scale-codec = { features = ["derive"], version = "1.3" } +parity-scale-codec = { features = ["derive"], version = "2.0" } hex = "0.4.2" secp256k1 = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "1aae6edc5f1de0bbdcdb26f1f1d8b00ca28e012a", features = ["recovery", "global-context"] } tendermint = "0.15" diff --git a/client-rpc/Cargo.toml b/client-rpc/Cargo.toml index 3c2f8faa5..ffec87882 100644 --- a/client-rpc/Cargo.toml +++ b/client-rpc/Cargo.toml @@ -20,7 +20,7 @@ secstr = { version = "0.4.0", features = ["serde"] } env_logger="0.8.2" log ="0.4.13" zeroize = "1.2" -parity-scale-codec = "1.3" +parity-scale-codec = "2.0" tendermint-light-client = "0.15" [features] diff --git a/cro-clib/Cargo.toml b/cro-clib/Cargo.toml index 7a9660395..633da29f7 100644 --- a/cro-clib/Cargo.toml +++ b/cro-clib/Cargo.toml @@ -14,7 +14,7 @@ mock-enclave = ["client-rpc-core/mock-enclave"] [dependencies] serde = { version = "1.0", features = ["derive"]} serde_json = "1.0.61" -parity-scale-codec = { features = ["derive"], version = "1.3" } +parity-scale-codec = { features = ["derive"], version = "2.0" } hex="0.4.2" chain-core = { path = "../chain-core" } client-common = { path = "../client-common" } diff --git a/dev-utils/Cargo.toml b/dev-utils/Cargo.toml index adde123fc..4673e5178 100644 --- a/dev-utils/Cargo.toml +++ b/dev-utils/Cargo.toml @@ -21,7 +21,7 @@ kvdb-memorydb = "0.7" dirs = "3.0.1" quest = "0.3" secstr = "0.4.0" -parity-scale-codec = { version = "1.3" } +parity-scale-codec = { version = "2.0" } secp256k1 = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "1aae6edc5f1de0bbdcdb26f1f1d8b00ca28e012a", features = ["recovery", "endomorphism", "schnorrsig", "global-context"] } base64 = "0.13" mls = { path = "../chain-tx-enclave-next/mls" } diff --git a/enclave-protocol/Cargo.toml b/enclave-protocol/Cargo.toml index 820be9a67..386c6b705 100644 --- a/enclave-protocol/Cargo.toml +++ b/enclave-protocol/Cargo.toml @@ -14,6 +14,6 @@ edp = ["chain-core/edp", "parity-scale-codec/std", "secp256k1/lowmemory"] [dependencies] chain-core = { path = "../chain-core", default-features = false } chain-tx-validation = { path = "../chain-tx-validation", default-features = false } -parity-scale-codec = { version = "1.3", features = ["derive"] } +parity-scale-codec = { version = "2.0", features = ["derive"] } blake3 = { version = "0.3.7", default-features = false } secp256k1 = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", default-features = false, rev = "1aae6edc5f1de0bbdcdb26f1f1d8b00ca28e012a" } diff --git a/test-common/Cargo.toml b/test-common/Cargo.toml index 58f3840fb..13b6df669 100644 --- a/test-common/Cargo.toml +++ b/test-common/Cargo.toml @@ -18,7 +18,7 @@ abci = { version = "0.7", git = "https://github.com/crypto-com/rust-abci.git", r kvdb-memorydb = "0.7" protobuf = "2.16.2" secp256k1 = { git = "https://github.com/crypto-com/rust-secp256k1-zkp.git", rev = "1aae6edc5f1de0bbdcdb26f1f1d8b00ca28e012a", features = ["recovery", "endomorphism", "schnorrsig", "global-context"] } -parity-scale-codec = { features = ["derive"], version = "1.3" } +parity-scale-codec = { features = ["derive"], version = "2.0" } base64 = "0.13" hex = "0.4"