[companion] Get rid of Peerset compatibility layer (#2739)

* Init `PeerStore` in `build_collator_network`

* kick CI

* Update Cargo.lock for substrate

* Companion for substrate 14373

* Companion for paritytech/substrate#14020

* update lockfile for {"substrate", "polkadot"}

---------

Co-authored-by: Davide Galassi <davxy@datawok.net>
Co-authored-by: parity-processbot <>
This commit is contained in:
Dmitry Markin
2023-08-02 18:58:13 +03:00
committed by GitHub
parent ff3803503a
commit 0dc2812c38
5 changed files with 293 additions and 272 deletions
@@ -1,14 +1,15 @@
use crate::{
constants::currency::deposit, Balance, Balances, RandomnessCollectiveFlip, Runtime,
RuntimeCall, RuntimeEvent, Timestamp,
RuntimeCall, RuntimeEvent, RuntimeHoldReason, Timestamp,
};
use frame_support::{
parameter_types,
traits::{ConstBool, ConstU32, Nothing},
};
use pallet_contracts::{
migration::v12, weights::SubstrateWeight, Config, DebugInfo, DefaultAddressGenerator, Frame,
Schedule,
migration::{v12, v13, v14},
weights::SubstrateWeight,
Config, DebugInfo, DefaultAddressGenerator, Frame, Schedule,
};
use sp_runtime::Perbill;
@@ -54,5 +55,10 @@ impl Config for Runtime {
type MaxDebugBufferLen = ConstU32<{ 2 * 1024 * 1024 }>;
type MaxDelegateDependencies = ConstU32<32>;
type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
type Migrations = (v12::Migration<Runtime>,);
type Migrations = (
v12::Migration<Runtime, Balances>,
v13::Migration<Runtime>,
v14::Migration<Runtime, Balances>,
);
type RuntimeHoldReason = RuntimeHoldReason;
}
@@ -220,7 +220,7 @@ impl pallet_balances::Config for Runtime {
type ReserveIdentifier = [u8; 8];
type RuntimeHoldReason = RuntimeHoldReason;
type FreezeIdentifier = ();
type MaxHolds = ConstU32<0>;
type MaxHolds = ConstU32<1>;
type MaxFreezes = ConstU32<0>;
}
@@ -365,7 +365,7 @@ construct_runtime!(
DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,
// Smart Contracts.
Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 40,
Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>, HoldReason} = 40,
// Handy utilities.
Utility: pallet_utility::{Pallet, Call, Event} = 50,