@t2000/sdk 0.2.7 → 0.3.0

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'eventemitter3';
 import { SuiClient } from '@mysten/sui/client';
 import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
-import { Transaction } from '@mysten/sui/transactions';
+import { Transaction, TransactionObjectArgument } from '@mysten/sui/transactions';
 
 interface T2000Options {
     keyPath?: string;
@@ -373,6 +373,12 @@ interface ProtocolFeeInfo {
     rawAmount: bigint;
 }
 declare function calculateFee(operation: FeeOperation, amount: number): ProtocolFeeInfo;
+/**
+ * Add on-chain fee collection to an existing PTB via t2000::treasury::collect_fee().
+ * The Move function splits the fee from the payment coin and stores it in the
+ * Treasury's internal Balance<T>. Atomic — reverts with the operation if it fails.
+ */
+declare function addCollectFeeToTx(tx: Transaction, paymentCoin: TransactionObjectArgument, operation: FeeOperation): void;
 
 interface SimulationResult {
     success: boolean;
@@ -448,4 +454,4 @@ interface GasStatusResponse {
 }
 declare function getGasStatus(address?: string): Promise<GasStatusResponse>;
 
-export { type AutoTopUpResult, BPS_DENOMINATOR, type BalanceResponse, type BorrowResult, CLOCK_ID, DEFAULT_NETWORK, type DepositInfo, type EarningsResult, type FeeOperation, type FundStatusResult, type GasExecutionResult, type GasMethod, type GasRequestType, type GasReserve, type GasSponsorResponse, type GasStatusResponse, type HealthFactorResult, MIST_PER_SUI, type MaxBorrowResult, type MaxWithdrawResult, type PositionEntry, type PositionsResult, type ProtocolFeeInfo, type RatesResult, type RepayResult, SENTINEL, SUI_DECIMALS, SUPPORTED_ASSETS, type SaveResult, type SendResult, type SentinelAgent, type SentinelAttackResult, type SentinelVerdict, type SimulationResult, type SupportedAsset, type SwapResult, T2000, T2000Error, type T2000ErrorCode, type T2000ErrorData, type T2000Options, type TransactionRecord, USDC_DECIMALS, type WithdrawResult, calculateFee, executeAutoTopUp, executeWithGas, exportPrivateKey, formatSui, formatUsd, generateKeypair, getAddress, getGasStatus, getPoolPrice, getRates, getSentinelInfo, getSwapQuote, keypairFromPrivateKey, listSentinels, loadKey, mapMoveAbortCode, mapWalletError, mistToSui, rawToUsdc, requestAttack, saveKey, attack as sentinelAttack, settleAttack, shouldAutoTopUp, simulateTransaction, solveHashcash, submitPrompt, suiToMist, throwIfSimulationFailed, truncateAddress, usdcToRaw, validateAddress, walletExists };
+export { type AutoTopUpResult, BPS_DENOMINATOR, type BalanceResponse, type BorrowResult, CLOCK_ID, DEFAULT_NETWORK, type DepositInfo, type EarningsResult, type FeeOperation, type FundStatusResult, type GasExecutionResult, type GasMethod, type GasRequestType, type GasReserve, type GasSponsorResponse, type GasStatusResponse, type HealthFactorResult, MIST_PER_SUI, type MaxBorrowResult, type MaxWithdrawResult, type PositionEntry, type PositionsResult, type ProtocolFeeInfo, type RatesResult, type RepayResult, SENTINEL, SUI_DECIMALS, SUPPORTED_ASSETS, type SaveResult, type SendResult, type SentinelAgent, type SentinelAttackResult, type SentinelVerdict, type SimulationResult, type SupportedAsset, type SwapResult, T2000, T2000Error, type T2000ErrorCode, type T2000ErrorData, type T2000Options, type TransactionRecord, USDC_DECIMALS, type WithdrawResult, addCollectFeeToTx, calculateFee, executeAutoTopUp, executeWithGas, exportPrivateKey, formatSui, formatUsd, generateKeypair, getAddress, getGasStatus, getPoolPrice, getRates, getSentinelInfo, getSwapQuote, keypairFromPrivateKey, listSentinels, loadKey, mapMoveAbortCode, mapWalletError, mistToSui, rawToUsdc, requestAttack, saveKey, attack as sentinelAttack, settleAttack, shouldAutoTopUp, simulateTransaction, solveHashcash, submitPrompt, suiToMist, throwIfSimulationFailed, truncateAddress, usdcToRaw, validateAddress, walletExists };

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'eventemitter3';
 import { SuiClient } from '@mysten/sui/client';
 import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
-import { Transaction } from '@mysten/sui/transactions';
+import { Transaction, TransactionObjectArgument } from '@mysten/sui/transactions';
 
 interface T2000Options {
     keyPath?: string;
@@ -373,6 +373,12 @@ interface ProtocolFeeInfo {
     rawAmount: bigint;
 }
 declare function calculateFee(operation: FeeOperation, amount: number): ProtocolFeeInfo;
+/**
+ * Add on-chain fee collection to an existing PTB via t2000::treasury::collect_fee().
+ * The Move function splits the fee from the payment coin and stores it in the
+ * Treasury's internal Balance<T>. Atomic — reverts with the operation if it fails.
+ */
+declare function addCollectFeeToTx(tx: Transaction, paymentCoin: TransactionObjectArgument, operation: FeeOperation): void;
 
 interface SimulationResult {
     success: boolean;
@@ -448,4 +454,4 @@ interface GasStatusResponse {
 }
 declare function getGasStatus(address?: string): Promise<GasStatusResponse>;
 
-export { type AutoTopUpResult, BPS_DENOMINATOR, type BalanceResponse, type BorrowResult, CLOCK_ID, DEFAULT_NETWORK, type DepositInfo, type EarningsResult, type FeeOperation, type FundStatusResult, type GasExecutionResult, type GasMethod, type GasRequestType, type GasReserve, type GasSponsorResponse, type GasStatusResponse, type HealthFactorResult, MIST_PER_SUI, type MaxBorrowResult, type MaxWithdrawResult, type PositionEntry, type PositionsResult, type ProtocolFeeInfo, type RatesResult, type RepayResult, SENTINEL, SUI_DECIMALS, SUPPORTED_ASSETS, type SaveResult, type SendResult, type SentinelAgent, type SentinelAttackResult, type SentinelVerdict, type SimulationResult, type SupportedAsset, type SwapResult, T2000, T2000Error, type T2000ErrorCode, type T2000ErrorData, type T2000Options, type TransactionRecord, USDC_DECIMALS, type WithdrawResult, calculateFee, executeAutoTopUp, executeWithGas, exportPrivateKey, formatSui, formatUsd, generateKeypair, getAddress, getGasStatus, getPoolPrice, getRates, getSentinelInfo, getSwapQuote, keypairFromPrivateKey, listSentinels, loadKey, mapMoveAbortCode, mapWalletError, mistToSui, rawToUsdc, requestAttack, saveKey, attack as sentinelAttack, settleAttack, shouldAutoTopUp, simulateTransaction, solveHashcash, submitPrompt, suiToMist, throwIfSimulationFailed, truncateAddress, usdcToRaw, validateAddress, walletExists };
+export { type AutoTopUpResult, BPS_DENOMINATOR, type BalanceResponse, type BorrowResult, CLOCK_ID, DEFAULT_NETWORK, type DepositInfo, type EarningsResult, type FeeOperation, type FundStatusResult, type GasExecutionResult, type GasMethod, type GasRequestType, type GasReserve, type GasSponsorResponse, type GasStatusResponse, type HealthFactorResult, MIST_PER_SUI, type MaxBorrowResult, type MaxWithdrawResult, type PositionEntry, type PositionsResult, type ProtocolFeeInfo, type RatesResult, type RepayResult, SENTINEL, SUI_DECIMALS, SUPPORTED_ASSETS, type SaveResult, type SendResult, type SentinelAgent, type SentinelAttackResult, type SentinelVerdict, type SimulationResult, type SupportedAsset, type SwapResult, T2000, T2000Error, type T2000ErrorCode, type T2000ErrorData, type T2000Options, type TransactionRecord, USDC_DECIMALS, type WithdrawResult, addCollectFeeToTx, calculateFee, executeAutoTopUp, executeWithGas, exportPrivateKey, formatSui, formatUsd, generateKeypair, getAddress, getGasStatus, getPoolPrice, getRates, getSentinelInfo, getSwapQuote, keypairFromPrivateKey, listSentinels, loadKey, mapMoveAbortCode, mapWalletError, mistToSui, rawToUsdc, requestAttack, saveKey, attack as sentinelAttack, settleAttack, shouldAutoTopUp, simulateTransaction, solveHashcash, submitPrompt, suiToMist, throwIfSimulationFailed, truncateAddress, usdcToRaw, validateAddress, walletExists };

package/dist/index.js

@@ -38,9 +38,9 @@ var SUPPORTED_ASSETS = {
     symbol: "SUI"
   }
 };
-process.env.T2000_PACKAGE_ID ?? "0x51c44bb2ad3ba608cf9adbc6e37ee67268ef9313a4ff70957d4c6e7955dc7eef";
-process.env.T2000_CONFIG_ID ?? "0xd30408960ac38eced670acc102df9e178b5b46b3a8c0e96a53ec2fd3f39b5936";
-process.env.T2000_TREASURY_ID ?? "0x2398c2759cfce40f1b0f2b3e524eeba9e8f6428fcb1d1e39235dd042d48defc8";
+var T2000_PACKAGE_ID = process.env.T2000_PACKAGE_ID ?? "0xab92e9f1fe549ad3d6a52924a73181b45791e76120b975138fac9ec9b75db9f3";
+var T2000_CONFIG_ID = process.env.T2000_CONFIG_ID ?? "0x408add9aa9322f93cfd87523d8f603006eb8713894f4c460283c58a6888dae8a";
+var T2000_TREASURY_ID = process.env.T2000_TREASURY_ID ?? "0x3bb501b8300125dca59019247941a42af6b292a150ce3cfcce9449456be2ec91";
 var DEFAULT_NETWORK = "mainnet";
 var DEFAULT_RPC_URL = "https://fullnode.mainnet.sui.io:443";
 var DEFAULT_KEY_PATH = "~/.t2000/wallet.key";
@@ -100,7 +100,8 @@ function mapMoveAbortCode(code) {
     6: "Not authorized",
     7: "Package version mismatch \u2014 upgrade required",
     8: "Timelock is active \u2014 wait for expiry",
-    9: "No pending change to execute"
+    9: "No pending change to execute",
+    10: "Already at current version"
   };
   return abortMessages[code] ?? `Move abort code: ${code}`;
 }
@@ -371,6 +372,61 @@ function inferAction(txBlock) {
   if (kind === "ProgrammableTransaction") return "transaction";
   return kind ?? "unknown";
 }
+
+// src/protocols/protocolFee.ts
+var FEE_RATES = {
+  save: SAVE_FEE_BPS,
+  swap: SWAP_FEE_BPS,
+  borrow: BORROW_FEE_BPS
+};
+var OP_CODES = {
+  save: 0,
+  swap: 1,
+  borrow: 2
+};
+function calculateFee(operation, amount) {
+  const bps = FEE_RATES[operation];
+  const feeAmount = amount * Number(bps) / Number(BPS_DENOMINATOR);
+  const rawAmount = usdcToRaw(feeAmount);
+  return {
+    amount: feeAmount,
+    asset: "USDC",
+    rate: Number(bps) / Number(BPS_DENOMINATOR),
+    rawAmount
+  };
+}
+function addCollectFeeToTx(tx, paymentCoin, operation) {
+  const bps = FEE_RATES[operation];
+  if (bps <= 0n) return;
+  tx.moveCall({
+    target: `${T2000_PACKAGE_ID}::treasury::collect_fee`,
+    typeArguments: [SUPPORTED_ASSETS.USDC.type],
+    arguments: [
+      tx.object(T2000_TREASURY_ID),
+      tx.object(T2000_CONFIG_ID),
+      paymentCoin,
+      tx.pure.u8(OP_CODES[operation])
+    ]
+  });
+}
+async function reportFee(agentAddress, operation, feeAmount, feeRate, txDigest) {
+  try {
+    await fetch(`${API_BASE_URL}/api/fees`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        agentAddress,
+        operation,
+        feeAmount: feeAmount.toString(),
+        feeRate: feeRate.toString(),
+        txDigest
+      })
+    });
+  } catch {
+  }
+}
+
+// src/protocols/navi.ts
 var ENV = { env: "prod" };
 var USDC_TYPE = SUPPORTED_ASSETS.USDC.type;
 var RATE_DECIMALS = 27;
@@ -413,7 +469,7 @@ async function updateOracle(tx, client, address) {
   } catch {
   }
 }
-async function buildSaveTx(client, address, amount) {
+async function buildSaveTx(client, address, amount, options = {}) {
   const rawAmount = Number(usdcToRaw(amount));
   const coins = await getCoins(address, { coinType: USDC_TYPE, client });
   if (!coins || coins.length === 0) {
@@ -422,6 +478,9 @@ async function buildSaveTx(client, address, amount) {
   const tx = new Transaction();
   tx.setSender(address);
   const coinObj = mergeCoinsPTB(tx, coins, { balance: rawAmount });
+  if (options.collectFee) {
+    addCollectFeeToTx(tx, coinObj, "save");
+  }
   await depositCoinPTB(tx, USDC_TYPE, coinObj, ENV);
   return tx;
 }
@@ -439,12 +498,15 @@ async function buildWithdrawTx(client, address, amount) {
   tx.transferObjects([withdrawnCoin], address);
   return { tx, effectiveAmount };
 }
-async function buildBorrowTx(client, address, amount) {
+async function buildBorrowTx(client, address, amount, options = {}) {
   const rawAmount = Number(usdcToRaw(amount));
   const tx = new Transaction();
   tx.setSender(address);
   await updateOracle(tx, client, address);
   const borrowedCoin = await borrowCoinPTB(tx, USDC_TYPE, rawAmount, ENV);
+  if (options.collectFee) {
+    addCollectFeeToTx(tx, borrowedCoin, "borrow");
+  }
   tx.transferObjects([borrowedCoin], address);
   return tx;
 }
@@ -652,40 +714,6 @@ async function getSwapQuote(client, fromAsset, toAsset, amount) {
   }
 }
 
-// src/protocols/protocolFee.ts
-var FEE_RATES = {
-  save: SAVE_FEE_BPS,
-  swap: SWAP_FEE_BPS,
-  borrow: BORROW_FEE_BPS
-};
-function calculateFee(operation, amount) {
-  const bps = FEE_RATES[operation];
-  const feeAmount = amount * Number(bps) / Number(BPS_DENOMINATOR);
-  const rawAmount = usdcToRaw(feeAmount);
-  return {
-    amount: feeAmount,
-    asset: "USDC",
-    rate: Number(bps) / Number(BPS_DENOMINATOR),
-    rawAmount
-  };
-}
-async function reportFee(agentAddress, operation, feeAmount, feeRate, txDigest) {
-  try {
-    await fetch(`${API_BASE_URL}/api/fees`, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        agentAddress,
-        operation,
-        feeAmount: feeAmount.toString(),
-        feeRate: feeRate.toString(),
-        txDigest
-      })
-    });
-  } catch {
-  }
-}
-
 // src/protocols/yieldTracker.ts
 async function getEarnings(client, keypair) {
   const hf = await getHealthFactor(client, keypair);
@@ -1278,12 +1306,12 @@ var T2000 = class _T2000 extends EventEmitter {
     const gasResult = await executeWithGas(
       this.client,
       this.keypair,
-      () => buildSaveTx(this.client, this._address, saveAmount)
+      () => buildSaveTx(this.client, this._address, saveAmount, { collectFee: true })
     );
     const rates = await getRates(this.client);
     reportFee(this._address, "save", fee.amount, fee.rate, gasResult.digest);
     this.emitBalanceChange("USDC", saveAmount, "save", gasResult.digest);
-    let savingsBalance = saveAmount - fee.amount;
+    let savingsBalance = saveAmount;
     try {
       const positions = await this.positions();
       savingsBalance = positions.positions.filter((p) => p.type === "save").reduce((sum, p) => sum + p.amount, 0);
@@ -1367,7 +1395,7 @@ var T2000 = class _T2000 extends EventEmitter {
     const gasResult = await executeWithGas(
       this.client,
       this.keypair,
-      () => buildBorrowTx(this.client, this._address, borrowAmount)
+      () => buildBorrowTx(this.client, this._address, borrowAmount, { collectFee: true })
     );
     const hf = await getHealthFactor(this.client, this.keypair);
     reportFee(this._address, "borrow", fee.amount, fee.rate, gasResult.digest);
@@ -1622,6 +1650,6 @@ function parseMoveAbort(errorStr) {
   return { reason: errorStr };
 }
 
-export { BPS_DENOMINATOR, CLOCK_ID, DEFAULT_NETWORK, MIST_PER_SUI, SENTINEL, SUI_DECIMALS, SUPPORTED_ASSETS, T2000, T2000Error, USDC_DECIMALS, calculateFee, executeAutoTopUp, executeWithGas, exportPrivateKey, formatSui, formatUsd, generateKeypair, getAddress, getGasStatus, getPoolPrice, getRates, getSentinelInfo, getSwapQuote, keypairFromPrivateKey, listSentinels, loadKey, mapMoveAbortCode, mapWalletError, mistToSui, rawToUsdc, requestAttack, saveKey, attack as sentinelAttack, settleAttack, shouldAutoTopUp, simulateTransaction, solveHashcash, submitPrompt, suiToMist, throwIfSimulationFailed, truncateAddress, usdcToRaw, validateAddress, walletExists };
+export { BPS_DENOMINATOR, CLOCK_ID, DEFAULT_NETWORK, MIST_PER_SUI, SENTINEL, SUI_DECIMALS, SUPPORTED_ASSETS, T2000, T2000Error, USDC_DECIMALS, addCollectFeeToTx, calculateFee, executeAutoTopUp, executeWithGas, exportPrivateKey, formatSui, formatUsd, generateKeypair, getAddress, getGasStatus, getPoolPrice, getRates, getSentinelInfo, getSwapQuote, keypairFromPrivateKey, listSentinels, loadKey, mapMoveAbortCode, mapWalletError, mistToSui, rawToUsdc, requestAttack, saveKey, attack as sentinelAttack, settleAttack, shouldAutoTopUp, simulateTransaction, solveHashcash, submitPrompt, suiToMist, throwIfSimulationFailed, truncateAddress, usdcToRaw, validateAddress, walletExists };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map