Merge pull request #110 from BootNodeDev/feat/fulfillment-status

Author: fernandomg

typescript/ui/package.json

@@ -4,6 +4,7 @@
   "version": "7.1.0",
   "author": "J M Rossy",
   "dependencies": {
+    "@bootnodedev/intents-framework-core": "^0.1.0",
     "@chakra-ui/next-js": "^2.4.2",
     "@chakra-ui/react": "^2.8.2",
     "@cosmjs/cosmwasm-stargate": "^0.32.4",

typescript/ui/src/features/store.ts

@@ -100,9 +100,14 @@ export const useStore = create<AppState>()(
       },
       failUnconfirmedTransfers: () => {
         set((state) => ({
-          transfers: state.transfers.map((t) =>
-            FinalTransferStatuses.includes(t.status) ? t : { ...t, status: TransferStatus.Failed },
-          ),
+          transfers: state.transfers.map((t) => {
+            if (t.status === TransferStatus.WaitingForFulfillment && t.orderId) {
+              return { ...t, status: TransferStatus.Delivered };
+            }
+            return FinalTransferStatuses.includes(t.status)
+              ? t
+              : { ...t, status: TransferStatus.Failed };
+          }),
         }));
       },
 

typescript/ui/src/features/tokens/balances.ts

@@ -1,10 +1,11 @@
+import { Hyperlane7683__factory as Hyperlane7683Factory } from '@bootnodedev/intents-framework-core';
+import { FilledEvent } from '@bootnodedev/intents-framework-core/dist/src/Base7683';
 import { IToken, MultiProtocolProvider, Token } from '@hyperlane-xyz/sdk';
-import { isValidAddress } from '@hyperlane-xyz/utils';
+import { assert, isValidAddress } from '@hyperlane-xyz/utils';
 import { useAccountAddressForChain } from '@hyperlane-xyz/widgets';
 import { useQuery } from '@tanstack/react-query';
-import { createConfig, getBlockNumber, http, watchContractEvent } from '@wagmi/core';
 import { toast } from 'react-toastify';
-import { defineChain, type Address as ViemAddress } from 'viem';
+import { defineChain } from 'viem';
 import * as viemChains from 'viem/chains';
 import { chainConfig } from 'viem/op-stack';
 import { useToastError } from '../../components/toast/useToastError';
@@ -145,12 +146,6 @@ const abi = [
   },
 ] as const;
 
-function getRpc(chainId: number): string | undefined {
-  if (chainId === 8453) return 'https://base.drpc.org';
-  if (chainId === 42161) return 'https://arbitrum.drpc.org';
-  return;
-}
-
 export async function checkOrderFilled({
   destination,
   orderId,
@@ -162,42 +157,36 @@ export async function checkOrderFilled({
   originToken: Token;
   multiProvider: MultiProtocolProvider;
 }): Promise<string> {
-  const destinationChainId = multiProvider.getEvmChainId(destination);
+  const provider = multiProvider.toMultiProvider().getProvider(destination);
+  const connection = originToken.getConnectionForChain(destination);
 
-  const chain = Object.values(chains).find(
-    (chain) => chain.id === destinationChainId,
-  )! as viemChains.Chain;
+  assert(connection?.token.collateralAddressOrDenom, 'No connection found for destination chain');
 
-  const config = createConfig({
-    chains: [chain],
-    transports: {
-      [chain.id]: http(getRpc(chain.id)),
-    },
-  });
-
-  const fromBlock = await getBlockNumber(config);
+  const contract = Hyperlane7683Factory.connect(
+    connection.token.collateralAddressOrDenom,
+    provider,
+  );
+  const filter = contract.filters.Filled();
 
   return new Promise((resolve, reject) => {
-    const connection = originToken?.getConnectionForChain(destination);
-
-    const unwatch = watchContractEvent(config, {
-      address: connection?.token.collateralAddressOrDenom as ViemAddress,
-      chainId: destinationChainId,
-      eventName: 'Filled',
-      fromBlock: fromBlock,
-      args: { orderId },
-      abi,
-      onLogs([{ data, transactionHash }]) {
-        if (data?.toLowerCase().startsWith(orderId.toLowerCase())) {
-          // stop listening
-          unwatch();
-          resolve(transactionHash);
+    const intervalId = setInterval(async () => {
+      try {
+        const to = await provider.getBlockNumber();
+        const from = to - 20;
+        const events = await contract.queryFilter(filter, from, to);
+
+        for (const event of events as Array<FilledEvent>) {
+          const resolvedOrder = event.args.orderId;
+
+          if (resolvedOrder === orderId) {
+            clearInterval(intervalId);
+            resolve(event.transactionHash);
+          }
         }
-      },
-      onError(error) {
-        unwatch();
+      } catch (error) {
+        clearInterval(intervalId);
         reject(error);
-      },
-    });
+      }
+    }, 500);
   });
 }

typescript/ui/yarn.lock

@@ -850,6 +850,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@bootnodedev/intents-framework-core@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "@bootnodedev/intents-framework-core@npm:0.1.0"
+  dependencies:
+    "@hyperlane-xyz/core": "npm:^5.4.1"
+    "@openzeppelin/contracts": "npm:^4.9.6"
+    "@uniswap/permit2": "github:Uniswap/permit2"
+    dotenv-run-script: "npm:^0.4.1"
+  checksum: 10/f8df5a44e2ba7008e42d5e878ab6b2c57ebad0aaed1e8b134bc4a84d5539d5c62b04f299011435e9e4b2383c218e0d9897aef955c0b03b257ddbf7288242eb46
+  languageName: node
+  linkType: hard
+
 "@censo-custody/solana-wallet-adapter@npm:^0.1.0":
   version: 0.1.0
   resolution: "@censo-custody/solana-wallet-adapter@npm:0.1.0"
@@ -3687,6 +3699,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@hyperlane-xyz/core@npm:^5.4.1":
+  version: 5.11.4
+  resolution: "@hyperlane-xyz/core@npm:5.11.4"
+  dependencies:
+    "@arbitrum/nitro-contracts": "npm:^1.2.1"
+    "@eth-optimism/contracts": "npm:^0.6.0"
+    "@hyperlane-xyz/utils": "npm:8.7.0"
+    "@layerzerolabs/lz-evm-oapp-v2": "npm:2.0.2"
+    "@openzeppelin/contracts": "npm:^4.9.3"
+    "@openzeppelin/contracts-upgradeable": "npm:^4.9.3"
+    fx-portal: "npm:^1.0.3"
+  peerDependencies:
+    "@ethersproject/abi": "*"
+    "@ethersproject/providers": "*"
+    "@types/sinon-chai": "*"
+  checksum: 10/85f953cc4967f06ac08f31244b3262000a7185df709cd304a0ad8a85332010dd10ce128d4920ae631e5e75e79d6a872e977e507e1f0f14391ca948b5824c4fac
+  languageName: node
+  linkType: hard
+
 "@hyperlane-xyz/registry@npm:9.7.0":
   version: 9.7.0
   resolution: "@hyperlane-xyz/registry@npm:9.7.0"
@@ -4014,10 +4045,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@hyperlane-xyz/utils@npm:8.7.0":
+  version: 8.7.0
+  resolution: "@hyperlane-xyz/utils@npm:8.7.0"
+  dependencies:
+    "@cosmjs/encoding": "npm:^0.32.4"
+    "@solana/web3.js": "npm:^1.95.4"
+    bignumber.js: "npm:^9.1.1"
+    ethers: "npm:^5.7.2"
+    lodash-es: "npm:^4.17.21"
+    pino: "npm:^8.19.0"
+    yaml: "npm:2.4.5"
+  checksum: 10/90aaf687e59ae012e610f07727a16447cff54fd0f3f6b53792949e8cec88277092be53b04974d1974d1f49fb9393bdd3bfb0c17eeef563bcca6bb1421003d977
+  languageName: node
+  linkType: hard
+
 "@hyperlane-xyz/warp-ui-template@workspace:.":
   version: 0.0.0-use.local
   resolution: "@hyperlane-xyz/warp-ui-template@workspace:."
   dependencies:
+    "@bootnodedev/intents-framework-core": "npm:^0.1.0"
     "@chakra-ui/next-js": "npm:^2.4.2"
     "@chakra-ui/react": "npm:^2.8.2"
     "@cosmjs/cosmwasm-stargate": "npm:^0.32.4"
@@ -5473,7 +5520,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@openzeppelin/contracts@npm:^4.2.0":
+"@openzeppelin/contracts@npm:^4.2.0, @openzeppelin/contracts@npm:^4.9.6":
   version: 4.9.6
   resolution: "@openzeppelin/contracts@npm:4.9.6"
   checksum: 10/71f45ad42e68c0559be4ba502115462a01c76fc805c08d3005c10b5550a093f1a2b00b2d7e9d6d1f331e147c50fd4ad832f71c4470ec5b34f5a2d0751cd19a47
@@ -9927,6 +9974,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@uniswap/permit2@github:Uniswap/permit2":
+  version: 1.0.0
+  resolution: "@uniswap/permit2@https://github.com/Uniswap/permit2.git#commit=cc56ad0f3439c502c246fc5cfcc3db92bb8b7219"
+  checksum: 10/746891ef1b7e494eada03caf4818223d21c15558c1932111dbdf6584bc632188e9e333685b09ec3f29e9238c11e4246adabefa222a0ae8cc4e11e9a1fc093c38
+  languageName: node
+  linkType: hard
+
 "@vanilla-extract/css@npm:1.15.5":
   version: 1.15.5
   resolution: "@vanilla-extract/css@npm:1.15.5"
@@ -13011,6 +13065,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dotenv-expand@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "dotenv-expand@npm:10.0.0"
+  checksum: 10/b41eb278bc96b92cbf3037ca5f3d21e8845bf165dc06b6f9a0a03d278c2bd5a01c0cfbb3528ae3a60301ba1a8a9cace30e748c54b460753bc00d4c014b675597
+  languageName: node
+  linkType: hard
+
+"dotenv-run-script@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "dotenv-run-script@npm:0.4.1"
+  dependencies:
+    dotenv: "npm:^16.3.1"
+    dotenv-expand: "npm:^10.0.0"
+  bin:
+    dotenv-run-script: bin/dotenv-run-script
+  checksum: 10/dc0ec2b3bfbc5d01c32c937c24e6a6e4e910b6c95119dfd57d206a8c77f389a5f0512d68d4ec6e716e5afd3f1f799cc7d2e4a944b0334df781510f8aed0e5bd0
+  languageName: node
+  linkType: hard
+
+"dotenv@npm:^16.3.1":
+  version: 16.4.7
+  resolution: "dotenv@npm:16.4.7"
+  checksum: 10/f13bfe97db88f0df4ec505eeffb8925ec51f2d56a3d0b6d916964d8b4af494e6fb1633ba5d09089b552e77ab2a25de58d70259b2c5ed45ec148221835fc99a0c
+  languageName: node
+  linkType: hard
+
 "duplexer@npm:^0.1.2":
   version: 0.1.2
   resolution: "duplexer@npm:0.1.2"