diff --git a/Cargo.lock b/Cargo.lock index 705137b..371a707 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -897,7 +897,7 @@ name = "binary-merkle-tree" version = "13.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#5641e185cacd79b0c6ac1263ae28613c9625e6b3" dependencies = [ - "hash-db 0.16.0", + "hash-db", "log", ] @@ -3012,24 +3012,6 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "ethereum" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a89fb87a9e103f71b903b80b670200b54cc67a07578f070681f1fffb7396fb7" -dependencies = [ - "bytes", - "ethereum-types", - "hash-db 0.15.2", - "hash256-std-hasher", - "parity-scale-codec", - "rlp", - "scale-info", - "serde", - "sha3 0.10.8", - "triehash", -] - [[package]] name = "ethereum" version = "0.15.0" @@ -3038,7 +3020,7 @@ checksum = "2e04d24d20b8ff2235cffbf242d5092de3aa45f77c5270ddbfadd2778ca13fea" dependencies = [ "bytes", "ethereum-types", - "hash-db 0.16.0", + "hash-db", "hash256-std-hasher", "parity-scale-codec", "rlp", @@ -3102,26 +3084,6 @@ dependencies = [ "pin-project-lite 0.2.14", ] -[[package]] -name = "evm" -version = "0.36.0" -source = "git+https://github.com/rust-blockchain/evm?rev=13240a8a551586fdef0b5028ed73af80b248092a#13240a8a551586fdef0b5028ed73af80b248092a" -dependencies = [ - "auto_impl", - "environmental", - "ethereum 0.14.0", - "evm-core 0.36.0", - "evm-gasometer 0.36.0", - "evm-runtime 0.36.0", - "log", - "parity-scale-codec", - "primitive-types", - "rlp", - "scale-info", - "serde", - "sha3 0.10.8", -] - [[package]] name = "evm" version = "0.41.1" @@ -3130,10 +3092,10 @@ checksum = "767f43e9630cc36cf8ff2777cbb0121b055f0d1fd6eaaa13b46a1808f0d0e7e9" dependencies = [ "auto_impl", "environmental", - "ethereum 0.15.0", - "evm-core 0.41.0", - "evm-gasometer 0.41.0", - "evm-runtime 0.41.0", + "ethereum", + "evm-core", + "evm-gasometer", + "evm-runtime", "log", "parity-scale-codec", "primitive-types", @@ -3143,17 +3105,6 @@ dependencies = [ "sha3 0.10.8", ] -[[package]] -name = "evm-core" -version = "0.36.0" -source = "git+https://github.com/rust-blockchain/evm?rev=13240a8a551586fdef0b5028ed73af80b248092a#13240a8a551586fdef0b5028ed73af80b248092a" -dependencies = [ - "parity-scale-codec", - "primitive-types", - "scale-info", - "serde", -] - [[package]] name = "evm-core" version = "0.41.0" @@ -3166,17 +3117,6 @@ dependencies = [ "serde", ] -[[package]] -name = "evm-gasometer" -version = "0.36.0" -source = "git+https://github.com/rust-blockchain/evm?rev=13240a8a551586fdef0b5028ed73af80b248092a#13240a8a551586fdef0b5028ed73af80b248092a" -dependencies = [ - "environmental", - "evm-core 0.36.0", - "evm-runtime 0.36.0", - "primitive-types", -] - [[package]] name = "evm-gasometer" version = "0.41.0" @@ -3184,23 +3124,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dc0eb591abc5cd7b05bef6a036c2bb6c66ab6c5e0c5ce94bfe377ab670b1fd7" dependencies = [ "environmental", - "evm-core 0.41.0", - "evm-runtime 0.41.0", + "evm-core", + "evm-runtime", "primitive-types", ] -[[package]] -name = "evm-runtime" -version = "0.36.0" -source = "git+https://github.com/rust-blockchain/evm?rev=13240a8a551586fdef0b5028ed73af80b248092a#13240a8a551586fdef0b5028ed73af80b248092a" -dependencies = [ - "auto_impl", - "environmental", - "evm-core 0.36.0", - "primitive-types", - "sha3 0.10.8", -] - [[package]] name = "evm-runtime" version = "0.41.0" @@ -3209,7 +3137,7 @@ checksum = "84bbe09b64ae13a29514048c1bb6fda6374ac0b4f6a1f15a443348ab88ef42cd" dependencies = [ "auto_impl", "environmental", - "evm-core 0.41.0", + "evm-core", "primitive-types", "sha3 0.10.8", ] @@ -3367,9 +3295,9 @@ name = "fc-rpc" version = "2.0.0-dev" source = "git+https://github.com/polkadot-evm/frontier?branch=polkadot-v1.9.0#f68f4c685ed0aed813dcfaac1a9f94fa33d83d5e" dependencies = [ - "ethereum 0.15.0", + "ethereum", "ethereum-types", - "evm 0.41.1", + "evm", "fc-api", "fc-mapping-sync", "fc-rpc-core", @@ -3422,7 +3350,7 @@ name = "fc-rpc-core" version = "1.1.0-dev" source = "git+https://github.com/polkadot-evm/frontier?branch=polkadot-v1.9.0#f68f4c685ed0aed813dcfaac1a9f94fa33d83d5e" dependencies = [ - "ethereum 0.15.0", + "ethereum", "ethereum-types", "jsonrpsee", "rlp", @@ -3437,7 +3365,7 @@ name = "fc-storage" version = "1.0.0-dev" source = "git+https://github.com/polkadot-evm/frontier?branch=polkadot-v1.9.0#f68f4c685ed0aed813dcfaac1a9f94fa33d83d5e" dependencies = [ - "ethereum 0.15.0", + "ethereum", "ethereum-types", "fp-rpc", "fp-storage", @@ -3622,7 +3550,7 @@ name = "fp-consensus" version = "2.0.0-dev" source = "git+https://github.com/polkadot-evm/frontier?branch=polkadot-v1.9.0#f68f4c685ed0aed813dcfaac1a9f94fa33d83d5e" dependencies = [ - "ethereum 0.15.0", + "ethereum", "parity-scale-codec", "sp-core", "sp-runtime", @@ -3634,7 +3562,7 @@ name = "fp-ethereum" version = "1.0.0-dev" source = "git+https://github.com/polkadot-evm/frontier?branch=polkadot-v1.9.0#f68f4c685ed0aed813dcfaac1a9f94fa33d83d5e" dependencies = [ - "ethereum 0.15.0", + "ethereum", "ethereum-types", "fp-evm", "frame-support", @@ -3647,7 +3575,7 @@ name = "fp-evm" version = "3.0.0-dev" source = "git+https://github.com/polkadot-evm/frontier?branch=polkadot-v1.9.0#f68f4c685ed0aed813dcfaac1a9f94fa33d83d5e" dependencies = [ - "evm 0.41.1", + "evm", "frame-support", "num_enum 0.7.2", "parity-scale-codec", @@ -3663,7 +3591,7 @@ name = "fp-rpc" version = "3.0.0-dev" source = "git+https://github.com/polkadot-evm/frontier?branch=polkadot-v1.9.0#f68f4c685ed0aed813dcfaac1a9f94fa33d83d5e" dependencies = [ - "ethereum 0.15.0", + "ethereum", "ethereum-types", "fp-evm", "parity-scale-codec", @@ -4357,12 +4285,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "hash-db" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" - [[package]] name = "hash-db" version = "0.16.0" @@ -5927,7 +5849,7 @@ version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe" dependencies = [ - "hash-db 0.16.0", + "hash-db", ] [[package]] @@ -7241,9 +7163,9 @@ name = "pallet-ethereum" version = "4.0.0-dev" source = "git+https://github.com/polkadot-evm/frontier?branch=polkadot-v1.9.0#f68f4c685ed0aed813dcfaac1a9f94fa33d83d5e" dependencies = [ - "ethereum 0.15.0", + "ethereum", "ethereum-types", - "evm 0.41.1", + "evm", "fp-consensus", "fp-ethereum", "fp-evm", @@ -7265,13 +7187,13 @@ version = "6.0.0-dev" source = "git+https://github.com/polkadot-evm/frontier?branch=polkadot-v1.9.0#f68f4c685ed0aed813dcfaac1a9f94fa33d83d5e" dependencies = [ "environmental", - "evm 0.41.1", + "evm", "fp-account", "fp-evm", "frame-benchmarking", "frame-support", "frame-system", - "hash-db 0.16.0", + "hash-db", "hex", "hex-literal 0.4.1", "impl-trait-for-tuples", @@ -7363,10 +7285,10 @@ dependencies = [ name = "pallet-evm-utility" version = "1.1.1" dependencies = [ - "ethereum 0.14.0", - "evm 0.36.0", - "evm-gasometer 0.36.0", - "evm-runtime 0.36.0", + "ethereum", + "evm", + "evm-gasometer", + "evm-runtime", "sha3 0.10.8", "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0)", ] @@ -9689,7 +9611,7 @@ name = "precompile-utils" version = "1.1.1" dependencies = [ "assert_matches", - "evm 0.36.0", + "evm", "fp-evm", "frame-support", "frame-system", @@ -11024,7 +10946,7 @@ name = "sc-client-db" version = "0.35.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#5641e185cacd79b0c6ac1263ae28613c9625e6b3" dependencies = [ - "hash-db 0.16.0", + "hash-db", "kvdb", "kvdb-memorydb", "kvdb-rocksdb", @@ -12637,7 +12559,7 @@ name = "sp-api" version = "26.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#5641e185cacd79b0c6ac1263ae28613c9625e6b3" dependencies = [ - "hash-db 0.16.0", + "hash-db", "log", "parity-scale-codec", "scale-info", @@ -12871,7 +12793,7 @@ dependencies = [ "dyn-clonable", "ed25519-zebra 3.1.0", "futures", - "hash-db 0.16.0", + "hash-db", "hash256-std-hasher", "impl-serde", "itertools 0.10.5", @@ -13285,7 +13207,7 @@ name = "sp-state-machine" version = "0.35.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#5641e185cacd79b0c6ac1263ae28613c9625e6b3" dependencies = [ - "hash-db 0.16.0", + "hash-db", "log", "parity-scale-codec", "parking_lot 0.12.3", @@ -13427,7 +13349,7 @@ version = "29.0.0" source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.9.0#5641e185cacd79b0c6ac1263ae28613c9625e6b3" dependencies = [ "ahash 0.8.11", - "hash-db 0.16.0", + "hash-db", "lazy_static", "memory-db", "nohash-hasher", @@ -14469,7 +14391,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" dependencies = [ - "hash-db 0.16.0", + "hash-db", "hashbrown 0.13.2", "log", "rustc-hex", @@ -14482,17 +14404,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b" dependencies = [ - "hash-db 0.16.0", -] - -[[package]] -name = "triehash" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1631b201eb031b563d2e85ca18ec8092508e262a3196ce9bd10a67ec87b9f5c" -dependencies = [ - "hash-db 0.15.2", - "rlp", + "hash-db", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 254a4e2..66d0475 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -117,12 +117,10 @@ pallet-vesting = { git = "https://github.com/paritytech/polkadot-sdk", default-f pallet-xc-asset-config = { path = "./pallets/xc-asset-config", default-features = false } # EVM & Ethereum -evm = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a" } -evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false } -evm-runtime = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false } -ethereum = { version = "0.14.0", default-features = false, features = [ - "with-codec", -] } +evm = { version = "0.41.1", default-features = false } +evm-gasometer = { version = "0.41.0", default-features = false } +evm-runtime = { version = "0.41.0", default-features = false } +ethereum = { version = "0.15.0", default-features = false } # Frontier pallet-base-fee = { git = "https://github.com/polkadot-evm/frontier", default-features = false, branch = "polkadot-v1.9.0" } diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index ed8e9ff..2f30e9d 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -73,7 +73,7 @@ pub fn development_config() -> ChainSpec { neuroweb_runtime::WASM_BINARY.expect("WASM binary was not build, please build it!"), Extensions { relay_chain: "rococo-local".into(), // You MUST set this to the correct network! - para_id: 2048, + para_id: 2043, }, ) .with_name("Development") @@ -106,7 +106,7 @@ pub fn development_config() -> ChainSpec { get_account_id_from_seed::("Eve//stash"), get_account_id_from_seed::("Ferdie//stash"), ], - 2048.into(), + 2043.into(), )) .build() } @@ -121,7 +121,7 @@ pub fn local_testnet_config() -> ChainSpec { neuroweb_runtime::WASM_BINARY.expect("WASM binary was not build, please build it!"), Extensions { relay_chain: "rococo-local".into(), // You MUST set this to the correct network! - para_id: 2048, + para_id: 2043, }, ) .with_name("NeuroWeb Testnet") @@ -154,7 +154,7 @@ pub fn local_testnet_config() -> ChainSpec { get_account_id_from_seed::("Eve//stash"), get_account_id_from_seed::("Ferdie//stash"), ], - 2048.into(), + 2043.into(), )) .build() } diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 1eb225b..bd26d96 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -141,7 +141,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("origintrail-parachain"), impl_name: create_runtime_str!("neuroweb"), authoring_version: 1, - spec_version: 131, + spec_version: 132, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, @@ -662,7 +662,7 @@ impl pallet_evm_accounts::Config for Runtime { } parameter_types! { - pub DefaultBaseFeePerGas: U256 = U256::from(1_000_000_000); + pub DefaultBaseFeePerGas: U256 = U256::from(16); pub DefaultElasticity: Permill = Permill::from_parts(125_000); }