@gearbox-protocol/sdk 11.1.3 → 11.1.5

package/dist/cjs/sdk/router/RouterV310Contract.js

@@ -146,9 +146,16 @@ class RouterV310Contract extends import_AbstractRouterContract.AbstractRouterCon
    * Implements {@link IRouterContract.findClaimAllRewards}
    */
   async findClaimAllRewards(props) {
-    const tData = props.tokensToClaim.map((a) => ({
+    const record = props.tokensToClaim.reduce(
+      (acc, a) => {
+        acc[a.token.toLowerCase()] = a;
+        return acc;
+      },
+      {}
+    );
+    const tData = props.creditAccount.tokens.map((a) => ({
       balance: 0n,
-      claimRewards: true,
+      claimRewards: !!record[a.token.toLowerCase()],
       leftoverBalance: 0n,
       numSplits: 1n,
       token: a.token
@@ -261,7 +268,7 @@ class RouterV310Contract extends import_AbstractRouterContract.AbstractRouterCon
     }).map(({ token, balance }) => {
       return {
         token,
-        balance: priceOracle.convertToUSD(token, balance)
+        balance: this.#convertToUSDForSort(priceOracle, token, balance)
       };
     }).sort((a, b) => {
       return a.balance > b.balance ? -1 : 1;
@@ -284,6 +291,18 @@ class RouterV310Contract extends import_AbstractRouterContract.AbstractRouterCon
     }
     return (token) => map.get(token) ?? 1n;
   }
+  /**
+   * Tries to get some value even when prices are broken, since it's only needed for sorting
+   * @param oracle
+   * @param token
+   * @param amount
+   * @returns
+   */
+  #convertToUSDForSort(oracle, token, amount) {
+    const scale = 10n ** BigInt(this.sdk.tokensMeta.get(token)?.decimals ?? 0);
+    const price = oracle.mainPrices.get(token)?.price || oracle.reservePrices.get(token)?.price || scale;
+    return amount * price / scale;
+  }
   #debugTokenData(tData) {
     return tData.map((t) => ({
       token: this.labelAddress(t.token),

package/dist/esm/sdk/router/RouterV310Contract.js

@@ -123,9 +123,16 @@ class RouterV310Contract extends AbstractRouterContract {
    * Implements {@link IRouterContract.findClaimAllRewards}
    */
   async findClaimAllRewards(props) {
-    const tData = props.tokensToClaim.map((a) => ({
+    const record = props.tokensToClaim.reduce(
+      (acc, a) => {
+        acc[a.token.toLowerCase()] = a;
+        return acc;
+      },
+      {}
+    );
+    const tData = props.creditAccount.tokens.map((a) => ({
       balance: 0n,
-      claimRewards: true,
+      claimRewards: !!record[a.token.toLowerCase()],
       leftoverBalance: 0n,
       numSplits: 1n,
       token: a.token
@@ -238,7 +245,7 @@ class RouterV310Contract extends AbstractRouterContract {
     }).map(({ token, balance }) => {
       return {
         token,
-        balance: priceOracle.convertToUSD(token, balance)
+        balance: this.#convertToUSDForSort(priceOracle, token, balance)
       };
     }).sort((a, b) => {
       return a.balance > b.balance ? -1 : 1;
@@ -261,6 +268,18 @@ class RouterV310Contract extends AbstractRouterContract {
     }
     return (token) => map.get(token) ?? 1n;
   }
+  /**
+   * Tries to get some value even when prices are broken, since it's only needed for sorting
+   * @param oracle
+   * @param token
+   * @param amount
+   * @returns
+   */
+  #convertToUSDForSort(oracle, token, amount) {
+    const scale = 10n ** BigInt(this.sdk.tokensMeta.get(token)?.decimals ?? 0);
+    const price = oracle.mainPrices.get(token)?.price || oracle.reservePrices.get(token)?.price || scale;
+    return amount * price / scale;
+  }
   #debugTokenData(tData) {
     return tData.map((t) => ({
       token: this.labelAddress(t.token),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "11.1.3",
+  "version": "11.1.5",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",
@@ -76,7 +76,7 @@
     "lint-staged": "^16.2.6",
     "pino": "^10.1.0",
     "pino-pretty": "^13.1.2",
-    "tsup": "^8.5.0",
+    "tsup": "^8.5.1",
     "tsx": "^4.20.6",
     "typescript": "^5.9.3",
     "viem-deal": "^2.0.4",