@hyperbridge/sdk 1.3.13 → 1.3.15

package/dist/node/index.d.ts

@@ -2761,7 +2761,6 @@ declare class IntentGateway {
             failedHeight?: undefined;
             error?: undefined;
             deadline?: undefined;
-            height?: undefined;
         };
     } | {
         status: string;
@@ -2772,7 +2771,6 @@ declare class IntentGateway {
             proof?: undefined;
             failedHeight?: undefined;
             error?: undefined;
-            height?: undefined;
         };
     } | {
         status: string;
@@ -2781,16 +2779,6 @@ declare class IntentGateway {
             error: string;
             deadline: bigint;
             proof?: undefined;
-            height?: undefined;
-        };
-    } | {
-        status: string;
-        data: {
-            proof: `0x${string}`;
-            height: bigint;
-            failedHeight?: undefined;
-            error?: undefined;
-            deadline?: undefined;
         };
     } | {
         status: string;

package/dist/node/index.js

@@ -5,7 +5,7 @@ import { createConsola, LogLevels } from 'consola';
 import { flatten, zip, capitalize, maxBy, isNil } from 'lodash-es';
 import { toHex, hexToBytes, encodePacked, keccak256, encodeAbiParameters, bytesToHex, concatHex, createPublicClient, http, encodeFunctionData, erc20Abi, bytesToBigInt, pad, toBytes, maxUint256, formatUnits, parseUnits, hexToString as hexToString$1 } from 'viem';
 import mergeRace from '@async-generator/merge-race';
-import { gnosisChiado, gnosis, bscTestnet, bsc, soneium, baseSepolia, base, optimismSepolia, optimism, arbitrumSepolia, arbitrum, mainnet, unichain, polygon, sepolia } from 'viem/chains';
+import { unichain, polygon, gnosisChiado, gnosis, bscTestnet, bsc, soneium, baseSepolia, base, optimismSepolia, optimism, arbitrumSepolia, arbitrum, mainnet, sepolia } from 'viem/chains';
 import { hasWindow, isNode, env } from 'std-env';
 import { Vector, u8, Struct, Tuple, Enum, _void, u64, u32, Option, bool, u128, Bytes } from 'scale-ts';
 import { match } from 'ts-pattern';
@@ -4594,7 +4594,9 @@ var chains = {
   [bsc.id]: bsc,
   [bscTestnet.id]: bscTestnet,
   [gnosis.id]: gnosis,
-  [gnosisChiado.id]: gnosisChiado
+  [gnosisChiado.id]: gnosisChiado,
+  [polygon.id]: polygon,
+  [unichain.id]: unichain
 };
 var DEFAULT_ADDRESS = "0x0000000000000000000000000000000000000000";
 var EvmChain = class {
@@ -12374,7 +12376,7 @@ var IntentGateway = class {
         proof: proofHex,
         stateMachine: destStateMachine
       };
-      yield { status: "DESTINATION_FINALIZED", data: { proof: destIProof.proof, height: destIProof.height } };
+      yield { status: "DESTINATION_FINALIZED", data: { proof: destIProof } };
     }
     const getRequest = storedData?.getRequest ?? (yield { status: "AWAITING_GET_REQUEST" });
     if (!getRequest) throw new Error("[Cancel Order]: Get Request not provided");
@@ -12382,34 +12384,74 @@ var IntentGateway = class {
     const sourceStatusStream = indexerClient.getRequestStatusStream(commitment);
     for await (const statusUpdate of sourceStatusStream) {
       if (statusUpdate.status === RequestStatus.SOURCE_FINALIZED) {
-        const sourceHeight = BigInt(statusUpdate.metadata.blockNumber);
-        const proof = await this.source.queryProof(
-          { Requests: [commitment] },
-          hyperbridgeConfig.stateMachineId,
-          sourceHeight
-        );
-        const sourceIProof = {
-          height: sourceHeight,
-          stateMachine: sourceStateMachine,
-          consensusStateId: sourceConsensusStateId,
-          proof
+        let sourceHeight = BigInt(statusUpdate.metadata.blockNumber);
+        let proof;
+        const checkIfAlreadyDelivered = async () => {
+          const currentStatus = await indexerClient.queryGetRequestWithStatus(commitment);
+          return currentStatus?.statuses.some(
+            (status) => status.status === RequestStatus.HYPERBRIDGE_DELIVERED
+          ) ?? false;
         };
-        yield { status: "SOURCE_PROOF_RECEIVED", data: sourceIProof };
-        const getRequestMessage = {
-          kind: "GetRequest",
-          requests: [getRequest],
-          source: sourceIProof,
-          response: destIProof,
-          signer: pad("0x")
-        };
-        await waitForChallengePeriod(hyperbridge, {
-          height: sourceHeight,
-          id: {
-            stateId: parseStateMachineId(sourceStateMachine).stateId,
-            consensusStateId: sourceConsensusStateId
+        while (true) {
+          try {
+            proof = await this.source.queryProof(
+              { Requests: [commitment] },
+              hyperbridgeConfig.stateMachineId,
+              sourceHeight
+            );
+            break;
+          } catch {
+            const failedHeight = sourceHeight;
+            while (sourceHeight <= failedHeight) {
+              if (await checkIfAlreadyDelivered()) {
+                break;
+              }
+              const nextHeight = await retryPromise(
+                () => hyperbridge.latestStateMachineHeight({
+                  stateId: parseStateMachineId(sourceStateMachine).stateId,
+                  consensusStateId: sourceConsensusStateId
+                }),
+                {
+                  maxRetries: 5,
+                  backoffMs: 5e3,
+                  logMessage: "Failed to fetch latest state machine height (post-source-proof failure)"
+                }
+              );
+              if (nextHeight <= failedHeight) {
+                await sleep(1e4);
+                continue;
+              }
+              sourceHeight = nextHeight;
+            }
+            if (await checkIfAlreadyDelivered()) {
+              break;
+            }
           }
-        });
-        await this.submitAndConfirmReceipt(hyperbridge, commitment, getRequestMessage);
+        }
+        if (proof) {
+          const sourceIProof = {
+            height: sourceHeight,
+            stateMachine: sourceStateMachine,
+            consensusStateId: sourceConsensusStateId,
+            proof
+          };
+          yield { status: "SOURCE_PROOF_RECEIVED", data: sourceIProof };
+          const getRequestMessage = {
+            kind: "GetRequest",
+            requests: [getRequest],
+            source: sourceIProof,
+            response: destIProof,
+            signer: pad("0x")
+          };
+          await waitForChallengePeriod(hyperbridge, {
+            height: sourceHeight,
+            id: {
+              stateId: parseStateMachineId(sourceStateMachine).stateId,
+              consensusStateId: sourceConsensusStateId
+            }
+          });
+          await this.submitAndConfirmReceipt(hyperbridge, commitment, getRequestMessage);
+        }
       }
       yield statusUpdate;
     }