Movement fe integration

app/src/lib/components/TransferCube/components/Cube/faces/Transfer.svelte

@@ -9,7 +9,8 @@ import {
   type AptosBrowserWallet,
   http,
   type CosmosChainId,
-  isValidBech32ContractAddress
+  isValidBech32ContractAddress,
+  type AptosChainId
 } from "@unionlabs/client"
 import { custom, getConnectorClient, switchChain, waitForTransactionReceipt } from "@wagmi/core"
 import { fromHex, isHex, type HttpTransport, toHex } from "viem"
@@ -63,82 +64,85 @@ const transfer = async () => {
   // )
 
   /** --- APTOS START --- */
-  //  if ($validation.transfer.sourceChain.rpc_type === "aptos") {
-  //    const { connectedWallet, connectionStatus } = get(aptosStore)
-  //    if ($userAddressAptos === null) return toast.error("No aptos user address found")
-  //
-  //    if (connectionStatus !== "connected" || !connectedWallet) {
-  //      transferState.set({
-  //        kind: "SWITCHING_TO_CHAIN",
-  //        warning: new Error("No wallet connected")
-  //      })
-  //      return
-  //    }
-  //
-  //    const wallet = getAptosWallet(connectedWallet)
-  //    if (!wallet) {
-  //      transferState.set({
-  //        kind: "SWITCHING_TO_CHAIN",
-  //        warning: new Error(`${connectedWallet} wallet not found`)
-  //      })
-  //      return
-  //    }
-  //
-  //    // @ts-ignore
-  //    transferState.set({ kind: "SWITCHING_TO_CHAIN" })
-  //
-  //    const rpcUrl = $validation.transfer.sourceChain?.rpcs.find(rpc => rpc.type === "rpc")?.url
-  //    if (!rpcUrl)
-  //      return toast.error(`no rpc available for ${$validation.transfer.sourceChain?.display_name}`)
-  //
-  //    if (stepBefore($transferState, "CONFIRMING_TRANSFER")) {
-  //      const chainInfo = await wallet.getNetwork()
-  //
-  //      if (chainInfo?.chainId.toString() !== $validation.transfer.sourceChain.chain_id) {
-  //        transferState.set({
-  //          kind: "SWITCHING_TO_CHAIN",
-  //          warning: new Error("Failed to switch chain")
-  //        })
-  //        return
-  //      }
-  //
-  //      // @ts-ignore
-  //      transferState.set({ kind: "CONFIRMING_TRANSFER" })
-  //    }
-  //
-  //    if (stepBefore($transferState, "TRANSFERRING")) {
-  //      try {
-  //        const client = createUnionClient({
-  //          chainId: "2",
-  //          account: await wallet?.getAccount(),
-  //          transport: wallet as AptosBrowserWallet
-  //        })
-  //
-  //        const transferPayload = {
-  //          simulate: true,
-  //          receiver: $validation.transfer.receiver,
-  //          amount: parsedAmount,
-  //          authAccess: "wallet",
-  //          denomAddress: $validation.transfer.asset?.balance,
-  //          destinationChainId: $validation.transfer.destinationChain.chain_id as ChainId
-  //        } satisfies TransferAssetsParameters<"2">
-  //
-  //        const transfer = await client.transferAsset(transferPayload)
-  //
-  //        if (transfer.isErr()) throw transfer.error
-  //        transferState.set({ kind: "TRANSFERRING", transferHash: transfer.value })
-  //      } catch (error) {
-  //        if (error instanceof Error) {
-  //          // @ts-ignore
-  //          transferState.set({ kind: "CONFIRMING_TRANSFER", error })
-  //        }
-  //        return
-  //      }
-  //    }
-  //
-  //    /** --- APTOS END --- */
-  //    /** --- COSOS START --- */
-  if (sourceChain.rpc_type === "cosmos" && transferArgs !== "NO_QUOTE_AVAILABLE") {
+  if (sourceChain.rpc_type === "aptos") {
+    const { connectedWallet, connectionStatus } = get(aptosStore)
+    if ($userAddressAptos === null) return toast.error("No aptos user address found")
+
+    if (connectionStatus !== "connected" || !connectedWallet) {
+      transferState.set({
+        kind: "SWITCHING_TO_CHAIN",
+        warning: new Error("No wallet connected")
+      })
+      return
+    }
+
+    const wallet = getAptosWallet(connectedWallet)
+    if (!wallet) {
+      transferState.set({
+        kind: "SWITCHING_TO_CHAIN",
+        warning: new Error(`${connectedWallet} wallet not found`)
+      })
+      return
+    }
+
+    // @ts-ignore
+    transferState.set({ kind: "SWITCHING_TO_CHAIN" })
+
+    let rpcUrl = sourceChain.rpcs.find((rpc) => rpc.type === "rpc")?.url;
+      if (!rpcUrl)
+        return toast.error(`no rpc available for ${sourceChain.display_name}`);
+
+      if (!rpcUrl.endsWith("/v1", rpcUrl.length - 3)) {
+        rpcUrl = rpcUrl + "/v1";
+      }
+      rpcUrl = "https://aptos.testnet.bardock.movementlabs.xyz/v1"; //TODO: Remove this later its for test
+
+    if (stepBefore($transferState, "CONFIRMING_TRANSFER")) {
+      const chainInfo = await wallet.getNetwork()
+
+      if (chainInfo?.chainId.toString() !== sourceChain.chain_id) {
+        transferState.set({
+          kind: "SWITCHING_TO_CHAIN",
+          warning: new Error("Failed to switch chain")
+        })
+        return
+      }
+
+      // @ts-ignore
+      transferState.set({ kind: "CONFIRMING_TRANSFER" })
+    }
+
+    if (stepBefore($transferState, "TRANSFERRING")) {
+      try {
+        let account = await wallet?.getAccount();
+        const client = createUnionClient({
+          chainId: sourceChain.chain_id as AptosChainId,
+          account: account,
+          transport: wallet
+        })
+
+        let realArgs = {
+          ...transferArgs,
+          receiver: toHex(transferArgs.receiver)
+        }
+
+        const transfer = await client.transferAsset(realArgs)
+
+        if (transfer.isErr()) throw transfer.error
+        transferState.set({
+          kind: "TRANSFERRING",
+          transferHash: transfer.value
+        })
+      } catch (error) {
+        if (error instanceof Error) {
+          // @ts-ignore
+          transferState.set({ kind: "CONFIRMING_TRANSFER", error })
+        }
+        return
+      }
+    }
+  }
+  else if (sourceChain.rpc_type === "cosmos" && transferArgs !== "NO_QUOTE_AVAILABLE") {
     const { connectedWallet, connectionStatus } = get(cosmosStore)
     if ($userAddrCosmos === null) return toast.error("No Cosmos user address found")
 
@@ -256,9 +260,13 @@ const transfer = async () => {
         })
         let realArgs = {
           ...transferArgs,
-          receiver: toHex(transferArgs.receiver),
+          receiver: transferArgs.receiver,
           baseToken: fromHex(transferArgs.baseToken, "string")
         }
+
+        if (destChain.rpc_type !== "aptos") {
+          realArgs.receiver = toHex(transferArgs.receiver)
+        }
 
         console.log("args", realArgs)
         const transfer = await unionClient.transferAsset(realArgs)

app/src/lib/components/TransferCube/index.svelte

@@ -179,10 +179,19 @@ onMount(() => {
   const unsubscribe = transfer.subscribe(trans => {
     const chain = trans.intents.sourceChain
     if (chain) {
-      const userAddr =
-        chain.rpc_type === "evm"
-          ? $userAddress.evm?.canonical.toLowerCase()
-          : $userAddrCosmos?.canonical
+        let userAddr;
+      if (chain.rpc_type === "evm") {
+          userAddr = $userAddress.evm?.canonical.toLowerCase();
+        } else if (
+          chain.rpc_type === "aptos" ||
+          chain.chain_id === "movement"
+        ) {
+          // Use the aptos field for Movement
+          userAddr = $userAddress.aptos?.canonical.toLowerCase();
+        } else {
+          // Fallback to cosmos conversion if needed
+          userAddr = $userAddrCosmos?.canonical;
+        }
       if (userAddr && (previousSourceChain !== chain.chain_id || previousUserAddr !== userAddr)) {
         previousUserAddr = userAddr
         previousSourceChain = chain.chain_id

app/src/lib/components/connect/connect.svelte

@@ -34,7 +34,7 @@ let connectedWallets = derived(
 )
 
 // Set to 3 when shipping aptos.
-const WALLET_COUNT = 2
+  const WALLET_COUNT = 3;
 
 $: if ($connectedWallets >= 1) {
   buttonText =
@@ -97,8 +97,6 @@ $: if ($navigating) sheetOpen = false
         </h2>
       </Sheet.Title>
     </Sheet.Header>
-    <!-- Uncomment when shipping Aptos !-->
-    <!--
     <Connection
       address={$aptosStore.address}
       chain="aptos"
@@ -109,7 +107,6 @@ $: if ($navigating) sheetOpen = false
       onConnectClick={aptosStore.connect}
       onDisconnectClick={aptosStore.disconnect}
     />
-    !-->
     <Connection
       address={$sepoliaStore.address}
       chain="evm"

app/src/lib/stores/balances.ts

@@ -55,12 +55,95 @@ export async function queryBalances(chain: Chain, address: string) {
       await updateBalancesCosmos(chain, address)
       break
     case "aptos":
-      console.error("aptos balance fetching currently unsupported")
+      await updateBalancesAptos(chain, address as Address)
+      // console.error("aptos balance fetching currently unsupported")
       break
     default:
       console.error("invalid rpc type in balance fetching")
   }
 }
+export async function updateBalancesAptos(chain: Chain, address: Address) {
+  // Optionally mark expected tokens as "loading" (if chain.tokens exists)
+  if (chain.tokens && chain.tokens.length) {
+    chain.tokens.forEach(token =>
+      updateBalance(chain.chain_id, token.denom, { kind: "loading", timestamp: Date.now() })
+    );
+  }
+
+  // Define the GraphQL query and variables.
+  const query = `
+    query CoinsData($owner_address: String, $limit: Int, $offset: Int) {
+      current_fungible_asset_balances(
+        where: {owner_address: {_eq: $owner_address}}
+        limit: $limit
+        offset: $offset
+      ) {
+        amount
+        asset_type
+        metadata {
+          name
+          decimals
+          symbol
+          token_standard
+        }
+      }
+    }
+  `;
+  const variables = {
+    owner_address: address,
+    limit: 200,
+    offset: 0
+  };
+
+  // Set up the fetch options with appropriate headers.
+  const fetchOptions: RequestInit = {
+    method: "POST",
+    body: JSON.stringify({ query, variables }),
+  };
+
+  try {
+    // Send the request to the Aptos indexer.
+    const response = await fetchJson(
+      "https://indexer.testnet.movementnetwork.xyz/v1/graphql",
+      fetchOptions
+    )
+    if (response.isErr()) {
+      throw new Error(response.error.message)
+    }
+    const data = response.value.data;
+    if (!data || !data.current_fungible_asset_balances) {
+      throw new Error("Invalid response data");
+    }
+
+    const aptosBalances = data.current_fungible_asset_balances
+      .filter((token: any) => token.metadata.token_standard === "v2")
+      .map((token: any) => ({
+        denom: token.asset_type,
+        amount: token.amount
+      }))
+
+    console.info("aptosBalances: ", aptosBalances)
+    aptosBalances.forEach(token => {
+      updateBalance(chain.chain_id, token.denom, {
+        kind: "balance",
+        amount: token.amount,
+        timestamp: Date.now()
+      })
+    })
+  } catch (error: any) {
+    console.error("Error fetching Aptos balances", error)
+    // On error, update the balances for all tokens with an error state.
+    if (chain.tokens && chain.tokens.length) {
+      chain.tokens.forEach(token =>
+        updateBalance(chain.chain_id, token.denom, {
+          kind: "error",
+          error: error.message,
+          timestamp: Date.now()
+        })
+      )
+    }
+  }
+}
 
 export async function updateBalancesEvm(chain: Chain, address: Address) {
   const denoms = chain.tokens.filter(tokens => isAddress(tokens.denom)).map(token => token.denom)

app/src/lib/utilities/neverthrow.ts

@@ -1,8 +1,8 @@
 import { ResultAsync } from "neverthrow"
 
-export const fetchJson = (url: string) =>
+export const fetchJson = (url: string, options?: RequestInit) =>
   ResultAsync.fromPromise(
-    fetch(url).then(response => {
+    fetch(url, options).then(response => {
       if (!response.ok) {
         throw new Error(`HTTP error! Status: ${response.status}`)
       }

app/src/lib/wallet/aptos/config.ts

@@ -54,16 +54,17 @@ export type AptosWalletId = (typeof aptosWalletsInformation)[number]["id"]
  */
 
 export function getAptosWallet(walletId: AptosWalletId = "petra") {
-  // handle okx wallet special case since it's nested
-  if (
-    walletId === "okxwallet" &&
-    Object.hasOwn(window, "okxwallet") &&
-    Object.hasOwn(window.okxwallet, "aptos")
-  ) {
+  if (walletId === "okxwallet" && window.okxwallet?.aptos) {
     return window.okxwallet.aptos
   }
-  if (Object.hasOwn(window, walletId)) return window[walletId] as AptosBrowserWallet
-  if (Object.hasOwn(window, "aptos")) return window.aptos
+
+  if (walletId === "petra" && window.aptos) {
+    return window.aptos // ✅ Use Aptos Wallet Standard API
+  }
+
+  if (window[walletId]) {
+    return window[walletId] as AptosBrowserWallet
+  }
 
   window.open("https://petra.app/", "_blank", "noopener noreferrer")
 }
@@ -120,7 +121,11 @@ export function createAptosStore(
 
       const isConnected = await wallet?.isConnected()
       if (isConnected || aptosWallet.connectionStatus !== "disconnected") {
-        await wallet?.disconnect()
+        try {
+          await wallet?.disconnect()
+        } catch (err) {
+          console.warn("Petra threw an error during disconnect", err)
+        }
 
         update(_ => ({
           chain: "aptos",