feat: calculateAmountReceived uses filtered getAssets

connext · Apr 26, 2024 · 80584f1 · 80584f1
1 parent b121086
commit 80584f1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/packages/agents/sdk/src/sdkPool.ts b/packages/agents/sdk/src/sdkPool.ts
@@ -245,13 +245,14 @@ export class SdkPool extends SdkShared {
       amount,
       signerAddress,
     });
-    const [originPool, [canonicalDomain, canonicalId]] = await Promise.all([
-      this.getPool(originDomain, _originTokenAddress),
-      this.getCanonicalTokenId(originDomain, _originTokenAddress),
-    ]);
+
+    const originPool = await this.getPool(originDomain, _originTokenAddress);
     const isNextAsset = originPool ? utils.getAddress(originPool.local.address) === _originTokenAddress : undefined;
-    const key = this.calculateCanonicalKey(canonicalDomain, canonicalId);
-    const destinationAssetData = await this.getAssetsDataByDomainAndKey(destinationDomain, key);
+    const destinationAssetData = (await this.getAssetsData({
+      domain: originDomain,
+      localAsset: _originTokenAddress,
+      limit: 1
+    }))[0];
     if (!destinationAssetData) {
       throw new Error("Origin token cannot be bridged to any token on this destination domain");
     }

diff --git a/packages/agents/sdk/test/sdkPool.spec.ts b/packages/agents/sdk/test/sdkPool.spec.ts
@@ -437,7 +437,7 @@ describe("SdkPool", () => {
         .onCall(0) // swap once for destination pool
         .resolves(destinationAmountAfterSwap);
       stub(sdkPool, "getCanonicalTokenId").resolves([mockAssetData.canonical_domain, mockAssetData.canonical_id]);
-      stub(sdkPool, "getAssetsDataByDomainAndKey").resolves(mockAssetData);
+      stub(sdkPool, "getAssetsData").resolves([mockAssetData]);
 
       const res = await sdkPool.calculateAmountReceived(
         mockPool.domainId,
@@ -472,7 +472,7 @@ describe("SdkPool", () => {
         .onCall(1) // swap once for destination pool
         .resolves(destinationAmountAfterSwap);
       stub(sdkPool, "getCanonicalTokenId").resolves([mockAssetData.canonical_domain, mockAssetData.canonical_id]);
-      stub(sdkPool, "getAssetsDataByDomainAndKey").resolves(mockAssetData);
+      stub(sdkPool, "getAssetsData").resolves([mockAssetData]);
 
       const res = await sdkPool.calculateAmountReceived(
         mockPool.domainId,
@@ -500,7 +500,7 @@ describe("SdkPool", () => {
         .onCall(0) // swap once for origin pool
         .resolves(originAmountAfterSwap);
       stub(sdkPool, "getCanonicalTokenId").resolves([mockAssetData.canonical_domain, mockAssetData.canonical_id]);
-      stub(sdkPool, "getAssetsDataByDomainAndKey").resolves(mockAssetData);
+      stub(sdkPool, "getAssetsData").resolves([mockAssetData]);
 
       const res = await sdkPool.calculateAmountReceived(
         mockPool.domainId,
@@ -522,7 +522,7 @@ describe("SdkPool", () => {
       const destinationSlippage = "0"; // 0% in BPS
 
       stub(sdkPool, "getCanonicalTokenId").resolves([mockAssetData.canonical_domain, mockAssetData.canonical_id]);
-      stub(sdkPool, "getAssetsDataByDomainAndKey").resolves(mockAssetData);
+      stub(sdkPool, "getAssetsData").resolves([mockAssetData]);
 
       const res = await sdkPool.calculateAmountReceived(
         mockPool.domainId,
@@ -564,7 +564,7 @@ describe("SdkPool", () => {
         .onCall(0) // swap once for destination pool
         .resolves(destinationAmountAfterSwapConverted);
       stub(sdkPool, "getCanonicalTokenId").resolves([mockAssetData.canonical_domain, mockAssetData.canonical_id]);
-      stub(sdkPool, "getAssetsDataByDomainAndKey").resolves(mockAssetData);
+      stub(sdkPool, "getAssetsData").resolves([mockAssetData]);
 
       const res = await sdkPool.calculateAmountReceived(
         mockPoolDifferentDecimals.domainId,
@@ -602,7 +602,7 @@ describe("SdkPool", () => {
         .onCall(0) // swap once for origin pool
         .resolves(originAmountAfterSwapConverted);
       stub(sdkPool, "getCanonicalTokenId").resolves([mockAssetData.canonical_domain, mockAssetData.canonical_id]);
-      stub(sdkPool, "getAssetsDataByDomainAndKey").resolves(mockAssetData);
+      stub(sdkPool, "getAssetsData").resolves([mockAssetData]);
 
       const res = await sdkPool.calculateAmountReceived(
         mockPoolDifferentDecimals.domainId,