Update and companions

core/primitives/Cargo.toml

@@ -11,7 +11,7 @@ version.workspace = true
 dc-types = { workspace = true }
 
 # moonbeam
-account = { workspace = true }
+fp-account = { workspace = true }
 
 # substrate
 sp-core    = { workspace = true }
@@ -20,8 +20,8 @@ sp-runtime = { workspace = true }
 [features]
 default = ["std"]
 std = [
-	# moonbeam
-	"account/std",
+	# frontier
+	"fp-account/std",
 
 	# substrate
 	"sp-core/std",

core/primitives/src/lib.rs

@@ -31,7 +31,7 @@
 pub use dc_types::*;
 
 /// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
-pub type Signature = account::EthereumSignature;
+pub type Signature = fp_account::EthereumSignature;
 
 /// Some way of identifying an account on the chain.
 /// We intentionally make it equivalent to the public key of our transaction signing scheme.

pallet/deposit/src/lib.rs

@@ -139,7 +139,6 @@ pub mod pallet {
 		StorageMap<_, Blake2_128Concat, T::AccountId, BoundedVec<Deposit, T::MaxDeposits>>;
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {

pallet/staking/src/lib.rs

@@ -276,7 +276,6 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(PhantomData<T>);
 	#[pallet::hooks]
 	impl<T: Config> Hooks<T::BlockNumber> for Pallet<T> {

runtime/common/Cargo.toml

@@ -19,11 +19,9 @@ dc-primitives              = { workspace = true }
 bp-darwinia-core = { workspace = true }
 
 # frontier
+fp-account = { workspace = true }
 pallet-evm = { workspace = true }
 
-# moonbeam
-account = { workspace = true }
-
 # polkadot
 xcm          = { workspace = true }
 xcm-builder  = { workspace = true }
@@ -55,11 +53,9 @@ std = [
 	"bp-darwinia-core/std",
 
 	# frontier
+	"fp-account/std",
 	"pallet-evm/std",
 
-	# moonbeam
-	"account/std",
-
 	# polkadot
 	"xcm/std",
 	"xcm-builder/std",
@@ -82,5 +78,5 @@ std = [
 test = []
 
 runtime-benchmarks = [
-	"pallet-assets/runtime-benchmarks"
+	"pallet-assets/runtime-benchmarks",
 ]

runtime/common/src/gov_origin.rs

@@ -19,7 +19,7 @@
 // darwinia
 use dc_primitives::AccountId;
 // moonbeam
-use account::AccountId20;
+use fp_account::AccountId20;
 // substrate
 use frame_support::traits::EitherOfDiverse;
 use frame_system::EnsureRoot;

runtime/crab/src/bridges_message/darwinia.rs

@@ -119,16 +119,17 @@ impl BridgedChainWithMessages for Darwinia {
 impl TargetHeaderChain<ToDarwiniaMessagePayload, <Self as ChainWithMessages>::AccountId>
 	for Darwinia
 {
-	type Error = &'static str;
 	type MessagesDeliveryProof = ToDarwiniaMessagesDeliveryProof;
 
-	fn verify_message(payload: &ToDarwiniaMessagePayload) -> Result<(), Self::Error> {
+	fn verify_message(
+		payload: &ToDarwiniaMessagePayload,
+	) -> Result<(), bp_messages::VerificationError> {
 		source::verify_chain_message::<WithDarwiniaMessageBridge>(payload)
 	}
 
 	fn verify_messages_delivery_proof(
 		proof: Self::MessagesDeliveryProof,
-	) -> Result<(LaneId, InboundLaneData<bp_darwinia::AccountId>), Self::Error> {
+	) -> Result<(LaneId, InboundLaneData<bp_darwinia::AccountId>), bp_messages::VerificationError> {
 		source::verify_messages_delivery_proof_from_parachain::<
 			WithDarwiniaMessageBridge,
 			bp_darwinia::Header,
@@ -138,13 +139,15 @@ impl TargetHeaderChain<ToDarwiniaMessagePayload, <Self as ChainWithMessages>::Ac
 	}
 }
 impl SourceHeaderChain<<Self as ChainWithMessages>::Balance> for Darwinia {
-	type Error = &'static str;
 	type MessagesProof = FromDarwiniaMessagesProof;
 
 	fn verify_messages_proof(
 		proof: Self::MessagesProof,
 		messages_count: u32,
-	) -> Result<ProvedMessages<Message<<Self as ChainWithMessages>::Balance>>, Self::Error> {
+	) -> Result<
+		ProvedMessages<Message<<Self as ChainWithMessages>::Balance>>,
+		bp_messages::VerificationError,
+	> {
 		target::verify_messages_proof_from_parachain::<
 			WithDarwiniaMessageBridge,
 			bp_darwinia::Header,

runtime/crab/src/lib.rs

@@ -368,7 +368,7 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn account_code_at(address: sp_core::H160) -> Vec<u8> {
-			EVM::account_codes(address)
+			pallet_evm::AccountCodes::<Runtime>::get(address)
 		}
 
 		fn author() -> sp_core::H160 {
@@ -380,7 +380,7 @@ sp_api::impl_runtime_apis! {
 
 			index.to_big_endian(&mut tmp);
 
-			EVM::account_storages(address, sp_core::H256::from_slice(&tmp[..]))
+			pallet_evm::AccountStorages::<Runtime>::get(address, sp_core::H256::from_slice(&tmp[..]))
 		}
 
 		fn call(
@@ -472,15 +472,15 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn current_transaction_statuses() -> Option<Vec<fp_rpc::TransactionStatus>> {
-			Ethereum::current_transaction_statuses()
+			pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
 		}
 
 		fn current_block() -> Option<pallet_ethereum::Block> {
-			Ethereum::current_block()
+			pallet_ethereum::CurrentBlock::<Runtime>::get()
 		}
 
 		fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {
-			Ethereum::current_receipts()
+			pallet_ethereum::CurrentReceipts::<Runtime>::get()
 		}
 
 		fn current_all() -> (
@@ -489,9 +489,9 @@ sp_api::impl_runtime_apis! {
 			Option<Vec<fp_rpc::TransactionStatus>>
 		) {
 			(
-				Ethereum::current_block(),
-				Ethereum::current_receipts(),
-				Ethereum::current_transaction_statuses()
+				pallet_ethereum::CurrentBlock::<Runtime>::get(),
+				pallet_ethereum::CurrentReceipts::<Runtime>::get(),
+				pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
 			)
 		}
 

runtime/darwinia/src/bridges_message/crab.rs

@@ -113,16 +113,17 @@ impl BridgedChainWithMessages for Crab {
 	}
 }
 impl TargetHeaderChain<ToCrabMessagePayload, <Self as ChainWithMessages>::AccountId> for Crab {
-	type Error = &'static str;
 	type MessagesDeliveryProof = ToCrabMessagesDeliveryProof;
 
-	fn verify_message(payload: &ToCrabMessagePayload) -> Result<(), Self::Error> {
+	fn verify_message(
+		payload: &ToCrabMessagePayload,
+	) -> Result<(), bp_messages::VerificationError> {
 		source::verify_chain_message::<WithCrabMessageBridge>(payload)
 	}
 
 	fn verify_messages_delivery_proof(
 		proof: Self::MessagesDeliveryProof,
-	) -> Result<(LaneId, InboundLaneData<bp_crab::AccountId>), Self::Error> {
+	) -> Result<(LaneId, InboundLaneData<bp_crab::AccountId>), bp_messages::VerificationError> {
 		source::verify_messages_delivery_proof_from_parachain::<
 			WithCrabMessageBridge,
 			bp_crab::Header,
@@ -138,7 +139,10 @@ impl SourceHeaderChain<<Self as ChainWithMessages>::Balance> for Crab {
 	fn verify_messages_proof(
 		proof: Self::MessagesProof,
 		messages_count: u32,
-	) -> Result<ProvedMessages<Message<<Self as ChainWithMessages>::Balance>>, Self::Error> {
+	) -> Result<
+		ProvedMessages<Message<<Self as ChainWithMessages>::Balance>>,
+		bp_messages::VerificationError,
+	> {
 		target::verify_messages_proof_from_parachain::<
 			WithCrabMessageBridge,
 			bp_crab::Header,

runtime/darwinia/src/lib.rs

@@ -369,7 +369,7 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn account_code_at(address: sp_core::H160) -> Vec<u8> {
-			EVM::account_codes(address)
+			pallet_evm::AccountCodes::<Runtime>::get(address)
 		}
 
 		fn author() -> sp_core::H160 {
@@ -381,7 +381,7 @@ sp_api::impl_runtime_apis! {
 
 			index.to_big_endian(&mut tmp);
 
-			EVM::account_storages(address, sp_core::H256::from_slice(&tmp[..]))
+			pallet_evm::AccountStorages::<Runtime>::get(address, sp_core::H256::from_slice(&tmp[..]))
 		}
 
 		fn call(
@@ -473,15 +473,15 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn current_transaction_statuses() -> Option<Vec<fp_rpc::TransactionStatus>> {
-			Ethereum::current_transaction_statuses()
+			pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
 		}
 
 		fn current_block() -> Option<pallet_ethereum::Block> {
-			Ethereum::current_block()
+			pallet_ethereum::CurrentBlock::<Runtime>::get()
 		}
 
 		fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {
-			Ethereum::current_receipts()
+			pallet_ethereum::CurrentReceipts::<Runtime>::get()
 		}
 
 		fn current_all() -> (
@@ -490,9 +490,9 @@ sp_api::impl_runtime_apis! {
 			Option<Vec<fp_rpc::TransactionStatus>>
 		) {
 			(
-				Ethereum::current_block(),
-				Ethereum::current_receipts(),
-				Ethereum::current_transaction_statuses()
+				pallet_ethereum::CurrentBlock::<Runtime>::get(),
+				pallet_ethereum::CurrentReceipts::<Runtime>::get(),
+				pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
 			)
 		}
 

runtime/pangolin/src/bridges_message/pangoro.rs

@@ -119,16 +119,15 @@ impl BridgedChainWithMessages for Pangoro {
 impl TargetHeaderChain<ToPangoroMessagePayload, <Self as ChainWithMessages>::AccountId>
 	for Pangoro
 {
-	type Error = &'static str;
 	type MessagesDeliveryProof = ToPangoroMessagesDeliveryProof;
 
-	fn verify_message(payload: &ToPangoroMessagePayload) -> Result<(), Self::Error> {
+	fn verify_message(payload: &ToPangoroMessagePayload) -> Result<(), bp_messages::VerificationError> {
 		source::verify_chain_message::<WithPangoroMessageBridge>(payload)
 	}
 
 	fn verify_messages_delivery_proof(
 		proof: Self::MessagesDeliveryProof,
-	) -> Result<(LaneId, InboundLaneData<bp_pangoro::AccountId>), Self::Error> {
+	) -> Result<(LaneId, InboundLaneData<bp_pangoro::AccountId>), bp_messages::VerificationError> {
 		source::verify_messages_delivery_proof_from_parachain::<
 			WithPangoroMessageBridge,
 			bp_pangoro::Header,
@@ -138,13 +137,12 @@ impl TargetHeaderChain<ToPangoroMessagePayload, <Self as ChainWithMessages>::Acc
 	}
 }
 impl SourceHeaderChain<<Self as ChainWithMessages>::Balance> for Pangoro {
-	type Error = &'static str;
 	type MessagesProof = FromPangoroMessagesProof;
 
 	fn verify_messages_proof(
 		proof: Self::MessagesProof,
 		messages_count: u32,
-	) -> Result<ProvedMessages<Message<<Self as ChainWithMessages>::Balance>>, Self::Error> {
+	) -> Result<ProvedMessages<Message<<Self as ChainWithMessages>::Balance>>, bp_messages::VerificationError> {
 		target::verify_messages_proof_from_parachain::<
 			WithPangoroMessageBridge,
 			bp_pangoro::Header,

runtime/pangolin/src/lib.rs

@@ -370,7 +370,7 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn account_code_at(address: sp_core::H160) -> Vec<u8> {
-			EVM::account_codes(address)
+			pallet_evm::AccountCodes::<Runtime>::get(address)
 		}
 
 		fn author() -> sp_core::H160 {
@@ -382,7 +382,7 @@ sp_api::impl_runtime_apis! {
 
 			index.to_big_endian(&mut tmp);
 
-			EVM::account_storages(address, sp_core::H256::from_slice(&tmp[..]))
+			pallet_evm::AccountStorages::<Runtime>::get(address, sp_core::H256::from_slice(&tmp[..]))
 		}
 
 		fn call(
@@ -474,15 +474,15 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn current_transaction_statuses() -> Option<Vec<fp_rpc::TransactionStatus>> {
-			Ethereum::current_transaction_statuses()
+			pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
 		}
 
 		fn current_block() -> Option<pallet_ethereum::Block> {
-			Ethereum::current_block()
+			pallet_ethereum::CurrentBlock::<Runtime>::get()
 		}
 
 		fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {
-			Ethereum::current_receipts()
+			pallet_ethereum::CurrentReceipts::<Runtime>::get()
 		}
 
 		fn current_all() -> (
@@ -491,9 +491,9 @@ sp_api::impl_runtime_apis! {
 			Option<Vec<fp_rpc::TransactionStatus>>
 		) {
 			(
-				Ethereum::current_block(),
-				Ethereum::current_receipts(),
-				Ethereum::current_transaction_statuses()
+				pallet_ethereum::CurrentBlock::<Runtime>::get(),
+				pallet_ethereum::CurrentReceipts::<Runtime>::get(),
+				pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
 			)
 		}
 

runtime/pangoro/src/bridges_message/pangolin.rs

@@ -119,16 +119,17 @@ impl BridgedChainWithMessages for Pangolin {
 impl TargetHeaderChain<ToPangolinMessagePayload, <Self as ChainWithMessages>::AccountId>
 	for Pangolin
 {
-	type Error = &'static str;
 	type MessagesDeliveryProof = ToPangolinMessagesDeliveryProof;
 
-	fn verify_message(payload: &ToPangolinMessagePayload) -> Result<(), Self::Error> {
+	fn verify_message(
+		payload: &ToPangolinMessagePayload,
+	) -> Result<(), bp_messages::VerificationError> {
 		source::verify_chain_message::<WithPangolinMessageBridge>(payload)
 	}
 
 	fn verify_messages_delivery_proof(
 		proof: Self::MessagesDeliveryProof,
-	) -> Result<(LaneId, InboundLaneData<bp_pangolin::AccountId>), Self::Error> {
+	) -> Result<(LaneId, InboundLaneData<bp_pangolin::AccountId>), bp_messages::VerificationError> {
 		source::verify_messages_delivery_proof_from_parachain::<
 			WithPangolinMessageBridge,
 			bp_pangolin::Header,
@@ -138,13 +139,15 @@ impl TargetHeaderChain<ToPangolinMessagePayload, <Self as ChainWithMessages>::Ac
 	}
 }
 impl SourceHeaderChain<<Self as ChainWithMessages>::Balance> for Pangolin {
-	type Error = &'static str;
 	type MessagesProof = FromPangolinMessagesProof;
 
 	fn verify_messages_proof(
 		proof: Self::MessagesProof,
 		messages_count: u32,
-	) -> Result<ProvedMessages<Message<<Self as ChainWithMessages>::Balance>>, Self::Error> {
+	) -> Result<
+		ProvedMessages<Message<<Self as ChainWithMessages>::Balance>>,
+		bp_messages::VerificationError,
+	> {
 		target::verify_messages_proof_from_parachain::<
 			WithPangolinMessageBridge,
 			bp_pangolin::Header,