@hyperbridge/sdk 1.3.18 → 1.3.20

package/dist/browser/index.d.ts

@@ -1747,6 +1747,10 @@ declare const RESPONSE_RECEIPTS_SLOT = 3n;
  * Slot index for state commitment map
  */
 declare const STATE_COMMITMENTS_SLOT = 5n;
+declare function requestCommitmentKey(key: Hex): {
+    slot1: Hex;
+    slot2: Hex;
+};
 /**
  * Derives the storage slot for a specific field in the StateCommitment struct
  *
@@ -3095,4 +3099,4 @@ declare const coingeckoIds: {
     "EVM-130": string;
 };
 
-export { ADDRESS_ZERO, type AllStatusKey, type AssetTeleported, type AssetTeleportedResponse, type BlockMetadata, type CancelOptions, type ChainConfig, ChainConfigService, type ChainId, Chains, type ClientConfig, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DUMMY_PRIVATE_KEY, type DecodedOrderPlacedLog, type DispatchGet, type DispatchPost, ERC20Method, type EstimateGasCallData, EvmChain, type EvmChainParams, type ExecutionResult, type FillOptions, type FillerConfig, type GetRequestResponse, type GetRequestWithStatus, type GetResponseByRequestIdResponse, type GetResponseStorageValues, type HexString, type HostParams, HyperClientStatus, type HyperbridgeTxEvents, type IChain, type IConfig, type IEvmConfig, type IGetRequest, type IGetRequestMessage, type IGetResponse, type IGetResponseMessage, type IHyperbridgeConfig, type IIsmpMessage, type IMessage, type IPostRequest, type IPostResponse, type IProof, type IRequestMessage, type ISubstrateConfig, type ITimeoutPostRequestMessage, IndexerClient, type IndexerQueryClient, IntentGateway, type IntentGatewayParams, type IsmpRequest, type NewDeployment, type Order, type OrderResponse, OrderStatus, type OrderStatusMetadata, type OrderWithStatus, type Params, type PaymentInfo, type PostRequestStatus, type PostRequestTimeoutStatus, type PostRequestWithStatus, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, type RequestBody, type RequestCommitment, RequestKind, type RequestResponse, RequestStatus, type RequestStatusKey, type RequestStatusWithMetadata, type ResponseCommitmentWithValues, type RetryConfig, STATE_COMMITMENTS_SLOT, type StateMachineHeight, type StateMachineIdParams, type StateMachineResponse, type StateMachineUpdate, SubstrateChain, type SubstrateChainParams, TeleportStatus, TimeoutStatus, type TimeoutStatusKey, type TokenGatewayAssetTeleportedResponse, type TokenGatewayAssetTeleportedWithStatus, type TokenInfo, type TokenPrice, type TokenPricesResponse, type TokenRegistry, type TokenRegistryResponse, WrappedNativeDecimals, type XcmGatewayParams, __test, addresses, adjustFeeDecimals, assets, bytes20ToBytes32, bytes32ToBytes20, chainIds, coingeckoIds, consensusStateIds, constructRedeemEscrowRequestBody, convertStateIdToStateMachineId, convertStateMachineIdToEnum, createQueryClient, createRpcUrls, encodeISMPMessage, estimateGasForPost, fetchPrice, generateRootWithProof, getChain, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, hexToString, orderCommitment, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, teleport, teleportDot, viemChains };
+export { ADDRESS_ZERO, type AllStatusKey, type AssetTeleported, type AssetTeleportedResponse, type BlockMetadata, type CancelOptions, type ChainConfig, ChainConfigService, type ChainId, Chains, type ClientConfig, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DUMMY_PRIVATE_KEY, type DecodedOrderPlacedLog, type DispatchGet, type DispatchPost, ERC20Method, type EstimateGasCallData, EvmChain, type EvmChainParams, type ExecutionResult, type FillOptions, type FillerConfig, type GetRequestResponse, type GetRequestWithStatus, type GetResponseByRequestIdResponse, type GetResponseStorageValues, type HexString, type HostParams, HyperClientStatus, type HyperbridgeTxEvents, type IChain, type IConfig, type IEvmConfig, type IGetRequest, type IGetRequestMessage, type IGetResponse, type IGetResponseMessage, type IHyperbridgeConfig, type IIsmpMessage, type IMessage, type IPostRequest, type IPostResponse, type IProof, type IRequestMessage, type ISubstrateConfig, type ITimeoutPostRequestMessage, IndexerClient, type IndexerQueryClient, IntentGateway, type IntentGatewayParams, type IsmpRequest, type NewDeployment, type Order, type OrderResponse, OrderStatus, type OrderStatusMetadata, type OrderWithStatus, type Params, type PaymentInfo, type PostRequestStatus, type PostRequestTimeoutStatus, type PostRequestWithStatus, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, type RequestBody, type RequestCommitment, RequestKind, type RequestResponse, RequestStatus, type RequestStatusKey, type RequestStatusWithMetadata, type ResponseCommitmentWithValues, type RetryConfig, STATE_COMMITMENTS_SLOT, type StateMachineHeight, type StateMachineIdParams, type StateMachineResponse, type StateMachineUpdate, SubstrateChain, type SubstrateChainParams, TeleportStatus, TimeoutStatus, type TimeoutStatusKey, type TokenGatewayAssetTeleportedResponse, type TokenGatewayAssetTeleportedWithStatus, type TokenInfo, type TokenPrice, type TokenPricesResponse, type TokenRegistry, type TokenRegistryResponse, WrappedNativeDecimals, type XcmGatewayParams, __test, addresses, adjustFeeDecimals, assets, bytes20ToBytes32, bytes32ToBytes20, chainIds, coingeckoIds, consensusStateIds, constructRedeemEscrowRequestBody, convertStateIdToStateMachineId, convertStateMachineIdToEnum, createQueryClient, createRpcUrls, encodeISMPMessage, estimateGasForPost, fetchPrice, generateRootWithProof, getChain, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, hexToString, orderCommitment, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, requestCommitmentKey, teleport, teleportDot, viemChains };

package/dist/browser/index.js

@@ -5660,7 +5660,7 @@ var EvmChain = class {
    * @returns {Promise<HexString>} The proof.
    */
   async queryProof(message, counterparty, at) {
-    const commitmentKeys = "Requests" in message ? message.Requests.map((key) => requestCommitmentKey(key)) : message.Responses.map((key) => responseCommitmentKey(key));
+    const commitmentKeys = "Requests" in message ? message.Requests.map((key) => requestCommitmentKey(key).slot1) : message.Responses.map((key) => responseCommitmentKey(key));
     const config = {
       address: this.params.host,
       storageKeys: commitmentKeys
@@ -5702,7 +5702,7 @@ var EvmChain = class {
     const encoded = EvmStateProof.enc({
       contractProof: proof.accountProof.map((item) => Array.from(hexToBytes(item))),
       storageProof: [
-        [Array.from(hexToBytes(this.params.host)), flattenedProof.map((item) => Array.from(hexToBytes(item)))]
+        [Array.from(hexToBytes(config.address)), flattenedProof.map((item) => Array.from(hexToBytes(item)))]
       ]
     });
     return toHex(encoded);
@@ -6061,7 +6061,10 @@ function requestCommitmentKey(key) {
   const slot = REQUEST_COMMITMENTS_SLOT;
   const mappedKey = deriveMapKey(keyBytes, slot);
   const number = bytesToBigInt(hexToBytes(mappedKey)) + 1n;
-  return pad(`0x${number.toString(16)}`, { size: 32 });
+  return {
+    slot1: pad(`0x${number.toString(16)}`, { size: 32 }),
+    slot2: mappedKey
+  };
 }
 function responseCommitmentKey(key) {
   const keyBytes = hexToBytes(key);
@@ -12470,77 +12473,73 @@ var IntentGateway = class {
     const commitment = getRequestCommitment({ ...getRequest, keys: [...getRequest.keys] });
     const sourceStatusStream = indexerClient.getRequestStatusStream(commitment);
     for await (const statusUpdate of sourceStatusStream) {
-      if (statusUpdate.status === RequestStatus.SOURCE_FINALIZED) {
-        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;
-        };
-        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;
-            }
+      yield statusUpdate;
+      if (statusUpdate.status !== RequestStatus.SOURCE_FINALIZED) {
+        continue;
+      }
+      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;
+      };
+      const { slot1, slot2 } = requestCommitmentKey(commitment);
+      while (true) {
+        try {
+          proof = await this.source.queryStateProof(sourceHeight, [slot1, slot2]);
+          break;
+        } catch {
+          const failedHeight = sourceHeight;
+          while (sourceHeight <= failedHeight) {
             if (await checkIfAlreadyDelivered()) {
               break;
             }
-          }
-        }
-        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
+            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;
             }
-          });
-          await this.submitAndConfirmReceipt(hyperbridge, commitment, getRequestMessage);
+            sourceHeight = nextHeight;
+          }
+          if (await checkIfAlreadyDelivered()) {
+            break;
+          }
         }
       }
-      yield statusUpdate;
+      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);
+      }
     }
   }
   /**
@@ -12914,6 +12913,6 @@ async function teleportDot(param_) {
   return stream;
 }
 
-export { ADDRESS_ZERO, ChainConfigService, Chains, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DUMMY_PRIVATE_KEY, ERC20Method, EvmChain, HyperClientStatus, IndexerClient, IntentGateway, OrderStatus, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, RequestKind, RequestStatus, STATE_COMMITMENTS_SLOT, SubstrateChain, TeleportStatus, TimeoutStatus, WrappedNativeDecimals, __test, addresses, adjustFeeDecimals, assets, bytes20ToBytes32, bytes32ToBytes20, chainIds, coingeckoIds, consensusStateIds, constructRedeemEscrowRequestBody, convertStateIdToStateMachineId, convertStateMachineIdToEnum, createQueryClient, createRpcUrls, encodeISMPMessage, estimateGasForPost, fetchPrice, generateRootWithProof, getChain, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, hexToString, orderCommitment, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, teleport, teleportDot, viemChains };
+export { ADDRESS_ZERO, ChainConfigService, Chains, DEFAULT_ADDRESS, DEFAULT_GRAFFITI, DUMMY_PRIVATE_KEY, ERC20Method, EvmChain, HyperClientStatus, IndexerClient, IntentGateway, OrderStatus, REQUEST_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, RESPONSE_COMMITMENTS_SLOT, RESPONSE_RECEIPTS_SLOT, RequestKind, RequestStatus, STATE_COMMITMENTS_SLOT, SubstrateChain, TeleportStatus, TimeoutStatus, WrappedNativeDecimals, __test, addresses, adjustFeeDecimals, assets, bytes20ToBytes32, bytes32ToBytes20, chainIds, coingeckoIds, consensusStateIds, constructRedeemEscrowRequestBody, convertStateIdToStateMachineId, convertStateMachineIdToEnum, createQueryClient, createRpcUrls, encodeISMPMessage, estimateGasForPost, fetchPrice, generateRootWithProof, getChain, getRequestCommitment, getStateCommitmentFieldSlot, getStateCommitmentSlot, getStorageSlot, hexToString, orderCommitment, postRequestCommitment, queryAssetTeleported, queryGetRequest, queryPostRequest, requestCommitmentKey, teleport, teleportDot, viemChains };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map