From 634813aed69e694c3b2dde97d32f670e6965a1b7 Mon Sep 17 00:00:00 2001 From: Jeeyong Um Date: Sun, 2 Feb 2025 14:28:32 +0900 Subject: [PATCH] build(deps): Switch back Polkadot SDK to git repository versions (#130) * build(deps): Switch back Polkadot SDK to git repository versions * fix: Remove SuicideQuickClearLimit from pallet-evm configs --- Cargo.toml | 60 +++++++++---------- .../precompiles/assets-erc20/Cargo.toml | 8 +-- .../precompiles/assets-erc20/src/mock.rs | 1 - .../precompiles/balances-erc20/Cargo.toml | 8 +-- .../precompiles/balances-erc20/src/mock.rs | 1 - 5 files changed, 38 insertions(+), 40 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 727238f..18465ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -157,38 +157,38 @@ wasmi-validation = { version = "0.5.0", default-features = false } wat = "1.0" # substrate -sc-client-api = { version = "37.0.0" } -sc-consensus = { version = "0.44.0" } -frame-support = { version = "38.2.0", default-features = false } -frame-system = { version = "38.0.0", default-features = false } -pallet-assets = { version = "40.0.0", default-features = false } -pallet-balances = { version = "39.0.0", default-features = false } -pallet-sudo = { version = "38.0.0", default-features = false } -pallet-timestamp = { version = "37.0.0", default-features = false } -pallet-transaction-payment = { version = "38.0.2", default-features = false } -sc-transaction-pool-api = { version = "37.0.0" } -sp-api = { version = "34.0.0", default-features = false } -sp-arithmetic = { version = "26.0.0", default-features = false } -sp-block-builder = { version = "34.0.0", default-features = false } -sp-blockchain = { version = "37.0.1" } -sp-consensus = { version = "0.40.0", default-features = false } -sp-core = { version = "34.0.0", default-features = false } -sp-inherents = { version = "34.0.0", default-features = false } -sp-io = { version = "38.0.0", default-features = false } -sp-keyring = { version = "39.0.0", default-features = false } -sp-runtime = { version = "39.0.5", default-features = false } -substrate-prometheus-endpoint = { version = "0.17.0", default-features = false } +sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409" } +sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } +substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2409", default-features = false } # frontier -fp-evm = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } -fp-self-contained = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } -pallet-ethereum = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } -pallet-evm = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } -pallet-evm-precompile-blake2 = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } -pallet-evm-precompile-bn128 = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } -pallet-evm-precompile-modexp = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } -pallet-evm-precompile-simple = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } -precompile-utils = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } +fp-evm = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } +fp-self-contained = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } +pallet-ethereum = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } +pallet-evm = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } +pallet-evm-precompile-blake2 = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } +pallet-evm-precompile-bn128 = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } +pallet-evm-precompile-modexp = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } +pallet-evm-precompile-simple = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } +precompile-utils = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } # noir cosmos-rpc = { path = "frame/cosmos/rpc", default-features = false } diff --git a/vendor/moonbeam/precompiles/assets-erc20/Cargo.toml b/vendor/moonbeam/precompiles/assets-erc20/Cargo.toml index f4ded7f..b726874 100644 --- a/vendor/moonbeam/precompiles/assets-erc20/Cargo.toml +++ b/vendor/moonbeam/precompiles/assets-erc20/Cargo.toml @@ -23,9 +23,9 @@ sp-io = { workspace = true } sp-runtime = { workspace = true } # Frontier -fp-evm = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } -pallet-evm = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false, features = ["forbid-evm-reentrancy"] } -precompile-utils = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } +fp-evm = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } +pallet-evm = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false, features = ["forbid-evm-reentrancy"] } +precompile-utils = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } # Moonkit #moonkit-xcm-primitives = { workspace = true } @@ -37,7 +37,7 @@ serde = { workspace = true, default-features = true } sha3 = { workspace = true, default-features = true } # Moonbeam -precompile-utils = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", features = ["testing"] } +precompile-utils = { git = "https://github.com/noirhq/frontier", branch = "stable2409", features = ["testing"] } [features] default = ["std"] diff --git a/vendor/moonbeam/precompiles/assets-erc20/src/mock.rs b/vendor/moonbeam/precompiles/assets-erc20/src/mock.rs index 089e0b9..86d8883 100644 --- a/vendor/moonbeam/precompiles/assets-erc20/src/mock.rs +++ b/vendor/moonbeam/precompiles/assets-erc20/src/mock.rs @@ -188,7 +188,6 @@ impl pallet_evm::Config for Runtime { type FindAuthor = (); type OnCreate = (); type GasLimitPovSizeRatio = GasLimitPovSizeRatio; - type SuicideQuickClearLimit = ConstU32<0>; type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio; type Timestamp = Timestamp; type WeightInfo = pallet_evm::weights::SubstrateWeight; diff --git a/vendor/moonbeam/precompiles/balances-erc20/Cargo.toml b/vendor/moonbeam/precompiles/balances-erc20/Cargo.toml index 46a8ce8..d43df86 100644 --- a/vendor/moonbeam/precompiles/balances-erc20/Cargo.toml +++ b/vendor/moonbeam/precompiles/balances-erc20/Cargo.toml @@ -22,9 +22,9 @@ sp-io = { workspace = true } sp-runtime = { workspace = true } # Frontier -fp-evm = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } -pallet-evm = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false, features = ["forbid-evm-reentrancy"] } -precompile-utils = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", default-features = false } +fp-evm = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } +pallet-evm = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false, features = ["forbid-evm-reentrancy"] } +precompile-utils = { git = "https://github.com/noirhq/frontier", branch = "stable2409", default-features = false } [dev-dependencies] hex-literal = { workspace = true } @@ -33,7 +33,7 @@ serde = { workspace = true, default-features = true } sha3 = { workspace = true, default-features = true } # Moonbeam -precompile-utils = { git = "https://github.com/noirhq/frontier", branch = "crates.io/stable2409", features = ["testing"] } +precompile-utils = { git = "https://github.com/noirhq/frontier", branch = "stable2409", features = ["testing"] } scale-info = { workspace = true, default-features = true, features = ["derive"] } diff --git a/vendor/moonbeam/precompiles/balances-erc20/src/mock.rs b/vendor/moonbeam/precompiles/balances-erc20/src/mock.rs index 6a67abf..0facb04 100644 --- a/vendor/moonbeam/precompiles/balances-erc20/src/mock.rs +++ b/vendor/moonbeam/precompiles/balances-erc20/src/mock.rs @@ -141,7 +141,6 @@ impl pallet_evm::Config for Runtime { type FindAuthor = (); type OnCreate = (); type GasLimitPovSizeRatio = GasLimitPovSizeRatio; - type SuicideQuickClearLimit = ConstU32<0>; type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio; type Timestamp = Timestamp; type WeightInfo = pallet_evm::weights::SubstrateWeight;