Feat/solana

package.json

@@ -20,7 +20,7 @@
     "@polkadot/util": "^13.1.1",
     "@polkadot/util-crypto": "^13.1.1",
     "@polkadot/ui-shared": "^3.1.4",
-    "@galacticcouncil/xcm-core": "^5.5.0",
+    "@galacticcouncil/xcm-core": "^6.0.0",
     "strip-ansi": "6.0.1",
     "string-width": "4.2.2",
     "wrap-ansi": "7.0.0",
@@ -38,18 +38,18 @@
     "@emotion/styled": "^11.10.4",
     "@ethersproject/address": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
-    "@galacticcouncil/apps": "^9.2.1",
+    "@galacticcouncil/apps": "^10.0.2",
     "@galacticcouncil/math-lbp": "^1.0.0",
     "@galacticcouncil/math-liquidity-mining": "^1.0.0",
     "@galacticcouncil/math-omnipool": "^1.0.0",
     "@galacticcouncil/math-stableswap": "^1.0.0",
     "@galacticcouncil/math-staking": "^1.0.0",
     "@galacticcouncil/math-xyk": "^1.0.0",
-    "@galacticcouncil/sdk": "^5.1.0",
-    "@galacticcouncil/ui": "^5.2.3",
-    "@galacticcouncil/xcm-cfg": "^6.0.1",
-    "@galacticcouncil/xcm-core": "^5.5.0",
-    "@galacticcouncil/xcm-sdk": "^7.0.1",
+    "@galacticcouncil/sdk": "^5.2.0",
+    "@galacticcouncil/ui": "^5.3.1",
+    "@galacticcouncil/xcm-cfg": "^7.0.0",
+    "@galacticcouncil/xcm-core": "^6.0.0",
+    "@galacticcouncil/xcm-sdk": "^8.0.0",
     "@hookform/resolvers": "^3.3.4",
     "@lit-labs/react": "^1.1.0",
     "@polkadot/api": "14.0.1",
@@ -68,6 +68,7 @@
     "@radix-ui/react-toast": "^1.1.4",
     "@radix-ui/react-toggle-group": "^1.0.4",
     "@radix-ui/react-tooltip": "^1.0.6",
+    "@solana/web3.js": "^1.98.0",
     "@talismn/connect-wallets": "^1.2.5",
     "@tanstack/react-location": "^3.7.4",
     "@tanstack/react-query": "^4.14.5",

src/api/external/index.ts

@@ -76,6 +76,17 @@ export const useExternalApi = (chainKey: string) => {
   )
 }
 
+export const useExternalWhitelist = () => {
+  return useQuery(
+    QUERY_KEYS.externalStore,
+    async () => MetadataStore.getInstance().externalWhitelist(),
+    {
+      cacheTime: 1000 * 60 * 60 * 24, // 24 hours,
+      staleTime: 1000 * 60 * 60 * 1, // 1 hour
+    },
+  )
+}
+
 /**
  * Used for fetching tokens from supported parachains
  */
@@ -296,11 +307,7 @@ export const useExternalAssetsWhiteList = () => {
   const { isExternal, getAsset } = useAssets()
   const { isLoaded } = useRpcProvider()
   const assetRegistry = useExternalAssetRegistry()
-
-  const whitelist = useMemo(
-    () => MetadataStore.getInstance().externalWhitelist(),
-    [],
-  )
+  const { data: whitelist } = useExternalWhitelist()
 
   const getIsWhiteListed = useCallback(
     (assetId: string) => {
@@ -311,7 +318,7 @@ export const useExternalAssetsWhiteList = () => {
           ? assetRegistry[+asset.parachainId]?.data?.get(asset.externalId ?? "")
           : null
 
-        const isManuallyWhiteListed = whitelist.includes(asset.id)
+        const isManuallyWhiteListed = !!whitelist?.includes(asset.id)
         const isWhiteListed =
           isManuallyWhiteListed ||
           asset?.isWhiteListed ||

src/api/vesting.ts

@@ -14,11 +14,11 @@ import { compareAsc } from "date-fns"
 import { useRpcProvider } from "providers/rpcProvider"
 
 export const useVestingSchedules = (address: Maybe<AccountId32 | string>) => {
-  const { api } = useRpcProvider()
+  const { api, isLoaded } = useRpcProvider()
   return useQuery(
     QUERY_KEYS.vestingSchedules(address),
     address != null ? getVestingSchedules(api, address) : undefinedNoop,
-    { enabled: !!address },
+    { enabled: !!address && isLoaded },
   )
 }
 

src/api/xcm.ts

@@ -3,14 +3,14 @@ import {
   chainsMap,
   routesMap,
   validations,
+  swaps,
   HydrationConfigService,
 } from "@galacticcouncil/xcm-cfg"
 import { SubstrateApis } from "@galacticcouncil/xcm-core"
 import { Wallet } from "@galacticcouncil/xcm-sdk"
 import { useMutation } from "@tanstack/react-query"
 import { Transaction, useStore } from "state/store"
 import { isAnyParachain } from "utils/helpers"
-import { external } from "@galacticcouncil/apps"
 import { TRegisteredAsset } from "sections/wallet/addToken/AddToken.utils"
 import { useMemo } from "react"
 import { useTranslation } from "react-i18next"
@@ -37,9 +37,7 @@ export const syncAssethubXcmConfig = (
   asset: TRegisteredAsset,
   config: HydrationConfigService,
 ) => {
-  const hubAsset = external.toHubAsset(asset)
-  const paraAsset = external.toParachainAsset(asset)
-  config.addExternalHubRoute(hubAsset, paraAsset)
+  config.registerExternal([asset])
 }
 
 export const useCrossChainWallet = () => {
@@ -52,11 +50,21 @@ export const useCrossChainWallet = () => {
       routes: routesMap,
     })
 
-    return new Wallet({
+    const wallet = new Wallet({
       configService: configService,
-      poolService: poolService,
       transferValidations: validations,
     })
+
+    // Register chain swaps
+    const hydration = configService.getChain("hydration")
+    const assethub = configService.getChain("assethub")
+
+    wallet.registerSwaps(
+      new swaps.HydrationSwap(hydration, poolService),
+      new swaps.AssethubSwap(assethub),
+    )
+
+    return wallet
   }, [poolService])
 }
 

src/components/AccountAvatar/AccountAvatar.tsx

@@ -7,7 +7,10 @@ import { JdenticonAvatar } from "./JdenticonAvatar"
 import { PolkadotAvatar } from "./PolkadotAvatar"
 import { MetaMaskAvatar } from "./MetaMaskAvatar"
 import { isEvmAccount, isEvmAddress, safeConvertAddressH160 } from "utils/evm"
-import { WalletProviderType } from "sections/web3-connect/constants/providers"
+import {
+  SOLANA_PROVIDERS,
+  WalletProviderType,
+} from "sections/web3-connect/constants/providers"
 import { genesisHashToChain } from "utils/helpers"
 import type { Icon } from "@polkadot/networks/types"
 
@@ -24,12 +27,26 @@ export const AccountAvatar: FC<Props> = (props) => {
   const chainIcon: Icon =
     props.genesisHash && chain?.icon ? chain.icon : "polkadot"
 
+  const isSolana = !!props.provider && SOLANA_PROVIDERS.includes(props.provider)
   const isEvm = isEvmAccount(props.address) || isEvmAddress(props.address)
+
   const theme = props.provider?.startsWith("talisman")
     ? "talisman"
     : isEvm
       ? "evm"
-      : chainIcon
+      : isSolana
+        ? "jdenticon"
+        : chainIcon
+
+  if (theme === "jdenticon") {
+    return (
+      <JdenticonAvatar
+        publicKey={props.address}
+        size={props.size}
+        className={props.className}
+      />
+    )
+  }
 
   if (theme === "evm") {
     return (

src/i18n/locales/en/translations.json

@@ -461,6 +461,7 @@
   "walletConnect.provider.disconnect": "Disconnect",
   "walletConnect.provider.connectAll": "Connect all",
   "walletConnect.provider.mode.substrate": "Polkadot",
+  "walletConnect.provider.mode.solana": "Solana",
   "walletConnect.provider.mode.evm": "EVM",
   "walletConnect.provider.mode.all": "All",
   "walletConnect.provider.section.installed": "Installed & recently used",

src/polkadot.d.ts

@@ -1,5 +1,6 @@
 import { InjectedWindowProvider } from "@polkadot/extension-inject/types"
 import { MetaMaskLikeProvider } from "utils/metamask"
+import { SolanaWalletProvider } from "utils/solana"
 
 import BigNumber from "bignumber.js"
 
@@ -20,7 +21,9 @@ declare global {
     SubWallet?: MetaMaskLikeProvider
     phantom?: {
       ethereum: MetaMaskLikeProvider
+      solana: SolanaWalletProvider
     }
+    solflare?: SolanaWalletProvider
     injectedWeb3?: Record<string, InjectedWindowProvider>
     walletExtension?: { isNovaWallet?: boolean }
   }

src/sections/pools/PoolsPage.utils.ts

@@ -23,9 +23,9 @@ import { useTVL } from "api/stats"
 import { scaleHuman } from "utils/balance"
 import { useAccountAssets } from "api/deposits"
 import { TAsset, TShareToken, useAssets } from "providers/assets"
-import { MetadataStore } from "@galacticcouncil/ui"
 import { getTradabilityFromBits } from "api/omnipool"
 import { useOmnipoolFarms, useXYKFarms } from "api/farms"
+import { useExternalWhitelist } from "api/external"
 
 export const isXYKPoolType = (pool: TPool | TXYKPool): pool is TXYKPool =>
   !!(pool as TXYKPool).shareTokenIssuance
@@ -248,11 +248,7 @@ export const useXYKPools = () => {
   const { data: xykConsts } = useXYKConsts()
   const { shareTokens } = useAssets()
   const { data: accountAssets } = useAccountAssets()
-
-  const whitelist = useMemo(
-    () => MetadataStore.getInstance().externalWhitelist(),
-    [],
-  )
+  const { data: whitelist } = useExternalWhitelist()
 
   const { validShareTokens, allShareTokens } = useMemo(() => {
     return shareTokens.reduce<{
@@ -261,7 +257,7 @@ export const useXYKPools = () => {
     }>(
       (acc, shareToken) => {
         const isInvalid = !shareToken.assets.some(
-          (asset) => asset.isSufficient || whitelist.includes(asset.id),
+          (asset) => asset.isSufficient || whitelist?.includes(asset.id),
         )
 
         if (!isInvalid) acc.validShareTokens.push(shareToken)

src/sections/transaction/ReviewTransaction.tsx

@@ -12,7 +12,10 @@ import { ReviewTransactionToast } from "./ReviewTransactionToast"
 import { ReviewTransactionXCallForm } from "./ReviewTransactionXCallForm"
 import { ReviewTransactionEvmTxForm } from "sections/transaction/ReviewTransactionEvmTxForm"
 import { WalletUpgradeModal } from "sections/web3-connect/upgrade/WalletUpgradeModal"
-import { isEvmXCall } from "sections/transaction/ReviewTransactionXCallForm.utils"
+import {
+  isEvmCall,
+  isSolanaCall,
+} from "sections/transaction/ReviewTransactionXCallForm.utils"
 import { useRpcProvider } from "providers/rpcProvider"
 
 export const ReviewTransaction = (props: Transaction) => {
@@ -25,6 +28,7 @@ export const ReviewTransaction = (props: Transaction) => {
     sendTx,
     sendEvmTx,
     sendPermitTx,
+    sendSolanaTx,
     isLoading,
     isSuccess,
     isError: isSendError,
@@ -168,7 +172,8 @@ export const ReviewTransaction = (props: Transaction) => {
               sendPermitTx(permit)
             }}
           />
-        ) : isEvmXCall(props.xcall) && props.xcallMeta ? (
+        ) : (isEvmCall(props.xcall) || isSolanaCall(props.xcall)) &&
+          props.xcallMeta ? (
           <ReviewTransactionXCallForm
             xcall={props.xcall}
             xcallMeta={props.xcallMeta}
@@ -177,6 +182,10 @@ export const ReviewTransaction = (props: Transaction) => {
               props.onSubmitted?.()
               sendEvmTx(data)
             }}
+            onSolanaSigned={(data) => {
+              props.onSubmitted?.()
+              sendSolanaTx(data)
+            }}
             onSignError={setSignError}
           />
         ) : null}