From 18b97f1a6c8265319b214e25186af7ccd3060dee Mon Sep 17 00:00:00 2001 From: Rodrigo Quelhas Date: Mon, 4 Mar 2024 23:00:15 +0000 Subject: [PATCH] remove evm dependency patch --- Cargo.lock | 48 ++++++++++++++++++++++++------------------------ Cargo.toml | 3 --- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 65728a37f5..b9ac7f90d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3335,7 +3335,7 @@ dependencies = [ [[package]] name = "fc-api" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "async-trait", "fp-storage", @@ -3347,7 +3347,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "async-trait", "fp-consensus", @@ -3363,7 +3363,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "async-trait", "ethereum", @@ -3394,7 +3394,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "fc-db", "fc-storage", @@ -3417,7 +3417,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "ethereum", "ethereum-types", @@ -3472,7 +3472,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "ethereum", "ethereum-types", @@ -3487,7 +3487,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "ethereum", "ethereum-types", @@ -3682,7 +3682,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "hex", "impl-serde 0.4.0", @@ -3701,7 +3701,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "ethereum", "parity-scale-codec", @@ -3713,7 +3713,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "ethereum", "ethereum-types", @@ -3726,7 +3726,7 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "evm", "frame-support", @@ -3742,7 +3742,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "ethereum", "ethereum-types", @@ -3759,7 +3759,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "frame-support", "parity-scale-codec", @@ -3771,7 +3771,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "parity-scale-codec", "serde", @@ -7750,7 +7750,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", "syn 2.0.52", @@ -8500,7 +8500,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "environmental", "ethereum", @@ -8556,7 +8556,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "environmental", "evm", @@ -8582,7 +8582,7 @@ dependencies = [ [[package]] name = "pallet-evm-chain-id" version = "1.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "frame-support", "frame-system", @@ -8676,7 +8676,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-blake2" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "fp-evm", ] @@ -8684,7 +8684,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-bn128" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "fp-evm", "sp-core", @@ -8814,7 +8814,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-dispatch" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "fp-evm", "frame-support", @@ -8863,7 +8863,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "fp-evm", "num", @@ -9096,7 +9096,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-sha3fips" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "fp-evm", "tiny-keccak", @@ -9105,7 +9105,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#f221195780ea25226966d4a00e76cd89ece519d8" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.0#e8861faad8e39492fdaf6e9cf957cee1477b5386" dependencies = [ "fp-evm", "ripemd", diff --git a/Cargo.toml b/Cargo.toml index 89af9929b1..94063c7a88 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -470,6 +470,3 @@ debug = 1 # debug symbols are useful for profilers debug-assertions = true # Enable debug-assert! for non-production profiles inherits = "release" overflow-checks = true - -[patch.crates-io] -evm = { git = "https://github.com/moonbeam-foundation/evm", branch = "moonbeam-polkadot-v1.7.0", default-features = false }