Add evm rent burn and estimate and update runtime version

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chainx"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 description = "Fully Decentralized Interchain Crypto Asset Management on Polkadot"

cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chainx-cli"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 description = "Implementation of protocol https://chainx.org in Rust based on the Substrate framework."
 edition = "2021"

client/rpc/finality/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "bevm-finality-rpc"
 description = "An experimental RPC to check for block and transaction finality in the bevm chain"
-version = "5.2.2"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

executor/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chainx-executor"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

primitives/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chainx-primitives"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

primitives/assets-registrar/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xp-assets-registrar"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

primitives/gateway/bitcoin/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xp-gateway-bitcoin"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

primitives/gateway/common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xp-gateway-common"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

primitives/genesis-builder/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xp-genesis-builder"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

primitives/io/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xp-io"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

primitives/mining/common/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xp-mining-common"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

primitives/mining/staking/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xp-mining-staking"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

primitives/protocol/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xp-protocol"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

primitives/rpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xp-rpc"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

primitives/runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xp-runtime"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

rpc/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chainx-rpc"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 

runtime/chainx/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "chainx-runtime"
-version = "5.2.3"
+version = "5.2.4"
 authors = ["The ChainX Authors"]
 edition = "2021"
 
@@ -102,6 +102,8 @@ xpallet-btc-ledger-runtime-api = { path = "../../xpallets/btc-ledger/rpc/runtime
 pallet-evm = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18-btc-fix2", default-features = false, features = ["chainx-adaptor"] }
 pallet-ethereum = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18-btc-fix2", default-features = false }
 pallet-base-fee = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18-btc-fix2", default-features = false }
+pallet-evm-rent = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18-btc-fix2", default-features = false }
+
 xpallet-ethereum-chain-id = { path = "../../xpallets/ethereum-chain-id", default-features = false }
 xpallet-assets-bridge = { path = "../../xpallets/assets-bridge", default-features = false }
 
@@ -116,6 +118,7 @@ pallet-evm-precompile-blake2 = { git = "https://github.com/chainx-org/frontier",
 # ETH API
 fp-rpc = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18-btc-fix2", default-features = false }
 fp-self-contained = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18-btc-fix2", default-features = false }
+fp-rent = { git = "https://github.com/chainx-org/frontier", branch = "polkadot-v0.9.18-btc-fix2", default-features = false }
 
 [build-dependencies]
 substrate-wasm-builder = { git = "https://github.com/chainx-org/substrate", branch = "polkadot-v0.9.18-fix2" }
@@ -206,11 +209,13 @@ std = [
   "pallet-evm/std",
   "pallet-ethereum/std",
   "pallet-base-fee/std",
+  "pallet-evm-rent/std",
   "xpallet-ethereum-chain-id/std",
   "xpallet-assets-bridge/std",
   "fp-evm/std",
   "fp-rpc/std",
   "fp-self-contained/std",
+  "fp-rent/std",
 ]
 runtime-benchmarks = [
   "hex-literal",

runtime/chainx/src/lib.rs

@@ -125,7 +125,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("chainx"),
     impl_name: create_runtime_str!("chainx-net"),
     authoring_version: 1,
-    spec_version: 35,
+    spec_version: 36,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 8,
@@ -688,7 +688,7 @@ parameter_types! {
     pub const VotingBond: Balance = DOLLARS;
     pub const TermDuration: BlockNumber = DAYS;
     pub const DesiredMembers: u32 = 6;
-    pub const DesiredRunnersUp: u32 = 0;
+    pub const DesiredRunnersUp: u32 = 3;
     pub const ElectionsPhragmenPalletId: LockIdentifier = *b"pcx/phre";
 }
 
@@ -1159,6 +1159,7 @@ impl pallet_evm::Config for Runtime {
     type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter<XBtcLedger, DealWithBTCFees>;
     type BlockGasLimit = BlockGasLimit;
     type FindAuthor = ();
+    type EvmRentCalculator = EvmRent;
     type WeightInfo = pallet_evm::weights::SubstrateWeight<Self>;
 }
 
@@ -1203,6 +1204,12 @@ impl xpallet_assets_bridge::Config for Runtime {
     type ClaimBond = ClaimBond;
 }
 
+impl pallet_evm_rent::Config for Runtime {
+    type Event = Event;
+    type CouncilOrigin =
+        pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 2, 3>;
+}
+
 construct_runtime!(
     pub enum Runtime where
         Block = Block,
@@ -1281,6 +1288,7 @@ construct_runtime!(
         XAssetsBridge: xpallet_assets_bridge::{Pallet, Call, Storage, Config<T>, Event<T>} = 45,
 
         XBtcLedger: xpallet_btc_ledger::{Pallet, Call, Storage, Config<T>, Event<T>} = 46,
+        EvmRent: pallet_evm_rent::{Pallet, Call, Storage, Event<T>} = 47,
     }
 );
 
@@ -1322,25 +1330,8 @@ pub type Executive = frame_executive::Executive<
     frame_system::ChainContext<Runtime>,
     Runtime,
     AllPalletsWithSystem,
-    AssetsBridgeMigration,
 >;
 
-pub struct AssetsBridgeMigration;
-impl OnRuntimeUpgrade for AssetsBridgeMigration {
-    fn on_runtime_upgrade() -> Weight {
-        use frame_support::storage::migration;
-
-        frame_support::log::info!("🔍️ AssetsBridgeMigration start");
-
-        // Remove the storage value `HotAccount` from  pallet `XAssetsBridge`
-        migration::remove_storage_prefix(b"XAssetsBridge", b"HotAccount", b"");
-
-        frame_support::log::info!("🚀 AssetsBridgeMigration end");
-
-        <Runtime as frame_system::Config>::DbWeight::get().writes(1)
-    }
-}
-
 pub struct TransactionConverter;
 impl fp_rpc::ConvertTransaction<UncheckedExtrinsic> for TransactionConverter {
     fn convert_transaction(&self, transaction: pallet_ethereum::Transaction) -> UncheckedExtrinsic {

runtime/chainx/src/precompiles.rs

@@ -40,7 +40,8 @@ impl<R> PrecompileSet for ChainXPrecompiles<R>
 where
     R: xpallet_assets_bridge::Config
         + xpallet_gateway_common::Config
-        + xpallet_gateway_records::Config,
+        + xpallet_gateway_records::Config
+        + pallet_evm_rent::Config,
     Dispatch<R>: Precompile,
 {
     fn execute(