Use H160 as AccountId (#55)

* Configure `H160` for runtime * Configure `H160` genesis Signed-off-by: Xavier Lau <[email protected]> * Docs * Improve code * Add missing features * Format and enable missing features for #50 * Format * Fix evm config * Revert the rename Signed-off-by: Xavier Lau <[email protected]> Co-authored-by: bear <[email protected]>
darwinia-network · Nov 22, 2022 · c841631 · c841631
1 parent 4b40193
commit c841631
Show file tree

Hide file tree

Showing 16 changed files with 352 additions and 197 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,6 +5,6 @@ panic = "unwind"
 members = [
 	"core/*",
 	"node",
+	"precompiles/*",
 	"runtime/*",
-	"precompiles/*"
 ]
diff --git a/core/primitives/Cargo.toml b/core/primitives/Cargo.toml
@@ -10,12 +10,19 @@ repository  = "https://github.com/darwinia-network/darwinia"
 version     = "6.0.0"
 
 [dependencies]
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
+# moonbeam
+account = { default-features = false, git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v0.9.30" }
+# substrate
+sp-core    = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
 sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.30" }
 
+
 [features]
 default = ["std"]
 std = [
+	# moonbeam
+	"account/std",
+	# substrate
 	"sp-core/std",
 	"sp-runtime/std",
 ]
diff --git a/core/primitives/src/lib.rs b/core/primitives/src/lib.rs
@@ -28,7 +28,7 @@
 #![deny(missing_docs)]
 
 /// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
-pub type Signature = sp_runtime::MultiSignature;
+pub type Signature = 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.
@@ -50,7 +50,7 @@ pub type Hash = sp_core::H256;
 pub type BlockNumber = u32;
 
 /// The address format for describing accounts.
-pub type Address = sp_runtime::MultiAddress<AccountId, ()>;
+pub type Address = AccountId;
 
 /// Hashing type
 pub type Hashing = sp_runtime::traits::BlakeTwo256;
@@ -97,6 +97,3 @@ pub const MWEI: Balance = 1_000 * KWEI;
 pub const KWEI: Balance = 1_000 * WEI;
 /// 1 wei — 1
 pub const WEI: Balance = 1;
-
-/// Darwinia EVM addresses specific prefix.
-pub const EVM_ADDR_PREFIX: &[u8] = b"dvm:";