From f4cd2eebd1457389291141af7f7e6bb372e845bc Mon Sep 17 00:00:00 2001 From: Michael Birch Date: Fri, 17 Sep 2021 17:50:11 +0200 Subject: [PATCH] Update primitive-types dependency to 0.10 --- Cargo.lock | 74 +++++++++++++++++------------ Cargo.toml | 6 +-- etc/state-migration-test/Cargo.lock | 34 ++++++------- src/tests/sanity.rs | 2 +- 4 files changed, 65 insertions(+), 51 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a99cc29e9..94b199e95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,9 +49,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" +checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "arrayref" @@ -139,7 +139,7 @@ dependencies = [ "near-vm-logic 3.0.0 (git+https://github.com/near/nearcore.git?rev=8a377fda0b4ce319385c463f1ae46e4b0b29dcd9)", "near-vm-runner", "num", - "primitive-types 0.9.0", + "primitive-types 0.10.0", "rand 0.7.3", "ripemd160", "rjson", @@ -1157,11 +1157,11 @@ dependencies = [ [[package]] name = "ethabi" -version = "13.0.0" -source = "git+https://github.com/darwinia-network/ethabi?branch=xavier-no-std#baacf174d5c2f12122c4ee3fe31506fb52069983" +version = "14.1.0" +source = "git+https://github.com/darwinia-network/ethabi?branch=xavier-no-std#09da0834d95f8b43377ca22d7b1c97a2401f4b0c" dependencies = [ "anyhow", - "ethereum-types", + "ethereum-types 0.12.0", "hex", "serde", "serde_json", @@ -1185,12 +1185,12 @@ dependencies = [ [[package]] name = "ethereum" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567ce064a8232c16e2b2c2173a936b91fbe35c2f2c5278871f5a1a31688b42e9" +checksum = "42ccff962ede8fe7c3ec53d46b8316f3c53377a701a30c0325918b38ce04a497" dependencies = [ - "ethereum-types", - "funty", + "bytes", + "ethereum-types 0.12.0", "hash-db", "hash256-std-hasher", "parity-scale-codec", @@ -1215,6 +1215,19 @@ dependencies = [ "uint", ] +[[package]] +name = "ethereum-types" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd6bde671199089e601e8d47e153368b893ef885f11f365a3261ec58153c211" +dependencies = [ + "ethbloom", + "fixed-hash", + "impl-rlp", + "primitive-types 0.10.0", + "uint", +] + [[package]] name = "event-listener" version = "2.5.1" @@ -1224,7 +1237,7 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" [[package]] name = "evm" version = "0.30.1" -source = "git+https://github.com/aurora-is-near/sputnikvm.git?rev=01e000cbf081dada77ac6b325a6521341044d970#01e000cbf081dada77ac6b325a6521341044d970" +source = "git+https://github.com/aurora-is-near/sputnikvm.git#5ecf36ce393380a89c6f1b09ef79f686fe043624" dependencies = [ "environmental", "ethereum", @@ -1233,7 +1246,7 @@ dependencies = [ "evm-runtime", "log", "parity-scale-codec", - "primitive-types 0.9.0", + "primitive-types 0.10.0", "rlp", "serde", "sha3 0.8.2", @@ -1242,33 +1255,33 @@ dependencies = [ [[package]] name = "evm-core" version = "0.30.0" -source = "git+https://github.com/aurora-is-near/sputnikvm.git?rev=01e000cbf081dada77ac6b325a6521341044d970#01e000cbf081dada77ac6b325a6521341044d970" +source = "git+https://github.com/aurora-is-near/sputnikvm.git#5ecf36ce393380a89c6f1b09ef79f686fe043624" dependencies = [ "funty", "parity-scale-codec", - "primitive-types 0.9.0", + "primitive-types 0.10.0", "serde", ] [[package]] name = "evm-gasometer" version = "0.30.0" -source = "git+https://github.com/aurora-is-near/sputnikvm.git?rev=01e000cbf081dada77ac6b325a6521341044d970#01e000cbf081dada77ac6b325a6521341044d970" +source = "git+https://github.com/aurora-is-near/sputnikvm.git#5ecf36ce393380a89c6f1b09ef79f686fe043624" dependencies = [ "environmental", "evm-core", "evm-runtime", - "primitive-types 0.9.0", + "primitive-types 0.10.0", ] [[package]] name = "evm-runtime" version = "0.30.0" -source = "git+https://github.com/aurora-is-near/sputnikvm.git?rev=01e000cbf081dada77ac6b325a6521341044d970#01e000cbf081dada77ac6b325a6521341044d970" +source = "git+https://github.com/aurora-is-near/sputnikvm.git#5ecf36ce393380a89c6f1b09ef79f686fe043624" dependencies = [ "environmental", "evm-core", - "primitive-types 0.9.0", + "primitive-types 0.10.0", "sha3 0.8.2", ] @@ -2064,7 +2077,7 @@ dependencies = [ "curve25519-dalek", "derive_more", "ed25519-dalek", - "ethereum-types", + "ethereum-types 0.11.0", "lazy_static", "libc", "parity-secp256k1", @@ -2371,7 +2384,7 @@ dependencies = [ "ripemd160", "serde", "sha2 0.8.2", - "sha3 0.8.2", + "sha3 0.9.1", ] [[package]] @@ -2846,6 +2859,7 @@ checksum = "e90f6931e6b3051e208a449c342246cb7c786ef300789b95619f46f1dd75d9b0" dependencies = [ "fixed-hash", "impl-codec", + "impl-rlp", "uint", ] @@ -3260,9 +3274,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.118" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" +checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" dependencies = [ "serde_derive", ] @@ -3298,9 +3312,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.118" +version = "1.0.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" +checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" dependencies = [ "proc-macro2", "quote", @@ -3527,18 +3541,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.24" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e" +checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.24" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0" +checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" dependencies = [ "proc-macro2", "quote", @@ -3657,9 +3671,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "uint" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e" +checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f" dependencies = [ "byteorder", "crunchy", diff --git a/Cargo.toml b/Cargo.toml index d5e1cf970..5a8116aad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,11 +49,11 @@ base64 = { version = "0.13.0", default-features = false, features = ["alloc"] } blake2 = { git = "https://github.com/near/near-blake2.git", version = "0.9.1", default-features = false } borsh = { version = "0.8.2", default-features = false } bn = { package = "aurora-bn", git = "https://github.com/aurora-is-near/aurora-bn.git", default-features = false } -evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "01e000cbf081dada77ac6b325a6521341044d970", default-features = false } -evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", rev = "01e000cbf081dada77ac6b325a6521341044d970", default-features = false } +evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", default-features = false } +evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", default-features = false } libsecp256k1 = { version = "0.3.5", default-features = false } num = { version = "0.4.0", default-features = false, features = ["alloc"] } -primitive-types = { version = "0.9.0", default-features = false, features = ["rlp"] } +primitive-types = { version = "0.10", default-features = false, features = ["rlp"] } ripemd160 = { version = "0.9.1", default-features = false } rlp = { version = "0.5.0", default-features = false } sha2 = { version = "0.9.3", default-features = false, optional = true } diff --git a/etc/state-migration-test/Cargo.lock b/etc/state-migration-test/Cargo.lock index 029c32bf5..f9d5fd79d 100644 --- a/etc/state-migration-test/Cargo.lock +++ b/etc/state-migration-test/Cargo.lock @@ -10,9 +10,9 @@ checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" [[package]] name = "anyhow" -version = "1.0.40" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" +checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" [[package]] name = "arrayref" @@ -259,8 +259,8 @@ dependencies = [ [[package]] name = "ethabi" -version = "13.0.0" -source = "git+https://github.com/darwinia-network/ethabi?branch=xavier-no-std#baacf174d5c2f12122c4ee3fe31506fb52069983" +version = "14.1.0" +source = "git+https://github.com/darwinia-network/ethabi?branch=xavier-no-std#09da0834d95f8b43377ca22d7b1c97a2401f4b0c" dependencies = [ "anyhow", "ethereum-types", @@ -283,12 +283,12 @@ dependencies = [ [[package]] name = "ethereum" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567ce064a8232c16e2b2c2173a936b91fbe35c2f2c5278871f5a1a31688b42e9" +checksum = "42ccff962ede8fe7c3ec53d46b8316f3c53377a701a30c0325918b38ce04a497" dependencies = [ + "bytes", "ethereum-types", - "funty", "hash-db", "hash256-std-hasher", "rlp", @@ -299,9 +299,9 @@ dependencies = [ [[package]] name = "ethereum-types" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64b5df66a228d85e4b17e5d6c6aa43b0310898ffe8a85988c4c032357aaabfd" +checksum = "0dd6bde671199089e601e8d47e153368b893ef885f11f365a3261ec58153c211" dependencies = [ "ethbloom", "fixed-hash", @@ -313,7 +313,7 @@ dependencies = [ [[package]] name = "evm" version = "0.30.1" -source = "git+https://github.com/aurora-is-near/sputnikvm.git?rev=01e000cbf081dada77ac6b325a6521341044d970#01e000cbf081dada77ac6b325a6521341044d970" +source = "git+https://github.com/aurora-is-near/sputnikvm.git#5ecf36ce393380a89c6f1b09ef79f686fe043624" dependencies = [ "ethereum", "evm-core", @@ -328,7 +328,7 @@ dependencies = [ [[package]] name = "evm-core" version = "0.30.0" -source = "git+https://github.com/aurora-is-near/sputnikvm.git?rev=01e000cbf081dada77ac6b325a6521341044d970#01e000cbf081dada77ac6b325a6521341044d970" +source = "git+https://github.com/aurora-is-near/sputnikvm.git#5ecf36ce393380a89c6f1b09ef79f686fe043624" dependencies = [ "funty", "primitive-types", @@ -337,7 +337,7 @@ dependencies = [ [[package]] name = "evm-gasometer" version = "0.30.0" -source = "git+https://github.com/aurora-is-near/sputnikvm.git?rev=01e000cbf081dada77ac6b325a6521341044d970#01e000cbf081dada77ac6b325a6521341044d970" +source = "git+https://github.com/aurora-is-near/sputnikvm.git#5ecf36ce393380a89c6f1b09ef79f686fe043624" dependencies = [ "evm-core", "evm-runtime", @@ -347,7 +347,7 @@ dependencies = [ [[package]] name = "evm-runtime" version = "0.30.0" -source = "git+https://github.com/aurora-is-near/sputnikvm.git?rev=01e000cbf081dada77ac6b325a6521341044d970#01e000cbf081dada77ac6b325a6521341044d970" +source = "git+https://github.com/aurora-is-near/sputnikvm.git#5ecf36ce393380a89c6f1b09ef79f686fe043624" dependencies = [ "evm-core", "primitive-types", @@ -623,9 +623,9 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "primitive-types" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2415937401cb030a2a0a4d922483f945fa068f52a7dbb22ce0fe5f2b6f6adace" +checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" dependencies = [ "fixed-hash", "impl-rlp", @@ -847,9 +847,9 @@ checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "uint" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11fe9a9348741cf134085ad57c249508345fe16411b3d7fb4ff2da2f1d6382e" +checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f" dependencies = [ "byteorder", "crunchy", diff --git a/src/tests/sanity.rs b/src/tests/sanity.rs index ff064f826..6808ba707 100644 --- a/src/tests/sanity.rs +++ b/src/tests/sanity.rs @@ -118,7 +118,7 @@ fn test_num_wasm_functions() { let artifact = get_compiled_artifact(&runner); let module_info = artifact.info(); let num_functions = module_info.func_assoc.len(); - assert!(num_functions <= 1281); + assert!(num_functions <= 1282); } /// Tests we can transfer Eth from one account to another and that the balances are correctly