diff --git a/Cargo.lock b/Cargo.lock index fe8a91b7ad..f58304e41d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3225,7 +3225,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "parity-scale-codec", ] @@ -3346,7 +3346,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "frame-support", "frame-support-procedural", @@ -3496,7 +3496,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "bitflags 1.3.2", "environmental", @@ -3530,7 +3530,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "Inflector", "cfg-expr", @@ -3546,7 +3546,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -3558,7 +3558,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "proc-macro2", "quote", @@ -3568,7 +3568,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "cfg-if", "frame-support", @@ -5822,9 +5822,9 @@ dependencies = [ "pallet-democracy", "pallet-erc20-xcm-bridge", "pallet-ethereum", - "pallet-ethereum-chain-id", "pallet-ethereum-xcm", "pallet-evm", + "pallet-evm-chain-id", "pallet-evm-precompile-author-mapping", "pallet-evm-precompile-balances-erc20", "pallet-evm-precompile-batch", @@ -6290,9 +6290,9 @@ dependencies = [ "pallet-democracy", "pallet-erc20-xcm-bridge", "pallet-ethereum", - "pallet-ethereum-chain-id", "pallet-ethereum-xcm", "pallet-evm", + "pallet-evm-chain-id", "pallet-evm-precompile-author-mapping", "pallet-evm-precompile-balances-erc20", "pallet-evm-precompile-batch", @@ -6404,6 +6404,7 @@ dependencies = [ "pallet-democracy", "pallet-ethereum-xcm", "pallet-evm", + "pallet-evm-chain-id", "pallet-identity", "pallet-migrations", "pallet-moonbeam-orbiters", @@ -6660,9 +6661,9 @@ dependencies = [ "pallet-democracy", "pallet-erc20-xcm-bridge", "pallet-ethereum", - "pallet-ethereum-chain-id", "pallet-ethereum-xcm", "pallet-evm", + "pallet-evm-chain-id", "pallet-evm-precompile-author-mapping", "pallet-evm-precompile-balances-erc20", "pallet-evm-precompile-batch", @@ -7892,17 +7893,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-ethereum-chain-id" -version = "1.0.0" -dependencies = [ - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "serde", -] - [[package]] name = "pallet-ethereum-xcm" version = "1.0.0-dev" @@ -7960,6 +7950,17 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-evm-chain-id" +version = "1.0.0-dev" +source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v0.9.43#a39b3011b9fb62b47931a199060c1b23926f34d8" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", +] + [[package]] name = "pallet-evm-precompile-author-mapping" version = "0.2.0" @@ -12121,7 +12122,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "log", "sp-core", @@ -12184,7 +12185,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -12199,7 +12200,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -12218,7 +12219,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -12269,7 +12270,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "fnv", "futures 0.3.28", @@ -12296,7 +12297,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "hash-db 0.16.0", "kvdb", @@ -12322,7 +12323,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "async-trait", "futures 0.3.28", @@ -12620,7 +12621,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "lru 0.8.1", "parity-scale-codec", @@ -12642,7 +12643,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -12654,7 +12655,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "anyhow", "cfg-if", @@ -12672,7 +12673,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "ansi_term", "futures 0.3.28", @@ -12688,7 +12689,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "array-bytes 4.2.0", "parking_lot 0.12.1", @@ -12702,7 +12703,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "array-bytes 4.2.0", "async-channel", @@ -12747,7 +12748,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "async-channel", "cid", @@ -12768,7 +12769,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -12815,7 +12816,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "array-bytes 4.2.0", "async-channel", @@ -12838,7 +12839,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "array-bytes 4.2.0", "async-channel", @@ -12873,7 +12874,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "array-bytes 4.2.0", "futures 0.3.28", @@ -12893,7 +12894,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "array-bytes 4.2.0", "bytes", @@ -12924,7 +12925,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "futures 0.3.28", "libp2p-identity", @@ -12949,7 +12950,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "futures 0.3.28", "jsonrpsee", @@ -12980,7 +12981,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12999,7 +13000,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "http", "jsonrpsee", @@ -13014,7 +13015,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "array-bytes 4.2.0", "futures 0.3.28", @@ -13040,7 +13041,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "async-trait", "directories", @@ -13106,7 +13107,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "log", "parity-scale-codec", @@ -13117,7 +13118,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "clap", "fs4", @@ -13152,7 +13153,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "futures 0.3.28", "libc", @@ -13171,7 +13172,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "chrono", "futures 0.3.28", @@ -13190,7 +13191,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "ansi_term", "atty", @@ -13221,7 +13222,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -13232,7 +13233,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "async-trait", "futures 0.3.28", @@ -13258,7 +13259,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "async-trait", "futures 0.3.28", @@ -13272,7 +13273,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "async-channel", "futures 0.3.28", @@ -13824,7 +13825,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "hash-db 0.16.0", "log", @@ -13844,7 +13845,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "Inflector", "blake2", @@ -13858,7 +13859,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "parity-scale-codec", "scale-info", @@ -13871,7 +13872,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "integer-sqrt", "num-traits", @@ -13898,7 +13899,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "parity-scale-codec", "sp-api", @@ -13910,7 +13911,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "futures 0.3.28", "log", @@ -13928,7 +13929,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "async-trait", "futures 0.3.28", @@ -14001,7 +14002,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "finality-grandpa", "log", @@ -14031,7 +14032,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "array-bytes 4.2.0", "bitflags 1.3.2", @@ -14075,7 +14076,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "blake2b_simd", "byteorder", @@ -14089,7 +14090,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "proc-macro2", "quote", @@ -14100,7 +14101,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -14109,7 +14110,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "proc-macro2", "quote", @@ -14119,7 +14120,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "environmental", "parity-scale-codec", @@ -14130,7 +14131,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -14145,7 +14146,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "bytes", "ed25519 1.5.3", @@ -14182,7 +14183,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "futures 0.3.28", "parity-scale-codec", @@ -14196,7 +14197,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "thiserror", "zstd 0.12.4", @@ -14205,7 +14206,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -14248,7 +14249,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "sp-api", "sp-core", @@ -14258,7 +14259,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "backtrace", "lazy_static", @@ -14268,7 +14269,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "rustc-hash", "serde", @@ -14278,7 +14279,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "either", "hash256-std-hasher", @@ -14300,7 +14301,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -14318,7 +14319,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "Inflector", "proc-macro-crate", @@ -14330,7 +14331,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "parity-scale-codec", "scale-info", @@ -14344,7 +14345,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "parity-scale-codec", "scale-info", @@ -14357,7 +14358,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "hash-db 0.16.0", "log", @@ -14377,7 +14378,7 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "log", "parity-scale-codec", @@ -14395,12 +14396,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -14428,7 +14429,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "parity-scale-codec", "sp-std", @@ -14440,7 +14441,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "sp-api", "sp-runtime", @@ -14449,7 +14450,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "async-trait", "log", @@ -14465,7 +14466,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "ahash 0.8.3", "hash-db 0.16.0", @@ -14488,7 +14489,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "impl-serde 0.4.0", "parity-scale-codec", @@ -14505,7 +14506,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -14516,7 +14517,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -14530,7 +14531,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "parity-scale-codec", "scale-info", @@ -14902,7 +14903,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#d1afa36361cdad96108aebe6e2fe8d3a429ef23d" +source = "git+https://github.com/moonbeam-foundation/substrate?branch=moonbeam-polkadot-v0.9.43#fb7885d0002f63a0919dc3e7cf071695ef5e3a6c" dependencies = [ "hyper", "log", diff --git a/Cargo.toml b/Cargo.toml index 9f3770d670..d39698a565 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,7 +64,6 @@ moonbeam-runtime-common = { path = "runtime/common", default-features = false } moonbeam-xcm-benchmarks = { path = "pallets/moonbeam-xcm-benchmarks", default-features = false } pallet-asset-manager = { path = "pallets/asset-manager", default-features = false } pallet-erc20-xcm-bridge = { path = "pallets/erc20-xcm-bridge", default-features = false } -pallet-ethereum-chain-id = { path = "pallets/ethereum-chain-id", default-features = false } pallet-ethereum-xcm = { path = "pallets/ethereum-xcm", default-features = false } pallet-evm-precompile-author-mapping = { path = "precompiles/author-mapping", default-features = false } @@ -233,6 +232,7 @@ pallet-ethereum = { git = "https://github.com/moonbeam-foundation/frontier", bra pallet-evm = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false, features = [ "forbid-evm-reentrancy", ] } +pallet-evm-chain-id = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } pallet-evm-precompile-blake2 = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } pallet-evm-precompile-bn128 = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } pallet-evm-precompile-dispatch = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v0.9.43", default-features = false } @@ -446,7 +446,7 @@ opt-level = 3 panic = "unwind" [profile.testnet] -debug = 1 # debug symbols are useful for profilers +debug = 1 # debug symbols are useful for profilers debug-assertions = true inherits = "release" overflow-checks = true diff --git a/README.md b/README.md index d84787f2a9..3f0d6ed0a6 100644 --- a/README.md +++ b/README.md @@ -179,6 +179,7 @@ From substrate: From frontier: +- _EVM Chain Id_: A place to store the chain id for each Moonbeam network - _EVM_: Encapsulates execution logic for an Ethereum Virtual Machine - _Ethereum_: Ethereum-style data encoding and access for the EVM. @@ -189,7 +190,6 @@ From cumulus: The following pallets are stored in `pallets/`. They are designed for Moonbeam's specific requirements: -- _Ethereum Chain Id_: A place to store the chain id for each Moonbeam network - _Author Inherent_: Allows block authors to include their identity in a block via an inherent - _Parachain Staking_: Minimal staking pallet that selects collators by total amount at stake diff --git a/pallets/ethereum-chain-id/Cargo.toml b/pallets/ethereum-chain-id/Cargo.toml deleted file mode 100644 index 080dfc263e..0000000000 --- a/pallets/ethereum-chain-id/Cargo.toml +++ /dev/null @@ -1,25 +0,0 @@ -[package] -name = "pallet-ethereum-chain-id" -authors = { workspace = true } -edition = "2021" -version = "1.0.0" - -[dependencies] -serde = { workspace = true, optional = true, features = [ "derive" ] } - -# Substrate -frame-support = { workspace = true } -frame-system = { workspace = true } -parity-scale-codec = { workspace = true, features = [ "derive" ] } -scale-info = { workspace = true, features = [ "derive" ] } - -[features] -default = [ "std" ] -std = [ - "frame-support/std", - "frame-system/std", - "parity-scale-codec/std", - "scale-info/std", - "serde", -] -try-runtime = [ "frame-support/try-runtime" ] diff --git a/pallets/ethereum-chain-id/src/lib.rs b/pallets/ethereum-chain-id/src/lib.rs deleted file mode 100644 index ac5d3cff57..0000000000 --- a/pallets/ethereum-chain-id/src/lib.rs +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2019-2022 PureStake Inc. -// This file is part of Moonbeam. - -// Moonbeam is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Moonbeam is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Moonbeam. If not, see . - -//! Minimal Pallet that stores the numeric Ethereum-style chain id in the runtime. - -#![cfg_attr(not(feature = "std"), no_std)] - -use frame_support::pallet; - -pub use pallet::*; - -#[pallet] -pub mod pallet { - - use frame_support::pallet_prelude::*; - - /// The Ethereum Chain Id Pallet - #[pallet::pallet] - pub struct Pallet(PhantomData); - - /// Configuration trait of this pallet. - #[pallet::config] - pub trait Config: frame_system::Config {} - - impl Get for Pallet { - fn get() -> u64 { - Self::chain_id() - } - } - - #[pallet::storage] - #[pallet::getter(fn chain_id)] - pub type ChainId = StorageValue<_, u64, ValueQuery>; - - #[pallet::genesis_config] - #[derive(Default)] - pub struct GenesisConfig { - pub chain_id: u64, - } - - #[pallet::genesis_build] - impl GenesisBuild for GenesisConfig { - fn build(&self) { - ChainId::::put(self.chain_id); - } - } -} diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index cbdfef4b22..3a79b1a177 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -58,6 +58,7 @@ fp-ethereum = { workspace = true } fp-evm = { workspace = true } pallet-base-fee = { workspace = true } pallet-evm = { workspace = true, features = [ "forbid-evm-reentrancy" ] } +pallet-evm-chain-id = { workspace = true } # Nimbus pallet-author-inherent = { workspace = true } diff --git a/runtime/moonbase/Cargo.toml b/runtime/moonbase/Cargo.toml index 0ba889e447..7464108dbf 100644 --- a/runtime/moonbase/Cargo.toml +++ b/runtime/moonbase/Cargo.toml @@ -34,7 +34,7 @@ pallet-asset-manager = { workspace = true } pallet-author-mapping = { workspace = true } pallet-crowdloan-rewards = { workspace = true } pallet-erc20-xcm-bridge = { workspace = true } -pallet-ethereum-chain-id = { workspace = true } +pallet-evm-chain-id = { workspace = true } pallet-ethereum-xcm = { workspace = true } pallet-maintenance-mode = { workspace = true, features = [ "xcm-support" ] } pallet-migrations = { workspace = true } @@ -219,7 +219,7 @@ std = [ "pallet-crowdloan-rewards/std", "pallet-democracy/std", "pallet-erc20-xcm-bridge/std", - "pallet-ethereum-chain-id/std", + "pallet-evm-chain-id/std", "pallet-ethereum-xcm/std", "pallet-ethereum/std", "pallet-evm-precompile-author-mapping/std", diff --git a/runtime/moonbase/src/lib.rs b/runtime/moonbase/src/lib.rs index 3a8eb62ce3..78f202013e 100644 --- a/runtime/moonbase/src/lib.rs +++ b/runtime/moonbase/src/lib.rs @@ -382,7 +382,7 @@ impl pallet_sudo::Config for Runtime { type WeightInfo = moonbeam_weights::pallet_sudo::WeightInfo; } -impl pallet_ethereum_chain_id::Config for Runtime {} +impl pallet_evm_chain_id::Config for Runtime {} /// Current approximation of the gas/s consumption considering /// EVM execution over compiled WASM (on 4.4Ghz CPU). @@ -1330,7 +1330,7 @@ construct_runtime! { ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Storage, Inherent, Event} = 6, TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Config, Event} = 7, ParachainInfo: parachain_info::{Pallet, Storage, Config} = 8, - EthereumChainId: pallet_ethereum_chain_id::{Pallet, Storage, Config} = 9, + EthereumChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 9, EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 10, Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 11, ParachainStaking: pallet_parachain_staking::{Pallet, Call, Storage, Event, Config} = 12, @@ -1579,9 +1579,7 @@ mod tests { // need to be Boxed. fn call_max_size() { const CALL_ALIGN: u32 = 1024; - assert!( - std::mem::size_of::>() <= CALL_ALIGN as usize - ); + assert!(std::mem::size_of::>() <= CALL_ALIGN as usize); assert!(std::mem::size_of::>() <= CALL_ALIGN as usize); assert!(std::mem::size_of::>() <= CALL_ALIGN as usize); assert!( diff --git a/runtime/moonbase/tests/common/mod.rs b/runtime/moonbase/tests/common/mod.rs index 0a9782ca1f..9129197103 100644 --- a/runtime/moonbase/tests/common/mod.rs +++ b/runtime/moonbase/tests/common/mod.rs @@ -263,8 +263,8 @@ impl ExtBuilder { .assimilate_storage(&mut t) .unwrap(); - >::assimilate_storage( - &pallet_ethereum_chain_id::GenesisConfig { + >::assimilate_storage( + &pallet_evm_chain_id::GenesisConfig { chain_id: self.chain_id, }, &mut t, diff --git a/runtime/moonbeam/Cargo.toml b/runtime/moonbeam/Cargo.toml index f0500042ab..c022269cb2 100644 --- a/runtime/moonbeam/Cargo.toml +++ b/runtime/moonbeam/Cargo.toml @@ -34,7 +34,7 @@ pallet-asset-manager = { workspace = true } pallet-author-mapping = { workspace = true } pallet-crowdloan-rewards = { workspace = true } pallet-erc20-xcm-bridge = { workspace = true } -pallet-ethereum-chain-id = { workspace = true } +pallet-evm-chain-id = { workspace = true } pallet-ethereum-xcm = { workspace = true } pallet-maintenance-mode = { workspace = true, features = [ "xcm-support" ] } pallet-migrations = { workspace = true } @@ -218,7 +218,7 @@ std = [ "pallet-crowdloan-rewards/std", "pallet-democracy/std", "pallet-erc20-xcm-bridge/std", - "pallet-ethereum-chain-id/std", + "pallet-evm-chain-id/std", "pallet-ethereum-xcm/std", "pallet-ethereum/std", "pallet-evm-precompile-author-mapping/std", diff --git a/runtime/moonbeam/src/lib.rs b/runtime/moonbeam/src/lib.rs index b0ebe68461..a4aa647fc1 100644 --- a/runtime/moonbeam/src/lib.rs +++ b/runtime/moonbeam/src/lib.rs @@ -367,7 +367,7 @@ impl pallet_transaction_payment::Config for Runtime { type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; } -impl pallet_ethereum_chain_id::Config for Runtime {} +impl pallet_evm_chain_id::Config for Runtime {} /// Current approximation of the gas/s consumption considering /// EVM execution over compiled WASM (on 4.4Ghz CPU). @@ -1359,7 +1359,7 @@ construct_runtime! { // Sudo: pallet_sudo::{Pallet, Call, Config, Storage, Event} = 40, // Ethereum compatibility. - EthereumChainId: pallet_ethereum_chain_id::{Pallet, Storage, Config} = 50, + EthereumChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 50, EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 51, Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 52, @@ -1619,9 +1619,7 @@ mod tests { // need to be Boxed. fn call_max_size() { const CALL_ALIGN: u32 = 1024; - assert!( - std::mem::size_of::>() <= CALL_ALIGN as usize - ); + assert!(std::mem::size_of::>() <= CALL_ALIGN as usize); assert!(std::mem::size_of::>() <= CALL_ALIGN as usize); assert!(std::mem::size_of::>() <= CALL_ALIGN as usize); assert!( diff --git a/runtime/moonbeam/tests/common/mod.rs b/runtime/moonbeam/tests/common/mod.rs index 30635022aa..8729105b54 100644 --- a/runtime/moonbeam/tests/common/mod.rs +++ b/runtime/moonbeam/tests/common/mod.rs @@ -274,8 +274,8 @@ impl ExtBuilder { .assimilate_storage(&mut t) .unwrap(); - >::assimilate_storage( - &pallet_ethereum_chain_id::GenesisConfig { + >::assimilate_storage( + &pallet_evm_chain_id::GenesisConfig { chain_id: self.chain_id, }, &mut t, diff --git a/runtime/moonriver/Cargo.toml b/runtime/moonriver/Cargo.toml index 5005e27082..3b0bd2d4a2 100644 --- a/runtime/moonriver/Cargo.toml +++ b/runtime/moonriver/Cargo.toml @@ -34,7 +34,7 @@ pallet-asset-manager = { workspace = true } pallet-author-mapping = { workspace = true } pallet-crowdloan-rewards = { workspace = true } pallet-erc20-xcm-bridge = { workspace = true } -pallet-ethereum-chain-id = { workspace = true } +pallet-evm-chain-id = { workspace = true } pallet-ethereum-xcm = { workspace = true } pallet-maintenance-mode = { workspace = true, features = [ "xcm-support" ] } pallet-migrations = { workspace = true } @@ -218,7 +218,7 @@ std = [ "pallet-crowdloan-rewards/std", "pallet-democracy/std", "pallet-erc20-xcm-bridge/std", - "pallet-ethereum-chain-id/std", + "pallet-evm-chain-id/std", "pallet-ethereum-xcm/std", "pallet-ethereum/std", "pallet-evm-precompile-author-mapping/std", diff --git a/runtime/moonriver/src/lib.rs b/runtime/moonriver/src/lib.rs index 45764112d8..f16d8b3b94 100644 --- a/runtime/moonriver/src/lib.rs +++ b/runtime/moonriver/src/lib.rs @@ -368,7 +368,7 @@ impl pallet_transaction_payment::Config for Runtime { type FeeMultiplierUpdate = SlowAdjustingFeeUpdate; } -impl pallet_ethereum_chain_id::Config for Runtime {} +impl pallet_evm_chain_id::Config for Runtime {} /// Current approximation of the gas/s consumption considering /// EVM execution over compiled WASM (on 4.4Ghz CPU). @@ -1367,7 +1367,7 @@ construct_runtime! { // Sudo was previously index 40 // Ethereum compatibility - EthereumChainId: pallet_ethereum_chain_id::{Pallet, Storage, Config} = 50, + EthereumChainId: pallet_evm_chain_id::{Pallet, Storage, Config} = 50, EVM: pallet_evm::{Pallet, Config, Call, Storage, Event} = 51, Ethereum: pallet_ethereum::{Pallet, Call, Storage, Event, Origin, Config} = 52, @@ -1626,9 +1626,7 @@ mod tests { // need to be Boxed. fn call_max_size() { const CALL_ALIGN: u32 = 1024; - assert!( - std::mem::size_of::>() <= CALL_ALIGN as usize - ); + assert!(std::mem::size_of::>() <= CALL_ALIGN as usize); assert!(std::mem::size_of::>() <= CALL_ALIGN as usize); assert!(std::mem::size_of::>() <= CALL_ALIGN as usize); assert!( diff --git a/runtime/moonriver/tests/common/mod.rs b/runtime/moonriver/tests/common/mod.rs index 55ef74a9e9..69d1f52459 100644 --- a/runtime/moonriver/tests/common/mod.rs +++ b/runtime/moonriver/tests/common/mod.rs @@ -275,8 +275,8 @@ impl ExtBuilder { .assimilate_storage(&mut t) .unwrap(); - >::assimilate_storage( - &pallet_ethereum_chain_id::GenesisConfig { + >::assimilate_storage( + &pallet_evm_chain_id::GenesisConfig { chain_id: self.chain_id, }, &mut t,