@t2000/cli 1.22.2 → 1.23.1

package/dist/{dist-XSJQIU5E.js → dist-K2TQP3EL.js}

@@ -52,11 +52,13 @@ import {
   WBTC_TYPE,
   WRITE_APPENDER_REGISTRY,
   ZkLoginSigner,
+  addClaimRewardsToTx,
   addFeeTransfer,
   addSendToTx,
   addStakeVSuiToTx,
   addSwapToTx,
   addUnstakeVSuiToTx,
+  aggregateClaimableRewards,
   allDescriptors,
   assertAllowedAsset,
   buildAddLeafTx,
@@ -72,6 +74,7 @@ import {
   classifyTransaction,
   composeTx,
   deriveAllowedAddressesFromPtb,
+  displayHandle,
   exportPrivateKey,
   extractTransferDetails,
   extractTxCommands,
@@ -127,7 +130,7 @@ import {
   validateAddress,
   validateLabel,
   walletExists
-} from "./chunk-COE5RRNH.js";
+} from "./chunk-IR2QGWUU.js";
 import "./chunk-Z74HUTKM.js";
 import "./chunk-V7PXDEKG.js";
 import "./chunk-UY3WLP52.js";
@@ -186,11 +189,13 @@ export {
   WBTC_TYPE,
   WRITE_APPENDER_REGISTRY,
   ZkLoginSigner,
+  addClaimRewardsToTx,
   addFeeTransfer,
   addSendToTx,
   addStakeVSuiToTx,
   addSwapToTx,
   addUnstakeVSuiToTx,
+  aggregateClaimableRewards,
   allDescriptors,
   assertAllowedAsset,
   buildAddLeafTx,
@@ -206,6 +211,7 @@ export {
   classifyTransaction,
   composeTx,
   deriveAllowedAddressesFromPtb,
+  displayHandle,
   exportPrivateKey,
   extractTransferDetails,
   extractTxCommands,
@@ -262,4 +268,4 @@ export {
   validateLabel,
   walletExists
 };
-//# sourceMappingURL=dist-XSJQIU5E.js.map
+//# sourceMappingURL=dist-K2TQP3EL.js.map

package/dist/{dist-7TDENFJA.js → dist-K4ONVV5A.js}

@@ -136083,35 +136083,6 @@ async function vt(e, n) {
   );
   return await De(e, t, n);
 }
-function wt(e) {
-  const n = /* @__PURE__ */ new Map();
-  e.forEach((r) => {
-    const t = r.assetId, a = r.option, s = `${t}-${a}-${r.rewardCoinType}-${r.market}`;
-    n.has(s) ? n.get(s).total += r.userClaimableReward : n.set(s, {
-      assetId: t,
-      rewardType: a,
-      coinType: r.rewardCoinType,
-      total: Number(r.userClaimableReward),
-      market: r.market
-    });
-  });
-  const o = /* @__PURE__ */ new Map();
-  for (const { assetId: r, rewardType: t, coinType: a, total: s, market: i } of n.values()) {
-    const c = `${r}-${t}-${i}`;
-    o.has(c) || o.set(c, { assetId: r, rewardType: t, market: i, rewards: /* @__PURE__ */ new Map() });
-    const u2 = o.get(c);
-    u2.rewards.set(a, (u2.rewards.get(a) || 0) + s);
-  }
-  return Array.from(o.values()).map((r) => ({
-    assetId: r.assetId,
-    rewardType: r.rewardType,
-    market: r.market,
-    rewards: Array.from(r.rewards.entries()).map(([t, a]) => ({
-      coinType: t,
-      available: a.toFixed(6)
-    }))
-  }));
-}
 async function Ct(e, n, o) {
   const r = await R2({
     ...o,
@@ -136287,6 +136258,7 @@ async function Ct(e, n, o) {
   return a;
 }
 init_errors7();
+init_token_registry();
 var MIN_HEALTH_FACTOR = 1.5;
 function sdkOptions(client) {
   return { env: "prod", client, cacheTime: 0, disableCache: true };
@@ -136645,60 +136617,69 @@ async function maxBorrowAmount(client, address2) {
   return { maxAmount, healthFactorAfter: MIN_HEALTH_FACTOR, currentHF: hf.healthFactor };
 }
 async function getPendingRewards2(client, address2) {
+  let rewards;
   try {
-    const rewards = await vt(address2, {
+    rewards = await vt(address2, {
       ...sdkOptions(client),
       markets: ["main"]
     });
-    if (!rewards || rewards.length === 0) return [];
-    const summary = wt(rewards);
-    const result = [];
-    for (const s of summary) {
-      for (const rw of s.rewards) {
-        const available = Number(rw.available);
-        if (available <= 0) continue;
-        const symbol2 = rw.coinType.split("::").pop() ?? "UNKNOWN";
-        result.push({
-          protocol: "navi",
-          asset: String(s.assetId),
-          coinType: rw.coinType,
-          symbol: symbol2,
-          amount: available,
-          estimatedValueUsd: 0
-        });
-      }
-    }
-    return result;
-  } catch {
-    return [];
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new T2000Error(
+      "PROTOCOL_UNAVAILABLE",
+      `NAVI rewards lookup failed: ${msg}`,
+      { source: "navi-rewards-read" },
+      true
+    );
   }
+  if (!rewards || rewards.length === 0) return [];
+  const claimable = rewards.filter((r) => Number(r.userClaimableReward) > 0);
+  return aggregateClaimableRewards(claimable);
 }
 async function addClaimRewardsToTx(tx, client, address2) {
+  let rewards;
   try {
-    const rewards = await vt(address2, {
+    rewards = await vt(address2, {
       ...sdkOptions(client),
       markets: ["main"]
     });
-    if (!rewards || rewards.length === 0) return [];
-    const claimable = rewards.filter(
-      (r) => Number(r.userClaimableReward) > 0
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new T2000Error(
+      "PROTOCOL_UNAVAILABLE",
+      `NAVI rewards lookup failed: ${msg}`,
+      { source: "navi-rewards-claim-prelude" },
+      true
     );
-    if (claimable.length === 0) return [];
+  }
+  if (!rewards || rewards.length === 0) return [];
+  const claimable = rewards.filter(
+    (r) => Number(r.userClaimableReward) > 0
+  );
+  if (claimable.length === 0) return [];
+  try {
     await Ct(tx, claimable, {
       env: "prod",
       customCoinReceive: { type: "transfer", transfer: address2 }
     });
-    return aggregateClaimableRewards(claimable);
-  } catch {
-    return [];
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    throw new T2000Error(
+      "PROTOCOL_UNAVAILABLE",
+      `NAVI claim PTB build failed: ${msg}`,
+      { source: "navi-rewards-claim-ptb" },
+      true
+    );
   }
+  return aggregateClaimableRewards(claimable);
 }
 function aggregateClaimableRewards(claimable) {
   const aggregated = /* @__PURE__ */ new Map();
   for (const c of claimable) {
     const coinType = c.rewardCoinType;
     if (!coinType) continue;
-    const symbol2 = coinType.split("::").pop() ?? "REWARD";
+    const meta3 = getCoinMeta(coinType);
+    const symbol2 = meta3?.symbol ?? coinType.split("::").pop() ?? "REWARD";
     const amount2 = Number(c.userClaimableReward);
     if (!Number.isFinite(amount2) || amount2 <= 0) continue;
     const existing = aggregated.get(coinType);
@@ -138112,13 +138093,20 @@ var T2000 = class _T2000 extends import_index2.default {
   }
   // -- Claim Rewards --
   async getPendingRewards() {
-    const adapters = this.registry.listLending();
+    const adapters = this.registry.listLending().filter((a) => a.getPendingRewards);
+    if (adapters.length === 0) return [];
     const results = await Promise.allSettled(
-      adapters.filter((a) => a.getPendingRewards).map((a) => a.getPendingRewards(this._address))
+      adapters.map((a) => a.getPendingRewards(this._address))
     );
     const all3 = [];
+    const errors = [];
     for (const r of results) {
       if (r.status === "fulfilled") all3.push(...r.value);
+      else errors.push(r.reason);
+    }
+    if (all3.length === 0 && errors.length === adapters.length) {
+      const first = errors[0];
+      throw first instanceof Error ? first : new Error(String(first));
     }
     return all3;
   }
@@ -138131,13 +138119,19 @@ var T2000 = class _T2000 extends import_index2.default {
     const tx = new Transaction();
     tx.setSender(this._address);
     const allRewards = [];
+    const errors = [];
     for (const adapter2 of adapters) {
       try {
         const claimed = await adapter2.addClaimRewardsToTx(tx, this._address);
         allRewards.push(...claimed);
-      } catch {
+      } catch (err) {
+        errors.push(err);
       }
     }
+    if (allRewards.length === 0 && errors.length === adapters.length) {
+      const first = errors[0];
+      throw first instanceof Error ? first : new Error(String(first));
+    }
     if (allRewards.length === 0) {
       return { success: true, tx: "", rewards: [], totalValueUsd: 0, gasCost: 0 };
     }
@@ -139672,7 +139666,7 @@ ${context}
     })
   );
 }
-var PKG_VERSION = "1.22.2";
+var PKG_VERSION = "1.23.1";
 console.log = (...args) => console.error("[log]", ...args);
 console.warn = (...args) => console.error("[warn]", ...args);
 async function startMcpServer(opts) {
@@ -139762,4 +139756,4 @@ axios/dist/node/axios.cjs:
 @scure/bip39/index.js:
   (*! scure-bip39 - MIT License (c) 2022 Patricio Palladino, Paul Miller (paulmillr.com) *)
 */
-//# sourceMappingURL=dist-7TDENFJA.js.map
+//# sourceMappingURL=dist-K4ONVV5A.js.map