@suilend/sdk 1.0.9 → 1.1.1

package/core/parsers/obligation.d.ts

@@ -25,6 +25,7 @@ export declare const parseObligation: ({ Obligation }: Pick<Deps, "Obligation">,
         userRewardManager: any;
         depositedAmount: BigNumber;
         depositedAmountUsd: BigNumber;
+        depositedCtokenAmount: BigNumber;
         reserve: {
             config: {
                 $typeName: any;
@@ -41,7 +42,7 @@ export declare const parseObligation: ({ Obligation }: Pick<Deps, "Obligation">,
                 borrowFeeBps: number;
                 spreadFeeBps: number;
                 protocolLiquidationFeeBps: number;
-                isolated: any;
+                isolated: boolean;
                 openAttributedBorrowLimitUsd: number;
                 closeAttributedBorrowLimitUsd: number;
                 interestRate: {
@@ -149,7 +150,7 @@ export declare const parseObligation: ({ Obligation }: Pick<Deps, "Obligation">,
                 borrowFeeBps: number;
                 spreadFeeBps: number;
                 protocolLiquidationFeeBps: number;
-                isolated: any;
+                isolated: boolean;
                 openAttributedBorrowLimitUsd: number;
                 closeAttributedBorrowLimitUsd: number;
                 interestRate: {

package/core/parsers/obligation.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseObligation = void 0;
-const utils_1 = require("@mysten/sui.js/utils");
+const utils_1 = require("@mysten/sui/utils");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const constants_1 = require("../constants");
 const parseObligation = ({ Obligation }, obligation, parsedReserveMap) => {
@@ -42,6 +42,7 @@ const parseObligation = ({ Obligation }, obligation, parsedReserveMap) => {
             userRewardManager,
             depositedAmount,
             depositedAmountUsd,
+            depositedCtokenAmount,
             reserve,
             original: obligation,
         };

package/core/parsers/reserve.d.ts

@@ -1,4 +1,4 @@
-import { CoinMetadata } from "@mysten/sui.js/client";
+import { CoinMetadata } from "@mysten/sui/client";
 import BigNumber from "bignumber.js";
 import { Deps } from "./deps";
 export type ParsedReserve = ReturnType<typeof parseReserve>;
@@ -21,7 +21,7 @@ export declare const parseReserve: ({ Reserve, PoolRewardManager, PoolReward, si
         borrowFeeBps: number;
         spreadFeeBps: number;
         protocolLiquidationFeeBps: number;
-        isolated: any;
+        isolated: boolean;
         openAttributedBorrowLimitUsd: number;
         closeAttributedBorrowLimitUsd: number;
         interestRate: {
@@ -122,7 +122,7 @@ export declare const parseReserveConfig: ({ Reserve }: Pick<Deps, "Reserve">, re
     borrowFeeBps: number;
     spreadFeeBps: number;
     protocolLiquidationFeeBps: number;
-    isolated: any;
+    isolated: boolean;
     openAttributedBorrowLimitUsd: number;
     closeAttributedBorrowLimitUsd: number;
     interestRate: {

package/core/parsers/reserve.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parsePoolReward = exports.parsePoolRewardManager = exports.parseReserveConfig = exports.parseReserve = void 0;
-const utils_1 = require("@mysten/sui.js/utils");
+const utils_1 = require("@mysten/sui/utils");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const uuid_1 = require("uuid");
 const constants_1 = require("../constants");

package/core/types.d.ts

@@ -1,7 +1,6 @@
 import { BcsType, InferBcsType } from "@mysten/bcs";
-import { ObjectArg as SuiObjectArg } from "@mysten/sui.js/bcs";
-import { SuiClient } from "@mysten/sui.js/client";
-import { TransactionArgument } from "@mysten/sui.js/transactions";
+import { SuiClient } from "@mysten/sui/client";
+import { TransactionArgument, TransactionObjectInput } from "@mysten/sui/transactions";
 export declare const ID: BcsType<{
     bytes: string;
 }, {
@@ -524,22 +523,17 @@ export declare enum Side {
     DEPOSIT = "deposit",
     BORROW = "borrow"
 }
-export type ObjectId = string;
-export type ObjectCallArg = {
-    Object: SuiObjectArg;
-};
-export type ObjectArg = string | ObjectCallArg | TransactionArgument;
 export interface PhantomReified<P> {
     phantomType: P;
     kind: "PhantomReified";
 }
 export interface AddReserveArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
-    priceInfo: ObjectArg;
-    config: ObjectArg;
-    coinMetadata: ObjectArg;
-    clock: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
+    priceInfo: TransactionObjectInput;
+    config: TransactionObjectInput;
+    coinMetadata: TransactionObjectInput;
+    clock: TransactionObjectInput;
 }
 export interface CreateReserveConfigArgs {
     openLtvPct: number | TransactionArgument;
@@ -562,49 +556,49 @@ export interface CreateReserveConfigArgs {
     closeAttributedBorrowLimitUsd: bigint | TransactionArgument;
 }
 export interface UpdateReserveConfigArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
-    config: ObjectArg;
+    config: TransactionObjectInput;
 }
 export interface AddPoolRewardArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
     isDepositReward: boolean | TransactionArgument;
-    rewards: ObjectArg;
+    rewards: TransactionObjectInput;
     startTimeMs: bigint | TransactionArgument;
     endTimeMs: bigint | TransactionArgument;
-    clock: ObjectArg;
+    clock: TransactionObjectInput;
 }
 export interface CancelPoolRewardArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
     isDepositReward: boolean | TransactionArgument;
     rewardIndex: bigint | TransactionArgument;
-    clock: ObjectArg;
+    clock: TransactionObjectInput;
 }
 export interface ClosePoolRewardArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
     isDepositReward: boolean | TransactionArgument;
     rewardIndex: bigint | TransactionArgument;
-    clock: ObjectArg;
+    clock: TransactionObjectInput;
 }
 export interface ClaimRewardsArgs {
-    lendingMarket: ObjectArg;
-    cap: ObjectArg;
-    clock: ObjectArg;
+    lendingMarket: TransactionObjectInput;
+    cap: TransactionObjectInput;
+    clock: TransactionObjectInput;
     reserveId: bigint | TransactionArgument;
     rewardIndex: bigint | TransactionArgument;
     isDepositReward: boolean | TransactionArgument;
 }
 export interface ClaimRewardsAndDepositArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     obligationId: string | TransactionArgument;
-    clock: ObjectArg;
+    clock: TransactionObjectInput;
     rewardReserveId: bigint | TransactionArgument;
     rewardIndex: bigint | TransactionArgument;
     isDepositReward: boolean | TransactionArgument;
@@ -615,62 +609,73 @@ export interface CreateRateLimiterConfigArgs {
     maxOutflow: bigint | TransactionArgument;
 }
 export interface UpdateRateLimiterConfigArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
-    clock: ObjectArg;
-    config: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
+    clock: TransactionObjectInput;
+    config: TransactionObjectInput;
 }
 export interface RefreshReservePriceArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
-    clock: ObjectArg;
-    priceInfo: ObjectArg;
+    clock: TransactionObjectInput;
+    priceInfo: TransactionObjectInput;
 }
 export interface DepositLiquidityAndMintCtokensArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
-    clock: ObjectArg;
-    deposit: ObjectArg;
+    clock: TransactionObjectInput;
+    deposit: TransactionObjectInput;
 }
 export interface DepositCtokensIntoObligationArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
-    obligationOwnerCap: ObjectArg;
-    clock: ObjectArg;
-    deposit: ObjectArg;
+    obligationOwnerCap: TransactionObjectInput;
+    clock: TransactionObjectInput;
+    deposit: TransactionObjectInput;
 }
 export interface WithdrawCtokensArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
-    obligationOwnerCap: ObjectArg;
-    clock: ObjectArg;
+    obligationOwnerCap: TransactionObjectInput;
+    clock: TransactionObjectInput;
     amount: bigint | TransactionArgument;
 }
 export interface BorrowArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
-    obligationOwnerCap: ObjectArg;
-    clock: ObjectArg;
+    obligationOwnerCap: TransactionObjectInput;
+    clock: TransactionObjectInput;
     amount: bigint | TransactionArgument;
 }
 export interface RepayArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     reserveArrayIndex: bigint | TransactionArgument;
     obligationId: string | TransactionArgument;
-    clock: ObjectArg;
-    maxRepayCoins: ObjectArg;
+    clock: TransactionObjectInput;
+    maxRepayCoins: TransactionObjectInput;
 }
 export interface LiquidateArgs {
-    lendingMarket: ObjectArg;
+    lendingMarket: TransactionObjectInput;
     obligationId: string | TransactionArgument;
     repayReserveArrayIndex: bigint | TransactionArgument;
     withdrawReserveArrayIndex: bigint | TransactionArgument;
-    clock: ObjectArg;
-    repayCoins: ObjectArg;
+    clock: TransactionObjectInput;
+    repayCoins: TransactionObjectInput;
 }
 export interface MigrateArgs {
-    lendingMarketOwnerCap: ObjectArg;
-    lendingMarket: ObjectArg;
+    lendingMarketOwnerCap: TransactionObjectInput;
+    lendingMarket: TransactionObjectInput;
+}
+export interface ClaimFeesArgs {
+    lendingMarket: TransactionObjectInput;
+    reserveArrayIndex: bigint | TransactionArgument;
+}
+export interface RedeemCtokensAndWithdrawLiquidityArgs {
+    lendingMarket: TransactionObjectInput;
+    reserveArrayIndex: bigint | TransactionArgument;
+    clock: TransactionObjectInput;
+    ctokens: TransactionObjectInput;
+    rateLimiterExemption: TransactionObjectInput | TransactionArgument | null;
 }
 export type ApiInterestUpdateEvent = {
     id: number;

package/core/types.js

@@ -11,10 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Side = exports.load = exports.LendingMarket = exports.ObjectBag = exports.Reserve = exports.PriceIdentifier = exports.ReserveConfig = exports.InterestRateModel = exports.Obligation = exports.Bag = exports.Deposit = exports.Borrow = exports.Decimal = exports.ObligationOwnerCap = exports.UID = exports.ID = void 0;
 const bcs_1 = require("@mysten/bcs");
+const utils_1 = require("@mysten/sui/utils");
 exports.ID = bcs_1.bcs.struct("ID", {
     bytes: bcs_1.bcs.bytes(32).transform({
-        input: (val) => (0, bcs_1.fromHEX)(val),
-        output: (val) => (0, bcs_1.toHEX)(val),
+        input: (val) => (0, utils_1.fromHex)(val),
+        output: (val) => (0, utils_1.toHex)(val),
     }),
 });
 exports.UID = bcs_1.bcs.struct("UID", {
@@ -45,8 +46,8 @@ exports.Bag = bcs_1.bcs.struct("Bag", {
 exports.Obligation = bcs_1.bcs.struct("Obligation", {
     id: exports.UID,
     owner: bcs_1.bcs.bytes(32).transform({
-        input: (val) => (0, bcs_1.fromHEX)(val),
-        output: (val) => (0, bcs_1.toHEX)(val),
+        input: (val) => (0, utils_1.fromHex)(val),
+        output: (val) => (0, utils_1.toHex)(val),
     }),
     deposits: bcs_1.bcs.vector(exports.Deposit),
     borrows: bcs_1.bcs.vector(exports.Borrow),
@@ -112,10 +113,11 @@ function load(client, type, id) {
         if (((_b = (_a = data.data) === null || _a === void 0 ? void 0 : _a.bcs) === null || _b === void 0 ? void 0 : _b.dataType) !== "moveObject") {
             throw new Error("Error: invalid data type");
         }
-        return type.parse((0, bcs_1.fromB64)(data.data.bcs.bcsBytes));
+        return type.parse((0, utils_1.fromBase64)(data.data.bcs.bcsBytes));
     });
 }
 exports.load = load;
+//
 var Side;
 (function (Side) {
     Side["DEPOSIT"] = "deposit";

package/core/utils/events.d.ts

@@ -1,4 +1,4 @@
-import { SuiClient, SuiEvent } from "@mysten/sui.js/client";
+import { SuiClient, SuiEvent } from "@mysten/sui/client";
 type TypeName = {
     name: string;
 };
@@ -30,7 +30,7 @@ declare class TypedParamsSuiEvent<T> {
     params(): T;
     isType(module: SuilendTransactionModule, eventType: SuilendEventType): boolean;
 }
-export declare class GenericSuilendEvent extends TypedParamsSuiEvent<{}> {
+export declare class GenericSuilendEvent extends TypedParamsSuiEvent<object> {
 }
 export declare class InterestUpdateEvent extends TypedParamsSuiEvent<{
     lending_market_id: address;

package/core/utils/simulate.d.ts

@@ -1,5 +1,5 @@
+import { SuiPriceServiceConnection } from "@pythnetwork/pyth-sui-js";
 import BigNumber from "bignumber.js";
-import { SuiPriceServiceConnection } from "../../pyth-sdk";
 interface Deps {
     Decimal: any;
     Obligation: any;

package/core/utils/simulate.js

@@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Simulate = void 0;
-const bcs_1 = require("@mysten/sui.js/bcs");
-const utils_1 = require("@mysten/sui.js/utils");
+const bcs_1 = require("@mysten/sui/bcs");
+const utils_1 = require("@mysten/sui/utils");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const uuid_1 = require("uuid");
 const constants_1 = require("../constants");
@@ -152,7 +152,7 @@ class Simulate {
     }
     refreshReservePrice(reserves, pythConnection) {
         return __awaiter(this, void 0, void 0, function* () {
-            const priceIdentifiers = reserves.map((r) => (0, utils_1.toHEX)(new Uint8Array(r.priceIdentifier.bytes)));
+            const priceIdentifiers = reserves.map((r) => (0, utils_1.toHex)(new Uint8Array(r.priceIdentifier.bytes)));
             const priceData = yield pythConnection.getLatestPriceFeeds(priceIdentifiers);
             if (!priceData)
                 return reserves;

package/core/utils.d.ts

@@ -1,5 +1,7 @@
 import BigNumber from "bignumber.js";
 import { ParsedReserve } from "./parsers/reserve";
 export declare const toHexString: (bytes: number[]) => string;
-export declare const reserveSort: (a: ParsedReserve, b: ParsedReserve) => number;
+export declare const reserveSort: (reserves: ParsedReserve[], aCoinType: string, bCoinType: string) => number;
 export declare const linearlyInterpolate: (array: any[], xKey: string, yKey: string, _xValue: number | BigNumber) => BigNumber;
+export declare const isCTokenCoinType: (coinType: string) => boolean;
+export declare const extractCTokenCoinType: (coinType: string) => string;

package/core/utils.js

@@ -3,13 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.linearlyInterpolate = exports.reserveSort = exports.toHexString = void 0;
+exports.extractCTokenCoinType = exports.isCTokenCoinType = exports.linearlyInterpolate = exports.reserveSort = exports.toHexString = void 0;
+const utils_1 = require("@mysten/sui/utils");
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const toHexString = (bytes) => Array.from(bytes, function (byte) {
     return ("0" + (byte & 0xff).toString(16)).slice(-2);
 }).join("");
 exports.toHexString = toHexString;
-const reserveSort = (a, b) => { var _a, _b; return Number((_a = a === null || a === void 0 ? void 0 : a.arrayIndex) !== null && _a !== void 0 ? _a : 0) - Number((_b = b === null || b === void 0 ? void 0 : b.arrayIndex) !== null && _b !== void 0 ? _b : 0); };
+const reserveSort = (reserves, aCoinType, bCoinType) => reserves.findIndex((r) => r.coinType === aCoinType) -
+    reserves.findIndex((r) => r.coinType === bCoinType);
 exports.reserveSort = reserveSort;
 const linearlyInterpolate = (array, xKey, yKey, _xValue) => {
     let i = 1;
@@ -29,3 +31,11 @@ const linearlyInterpolate = (array, xKey, yKey, _xValue) => {
     return new bignumber_js_1.default(0);
 };
 exports.linearlyInterpolate = linearlyInterpolate;
+const isCTokenCoinType = (coinType) => coinType.includes("::reserve::CToken<") && coinType.endsWith(">");
+exports.isCTokenCoinType = isCTokenCoinType;
+const extractCTokenCoinType = (coinType) => {
+    if (!(0, exports.isCTokenCoinType)(coinType))
+        throw new Error("Not a CToken ");
+    return (0, utils_1.normalizeStructTag)(coinType.split("::reserve::CToken")[1].split(",")[1].slice(0, -1));
+};
+exports.extractCTokenCoinType = extractCTokenCoinType;

package/mainnet/_generated/_dependencies/source/0x1/ascii/structs.d.ts

@@ -1,25 +1,30 @@
 import * as reified from "../../../../_framework/reified";
-import { PhantomReified, Reified, StructClass, ToField, ToTypeStr, Vector } from "../../../../_framework/reified";
+import { PhantomReified, Reified, StructClass, ToField, ToTypeStr } from "../../../../_framework/reified";
 import { FieldsWithTypes } from "../../../../_framework/util";
-import { SuiClient, SuiParsedData } from "@mysten/sui.js/client";
+import { Vector } from "../../../../_framework/vector";
+import { PKG_V9 } from "../index";
+import { SuiClient, SuiObjectData, SuiParsedData } from "@mysten/sui/client";
 export declare function isChar(type: string): boolean;
 export interface CharFields {
     byte: ToField<"u8">;
 }
 export type CharReified = Reified<Char, CharFields>;
 export declare class Char implements StructClass {
+    __StructClass: true;
     static readonly $typeName = "0x1::ascii::Char";
     static readonly $numTypeParams = 0;
+    static readonly $isPhantom: readonly [];
     readonly $typeName = "0x1::ascii::Char";
-    readonly $fullTypeName: "0x1::ascii::Char";
+    readonly $fullTypeName: `${typeof PKG_V9}::ascii::Char`;
     readonly $typeArgs: [];
+    readonly $isPhantom: readonly [];
     readonly byte: ToField<"u8">;
     private constructor();
     static reified(): CharReified;
     static get r(): reified.StructClassReified<Char, CharFields>;
     static phantom(): PhantomReified<ToTypeStr<Char>>;
     static get p(): reified.PhantomReified<"0x1::ascii::Char">;
-    static get bcs(): import("@mysten/bcs").BcsType<{
+    static get bcs(): import("@mysten/sui/bcs").BcsType<{
         byte: number;
     }, {
         byte: number;
@@ -38,6 +43,7 @@ export declare class Char implements StructClass {
     static fromJSONField(field: any): Char;
     static fromJSON(json: Record<string, any>): Char;
     static fromSuiParsedData(content: SuiParsedData): Char;
+    static fromSuiObjectData(data: SuiObjectData): Char;
     static fetch(client: SuiClient, id: string): Promise<Char>;
 }
 export declare function isString(type: string): boolean;
@@ -46,18 +52,21 @@ export interface StringFields {
 }
 export type StringReified = Reified<String, StringFields>;
 export declare class String implements StructClass {
+    __StructClass: true;
     static readonly $typeName = "0x1::ascii::String";
     static readonly $numTypeParams = 0;
+    static readonly $isPhantom: readonly [];
     readonly $typeName = "0x1::ascii::String";
-    readonly $fullTypeName: "0x1::ascii::String";
+    readonly $fullTypeName: `${typeof PKG_V9}::ascii::String`;
     readonly $typeArgs: [];
+    readonly $isPhantom: readonly [];
     readonly bytes: ToField<Vector<"u8">>;
     private constructor();
     static reified(): StringReified;
     static get r(): reified.StructClassReified<String, StringFields>;
     static phantom(): PhantomReified<ToTypeStr<String>>;
     static get p(): reified.PhantomReified<"0x1::ascii::String">;
-    static get bcs(): import("@mysten/bcs").BcsType<{
+    static get bcs(): import("@mysten/sui/bcs").BcsType<{
         bytes: number[];
     }, {
         bytes: Iterable<number> & {
@@ -78,5 +87,6 @@ export declare class String implements StructClass {
     static fromJSONField(field: any): String;
     static fromJSON(json: Record<string, any>): String;
     static fromSuiParsedData(content: SuiParsedData): String;
+    static fromSuiObjectData(data: SuiObjectData): String;
     static fetch(client: SuiClient, id: string): Promise<String>;
 }

package/mainnet/_generated/_dependencies/source/0x1/ascii/structs.js

@@ -36,16 +36,20 @@ exports.String = exports.isString = exports.Char = exports.isChar = void 0;
 const reified = __importStar(require("../../../../_framework/reified"));
 const reified_1 = require("../../../../_framework/reified");
 const util_1 = require("../../../../_framework/util");
-const bcs_1 = require("@mysten/bcs");
+const index_1 = require("../index");
+const bcs_1 = require("@mysten/sui/bcs");
+const utils_1 = require("@mysten/sui/utils");
 /* ============================== Char =============================== */
 function isChar(type) {
     type = (0, util_1.compressSuiType)(type);
-    return type === "0x1::ascii::Char";
+    return type === `${index_1.PKG_V9}::ascii::Char`;
 }
 exports.isChar = isChar;
 class Char {
     constructor(typeArgs, fields) {
+        this.__StructClass = true;
         this.$typeName = Char.$typeName;
+        this.$isPhantom = Char.$isPhantom;
         this.$fullTypeName = (0, util_1.composeSuiType)(Char.$typeName, ...typeArgs);
         this.$typeArgs = typeArgs;
         this.byte = fields.byte;
@@ -55,6 +59,7 @@ class Char {
             typeName: Char.$typeName,
             fullTypeName: (0, util_1.composeSuiType)(Char.$typeName, ...[]),
             typeArgs: [],
+            isPhantom: Char.$isPhantom,
             reifiedTypeArgs: [],
             fromFields: (fields) => Char.fromFields(fields),
             fromFieldsWithTypes: (item) => Char.fromFieldsWithTypes(item),
@@ -63,6 +68,7 @@ class Char {
             fromJSONField: (field) => Char.fromJSONField(field),
             fromJSON: (json) => Char.fromJSON(json),
             fromSuiParsedData: (content) => Char.fromSuiParsedData(content),
+            fromSuiObjectData: (content) => Char.fromSuiObjectData(content),
             fetch: (client, id) => __awaiter(this, void 0, void 0, function* () { return Char.fetch(client, id); }),
             new: (fields) => {
                 return new Char([], fields);
@@ -124,6 +130,18 @@ class Char {
         }
         return Char.fromFieldsWithTypes(content);
     }
+    static fromSuiObjectData(data) {
+        if (data.bcs) {
+            if (data.bcs.dataType !== "moveObject" || !isChar(data.bcs.type)) {
+                throw new Error(`object at is not a Char object`);
+            }
+            return Char.fromBcs((0, utils_1.fromB64)(data.bcs.bcsBytes));
+        }
+        if (data.content) {
+            return Char.fromSuiParsedData(data.content);
+        }
+        throw new Error("Both `bcs` and `content` fields are missing from the data. Include `showBcs` or `showContent` in the request.");
+    }
     static fetch(client, id) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -135,22 +153,25 @@ class Char {
                 !isChar(res.data.bcs.type)) {
                 throw new Error(`object at id ${id} is not a Char object`);
             }
-            return Char.fromBcs((0, bcs_1.fromB64)(res.data.bcs.bcsBytes));
+            return Char.fromSuiObjectData(res.data);
         });
     }
 }
 exports.Char = Char;
-Char.$typeName = "0x1::ascii::Char";
+Char.$typeName = `${index_1.PKG_V9}::ascii::Char`;
 Char.$numTypeParams = 0;
+Char.$isPhantom = [];
 /* ============================== String =============================== */
 function isString(type) {
     type = (0, util_1.compressSuiType)(type);
-    return type === "0x1::ascii::String";
+    return type === `${index_1.PKG_V9}::ascii::String`;
 }
 exports.isString = isString;
 class String {
     constructor(typeArgs, fields) {
+        this.__StructClass = true;
         this.$typeName = String.$typeName;
+        this.$isPhantom = String.$isPhantom;
         this.$fullTypeName = (0, util_1.composeSuiType)(String.$typeName, ...typeArgs);
         this.$typeArgs = typeArgs;
         this.bytes = fields.bytes;
@@ -160,6 +181,7 @@ class String {
             typeName: String.$typeName,
             fullTypeName: (0, util_1.composeSuiType)(String.$typeName, ...[]),
             typeArgs: [],
+            isPhantom: String.$isPhantom,
             reifiedTypeArgs: [],
             fromFields: (fields) => String.fromFields(fields),
             fromFieldsWithTypes: (item) => String.fromFieldsWithTypes(item),
@@ -168,6 +190,7 @@ class String {
             fromJSONField: (field) => String.fromJSONField(field),
             fromJSON: (json) => String.fromJSON(json),
             fromSuiParsedData: (content) => String.fromSuiParsedData(content),
+            fromSuiObjectData: (content) => String.fromSuiObjectData(content),
             fetch: (client, id) => __awaiter(this, void 0, void 0, function* () { return String.fetch(client, id); }),
             new: (fields) => {
                 return new String([], fields);
@@ -233,6 +256,18 @@ class String {
         }
         return String.fromFieldsWithTypes(content);
     }
+    static fromSuiObjectData(data) {
+        if (data.bcs) {
+            if (data.bcs.dataType !== "moveObject" || !isString(data.bcs.type)) {
+                throw new Error(`object at is not a String object`);
+            }
+            return String.fromBcs((0, utils_1.fromB64)(data.bcs.bcsBytes));
+        }
+        if (data.content) {
+            return String.fromSuiParsedData(data.content);
+        }
+        throw new Error("Both `bcs` and `content` fields are missing from the data. Include `showBcs` or `showContent` in the request.");
+    }
     static fetch(client, id) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
@@ -244,10 +279,11 @@ class String {
                 !isString(res.data.bcs.type)) {
                 throw new Error(`object at id ${id} is not a String object`);
             }
-            return String.fromBcs((0, bcs_1.fromB64)(res.data.bcs.bcsBytes));
+            return String.fromSuiObjectData(res.data);
         });
     }
 }
 exports.String = String;
-String.$typeName = "0x1::ascii::String";
+String.$typeName = `${index_1.PKG_V9}::ascii::String`;
 String.$numTypeParams = 0;
+String.$isPhantom = [];

package/mainnet/_generated/_dependencies/source/0x1/index.d.ts

@@ -1,2 +1,3 @@
 export declare const PACKAGE_ID = "0x1";
 export declare const PUBLISHED_AT = "0x1";
+export declare const PKG_V9 = "0x1";

package/mainnet/_generated/_dependencies/source/0x1/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PUBLISHED_AT = exports.PACKAGE_ID = void 0;
+exports.PKG_V9 = exports.PUBLISHED_AT = exports.PACKAGE_ID = void 0;
 exports.PACKAGE_ID = "0x1";
 exports.PUBLISHED_AT = "0x1";
+exports.PKG_V9 = "0x1";