diff --git a/Cargo.lock b/Cargo.lock index afcfff15..cb43277b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,6 +21,7 @@ dependencies = [ "clap", "futures", "hex", + "hex-literal", "jsonrpsee", "log", "pallet-transaction-payment-rpc", diff --git a/node/Cargo.toml b/node/Cargo.toml index 90df2fd5..91961477 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -19,6 +19,7 @@ clap = { version = "4.3.0", features = ["derive"] } parity-scale-codec = '3.1.2' sha3 = "0.10.1" rand = { version = "0.8.5", features = ["small_rng"] } +hex-literal = "0.4.1" account = { path = "../account" } diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs index 54f76d3e..3fa0eadc 100644 --- a/node/src/chain_spec.rs +++ b/node/src/chain_spec.rs @@ -4,6 +4,7 @@ use academy_pow_runtime::{ }; use sp_core::{ecdsa, Pair, Public}; use sp_runtime::traits::{IdentifyAccount, Verify}; +use hex_literal::hex; /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type. pub type ChainSpec = sc_service::GenericChainSpec; @@ -37,6 +38,7 @@ pub fn development_config() -> Result { wasm_binary, vec![ get_account_id_from_seed::("Alice"), + AccountId::from(hex!("f24FF3a9CF04c71Dbc94D0b566f7A27B94566cac")), get_account_id_from_seed::("Bob"), get_account_id_from_seed::("Alice//stash"), get_account_id_from_seed::("Bob//stash"), diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index 06fe90f4..d2b5e15d 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -152,7 +152,7 @@ impl frame_system::Config for Runtime { /// The aggregated dispatch type that is available for extrinsics. type RuntimeCall = RuntimeCall; /// The lookup mechanism to get account ID from whatever is passed in dispatchers. - type Lookup = AccountIdLookup; + type Lookup = sp_runtime::traits::IdentityLookup; /// The index type for storing how many extrinsics an account has signed. type Index = Index; /// The index type for blocks. @@ -356,7 +356,7 @@ construct_runtime!( ); /// The address format for describing accounts. -pub type Address = sp_runtime::MultiAddress; +pub type Address = AccountId; /// Block header type as expected by this runtime. pub type Header = generic::Header; /// Block type as expected by this runtime.