pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-19 22:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

pallet-evm: customizable chain id (#6537)

Browse Source
This commit is contained in:
Wei Tang
2020-07-01 09:00:12 +02:00
committed by GitHub
parent e61f377617
commit c4f6fbceac
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/evm/src/backend.rs
+2 -1
View File
@@ -5,6 +5,7 @@ use serde::{Serialize, Deserialize};
use codec::{Encode, Decode}; use codec::{Encode, Decode};
use sp_core::{U256, H256, H160}; use sp_core::{U256, H256, H160};
use sp_runtime::traits::UniqueSaturatedInto; use sp_runtime::traits::UniqueSaturatedInto;
use frame_support::traits::Get;
use frame_support::storage::{StorageMap, StorageDoubleMap}; use frame_support::storage::{StorageMap, StorageDoubleMap};
use sha3::{Keccak256, Digest}; use sha3::{Keccak256, Digest};
use evm::backend::{Backend as BackendT, ApplyBackend, Apply}; use evm::backend::{Backend as BackendT, ApplyBackend, Apply};
@@ -91,7 +92,7 @@ impl<'vicinity, T: Trait> BackendT for Backend<'vicinity, T> {
} }
fn chain_id(&self) -> U256 { fn chain_id(&self) -> U256 {
U256::from(sp_io::misc::chain_id()) U256::from(T::ChainId::get())
} }
fn exists(&self, _address: H160) -> bool { fn exists(&self, _address: H160) -> bool {
substrate/frame/evm/src/lib.rs
+12 -1
View File
@@ -118,6 +118,15 @@ impl Precompiles for () {
} }
} }
/// Substrate system chain ID.
pub struct SystemChainId;
impl Get<u64> for SystemChainId {
fn get() -> u64 {
sp_io::misc::chain_id()
}
}
static ISTANBUL_CONFIG: Config = Config::istanbul(); static ISTANBUL_CONFIG: Config = Config::istanbul();
/// EVM module trait /// EVM module trait
@@ -134,6 +143,8 @@ pub trait Trait: frame_system::Trait + pallet_timestamp::Trait {
type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>; type Event: From<Event<Self>> + Into<<Self as frame_system::Trait>::Event>;
/// Precompiles associated with this EVM engine. /// Precompiles associated with this EVM engine.
type Precompiles: Precompiles; type Precompiles: Precompiles;
/// Chain ID of EVM.
type ChainId: Get<U256>;
/// EVM config used in the module. /// EVM config used in the module.
fn config() -> &'static Config { fn config() -> &'static Config {
@@ -159,7 +170,7 @@ decl_storage! {
trait Store for Module<T: Trait> as EVM { trait Store for Module<T: Trait> as EVM {
Accounts get(fn accounts): map hasher(blake2_128_concat) H160 => Account; Accounts get(fn accounts): map hasher(blake2_128_concat) H160 => Account;
AccountCodes get(fn account_codes): map hasher(blake2_128_concat) H160 => Vec<u8>; AccountCodes get(fn account_codes): map hasher(blake2_128_concat) H160 => Vec<u8>;
AccountStorages get(fn account_storages): AccountStorages get(fn account_storages):
double_map hasher(blake2_128_concat) H160, hasher(blake2_128_concat) H256 => H256; double_map hasher(blake2_128_concat) H160, hasher(blake2_128_concat) H256 => H256;
} }