Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,816 changes: 1,657 additions & 1,159 deletions Cargo.lock

Large diffs are not rendered by default.

1,333 changes: 666 additions & 667 deletions Cargo.toml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "runtime-integration-tests"
version = "1.69.0"
version = "1.70.0"
description = "Integration tests"
authors = ["GalacticCouncil"]
edition = "2021"
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/src/cross_chain_transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -941,7 +941,7 @@ fn xcm_for_deposit_reserve_asset_to_hydra<RC: Decode + GetDispatchInfo>(
},
]);
// use local weight for remote message and hope for the best.
let remote_weight = Weigher::weight(&mut remote_message).expect("weighing should not fail");
let remote_weight = Weigher::weight(&mut remote_message, Weight::MAX).expect("weighing should not fail");
Limited(remote_weight)
};

Expand Down Expand Up @@ -1178,7 +1178,7 @@ fn xcm_transfer_reserve_asset_and_deposit_asset_to_hydra<RC: Decode + GetDispatc
},
]);
// use local weight for remote message and hope for the best.
let remote_weight = Weigher::weight(&mut remote_message).expect("weighing should not fail");
let remote_weight = Weigher::weight(&mut remote_message, Weight::MAX).expect("weighing should not fail");
Limited(remote_weight)
};
// executed on remote (on hydra)
Expand Down
2 changes: 2 additions & 0 deletions integration-tests/src/polkadot_test_net.rs
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,8 @@ pub fn go_to_block(number: BlockNumber) {
relay_chain_state: proof,
downward_messages: Default::default(),
horizontal_messages: Default::default(),
collator_peer_id: None,
relay_parent_descendants: Default::default(),
}
));

Expand Down
2 changes: 1 addition & 1 deletion node/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "hydradx"
version = "14.9.0"
version = "14.10.0"
description = "Hydration node"
authors = ["GalacticCouncil"]
edition = "2021"
Expand Down
2 changes: 1 addition & 1 deletion node/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ pub fn run() -> sc_cli::Result<()> {
let db = partials.backend.expose_db();
let storage = partials.backend.expose_storage();

cmd.run(config, partials.client, db, storage)
cmd.run(config, partials.client, db, storage, None)
}),
BenchmarkCmd::Overhead(_) | BenchmarkCmd::Extrinsic(_) => {
Err("Unsupported benchmarking command".into())
Expand Down
2 changes: 2 additions & 0 deletions node/src/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ where
relay_chain_state,
downward_messages: Default::default(),
horizontal_messages: Default::default(),
collator_peer_id: None,
relay_parent_descendants: Default::default(),
};
Ok((timestamp, parachain_inherent_data))
};
Expand Down
4 changes: 3 additions & 1 deletion node/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ async fn start_node_impl(
let backend = params.backend.clone();
let mut task_manager = params.task_manager;

let (relay_chain_interface, collator_key) = build_relay_chain_interface(
let (relay_chain_interface, collator_key, _, _) = build_relay_chain_interface(
polkadot_config,
&parachain_config,
telemetry_worker_handle,
Expand All @@ -311,6 +311,7 @@ async fn start_node_impl(
import_queue: params.import_queue,
net_config,
sybil_resistance_level: CollatorSybilResistance::Resistant, // because of Aura
metrics: sc_network::service::NotificationMetrics::new(prometheus_registry.as_ref()),
})
.await?;

Expand Down Expand Up @@ -480,6 +481,7 @@ async fn start_node_impl(
relay_chain_slot_duration,
recovery_handle: Box::new(overseer_handle.clone()),
sync_service: sync_service.clone(),
prometheus_registry: prometheus_registry.as_ref(),
})?;

if validator {
Expand Down
2 changes: 1 addition & 1 deletion pallets/asset-registry/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-asset-registry"
version = "3.4.0"
version = "3.5.0"
description = "Pallet for asset registry management"
authors = ["GalacticCouncil"]
edition = "2021"
Expand Down
2 changes: 0 additions & 2 deletions pallets/asset-registry/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ pub mod pallet {

#[pallet::config]
pub trait Config: frame_system::Config {
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

/// The origin which can work with asset-registry.
type RegistryOrigin: EnsureOrigin<Self::RuntimeOrigin>;

Expand Down
2 changes: 0 additions & 2 deletions pallets/asset-registry/src/tests/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ impl From<AssetLocation> for Location {
}

impl pallet_asset_registry::Config for Test {
type RuntimeEvent = RuntimeEvent;
type Currency = Tokens;
type RegistryOrigin = frame_system::EnsureRoot<u64>;
type UpdateOrigin = frame_system::EnsureSigned<u64>;
Expand All @@ -130,7 +129,6 @@ parameter_type_with_key! {
}

impl orml_tokens::Config for Test {
type RuntimeEvent = RuntimeEvent;
type Balance = Balance;
type Amount = i128;
type CurrencyId = AssetId;
Expand Down
2 changes: 1 addition & 1 deletion pallets/bonds/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-bonds"
version = "2.3.0"
version = "2.4.0"
authors = ['GalacticCouncil']
edition = "2021"
license = "Apache-2.0"
Expand Down
3 changes: 0 additions & 3 deletions pallets/bonds/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,6 @@ pub mod pallet {

#[pallet::config]
pub trait Config: frame_system::Config {
/// The overarching event type.
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

/// Balance type.
type Balance: Parameter
+ Member
Expand Down
2 changes: 0 additions & 2 deletions pallets/bonds/src/tests/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ impl Contains<AssetKind> for AssetTypeWhitelist {
}

impl pallet_bonds::Config for Test {
type RuntimeEvent = RuntimeEvent;
type Balance = Balance;
type Currency = Tokens;
type AssetRegistry = DummyRegistry<Test>;
Expand Down Expand Up @@ -151,7 +150,6 @@ impl frame_system::Config for Test {
}

impl orml_tokens::Config for Test {
type RuntimeEvent = RuntimeEvent;
type Balance = Balance;
type Amount = i128;
type CurrencyId = AssetId;
Expand Down
2 changes: 1 addition & 1 deletion pallets/broadcast/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-broadcast"
version = "1.6.0"
version = "1.7.0"
authors = ["GalacticCouncil"]
edition = "2021"
license = "Apache 2.0"
Expand Down
4 changes: 1 addition & 3 deletions pallets/broadcast/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ pub mod pallet {
pub struct Pallet<T>(_);

#[pallet::config]
pub trait Config: frame_system::Config {
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
}
pub trait Config: frame_system::Config {}

#[pallet::storage]
/// Next available incremental ID
Expand Down
4 changes: 1 addition & 3 deletions pallets/broadcast/src/tests/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,7 @@ construct_runtime!(
}
);

impl crate::Config for Test {
type RuntimeEvent = RuntimeEvent;
}
impl crate::Config for Test {}

impl frame_system::Config for Test {
type BaseCallFilter = Everything;
Expand Down
2 changes: 1 addition & 1 deletion pallets/circuit-breaker/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-circuit-breaker"
version = "1.5.0"
version = "1.6.0"
authors = ["GalacticCouncil <hydradx@galacticcouncil.io>"]
edition = "2021"
license = "Apache-2.0"
Expand Down
3 changes: 0 additions & 3 deletions pallets/circuit-breaker/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,6 @@ pub mod pallet {

#[pallet::config]
pub trait Config: frame_system::Config {
/// The overarching event type.
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

/// Identifier for the class of asset.
type AssetId: Member
+ Parameter
Expand Down
8 changes: 1 addition & 7 deletions pallets/circuit-breaker/src/tests/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ parameter_types! {
pub type Amount = i128;

impl pallet_currencies::Config for Test {
type RuntimeEvent = RuntimeEvent;
type MultiCurrency = Tokens;
type NativeCurrency = BasicCurrencyAdapter<Test, Balances, Amount, u32>;
type Erc20Currency = MockErc20Currency<Test>;
Expand Down Expand Up @@ -172,7 +171,6 @@ parameter_types! {
}

impl pallet_circuit_breaker::Config for Test {
type RuntimeEvent = RuntimeEvent;
type AssetId = AssetId;
type Balance = Balance;
type AuthorityOrigin = EnsureRoot<Self::AccountId>;
Expand Down Expand Up @@ -253,7 +251,6 @@ parameter_type_with_key! {
}

impl orml_tokens::Config for Test {
type RuntimeEvent = RuntimeEvent;
type Balance = Balance;
type Amount = i128;
type CurrencyId = AssetId;
Expand Down Expand Up @@ -284,7 +281,6 @@ parameter_types! {
}

impl pallet_omnipool::Config for Test {
type RuntimeEvent = RuntimeEvent;
type AssetId = AssetId;
type PositionItemId = u32;
type Currency = Tokens;
Expand All @@ -310,9 +306,7 @@ impl pallet_omnipool::Config for Test {
type HubDestination = TreasuryAccount;
}

impl pallet_broadcast::Config for Test {
type RuntimeEvent = RuntimeEvent;
}
impl pallet_broadcast::Config for Test {}

pub struct CircuitBreakerHooks<T>(PhantomData<T>);

Expand Down
2 changes: 1 addition & 1 deletion pallets/claims/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-claims"
version = "3.5.0"
version = "3.6.0"
description = "HydraDX Claims Module"
authors = ["GalacticCouncil"]
edition = "2021"
Expand Down
2 changes: 0 additions & 2 deletions pallets/claims/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ pub mod pallet {

#[pallet::config]
pub trait Config: frame_system::Config {
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

type Prefix: Get<&'static [u8]>;

type WeightInfo: WeightInfo;
Expand Down
1 change: 0 additions & 1 deletion pallets/claims/src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ parameter_types! {
}

impl Config for Test {
type RuntimeEvent = RuntimeEvent;
type Currency = Balances;
type Prefix = Prefix;
type WeightInfo = ();
Expand Down
2 changes: 1 addition & 1 deletion pallets/collator-rewards/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-collator-rewards"
version = "1.2.0"
version = "1.3.0"
description = "Pallet for collator rewards"
authors = ["GalacticCouncil"]
edition = "2021"
Expand Down
2 changes: 0 additions & 2 deletions pallets/collator-rewards/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ pub mod pallet {

#[pallet::config]
pub trait Config: frame_system::Config {
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

/// Balance type
type Balance: Parameter
+ Member
Expand Down
2 changes: 0 additions & 2 deletions pallets/collator-rewards/src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ parameter_type_with_key! {
}

impl orml_tokens::Config for Test {
type RuntimeEvent = RuntimeEvent;
type Balance = Balance;
type Amount = Amount;
type CurrencyId = AssetId;
Expand Down Expand Up @@ -152,7 +151,6 @@ impl SessionManager<AccountId> for MockSessionManager {
}

impl Config for Test {
type RuntimeEvent = RuntimeEvent;
type Balance = Balance;
type CurrencyId = AssetId;
type Currency = Tokens;
Expand Down
2 changes: 1 addition & 1 deletion pallets/currencies/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "pallet-currencies"
description = "Provide `MultiCurrency` implementation using `pallet-balances` and `orml-tokens` module."
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/currencies"
license = "Apache-2.0"
version = "4.0.0"
version = "4.1.0"
authors = ["Laminar Developers <hello@laminar.one>"]
edition = "2021"

Expand Down
2 changes: 0 additions & 2 deletions pallets/currencies/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ pub mod module {
where
<Self::MultiCurrency as MultiCurrency<Self::AccountId>>::CurrencyId: codec::DecodeWithMemTracking,
{
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

type MultiCurrency: TransferAll<Self::AccountId>
+ MultiCurrencyExtended<Self::AccountId>
+ MultiLockableCurrency<Self::AccountId>
Expand Down
2 changes: 0 additions & 2 deletions pallets/currencies/src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ parameter_types! {
pub type ReserveIdentifier = [u8; 8];

impl orml_tokens::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type Balance = Balance;
type Amount = i64;
type CurrencyId = CurrencyId;
Expand All @@ -106,7 +105,6 @@ parameter_types! {
}

impl Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type MultiCurrency = Tokens;
type NativeCurrency = AdaptedBasicCurrency;
type Erc20Currency = MockErc20Currency<Runtime>;
Expand Down
2 changes: 1 addition & 1 deletion pallets/dca/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = 'pallet-dca'
version = "1.15.0"
version = "1.16.0"
description = 'A pallet to manage DCA scheduling'
authors = ['GalacticCouncil']
edition = '2021'
Expand Down
3 changes: 0 additions & 3 deletions pallets/dca/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,6 @@ pub mod pallet {

#[pallet::config]
pub trait Config: frame_system::Config + pallet_broadcast::Config {
/// The overarching event type.
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;

/// Asset id type
type AssetId: Parameter + Member + Copy + MaybeSerializeDeserialize + MaxEncodedLen;

Expand Down
Loading
Loading