@t2000/sdk 0.5.6 → 0.6.0

package/dist/adapters/index.cjs

@@ -193,6 +193,8 @@ var SUI_SYSTEM_STATE = "0x05";
 var NAVI_BALANCE_DECIMALS = 9;
 var CONFIG_API = "https://open-api.naviprotocol.io/api/navi/config?env=prod";
 var POOLS_API = "https://open-api.naviprotocol.io/api/navi/pools?env=prod";
+var PACKAGE_API = "https://open-api.naviprotocol.io/api/package";
+var packageCache = null;
 function toBigInt(v) {
   if (typeof v === "bigint") return v;
   return BigInt(String(v));
@@ -217,9 +219,22 @@ async function fetchJson(url) {
   const json = await res.json();
   return json.data ?? json;
 }
+async function getLatestPackageId() {
+  if (packageCache && Date.now() - packageCache.ts < CACHE_TTL) return packageCache.id;
+  const res = await fetch(PACKAGE_API);
+  if (!res.ok) throw new T2000Error("PROTOCOL_UNAVAILABLE", `NAVI package API error: ${res.status}`);
+  const json = await res.json();
+  if (!json.packageId) throw new T2000Error("PROTOCOL_UNAVAILABLE", "NAVI package API returned no packageId");
+  packageCache = { id: json.packageId, ts: Date.now() };
+  return json.packageId;
+}
 async function getConfig(fresh = false) {
   if (configCache && !fresh && Date.now() - configCache.ts < CACHE_TTL) return configCache.data;
-  const data = await fetchJson(CONFIG_API);
+  const [data, latestPkg] = await Promise.all([
+    fetchJson(CONFIG_API),
+    getLatestPackageId()
+  ]);
+  data.package = latestPkg;
   configCache = { data, ts: Date.now() };
   return data;
 }
@@ -293,14 +308,13 @@ async function fetchCoins(client, owner, coinType) {
   }
   return all;
 }
-function mergeCoinsPtb(tx, coins, amount) {
+function mergeCoins(tx, coins) {
   if (coins.length === 0) throw new T2000Error("INSUFFICIENT_BALANCE", "No coins to merge");
   const primary = tx.object(coins[0].coinObjectId);
   if (coins.length > 1) {
     tx.mergeCoins(primary, coins.slice(1).map((c) => tx.object(c.coinObjectId)));
   }
-  const [split] = tx.splitCoins(primary, [amount]);
-  return split;
+  return primary;
 }
 async function buildSaveTx(client, address, amount, options = {}) {
   const rawAmount = Number(usdcToRaw(amount));
@@ -309,7 +323,7 @@ async function buildSaveTx(client, address, amount, options = {}) {
   if (coins.length === 0) throw new T2000Error("INSUFFICIENT_BALANCE", "No USDC coins found");
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  const coinObj = mergeCoinsPtb(tx, coins, rawAmount);
+  const coinObj = mergeCoins(tx, coins);
   if (options.collectFee) {
     addCollectFeeToTx(tx, coinObj, "save");
   }
@@ -343,8 +357,8 @@ async function buildWithdrawTx(client, address, amount) {
   const rawAmount = Number(usdcToRaw(effectiveAmount));
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  tx.moveCall({
-    target: `${config.package}::incentive_v3::entry_withdraw_v2`,
+  const [balance] = tx.moveCall({
+    target: `${config.package}::incentive_v3::withdraw_v2`,
     arguments: [
       tx.object(CLOCK),
       tx.object(config.oracle.priceOracle),
@@ -355,8 +369,15 @@ async function buildWithdrawTx(client, address, amount) {
       tx.object(config.incentiveV2),
       tx.object(config.incentiveV3),
       tx.object(SUI_SYSTEM_STATE)
-    ]
+    ],
+    typeArguments: [pool.suiCoinType]
   });
+  const [coin] = tx.moveCall({
+    target: "0x2::coin::from_balance",
+    arguments: [balance],
+    typeArguments: [pool.suiCoinType]
+  });
+  tx.transferObjects([coin], address);
   return { tx, effectiveAmount };
 }
 async function buildBorrowTx(client, address, amount, options = {}) {
@@ -364,8 +385,8 @@ async function buildBorrowTx(client, address, amount, options = {}) {
   const [config, pool] = await Promise.all([getConfig(), getUsdcPool()]);
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  tx.moveCall({
-    target: `${config.package}::incentive_v3::entry_borrow_v2`,
+  const [balance] = tx.moveCall({
+    target: `${config.package}::incentive_v3::borrow_v2`,
     arguments: [
       tx.object(CLOCK),
       tx.object(config.oracle.priceOracle),
@@ -376,8 +397,15 @@ async function buildBorrowTx(client, address, amount, options = {}) {
       tx.object(config.incentiveV2),
       tx.object(config.incentiveV3),
       tx.object(SUI_SYSTEM_STATE)
-    ]
+    ],
+    typeArguments: [pool.suiCoinType]
+  });
+  const [borrowedCoin] = tx.moveCall({
+    target: "0x2::coin::from_balance",
+    arguments: [balance],
+    typeArguments: [pool.suiCoinType]
   });
+  tx.transferObjects([borrowedCoin], address);
   return tx;
 }
 async function buildRepayTx(client, address, amount) {
@@ -387,7 +415,7 @@ async function buildRepayTx(client, address, amount) {
   if (coins.length === 0) throw new T2000Error("INSUFFICIENT_BALANCE", "No USDC coins to repay with");
   const tx = new transactions.Transaction();
   tx.setSender(address);
-  const coinObj = mergeCoinsPtb(tx, coins, rawAmount);
+  const coinObj = mergeCoins(tx, coins);
   tx.moveCall({
     target: `${config.package}::incentive_v3::entry_repay`,
     arguments: [