@t2000/sdk 0.14.1 → 0.15.1

package/dist/{index-B14ZyQZt.d.cts → index-BykavuDO.d.cts}

@@ -223,6 +223,9 @@ interface InvestmentPosition {
     unrealizedPnL: number;
     unrealizedPnLPct: number;
     trades: InvestmentTrade[];
+    earning?: boolean;
+    earningProtocol?: string;
+    earningApy?: number;
 }
 interface PortfolioResult {
     positions: InvestmentPosition[];
@@ -246,6 +249,16 @@ interface InvestResult {
     realizedPnL?: number;
     position: InvestmentPosition;
 }
+interface InvestEarnResult {
+    success: boolean;
+    tx: string;
+    asset: string;
+    amount: number;
+    protocol: string;
+    apy: number;
+    gasCost: number;
+    gasMethod: GasMethod;
+}
 type PositionSide = 'long' | 'short';
 interface PerpsPosition {
     market: string;
@@ -608,4 +621,4 @@ declare function attack(client: SuiJsonRpcClient, signer: Ed25519Keypair, sentin
 /** All registered protocol descriptors — used by the indexer for event classification */
 declare const allDescriptors: ProtocolDescriptor[];
 
-export { requestAttack as $, type AdapterCapability as A, type BalanceResponse as B, CetusAdapter as C, type DepositInfo as D, type EarningsResult as E, type FundStatusResult as F, type GasMethod as G, type HealthFactorResult as H, type InvestmentTrade as I, type SentinelVerdict as J, SuilendAdapter as K, type LendingAdapter as L, type MaxWithdrawResult as M, NaviAdapter as N, type SwapQuote as O, type PortfolioResult as P, type TradePositionsResult as Q, type RepayResult as R, type SendResult as S, type T2000Options as T, type TradeResult as U, allDescriptors as V, type WithdrawResult as W, descriptor$2 as X, getSentinelInfo as Y, listSentinels as Z, descriptor$3 as _, type TransactionRecord as a, attack as a0, descriptor as a1, settleAttack as a2, submitPrompt as a3, descriptor$1 as a4, type SwapAdapter as b, type SaveResult as c, type BorrowResult as d, type MaxBorrowResult as e, type SwapResult as f, type InvestResult as g, type PositionsResult as h, type RatesResult as i, type LendingRates as j, type RebalanceResult as k, type SentinelAgent as l, type SentinelAttackResult as m, type AdapterPositions as n, type AdapterTxResult as o, type AssetRates as p, type GasReserve as q, type HealthInfo as r, type InvestmentPosition as s, type PerpsAdapter as t, type PerpsPosition as u, type PositionEntry as v, type PositionSide as w, type ProtocolDescriptor as x, ProtocolRegistry as y, type RebalanceStep as z };
+export { descriptor$3 as $, type AdapterCapability as A, type BalanceResponse as B, CetusAdapter as C, type DepositInfo as D, type EarningsResult as E, type FundStatusResult as F, type GasMethod as G, type HealthFactorResult as H, type InvestmentTrade as I, type RebalanceStep as J, type SentinelVerdict as K, type LendingAdapter as L, type MaxWithdrawResult as M, NaviAdapter as N, SuilendAdapter as O, type PortfolioResult as P, type SwapQuote as Q, type RepayResult as R, type SendResult as S, type T2000Options as T, type TradePositionsResult as U, type TradeResult as V, type WithdrawResult as W, allDescriptors as X, descriptor$2 as Y, getSentinelInfo as Z, listSentinels as _, type TransactionRecord as a, requestAttack as a0, attack as a1, descriptor as a2, settleAttack as a3, submitPrompt as a4, descriptor$1 as a5, type SwapAdapter as b, type SaveResult as c, type BorrowResult as d, type MaxBorrowResult as e, type SwapResult as f, type InvestResult as g, type InvestEarnResult as h, type PositionsResult as i, type RatesResult as j, type LendingRates as k, type RebalanceResult as l, type SentinelAgent as m, type SentinelAttackResult as n, type AdapterPositions as o, type AdapterTxResult as p, type AssetRates as q, type GasReserve as r, type HealthInfo as s, type InvestmentPosition as t, type PerpsAdapter as u, type PerpsPosition as v, type PositionEntry as w, type PositionSide as x, type ProtocolDescriptor as y, ProtocolRegistry as z };

package/dist/{index-B14ZyQZt.d.ts → index-BykavuDO.d.ts}

@@ -223,6 +223,9 @@ interface InvestmentPosition {
     unrealizedPnL: number;
     unrealizedPnLPct: number;
     trades: InvestmentTrade[];
+    earning?: boolean;
+    earningProtocol?: string;
+    earningApy?: number;
 }
 interface PortfolioResult {
     positions: InvestmentPosition[];
@@ -246,6 +249,16 @@ interface InvestResult {
     realizedPnL?: number;
     position: InvestmentPosition;
 }
+interface InvestEarnResult {
+    success: boolean;
+    tx: string;
+    asset: string;
+    amount: number;
+    protocol: string;
+    apy: number;
+    gasCost: number;
+    gasMethod: GasMethod;
+}
 type PositionSide = 'long' | 'short';
 interface PerpsPosition {
     market: string;
@@ -608,4 +621,4 @@ declare function attack(client: SuiJsonRpcClient, signer: Ed25519Keypair, sentin
 /** All registered protocol descriptors — used by the indexer for event classification */
 declare const allDescriptors: ProtocolDescriptor[];
 
-export { requestAttack as $, type AdapterCapability as A, type BalanceResponse as B, CetusAdapter as C, type DepositInfo as D, type EarningsResult as E, type FundStatusResult as F, type GasMethod as G, type HealthFactorResult as H, type InvestmentTrade as I, type SentinelVerdict as J, SuilendAdapter as K, type LendingAdapter as L, type MaxWithdrawResult as M, NaviAdapter as N, type SwapQuote as O, type PortfolioResult as P, type TradePositionsResult as Q, type RepayResult as R, type SendResult as S, type T2000Options as T, type TradeResult as U, allDescriptors as V, type WithdrawResult as W, descriptor$2 as X, getSentinelInfo as Y, listSentinels as Z, descriptor$3 as _, type TransactionRecord as a, attack as a0, descriptor as a1, settleAttack as a2, submitPrompt as a3, descriptor$1 as a4, type SwapAdapter as b, type SaveResult as c, type BorrowResult as d, type MaxBorrowResult as e, type SwapResult as f, type InvestResult as g, type PositionsResult as h, type RatesResult as i, type LendingRates as j, type RebalanceResult as k, type SentinelAgent as l, type SentinelAttackResult as m, type AdapterPositions as n, type AdapterTxResult as o, type AssetRates as p, type GasReserve as q, type HealthInfo as r, type InvestmentPosition as s, type PerpsAdapter as t, type PerpsPosition as u, type PositionEntry as v, type PositionSide as w, type ProtocolDescriptor as x, ProtocolRegistry as y, type RebalanceStep as z };
+export { descriptor$3 as $, type AdapterCapability as A, type BalanceResponse as B, CetusAdapter as C, type DepositInfo as D, type EarningsResult as E, type FundStatusResult as F, type GasMethod as G, type HealthFactorResult as H, type InvestmentTrade as I, type RebalanceStep as J, type SentinelVerdict as K, type LendingAdapter as L, type MaxWithdrawResult as M, NaviAdapter as N, SuilendAdapter as O, type PortfolioResult as P, type SwapQuote as Q, type RepayResult as R, type SendResult as S, type T2000Options as T, type TradePositionsResult as U, type TradeResult as V, type WithdrawResult as W, allDescriptors as X, descriptor$2 as Y, getSentinelInfo as Z, listSentinels as _, type TransactionRecord as a, requestAttack as a0, attack as a1, descriptor as a2, settleAttack as a3, submitPrompt as a4, descriptor$1 as a5, type SwapAdapter as b, type SaveResult as c, type BorrowResult as d, type MaxBorrowResult as e, type SwapResult as f, type InvestResult as g, type InvestEarnResult as h, type PositionsResult as i, type RatesResult as j, type LendingRates as k, type RebalanceResult as l, type SentinelAgent as m, type SentinelAttackResult as n, type AdapterPositions as o, type AdapterTxResult as p, type AssetRates as q, type GasReserve as r, type HealthInfo as s, type InvestmentPosition as t, type PerpsAdapter as u, type PerpsPosition as v, type PositionEntry as w, type PositionSide as x, type ProtocolDescriptor as y, ProtocolRegistry as z };

package/dist/index.cjs

@@ -60,7 +60,7 @@ var SUPPORTED_ASSETS = {
     displayName: "SUI"
   },
   BTC: {
-    type: "0xaafb102dd0902f5055cadecd687fb5b71ca82ef0e0285d90afde828ec58ca96b::btc::BTC",
+    type: "0x0041f9f9344cac094454cd574e333c4fdb132d7bcc9379bcd4aab485b2a63942::wbtc::WBTC",
     decimals: 8,
     symbol: "BTC",
     displayName: "Bitcoin"
@@ -602,16 +602,23 @@ function resolvePoolSymbol(pool) {
   }
   return pool.token?.symbol ?? "UNKNOWN";
 }
+function resolveAssetInfo(asset) {
+  if (asset in SUPPORTED_ASSETS) {
+    const info = SUPPORTED_ASSETS[asset];
+    return { type: info.type, decimals: info.decimals, displayName: info.displayName };
+  }
+  throw new T2000Error("ASSET_NOT_SUPPORTED", `Unknown asset: ${asset}`);
+}
 async function getPool(asset = "USDC") {
   const pools = await getPools();
-  const targetType = SUPPORTED_ASSETS[asset].type;
+  const { type: targetType, displayName } = resolveAssetInfo(asset);
   const pool = pools.find(
     (p) => matchesCoinType(p.suiCoinType || p.coinType || "", targetType)
   );
   if (!pool) {
     throw new T2000Error(
       "ASSET_NOT_SUPPORTED",
-      `${SUPPORTED_ASSETS[asset].displayName} pool not found on NAVI. Try: ${STABLE_ASSETS.filter((a) => a !== asset).join(", ")}`
+      `${displayName} pool not found on NAVI`
     );
   }
   return pool;
@@ -634,13 +641,14 @@ function addOracleUpdate(tx, config, pool) {
     ]
   });
 }
-function refreshStableOracles(tx, config, pools) {
-  const stableTypes = STABLE_ASSETS.map((a) => SUPPORTED_ASSETS[a].type);
-  const stablePools = pools.filter((p) => {
+function refreshOracles(tx, config, pools, opts) {
+  const assetsToRefresh = NAVI_SUPPORTED_ASSETS;
+  const targetTypes = assetsToRefresh.map((a) => SUPPORTED_ASSETS[a].type);
+  const matchedPools = pools.filter((p) => {
     const ct = p.suiCoinType || p.coinType || "";
-    return stableTypes.some((t) => matchesCoinType(ct, t));
+    return targetTypes.some((t) => matchesCoinType(ct, t));
   });
-  for (const pool of stablePools) {
+  for (const pool of matchedPools) {
     addOracleUpdate(tx, config, pool);
   }
 }
@@ -714,7 +722,7 @@ async function buildSaveTx(client, address, amount, options = {}) {
     throw new T2000Error("INVALID_AMOUNT", "Save amount must be a positive number");
   }
   const asset = options.asset ?? "USDC";
-  const assetInfo = SUPPORTED_ASSETS[asset];
+  const assetInfo = resolveAssetInfo(asset);
   const rawAmount = Number(stableToRaw(amount, assetInfo.decimals));
   const [config, pool] = await Promise.all([getConfig(), getPool(asset)]);
   const coins = await fetchCoins(client, address, assetInfo.type);
@@ -743,7 +751,7 @@ async function buildSaveTx(client, address, amount, options = {}) {
 }
 async function buildWithdrawTx(client, address, amount, options = {}) {
   const asset = options.asset ?? "USDC";
-  const assetInfo = SUPPORTED_ASSETS[asset];
+  const assetInfo = resolveAssetInfo(asset);
   const [config, pool, pools, states] = await Promise.all([
     getConfig(),
     getPool(asset),
@@ -760,7 +768,7 @@ async function buildWithdrawTx(client, address, amount, options = {}) {
   }
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  refreshStableOracles(tx, config, pools);
+  refreshOracles(tx, config, pools);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::withdraw_v2`,
     arguments: [
@@ -786,7 +794,7 @@ async function buildWithdrawTx(client, address, amount, options = {}) {
 }
 async function addWithdrawToTx(tx, client, address, amount, options = {}) {
   const asset = options.asset ?? "USDC";
-  const assetInfo = SUPPORTED_ASSETS[asset];
+  const assetInfo = resolveAssetInfo(asset);
   const [config, pool, pools, states] = await Promise.all([
     getConfig(),
     getPool(asset),
@@ -805,7 +813,7 @@ async function addWithdrawToTx(tx, client, address, amount, options = {}) {
     });
     return { coin: coin2, effectiveAmount: 0 };
   }
-  refreshStableOracles(tx, config, pools);
+  refreshOracles(tx, config, pools);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::withdraw_v2`,
     arguments: [
@@ -854,7 +862,7 @@ async function addSaveToTx(tx, _client, _address, coin, options = {}) {
     typeArguments: [pool.suiCoinType]
   });
 }
-async function addRepayToTx(tx, client, _address, coin, options = {}) {
+async function addRepayToTx(tx, _client, _address, coin, options = {}) {
   const asset = options.asset ?? "USDC";
   const [config, pool] = await Promise.all([getConfig(), getPool(asset)]);
   addOracleUpdate(tx, config, pool);
@@ -884,7 +892,7 @@ async function buildBorrowTx(client, address, amount, options = {}) {
     throw new T2000Error("INVALID_AMOUNT", "Borrow amount must be a positive number");
   }
   const asset = options.asset ?? "USDC";
-  const assetInfo = SUPPORTED_ASSETS[asset];
+  const assetInfo = resolveAssetInfo(asset);
   const rawAmount = Number(stableToRaw(amount, assetInfo.decimals));
   const [config, pool, pools] = await Promise.all([
     getConfig(),
@@ -893,7 +901,7 @@ async function buildBorrowTx(client, address, amount, options = {}) {
   ]);
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  refreshStableOracles(tx, config, pools);
+  refreshOracles(tx, config, pools);
   const [balance] = tx.moveCall({
     target: `${config.package}::incentive_v3::borrow_v2`,
     arguments: [
@@ -925,7 +933,7 @@ async function buildRepayTx(client, address, amount, options = {}) {
     throw new T2000Error("INVALID_AMOUNT", "Repay amount must be a positive number");
   }
   const asset = options.asset ?? "USDC";
-  const assetInfo = SUPPORTED_ASSETS[asset];
+  const assetInfo = resolveAssetInfo(asset);
   const rawAmount = Number(stableToRaw(amount, assetInfo.decimals));
   const [config, pool] = await Promise.all([getConfig(), getPool(asset)]);
   const coins = await fetchCoins(client, address, assetInfo.type);
@@ -1024,11 +1032,12 @@ async function getHealthFactor(client, addressOrKeypair) {
     liquidationThreshold: liqThreshold
   };
 }
+var NAVI_SUPPORTED_ASSETS = [...STABLE_ASSETS, "SUI", "ETH"];
 async function getRates(client) {
   try {
     const pools = await getPools();
     const result = {};
-    for (const asset of STABLE_ASSETS) {
+    for (const asset of NAVI_SUPPORTED_ASSETS) {
       const targetType = SUPPORTED_ASSETS[asset].type;
       const pool = pools.find((p) => matchesCoinType(p.suiCoinType || p.coinType || "", targetType));
       if (!pool) continue;
@@ -1398,7 +1407,11 @@ var ProtocolRegistry = class {
   }
   async allRatesAcrossAssets() {
     const results = [];
-    for (const asset of STABLE_ASSETS) {
+    const allAssets = [...STABLE_ASSETS, ...Object.keys(INVESTMENT_ASSETS)];
+    const seen = /* @__PURE__ */ new Set();
+    for (const asset of allAssets) {
+      if (seen.has(asset)) continue;
+      seen.add(asset);
       for (const adapter of this.lending.values()) {
         if (!adapter.supportedAssets.includes(asset)) continue;
         try {
@@ -1473,7 +1486,7 @@ var NaviAdapter = class {
   name = "NAVI Protocol";
   version = "1.0.0";
   capabilities = ["save", "withdraw", "borrow", "repay"];
-  supportedAssets = [...STABLE_ASSETS];
+  supportedAssets = [...STABLE_ASSETS, "SUI", "ETH"];
   supportsSameAssetBorrow = true;
   client;
   async init(client) {
@@ -1500,23 +1513,23 @@ var NaviAdapter = class {
     return getHealthFactor(this.client, address);
   }
   async buildSaveTx(address, amount, asset, options) {
-    const stableAsset = normalizeAsset(asset);
-    const tx = await buildSaveTx(this.client, address, amount, { ...options, asset: stableAsset });
+    const normalized = normalizeAsset(asset);
+    const tx = await buildSaveTx(this.client, address, amount, { ...options, asset: normalized });
     return { tx };
   }
   async buildWithdrawTx(address, amount, asset) {
-    const stableAsset = normalizeAsset(asset);
-    const result = await buildWithdrawTx(this.client, address, amount, { asset: stableAsset });
+    const normalized = normalizeAsset(asset);
+    const result = await buildWithdrawTx(this.client, address, amount, { asset: normalized });
     return { tx: result.tx, effectiveAmount: result.effectiveAmount };
   }
   async buildBorrowTx(address, amount, asset, options) {
-    const stableAsset = normalizeAsset(asset);
-    const tx = await buildBorrowTx(this.client, address, amount, { ...options, asset: stableAsset });
+    const normalized = normalizeAsset(asset);
+    const tx = await buildBorrowTx(this.client, address, amount, { ...options, asset: normalized });
     return { tx };
   }
   async buildRepayTx(address, amount, asset) {
-    const stableAsset = normalizeAsset(asset);
-    const tx = await buildRepayTx(this.client, address, amount, { asset: stableAsset });
+    const normalized = normalizeAsset(asset);
+    const tx = await buildRepayTx(this.client, address, amount, { asset: normalized });
     return { tx };
   }
   async maxWithdraw(address, _asset) {
@@ -1526,16 +1539,16 @@ var NaviAdapter = class {
     return maxBorrowAmount(this.client, address);
   }
   async addWithdrawToTx(tx, address, amount, asset) {
-    const stableAsset = normalizeAsset(asset);
-    return addWithdrawToTx(tx, this.client, address, amount, { asset: stableAsset });
+    const normalized = normalizeAsset(asset);
+    return addWithdrawToTx(tx, this.client, address, amount, { asset: normalized });
   }
   async addSaveToTx(tx, address, coin, asset, options) {
-    const stableAsset = normalizeAsset(asset);
-    return addSaveToTx(tx, this.client, address, coin, { ...options, asset: stableAsset });
+    const normalized = normalizeAsset(asset);
+    return addSaveToTx(tx, this.client, address, coin, { ...options, asset: normalized });
   }
   async addRepayToTx(tx, address, coin, asset) {
-    const stableAsset = normalizeAsset(asset);
-    return addRepayToTx(tx, this.client, address, coin, { asset: stableAsset });
+    const normalized = normalizeAsset(asset);
+    return addRepayToTx(tx, this.client, address, coin, { asset: normalized });
   }
 };
 var DEFAULT_SLIPPAGE_BPS = 300;
@@ -1847,7 +1860,7 @@ var SuilendAdapter = class {
   name = "Suilend";
   version = "2.0.0";
   capabilities = ["save", "withdraw", "borrow", "repay"];
-  supportedAssets = [...STABLE_ASSETS];
+  supportedAssets = [...STABLE_ASSETS, "SUI", "ETH", "BTC"];
   supportsSameAssetBorrow = false;
   client;
   publishedAt = null;
@@ -2869,6 +2882,38 @@ var PortfolioManager = class {
     this.load();
     return Object.entries(this.data.positions).filter(([, pos]) => pos.totalAmount > 0).map(([asset, pos]) => ({ asset, ...pos }));
   }
+  recordEarn(asset, protocol, apy) {
+    this.load();
+    const pos = this.data.positions[asset];
+    if (!pos || pos.totalAmount <= 0) {
+      throw new T2000Error("INSUFFICIENT_INVESTMENT", `No ${asset} position to earn on`);
+    }
+    if (pos.earning) {
+      throw new T2000Error("INVEST_ALREADY_EARNING", `${asset} is already earning via ${pos.earningProtocol}`);
+    }
+    pos.earning = true;
+    pos.earningProtocol = protocol;
+    pos.earningApy = apy;
+    this.data.positions[asset] = pos;
+    this.save();
+  }
+  recordUnearn(asset) {
+    this.load();
+    const pos = this.data.positions[asset];
+    if (!pos || !pos.earning) {
+      throw new T2000Error("INVEST_NOT_EARNING", `${asset} is not currently earning`);
+    }
+    pos.earning = false;
+    pos.earningProtocol = void 0;
+    pos.earningApy = void 0;
+    this.data.positions[asset] = pos;
+    this.save();
+  }
+  isEarning(asset) {
+    this.load();
+    const pos = this.data.positions[asset];
+    return pos?.earning === true;
+  }
   getRealizedPnL() {
     this.load();
     return this.data.realizedPnL;
@@ -3428,16 +3473,49 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
     return adapter.maxWithdraw(this._address, "USDC");
   }
   // -- Borrowing --
+  async adjustMaxBorrowForInvestments(adapter, maxResult) {
+    const earningPositions = this.portfolio.getPositions().filter((p) => p.earning);
+    if (earningPositions.length === 0) return maxResult;
+    let investmentCollateralUsd = 0;
+    const swapAdapter = this.registry.listSwap()[0];
+    for (const pos of earningPositions) {
+      if (pos.earningProtocol !== adapter.id) continue;
+      try {
+        let price = 0;
+        if (pos.asset === "SUI" && swapAdapter) {
+          price = await swapAdapter.getPoolPrice();
+        } else if (swapAdapter) {
+          const quote = await swapAdapter.getQuote("USDC", pos.asset, 1);
+          price = quote.expectedOutput > 0 ? 1 / quote.expectedOutput : 0;
+        }
+        investmentCollateralUsd += pos.totalAmount * price;
+      } catch {
+      }
+    }
+    if (investmentCollateralUsd <= 0) return maxResult;
+    const CONSERVATIVE_LTV = 0.6;
+    const investmentBorrowCapacity = investmentCollateralUsd * CONSERVATIVE_LTV;
+    const adjustedMax = Math.max(0, maxResult.maxAmount - investmentBorrowCapacity);
+    return { ...maxResult, maxAmount: adjustedMax };
+  }
   async borrow(params) {
     this.enforcer.assertNotLocked();
     const asset = "USDC";
     const adapter = await this.resolveLending(params.protocol, asset, "borrow");
-    const maxResult = await adapter.maxBorrow(this._address, asset);
+    const rawMax = await adapter.maxBorrow(this._address, asset);
+    const maxResult = await this.adjustMaxBorrowForInvestments(adapter, rawMax);
     if (maxResult.maxAmount <= 0) {
+      const hasInvestmentEarning = this.portfolio.getPositions().some((p) => p.earning && p.earningProtocol === adapter.id);
+      if (hasInvestmentEarning) {
+        throw new T2000Error(
+          "BORROW_GUARD_INVESTMENT",
+          "Max safe borrow: $0.00. Only savings deposits (stablecoins) count as borrowable collateral. Investment collateral (SUI, ETH, BTC) is excluded."
+        );
+      }
       throw new T2000Error("NO_COLLATERAL", "No collateral deposited. Save first with `t2000 save <amount>`.");
     }
     if (params.amount > maxResult.maxAmount) {
-      throw new T2000Error("HEALTH_FACTOR_TOO_LOW", `Max safe borrow: $${maxResult.maxAmount.toFixed(2)}`, {
+      throw new T2000Error("HEALTH_FACTOR_TOO_LOW", `Max safe borrow: $${maxResult.maxAmount.toFixed(2)}. Only savings deposits count as borrowable collateral.`, {
         maxBorrow: maxResult.maxAmount,
         currentHF: maxResult.currentHF
       });
@@ -3602,7 +3680,8 @@ To access invested funds: t2000 invest sell ${params.amount} ${asset}`,
   }
   async maxBorrow() {
     const adapter = await this.resolveLending(void 0, "USDC", "borrow");
-    return adapter.maxBorrow(this._address, "USDC");
+    const rawMax = await adapter.maxBorrow(this._address, "USDC");
+    return this.adjustMaxBorrowForInvestments(adapter, rawMax);
   }
   async healthFactor() {
     const adapter = await this.resolveLending(void 0, "USDC", "save");
@@ -3766,6 +3845,9 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
     if (!pos || pos.totalAmount <= 0) {
       throw new T2000Error("INSUFFICIENT_INVESTMENT", `No ${params.asset} position to sell`);
     }
+    if (pos.earning && pos.earningProtocol) {
+      await this.investUnearn({ asset: params.asset });
+    }
     const assetInfo = SUPPORTED_ASSETS[params.asset];
     const assetBalance = await this.client.getBalance({
       owner: this._address,
@@ -3840,6 +3922,91 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
       position
     };
   }
+  async investEarn(params) {
+    this.enforcer.assertNotLocked();
+    if (!(params.asset in INVESTMENT_ASSETS)) {
+      throw new T2000Error("ASSET_NOT_SUPPORTED", `${params.asset} is not available for investment`);
+    }
+    const pos = this.portfolio.getPosition(params.asset);
+    if (!pos || pos.totalAmount <= 0) {
+      throw new T2000Error("INSUFFICIENT_INVESTMENT", `No ${params.asset} position to earn on`);
+    }
+    if (pos.earning) {
+      throw new T2000Error("INVEST_ALREADY_EARNING", `${params.asset} is already earning via ${pos.earningProtocol}`);
+    }
+    const { adapter, rate } = await this.registry.bestSaveRate(params.asset);
+    const assetInfo = SUPPORTED_ASSETS[params.asset];
+    const assetBalance = await this.client.getBalance({
+      owner: this._address,
+      coinType: assetInfo.type
+    });
+    const walletAmount = Number(assetBalance.totalBalance) / 10 ** assetInfo.decimals;
+    const gasReserve = params.asset === "SUI" ? GAS_RESERVE_MIN : 0;
+    const depositAmount = Math.max(0, walletAmount - gasReserve);
+    if (depositAmount <= 0) {
+      throw new T2000Error("INSUFFICIENT_BALANCE", `No ${params.asset} available to deposit (wallet: ${walletAmount}, gas reserve: ${gasReserve})`);
+    }
+    const { tx } = await adapter.buildSaveTx(this._address, depositAmount, params.asset);
+    const result = await this.client.signAndExecuteTransaction({
+      signer: this.keypair,
+      transaction: tx,
+      options: { showEffects: true }
+    });
+    await this.client.waitForTransaction({ digest: result.digest });
+    const gasCost = result.effects?.gasUsed ? Math.abs(
+      (Number(result.effects.gasUsed.computationCost) + Number(result.effects.gasUsed.storageCost) - Number(result.effects.gasUsed.storageRebate)) / 1e9
+    ) : 0;
+    this.portfolio.recordEarn(params.asset, adapter.id, rate.saveApy);
+    return {
+      success: true,
+      tx: result.digest,
+      asset: params.asset,
+      amount: depositAmount,
+      protocol: adapter.name,
+      apy: rate.saveApy,
+      gasCost,
+      gasMethod: "self-funded"
+    };
+  }
+  async investUnearn(params) {
+    this.enforcer.assertNotLocked();
+    if (!(params.asset in INVESTMENT_ASSETS)) {
+      throw new T2000Error("ASSET_NOT_SUPPORTED", `${params.asset} is not available for investment`);
+    }
+    const pos = this.portfolio.getPosition(params.asset);
+    if (!pos || !pos.earning || !pos.earningProtocol) {
+      throw new T2000Error("INVEST_NOT_EARNING", `${params.asset} is not currently earning`);
+    }
+    const adapter = this.registry.getLending(pos.earningProtocol);
+    if (!adapter) {
+      throw new T2000Error("PROTOCOL_UNAVAILABLE", `Lending protocol ${pos.earningProtocol} not found`);
+    }
+    const positions = await adapter.getPositions(this._address);
+    const supply = positions.supplies.find((s) => s.asset === params.asset);
+    const withdrawAmount = supply?.amount ?? pos.totalAmount;
+    const { tx, effectiveAmount } = await adapter.buildWithdrawTx(this._address, withdrawAmount, params.asset);
+    const result = await this.client.signAndExecuteTransaction({
+      signer: this.keypair,
+      transaction: tx,
+      options: { showEffects: true }
+    });
+    await this.client.waitForTransaction({ digest: result.digest });
+    const gasCost = result.effects?.gasUsed ? Math.abs(
+      (Number(result.effects.gasUsed.computationCost) + Number(result.effects.gasUsed.storageCost) - Number(result.effects.gasUsed.storageRebate)) / 1e9
+    ) : 0;
+    const protocolName = adapter.name;
+    this.portfolio.recordUnearn(params.asset);
+    return {
+      success: true,
+      tx: result.digest,
+      asset: params.asset,
+      amount: effectiveAmount,
+      protocol: protocolName,
+      apy: 0,
+      gasCost,
+      gasMethod: "self-funded"
+    };
+  }
   async getPortfolio() {
     const positions = this.portfolio.getPositions();
     const realizedPnL = this.portfolio.getRealizedPnL();
@@ -3889,7 +4056,10 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
         currentValue,
         unrealizedPnL,
         unrealizedPnLPct,
-        trades: pos.trades
+        trades: pos.trades,
+        earning: pos.earning,
+        earningProtocol: pos.earningProtocol,
+        earningApy: pos.earningApy
       });
     }
     const totalInvested = enriched.reduce((sum, p) => sum + p.costBasis, 0);
@@ -3954,8 +4124,11 @@ To sell investment: t2000 invest sell ${params.amount} ${fromAsset}`,
       this.registry.allPositions(this._address),
       this.registry.allRatesAcrossAssets()
     ]);
+    const earningAssets = new Set(
+      this.portfolio.getPositions().filter((p) => p.earning).map((p) => p.asset)
+    );
     const savePositions = allPositions.flatMap(
-      (p) => p.positions.supplies.filter((s) => s.amount > 0.01).map((s) => ({
+      (p) => p.positions.supplies.filter((s) => s.amount > 0.01).filter((s) => !earningAssets.has(s.asset)).map((s) => ({
         protocolId: p.protocolId,
         protocol: p.protocol,
         asset: s.asset,