Skip to content

Commit

Permalink
Merge pull request #798 from galacticcouncil/feat/xyk-liquidity-mining
Browse files Browse the repository at this point in the history
feat: liquidity mining for xyk pallet
  • Loading branch information
mrq1911 authored Apr 9, 2024
2 parents ac9335f + 942934a commit ad6046e
Show file tree
Hide file tree
Showing 68 changed files with 8,210 additions and 61 deletions.
60 changes: 43 additions & 17 deletions Cargo.lock

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

8 changes: 5 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ members = [
'runtime/hydradx/src/evm/evm-utility/macro',
'pallets/referrals',
'pallets/evm-accounts',
'pallets/dynamic-evm-fee'
'pallets/dynamic-evm-fee',
'pallets/xyk-liquidity-mining',
]

[workspace.dependencies]
Expand Down Expand Up @@ -86,6 +87,7 @@ pallet-xyk = { path = "pallets/xyk", default-features = false}
pallet-referrals = { path = "pallets/referrals", default-features = false}
pallet-evm-accounts = { path = "pallets/evm-accounts", default-features = false}
pallet-evm-accounts-rpc-runtime-api = { path = "pallets/evm-accounts/rpc/runtime-api", default-features = false}
pallet-xyk-liquidity-mining = { path = "pallets/xyk-liquidity-mining", default-features = false }

hydra-dx-build-script-utils = { path = "utils/build-script-utils", default-features = false }
scraper = { path = "scraper", default-features = false }
Expand All @@ -103,7 +105,7 @@ frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", rev =
frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
frame-remote-externalities = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
frame-support = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false, features = ["tuples-96"] }
frame-system = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
Expand Down Expand Up @@ -578,4 +580,4 @@ westend-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev

cumulus-client-pov-recovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
cumulus-pallet-parachain-system-proc-macro = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
cumulus-relay-chain-rpc-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
cumulus-relay-chain-rpc-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
3 changes: 2 additions & 1 deletion integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "runtime-integration-tests"
version = "1.19.12"
version = "1.20.0"
description = "Integration tests"
authors = ["GalacticCouncil"]
edition = "2021"
Expand Down Expand Up @@ -45,6 +45,7 @@ pallet-democracy = { workspace = true }
pallet-scheduler = { workspace = true }
pallet-elections-phragmen = { workspace = true }
pallet-tips = { workspace = true }
pallet-xyk-liquidity-mining = { workspace = true }

# collator support
pallet-collator-selection = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions integration-tests/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ mod vesting;
mod xcm_defer;
mod xcm_rate_limiter;
mod xyk;
mod xyk_liquidity_mining;

#[macro_export]
macro_rules! assert_balance {
Expand Down
Loading

0 comments on commit ad6046e

Please sign in to comment.