@suilend/springsui-cli 1.0.14 → 2.0.1

package/sdk/src/client.d.ts

@@ -1,9 +1,8 @@
-import { SuiGrpcClient } from "@mysten/sui/grpc";
 import { SuiJsonRpcClient, ValidatorApy } from "@mysten/sui/jsonRpc";
 import { Transaction, TransactionObjectInput } from "@mysten/sui/transactions";
 import BigNumber from "bignumber.js";
 import { LiquidStakingInfo } from "./_generated/liquid_staking/liquid-staking/structs";
-export interface LiquidStakingObject {
+export interface LiquidStakingObjectInfo {
     id: string;
     type: string;
     weightHookId: string;
@@ -16,43 +15,54 @@ export interface FeeConfigArgs {
 export declare const SUILEND_VALIDATOR_ADDRESS = "0xce8e537664ba5d1d5a6a857b17bd142097138706281882be6805e17065ecde89";
 export declare const SPRING_SUI_UPGRADE_CAP_ID = "0x4dc657b6c0fe896f4b94fee1ceac96312dde0a36b94e799caaec30deb53dcd67";
 export declare const ADMIN_ADDRESS = "0xb1ffbc2e1915f44b8f271a703becc1bf8aa79bc22431a58900a102892b783c25";
-export declare function getLatestPackageId(client: SuiGrpcClient, upgradeCapId: string): Promise<string>;
-interface LstClientOptions {
-    publishedAt?: string;
-    logPackageId?: boolean;
-}
+export declare function getLatestPackageId(client: SuiJsonRpcClient, upgradeCapId: string): Promise<string>;
 export declare class LstClient {
-    client: SuiGrpcClient;
-    jsonRpcClient: SuiJsonRpcClient;
-    liquidStakingObject: LiquidStakingObject;
-    private adapter;
-    static initialize(client: SuiGrpcClient, jsonRpcClient: SuiJsonRpcClient, liquidStakingObject: LiquidStakingObject, options?: LstClientOptions): Promise<LstClient>;
+    liquidStakingObject: LiquidStakingObjectInfo;
+    client: SuiJsonRpcClient;
+    static initialize(client: SuiJsonRpcClient, liquidStakingObjectInfo: LiquidStakingObjectInfo, _publishedAt?: string, logPackageId?: boolean): Promise<LstClient>;
     static createNewLst(tx: Transaction, treasuryCap: string, coinType: string): TransactionObjectInput;
-    static getWeightHookAdminCapId(client: SuiGrpcClient, address: string, coinType: string): Promise<string | null | undefined>;
-    constructor(client: SuiGrpcClient, jsonRpcClient: SuiJsonRpcClient, liquidStakingObject: LiquidStakingObject);
+    static getWeightHookAdminCapId(client: SuiJsonRpcClient, address: string, coinType: string): Promise<string | null | undefined>;
+    constructor(liquidStakingObject: LiquidStakingObjectInfo, client: SuiJsonRpcClient);
     getAdminCapId(address: string): Promise<string | null | undefined>;
-    mint(tx: Transaction, suiCoinId: TransactionObjectInput): any;
-    mintAmountAndRebalance(tx: Transaction, address: string, amount: string): any;
+    mint(tx: Transaction, suiCoinId: TransactionObjectInput): {
+        NestedResult: [number, number];
+        $kind: "NestedResult";
+    };
+    mintAmountAndRebalance(tx: Transaction, address: string, amount: string): {
+        NestedResult: [number, number];
+        $kind: "NestedResult";
+    };
     mintAmountAndRebalanceAndSendToUser(tx: Transaction, address: string, amount: string): void;
-    redeem(tx: Transaction, lstId: TransactionObjectInput): any;
-    redeemAmountAndRebalance(tx: Transaction, address: string, amount: string, client: SuiGrpcClient): Promise<any>;
-    redeemAmountAndRebalanceAndSendToUser(tx: Transaction, address: string, amount: string, client: SuiGrpcClient): Promise<void>;
+    redeem(tx: Transaction, lstId: TransactionObjectInput): {
+        NestedResult: [number, number];
+        $kind: "NestedResult";
+    };
+    redeemAmountAndRebalance(tx: Transaction, address: string, amount: string, client: SuiJsonRpcClient): Promise<{
+        NestedResult: [number, number];
+        $kind: "NestedResult";
+    }>;
+    redeemAmountAndRebalanceAndSendToUser(tx: Transaction, address: string, amount: string, client: SuiJsonRpcClient): Promise<void>;
     increaseValidatorStake(tx: Transaction, adminCapId: TransactionObjectInput, validatorAddress: string, suiAmount: number): void;
     decreaseValidatorStake(tx: Transaction, adminCapId: TransactionObjectInput, validatorAddress: string, targetUnstakeSuiAmount: bigint): void;
-    collectFees(tx: Transaction, weightHookAdminCapId: TransactionObjectInput): any;
+    collectFees(tx: Transaction, weightHookAdminCapId: TransactionObjectInput): {
+        NestedResult: [number, number];
+        $kind: "NestedResult";
+    };
     collectFeesAndSendToUser(tx: Transaction, weightHookAdminCapId: TransactionObjectInput, address: string): void;
     updateFees(tx: Transaction, weightHookAdminCapId: TransactionObjectInput, feeConfigArgs: FeeConfigArgs): void;
-    initializeWeightHook(tx: Transaction, adminCapId: TransactionObjectInput): any;
+    initializeWeightHook(tx: Transaction, adminCapId: TransactionObjectInput): {
+        NestedResult: [number, number];
+        $kind: "NestedResult";
+    };
     setValidatorAddressesAndWeights(tx: Transaction, weightHookId: TransactionObjectInput, weightHookAdminCap: TransactionObjectInput, validatorAddressesAndWeights: Record<string, number>): void;
     rebalance(tx: Transaction, weightHookId: TransactionObjectInput): void;
     getSpringSuiApy(_validatorApys?: ValidatorApy[]): Promise<BigNumber>;
 }
-export declare const fetchLiquidStakingInfo: (info: LiquidStakingObject, client: SuiGrpcClient) => Promise<LiquidStakingInfo<any>>;
-export declare const fetchRegistryLiquidStakingInfoMap: (client: SuiGrpcClient) => Promise<{
-    [x: string]: LiquidStakingObject | {
+export declare const fetchLiquidStakingInfo: (info: LiquidStakingObjectInfo, client: SuiJsonRpcClient) => Promise<LiquidStakingInfo<any>>;
+export declare const fetchRegistryLiquidStakingInfoMap: (client: SuiJsonRpcClient) => Promise<{
+    [x: string]: LiquidStakingObjectInfo | {
         id: any;
         type: string;
         weightHookId: any;
     };
 }>;
-export {};

package/sdk/src/client.js

@@ -11,44 +11,35 @@ import { SUI_DECIMALS, normalizeStructTag } from "@mysten/sui/utils";
 import BigNumber from "bignumber.js";
 import { phantom } from "./_generated/_framework/reified";
 import { PACKAGE_ID, setPublishedAt } from "./_generated/liquid_staking";
-import { newBuilder as newBuilder_, setRedeemFeeBps as setRedeemFeeBps_, setSpreadFeeBps as setSpreadFeeBps_, setSuiMintFeeBps as setSuiMintFeeBps_, toFeeConfig as toFeeConfig_, } from "./_generated/liquid_staking/fees/functions";
-import * as generated_ from "./_generated/liquid_staking/liquid-staking/functions";
+import { newBuilder, setRedeemFeeBps, setSpreadFeeBps, setSuiMintFeeBps, toFeeConfig, } from "./_generated/liquid_staking/fees/functions";
+import * as generated from "./_generated/liquid_staking/liquid-staking/functions";
 import { LiquidStakingInfo } from "./_generated/liquid_staking/liquid-staking/structs";
-import * as weightHookGenerated_ from "./_generated/liquid_staking/weight/functions";
+import * as weightHookGenerated from "./_generated/liquid_staking/weight/functions";
 import { WeightHook } from "./_generated/liquid_staking/weight/structs";
-import { GrpcAdapter } from "./grpcAdapter";
-// Cast generated functions to any to avoid v1/v2 type conflicts
-const newBuilder = newBuilder_;
-const setRedeemFeeBps = setRedeemFeeBps_;
-const setSpreadFeeBps = setSpreadFeeBps_;
-const setSuiMintFeeBps = setSuiMintFeeBps_;
-const toFeeConfig = toFeeConfig_;
-const generated = generated_;
-const weightHookGenerated = weightHookGenerated_;
 const SUI_SYSTEM_STATE_ID = "0x0000000000000000000000000000000000000000000000000000000000000005";
 export const SUILEND_VALIDATOR_ADDRESS = "0xce8e537664ba5d1d5a6a857b17bd142097138706281882be6805e17065ecde89";
 export const SPRING_SUI_UPGRADE_CAP_ID = "0x4dc657b6c0fe896f4b94fee1ceac96312dde0a36b94e799caaec30deb53dcd67";
 export const ADMIN_ADDRESS = "0xb1ffbc2e1915f44b8f271a703becc1bf8aa79bc22431a58900a102892b783c25";
 export function getLatestPackageId(client, upgradeCapId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const result = yield client.getObject({
-            objectId: upgradeCapId,
-            include: {
-                json: true,
+        var _a;
+        const object = yield client.getObject({
+            id: upgradeCapId,
+            options: {
+                showContent: true,
             },
         });
-        return result.object.json.package;
+        return ((_a = object.data) === null || _a === void 0 ? void 0 : _a.content).fields.package;
     });
 }
 export class LstClient {
-    static initialize(client, jsonRpcClient, liquidStakingObject, options) {
+    static initialize(client, liquidStakingObjectInfo, _publishedAt, logPackageId) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const publishedAt = (_a = options === null || options === void 0 ? void 0 : options.publishedAt) !== null && _a !== void 0 ? _a : (yield getLatestPackageId(client, SPRING_SUI_UPGRADE_CAP_ID));
-            if (options === null || options === void 0 ? void 0 : options.logPackageId)
+            const publishedAt = _publishedAt !== null && _publishedAt !== void 0 ? _publishedAt : (yield getLatestPackageId(client, SPRING_SUI_UPGRADE_CAP_ID));
+            if (logPackageId)
                 console.log("@suilend/springsui-sdk | publishedAt:", publishedAt);
             setPublishedAt(publishedAt);
-            return new LstClient(client, jsonRpcClient, liquidStakingObject);
+            return new LstClient(liquidStakingObjectInfo, client);
         });
     }
     static createNewLst(tx, treasuryCap, coinType) {
@@ -78,32 +69,36 @@ export class LstClient {
     }
     static getWeightHookAdminCapId(client, address, coinType) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield client.listOwnedObjects({
+            var _a;
+            const res = (yield client.getOwnedObjects({
                 owner: address,
-                type: `${PACKAGE_ID}::weight::WeightHookAdminCap<${coinType}>`,
-            });
-            if (result.objects.length === 0) {
+                filter: {
+                    StructType: `${PACKAGE_ID}::weight::WeightHookAdminCap<${coinType}>`,
+                },
+            })).data;
+            if (res.length == 0) {
                 return null;
             }
-            return result.objects[0].objectId;
+            return (_a = res[0].data) === null || _a === void 0 ? void 0 : _a.objectId;
         });
     }
-    constructor(client, jsonRpcClient, liquidStakingObject) {
-        this.client = client;
-        this.jsonRpcClient = jsonRpcClient;
+    constructor(liquidStakingObject, client) {
         this.liquidStakingObject = liquidStakingObject;
-        this.adapter = new GrpcAdapter(client);
+        this.client = client;
     }
     getAdminCapId(address) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.client.listOwnedObjects({
+            var _a;
+            const res = (yield this.client.getOwnedObjects({
                 owner: address,
-                type: `${PACKAGE_ID}::liquid_staking::AdminCap<${this.liquidStakingObject.type}>`,
-            });
-            if (result.objects.length === 0) {
+                filter: {
+                    StructType: `${PACKAGE_ID}::liquid_staking::AdminCap<${this.liquidStakingObject.type}>`,
+                },
+            })).data;
+            if (res.length == 0) {
                 return null;
             }
-            return result.objects[0].objectId;
+            return (_a = res[0].data) === null || _a === void 0 ? void 0 : _a.objectId;
         });
     }
     // returns the lst object
@@ -136,16 +131,15 @@ export class LstClient {
     }
     redeemAmountAndRebalance(tx, address, amount, client) {
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield client.listCoins({
+            const coins = (yield client.getCoins({
                 owner: address,
                 coinType: this.liquidStakingObject.type,
-            });
-            const coins = result.objects;
+            })).data;
             const mergeCoin = coins[0];
             if (coins.length > 1) {
-                tx.mergeCoins(tx.object(mergeCoin.objectId), coins.map((c) => tx.object(c.objectId)).slice(1));
+                tx.mergeCoins(tx.object(mergeCoin.coinObjectId), coins.map((c) => tx.object(c.coinObjectId)).slice(1));
             }
-            const [lstCoin] = tx.splitCoins(tx.object(mergeCoin.objectId), [
+            const [lstCoin] = tx.splitCoins(tx.object(mergeCoin.coinObjectId), [
                 BigInt(amount),
             ]);
             const suiCoin = this.redeem(tx, lstCoin);
@@ -267,7 +261,7 @@ export class LstClient {
     getSpringSuiApy(_validatorApys) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const validatorApys = _validatorApys !== null && _validatorApys !== void 0 ? _validatorApys : (yield this.jsonRpcClient.getValidatorsApy()).apys;
+            const validatorApys = _validatorApys !== null && _validatorApys !== void 0 ? _validatorApys : (yield this.client.getValidatorsApy()).apys;
             const liquidStakingInfo = yield fetchLiquidStakingInfo(this.liquidStakingObject, this.client);
             const totalSuiSupply = new BigNumber(liquidStakingInfo.storage.totalSuiSupply.toString()).div(10 ** SUI_DECIMALS);
             const spreadFeePercent = new BigNumber((_b = (_a = liquidStakingInfo.feeConfig.element) === null || _a === void 0 ? void 0 : _a.spreadFeeBps.toString()) !== null && _b !== void 0 ? _b : 0).div(100);
@@ -285,33 +279,32 @@ export class LstClient {
     }
 }
 // user functions
-export const fetchLiquidStakingInfo = (info, client) => LiquidStakingInfo.fetch(new GrpcAdapter(client), phantom(info.type), info.id);
+export const fetchLiquidStakingInfo = (info, client) => LiquidStakingInfo.fetch(client, phantom(info.type), info.id);
 export const fetchRegistryLiquidStakingInfoMap = (client) => __awaiter(void 0, void 0, void 0, function* () {
     const REGISTRY_ID = "0x06d6b6881ef14ad1a8cc29d1f97ba3397ecea56af5afa0642093e981b1fda3f4";
     const registryObjectIds = [];
     let cursor = null;
     let hasNextPage = true;
     while (hasNextPage) {
-        const page = yield client.listDynamicFields({
+        const page = yield client.getDynamicFields({
             parentId: REGISTRY_ID,
             cursor,
         });
-        registryObjectIds.push(...page.dynamicFields.map((d) => d.fieldId));
-        cursor = page.cursor;
+        registryObjectIds.push(...page.data.map((d) => d.objectId));
+        cursor = page.nextCursor;
         hasNextPage = page.hasNextPage;
     }
-    const registryObjects = yield client.getObjects({
-        objectIds: registryObjectIds,
-        include: {
-            json: true,
+    const registryObjects = yield Promise.all(registryObjectIds.map((objectId) => client.getObject({
+        id: objectId,
+        options: {
+            showContent: true,
         },
-    });
-    const LIQUID_STAKING_OBJECT_MAP = registryObjects.objects.reduce((acc, obj) => {
-        if (obj instanceof Error)
-            return acc;
-        const json = obj.json;
-        const id = json.value.liquid_staking_info_id;
-        const coinType = normalizeStructTag(json.name.name);
+    })));
+    const LIQUID_STAKING_INFO_MAP = registryObjects.reduce((acc, obj) => {
+        var _a;
+        const fields = ((_a = obj.data) === null || _a === void 0 ? void 0 : _a.content).fields;
+        const id = fields.value.fields.liquid_staking_info_id;
+        const coinType = normalizeStructTag(fields.name.fields.name);
         if ([
             "0x460c669acd3f294dc4247a6877ec2532340ffde76162ab201e72fe95355830e7::asui::ASUI",
             "0x752f18582da315f9104bb8b7828188c474e64f23255ed9fd231ed3fa883f27e0::tt_sui::TT_SUI",
@@ -325,8 +318,8 @@ export const fetchRegistryLiquidStakingInfoMap = (client) => __awaiter(void 0, v
             "0xad421271913607cab135184481d65d25f10b3ef4464004fe6333930503404e3d::mjsui2::MJSUI2",
         ].includes(coinType))
             return acc;
-        const weightHookId = json.value.extra_info.weight_hook_id;
+        const weightHookId = fields.value.fields.extra_info.fields.weight_hook_id;
         return Object.assign(Object.assign({}, acc), { [coinType]: { id, type: coinType, weightHookId } });
     }, {});
-    return LIQUID_STAKING_OBJECT_MAP;
+    return LIQUID_STAKING_INFO_MAP;
 });

package/sdk/src/index.d.ts

@@ -1,3 +1,2 @@
 export * from "./lib";
 export * from "./client";
-export * from "./grpcAdapter";

package/sdk/src/index.js

@@ -1,3 +1,2 @@
 export * from "./lib";
 export * from "./client";
-export * from "./grpcAdapter";

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

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

package/sdk/src/grpcAdapter.d.ts

@@ -1,50 +0,0 @@
-/**
- * Adapter that wraps SuiGrpcClient to provide the legacy SuiClient API
- * that the generated code expects.
- *
- * This allows using gRPC while maintaining compatibility with sui-client-gen generated code.
- */
-import { SuiGrpcClient } from "@mysten/sui/grpc";
-export interface LegacyObjectResponse {
-    data?: {
-        objectId: string;
-        version: string;
-        digest: string;
-        type?: string;
-        owner?: unknown;
-        previousTransaction?: string;
-        bcs?: {
-            dataType: "moveObject";
-            type: string;
-            hasPublicTransfer: boolean;
-            version: string;
-            bcsBytes: string;
-        };
-    };
-    error?: {
-        code: string;
-        message?: string;
-    };
-}
-/**
- * GrpcAdapter wraps a SuiGrpcClient and provides the legacy SuiClient API
- * for compatibility with generated code.
- */
-export declare class GrpcAdapter {
-    private grpcClient;
-    constructor(grpcClient: SuiGrpcClient);
-    /**
-     * getObject - adapts gRPC getObject to legacy format
-     * Used by generated code's .fetch() methods
-     */
-    getObject(input: {
-        id: string;
-        options?: {
-            showBcs?: boolean;
-            showContent?: boolean;
-            showOwner?: boolean;
-            showPreviousTransaction?: boolean;
-            showType?: boolean;
-        };
-    }): Promise<LegacyObjectResponse>;
-}

package/sdk/src/grpcAdapter.js

@@ -1,75 +0,0 @@
-/**
- * Adapter that wraps SuiGrpcClient to provide the legacy SuiClient API
- * that the generated code expects.
- *
- * This allows using gRPC while maintaining compatibility with sui-client-gen generated code.
- */
-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());
-    });
-};
-import { toBase64 } from "@mysten/sui/utils";
-/**
- * GrpcAdapter wraps a SuiGrpcClient and provides the legacy SuiClient API
- * for compatibility with generated code.
- */
-export class GrpcAdapter {
-    constructor(grpcClient) {
-        this.grpcClient = grpcClient;
-    }
-    /**
-     * getObject - adapts gRPC getObject to legacy format
-     * Used by generated code's .fetch() methods
-     */
-    getObject(input) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
-            try {
-                const result = yield this.grpcClient.getObject({
-                    objectId: input.id,
-                    include: {
-                        objectBcs: (_a = input.options) === null || _a === void 0 ? void 0 : _a.showBcs,
-                        previousTransaction: (_b = input.options) === null || _b === void 0 ? void 0 : _b.showPreviousTransaction,
-                    },
-                });
-                const obj = result.object;
-                // Build legacy response format
-                const response = {
-                    data: {
-                        objectId: obj.objectId,
-                        version: obj.version,
-                        digest: obj.digest,
-                        type: obj.type,
-                        owner: obj.owner,
-                        previousTransaction: (_c = obj.previousTransaction) !== null && _c !== void 0 ? _c : undefined,
-                    },
-                };
-                // Handle BCS data (used by generated code)
-                if (((_d = input.options) === null || _d === void 0 ? void 0 : _d.showBcs) && obj.objectBcs) {
-                    response.data.bcs = {
-                        dataType: "moveObject",
-                        type: obj.type,
-                        hasPublicTransfer: true,
-                        version: obj.version,
-                        bcsBytes: toBase64(obj.objectBcs),
-                    };
-                }
-                return response;
-            }
-            catch (error) {
-                // Convert thrown errors to error response format
-                return {
-                    error: {
-                        code: "objectNotFound",
-                        message: error instanceof Error ? error.message : String(error),
-                    },
-                };
-            }
-        });
-    }
-}