Merge master to rococo

.env.development

@@ -1,9 +1,13 @@
 VITE_PROVIDER_URL=wss://basilisk-rococo-rpc.play.hydration.cloud
 VITE_DOMAIN_URL=https://testnet-app.basilisk.cloud
 VITE_INDEXER_URL=https://basilisk-rococo-explorer.play.hydration.cloud/graphql
+VITE_GRAFANA_URL=https://grafana-api.play.hydration.cloud/api/ds/query
+VITE_GRAFANA_DSN=5
 VITE_USD_PEGGED_ASSET_NAME=USDT
 VITE_USD_PEGGED_ASSET_ID=19
 VITE_FF_XCM_ENABLED=true
 VITE_ENV=rococo
 VITE_WC_PROJECT_ID=8acb5f70a756a0a3bea40322364949c1
 VITE_BSX_CAIP_ID=polkadot:a85cfb9b9fd4d622a5b28289a02347af
+VITE_GRAFANA_URL=https://grafana-api.play.hydration.cloud/api/ds/query
+VITE_GRAFANA_DSN=11

.env.production

@@ -1,10 +1,11 @@
 VITE_PROVIDER_URL=wss://rpc.basilisk.cloud
 VITE_DOMAIN_URL=https://app.basilisk.cloud
 VITE_INDEXER_URL=https://basilisk-explorer.play.hydration.cloud/graphql
+VITE_GRAFANA_URL=https://grafana-api.play.hydration.cloud/api/ds/query
+VITE_GRAFANA_DSN=5
 VITE_USD_PEGGED_ASSET_NAME=USDT
 VITE_USD_PEGGED_ASSET_ID=14
 VITE_FF_XCM_ENABLED=true
 VITE_ENV=production
-
 VITE_WC_PROJECT_ID=8acb5f70a756a0a3bea40322364949c1
 VITE_BSX_CAIP_ID=polkadot:a85cfb9b9fd4d622a5b28289a02347af

.env.rococo

@@ -1,6 +1,8 @@
 VITE_PROVIDER_URL=wss://basilisk-rococo-rpc.play.hydration.cloud
 VITE_DOMAIN_URL=https://rococo-app.basilisk.cloud
 VITE_INDEXER_URL=https://basilisk-rococo-explorer.play.hydration.cloud/graphql
+VITE_GRAFANA_URL=https://grafana-api.play.hydration.cloud/api/ds/query
+VITE_GRAFANA_DSN=5
 VITE_USD_PEGGED_ASSET_NAME=USDT
 VITE_USD_PEGGED_ASSET_ID=19
 VITE_FF_XCM_ENABLED=false

package.json

@@ -26,15 +26,17 @@
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@galacticcouncil/api-augment": "^0.0.3",
-    "@galacticcouncil/apps": "1.4.3-1",
-    "@galacticcouncil/bridge": "0.0.3-1",
+    "@galacticcouncil/apps": "3.3.3",
     "@galacticcouncil/math-lbp": "^0.1.3",
     "@galacticcouncil/math-liquidity-mining": "^0.1.3",
     "@galacticcouncil/math-xyk": "^0.1.3",
-    "@galacticcouncil/sdk": "0.3.1",
-    "@galacticcouncil/ui": "^1.2.12",
+    "@galacticcouncil/sdk": "^1.1.11",
+    "@galacticcouncil/ui": "^3.1.2",
+    "@galacticcouncil/xcm-cfg": "^1.10.4",
+    "@galacticcouncil/xcm-sdk": "^2.3.1",
     "@lit-labs/react": "^1.1.0",
     "@polkadot/api": "10.9.1",
+    "@polkadot/apps-config": "^0.132.1",
     "@polkadot/extension-inject": "^0.44.5",
     "@polkadot/ui-shared": "^3.1.4",
     "@radix-ui/react-dialog": "^1.0.0",
@@ -45,7 +47,7 @@
     "@radix-ui/react-slider": "^1.0.0",
     "@radix-ui/react-switch": "^1.0.0",
     "@radix-ui/react-toast": "^1.0.0",
-    "@radix-ui/react-tooltip": "^1.0.2",
+    "@radix-ui/react-tooltip": "^1.0.7",
     "@sentry/react": "^7.16.0",
     "@sentry/tracing": "^7.16.0",
     "@talismn/connect-wallets": "^1.2.1",
@@ -81,7 +83,7 @@
     "react-remove-scroll": "^2.5.5",
     "react-use": "^17.4.0",
     "recharts": "^2.1.13",
-    "typescript": "^4.7.4",
+    "typescript": "^5.4.2",
     "uuid": "^9.0.0",
     "vite-plugin-wasm": "^2.1.0",
     "web-vitals": "^2.1.4",
@@ -90,6 +92,8 @@
   },
   "scripts": {
     "dev": "vite",
+    "dev:rococo": "vite -m rococo",
+    "dev:production": "vite -m production",
     "build": "vite build && cp ./build/index.html ./build/404.html",
     "preview": "vite preview",
     "postinstall": "patch-package",

src/api/accountBalances.ts

@@ -4,11 +4,15 @@ import { useQuery } from "@tanstack/react-query"
 import { QUERY_KEYS } from "utils/queryKeys"
 import { ApiPromise } from "@polkadot/api"
 import { Maybe, undefinedNoop } from "utils/helpers"
-import { u32 } from "@polkadot/types"
+import { u32, u128 } from "@polkadot/types"
+import { PalletBalancesAccountData } from "@polkadot/types/lookup"
 import { BN } from "@polkadot/util"
+interface PalletBalancesAccountDataCustom extends PalletBalancesAccountData {
+  frozen: u128
+}
 
 export const useAccountBalances = (id: Maybe<AccountId32 | string>) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
   return useQuery(
     QUERY_KEYS.accountBalances(id),
     !!id ? getAccountBalances(api, id) : undefinedNoop,
@@ -65,10 +69,14 @@ const getTokenAccountBalancesList =
         const [, assetId] = pairs[idx]
 
         if (assetId.toString() === NATIVE_ASSET_ID) {
-          let {data} = natives[nativeIdx]
-          const frozen = data.feeFrozen ? data.feeFrozen.add(
-            data.miscFrozen,
-            ) : data.frozen
+          //@ts-ignore
+          let { data }: { data: PalletBalancesAccountDataCustom } =
+            natives[nativeIdx]
+
+          const frozen = data.feeFrozen
+            ? data.feeFrozen.add(data.miscFrozen)
+            : data.frozen
+
           values.push({
             free: data.free,
             reserved: data.reserved,
@@ -96,7 +104,7 @@ const getTokenAccountBalancesList =
 export const useTokenAccountBalancesList = (
   pairs: Array<[address: AccountId32 | string, assetId: u32 | string]>,
 ) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
 
   return useQuery(
     QUERY_KEYS.tokenAccountBalancesList(pairs),

src/api/addLiquidity.ts

@@ -10,12 +10,12 @@ interface AddLiquidityAsset {
 }
 
 export function useAddLiquidityPaymentInfo(assetA: string, assetB: string) {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
   return usePaymentInfo(api.tx.xyk.addLiquidity(assetA, assetB, "0", "0"))
 }
 
 export function useAddLiquidityMutation(onClose: () => void) {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
   const { createTransaction } = useStore()
   const { account } = useAccountStore()
 

src/api/asset.ts

@@ -4,7 +4,7 @@ import { getAssetLogo } from "components/AssetIcon/AssetIcon"
 import { u32 } from "@polkadot/types"
 import { Maybe, useQueryReduce, useQuerySelect } from "utils/helpers"
 import { TradeRouter } from "@galacticcouncil/sdk"
-import { useTradeRouter } from "utils/api"
+import { useApiPromise } from "utils/api"
 import { useQuery } from "@tanstack/react-query"
 import { QUERY_KEYS } from "utils/queryKeys"
 
@@ -34,7 +34,7 @@ export const useUsdPeggedAsset = () => {
 }
 
 export const useTradeAssets = () => {
-  const tradeRouter = useTradeRouter()
+  const { tradeRouter } = useApiPromise()
   return useQuery(QUERY_KEYS.tradeAssets, getTradeAssets(tradeRouter))
 }
 

src/api/assetDetails.ts

@@ -10,7 +10,7 @@ import { PalletAssetRegistryAssetType } from "@polkadot/types/lookup"
 import { BN_0 } from "utils/constants"
 
 export const useAssetDetails = (id: Maybe<u32 | string>) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
   return useQuery(QUERY_KEYS.assets, getAssetDetails(api), {
     select: (data) => data.find((i) => i.id === id?.toString()),
   })
@@ -26,7 +26,7 @@ export const useAssetDetailsList = (
     assetType: ["Token"],
   },
 ) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
 
   const normalizedIds = ids?.filter(isNotNil).map(normalizeId)
 

src/api/assetMeta.ts

@@ -6,14 +6,14 @@ import { u32, u8 } from "@polkadot/types"
 import { Maybe } from "utils/helpers"
 
 export const useAssetMeta = (id: Maybe<u32 | string>) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
   return useQuery(QUERY_KEYS.assetsMeta, getAllAssetMeta(api), {
     select: (data) => data.find((i) => i.id === id?.toString()),
   })
 }
 
 export const useAssetMetaList = (ids: Array<Maybe<u32 | string>>) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
 
   const normalizedIds = ids
     .filter((x): x is u32 | string => !!x)

src/api/balances.ts

@@ -14,10 +14,18 @@ export const getTokenBalance =
   (api: ApiPromise, account: AccountId32 | string, id: string | u32) =>
   async () => {
     if (id.toString() === NATIVE_ASSET_ID) {
-      const res = await api.query.system.account(account)
+      const res = (await api.query.system.account(account)) as any
       const freeBalance = new BigNumber(res.data.free.toHex())
-      const miscFrozenBalance = new BigNumber(res.data.miscFrozen ? res.data.miscFrozen.toHex() : res.data.frozen.toHex())
-      const feeFrozenBalance = new BigNumber(res.data.feeFrozen ? res.data.feeFrozen.toHex() : res.data.frozen.toHex())
+      const miscFrozenBalance = new BigNumber(
+        res.data.miscFrozen
+          ? res.data.miscFrozen.toHex()
+          : res.data.frozen.toHex(),
+      )
+      const feeFrozenBalance = new BigNumber(
+        res.data.feeFrozen
+          ? res.data.feeFrozen.toHex()
+          : res.data.frozen.toHex(),
+      )
       const reservedBalance = new BigNumber(res.data.reserved.toHex())
 
       const balance = new BigNumber(
@@ -57,7 +65,7 @@ export const useTokenBalance = (
   id: Maybe<string | u32>,
   address: Maybe<AccountId32 | string>,
 ) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
 
   return useQuery(
     QUERY_KEYS.tokenBalance(id, address),
@@ -72,7 +80,7 @@ export function useTokensBalances(
   tokenIds: (string | u32)[],
   address: Maybe<AccountId32 | string>,
 ) {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
 
   return useQueries({
     queries: tokenIds.map((id) => ({
@@ -89,15 +97,15 @@ const getExistentialDeposit = (api: ApiPromise) => {
 }
 
 export function useExistentialDeposit() {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
   return useQuery(QUERY_KEYS.existentialDeposit, async () => {
     const existentialDeposit = await getExistentialDeposit(api)
     return existentialDeposit.toBigNumber()
   })
 }
 
 export const useTokensLocks = (ids: Maybe<u32 | string>[]) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
   const { account } = useAccountStore()
 
   const normalizedIds = ids?.reduce<string[]>((memo, item) => {

src/api/bestTrade.ts

@@ -2,16 +2,16 @@ import { TradeRouter } from "@galacticcouncil/sdk"
 import BigNumber from "bignumber.js"
 import { useQuery } from "@tanstack/react-query"
 import { QUERY_KEYS } from "utils/queryKeys"
-import { useTradeRouter } from "utils/api"
+import { useApiPromise } from "utils/api"
 
 export const useBestBuy = (props: BestTradeProps) => {
-  const tradeRouter = useTradeRouter()
+  const { tradeRouter } = useApiPromise()
 
   return useQuery(QUERY_KEYS.bestBuy(props), getBestBuy(tradeRouter, props))
 }
 
 export const useBestSell = (props: BestTradeProps) => {
-  const tradeRouter = useTradeRouter()
+  const { tradeRouter } = useApiPromise()
 
   return useQuery(QUERY_KEYS.bestSell(props), getBestSell(tradeRouter, props))
 }

src/api/chain.ts

@@ -3,7 +3,7 @@ import { useApiPromise } from "utils/api"
 import { QUERY_KEYS } from "utils/queryKeys"
 
 export const useBestNumber = (disable?: boolean) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
   return useQuery(
     QUERY_KEYS.bestNumber,
     async () => {

src/api/deposits.ts

@@ -11,12 +11,12 @@ export type DepositNftType = Awaited<
 >[number]
 
 export const useDeposits = (poolId?: string) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
   return useQuery(QUERY_KEYS.deposits(poolId), getDeposits(api, poolId))
 }
 
 export const useAllDeposits = (poolIds?: string[]) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
   const ids = poolIds?.filter((id): id is string => !!id) ?? []
 
   return useQueries({
@@ -29,7 +29,7 @@ export const useAllDeposits = (poolIds?: string[]) => {
 }
 
 export const useDeposit = (id: Maybe<u128>) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
   return useQuery(
     QUERY_KEYS.deposit(id),
     id != null ? getDeposit(api, id) : undefinedNoop,
@@ -40,7 +40,7 @@ export const useDeposit = (id: Maybe<u128>) => {
 export const useAccountDepositIds = (
   accountId: Maybe<AccountId32 | string>,
 ) => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
   return useQuery(
     QUERY_KEYS.accountDepositIds(accountId),
     accountId != null ? getAccountDepositIds(api, accountId) : undefinedNoop,

src/api/exchangeFee.ts

@@ -6,7 +6,7 @@ import BN from "bignumber.js"
 import { TRADING_FEE } from "utils/constants"
 
 export const useExchangeFee = () => {
-  const api = useApiPromise()
+  const { api } = useApiPromise()
 
   return useQuery(QUERY_KEYS.exchangeFee, getExchangeFee(api))
 }