difftreelog
fix make runtime build on 0.9.42
in: master
11 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13701,6 +13701,7 @@
dependencies = [
"app-promotion-rpc",
"fc-db",
+ "fc-mapping-sync",
"fc-rpc",
"fc-rpc-core",
"fp-rpc",
runtime/common/config/ethereum.rsdiffbeforeafterboth--- a/runtime/common/config/ethereum.rs
+++ b/runtime/common/config/ethereum.rs
@@ -4,7 +4,7 @@
traits::{FindAuthor},
parameter_types, ConsensusEngineId,
};
-use sp_runtime::{RuntimeAppPublic, Perbill};
+use sp_runtime::{RuntimeAppPublic, Perbill, traits::ConstU32};
use crate::{
runtime_common::{
config::sponsoring::DefaultSponsoringRateLimit,
@@ -84,6 +84,8 @@
type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter<Balances, DealWithFees>;
type TransactionValidityHack = pallet_evm_transaction_payment::TransactionValidityHack<Self>;
type FindAuthor = EthereumFindAuthor<Aura>;
+ type Timestamp = crate::Timestamp;
+ type WeightInfo = pallet_evm::weights::SubstrateWeight<Self>;
}
impl pallet_evm_migration::Config for Runtime {
@@ -99,6 +101,9 @@
type RuntimeEvent = RuntimeEvent;
type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;
type PostLogContent = PostBlockAndTxnHashes;
+ // Space for revert reason. Ethereum transactions are not cheap, and overall size is much less
+ // than the substrate tx size, so we can afford this
+ type ExtraDataLength = ConstU32<32>;
}
parameter_types! {
runtime/common/config/substrate.rsdiffbeforeafterboth--- a/runtime/common/config/substrate.rs
+++ b/runtime/common/config/substrate.rs
@@ -36,7 +36,7 @@
use pallet_transaction_payment::{Multiplier, ConstFeeMultiplier};
use crate::{
runtime_common::DealWithFees, Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin, PalletInfo,
- System, Balances, Treasury, SS58Prefix, Version,
+ System, Balances, SS58Prefix, Version,
};
use up_common::{types::*, constants::*};
@@ -142,10 +142,15 @@
type Balance = Balance;
/// The ubiquitous event type.
type RuntimeEvent = RuntimeEvent;
- type DustRemoval = Treasury;
+ // FIXME: Is () the new treasury?
+ type DustRemoval = ();
type ExistentialDeposit = ExistentialDeposit;
type AccountStore = System;
type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;
+ type HoldIdentifier = [u8; 16];
+ type FreezeIdentifier = [u8; 16];
+ type MaxHolds = ();
+ type MaxFreezes = ();
}
parameter_types! {
runtime/common/config/xcm/mod.rsdiffbeforeafterboth--- a/runtime/common/config/xcm/mod.rs
+++ b/runtime/common/config/xcm/mod.rs
@@ -15,7 +15,7 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
use frame_support::{
- traits::{Everything, Nothing, Get, ConstU32},
+ traits::{Everything, Nothing, Get, ConstU32, ProcessMessageError},
parameter_types,
};
use frame_system::EnsureRoot;
@@ -114,26 +114,18 @@
);
pub trait TryPass {
-<<<<<<< HEAD
- fn try_pass<Call>(origin: &MultiLocation, message: &mut [Instruction<Call>]) -> Result<(), ()>;
-=======
fn try_pass<Call>(
origin: &MultiLocation,
message: &mut [Instruction<Call>],
) -> Result<(), ProcessMessageError>;
->>>>>>> fd33b0ac (fixup pallets)
}
#[impl_trait_for_tuples::impl_for_tuples(30)]
impl TryPass for Tuple {
-<<<<<<< HEAD
- fn try_pass<Call>(origin: &MultiLocation, message: &mut [Instruction<Call>]) -> Result<(), ()> {
-=======
fn try_pass<Call>(
origin: &MultiLocation,
message: &mut [Instruction<Call>],
) -> Result<(), ProcessMessageError> {
->>>>>>> fd33b0ac (fixup pallets)
for_tuples!( #(
Tuple::try_pass(origin, message)?;
)* );
@@ -159,7 +151,7 @@
message: &mut [Instruction<Call>],
max_weight: Weight,
weight_credit: &mut Weight,
- ) -> Result<(), ()> {
+ ) -> Result<(), ProcessMessageError> {
Deny::try_pass(origin, message)?;
Allow::should_execute(origin, message, max_weight, weight_credit)
}
@@ -227,6 +219,7 @@
type SovereignAccountOf = LocationToAccountId;
type MaxLockers = ConstU32<8>;
type WeightInfo = crate::weights::xcm::SubstrateWeight<Runtime>;
+ type AdminOrigin = EnsureRoot<AccountId>;
#[cfg(feature = "runtime-benchmarks")]
type ReachableDest = ReachableDest;
}
runtime/common/config/xcm/nativeassets.rsdiffbeforeafterboth--- a/runtime/common/config/xcm/nativeassets.rs
+++ b/runtime/common/config/xcm/nativeassets.rs
@@ -102,7 +102,8 @@
for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>
{
fn new() -> Self {
- Self(0, Zero::zero(), PhantomData)
+ // FIXME: benchmark
+ Self(Weight::from_parts(0, 0), Zero::zero(), PhantomData)
}
fn buy_weight(&mut self, _weight: Weight, payment: Assets) -> Result<Assets, XcmError> {
runtime/common/runtime_apis.rsdiffbeforeafterboth35 ) => {35 ) => {36 use sp_std::prelude::*;36 use sp_std::prelude::*;37 use sp_api::impl_runtime_apis;37 use sp_api::impl_runtime_apis;38 use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160, Bytes};38 use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};39 use sp_runtime::{39 use sp_runtime::{40 Permill,40 Permill,41 traits::Block as BlockT,41 traits::Block as BlockT,251 OpaqueMetadata::new(Runtime::metadata().into())251 OpaqueMetadata::new(Runtime::metadata().into())252 }252 }253254 fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> {255 Runtime::metadata_at_version(version)256 }257258 fn metadata_versions() -> sp_std::vec::Vec<u32> {259 Runtime::metadata_versions()260 }253 }261 }254262255 impl sp_block_builder::BlockBuilder<Block> for Runtime {263 impl sp_block_builder::BlockBuilder<Block> for Runtime {311 fn account_code_at(address: H160) -> Vec<u8> {319 fn account_code_at(address: H160) -> Vec<u8> {312 use pallet_evm::OnMethodCall;320 use pallet_evm::OnMethodCall;313 <Runtime as pallet_evm::Config>::OnMethodCall::get_code(&address)321 <Runtime as pallet_evm::Config>::OnMethodCall::get_code(&address)314 .unwrap_or_else(|| EVM::account_codes(address))322 .unwrap_or_else(|| pallet_evm::AccountCodes::<Runtime>::get(address))315 }323 }316324317 fn author() -> H160 {325 fn author() -> H160 {321 fn storage_at(address: H160, index: U256) -> H256 {329 fn storage_at(address: H160, index: U256) -> H256 {322 let mut tmp = [0u8; 32];330 let mut tmp = [0u8; 32];323 index.to_big_endian(&mut tmp);331 index.to_big_endian(&mut tmp);324 EVM::account_storages(address, H256::from_slice(&tmp[..]))332 pallet_evm::AccountStorages::<Runtime>::get(address, H256::from_slice(&tmp[..]))325 }333 }326334327 #[allow(clippy::redundant_closure)]335 #[allow(clippy::redundant_closure)]401 }409 }402410403 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {411 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {404 Ethereum::current_transaction_statuses()412 pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()405 }413 }406414407 fn current_block() -> Option<pallet_ethereum::Block> {415 fn current_block() -> Option<pallet_ethereum::Block> {408 Ethereum::current_block()416 pallet_ethereum::CurrentBlock::<Runtime>::get()409 }417 }410418411 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {419 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {412 Ethereum::current_receipts()420 pallet_ethereum::CurrentReceipts::<Runtime>::get()413 }421 }414422415 fn current_all() -> (423 fn current_all() -> (418 Option<Vec<TransactionStatus>>426 Option<Vec<TransactionStatus>>419 ) {427 ) {420 (428 (421 Ethereum::current_block(),429 pallet_ethereum::CurrentBlock::<Runtime>::get(),422 Ethereum::current_receipts(),430 pallet_ethereum::CurrentReceipts::<Runtime>::get(),423 Ethereum::current_transaction_statuses()431 pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()424 )432 )425 }433 }426434653661654 impl up_pov_estimate_rpc::PovEstimateApi<Block> for Runtime {662 impl up_pov_estimate_rpc::PovEstimateApi<Block> for Runtime {655 #[allow(unused_variables)]663 #[allow(unused_variables)]656 fn pov_estimate(uxt: Bytes) -> ApplyExtrinsicResult {664 fn pov_estimate(uxt: Vec<u8>) -> ApplyExtrinsicResult {657 #[cfg(feature = "pov-estimate")]665 #[cfg(feature = "pov-estimate")]658 {666 {659 use codec::Decode;667 use codec::Decode;660668661 let uxt_decode = <<Block as BlockT>::Extrinsic as Decode>::decode(&mut &*uxt)669 let uxt_decode = <<Block as BlockT>::Extrinsic as Decode>::decode(&mut &uxt)662 .map_err(|_| DispatchError::Other("failed to decode the extrinsic"));670 .map_err(|_| DispatchError::Other("failed to decode the extrinsic"));663671664 let uxt = match uxt_decode {672 let uxt = match uxt_decode {runtime/common/weights/xcm.rsdiffbeforeafterboth--- a/runtime/common/weights/xcm.rs
+++ b/runtime/common/weights/xcm.rs
@@ -244,5 +244,9 @@
.saturating_add(T::DbWeight::get().reads(9_u64))
.saturating_add(T::DbWeight::get().writes(4_u64))
}
+
+ fn force_suspension() -> Weight {
+ Default::default()
+ }
}
runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -220,7 +220,7 @@
orml-xcm-support = { workspace = true }
pallet-aura = { workspace = true }
pallet-authorship = { workspace = true }
-pallet-balances = { workspace = true }
+pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
pallet-preimage = { workspace = true }
pallet-session = { workspace = true }
pallet-sudo = { workspace = true }
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -212,7 +212,7 @@
orml-xcm-support = { workspace = true }
pallet-aura = { workspace = true }
pallet-authorship = { workspace = true }
-pallet-balances = { workspace = true }
+pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
pallet-preimage = { workspace = true }
pallet-session = { workspace = true }
pallet-sudo = { workspace = true }
runtime/tests/Cargo.tomldiffbeforeafterboth--- a/runtime/tests/Cargo.toml
+++ b/runtime/tests/Cargo.toml
@@ -9,37 +9,37 @@
refungible = []
[dependencies]
-up-data-structs = { default-features = false, path = "../../primitives/data-structs" }
+up-data-structs = { workspace = true }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+sp-core = { workspace = true }
+sp-io = { workspace = true }
+sp-runtime = { workspace = true }
+sp-std = { workspace = true }
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+frame-support = { workspace = true }
+frame-system = { workspace = true }
-pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
-pallet-transaction-payment = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.42" }
+pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
+pallet-timestamp = { workspace = true }
+pallet-transaction-payment = { workspace = true }
-pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.42" }
-pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/unique-frontier", branch = "unique-polkadot-v0.9.42" }
+pallet-ethereum = { workspace = true }
+pallet-evm = { workspace = true }
-pallet-common.path = "../../pallets/common"
-pallet-fungible.path = "../../pallets/fungible"
-pallet-nonfungible.path = "../../pallets/nonfungible"
-pallet-refungible.path = "../../pallets/refungible"
-pallet-structure.path = "../../pallets/structure"
-pallet-unique.path = "../../pallets/unique"
+pallet-common = { workspace = true }
+pallet-fungible = { workspace = true }
+pallet-nonfungible = { workspace = true }
+pallet-refungible = { workspace = true }
+pallet-structure = { workspace = true }
+pallet-unique = { workspace = true }
-pallet-evm-coder-substrate.path = "../../pallets/evm-coder-substrate"
+pallet-evm-coder-substrate = { workspace = true }
-parity-scale-codec = { version = "3.2.2", default-features = false, features = ["derive"] }
-scale-info = "*"
+codec = { workspace = true }
+scale-info = { workspace = true }
evm-coder = { workspace = true }
-up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.42" }
+up-sponsorship = { workspace = true }
xcm = { workspace = true }
pallet-xcm = { workspace = true }
pallet-configuration = { workspace = true }
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -211,7 +211,7 @@
orml-xcm-support = { workspace = true }
pallet-aura = { workspace = true }
pallet-authorship = { workspace = true }
-pallet-balances = { workspace = true }
+pallet-balances = { features = ["insecure_zero_ed"], workspace = true }
pallet-preimage = { workspace = true }
pallet-session = { workspace = true }
pallet-sudo = { workspace = true }