Merge withdraw and kton into new transfer precompile

Cargo.toml

@@ -37,10 +37,9 @@ members = [
 	"frame/evm/precompile/contracts/dispatch",
 	"frame/evm/precompile/contracts/ed25519",
 	"frame/evm/precompile/contracts/empty",
-	"frame/evm/precompile/contracts/kton",
 	"frame/evm/precompile/contracts/modexp",
 	"frame/evm/precompile/contracts/simple",
-	"frame/evm/precompile/contracts/withdraw",
+	"frame/evm/precompile/contracts/transfer",
 	"frame/evm/precompile/contracts/sha3fips",
 	"frame/header-mmr",
 	"frame/header-mmr/rpc",

bin/node/runtime/pangolin/Cargo.toml

@@ -30,9 +30,8 @@ darwinia-ethereum-issuing           = { default-features = false, path = "../../
 darwinia-ethereum-relay             = { default-features = false, path = "../../../../frame/bridge/ethereum/relay" }
 darwinia-evm                        = { default-features = false, path = "../../../../frame/evm" }
 darwinia-evm-precompile-issuing     = { default-features = false, path = "../../../../frame/evm/precompile/contracts/issuing" }
-darwinia-evm-precompile-kton        = { default-features = false, path = "../../../../frame/evm/precompile/contracts/kton" }
 darwinia-evm-precompile-simple      = { default-features = false, path = "../../../../frame/evm/precompile/contracts/simple" }
-darwinia-evm-precompile-withdraw    = { default-features = false, path = "../../../../frame/evm/precompile/contracts/withdraw" }
+darwinia-evm-precompile-transfer    = { default-features = false, path = "../../../../frame/evm/precompile/contracts/transfer" }
 darwinia-header-mmr                 = { default-features = false, path = "../../../../frame/header-mmr" }
 darwinia-header-mmr-rpc-runtime-api = { default-features = false, path = "../../../../frame/header-mmr/rpc/runtime-api" }
 darwinia-relay-authorities          = { default-features = false, path = "../../../../frame/bridge/relay-authorities" }
@@ -128,9 +127,8 @@ std = [
 	"darwinia-ethereum-relay/std",
 	"darwinia-evm/std",
 	"darwinia-evm-precompile-issuing/std",
-	"darwinia-evm-precompile-kton/std",
 	"darwinia-evm-precompile-simple/std",
-	"darwinia-evm-precompile-withdraw/std",
+	"darwinia-evm-precompile-transfer/std",
 	"darwinia-header-mmr/std",
 	"darwinia-header-mmr-rpc-runtime-api/std",
 	"darwinia-relay-authorities/std",

bin/node/runtime/pangolin/src/pallets/evm_.rs

@@ -1,7 +1,6 @@
 pub use darwinia_evm_precompile_issuing::Issuing;
-pub use darwinia_evm_precompile_kton::Kton as KtonPrecompile;
 pub use darwinia_evm_precompile_simple::{ECRecover, Identity, Ripemd160, Sha256};
-pub use darwinia_evm_precompile_withdraw::WithDraw;
+pub use darwinia_evm_precompile_transfer::Transfer;
 
 // --- crates.io ---
 use evm::{Context, ExitError, ExitSucceed};
@@ -15,31 +14,24 @@ use dp_evm::{Precompile, PrecompileSet};
 use dvm_ethereum::account_basic::{DvmAccountBasic, KtonRemainBalance, RingRemainBalance};
 
 pub struct PangolinPrecompiles<R>(PhantomData<R>);
-impl<R: dvm_ethereum::Config> PrecompileSet for PangolinPrecompiles<R> {
+impl<R: darwinia_evm::Config> PrecompileSet for PangolinPrecompiles<R> {
 	fn execute(
 		address: H160,
 		input: &[u8],
 		target_gas: Option<u64>,
 		context: &Context,
 	) -> Option<Result<(ExitSucceed, Vec<u8>, u64), ExitError>> {
-		let to_address = |n: u64| -> H160 { H160::from_low_u64_be(n) };
+		let addr = |n: u64| -> H160 { H160::from_low_u64_be(n) };
 
 		match address {
 			// Ethereum precompiles
-			_ if address == to_address(1) => Some(ECRecover::execute(input, target_gas, context)),
-			_ if address == to_address(2) => Some(Sha256::execute(input, target_gas, context)),
-			_ if address == to_address(3) => Some(Ripemd160::execute(input, target_gas, context)),
-			_ if address == to_address(4) => Some(Identity::execute(input, target_gas, context)),
+			_ if address == addr(1) => Some(ECRecover::execute(input, target_gas, context)),
+			_ if address == addr(2) => Some(Sha256::execute(input, target_gas, context)),
+			_ if address == addr(3) => Some(Ripemd160::execute(input, target_gas, context)),
+			_ if address == addr(4) => Some(Identity::execute(input, target_gas, context)),
 			// Darwinia precompiles
-			_ if address == to_address(21) => {
-				Some(<WithDraw<R>>::execute(input, target_gas, context))
-			}
-			_ if address == to_address(22) => {
-				Some(<KtonPrecompile<R>>::execute(input, target_gas, context))
-			}
-			_ if address == to_address(23) => {
-				Some(<Issuing<R>>::execute(input, target_gas, context))
-			}
+			_ if address == addr(21) => Some(<Transfer<R>>::execute(input, target_gas, context)),
+			_ if address == addr(23) => Some(<Issuing<R>>::execute(input, target_gas, context)),
 			_ => None,
 		}
 	}

frame/dvm/Cargo.toml

@@ -39,10 +39,11 @@ sp-std           = { default-features = false, git = "https://github.com/darwini
 [dev-dependencies]
 # crates.io
 array-bytes = { version = "1.3.3" }
+ethabi      = { git = "https://github.com/darwinia-network/ethabi.git", branch = "xavier-no-std", default-features = false }
 # darwinia
 darwinia-balances                = { path = "../balances" }
 darwinia-evm-precompile-simple   = { path = "../evm/precompile/contracts/simple" }
-darwinia-evm-precompile-withdraw = { path = "../evm/precompile/contracts/withdraw" }
+darwinia-evm-precompile-transfer = { path = "../evm/precompile/contracts/transfer" }
 
 [features]
 default = ["std"]

frame/dvm/src/account_basic.rs

@@ -101,7 +101,7 @@ impl<T: Config> RemainBalanceOp<T, KtonBalance<T>> for KtonRemainBalance {
 }
 
 pub struct DvmAccountBasic<T, C, RB>(sp_std::marker::PhantomData<(T, C, RB)>);
-impl<T: Config, C, RB> AccountBasic for DvmAccountBasic<T, C, RB>
+impl<T: Config, C, RB> AccountBasic<T> for DvmAccountBasic<T, C, RB>
 where
 	RB: RemainBalanceOp<T, C::Balance>,
 	C: Currency<T::AccountId>,
@@ -110,6 +110,35 @@ where
 	fn account_basic(address: &H160) -> EVMAccount {
 		let account_id = <T as darwinia_evm::Config>::AddressMapping::into_account_id(*address);
 		let nonce = <frame_system::Pallet<T>>::account_nonce(&account_id);
+
+		EVMAccount {
+			nonce: nonce.saturated_into::<u128>().into(),
+			balance: Self::account_balance(&account_id),
+		}
+	}
+
+	/// Mutate the basic account
+	fn mutate_account_basic_balance(address: &H160, new_balance: U256) {
+		let account_id = <T as darwinia_evm::Config>::AddressMapping::into_account_id(*address);
+		Self::mutate_account_balance(&account_id, new_balance)
+	}
+
+	/// Transfer value
+	fn transfer(source: &H160, target: &H160, value: U256) -> Result<(), ExitError> {
+		let source_account = Self::account_basic(source);
+		ensure!(source_account.balance >= value, ExitError::OutOfGas);
+		let new_source_balance = source_account.balance.saturating_sub(value);
+		Self::mutate_account_basic_balance(source, new_source_balance);
+
+		let target_account = Self::account_basic(target);
+		let new_target_balance = target_account.balance.saturating_add(value);
+		Self::mutate_account_basic_balance(target, new_target_balance);
+
+		Ok(())
+	}
+
+	/// Get account balance
+	fn account_balance(account_id: &T::AccountId) -> U256 {
 		let helper = U256::from(POW_9);
 
 		// Get balance from Currency
@@ -125,24 +154,20 @@ where
 			.checked_add(remaining_balance)
 			.unwrap_or_default();
 
-		EVMAccount {
-			nonce: nonce.saturated_into::<u128>().into(),
-			balance: final_balance,
-		}
+		final_balance
 	}
 
-	/// Mutate the basic account
-	fn mutate_account_basic(address: &H160, new: EVMAccount) {
+	/// Mutate account balance
+	fn mutate_account_balance(account_id: &T::AccountId, new_balance: U256) {
 		let helper = U256::from(POW_9);
 
-		let account_id = <T as darwinia_evm::Config>::AddressMapping::into_account_id(*address);
-		let current = Self::account_basic(address);
+		let current = Self::account_balance(account_id);
 		let dvm_balance: U256 = RB::remaining_balance(&account_id)
 			.saturated_into::<u128>()
 			.into();
 
-		let nb = new.balance;
-		match current.balance {
+		let nb = new_balance;
+		match current {
 			cb if cb > nb => {
 				let diff = cb - nb;
 				let (diff_balance, diff_remaining_balance) = diff.div_mod(helper);
@@ -207,11 +232,9 @@ where
 		let ring_existential_deposit = U256::from(ring_existential_deposit) * helper;
 		let kton_existential_deposit = U256::from(kton_existential_deposit) * helper;
 
-		let ring_account = T::RingAccountBasic::account_basic(address);
-		let kton_account = T::KtonAccountBasic::account_basic(address);
-		if ring_account.balance < ring_existential_deposit
-			&& kton_account.balance < kton_existential_deposit
-		{
+		let ring_account = T::RingAccountBasic::account_balance(&account_id);
+		let kton_account = T::KtonAccountBasic::account_balance(&account_id);
+		if ring_account < ring_existential_deposit && kton_account < kton_existential_deposit {
 			<RingRemainBalance as RemainBalanceOp<T, RingBalance<T>>>::remove_remaining_balance(
 				&account_id,
 			);
@@ -220,29 +243,4 @@ where
 			);
 		}
 	}
-
-	fn transfer(source: &H160, target: &H160, value: U256) -> Result<(), ExitError> {
-		let source_account = Self::account_basic(source);
-		ensure!(source_account.balance >= value, ExitError::OutOfGas);
-		let new_source_balance = source_account.balance.saturating_sub(value);
-		Self::mutate_account_basic(
-			source,
-			EVMAccount {
-				nonce: source_account.nonce,
-				balance: new_source_balance,
-			},
-		);
-
-		let target_account = Self::account_basic(target);
-		let new_target_balance = target_account.balance.saturating_add(value);
-		Self::mutate_account_basic(
-			target,
-			EVMAccount {
-				nonce: target_account.nonce,
-				balance: new_target_balance,
-			},
-		);
-
-		Ok(())
-	}
 }