@scallop-io/sui-scallop-sdk 0.47.6 → 1.3.0-alpha.2

package/dist/index.js

@@ -348,13 +348,6 @@ var sCoinIds = {
   swbtc: "0x2cf76a9cf5d3337961d1154283234f94da2dcff18544dfe5cbdef65f319591b5::scallop_wormhole_btc::SCALLOP_WORMHOLE_BTC"
 };
 
-// src/constants/vesca.ts
-var UNLOCK_ROUND_DURATION = 60 * 60 * 24;
-var MAX_LOCK_ROUNDS = 1460;
-var MAX_LOCK_DURATION = MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION;
-var MIN_INITIAL_LOCK_AMOUNT = 1e10;
-var MIN_TOP_UP_AMOUNT = 1e9;
-
 // src/constants/flashloan.ts
 var FlashLoanFeeObjectMap = {
   vsui: "0x0069cddee7a5c0b1d34beb5ef0620f978096525f1830b055f38b110f40d73fbb",
@@ -371,6 +364,13 @@ var FlashLoanFeeObjectMap = {
   wsol: "0xe84bdb35b790fc7bdd1645122ac6ac0fc904531d6772c9e25904fece322c5f34"
 };
 
+// src/constants/vesca.ts
+var UNLOCK_ROUND_DURATION = 60 * 60 * 24;
+var MAX_LOCK_ROUNDS = 1460;
+var MAX_LOCK_DURATION = MAX_LOCK_ROUNDS * UNLOCK_ROUND_DURATION;
+var MIN_INITIAL_LOCK_AMOUNT = 1e10;
+var MIN_TOP_UP_AMOUNT = 1e9;
+
 // src/models/scallop.ts
 var import_sui_kit16 = require("@scallop-io/sui-kit");
 
@@ -495,7 +495,7 @@ var checkRenewExpiredVeSca = (scaAmount, lockPeriodInDays, prevUnlockAtInMillisT
 
 // src/utils/query.ts
 var import_bignumber = __toESM(require("bignumber.js"));
-var import_utils = require("@mysten/sui.js/utils");
+var import_utils = require("@mysten/sui/utils");
 var parseOriginMarketPoolData = (originMarketPoolData) => {
   return {
     coinType: (0, import_utils.normalizeStructTag)(originMarketPoolData.type.name),
@@ -1013,6 +1013,25 @@ var callWithRateLimit = async (tokenBucket, fn, retryDelayInMs = DEFAULT_INTERVA
   return tryRequest();
 };
 
+// src/utils/indexer.ts
+async function callMethodWithIndexerFallback(method, context, ...args) {
+  const indexer = args[args.length - 1];
+  if (indexer) {
+    try {
+      return await method.apply(context, args);
+    } catch (_e) {
+      console.warn("Indexer requests failed. Retrying without indexer..");
+      return await method.apply(context, [...args.slice(0, -1), false]);
+    }
+  }
+  return await method.apply(context, args);
+}
+function withIndexerFallback(method) {
+  return (...args) => {
+    return callMethodWithIndexerFallback(method, this, ...args);
+  };
+}
+
 // src/models/scallopCache.ts
 var ScallopCache = class {
   constructor(suiKit, walletAddress, cacheOptions, tokenBucket) {
@@ -1044,21 +1063,40 @@ var ScallopCache = class {
       refetchType
     });
   }
-  /**
-   * @description Cache protocol config call for 60 seconds.
-   * @returns Promise<ProtocolConfig>
-   */
-  async getProtocolConfig() {
-    return await this.queryClient.fetchQuery({
-      queryKey: ["getProtocolConfig"],
-      queryFn: async () => {
-        return await callWithRateLimit(
-          this.tokenBucket,
-          () => this.client.getProtocolConfig()
-        );
-      },
-      staleTime: 3e4
-    });
+  async resolveArgs(txb, args) {
+    return await Promise.all(
+      args.map(async (arg) => {
+        if (typeof arg === "string") {
+          const objData = (await this.queryGetObject(arg, { showOwner: true }))?.data;
+          if (!objData)
+            return arg;
+          const owner = objData?.owner;
+          if (!owner)
+            return arg;
+          if ("Shared" in owner) {
+            return txb.sharedObjectRef({
+              objectId: objData.objectId,
+              initialSharedVersion: owner.Shared.initial_shared_version,
+              mutable: true
+            });
+          } else {
+            return txb.objectRef({
+              objectId: objData.objectId,
+              version: objData.version,
+              digest: objData.digest
+            });
+          }
+        } else if ("objectId" in arg && "version" in arg && "digest" in arg) {
+          return txb.objectRef({
+            objectId: arg.objectId,
+            version: arg.version,
+            digest: arg.digest
+          });
+        } else {
+          return arg;
+        }
+      })
+    );
   }
   /**
    * @description Provides cache for inspectTxn of the SuiKit.
@@ -1072,20 +1110,8 @@ var ScallopCache = class {
     typeArgs
   }) {
     const txBlock = new import_sui_kit.SuiTxBlock();
-    const resolvedArgs = await Promise.all(
-      args.map(async (arg) => {
-        if (typeof arg === "string") {
-          return (await this.queryGetObject(arg, { showContent: true }))?.data;
-        }
-        return arg;
-      })
-    );
+    const resolvedArgs = await this.resolveArgs(txBlock, args);
     txBlock.moveCall(queryTarget, resolvedArgs, typeArgs);
-    const txBytes = await txBlock.txBlock.build({
-      client: this.client,
-      onlyTransactionKind: true,
-      protocolConfig: await this.getProtocolConfig() ?? void 0
-    });
     const query = await this.queryClient.fetchQuery({
       queryKey: typeArgs ? ["inspectTxn", queryTarget, JSON.stringify(args)] : [
         "inspectTxn",
@@ -1096,7 +1122,7 @@ var ScallopCache = class {
       queryFn: async () => {
         return await callWithRateLimit(
           this.tokenBucket,
-          () => this.suiKit.inspectTxn(txBytes)
+          () => this.suiKit.inspectTxn(txBlock)
         );
       }
     });
@@ -2328,16 +2354,16 @@ var ScallopAddress = class {
 };
 
 // src/models/scallopClient.ts
-var import_utils25 = require("@mysten/sui.js/utils");
+var import_utils25 = require("@mysten/sui/utils");
 var import_sui_kit15 = require("@scallop-io/sui-kit");
 
 // src/models/scallopUtils.ts
-var import_utils10 = require("@mysten/sui.js/utils");
+var import_utils10 = require("@mysten/sui/utils");
 var import_sui_kit4 = require("@scallop-io/sui-kit");
 var import_pyth_sui_js = require("@pythnetwork/pyth-sui-js");
 
 // src/queries/coreQuery.ts
-var import_utils3 = require("@mysten/sui.js/utils");
+var import_utils3 = require("@mysten/sui/utils");
 var import_bignumber2 = __toESM(require("bignumber.js"));
 
 // src/queries/supplyLimit.ts
@@ -2992,7 +3018,7 @@ var getFlashLoanFees = async (query, assetNames) => {
 };
 
 // src/queries/spoolQuery.ts
-var import_utils5 = require("@mysten/sui.js/utils");
+var import_utils5 = require("@mysten/sui/utils");
 var getSpools = async (query, stakeMarketCoinNames = [...SUPPORT_SPOOLS], indexer = false) => {
   const stakeCoinNames = stakeMarketCoinNames.map(
     (stakeMarketCoinName) => query.utils.parseCoinName(stakeMarketCoinName)
@@ -3315,7 +3341,7 @@ var getStakeRewardPool = async ({
 };
 
 // src/queries/borrowIncentiveQuery.ts
-var import_utils7 = require("@mysten/sui.js/utils");
+var import_utils7 = require("@mysten/sui/utils");
 var import_bignumber3 = __toESM(require("bignumber.js"));
 var queryBorrowIncentivePools = async (address) => {
   const queryPkgId = address.get("borrowIncentive.query");
@@ -4102,8 +4128,9 @@ var getTotalValueLocked = async (query, indexer = false) => {
 // src/queries/vescaQuery.ts
 var import_bignumber5 = __toESM(require("bignumber.js"));
 var import_sui_kit3 = require("@scallop-io/sui-kit");
-var import_bcs = require("@mysten/sui.js/bcs");
+var import_bcs = require("@mysten/sui/bcs");
 var import_zod2 = require("zod");
+var import_assert = __toESM(require("assert"));
 var getVescaKeys = async (utils, ownerAddress) => {
   const owner = ownerAddress || utils.suiKit.currentAddress();
   const veScaObjId = utils.address.get("vesca.object");
@@ -4241,7 +4268,8 @@ var getTotalVeScaTreasuryAmount = async (utils, veScaTreasury) => {
   if (results && results[1].returnValues) {
     const value = Uint8Array.from(results[1].returnValues[0][0]);
     const type = results[1].returnValues[0][1];
-    return import_bcs.bcs.de(type, value);
+    (0, import_assert.default)(type === "u64", "Result type is not u64");
+    return import_bcs.bcs.u64().parse(value);
   }
   return "0";
 };
@@ -4383,7 +4411,8 @@ var ScallopUtils = class {
       this.address = instance?.address ?? new ScallopAddress(
         {
           id: params?.addressesId || ADDRESSES_ID,
-          network: params?.networkType
+          network: params?.networkType,
+          forceInterface: params?.forceAddressesInterface
         },
         {
           cache: this.cache
@@ -4632,7 +4661,7 @@ var ScallopUtils = class {
       if (existingCoins.length > 0) {
         txBlock.mergeCoins(dest, existingCoins.slice(0, 500));
       }
-    } catch (e) {
+    } catch (_e) {
     }
   }
   /**
@@ -4808,17 +4837,18 @@ var ScallopUtils = class {
 };
 
 // src/models/scallopBuilder.ts
-var import_utils24 = require("@mysten/sui.js/utils");
+var import_utils24 = require("@mysten/sui/utils");
 var import_sui_kit14 = require("@scallop-io/sui-kit");
 
 // src/builders/coreBuilder.ts
-var import_transactions = require("@mysten/sui.js/transactions");
-var import_utils13 = require("@mysten/sui.js/utils");
+var import_transactions2 = require("@mysten/sui/transactions");
+var import_utils13 = require("@mysten/sui/utils");
 var import_sui_kit5 = require("@scallop-io/sui-kit");
 
 // src/builders/oracle.ts
-var import_utils12 = require("@mysten/sui.js/utils");
+var import_utils12 = require("@mysten/sui/utils");
 var import_pyth_sui_js2 = require("@pythnetwork/pyth-sui-js");
+var import_transactions = require("@mysten/sui.js/transactions");
 var updateOracles = async (builder, txBlock, assetCoinNames, options = { usePythPullModel: true }) => {
   const usePythPullModel = builder.params.usePythPullModel ?? options.usePythPullModel;
   assetCoinNames = assetCoinNames ?? [
@@ -4827,7 +4857,7 @@ var updateOracles = async (builder, txBlock, assetCoinNames, options = { usePyth
   const rules = builder.isTestnet ? ["pyth"] : ["pyth"];
   if (usePythPullModel && rules.includes("pyth")) {
     const pythClient = new import_pyth_sui_js2.SuiPythClient(
-      builder.suiKit.client(),
+      builder.oldSuiClient,
       builder.address.get("core.oracles.pyth.state"),
       builder.address.get("core.oracles.pyth.wormholeState")
     );
@@ -4840,7 +4870,8 @@ var updateOracles = async (builder, txBlock, assetCoinNames, options = { usePyth
         const pythConnection = new import_pyth_sui_js2.SuiPriceServiceConnection(endpoint);
         const priceUpdateData = await pythConnection.getPriceFeedsUpdateData(priceIds);
         await pythClient.updatePriceFeeds(
-          txBlock.txBlock,
+          import_transactions.TransactionBlock.from(txBlock.serialize()),
+          // convert txBlock to TransactionBlock because pyth sdk not support new @mysten/sui yet
           priceUpdateData,
           priceIds
         );
@@ -5021,7 +5052,7 @@ var generateCoreNormalMethod = ({
           obligationKey,
           coreIds.market,
           coreIds.coinDecimalsRegistry,
-          amount,
+          txBlock.pure.u64(amount),
           coreIds.xOracle,
           import_utils13.SUI_CLOCK_OBJECT_ID
         ],
@@ -5088,7 +5119,7 @@ var generateCoreNormalMethod = ({
           coreIds.market,
           coreIds.coinDecimalsRegistry,
           borrowReferral,
-          amount,
+          txBlock.pure.u64(amount),
           coreIds.xOracle,
           import_utils13.SUI_CLOCK_OBJECT_ID
         ],
@@ -5105,7 +5136,7 @@ var generateCoreNormalMethod = ({
           obligationKey,
           coreIds.market,
           coreIds.coinDecimalsRegistry,
-          amount,
+          txBlock.pure.u64(amount),
           coreIds.xOracle,
           import_utils13.SUI_CLOCK_OBJECT_ID
         ],
@@ -5235,10 +5266,10 @@ var generateCoreQuickMethod = ({
             txBlock.transferObjects([leftCoin2], sender);
             txBlock.mergeCoins(marketCoins2, [walletMarketCoins]);
           }
-        } catch (e) {
+        } catch (_e) {
         }
         return txBlock.withdraw(marketCoins2, poolCoinName);
-      } catch (e) {
+      } catch (_e) {
         const { leftCoin, takeCoin: walletMarketCoins } = await builder.selectMarketCoin(
           txBlock,
           marketCoinName,
@@ -5323,7 +5354,7 @@ var generateCoreQuickMethod = ({
   };
 };
 var newCoreTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions.TransactionBlock ? new import_sui_kit5.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit5.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_transactions2.Transaction ? new import_sui_kit5.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit5.SuiTxBlock();
   const normalMethod = generateCoreNormalMethod({
     builder,
     txBlock
@@ -5351,8 +5382,8 @@ var newCoreTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/spoolBuilder.ts
-var import_transactions2 = require("@mysten/sui.js/transactions");
-var import_utils15 = require("@mysten/sui.js/utils");
+var import_transactions3 = require("@mysten/sui/transactions");
+var import_utils15 = require("@mysten/sui/utils");
 var import_sui_kit6 = require("@scallop-io/sui-kit");
 var requireStakeAccountIds = async (...params) => {
   const [builder, txBlock, stakeMarketCoinName, stakeAccountId] = params;
@@ -5388,7 +5419,7 @@ var stakeHelper = async (builder, txBlock, stakeAccount, coinName, amount, sende
     }
     txBlock.transferObjects([leftCoin], sender);
     return totalAmount;
-  } catch (e) {
+  } catch (_e) {
     return 0;
   }
 };
@@ -5545,7 +5576,7 @@ var generateSpoolQuickMethod = ({
   };
 };
 var newSpoolTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions2.TransactionBlock ? new import_sui_kit6.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit6.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_transactions3.Transaction ? new import_sui_kit6.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit6.SuiTxBlock();
   const normalMethod = generateSpoolNormalMethod({
     builder,
     txBlock
@@ -5573,8 +5604,8 @@ var newSpoolTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/borrowIncentiveBuilder.ts
-var import_transactions3 = require("@mysten/sui.js/transactions");
-var import_utils17 = require("@mysten/sui.js/utils");
+var import_transactions4 = require("@mysten/sui/transactions");
+var import_utils17 = require("@mysten/sui/utils");
 var import_sui_kit7 = require("@scallop-io/sui-kit");
 var requireObligationInfo2 = async (...params) => {
   const [builder, txBlock, obligationId, obligationKey] = params;
@@ -5775,7 +5806,7 @@ var generateBorrowIncentiveQuickMethod = ({ builder, txBlock }) => {
   };
 };
 var newBorrowIncentiveTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions3.TransactionBlock ? new import_sui_kit7.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit7.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_transactions4.Transaction ? new import_sui_kit7.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit7.SuiTxBlock();
   const normalMethod = generateBorrowIncentiveNormalMethod({
     builder,
     txBlock
@@ -6051,7 +6082,7 @@ var generateQuickVeScaMethod = ({
   };
 };
 var newVeScaTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_sui_kit8.TransactionBlock ? new import_sui_kit8.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit8.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_sui_kit8.Transaction ? new import_sui_kit8.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit8.SuiTxBlock();
   const normalMethod = generateNormalVeScaMethod({
     builder,
     txBlock
@@ -6101,7 +6132,7 @@ var generateReferralNormalMethod = ({
         `${referralIds.referralPgkId}::referral_bindings::bind_ve_sca_referrer`,
         [
           referralIds.referralBindings,
-          txBlock.pure(veScaKeyId),
+          txBlock.pure.id(veScaKeyId),
           veScaTable,
           import_sui_kit9.SUI_CLOCK_OBJECT_ID
         ],
@@ -6172,7 +6203,7 @@ var generateReferralQuickMethod = ({
               builder.utils.parseCoinType(coinName)
             );
             txBlock.mergeCoins(rewardCoin, coins.slice(0, 500));
-          } catch (e) {
+          } catch (_e) {
           } finally {
             objToTransfer.push(rewardCoin);
           }
@@ -6185,7 +6216,7 @@ var generateReferralQuickMethod = ({
   };
 };
 var newReferralTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_sui_kit9.TransactionBlock ? new import_sui_kit9.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit9.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_sui_kit9.Transaction ? new import_sui_kit9.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit9.SuiTxBlock();
   const normalMethod = generateReferralNormalMethod({
     builder,
     txBlock
@@ -6213,7 +6244,7 @@ var newReferralTxBlock = (builder, initTxBlock) => {
 };
 
 // src/builders/loyaltyProgramBuilder.ts
-var import_transactions4 = require("@mysten/sui.js/transactions");
+var import_transactions5 = require("@mysten/sui/transactions");
 var import_sui_kit10 = require("@scallop-io/sui-kit");
 var generateLoyaltyProgramNormalMethod = ({ builder, txBlock }) => {
   const loyaltyProgramIds = {
@@ -6254,7 +6285,7 @@ var generateLoyaltyProgramQuickMethod = ({
   };
 };
 var newLoyaltyProgramTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_transactions4.TransactionBlock ? new import_sui_kit10.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit10.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_transactions5.Transaction ? new import_sui_kit10.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit10.SuiTxBlock();
   const normalMethod = generateLoyaltyProgramNormalMethod({
     builder,
     txBlock
@@ -6343,7 +6374,7 @@ var generateSCoinQuickMethod = ({
   };
 };
 var newSCoinTxBlock = (builder, initTxBlock) => {
-  const txBlock = initTxBlock instanceof import_sui_kit11.TransactionBlock ? new import_sui_kit11.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit11.SuiTxBlock();
+  const txBlock = initTxBlock instanceof import_sui_kit11.Transaction ? new import_sui_kit11.SuiTxBlock(initTxBlock) : initTxBlock ? initTxBlock : new import_sui_kit11.SuiTxBlock();
   const normalMethod = generateSCoinNormalMethod({
     builder,
     txBlock
@@ -6575,8 +6606,8 @@ var ScallopIndexer = class {
 };
 
 // src/queries/sCoinQuery.ts
-var import_bcs2 = require("@mysten/sui.js/bcs");
-var import_assert = __toESM(require("assert"));
+var import_bcs2 = require("@mysten/sui/bcs");
+var import_assert2 = __toESM(require("assert"));
 var import_bignumber7 = __toESM(require("bignumber.js"));
 var getSCoinTotalSupply = async ({
   utils
@@ -6597,8 +6628,8 @@ var getSCoinTotalSupply = async ({
   if (results && results[0].returnValues) {
     const value = Uint8Array.from(results[0].returnValues[0][0]);
     const type = results[0].returnValues[0][1];
-    (0, import_assert.default)(type === "u64", "Result type is not u64");
-    return (0, import_bignumber7.default)(import_bcs2.bcs.de(type, value)).shiftedBy(utils.getCoinDecimal(utils.parseCoinName(sCoinName))).toNumber();
+    (0, import_assert2.default)(type === "u64", "Result type is not u64");
+    return (0, import_bignumber7.default)(import_bcs2.bcs.u64().parse(value)).shiftedBy(utils.getCoinDecimal(utils.parseCoinName(sCoinName))).toNumber();
   }
   return 0;
 };
@@ -6668,7 +6699,7 @@ var getSCoinSwapRate = async (query, fromSCoin, toSCoin, underlyingCoinPrice) =>
 };
 
 // src/models/scallopQuery.ts
-var import_utils23 = require("@mysten/sui.js/utils");
+var import_utils23 = require("@mysten/sui/utils");
 var ScallopQuery = class {
   constructor(params, instance) {
     this.params = params;
@@ -6689,7 +6720,8 @@ var ScallopQuery = class {
       this.address = new ScallopAddress(
         {
           id: params?.addressesId || ADDRESSES_ID,
-          network: params?.networkType
+          network: params?.networkType,
+          forceInterface: params?.forceAddressesInterface
         },
         {
           cache: this.cache
@@ -6700,7 +6732,36 @@ var ScallopQuery = class {
       });
     }
     this.indexer = instance?.indexer ?? new ScallopIndexer(this.params, { cache: this.cache });
+    this.queryMarket = withIndexerFallback.call(this, this.queryMarket);
+    this.getMarketPools = withIndexerFallback.call(this, this.getMarketPools);
+    this.getMarketPool = withIndexerFallback.call(this, this.getMarketPool);
+    this.getMarketCollaterals = withIndexerFallback.call(
+      this,
+      this.getMarketCollaterals
+    );
+    this.getMarketCollateral = withIndexerFallback.call(
+      this,
+      this.getMarketCollateral
+    );
+    this.getSpools = withIndexerFallback.call(this, this.getSpools);
+    this.getSpool = withIndexerFallback.call(this, this.getSpool);
+    this.getBorrowIncentivePools = withIndexerFallback.call(
+      this,
+      this.getBorrowIncentivePools
+    );
+    this.getLendings = withIndexerFallback.call(this, this.getLendings);
+    this.getLending = withIndexerFallback.call(this, this.getLending);
+    this.getObligationAccounts = withIndexerFallback.call(
+      this,
+      this.getObligationAccounts
+    );
+    this.getObligationAccount = withIndexerFallback.call(
+      this,
+      this.getObligationAccount
+    );
+    this.getTvl = withIndexerFallback.call(this, this.getTvl);
   }
+  /* ========================================================== */
   /**
    * Request the scallop API to initialize data.
    *
@@ -7159,6 +7220,7 @@ var ScallopQuery = class {
 };
 
 // src/models/scallopBuilder.ts
+var import_client = require("@mysten/sui.js/client");
 var ScallopBuilder = class {
   constructor(params, instance) {
     this.suiKit = instance?.suiKit ?? new import_sui_kit14.SuiKit(params);
@@ -7180,7 +7242,8 @@ var ScallopBuilder = class {
       this.address = new ScallopAddress(
         {
           id: params?.addressesId || ADDRESSES_ID,
-          network: params?.networkType
+          network: params?.networkType,
+          forceInterface: params?.forceAddressesInterface
         },
         {
           cache: this.cache
@@ -7199,6 +7262,9 @@ var ScallopBuilder = class {
       );
     }
     this.isTestnet = params.networkType ? params.networkType === "testnet" : false;
+    this.oldSuiClient = new import_client.SuiClient({
+      url: this.suiKit.suiInteractor.currentFullNode
+    });
   }
   /**
    * Request the scallop API to initialize data.
@@ -7327,8 +7393,8 @@ var ScallopClient = class {
       this.address = new ScallopAddress(
         {
           id: params?.addressesId || ADDRESSES_ID,
-          forceInterface: params?.forceAddressesInterface,
-          network: params?.networkType
+          network: params?.networkType,
+          forceInterface: params?.forceAddressesInterface
         },
         {
           cache: this.cache
@@ -7887,7 +7953,7 @@ var ScallopClient = class {
               if (sCoin) {
                 sCoins2.push(sCoin);
               }
-            } catch (e) {
+            } catch (_e) {
             }
           }
         }
@@ -7928,7 +7994,7 @@ var ScallopClient = class {
           if (!scaCoin)
             return;
           scaCoins.push(scaCoin);
-        } catch (e) {
+        } catch (_e) {
         }
       })
     );