@suilend/springsui-cli 1.0.11 → 1.0.13

package/sdk/src/client.js

@@ -45,8 +45,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchRegistryLiquidStakingInfoMap = exports.fetchLiquidStakingInfo = exports.LstClient = exports.SUILEND_VALIDATOR_ADDRESS = void 0;
-const transactions_1 = require("@mysten/sui/transactions");
+exports.fetchRegistryLiquidStakingInfoMap = exports.fetchLiquidStakingInfo = exports.LstClient = exports.ADMIN_ADDRESS = exports.SPRING_SUI_UPGRADE_CAP_ID = exports.SUILEND_VALIDATOR_ADDRESS = void 0;
+exports.getLatestPackageId = getLatestPackageId;
 const utils_1 = require("@mysten/sui/utils");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const reified_1 = require("./_generated/_framework/reified");
@@ -58,7 +58,8 @@ const weightHookGenerated = __importStar(require("./_generated/liquid_staking/we
 const structs_2 = require("./_generated/liquid_staking/weight/structs");
 const SUI_SYSTEM_STATE_ID = "0x0000000000000000000000000000000000000000000000000000000000000005";
 exports.SUILEND_VALIDATOR_ADDRESS = "0xce8e537664ba5d1d5a6a857b17bd142097138706281882be6805e17065ecde89";
-const SPRING_SUI_UPGRADE_CAP_ID = "0x4dc657b6c0fe896f4b94fee1ceac96312dde0a36b94e799caaec30deb53dcd67";
+exports.SPRING_SUI_UPGRADE_CAP_ID = "0x4dc657b6c0fe896f4b94fee1ceac96312dde0a36b94e799caaec30deb53dcd67";
+exports.ADMIN_ADDRESS = "0xb1ffbc2e1915f44b8f271a703becc1bf8aa79bc22431a58900a102892b783c25";
 function getLatestPackageId(client, upgradeCapId) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -72,11 +73,12 @@ function getLatestPackageId(client, upgradeCapId) {
     });
 }
 class LstClient {
-    static initialize(client, liquidStakingObjectInfo) {
+    static initialize(client, liquidStakingObjectInfo, _publishedAt, logPackageId) {
         return __awaiter(this, void 0, void 0, function* () {
-            const publishedAt = yield getLatestPackageId(client, SPRING_SUI_UPGRADE_CAP_ID);
+            const publishedAt = _publishedAt !== null && _publishedAt !== void 0 ? _publishedAt : (yield getLatestPackageId(client, exports.SPRING_SUI_UPGRADE_CAP_ID));
+            if (logPackageId)
+                console.log("@suilend/springsui-sdk | publishedAt:", publishedAt);
             (0, liquid_staking_1.setPublishedAt)(publishedAt);
-            console.log(`Initialized LstClient with package ID: ${publishedAt}`);
             return new LstClient(liquidStakingObjectInfo, client);
         });
     }
@@ -105,13 +107,13 @@ class LstClient {
         });
         return weightHookAdminCap;
     }
-    static getWeightHookAdminCapId(client, address, weightHookAdminCapId) {
+    static getWeightHookAdminCapId(client, address, coinType) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const res = (yield client.getOwnedObjects({
                 owner: address,
                 filter: {
-                    StructType: `${liquid_staking_1.PACKAGE_ID}::weight::WeightHookAdminCap<${weightHookAdminCapId}>`,
+                    StructType: `${liquid_staking_1.PACKAGE_ID}::weight::WeightHookAdminCap<${coinType}>`,
                 },
             })).data;
             if (res.length == 0) {
@@ -149,8 +151,8 @@ class LstClient {
         return lst;
     }
     mintAmountAndRebalance(tx, address, amount) {
-        const [sui] = tx.splitCoins(tx.gas, [BigInt(amount)]);
-        const lst = this.mint(tx, sui);
+        const [suiCoin] = tx.splitCoins(tx.gas, [BigInt(amount)]);
+        const lst = this.mint(tx, suiCoin);
         this.rebalance(tx, this.liquidStakingObject.weightHookId);
         return lst;
     }
@@ -160,25 +162,36 @@ class LstClient {
     }
     // returns the sui coin
     redeem(tx, lstId) {
-        const [sui] = generated.redeem(tx, this.liquidStakingObject.type, {
+        const [suiCoin] = generated.redeem(tx, this.liquidStakingObject.type, {
             self: this.liquidStakingObject.id,
             systemState: SUI_SYSTEM_STATE_ID,
             lst: lstId,
         });
-        return sui;
+        return suiCoin;
     }
-    redeemAmount(tx, address, amount) {
-        const lstCoin = (0, transactions_1.coinWithBalance)({
-            balance: BigInt(amount),
-            type: this.liquidStakingObject.type,
-            useGasCoin: false,
-        })(tx);
-        const sui = this.redeem(tx, lstCoin);
-        return sui;
+    redeemAmountAndRebalance(tx, address, amount, client) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const coins = (yield client.getCoins({
+                owner: address,
+                coinType: this.liquidStakingObject.type,
+            })).data;
+            const mergeCoin = coins[0];
+            if (coins.length > 1) {
+                tx.mergeCoins(tx.object(mergeCoin.coinObjectId), coins.map((c) => tx.object(c.coinObjectId)).slice(1));
+            }
+            const [lstCoin] = tx.splitCoins(tx.object(mergeCoin.coinObjectId), [
+                BigInt(amount),
+            ]);
+            const suiCoin = this.redeem(tx, lstCoin);
+            this.rebalance(tx, this.liquidStakingObject.weightHookId);
+            return suiCoin;
+        });
     }
-    redeemAmountAndSendToUser(tx, address, amount) {
-        const suiCoin = this.redeemAmount(tx, address, amount);
-        tx.transferObjects([suiCoin], address);
+    redeemAmountAndRebalanceAndSendToUser(tx, address, amount, client) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const suiCoin = yield this.redeemAmountAndRebalance(tx, address, amount, client);
+            tx.transferObjects([suiCoin], address);
+        });
     }
     // admin functions
     increaseValidatorStake(tx, adminCapId, validatorAddress, suiAmount) {
@@ -285,10 +298,10 @@ class LstClient {
             liquidStakingInfo: this.liquidStakingObject.id,
         });
     }
-    getSpringSuiApy() {
+    getSpringSuiApy(_validatorApys) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const validatorApys = (yield this.client.getValidatorsApy()).apys;
+            const validatorApys = _validatorApys !== null && _validatorApys !== void 0 ? _validatorApys : (yield this.client.getValidatorsApy()).apys;
             const liquidStakingInfo = yield (0, exports.fetchLiquidStakingInfo)(this.liquidStakingObject, this.client);
             const totalSuiSupply = new bignumber_js_1.default(liquidStakingInfo.storage.totalSuiSupply.toString()).div(10 ** utils_1.SUI_DECIMALS);
             const spreadFeePercent = new bignumber_js_1.default((_b = (_a = liquidStakingInfo.feeConfig.element) === null || _a === void 0 ? void 0 : _a.spreadFeeBps.toString()) !== null && _b !== void 0 ? _b : 0).div(100);
@@ -311,7 +324,18 @@ const fetchLiquidStakingInfo = (info, client) => structs_1.LiquidStakingInfo.fet
 exports.fetchLiquidStakingInfo = fetchLiquidStakingInfo;
 const fetchRegistryLiquidStakingInfoMap = (client) => __awaiter(void 0, void 0, void 0, function* () {
     const REGISTRY_ID = "0x06d6b6881ef14ad1a8cc29d1f97ba3397ecea56af5afa0642093e981b1fda3f4";
-    const registryObjectIds = (yield client.getDynamicFields({ parentId: REGISTRY_ID })).data.map((d) => d.objectId);
+    const registryObjectIds = [];
+    let cursor = null;
+    let hasNextPage = true;
+    while (hasNextPage) {
+        const page = yield client.getDynamicFields({
+            parentId: REGISTRY_ID,
+            cursor,
+        });
+        registryObjectIds.push(...page.data.map((d) => d.objectId));
+        cursor = page.nextCursor;
+        hasNextPage = page.hasNextPage;
+    }
     const registryObjects = yield Promise.all(registryObjectIds.map((objectId) => client.getObject({
         id: objectId,
         options: {

package/sdk/src/lib/transactions.d.ts

@@ -1,7 +1,7 @@
 import { Transaction } from "@mysten/sui/transactions";
 import { LstClient } from "../client";
-export declare const convertLsts: (inLstClient: LstClient, outLstClient: LstClient, transaction: Transaction, address: string, amount: string) => {
+export declare const convertLstsAndRebalance: (inLstClient: LstClient, outLstClient: LstClient, transaction: Transaction, address: string, amount: string) => Promise<{
     $kind: "NestedResult";
     NestedResult: [number, number];
-};
-export declare const convertLstsAndSendToUser: (inLstClient: LstClient, outLstClient: LstClient, transaction: Transaction, address: string, amount: string) => void;
+}>;
+export declare const convertLstsAndRebalanceAndSendToUser: (inLstClient: LstClient, outLstClient: LstClient, transaction: Transaction, address: string, amount: string) => Promise<void>;

package/sdk/src/lib/transactions.js

@@ -1,15 +1,24 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertLstsAndSendToUser = exports.convertLsts = void 0;
-const convertLsts = (inLstClient, outLstClient, transaction, address, amount) => {
-    const suiCoin = inLstClient.redeemAmount(transaction, address, amount);
+exports.convertLstsAndRebalanceAndSendToUser = exports.convertLstsAndRebalance = void 0;
+const convertLstsAndRebalance = (inLstClient, outLstClient, transaction, address, amount) => __awaiter(void 0, void 0, void 0, function* () {
+    const suiCoin = yield inLstClient.redeemAmountAndRebalance(transaction, address, amount, inLstClient.client);
     const lstCoin = outLstClient.mint(transaction, suiCoin);
     outLstClient.rebalance(transaction, outLstClient.liquidStakingObject.weightHookId);
     return lstCoin;
-};
-exports.convertLsts = convertLsts;
-const convertLstsAndSendToUser = (inLstClient, outLstClient, transaction, address, amount) => {
-    const lstCoin = (0, exports.convertLsts)(inLstClient, outLstClient, transaction, address, amount);
+});
+exports.convertLstsAndRebalance = convertLstsAndRebalance;
+const convertLstsAndRebalanceAndSendToUser = (inLstClient, outLstClient, transaction, address, amount) => __awaiter(void 0, void 0, void 0, function* () {
+    const lstCoin = yield (0, exports.convertLstsAndRebalance)(inLstClient, outLstClient, transaction, address, amount);
     transaction.transferObjects([lstCoin], address);
-};
-exports.convertLstsAndSendToUser = convertLstsAndSendToUser;
+});
+exports.convertLstsAndRebalanceAndSendToUser = convertLstsAndRebalanceAndSendToUser;