Skip to content

Allow BNC transfer and enable vesting #343

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

Merged
ark930 merged 2 commits into from
Oct 13, 2021
Merged

Allow BNC transfer and enable vesting #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddef63f
Allow BNC transfer and enable vesting
ark930 Oct 11, 2021
4440b92
Merge branch 'develop' into v0.9.3
ark930 Oct 12, 2021
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 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion node/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "node-cli"
version = "0.9.2"
version = "0.9.3"
authors = ["Liebi Technologies <bifrost@liebi.com>"]
description = "Bifrost Parachain Node"
build = "build.rs"
Expand Down
18 changes: 9 additions & 9 deletions pallets/vesting/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,15 @@ pub mod pallet {

#[pallet::hooks]
impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
// fn on_runtime_upgrade() -> frame_support::weights::Weight {
// if !VestingStartAt::<T>::exists() {
// let now = <frame_system::Pallet<T>>::block_number();
// VestingStartAt::<T>::put(now);
// T::DbWeight::get().reads_writes(1, 1)
// } else {
// 0
// }
// }
fn on_runtime_upgrade() -> frame_support::weights::Weight {
if !VestingStartAt::<T>::exists() {
let now = <frame_system::Pallet<T>>::block_number();
VestingStartAt::<T>::put(now);
T::DbWeight::get().reads_writes(1, 1)
} else {
0
}
}
}

#[pallet::call]
Expand Down
33 changes: 6 additions & 27 deletions runtime/bifrost/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("bifrost"),
impl_name: create_runtime_str!("bifrost"),
authoring_version: 1,
spec_version: 902,
spec_version: 903,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down Expand Up @@ -186,29 +186,6 @@ impl Contains<Call> for CallFilter {
match *c {
// call banned

// BNC transfer
Call::Currencies(orml_currencies::Call::transfer_native_currency(..)) => false,
Call::Currencies(orml_currencies::Call::transfer(
_,
CurrencyId::Native(TokenSymbol::BNC),
_,
)) => false,
Call::Tokens(orml_tokens::Call::transfer(
_,
CurrencyId::Native(TokenSymbol::BNC),
_,
)) => false,
Call::Tokens(orml_tokens::Call::transfer_all(
_,
CurrencyId::Native(TokenSymbol::BNC),
_,
)) => false,
Call::Tokens(orml_tokens::Call::transfer_keep_alive(
_,
CurrencyId::Native(TokenSymbol::BNC),
_,
)) => false,

// ZLK transfer
Call::Currencies(orml_currencies::Call::transfer(
_,
Expand All @@ -231,8 +208,6 @@ impl Contains<Call> for CallFilter {
_,
)) => false,

Call::Balances(_) => false,
Call::Vesting(_) => false,
Call::PhragmenElection(_) => false,
_ => true,
}
Expand All @@ -253,7 +228,11 @@ parameter_types! {
}

pub fn get_all_pallet_accounts() -> Vec<AccountId> {
vec![TreasuryPalletId::get().into_account(), BifrostCrowdloanId::get().into_account()]
vec![
TreasuryPalletId::get().into_account(),
BifrostCrowdloanId::get().into_account(),
LiquidityMiningPalletId::get().into_account(),
]
}

impl frame_system::Config for Runtime {
Expand Down