@pear-protocol/exchanges-sdk 0.9.0 → 0.9.1

package/dist/helper/lighter/funxyz-deposit.helper.js

@@ -59,7 +59,7 @@ async function depositUsdcViaFunxyz(sdk, params, demo) {
   if (wallet.chain?.id !== params.chainId) {
     throw new Error(`Switch the wallet to chain ${params.chainId} before depositing.`);
   }
-  const knownTxHashes = await readKnownBridgeTxHashes(sdk, params, uda.credits);
+  const knownTxHashes = await readKnownBridgeTxHashes(sdk, params, uda.credits, uda.raw.resolved.userId);
   const txHash = await writeUsdcTransfer(wallet, {
     usdcAddress,
     to: uda.evmAddress,
@@ -74,7 +74,7 @@ async function depositUsdcViaFunxyz(sdk, params, demo) {
     state: "bridging",
     txHash
   });
-  await followFunxyzSettlement(sdk, params, uda.credits, {
+  await followFunxyzSettlement(sdk, params, uda.credits, uda.raw.resolved.userId, {
     depositAddress: uda.evmAddress,
     txHash,
     chainId: params.chainId,
@@ -163,7 +163,7 @@ function assertFunxyzEnvironment(demo) {
   }
 }
 __name(assertFunxyzEnvironment, "assertFunxyzEnvironment");
-async function followFunxyzSettlement(sdk, params, credits, transfer, knownTxHashes, demo) {
+async function followFunxyzSettlement(sdk, params, credits, bridgeUserId, transfer, knownTxHashes, demo) {
   if (!params.settlement) {
     emitProgress(params.onProgress, params.signal, {
       state: "untracked",
@@ -173,7 +173,7 @@ async function followFunxyzSettlement(sdk, params, credits, transfer, knownTxHas
   }
   switch (credits.account) {
     case "existing": {
-      const transaction = await watchFunxyzBridge(sdk, params, transfer, knownTxHashes);
+      const transaction = await watchFunxyzBridge(sdk, params, bridgeUserId, transfer, knownTxHashes);
       if (!transaction) {
         return;
       }
@@ -194,19 +194,21 @@ async function followFunxyzSettlement(sdk, params, credits, transfer, knownTxHas
   }
 }
 __name(followFunxyzSettlement, "followFunxyzSettlement");
-async function readKnownBridgeTxHashes(sdk, params, credits) {
+async function readKnownBridgeTxHashes(sdk, params, credits, bridgeUserId) {
   if (!params.settlement || credits.account !== "existing") {
     return void 0;
   }
   try {
-    const result = await sdk.core.misc.lighter.listUdaDeposits(params.ownerAddress);
-    return new Set(result.transactions.map((transaction) => transaction.txHash.toLowerCase()));
+    const result = await sdk.core.misc.lighter.listUdaDeposits(bridgeUserId);
+    return new Set(result.transactions.flatMap((transaction) => transaction.txHash === void 0 ? [] : [
+      transaction.txHash.toLowerCase()
+    ]));
   } catch {
     return void 0;
   }
 }
 __name(readKnownBridgeTxHashes, "readKnownBridgeTxHashes");
-async function watchFunxyzBridge(sdk, params, transfer, knownTxHashes) {
+async function watchFunxyzBridge(sdk, params, bridgeUserId, transfer, knownTxHashes) {
   const signal = params.signal;
   const deadline = Date.now() + SETTLEMENT_WATCH_LIMIT_MS;
   while (!signal?.aborted) {
@@ -223,7 +225,7 @@ async function watchFunxyzBridge(sdk, params, transfer, knownTxHashes) {
     }
     let transactions;
     try {
-      const result = await sdk.core.misc.lighter.listUdaDeposits(params.ownerAddress);
+      const result = await sdk.core.misc.lighter.listUdaDeposits(bridgeUserId);
       transactions = result.transactions;
     } catch {
       continue;
@@ -242,14 +244,14 @@ async function watchFunxyzBridge(sdk, params, transfer, knownTxHashes) {
 }
 __name(watchFunxyzBridge, "watchFunxyzBridge");
 function findFunxyzTransaction(transactions, transfer, knownTxHashes) {
-  const byHash = transactions.find((candidate) => candidate.txHash.toLowerCase() === transfer.txHash.toLowerCase());
+  const byHash = transactions.find((candidate) => candidate.txHash?.toLowerCase() === transfer.txHash.toLowerCase());
   if (byHash) {
     return byHash;
   }
   if (!knownTxHashes) {
     return void 0;
   }
-  const candidates = transactions.filter((candidate) => candidate.depositAddr.toLowerCase() === transfer.depositAddress.toLowerCase() && !knownTxHashes.has(candidate.txHash.toLowerCase()) && candidate.fromChainId === String(transfer.chainId) && candidate.fromAmountBaseUnit === String(transfer.units));
+  const candidates = transactions.filter((candidate) => candidate.txHash !== void 0 && candidate.depositAddr.toLowerCase() === transfer.depositAddress.toLowerCase() && !knownTxHashes.has(candidate.txHash.toLowerCase()) && candidate.fromChainId === String(transfer.chainId) && candidate.fromAmountBaseUnit === String(transfer.units));
   return candidates.length === 1 ? candidates[0] : void 0;
 }
 __name(findFunxyzTransaction, "findFunxyzTransaction");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pear-protocol/exchanges-sdk",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Pear Protocol Exchanges SDK",
   "private": false,
   "type": "module",
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "@pear-protocol/core-sdk": "^1.19.0",
-    "@pear-protocol/types": "^1.28.0",
+    "@pear-protocol/types": "^1.29.0",
     "@pear-protocol/utils": "^0.5.3",
     "bignumber.js": "^11.1.1",
     "partysocket": "^1.0.3",