update build, fix fmt and tomls

evm-template/Cargo.toml

@@ -1,21 +1,21 @@
 [workspace]
-members = ["node", "runtime", "template-fuzzer"]
+members = [ "node", "runtime", "template-fuzzer" ]
 resolver = "2"
 
 [workspace.package]
-authors = ["OpenZeppelin"]
+authors = [ "OpenZeppelin" ]
 description = "EVM Runtime template for Polkadot Para{chains, cores}"
 edition = "2021"
 license = "GPL-3.0-only"
 repository = "https://github.com/OpenZeppelin/polkadot-runtime-templates"
 
 [workspace.dependencies]
-clap = { version = "4.5.3", features = ["derive"] }
+clap = { version = "4.5.3", features = [ "derive" ] }
 color-print = "0.3.4"
 futures = "0.3.30"
 hex = "0.4.3"
 hex-literal = "0.4.1"
-jsonrpsee = { version = "0.23.2", features = ["server"] }
+jsonrpsee = { version = "0.23.2", features = [ "server" ] }
 log = { version = "0.4.21", default-features = false }
 parity-scale-codec = { version = "3.6.12", default-features = false, features = [
 	"derive",

evm-template/runtime/Cargo.toml

@@ -11,14 +11,14 @@ version = "1.0.0"
 targets = [ "x86_64-unknown-linux-gnu" ]
 
 [dependencies]
-openzeppelin-procedural = {workspace = true}
 hex-literal = { workspace = true, optional = true }
 log = { workspace = true }
 parity-scale-codec = { workspace = true, features = [ "derive" ] }
 scale-info = { workspace = true, features = [ "derive" ] }
 smallvec = { workspace = true }
 
 openzeppelin-polkadot-wrappers = { workspace = true }
+openzeppelin-procedural = { workspace = true }
 
 # Substrate
 frame-benchmarking = { workspace = true, optional = true }

evm-template/runtime/src/lib.rs

@@ -24,9 +24,7 @@ use sp_core::H160;
 pub use sp_runtime::BuildStorage;
 use sp_runtime::{
     impl_opaque_keys,
-    traits::{
-        DispatchInfoOf, Dispatchable, Get, PostDispatchInfoOf, UniqueSaturatedInto,
-    },
+    traits::{DispatchInfoOf, Dispatchable, Get, PostDispatchInfoOf, UniqueSaturatedInto},
     transaction_validity::{TransactionValidity, TransactionValidityError},
 };
 pub use sp_runtime::{MultiAddress, Perbill, Permill};
@@ -45,11 +43,20 @@ pub use crate::{
         AccountId, Balance, Block, BlockNumber, Executive, Nonce, Signature, UncheckedExtrinsic,
     },
 };
+#[cfg(feature = "runtime-benchmarks")]
+use crate::{
+    configs::{
+        asset_config::AssetType, xcm_config::RelayLocation, FeeAssetId, TransactionByteFee,
+        XcmExecutorConfig,
+    },
+    constants::currency::{CENTS, EXISTENTIAL_DEPOSIT},
+    types::{Address, AssetId},
+};
 #[cfg(feature = "async-backing")]
 use crate::{constants::SLOT_DURATION, types::ConsensusHook};
 
 #[cfg(feature = "runtime-benchmarks")]
-use crate::{types::{RelayLocation, FeeAssetId, TransactionByteFee, AssetId, Address}, configs::{ExistentialDeposit, AssetType, xcm_config::XcmConfig}, constants::currency::CENTS};
+type ExistentialDeposit = sp_core::ConstU128<EXISTENTIAL_DEPOSIT>;
 
 impl fp_self_contained::SelfContainedCall for RuntimeCall {
     type SignedInfo = H160;
@@ -212,7 +219,7 @@ mod apis {
     mod evm {
         type RuntimeCall = RuntimeCall;
         type Executive = Executive;
-        type Ethereum = Ethereum; 
+        type Ethereum = Ethereum;
     }
 
     #[abstraction]
@@ -257,12 +264,13 @@ mod apis {
         type System = System;
         type ExistentialDeposit = ExistentialDeposit;
         type AssetId = AssetId;
-        type XCMConfig = XcmConfig;
+        type XCMConfig = XcmExecutorConfig;
         type AccountId = AccountId;
         type Cents = CENTS;
         type FeeAssetId = FeeAssetId;
         type TransactionByteFee = TransactionByteFee;
         type Address = Address;
+        type Balances = Balances;
     }
 }
 

generic-template/Cargo.toml

@@ -1,20 +1,20 @@
 [workspace]
-members = ["node", "runtime", "template-fuzzer"]
+members = [ "node", "runtime", "template-fuzzer" ]
 resolver = "2"
 
 [workspace.package]
-authors = ["OpenZeppelin"]
+authors = [ "OpenZeppelin" ]
 description = "Generic runtime template for Polkadot Para{chains, cores}"
 edition = "2021"
 license = "GPL-3.0-only"
 repository = "https://github.com/OpenZeppelin/polkadot-runtime-templates"
 
 [workspace.dependencies]
-clap = { version = "4.5.3", features = ["derive"] }
+clap = { version = "4.5.3", features = [ "derive" ] }
 color-print = "0.3.4"
 futures = "0.3.30"
 hex-literal = "0.4.1"
-jsonrpsee = { version = "0.23.2", features = ["server"] }
+jsonrpsee = { version = "0.23.2", features = [ "server" ] }
 log = { version = "0.4.21", default-features = false }
 parity-scale-codec = { version = "3.6.12", default-features = false, features = [
 	"derive",

generic-template/runtime/Cargo.toml

@@ -8,13 +8,13 @@ repository = { workspace = true }
 version = "2.0.0"
 
 [package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+targets = [ "x86_64-unknown-linux-gnu" ]
 
 [dependencies]
 hex-literal = { workspace = true, optional = true }
 log = { workspace = true }
-parity-scale-codec = { workspace = true, features = ["derive"] }
-scale-info = { workspace = true, features = ["derive"] }
+parity-scale-codec = { workspace = true, features = [ "derive" ] }
+scale-info = { workspace = true, features = [ "derive" ] }
 smallvec = { workspace = true }
 
 openzeppelin-polkadot-wrappers = { workspace = true }
@@ -254,10 +254,10 @@ try-runtime = [
 # A feature that should be enabled when the runtime should be built for on-chain
 # deployment. This will disable stuff that shouldn't be part of the on-chain wasm
 # to make it smaller, like logging for example.
-on-chain-release-build = ["sp-api/disable-logging"]
+on-chain-release-build = [ "sp-api/disable-logging" ]
 
-async-backing = ["openzeppelin-procedural/async-backing"]
+async-backing = [ "openzeppelin-procedural/async-backing" ]
 
-default = ["std"]
+default = [ "std" ]
 
-metadata-hash = ["substrate-wasm-builder/metadata-hash"]
+metadata-hash = [ "substrate-wasm-builder/metadata-hash" ]

generic-template/runtime/src/apis.rs

@@ -1,19 +1,20 @@
+use openzeppelin_procedural::openzeppelin_runtime_apis;
+
+#[cfg(feature = "runtime-benchmarks")]
+use crate::constants::currency::{CENTS, EXISTENTIAL_DEPOSIT};
 #[cfg(not(feature = "async-backing"))]
 use crate::Aura;
 #[cfg(feature = "async-backing")]
 use crate::{constants::SLOT_DURATION, types::ConsensusHook};
-#[cfg(feature = "runtime-benchmarks")]
-use crate::{
-    constants::currency::CENTS, configs::xcm_config::XcmConfig, Address
-};
 use crate::{
     constants::VERSION,
     types::{AccountId, Balance, Block, Executive, Nonce},
-    InherentDataExt, ParachainSystem, Runtime, RuntimeCall, RuntimeGenesisConfig, SessionKeys,
-    System, TransactionPayment, RuntimeBlockWeights
+    InherentDataExt, ParachainSystem, Runtime, RuntimeBlockWeights, RuntimeCall,
+    RuntimeGenesisConfig, SessionKeys, System, TransactionPayment,
 };
 
-use openzeppelin_procedural::openzeppelin_runtime_apis;
+#[cfg(feature = "runtime-benchmarks")]
+type ExistentialDeposit = sp_core::ConstU128<EXISTENTIAL_DEPOSIT>;
 
 #[openzeppelin_runtime_apis]
 mod apis {
@@ -52,6 +53,8 @@ mod apis {
 
     #[abstraction]
     mod benchmarks {
+        use crate::configs::XcmExecutorConfig;
+
         type AllPalletsWithSystem = AllPalletsWithSystem;
         type Assets = Assets;
         type AssetManager = AssetManager;
@@ -62,11 +65,12 @@ mod apis {
         type System = System;
         type ExistentialDeposit = ExistentialDeposit;
         type AssetId = AssetId;
-        type XCMConfig = XcmConfig;
+        type XCMConfig = XcmExecutorConfig;
         type AccountId = AccountId;
         type Cents = CENTS;
         type FeeAssetId = FeeAssetId;
         type TransactionByteFee = TransactionByteFee;
         type Address = Address;
+        type Balances = Balances;
     }
 }

generic-template/runtime/src/configs/xcm_config.rs

@@ -395,7 +395,9 @@ mod testing {
     /// AssetManager::set_asset_type_asset_id() and should NOT be used in any production code.
     impl From<Location> for CurrencyId {
         fn from(location: Location) -> CurrencyId {
-            use xcm_primitives::AssetTypeGetter;
+            use xcm_primitives::{AsAssetType, AssetTypeGetter};
+
+            use crate::{configs::asset_config::AssetType, AssetManager};
 
             // If it does not exist, for benchmarking purposes, we create the association
             let asset_id = if let Some(asset_id) =