fix: 🐛 redefine system pool id (#1421)

* fix: 🐛 redefine system pool id * fix: 🐛 auto_notify_reward * refactor: 💡 rename to bb-bnc * style: 💄 clippy * fix: 🐛 rename error * refactor: 💡 rm BbBNCPalletId * fix: 🐛 UserFarmingPool bound limit
bifrost-finance · Sep 11, 2024 · b26c6bc · b26c6bc
1 parent 7bcc93f
commit b26c6bc
Show file tree

Hide file tree

Showing 51 changed files with 905 additions and 920 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,7 @@ members = [
 	"pallets/system-maker",
 	"pallets/fee-share",
 	"pallets/parachain-staking",
-	"pallets/ve-minting",
+	"pallets/bb-bnc",
 	"pallets/stable-pool",
 	"pallets/lend-market",
 	"pallets/prices",
@@ -53,7 +53,7 @@ bifrost-flexible-fee-rpc = { path = "pallets/flexible-fee/rpc" }
 bifrost-rpc              = { path = "node/rpc" }
 bifrost-salp-rpc         = { path = "pallets/salp/rpc" }
 bifrost-stable-pool-rpc  = { path = "pallets/stable-pool/rpc" }
-bifrost-ve-minting-rpc   = { path = "pallets/ve-minting/rpc" }
+bb-bnc-rpc               = { path = "pallets/bb-bnc/rpc" }
 lend-market-rpc          = { path = "pallets/lend-market/rpc" }
 bifrost-vtoken-minting-rpc = { path = "pallets/vtoken-minting/rpc" }
 
@@ -89,8 +89,8 @@ bifrost-system-maker                   = { path = "pallets/system-maker", defaul
 bifrost-system-staking                 = { path = "pallets/system-staking", default-features = false }
 bifrost-token-issuer                   = { path = "pallets/token-issuer", default-features = false }
 bifrost-vbnc-convert                   = { path = "pallets/vbnc-convert", default-features = false }
-bifrost-ve-minting                     = { path = "pallets/ve-minting", default-features = false }
-bifrost-ve-minting-rpc-runtime-api     = { path = "pallets/ve-minting/rpc/runtime-api", default-features = false }
+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 }

diff --git a/node/rpc/Cargo.toml b/node/rpc/Cargo.toml
@@ -44,8 +44,8 @@ bifrost-salp-rpc = { workspace = true }
 bifrost-salp-rpc-runtime-api = { workspace = true }
 bifrost-farming-rpc = { workspace = true }
 bifrost-farming-rpc-runtime-api = { workspace = true }
-bifrost-ve-minting-rpc = { workspace = true }
-bifrost-ve-minting-rpc-runtime-api = { workspace = true }
+bb-bnc-rpc = { workspace = true }
+bb-bnc-rpc-runtime-api = { workspace = true }
 bifrost-stable-pool-rpc = { workspace = true }
 bifrost-stable-pool-rpc-runtime-api = { workspace = true }
 lend-market-rpc = { workspace = true }

diff --git a/node/rpc/src/lib.rs b/node/rpc/src/lib.rs
@@ -33,6 +33,8 @@
 
 use std::sync::Arc;
 
+use bb_bnc_rpc::{BbBNCRpc, BbBNCRpcApiServer};
+use bb_bnc_rpc_runtime_api::BbBNCRuntimeApi;
 use bifrost_farming_rpc::{FarmingRpc, FarmingRpcApiServer};
 use bifrost_farming_rpc_runtime_api::FarmingRuntimeApi;
 use bifrost_flexible_fee_rpc::{FeeRpcApiServer, FlexibleFeeRpc};
@@ -43,8 +45,6 @@ use bifrost_salp_rpc::{SalpRpc, SalpRpcApiServer};
 use bifrost_salp_rpc_runtime_api::SalpRuntimeApi;
 use bifrost_stable_pool_rpc::{StablePoolRpc, StablePoolRpcApiServer};
 use bifrost_stable_pool_rpc_runtime_api::StablePoolRuntimeApi;
-use bifrost_ve_minting_rpc::{VeMintingRpc, VeMintingRpcApiServer};
-use bifrost_ve_minting_rpc_runtime_api::VeMintingRuntimeApi;
 use bifrost_vtoken_minting_rpc::{VtokenMintingRpc, VtokenMintingRpcApiServer};
 use bifrost_vtoken_minting_rpc_runtime_api::VtokenMintingRuntimeApi;
 use futures::channel::mpsc;
@@ -152,7 +152,7 @@ where
 	C::Api: FarmingRuntimeApi<Block, AccountId, PoolId, CurrencyId>,
 	C::Api: FeeRuntimeApi<Block, AccountId>,
 	C::Api: SalpRuntimeApi<Block, ParaId, AccountId>,
-	C::Api: VeMintingRuntimeApi<Block, AccountId>,
+	C::Api: BbBNCRuntimeApi<Block, AccountId>,
 	C::Api: LendMarketApi<Block, AccountId, Balance>,
 	C::Api: VtokenMintingRuntimeApi<Block, CurrencyId>,
 	C::Api: ZenlinkProtocolRuntimeApi<Block, AccountId, AssetId>,
@@ -169,7 +169,7 @@ where
 	module.merge(FarmingRpc::new(client.clone()).into_rpc())?;
 	module.merge(FlexibleFeeRpc::new(client.clone()).into_rpc())?;
 	module.merge(SalpRpc::new(client.clone()).into_rpc())?;
-	module.merge(VeMintingRpc::new(client.clone()).into_rpc())?;
+	module.merge(BbBNCRpc::new(client.clone()).into_rpc())?;
 	module.merge(ZenlinkProtocol::new(client.clone()).into_rpc())?;
 	module.merge(StablePoolRpc::new(client.clone()).into_rpc())?;
 	module.merge(LendMarket::new(client.clone()).into_rpc())?;

diff --git a/node/service/Cargo.toml b/node/service/Cargo.toml
@@ -124,7 +124,7 @@ fp-rpc = { workspace = true, features = ["default"] }
 bifrost-flexible-fee-rpc-runtime-api = { workspace = true }
 bifrost-salp-rpc-runtime-api = { workspace = true }
 bifrost-farming-rpc-runtime-api = { workspace = true }
-bifrost-ve-minting-rpc-runtime-api = { workspace = true }
+bb-bnc-rpc-runtime-api = { workspace = true }
 
 [features]
 default = [ "std" ]

diff --git a/pallets/ve-minting/Cargo.toml → pallets/bb-bnc/Cargo.toml b/pallets/ve-minting/Cargo.toml → pallets/bb-bnc/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bifrost-ve-minting"
+name = "bb-bnc"
 version = "0.8.0"
 authors = ["Kadokura <ymlll0508@gmail.com>"]
 edition = "2021"

diff --git a/pallets/ve-minting/rpc/Cargo.toml → pallets/bb-bnc/rpc/Cargo.toml b/pallets/ve-minting/rpc/Cargo.toml → pallets/bb-bnc/rpc/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bifrost-ve-minting-rpc"
+name = "bb-bnc-rpc"
 version = "0.8.0"
 authors = ["Kadokura <ymlll0508@gmail.com>"]
 edition = "2021"
@@ -14,4 +14,4 @@ sp-blockchain = { workspace = true }
 sp-core = { workspace = true }
 sp-rpc = { workspace = true }
 bifrost-primitives = { workspace = true }
-bifrost-ve-minting-rpc-runtime-api = { workspace = true }
+bb-bnc-rpc-runtime-api = { workspace = true }
diff --git a/...ets/ve-minting/rpc/runtime-api/Cargo.toml → pallets/bb-bnc/rpc/runtime-api/Cargo.toml b/...ets/ve-minting/rpc/runtime-api/Cargo.toml → pallets/bb-bnc/rpc/runtime-api/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "bifrost-ve-minting-rpc-runtime-api"
+name = "bb-bnc-rpc-runtime-api"
 version = "0.8.0"
 authors = ["Kadokura <ymlll0508@gmail.com>"]
 edition = "2021"

diff --git a/...ets/ve-minting/rpc/runtime-api/src/lib.rs → pallets/bb-bnc/rpc/runtime-api/src/lib.rs b/...ets/ve-minting/rpc/runtime-api/src/lib.rs → pallets/bb-bnc/rpc/runtime-api/src/lib.rs
@@ -24,7 +24,7 @@ use sp_api::decl_runtime_apis;
 use sp_core::U256;
 
 decl_runtime_apis! {
-	pub trait VeMintingRuntimeApi<AccountId> where
+	pub trait BbBNCRuntimeApi<AccountId> where
 		AccountId: Codec,
 		BlockNumber: Codec,
 	{