Skip to content

Commit

Permalink
merge master to alistair/enable-bridged-reserves
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmoka
dmoka committed May 14, 2024
2 parents ebb7141 + e3821e0 commit b3cc5c5
Show file tree
Hide file tree
Showing 53 changed files with 3,717 additions and 236 deletions.
47 changes: 25 additions & 22 deletions Cargo.lock
View file

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

21 changes: 11 additions & 10 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,19 +210,20 @@ substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-
substrate-rpc-client = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }

#TODO: We use our custom ORML as it contains the fix of bug for reducible_balance check, for Preserve mode. Once the official ORML pushes a new version with the fix, we can use that again
# ORML dependencies
orml-benchmarking = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false }
orml-currencies = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false }
orml-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false }
orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false }
orml-utilities = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false }
orml-vesting = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false }
orml-benchmarking = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
orml-currencies = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
orml-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
orml-traits = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
orml-utilities = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
orml-vesting = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }

# orml XCM support
orml-unknown-tokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false }
orml-xcm = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false }
orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false }
orml-xtokens = { git = "https://github.com/open-web3-stack/open-runtime-module-library", rev = "b3694e631df7f1ca16b1973122937753fcdee9d4", default-features = false }
orml-unknown-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
orml-xcm = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
orml-xcm-support = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
orml-xtokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }

# Cumulus dependencies
cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
Expand Down
4 changes: 3 additions & 1 deletion integration-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "runtime-integration-tests"
version = "1.21.2"
version = "1.21.5"
description = "Integration tests"
authors = ["GalacticCouncil"]
edition = "2021"
Expand Down Expand Up @@ -46,6 +46,7 @@ pallet-scheduler = { workspace = true }
pallet-elections-phragmen = { workspace = true }
pallet-tips = { workspace = true }
pallet-xyk-liquidity-mining = { workspace = true }
pallet-transaction-pause = { workspace = true }

# collator support
pallet-collator-selection = { workspace = true }
Expand Down Expand Up @@ -205,6 +206,7 @@ std = [
"scraper/std",
"pallet-dynamic-evm-fee/std",
"precompile-utils/std",
"pallet-transaction-pause/std",
]

# we don't include integration tests when benchmarking feature is enabled
Expand Down
Loading

0 comments on commit b3cc5c5

Please sign in to comment.