git.delta.rocks / unique-network / refs/commits / 37e76bc01ac1

difftreelog

fix make runtime build on 0.9.42

Yaroslav Bolyukin2023-05-22parent: #6f7886b.patch.diff
in: master

11 files changed

modifiedCargo.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",
modifiedruntime/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! {
modifiedruntime/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! {
modifiedruntime/common/config/xcm/mod.rsdiffbeforeafterboth
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17use frame_support::{17use frame_support::{
18	traits::{Everything, Nothing, Get, ConstU32},18	traits::{Everything, Nothing, Get, ConstU32, ProcessMessageError},
19	parameter_types,19	parameter_types,
20};20};
21use frame_system::EnsureRoot;21use frame_system::EnsureRoot;
114);114);
115115
116pub trait TryPass {116pub trait TryPass {
117<<<<<<< HEAD
118	fn try_pass<Call>(origin: &MultiLocation, message: &mut [Instruction<Call>]) -> Result<(), ()>;
119=======
120	fn try_pass<Call>(117	fn try_pass<Call>(
121		origin: &MultiLocation,118		origin: &MultiLocation,
122		message: &mut [Instruction<Call>],119		message: &mut [Instruction<Call>],
123	) -> Result<(), ProcessMessageError>;120	) -> Result<(), ProcessMessageError>;
124>>>>>>> fd33b0ac (fixup pallets)
125}121}
126122
127#[impl_trait_for_tuples::impl_for_tuples(30)]123#[impl_trait_for_tuples::impl_for_tuples(30)]
128impl TryPass for Tuple {124impl TryPass for Tuple {
129<<<<<<< HEAD
130	fn try_pass<Call>(origin: &MultiLocation, message: &mut [Instruction<Call>]) -> Result<(), ()> {
131=======
132	fn try_pass<Call>(125	fn try_pass<Call>(
133		origin: &MultiLocation,126		origin: &MultiLocation,
134		message: &mut [Instruction<Call>],127		message: &mut [Instruction<Call>],
135	) -> Result<(), ProcessMessageError> {128	) -> Result<(), ProcessMessageError> {
136>>>>>>> fd33b0ac (fixup pallets)
137		for_tuples!( #(129		for_tuples!( #(
138			Tuple::try_pass(origin, message)?;130			Tuple::try_pass(origin, message)?;
139		)* );131		)* );
159		message: &mut [Instruction<Call>],151		message: &mut [Instruction<Call>],
160		max_weight: Weight,152		max_weight: Weight,
161		weight_credit: &mut Weight,153		weight_credit: &mut Weight,
162	) -> Result<(), ()> {154	) -> Result<(), ProcessMessageError> {
163		Deny::try_pass(origin, message)?;155		Deny::try_pass(origin, message)?;
164		Allow::should_execute(origin, message, max_weight, weight_credit)156		Allow::should_execute(origin, message, max_weight, weight_credit)
165	}157	}
227	type SovereignAccountOf = LocationToAccountId;219	type SovereignAccountOf = LocationToAccountId;
228	type MaxLockers = ConstU32<8>;220	type MaxLockers = ConstU32<8>;
229	type WeightInfo = crate::weights::xcm::SubstrateWeight<Runtime>;221	type WeightInfo = crate::weights::xcm::SubstrateWeight<Runtime>;
222	type AdminOrigin = EnsureRoot<AccountId>;
230	#[cfg(feature = "runtime-benchmarks")]223	#[cfg(feature = "runtime-benchmarks")]
231	type ReachableDest = ReachableDest;224	type ReachableDest = ReachableDest;
232}225}
modifiedruntime/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> {
modifiedruntime/common/runtime_apis.rsdiffbeforeafterboth
--- a/runtime/common/runtime_apis.rs
+++ b/runtime/common/runtime_apis.rs
@@ -35,7 +35,7 @@
     ) => {
         use sp_std::prelude::*;
         use sp_api::impl_runtime_apis;
-        use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160, Bytes};
+        use sp_core::{crypto::KeyTypeId, OpaqueMetadata, H256, U256, H160};
         use sp_runtime::{
             Permill,
             traits::Block as BlockT,
@@ -250,6 +250,14 @@
                 fn metadata() -> OpaqueMetadata {
                     OpaqueMetadata::new(Runtime::metadata().into())
                 }
+
+                fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> {
+                    Runtime::metadata_at_version(version)
+                }
+
+                fn metadata_versions() -> sp_std::vec::Vec<u32> {
+                    Runtime::metadata_versions()
+                }
             }
 
             impl sp_block_builder::BlockBuilder<Block> for Runtime {
@@ -311,7 +319,7 @@
                 fn account_code_at(address: H160) -> Vec<u8> {
                     use pallet_evm::OnMethodCall;
                     <Runtime as pallet_evm::Config>::OnMethodCall::get_code(&address)
-                        .unwrap_or_else(|| EVM::account_codes(address))
+                        .unwrap_or_else(|| pallet_evm::AccountCodes::<Runtime>::get(address))
                 }
 
                 fn author() -> H160 {
@@ -321,7 +329,7 @@
                 fn storage_at(address: H160, index: U256) -> H256 {
                     let mut tmp = [0u8; 32];
                     index.to_big_endian(&mut tmp);
-                    EVM::account_storages(address, H256::from_slice(&tmp[..]))
+                    pallet_evm::AccountStorages::<Runtime>::get(address, H256::from_slice(&tmp[..]))
                 }
 
                 #[allow(clippy::redundant_closure)]
@@ -401,15 +409,15 @@
                 }
 
                 fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {
-                    Ethereum::current_transaction_statuses()
+                    pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
                 }
 
                 fn current_block() -> Option<pallet_ethereum::Block> {
-                    Ethereum::current_block()
+                    pallet_ethereum::CurrentBlock::<Runtime>::get()
                 }
 
                 fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {
-                    Ethereum::current_receipts()
+                    pallet_ethereum::CurrentReceipts::<Runtime>::get()
                 }
 
                 fn current_all() -> (
@@ -418,9 +426,9 @@
                     Option<Vec<TransactionStatus>>
                 ) {
                     (
-                        Ethereum::current_block(),
-                        Ethereum::current_receipts(),
-                        Ethereum::current_transaction_statuses()
+                        pallet_ethereum::CurrentBlock::<Runtime>::get(),
+                        pallet_ethereum::CurrentReceipts::<Runtime>::get(),
+                        pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
                     )
                 }
 
@@ -653,12 +661,12 @@
 
             impl up_pov_estimate_rpc::PovEstimateApi<Block> for Runtime {
                 #[allow(unused_variables)]
-                fn pov_estimate(uxt: Bytes) -> ApplyExtrinsicResult {
+                fn pov_estimate(uxt: Vec<u8>) -> ApplyExtrinsicResult {
                     #[cfg(feature = "pov-estimate")]
                     {
                         use codec::Decode;
 
-                        let uxt_decode = <<Block as BlockT>::Extrinsic as Decode>::decode(&mut &*uxt)
+                        let uxt_decode = <<Block as BlockT>::Extrinsic as Decode>::decode(&mut &uxt)
                             .map_err(|_| DispatchError::Other("failed to decode the extrinsic"));
 
                         let uxt = match uxt_decode {
modifiedruntime/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()
+	}
 }
modifiedruntime/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 }
modifiedruntime/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 }
modifiedruntime/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 }
modifiedruntime/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 }