From c0e82fe3d2c569067e393090010fee05f1ff5f21 Mon Sep 17 00:00:00 2001 From: Alex Won Date: Fri, 12 Jan 2024 15:05:12 +0900 Subject: [PATCH] NODE-86, deps: patch rust-evm (#35) --- Cargo.lock | 74 +++++++++++++++++++------------------- Cargo.toml | 2 +- runtime/dev/src/lib.rs | 2 +- runtime/mainnet/src/lib.rs | 2 +- runtime/testnet/src/lib.rs | 2 +- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c30de516..be478c07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2370,7 +2370,7 @@ dependencies = [ [[package]] name = "evm" version = "0.39.1" -source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" +source = "git+https://github.com/bifrost-platform/evm?branch=bifrost-polkadot-v0.9.43#e14df5ea28a431ed17a828c6c2597e0ccedfb0e7" dependencies = [ "auto_impl", "environmental", @@ -2390,7 +2390,7 @@ dependencies = [ [[package]] name = "evm-core" version = "0.39.0" -source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" +source = "git+https://github.com/bifrost-platform/evm?branch=bifrost-polkadot-v0.9.43#e14df5ea28a431ed17a828c6c2597e0ccedfb0e7" dependencies = [ "parity-scale-codec", "primitive-types", @@ -2401,7 +2401,7 @@ dependencies = [ [[package]] name = "evm-gasometer" version = "0.39.0" -source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" +source = "git+https://github.com/bifrost-platform/evm?branch=bifrost-polkadot-v0.9.43#e14df5ea28a431ed17a828c6c2597e0ccedfb0e7" dependencies = [ "environmental", "evm-core", @@ -2412,7 +2412,7 @@ dependencies = [ [[package]] name = "evm-runtime" version = "0.39.0" -source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" +source = "git+https://github.com/bifrost-platform/evm?branch=bifrost-polkadot-v0.9.43#e14df5ea28a431ed17a828c6c2597e0ccedfb0e7" dependencies = [ "auto_impl", "environmental", @@ -2424,7 +2424,7 @@ dependencies = [ [[package]] name = "evm-tracer" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum-types", "evm", @@ -2484,7 +2484,7 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "async-trait", "fp-consensus", @@ -2500,7 +2500,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "async-trait", "ethereum", @@ -2530,7 +2530,7 @@ dependencies = [ [[package]] name = "fc-evm-tracing" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum-types", "fp-rpc-debug", @@ -2545,7 +2545,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "fc-db", "fc-storage", @@ -2568,7 +2568,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum", "ethereum-types", @@ -2618,7 +2618,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum", "ethereum-types", @@ -2631,7 +2631,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-debug" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum-types", "fc-evm-tracing", @@ -2646,7 +2646,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-trace" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum-types", "fc-evm-tracing", @@ -2660,7 +2660,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-txpool" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum", "ethereum-types", @@ -2673,7 +2673,7 @@ dependencies = [ [[package]] name = "fc-rpc-core-types" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum-types", "serde", @@ -2683,7 +2683,7 @@ dependencies = [ [[package]] name = "fc-rpc-debug" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum", "ethereum-types", @@ -2713,7 +2713,7 @@ dependencies = [ [[package]] name = "fc-rpc-trace" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum", "ethereum-types", @@ -2749,7 +2749,7 @@ dependencies = [ [[package]] name = "fc-rpc-txpool" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum-types", "fc-rpc", @@ -2772,7 +2772,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum", "ethereum-types", @@ -2940,7 +2940,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "hex", "impl-serde 0.4.0", @@ -2959,7 +2959,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum", "parity-scale-codec", @@ -2971,7 +2971,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum", "ethereum-types", @@ -2985,7 +2985,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "evm", "frame-support", @@ -3000,7 +3000,7 @@ dependencies = [ [[package]] name = "fp-ext" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum-types", "fp-rpc-evm-tracing-events", @@ -3013,7 +3013,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum", "ethereum-types", @@ -3030,7 +3030,7 @@ dependencies = [ [[package]] name = "fp-rpc-debug" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "environmental", "ethereum", @@ -3048,7 +3048,7 @@ dependencies = [ [[package]] name = "fp-rpc-evm-tracing-events" version = "0.1.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "environmental", "ethereum", @@ -3063,7 +3063,7 @@ dependencies = [ [[package]] name = "fp-rpc-txpool" version = "0.6.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum", "parity-scale-codec", @@ -3077,7 +3077,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "frame-support", "parity-scale-codec", @@ -3089,7 +3089,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "parity-scale-codec", "serde", @@ -5619,7 +5619,7 @@ dependencies = [ [[package]] name = "pallet-base-fee" version = "1.0.0" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "fp-evm", "frame-support", @@ -5736,7 +5736,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "ethereum", "ethereum-types", @@ -5759,7 +5759,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "environmental", "evm", @@ -5783,7 +5783,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "fp-evm", ] @@ -5791,7 +5791,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "fp-evm", "sp-core", @@ -5801,7 +5801,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "fp-evm", "num", @@ -5810,7 +5810,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#67136c7cfa87e48504991fa502e37673630f5595" +source = "git+https://github.com/bifrost-platform/bifrost-frontier?branch=bifrost-polkadot-v0.9.43#cbf62427847d400525e100ee6c07fbfd2c97ec52" dependencies = [ "fp-evm", "ripemd", diff --git a/Cargo.toml b/Cargo.toml index 743c63d6..102e3339 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ parity-scale-codec = { version = "3.2.2", default-features = false, features = [ scale-info = { version = "2.0", default-features = false, features = [ "derive", ] } -evm = { git = "https://github.com/rust-blockchain/evm", rev = "b7b82c7e1fc57b7449d6dfa6826600de37cc1e65", default-features = false } +evm = { git = "https://github.com/bifrost-platform/evm", default-features = false, branch = "bifrost-polkadot-v0.9.43" } environmental = { version = "1.1.2", default-features = false } clap = { version = "4.0.9", features = ["derive"] } hex = { version = "0.4.3", default-features = false } diff --git a/runtime/dev/src/lib.rs b/runtime/dev/src/lib.rs index 984762e2..c72e4940 100644 --- a/runtime/dev/src/lib.rs +++ b/runtime/dev/src/lib.rs @@ -140,7 +140,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // The version of the authorship interface. authoring_version: 1, // The version of the runtime spec. - spec_version: 305, + spec_version: 306, // The version of the implementation of the spec. impl_version: 1, // A list of supported runtime APIs along with their versions. diff --git a/runtime/mainnet/src/lib.rs b/runtime/mainnet/src/lib.rs index ee238391..d5075f39 100644 --- a/runtime/mainnet/src/lib.rs +++ b/runtime/mainnet/src/lib.rs @@ -141,7 +141,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // The version of the authorship interface. authoring_version: 1, // The version of the runtime spec. - spec_version: 2018, + spec_version: 2019, // The version of the implementation of the spec. impl_version: 1, // A list of supported runtime APIs along with their versions. diff --git a/runtime/testnet/src/lib.rs b/runtime/testnet/src/lib.rs index ae8e501d..64dd1e38 100644 --- a/runtime/testnet/src/lib.rs +++ b/runtime/testnet/src/lib.rs @@ -141,7 +141,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // The version of the authorship interface. authoring_version: 1, // The version of the runtime spec. - spec_version: 461, + spec_version: 462, // The version of the implementation of the spec. impl_version: 1, // A list of supported runtime APIs along with their versions.