Skip to content

Commit

Permalink
Merge branch 'snowbridge' into ron/refactor-with-remote-exporter
Browse files Browse the repository at this point in the history
  • Loading branch information
yrong committed Dec 19, 2023
2 parents 79f6294 + abb76a0 commit a074c2a
Showing 1 changed file with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@ pub use sp_consensus_aura::sr25519::AuthorityId as AuraId;
pub use sp_runtime::{MultiAddress, Perbill, Permill};
use xcm::VersionedMultiLocation;
use xcm_config::{TreasuryAccount, XcmOriginToTransactDispatchOrigin, XcmRouter};

use bp_runtime::HeaderId;

#[cfg(any(feature = "std", test))]
pub use sp_runtime::BuildStorage;

use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate};
use rococo_runtime_constants::system_parachain::{ASSET_HUB_ID, BRIDGE_HUB_ID};
use xcm::latest::prelude::*;

use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight};
Expand Down Expand Up @@ -151,6 +151,12 @@ pub type Migrations = (
pallet_multisig::migrations::v1::MigrateToV1<Runtime>,
InitStorageVersions,
cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
// unreleased
snowbridge_system::migration::v0::InitializeOnUpgrade<
Runtime,
ConstU32<BRIDGE_HUB_ID>,
ConstU32<ASSET_HUB_ID>,
>,
);

/// Migration to initialize storage versions for pallets added after genesis.
Expand Down Expand Up @@ -499,7 +505,6 @@ parameter_types! {
}

parameter_types! {
pub const Reward: u128 = 10;
pub const CreateAssetCall: [u8;2] = [53, 0];
pub const CreateAssetDeposit: u128 = (UNITS / 10) + EXISTENTIAL_DEPOSIT;
pub const InboundQueuePalletInstance: u8 = snowbridge_rococo_common::INBOUND_QUEUE_MESSAGES_PALLET_INDEX;
Expand Down Expand Up @@ -537,6 +542,8 @@ impl snowbridge_inbound_queue::Config for Runtime {
Balance,
>;
type WeightToFee = WeightToFee;
type LengthToFee = ConstantMultiplier<Balance, TransactionByteFee>;
type MaxMessageSize = ConstU32<2048>;
type WeightInfo = weights::snowbridge_inbound_queue::WeightInfo<Runtime>;
type PricingParameters = EthereumSystem;
}
Expand Down

0 comments on commit a074c2a

Please sign in to comment.