Skip to content

Support SDK 6.x #2252

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

Merged
nohaapav merged 7 commits into from
Apr 3, 2025
Merged

Support SDK 6.x #2252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
70dee03
"UPGRADE: Upgrading 1 package(s)\n\nPackages:\n @galacticcouncil/sdk…
actions-user Mar 27, 2025
1568e27
bump deps
nohaapav Mar 27, 2025
c4291f0
enable aave
nohaapav Mar 27, 2025
5a873ea
Support SDK 6.x
nohaapav Apr 1, 2025
f06488c
fix lint, fallback to default pegs
nohaapav Apr 1, 2025
3d289c8
disable aave amm for prod
nohaapav Apr 3, 2025
cd2c138
Merge branch 'master' into gc-apps
nohaapav Apr 3, 2025
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
4 changes: 3 additions & 1 deletion .env.development
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ VITE_EVM_CHAIN_ID=222222
VITE_EVM_NATIVE_ASSET_ID=20
VITE_MIGRATION_TRIGGER_DOMAIN="deploy-preview-1334--testnet-hydra-app.netlify.app"
VITE_MIGRATION_TARGET_DOMAIN="testnet-app.hydradx.io"
VITE_FF_UNIFIED_ADDRESS_FORMAT="false"
VITE_FF_UNIFIED_ADDRESS_FORMAT="false"

VITE_FF_AAVE_AMM_ENABLED=true
4 changes: 3 additions & 1 deletion .env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ VITE_EVM_CHAIN_ID=222222
VITE_EVM_NATIVE_ASSET_ID=20
VITE_MIGRATION_TRIGGER_DOMAIN="app.hydradx.io"
VITE_MIGRATION_TARGET_DOMAIN="app.hydration.net"
VITE_FF_UNIFIED_ADDRESS_FORMAT="false"
VITE_FF_UNIFIED_ADDRESS_FORMAT="false"

VITE_FF_AAVE_AMM_ENABLED=false
4 changes: 3 additions & 1 deletion .env.rococo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@ VITE_EVM_CHAIN_ID=
VITE_EVM_NATIVE_ASSET_ID=20
VITE_MIGRATION_TRIGGER_DOMAIN=""
VITE_MIGRATION_TARGET_DOMAIN=""
VITE_FF_UNIFIED_ADDRESS_FORMAT="false"
VITE_FF_UNIFIED_ADDRESS_FORMAT="false"

VITE_FF_AAVE_AMM_ENABLED=true
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@
"@emotion/styled": "^11.10.4",
"@ethersproject/address": "^5.7.0",
"@ethersproject/providers": "^5.7.2",
"@galacticcouncil/apps": "^10.10.0",
"@galacticcouncil/apps": "^12.0.0",
"@galacticcouncil/math-lbp": "^1.0.0",
"@galacticcouncil/math-liquidity-mining": "^1.0.0",
"@galacticcouncil/math-omnipool": "^1.1.0",
"@galacticcouncil/math-stableswap": "^1.2.0",
"@galacticcouncil/math-stableswap": "^2.0.0",
"@galacticcouncil/math-staking": "^1.0.0",
"@galacticcouncil/math-xyk": "^1.0.0",
"@galacticcouncil/sdk": "^5.6.0",
"@galacticcouncil/ui": "^5.4.0",
"@galacticcouncil/xcm-cfg": "^8.1.0",
"@galacticcouncil/sdk": "^6.0.0",
"@galacticcouncil/ui": "^5.5.0",
"@galacticcouncil/xcm-cfg": "^9.0.0",
"@galacticcouncil/xcm-core": "^7.0.0",
"@galacticcouncil/xcm-sdk": "^9.1.1",
"@hookform/resolvers": "^3.3.4",
Expand Down
7 changes: 7 additions & 0 deletions src/api/provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ const defaultProvider: Omit<ProviderProps, "name" | "url"> = {
dataEnv: "mainnet",
}

const AAVE_AMM_ENABLED = import.meta.env.VITE_FF_AAVE_AMM_ENABLED === "true"

export const PROVIDERS: ProviderProps[] = [
{
name: "GalacticCouncil",
Expand Down Expand Up @@ -404,6 +406,11 @@ export const useProviderData = (
PoolType.XYK,
PoolType.LBP,
]

if (AAVE_AMM_ENABLED) {
traderRoutes.push(PoolType.Aave)
}

const tradeRouter = new TradeRouter(poolService, {
includeOnly: traderRoutes,
})
Expand Down
7 changes: 5 additions & 2 deletions src/sections/pools/stablepool/removeLiquidity/RemoveLiquidity.utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
calculate_amplification,
calculate_liquidity_out_one_asset,
} from "@galacticcouncil/math-stableswap"
import { StableMath } from "@galacticcouncil/sdk"
import { useBestNumber } from "api/chain"
import { useStableswapPool } from "api/stableswap"
import { useTotalIssuances } from "api/totalIssuance"
Expand Down Expand Up @@ -35,20 +36,22 @@ export const useStablepoolLiquidityOut = ({ poolId, fee, reserves }: Args) => {

const getAssetOutValue = useCallback(
(assetId: number, shares: string) => {
if (amplification && shareIssuance) {
if (amplification && shareIssuance && pool) {
const pegs = StableMath.defaultPegs(pool.assets.length)
return calculate_liquidity_out_one_asset(
JSON.stringify(reserves),
shares,
assetId,
amplification,
shareIssuance,
fee,
JSON.stringify(pegs),
)
}

return "0"
},
[amplification, fee, reserves, shareIssuance],
[pool, amplification, fee, reserves, shareIssuance],
)

return {
Expand Down
4 changes: 4 additions & 0 deletions src/sections/pools/stablepool/transfer/AddStablepoolLiquidity.utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
calculate_amplification,
calculate_shares,
} from "@galacticcouncil/math-stableswap"
import { StableMath } from "@galacticcouncil/sdk"
import { useBestNumber } from "api/chain"
import { useStableswapPool } from "api/stableswap"
import { useTotalIssuances } from "api/totalIssuance"
Expand Down Expand Up @@ -45,12 +46,15 @@ export const useStablepoolShares = ({ poolId, asset, reserves }: Args) => {
},
]

const pegs = StableMath.defaultPegs(pool.data.assets.length)

const shares = calculate_shares(
JSON.stringify(reserves),
JSON.stringify(assets),
amplification,
shareIssuance.toString(),
new BigNumber(pool.data.fee.toString()).div(BN_MILL).toString(),
JSON.stringify(pegs),
)

return BigNumber.maximum(
Expand Down
42 changes: 21 additions & 21 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2582,10 +2582,10 @@
resolved "https://registry.yarnpkg.com/@galacticcouncil/api-augment/-/api-augment-0.3.0.tgz#1377809cf125941410eea6ad97b4da0ca1eabb6c"
integrity sha512-f14ftbivheBK8kSnqd8hSQlMPuVLY9571S5yx0LPU6K6m78F3pDPl09OEuJ+dSKHOw8hWzmFxiv0wRMYvDkeKA==

"@galacticcouncil/apps@^10.10.0":
version "10.10.0"
resolved "https://registry.yarnpkg.com/@galacticcouncil/apps/-/apps-10.10.0.tgz#a387229ba7740806c3ba5b8741cf1335ebeb4154"
integrity sha512-Q8nS8DiHbAnG6WJ52pz5Z2VoJFMI5qopHqt+NHLu0n/SfnYykN5CGUKRPyoOurdgoXQyQi10LBBlgC15xL7ddA==
"@galacticcouncil/apps@^12.0.0":
version "12.0.0"
resolved "https://registry.yarnpkg.com/@galacticcouncil/apps/-/apps-12.0.0.tgz#4ecbed3e11fa252c35e8d2b7a72fa441b04f7d0e"
integrity sha512-Ap47eZ9p8EHk5+o0MuF/tLDyJiEs67RQevHk8Cl1D/gNcxLMIyfveodnFR2katmy8DKebjTnE8d9/hv9jq5i+A==
dependencies:
"@cfx-kit/wallet-avatar" "0.0.5"
"@thi.ng/atom" "^5.1.3"
Expand Down Expand Up @@ -2613,10 +2613,10 @@
resolved "https://registry.yarnpkg.com/@galacticcouncil/math-omnipool/-/math-omnipool-1.1.0.tgz#e8b97131c80867a49752fd2d464f26b9529f3713"
integrity sha512-9sfzxwPeKTGTCxZfeYU7Wdp7Zye4tncyQ7aBrlae1qCncmoLsdr6BQd1MCOHeigJ06WxKBUtxSozO4Ipuxk1gQ==

"@galacticcouncil/math-stableswap@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@galacticcouncil/math-stableswap/-/math-stableswap-1.2.0.tgz#c6445d733da600fa7ad952bd5133c82f2fb6bed5"
integrity sha512-S46l/lfIO4KOPrXW8r62RXkFavcKEBpOUqOFw6JqTbabD1o7/TSbbpx1dQ2LQRfu5oOuhzWWPoIWyxeS1tOpMA==
"@galacticcouncil/math-stableswap@^2.0.0":
version "2.0.0"
resolved "https://registry.yarnpkg.com/@galacticcouncil/math-stableswap/-/math-stableswap-2.0.0.tgz#09014d0e88814d49f54bb2ab412b6497a50ee0a0"
integrity sha512-cFOuZlm04D3gHVCbsUZINOyuSLXaG6ZHqoHVQnW0PnZVEGRL9hXD3iLz06j9R5+xfHONirKHDJ/ZShw0XCx9Cw==

"@galacticcouncil/math-staking@^1.0.0":
version "1.0.0"
Expand All @@ -2628,25 +2628,25 @@
resolved "https://registry.yarnpkg.com/@galacticcouncil/math-xyk/-/math-xyk-1.0.0.tgz#eeb6f3693587c96131647a24af31536cab423d96"
integrity sha512-n44M7jKes5Rxr4RQZ5W7kscTfoO4xwhW3VL/VyaEP1KEHMavlICpDNOlCwO/k6RTr+UXU8cHLJZdBzGFa2soJA==

"@galacticcouncil/sdk@^5.6.0":
version "5.6.0"
resolved "https://registry.yarnpkg.com/@galacticcouncil/sdk/-/sdk-5.6.0.tgz#783e9fa3fb8ffb791192ab1b79571bdf753d36a7"
integrity sha512-gJ6cHY64FpBdYPj7ej0iknFsz9ErNiUCKP74+5yCCEp16nMcDu7lWCtMsRVA8XCYJxW0aRo0+pj9MYpJfOwkFQ==
"@galacticcouncil/sdk@^6.0.0":
version "6.0.0"
resolved "https://registry.yarnpkg.com/@galacticcouncil/sdk/-/sdk-6.0.0.tgz#94a8d451ad1d7aed87b3965bb65653b0af2ab5d3"
integrity sha512-SYkKMmc99GzwYf5tMaanOGtP5dedcIP1xrv+bs6TDTP0pzxUeyzSDeffopDKNDuokzT0UtWpv8AGf1vqApA7OQ==
dependencies:
"@galacticcouncil/math-lbp" "^1.0.0"
"@galacticcouncil/math-liquidity-mining" "^1.0.0"
"@galacticcouncil/math-omnipool" "^1.1.0"
"@galacticcouncil/math-stableswap" "^1.2.0"
"@galacticcouncil/math-stableswap" "^2.0.0"
"@galacticcouncil/math-xyk" "^1.0.0"
"@thi.ng/cache" "^2.1.35"
"@thi.ng/memoize" "^4.0.2"
bignumber.js "^9.1.0"
lodash.clonedeep "^4.5.0"

"@galacticcouncil/ui@^5.4.0":
version "5.4.0"
resolved "https://registry.yarnpkg.com/@galacticcouncil/ui/-/ui-5.4.0.tgz#f395d2e31ee4d0471edc90ebb8b69676948275dc"
integrity sha512-AInIP6e2A7So+wUuGjeknNx5se+sjH2HLThxLwZA1IEeCIhLy+mN8CXdu1HZivhWhCwdC6tCdSxckBApSUs16g==
"@galacticcouncil/ui@^5.5.0":
version "5.5.0"
resolved "https://registry.yarnpkg.com/@galacticcouncil/ui/-/ui-5.5.0.tgz#cc8731f77d6877e7c430de128e47a35e642fc9ec"
integrity sha512-UmF0eG4DTuK7AKGN8cBRIGbnTj0UAPicIZjpBYPeopCS15ApRET/JXLdoYALsTfQEw5hWE+tvpxeCzFRvC+6gQ==
dependencies:
"@floating-ui/dom" "^1.5.1"
"@lit-labs/virtualizer" "^2.0.14"
Expand All @@ -2655,10 +2655,10 @@
lit "^3.1.4"
ts-debounce "^4.0.0"

"@galacticcouncil/xcm-cfg@^8.1.0":
version "8.1.0"
resolved "https://registry.yarnpkg.com/@galacticcouncil/xcm-cfg/-/xcm-cfg-8.1.0.tgz#cb2ce6955467fd4d10ae9438a230bb2a4092029a"
integrity sha512-T1viEm1Gxf+xt8s5F81ekQGUQwzXeD/iZHY7CdtnmFCpvnW2RPdj8PlluHkkJzwk6Pz9vK5n3ddYnK/G9YhwKQ==
"@galacticcouncil/xcm-cfg@^9.0.0":
version "9.0.0"
resolved "https://registry.yarnpkg.com/@galacticcouncil/xcm-cfg/-/xcm-cfg-9.0.0.tgz#c6a74c044c690a1de6637523b1d9c370248b572c"
integrity sha512-kdcm48XdrBi2eYq9DFpOtCnHuEsPLBryhtc8kkApIsCI1Y/Nc/j4V6PJdat6zPmOXGEP77MHmLEsVaM/GMs/ug==
dependencies:
"@galacticcouncil/xcm-core" "^7.0.0"

Expand Down