Merge pull request #56 from skip-mev/fix-single-chain-txs

Properly track status of single chain transactions

Author: thal0x

package-lock.json

@@ -39,7 +39,7 @@
     "@radix-ui/react-dialog": "^1.0.4",
     "@radix-ui/react-toast": "^1.1.4",
     "@radix-ui/react-tooltip": "^1.0.6",
-    "@skip-router/core": "^0.0.7",
+    "@skip-router/core": "^0.0.11",
     "@tanstack/react-query": "^4.29.5",
     "@types/node": "20.1.2",
     "@types/react": "18.2.6",

package.json

@@ -18,7 +18,8 @@ export const SkipContext = createContext<
 export const SkipProvider: FC<PropsWithChildren> = ({ children }) => {
   const { client: walletClient } = useWalletClient();
 
-  const skipClient = new SkipRouter(SKIP_API_URL, {
+  const skipClient = new SkipRouter({
+    apiURL: SKIP_API_URL,
     getOfflineSigner: async (chainID) => {
       if (!walletClient) {
         throw new Error("No offline signer available");

src/solve/context.tsx

@@ -33,7 +33,8 @@ export async function executeRoute(
     addressList.push(address);
   }
 
-  const skipClient = new SkipRouter(SKIP_API_URL, {
+  const skipClient = new SkipRouter({
+    apiURL: SKIP_API_URL,
     getOfflineSigner: async (chainID) => {
       const signerIsLedger = await isLedger(walletClient, chainID);
 
@@ -62,19 +63,16 @@ export async function executeRoute(
 
   let i = 0;
 
-  await skipClient.executeRoute(route, userAddresses, {
-    onTransactionSuccess: async (txStatus) => {
-      const { sendTx } = txStatus.transferSequence[0].packetTXs;
-      if (!sendTx) {
-        return;
-      }
-
-      const explorerLink = getExplorerLinkForTx(sendTx.chainID, sendTx.txHash);
+  await skipClient.executeRoute({
+    route,
+    userAddresses,
+    onTransactionSuccess: async (txHash, chainID) => {
+      const explorerLink = getExplorerLinkForTx(chainID, txHash);
 
       onTxSuccess(
         {
           explorerLink,
-          txHash: sendTx.txHash,
+          txHash,
         },
         i,
       );