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

V0.9.23 #482

Merged
merged 3 commits into from
Jan 27, 2022
Merged

V0.9.23 #482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
582ee5f
Release v0.9.23
yrong Jan 24, 2022
db0c1d8
Merge branch 'develop' into v0.9.23
yrong Jan 24, 2022
767bc19
Fix benchmark in ci
yrong Jan 24, 2022
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 .github/workflows/benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
target: wasm32-unknown-unknown
default: true
- name: Generate WeightInfo Files
run: make generate-all-weights
run: make generate-bifrost-weights
- name: Commit Automatically
uses: stefanzweifel/git-auto-commit-action@v4
with:
Expand Down
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.22"
version = "0.9.23"
authors = ["Liebi Technologies <bifrost@liebi.com>"]
description = "Bifrost Parachain Node"
build = "build.rs"
Expand Down
9 changes: 6 additions & 3 deletions pallets/salp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "pol
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
xcm-support = { path = "../../xcm-support", default-features = false }
orml-traits = { version = "0.4.1-dev", default-features = false }
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13",default-features = false }
pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13",default-features = false }
pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13",default-features = false }

[dev-dependencies]
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" }
pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13" }
pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13"}
smallvec = "1.6.1"
sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
Expand All @@ -31,7 +32,6 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkad
orml-tokens = "0.4.1-dev"
orml-currencies = "0.4.1-dev"
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
bifrost-bancor = { path = "../../pallets/bancor" }
bifrost-runtime-common = { path = "../../runtime/common" }

Expand All @@ -50,6 +50,9 @@ std = [
"sp-arithmetic/std",
"orml-traits/std",
"xcm/std",
"xcm-builder/std",
"pallet-xcm/std",
"pallet-collective/std",
"xcm-support/std",
]

Expand Down
6 changes: 3 additions & 3 deletions runtime/bifrost-kusama/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polka
pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
pallet-bounties = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13",default-features = false }
pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
Expand Down Expand Up @@ -73,11 +73,11 @@ pallet-collator-selection = { git = "https://github.com/paritytech/cumulus", bra
parachain-info = { git = "https://github.com/paritytech/cumulus", branch = "polkadot-v0.9.13", default-features = false }

# Polkadot dependencies
pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13",default-features = false}
polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13",default-features = false}
xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }

# Bifrost
Expand Down
46 changes: 1 addition & 45 deletions runtime/bifrost-kusama/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("bifrost"),
impl_name: create_runtime_str!("bifrost"),
authoring_version: 1,
spec_version: 922,
spec_version: 923,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down Expand Up @@ -2024,50 +2024,6 @@ impl_runtime_apis! {
}
}

pub struct LatestRuntimeUpgrade;
impl OnRuntimeUpgrade for LatestRuntimeUpgrade {
fn on_runtime_upgrade() -> Weight {
let w_ksm = bifrost_liquidity_mining::migration::v2::Upgrade::<
Runtime,
bifrost_liquidity_mining::Instance1,
>::on_runtime_upgrade();
let w_dot = bifrost_liquidity_mining::migration::v2::Upgrade::<
Runtime,
bifrost_liquidity_mining::Instance2,
>::on_runtime_upgrade();

w_ksm + w_dot
}

#[cfg(feature = "try-runtime")]
fn pre_upgrade() -> Result<(), &'static str> {
bifrost_liquidity_mining::migration::v2::Upgrade::<
Runtime,
bifrost_liquidity_mining::Instance1,
>::pre_upgrade()?;
bifrost_liquidity_mining::migration::v2::Upgrade::<
Runtime,
bifrost_liquidity_mining::Instance2,
>::pre_upgrade()?;

Ok(())
}

#[cfg(feature = "try-runtime")]
fn post_upgrade() -> Result<(), &'static str> {
bifrost_liquidity_mining::migration::v2::Upgrade::<
Runtime,
bifrost_liquidity_mining::Instance1,
>::post_upgrade()?;
bifrost_liquidity_mining::migration::v2::Upgrade::<
Runtime,
bifrost_liquidity_mining::Instance2,
>::post_upgrade()?;

Ok(())
}
}

struct CheckInherents;

impl cumulus_pallet_parachain_system::CheckInherents<Block> for CheckInherents {
Expand Down
4 changes: 2 additions & 2 deletions scripts/generate-weights.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# sh ./script/generate-weights.sh asgard bifrost

# 1. Build all-release which is added with "runtime-benchmarks" feature;
make "build-all-release-with-bench"
make build-bifrost-release-with-bench
# 2. Filter the pallets of ${runtime} that should be executed benchmark;
IFS=', ' read -r -a runtimes <<< $@;
for runtime in "${runtimes[@]}"
Expand All @@ -31,6 +31,6 @@ do
--wasm-execution=compiled \
--heap-pages=4096 \
--header=./HEADER-GPL3 \
--output="./runtime/${runtime}/src/weights/${pallet}.rs";
--output="./runtime/${runtime}-kusama/src/weights/${pallet}.rs";
done
done