Skip to content

Commit

Permalink
Merge pull request #1503 from Phala-Network/upgrade-am-pallet
Browse files Browse the repository at this point in the history
Upgrade pallet-evm_account_mapping
  • Loading branch information
jasl authored Jan 2, 2024
2 parents 923a6c8 + cb9cc0e commit e4dac85
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion standalone/prouter/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion standalone/pruntime/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion standalone/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1553,7 +1553,7 @@ impl OnUnbalanced<NegativeImbalance> for DealWithServiceFee {

parameter_types! {
pub EIP712Name: Vec<u8> = b"PhalaNetwork".to_vec();
pub EIP712Version: Vec<u8> = b"1".to_vec();
pub EIP712Version: Vec<u8> = b"2".to_vec();
pub EIP712ChainID: pallet_evm_account_mapping::EIP712ChainID = sp_core::U256::from(0);
pub EIP712VerifyingContractAddress: pallet_evm_account_mapping::EIP712VerifyingContractAddress = sp_core::H160::from([0u8; 20]);
}
Expand All @@ -1562,6 +1562,7 @@ impl pallet_evm_account_mapping::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type RuntimeCall = RuntimeCall;
type Currency = Balances;
type AddressConverter = pallet_evm_account_mapping::EvmTransparentConverter;
type ServiceFee = ConstU128<10000000000>; // 0.01 PHA
type OnUnbalancedForServiceFee = DealWithServiceFee;
type CallFilter = frame_support::traits::Everything;
Expand Down

0 comments on commit e4dac85

Please sign in to comment.