Ecosystem/serai
Ecosystem/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-01-10 12:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Cherry-pick 28308dfe85387fe54c14076089a40c5af1f1b8f7

Browse source
This commit is contained in:
Luke Parker 2022-07-30 18:21:20 -04:00
parent 21fd56d4d3
commit c7f8258e0c
No known key found for this signature in database
GPG key ID: F9F1386DB1E119B6
2 changed files with 26 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
substrate/node/src/command_helper.rs
View file

@ -66,8 +66,7 @@ pub fn create_benchmark_extrinsic(
runtime::UncheckedExtrinsic::new_signed( runtime::UncheckedExtrinsic::new_signed(
call.clone(), call.clone(),
sp_runtime::AccountId32::from(sender.public()).into(), sender.public(),
runtime::Signature::Sr25519(
runtime::SignedPayload::from_raw( runtime::SignedPayload::from_raw(
call, call,
extra.clone(), extra.clone(),
@ -83,7 +82,6 @@ pub fn create_benchmark_extrinsic(
), ),
) )
.using_encoded(|e| sender.sign(e)), .using_encoded(|e| sender.sign(e)),
),
extra, extra,
) )
} }

27
substrate/runtime/src/lib.rs
View file

@ -7,9 +7,9 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
use sp_runtime::{ use sp_runtime::{
create_runtime_str, generic, impl_opaque_keys, create_runtime_str, generic, impl_opaque_keys,
traits::{AccountIdLookup, BlakeTwo256, Block as BlockT, IdentifyAccount, Verify}, traits::{IdentityLookup, BlakeTwo256, Block as BlockT},
transaction_validity::{TransactionSource, TransactionValidity}, transaction_validity::{TransactionSource, TransactionValidity},
ApplyExtrinsicResult, MultiSignature, Perbill, ApplyExtrinsicResult, Perbill,
}; };
use sp_std::prelude::*; use sp_std::prelude::*;
#[cfg(feature = "std")] #[cfg(feature = "std")]
@ -34,12 +34,11 @@ use pallet_transaction_payment::CurrencyAdapter;
/// An index to a block. /// An index to a block.
pub type BlockNumber = u32; pub type BlockNumber = u32;
/// Alias to 512-bit hash when used in the context of a transaction signature on the chain. /// Signature type
pub type Signature = MultiSignature; pub type Signature = sp_core::sr25519::Signature;
/// Some way of identifying an account on the chain. We intentionally make it equivalent /// Account ID type, equivalent to a public key
/// to the public key of our transaction signing scheme. pub type AccountId = sp_core::sr25519::Public;
pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;
/// Balance of an account. /// Balance of an account.
pub type Balance = u64; pub type Balance = u64;
@ -103,7 +102,7 @@ parameter_types! {
pub const BlockHashCount: BlockNumber = 2400; pub const BlockHashCount: BlockNumber = 2400;
pub const Version: RuntimeVersion = VERSION; pub const Version: RuntimeVersion = VERSION;
pub const SS58Prefix: u8 = 42; // TODO: Remove pub const SS58Prefix: u8 = 42; // TODO: Remove for Bech32m
// 1 MB block size limit // 1 MB block size limit
pub BlockLength: frame_system::limits::BlockLength = pub BlockLength: frame_system::limits::BlockLength =
@ -132,7 +131,7 @@ impl frame_system::Config for Runtime {
type BlockLength = BlockLength; type BlockLength = BlockLength;
type AccountId = AccountId; type AccountId = AccountId;
type RuntimeCall = RuntimeCall; type RuntimeCall = RuntimeCall;
type Lookup = AccountIdLookup<AccountId, ()>; type Lookup = IdentityLookup<AccountId>;
type Index = Index; type Index = Index;
type BlockNumber = BlockNumber; type BlockNumber = BlockNumber;
type Hash = Hash; type Hash = Hash;
@ -151,7 +150,7 @@ impl frame_system::Config for Runtime {
type AccountData = pallet_balances::AccountData<Balance>; type AccountData = pallet_balances::AccountData<Balance>;
type SystemWeightInfo = (); type SystemWeightInfo = ();
type SS58Prefix = SS58Prefix; // TODO: Remove type SS58Prefix = SS58Prefix; // TODO: Remove for Bech32m
type MaxConsumers = frame_support::traits::ConstU32<16>; type MaxConsumers = frame_support::traits::ConstU32<16>;
} }
@ -193,12 +192,6 @@ impl pallet_contracts::Config for Runtime {
type RuntimeEvent = RuntimeEvent; type RuntimeEvent = RuntimeEvent;
type RuntimeCall = RuntimeCall; type RuntimeCall = RuntimeCall;
/// The safest default is to allow no calls at all.
///
/// Runtimes should whitelist dispatchables that are allowed to be called from contracts
/// and make sure they are stable. Dispatchables exposed to contracts are not allowed to
/// change because that would break already deployed contracts. The `Call` structure itself
/// is not allowed to change the indices of existing pallets, too.
type CallFilter = frame_support::traits::Nothing; type CallFilter = frame_support::traits::Nothing;
type DepositPerItem = DepositPerItem; type DepositPerItem = DepositPerItem;
type DepositPerByte = DepositPerByte; type DepositPerByte = DepositPerByte;
@ -215,7 +208,7 @@ impl pallet_contracts::Config for Runtime {
type MaxStorageKeyLen = ConstU32<128>; type MaxStorageKeyLen = ConstU32<128>;
} }
pub type Address = sp_runtime::MultiAddress<AccountId, ()>; pub type Address = AccountId;
pub type Header = generic::Header<BlockNumber, BlakeTwo256>; pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
pub type Block = generic::Block<Header, UncheckedExtrinsic>; pub type Block = generic::Block<Header, UncheckedExtrinsic>;
pub type SignedExtra = ( pub type SignedExtra = (