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.

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 vsbond auction pallet #1456

Merged
merged 5 commits into from
Oct 11, 2024
Merged
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
21 changes: 0 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ members = [
"pallets/salp",
"pallets/token-issuer",
"pallets/vesting",
"pallets/vsbond-auction",
"pallets/cross-in-out",
"pallets/evm-accounts",
"pallets/xcm-interface",
Expand Down Expand Up @@ -92,7 +91,6 @@ bifrost-vbnc-convert = { path = "pallets/vbnc-convert", defaul
bb-bnc = { path = "pallets/bb-bnc", default-features = false }
bb-bnc-rpc-runtime-api = { path = "pallets/bb-bnc/rpc/runtime-api", default-features = false }
bifrost-vesting = { path = "pallets/vesting", default-features = false }
bifrost-vsbond-auction = { path = "pallets/vsbond-auction", default-features = false }
bifrost-vstoken-conversion = { path = "pallets/vstoken-conversion", default-features = false }
bifrost-vtoken-minting = { path = "pallets/vtoken-minting", default-features = false }
bifrost-vtoken-minting-rpc-runtime-api = { path = "pallets/vtoken-minting/rpc/runtime-api", default-features = false }
Expand Down
1 change: 1 addition & 0 deletions primitives/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ parameter_types! {
pub const TreasuryPalletId: PalletId = PalletId(*b"bf/trsry");
pub const VBNCConvertPalletId: PalletId = PalletId(*b"bf/vbncc");
pub const VeMintingPalletId: PalletId = PalletId(*b"bf/vemnt");
// unused after vsbond_auction pallet removed
pub const VsbondAuctionPalletId: PalletId = PalletId(*b"bf/vsbnd");
pub const ZenlinkPalletId: PalletId = PalletId(*b"/zenlink");
}
Expand Down
4 changes: 0 additions & 4 deletions runtime/bifrost-kusama/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ bifrost-system-maker = { workspace = true }
bifrost-system-staking = { workspace = true }
bifrost-token-issuer = { workspace = true }
bifrost-vesting = { workspace = true }
bifrost-vsbond-auction = { workspace = true }
bifrost-vstoken-conversion = { workspace = true }
bifrost-vtoken-minting = { workspace = true }
bifrost-vtoken-voting = { workspace = true, features = [ "kusama" ] }
Expand Down Expand Up @@ -260,7 +259,6 @@ std = [
"bifrost-system-staking/std",
"bifrost-token-issuer/std",
"bifrost-vesting/std",
"bifrost-vsbond-auction/std",
"bifrost-vstoken-conversion/std",
"bifrost-vtoken-minting/std",
"bifrost-vtoken-voting/std",
Expand Down Expand Up @@ -306,7 +304,6 @@ runtime-benchmarks = [
"xcm-builder/runtime-benchmarks",
"bifrost-flexible-fee/runtime-benchmarks",
"bifrost-salp/runtime-benchmarks",
"bifrost-vsbond-auction/runtime-benchmarks",
"bifrost-token-issuer/runtime-benchmarks",
"bifrost-vtoken-minting/runtime-benchmarks",
"bifrost-farming/runtime-benchmarks",
Expand Down Expand Up @@ -380,7 +377,6 @@ try-runtime = [
"bifrost-flexible-fee/try-runtime",
"bifrost-salp/try-runtime",
"bifrost-token-issuer/try-runtime",
"bifrost-vsbond-auction/try-runtime",
"bifrost-asset-registry/try-runtime",
"bifrost-vtoken-minting/try-runtime",
"bifrost-slp/try-runtime",
Expand Down
23 changes: 7 additions & 16 deletions runtime/bifrost-kusama/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ use bifrost_primitives::{
FarmingRewardIssuerPalletId, FeeSharePalletId, FlexibleFeePalletId, IncentivePoolAccount,
LendMarketPalletId, MerkleDirtributorPalletId, OraclePalletId, ParachainStakingPalletId,
SlpEntrancePalletId, SlpExitPalletId, SystemMakerPalletId, SystemStakingPalletId,
TreasuryPalletId, VBNCConvertPalletId, VsbondAuctionPalletId,
TreasuryPalletId, VBNCConvertPalletId,
};
pub use frame_support::{
construct_runtime, match_types, parameter_types,
Expand Down Expand Up @@ -1159,18 +1159,6 @@ parameter_types! {
pub const MinimumSupply: Balance = 0;
}

impl bifrost_vsbond_auction::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type InvoicingCurrency = RelayCurrencyId;
type MaximumOrderInTrade = MaximumOrderInTrade;
type MinimumAmount = MinimumSupply;
type MultiCurrency = Currencies;
type WeightInfo = weights::bifrost_vsbond_auction::BifrostWeight<Runtime>;
type PalletId = VsbondAuctionPalletId;
type TreasuryAccount = BifrostTreasuryAccount;
type ControlOrigin = TechAdminOrCouncil;
}

impl bifrost_token_issuer::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type MultiCurrency = Currencies;
Expand Down Expand Up @@ -1828,7 +1816,6 @@ construct_runtime! {
FlexibleFee: bifrost_flexible_fee = 100,
Salp: bifrost_salp = 105,
TokenIssuer: bifrost_token_issuer = 109,
VSBondAuction: bifrost_vsbond_auction = 113,
AssetRegistry: bifrost_asset_registry = 114,
VtokenMinting: bifrost_vtoken_minting = 115,
Slp: bifrost_slp = 116,
Expand Down Expand Up @@ -1905,13 +1892,16 @@ pub type Migrations = migrations::Unreleased;

parameter_types! {
pub const SystemMakerName: &'static str = "SystemMaker";
pub const VSBondAuctionName: &'static str = "VSBondAuction";
}

/// The runtime migrations per release.
pub mod migrations {
#![allow(unused_imports)]
use super::*;
use migration::system_maker::SystemMakerClearPalletId;
use migration::{
system_maker::SystemMakerClearPalletId, vsbond_auction::VSBondAuctionClearPalletId,
};

/// Unreleased migrations. Add new ones here:
pub type Unreleased = (
Expand All @@ -1920,7 +1910,9 @@ pub mod migrations {
bifrost_cross_in_out::migrations::v3::MigrateToV2<Runtime>,
bifrost_asset_registry::migrations::v1::MigrateToV1<Runtime>,
SystemMakerClearPalletId<Runtime>,
VSBondAuctionClearPalletId<Runtime>,
frame_support::migrations::RemovePallet<SystemMakerName, RocksDbWeight>,
frame_support::migrations::RemovePallet<VSBondAuctionName, RocksDbWeight>,
);
}

Expand Down Expand Up @@ -1951,7 +1943,6 @@ mod benches {
[bifrost_stable_pool, StablePool]
[bifrost_system_staking, SystemStaking]
[bifrost_token_issuer, TokenIssuer]
[bifrost_vsbond_auction, VSBondAuction]
[bifrost_vstoken_conversion, VstokenConversion]
[bifrost_vtoken_minting, VtokenMinting]
[bifrost_vtoken_voting, VtokenVoting]
Expand Down
Loading