Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove bifrost_channel_commission pallet #1155

Merged
merged 1 commit into from
Jan 19, 2024
Merged

Remove bifrost_channel_commission pallet #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 20 additions & 20 deletions runtime/bifrost-kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,7 +1393,7 @@ impl bifrost_slp::Config for Runtime {
type XcmTransfer = XTokens;
type MaxLengthLimit = MaxLengthLimit;
type XcmWeightAndFeeHandler = XcmInterface;
type ChannelCommission = ChannelCommission;
type ChannelCommission = ();
}

impl bifrost_vstoken_conversion::Config for Runtime {
Expand Down Expand Up @@ -1635,7 +1635,7 @@ impl bifrost_vtoken_minting::Config for Runtime {
type MoonbeamParachainId = ConstU32<2023>;
type HydradxParachainId = ConstU32<2034>;
type InterlayParachainId = ConstU32<2092>;
type ChannelCommission = ChannelCommission;
type ChannelCommission = ();
}

impl bifrost_slpx::Config for Runtime {
Expand Down Expand Up @@ -1786,22 +1786,22 @@ impl leverage_staking::Config for Runtime {
type CurrencyIdConversion = AssetIdMaps<Runtime>;
}

parameter_types! {
pub const ClearingDuration: u32 = prod_or_fast!(7 * DAYS, 10 * MINUTES);
pub const NameLengthLimit: u32 = 20;
pub BifrostCommissionReceiver: AccountId = TreasuryPalletId::get().into_account_truncating();
}

impl bifrost_channel_commission::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type MultiCurrency = Currencies;
type ControlOrigin = EitherOfDiverse<CoreAdminOrCouncil, LiquidStaking>;
type CommissionPalletId = CommissionPalletId;
type BifrostCommissionReceiver = BifrostCommissionReceiver;
type WeightInfo = weights::bifrost_channel_commission::BifrostWeight<Runtime>;
type ClearingDuration = ClearingDuration;
type NameLengthLimit = NameLengthLimit;
}
// parameter_types! {
// pub const ClearingDuration: u32 = prod_or_fast!(7 * DAYS, 10 * MINUTES);
// pub const NameLengthLimit: u32 = 20;
// pub BifrostCommissionReceiver: AccountId = TreasuryPalletId::get().into_account_truncating();
// }
//
// impl bifrost_channel_commission::Config for Runtime {
// type RuntimeEvent = RuntimeEvent;
// type MultiCurrency = Currencies;
// type ControlOrigin = EitherOfDiverse<CoreAdminOrCouncil, LiquidStaking>;
// type CommissionPalletId = CommissionPalletId;
// type BifrostCommissionReceiver = BifrostCommissionReceiver;
// type WeightInfo = weights::bifrost_channel_commission::BifrostWeight<Runtime>;
// type ClearingDuration = ClearingDuration;
// type NameLengthLimit = NameLengthLimit;
// }

// Below is the implementation of tokens manipulation functions other than native token.
pub struct LocalAssetAdaptor<Local>(PhantomData<Local>);
Expand Down Expand Up @@ -1989,7 +1989,7 @@ construct_runtime! {
Oracle: orml_oracle::<Instance1> = 133,
OracleMembership: pallet_membership::<Instance3> = 134,
LeverageStaking: leverage_staking = 135,
ChannelCommission: bifrost_channel_commission = 136,
// ChannelCommission: bifrost_channel_commission = 136,
}
}

Expand Down Expand Up @@ -2105,7 +2105,7 @@ mod benches {
[bifrost_vtoken_voting, VtokenVoting]
[lend_market, LendMarket]
[leverage_staking, LeverageStaking]
[bifrost_channel_commission, ChannelCommission]
// [bifrost_channel_commission, ChannelCommission]
);
}

Expand Down
38 changes: 19 additions & 19 deletions runtime/bifrost-polkadot/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@ impl bifrost_slp::Config for Runtime {
type XcmTransfer = XTokens;
type MaxLengthLimit = MaxLengthLimit;
type XcmWeightAndFeeHandler = XcmInterface;
type ChannelCommission = ChannelCommission;
type ChannelCommission = ();
}

parameter_types! {
Expand Down Expand Up @@ -1470,7 +1470,7 @@ impl bifrost_vtoken_minting::Config for Runtime {
type MoonbeamParachainId = ConstU32<2004>;
type HydradxParachainId = ConstU32<2034>;
type InterlayParachainId = ConstU32<2032>;
type ChannelCommission = ChannelCommission;
type ChannelCommission = ();
}

parameter_types! {
Expand Down Expand Up @@ -1594,22 +1594,22 @@ impl leverage_staking::Config for Runtime {
type CurrencyIdConversion = AssetIdMaps<Runtime>;
}

parameter_types! {
pub const ClearingDuration: u32 = prod_or_fast!(7 * DAYS, 10 * MINUTES);
pub const NameLengthLimit: u32 = 20;
pub BifrostCommissionReceiver: AccountId = TreasuryPalletId::get().into_account_truncating();
}

impl bifrost_channel_commission::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type MultiCurrency = Currencies;
type ControlOrigin = EitherOfDiverse<CoreAdminOrCouncil, LiquidStaking>;
type CommissionPalletId = CommissionPalletId;
type BifrostCommissionReceiver = BifrostCommissionReceiver;
type WeightInfo = weights::bifrost_channel_commission::BifrostWeight<Runtime>;
type ClearingDuration = ClearingDuration;
type NameLengthLimit = NameLengthLimit;
}
// parameter_types! {
// pub const ClearingDuration: u32 = prod_or_fast!(7 * DAYS, 10 * MINUTES);
// pub const NameLengthLimit: u32 = 20;
// pub BifrostCommissionReceiver: AccountId = TreasuryPalletId::get().into_account_truncating();
// }
//
// impl bifrost_channel_commission::Config for Runtime {
// type RuntimeEvent = RuntimeEvent;
// type MultiCurrency = Currencies;
// type ControlOrigin = EitherOfDiverse<CoreAdminOrCouncil, LiquidStaking>;
// type CommissionPalletId = CommissionPalletId;
// type BifrostCommissionReceiver = BifrostCommissionReceiver;
// type WeightInfo = weights::bifrost_channel_commission::BifrostWeight<Runtime>;
// type ClearingDuration = ClearingDuration;
// type NameLengthLimit = NameLengthLimit;
// }

// Below is the implementation of tokens manipulation functions other than native token.
pub struct LocalAssetAdaptor<Local>(PhantomData<Local>);
Expand Down Expand Up @@ -1794,7 +1794,7 @@ construct_runtime! {
Oracle: orml_oracle::<Instance1> = 133,
OracleMembership: pallet_membership::<Instance3> = 134,
LeverageStaking: leverage_staking = 135,
ChannelCommission: bifrost_channel_commission = 136,
// ChannelCommission: bifrost_channel_commission = 136,
}
}

Expand Down
Loading