Skip to content

Commit

Permalink
Merge pull request #616 from galacticcouncil/apopiak/add-xcm-rate-lim…
Browse files Browse the repository at this point in the history
…it-migration

feat: asset registry xcm rate limit
  • Loading branch information
mrq1911 authored May 30, 2023
2 parents 8306078 + 534c079 commit 7c53e94
Show file tree
Hide file tree
Showing 17 changed files with 138 additions and 104 deletions.
52 changes: 26 additions & 26 deletions Cargo.lock

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

20 changes: 10 additions & 10 deletions integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ repository = "/~https://github.com/galacticcouncil/Basilisk-node"

[dependencies]
# Warehouse dependencies
pallet-transaction-multi-payment = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false}
pallet-price-oracle = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false}
pallet-nft = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-currencies = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-route-executor = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-asset-registry = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-ema-oracle = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
hydradx-traits = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-duster = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-transaction-multi-payment = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false}
pallet-price-oracle = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false}
pallet-nft = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
pallet-currencies = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
pallet-route-executor = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
pallet-asset-registry = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
pallet-ema-oracle = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
hydradx-traits = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
pallet-duster = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }

pallet-xyk = { path = "../pallets/xyk",default-features = false}
pallet-lbp = { path = "../pallets/lbp", default-features = false }
Expand Down Expand Up @@ -109,7 +109,7 @@ parachain-runtime-mock = { path = "parachain-runtime-mock", default-features = f
[dev-dependencies]
xcm-emulator = { git = "/~https://github.com/shaunxw/xcm-simulator", rev = "754f3b90ecc65af735a6c9a2e1792c5253926ff6" }
hex-literal = "0.4.1"
pallet-relaychain-info = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd" }
pallet-relaychain-info = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334" }
pretty_assertions = "1.2.1"
sp-arithmetic = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
test-case = "3.1.0"
Expand Down
22 changes: 11 additions & 11 deletions integration-tests/parachain-runtime-mock/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "parachain-runtime-mock"
version = "0.2.3"
version = "0.2.4"
description = "A mock runtime for a parachain"
authors = ["GalacticCouncil"]
edition = "2021"
Expand All @@ -14,15 +14,15 @@ codec = { package = "parity-scale-codec", version = "3.4.0", default-features =
scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }

# Warehouse dependencies
pallet-transaction-multi-payment = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false}
pallet-price-oracle = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false}
pallet-nft = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-currencies = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-route-executor = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-asset-registry = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
hydradx-traits = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
hydradx-adapters = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-duster = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-transaction-multi-payment = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false}
pallet-price-oracle = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false}
pallet-nft = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
pallet-currencies = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
pallet-route-executor = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
pallet-asset-registry = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
hydradx-traits = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
hydradx-adapters = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
pallet-duster = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }

pallet-xyk = { path = "../../pallets/xyk",default-features = false}
pallet-lbp = { path = "../../pallets/lbp", default-features = false }
Expand Down Expand Up @@ -111,7 +111,7 @@ kusama-runtime = { git = "/~https://github.com/paritytech/polkadot", branch = "rel
[dev-dependencies]
xcm-emulator = { git = "/~https://github.com/shaunxw/xcm-simulator", rev = "6847a58888e483f0ed2e0b72f90e00767ea0ecac" }
hex-literal = "0.4.1"
pallet-relaychain-info = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd" }
pallet-relaychain-info = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334" }
pretty_assertions = "1.2.1"
sp-arithmetic = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
test-case = "3.1.0"
Expand Down
8 changes: 4 additions & 4 deletions pallets/lbp/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-lbp"
version = "4.6.10"
version = "4.6.11"
description = "HydraDX Liquidity Bootstrapping Pool Pallet"
authors = ["GalacticCouncil"]
edition = "2021"
Expand All @@ -21,9 +21,9 @@ primitive-types = { default-features = false, version = "0.12.0" }
serde = { features = ["derive"], optional = true, version = "1.0.136" }

# Warehouse dependencies
hydra-dx-math = { git = "/~https://github.com/galacticcouncil/HydraDX-math", rev = "35e5c0775a07e057ed5247ba96dfa254d691f034", default-features = false }
hydra-dx-math = { git = "/~https://github.com/galacticcouncil/HydraDX-math", rev = "380b80b59bbf62abb8848fb8a10bb206861eab41", default-features = false }

hydradx-traits = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
hydradx-traits = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }

## Local dependencies
primitives = { default-features = false, path = "../../primitives" }
Expand All @@ -45,7 +45,7 @@ sp-runtime = { git = "/~https://github.com/paritytech/substrate", branch = "polkad

[dev-dependencies]
sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
test-utils = {git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false}
test-utils = {git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false}

[features]
default = ["std"]
Expand Down
4 changes: 2 additions & 2 deletions pallets/marketplace/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-marketplace"
version = "5.0.12"
version = "5.0.13"
authors = ["GalacticCoucil"]
description = "The marketplace for trading NFTs"
edition = "2018"
Expand All @@ -26,7 +26,7 @@ sp-io = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0
pallet-uniques = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }

# Warehouse dependency
pallet-nft = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-nft = { git = "/~https://github.com/galacticcouncil/warehouse", rev = "d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }

# local dependency
primitives = { default-features = false, path = "../../primitives" }
Expand Down
8 changes: 4 additions & 4 deletions pallets/xyk-liquidity-mining/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "pallet-xyk-liquidity-mining"
version = "1.1.6"
version = "1.1.7"
description = "Liquidity mining"
authors = ["GalacticCouncil"]
edition = "2021"
Expand All @@ -24,9 +24,9 @@ orml-traits = { git = "/~https://github.com/open-web3-stack/open-runtime-module-li
primitives = { path = "../../primitives", default-features = false }

# Warehouse dependencies
pallet-liquidity-mining = { git = "/~https://github.com/galacticcouncil/warehouse", rev="f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
hydradx-traits = { git = "/~https://github.com/galacticcouncil/warehouse", rev="f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-nft = { git = "/~https://github.com/galacticcouncil/warehouse", rev="f64f50255965a1177d28bbc969a371013584bbdd", default-features = false }
pallet-liquidity-mining = { git = "/~https://github.com/galacticcouncil/warehouse", rev="d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
hydradx-traits = { git = "/~https://github.com/galacticcouncil/warehouse", rev="d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }
pallet-nft = { git = "/~https://github.com/galacticcouncil/warehouse", rev="d6a78b5d51bc8af525d2b8f856efcfce2159e334", default-features = false }

# Substrate dependencies
sp-std = { git = "/~https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
Expand Down
Loading

0 comments on commit 7c53e94

Please sign in to comment.