Skip to content

Commit

Permalink
Merge branch 'v0.11.0' into feat/slpx-mint-add-commission-id
Browse files Browse the repository at this point in the history
  • Loading branch information
SunTiebing committed Jun 19, 2024
2 parents d0c11e2 + fa21d8e commit 6ff9067
Show file tree
Hide file tree
Showing 126 changed files with 4,202 additions and 7,850 deletions.
1,466 changes: 800 additions & 666 deletions Cargo.lock

Large diffs are not rendered by default.

319 changes: 161 additions & 158 deletions Cargo.toml

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,14 @@ copy-genesis-config-release:

.PHONY: format # cargo fmt
format:
cargo +nightly fmt --all

.PHONY: format-check # cargo fmt check
format-check:
cargo +nightly fmt --all -- --check

.PHONY: clippy # cargo clippy
clippy:
clippy: format-check
SKIP_WASM_BUILD= cargo clippy --all --all-targets --features=with-all-runtime -- -D warnings

.PHONY: benchmarking-staking # benchmarking staking pallet
Expand Down
50 changes: 50 additions & 0 deletions integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
[package]
name = "bifrost-integration-tests"
version = "0.8.0"
authors = ["hqwangningbo <[email protected]>"]
edition = "2021"

[dev-dependencies]
bifrost-asset-registry = { workspace = true }
bifrost-currencies = { workspace = true }
bifrost-polkadot-runtime = { workspace = true }
bifrost-primitives = { workspace = true }
bifrost-runtime-common = { workspace = true }
bifrost-slp = { workspace = true }
bifrost-vtoken-voting = { workspace = true }
bifrost-xcm-interface = { workspace = true }
cumulus-primitives-core = { workspace = true }
env_logger = { workspace = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
hex-literal = { workspace = true }
log = { workspace = true }
orml-tokens = { workspace = true }
orml-traits = { workspace = true }
orml-xtokens = { workspace = true }
pallet-assets = { workspace = true }
pallet-balances = { workspace = true }
pallet-conviction-voting = { workspace = true }
pallet-message-queue = { workspace = true }
pallet-referenda = { workspace = true }
pallet-staking = { workspace = true }
pallet-xcm = { workspace = true }
parachain-info = { workspace = true }
parachains-common = { workspace = true }
parity-scale-codec = { workspace = true }
polkadot-core-primitives = { workspace = true }
polkadot-parachain-primitives = { workspace = true, features = ["std"] }
polkadot-runtime-common = { workspace = true, features = ["std"] }
polkadot-runtime-parachains = { workspace = true, features = ["std"] }
scale-info = { workspace = true }
serde = { workspace = true }
sp-core = { workspace = true }
sp-io = { workspace = true }
sp-runtime = { workspace = true }
sp-staking = { workspace = true }
sp-std = { workspace = true }
xcm = { workspace = true }
xcm-builder = { workspace = true }
xcm-emulator = { workspace = true }
xcm-executor = { workspace = true }
xcm-simulator = { workspace = true }
45 changes: 0 additions & 45 deletions integration-tests/bifrost-kusama/Cargo.toml

This file was deleted.

185 changes: 0 additions & 185 deletions integration-tests/bifrost-kusama/src/account_id.rs

This file was deleted.

Loading

0 comments on commit 6ff9067

Please sign in to comment.