@ember-finance/sdk 2.0.0 → 2.0.1

package/dist/src/sui-vaults/on-chain-calls/vault.js

@@ -1,8 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Vault = void 0;
-const bcs_1 = require("../interfaces/bcs");
-class Vault {
+import { bcs } from "@mysten/sui/bcs";
+import { BcsUpdateVaultStrategyRequest } from "../interfaces/bcs.js";
+const unwrapMoveFields = (value) => value?.fields ?? value;
+export class Vault {
     /**
      * Fetches the vault rate from on-chain
      * @param suiClient Sui Client
@@ -10,26 +9,31 @@ class Vault {
      * @returns The vault rate
      */
     static async getVaultRate(suiClient, vaultId) {
-        const response = await suiClient.getObject({
-            id: vaultId,
-            options: {
-                showContent: true
+        const response = await suiClient.core.getObject({
+            objectId: vaultId,
+            include: {
+                json: true
             }
         });
-        return (response.data?.content).fields?.["rate"]?.fields?.["value"];
+        const fields = unwrapMoveFields(response.object?.json);
+        const rate = unwrapMoveFields(fields?.rate);
+        return rate?.value !== undefined ? Number(rate.value) : undefined;
     }
     static async getVault(suiClient, vaultId) {
-        const response = await suiClient.getObject({
-            id: vaultId,
-            options: { showContent: true }
+        const response = await suiClient.core.getObject({
+            objectId: vaultId,
+            include: { json: true }
         });
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const fields = response.data?.content?.fields;
+        const fields = unwrapMoveFields(response.object?.json);
         if (!fields) {
             throw new Error("Vault not found or invalid response");
         }
+        const fee = unwrapMoveFields(fields.fee);
+        const rate = unwrapMoveFields(fields.rate);
+        const vaultIdField = unwrapMoveFields(fields.id);
         return {
-            id: fields.id?.id || vaultId,
+            id: vaultIdField?.id || fields.id || vaultId,
             name: fields.name || "",
             admin: fields.admin,
             operator: fields.operator,
@@ -43,35 +47,43 @@ class Vault {
             sub_accounts: fields.sub_accounts || [],
             blacklisted: fields.blacklisted || [],
             fee: {
-                accrued: fields.fee?.fields?.accrued || "0",
-                last_charged_at: fields.fee?.fields?.last_charged_at || "0"
+                accrued: fee?.accrued || "0",
+                last_charged_at: fee?.last_charged_at || "0"
             },
             rate: {
-                last_updated_at: fields.rate?.fields?.last_updated_at || "0",
-                max_rate_change_per_update: fields.rate?.fields?.max_rate_change_per_update || "0",
-                rate_update_interval: fields.rate?.fields?.rate_update_interval || "0",
-                value: fields.rate?.fields?.value || "0"
+                last_updated_at: rate?.last_updated_at || "0",
+                max_rate_change_per_update: rate?.max_rate_change_per_update || "0",
+                rate_update_interval: rate?.rate_update_interval || "0",
+                value: rate?.value || "0"
             }
         };
     }
     static async getPendingWithdrawalRequests(suiClient, vaultId, walletAddress) {
-        const objDetails = await suiClient.getObject({
-            id: vaultId,
-            options: { showContent: true }
+        const objDetails = await suiClient.core.getObject({
+            objectId: vaultId,
+            include: { json: true }
         });
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        const userTable = (objDetails.data?.content).fields.accounts.fields.id.id;
+        const fields = unwrapMoveFields(objDetails.object?.json);
+        const accounts = unwrapMoveFields(fields?.accounts);
+        const accountTableId = unwrapMoveFields(accounts?.id);
+        const userTable = accountTableId?.id || accounts?.id;
         try {
-            const userData = await suiClient.getDynamicFieldObject({
+            const userData = await suiClient.core.getDynamicObjectField({
                 parentId: userTable,
                 name: {
                     type: "address",
-                    value: walletAddress
+                    bcs: bcs.Address.serialize(walletAddress).toBytes()
+                },
+                include: {
+                    json: true
                 }
             });
             // parse the account
             // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            const fields = (userData.data?.content).fields.value.fields;
+            const dynamicFields = unwrapMoveFields(userData.object?.json);
+            const value = unwrapMoveFields(dynamicFields?.value);
+            const fields = unwrapMoveFields(value);
             const cancellationPendingWithdrawalRequestsSequenceNumbers = fields.cancel_withdraw_request;
             return {
                 cancellation_pending_withdrawal_requests: fields.pending_withdrawal_requests
@@ -93,7 +105,7 @@ class Vault {
     }
     static async signUpdateVaultStrategyRequest(payload, signer) {
         const now = Date.now();
-        const bcsPayload = bcs_1.BcsUpdateVaultStrategyRequest.serialize({
+        const bcsPayload = BcsUpdateVaultStrategyRequest.serialize({
             vaultId: payload.vaultId,
             strategies: payload.strategies,
             targetApyE9: payload.targetApyE9,
@@ -116,4 +128,3 @@ class Vault {
         };
     }
 }
-exports.Vault = Vault;

package/dist/src/sui-vaults/utils/common.js

@@ -1,8 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTxBytes = void 0;
-const utils_1 = require("@mysten/sui/utils");
-const getTxBytes = async (tx, client) => {
-    return (0, utils_1.toBase64)(await tx.build({ client: client, onlyTransactionKind: false }));
+import { toBase64 } from "@mysten/sui/utils";
+export const getTxBytes = async (tx, client) => {
+    return toBase64(await tx.build({ client: client, onlyTransactionKind: false }));
 };
-exports.getTxBytes = getTxBytes;

package/dist/src/sui-vaults/utils/deployment-parser.d.ts

@@ -1,4 +1,4 @@
-import { ISuiDeployment } from "../interfaces";
+import { ISuiDeployment } from "../interfaces/index.js";
 export declare class SuiDeploymentParser {
     deployment: ISuiDeployment;
     constructor(_deployment: ISuiDeployment);

package/dist/src/sui-vaults/utils/deployment-parser.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SuiDeploymentParser = void 0;
-class SuiDeploymentParser {
+export class SuiDeploymentParser {
     constructor(_deployment) {
         this.deployment = _deployment;
     }
@@ -53,4 +50,3 @@ class SuiDeploymentParser {
         return vault.DepositCoinDecimals;
     }
 }
-exports.SuiDeploymentParser = SuiDeploymentParser;

package/dist/src/sui-vaults/utils/index.d.ts

@@ -1,2 +1,2 @@
-export * from "./deployment-parser";
-export * from "./common";
+export * from "./deployment-parser.js";
+export * from "./common.js";

package/dist/src/sui-vaults/utils/index.js

@@ -1,18 +1,2 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./deployment-parser"), exports);
-__exportStar(require("./common"), exports);
+export * from "./deployment-parser.js";
+export * from "./common.js";

package/package.json

@@ -1,7 +1,8 @@
 {
     "name": "@ember-finance/sdk",
     "description": "Ember Protocol SDK",
-    "version": "2.0.0",
+    "version": "2.0.1",
+    "type": "module",
     "module": "./dist/index.js",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
@@ -13,40 +14,45 @@
         "fs": false
     },
     "exports": {
+        ".": {
+            "types": "./dist/index.d.ts",
+            "import": "./dist/index.js",
+            "default": "./dist/index.js"
+        },
         "./evm-vaults": {
             "types": "./dist/src/evm-vaults/index.d.ts",
             "import": "./dist/src/evm-vaults/index.js",
-            "require": "./dist/src/evm-vaults/index.js"
+            "default": "./dist/src/evm-vaults/index.js"
         },
         "./sui-vaults": {
             "types": "./dist/src/sui-vaults/index.d.ts",
             "import": "./dist/src/sui-vaults/index.js",
-            "require": "./dist/src/sui-vaults/index.js"
+            "default": "./dist/src/sui-vaults/index.js"
         },
         "./api": {
             "types": "./dist/src/api/index.d.ts",
             "import": "./dist/src/api/index.js",
-            "require": "./dist/src/api/index.js"
+            "default": "./dist/src/api/index.js"
         },
         "./api/v2": {
             "types": "./dist/src/api/v2/index.d.ts",
             "import": "./dist/src/api/v2/index.js",
-            "require": "./dist/src/api/v2/index.js"
+            "default": "./dist/src/api/v2/index.js"
         },
         "./common": {
             "types": "./dist/src/common/index.d.ts",
             "import": "./dist/src/common/index.js",
-            "require": "./dist/src/common/index.js"
+            "default": "./dist/src/common/index.js"
         },
         "./abis": {
             "types": "./dist/src/abis/index.d.ts",
             "import": "./dist/src/abis/index.js",
-            "require": "./dist/src/abis/index.js"
+            "default": "./dist/src/abis/index.js"
         },
         "./index": {
             "types": "./dist/src/index.d.ts",
             "import": "./dist/src/index.js",
-            "require": "./dist/src/index.js"
+            "default": "./dist/src/index.js"
         }
     },
     "scripts": {
@@ -58,12 +64,14 @@
         "format-staged": "git-format-staged -f \"prettier '{}'\" '**/*.js' '**/*.json' '**/*.ts' ",
         "ci:code-formatting": "yarn prettier --check .",
         "ci:code-style": "yarn eslint .",
+        "typecheck": "tsc --noEmit",
         "setup:sui": "docker-compose -f local/sui/docker-compose.yml up -d",
         "teardown:sui": "docker-compose -f  local/sui/docker-compose.yml down",
-        "test": "ts-mocha --no-timeout tests/*.test.ts",
+        "test": "node --loader ts-node/esm ./node_modules/mocha/bin/mocha.js --no-timeout tests/*.test.ts",
+        "test:integration": "node --loader ts-node/esm ./node_modules/mocha/bin/mocha.js --no-timeout tests/Vault.integration.test.ts",
         "publish-beta": "npm publish --tag beta",
-        "generate:vaults:api-client-v2": "openapi-generator-cli generate -i ./src/api/v2/openapi.yml  -g typescript-axios -c ./src/api/v2/config.json   -o ./src/api/v2",
-        "generate:vaults:api-client": "openapi-generator-cli generate -i ./src/api/openapi.yml  -g typescript-axios -c ./src/api/config.json   -o ./src/api",
+        "generate:vaults:api-client-v2": "openapi-generator-cli generate -i ./src/api/v2/openapi.yml  -g typescript-axios -c ./src/api/v2/config.json   -o ./src/api/v2 && node ./scripts/fix-openapi-esm.mjs ./src/api/v2",
+        "generate:vaults:api-client": "openapi-generator-cli generate -i ./src/api/openapi.yml  -g typescript-axios -c ./src/api/config.json   -o ./src/api && node ./scripts/fix-openapi-esm.mjs ./src/api",
         "generate:vaults:md-docs": "widdershins --search false --language_tabs 'typescript:TypeScript' --summary ./src/api/openapi.yml -o ./src/api/README.md",
         "generate:vaults": "yarn run generate:vaults:api-client && yarn run generate:vaults:api-client-v2 && yarn run generate:vaults:md-docs && yarn run format-all"
     },
@@ -71,12 +79,14 @@
         "test": "tests"
     },
     "dependencies": {
-        "@firefly-exchange/library-sui": "^2.12.1",
-        "axios": "1.12.2",
+        "@firefly-exchange/library-sui": "^3.0.0",
+        "axios": "1.13.6",
         "ethers": "^6.13.4",
         "yarn": "^1.22.19"
     },
     "devDependencies": {
+        "@mysten/bcs": "^2.0.3",
+        "@mysten/sui": "^2.0.0",
         "@openapitools/openapi-generator-cli": "^2.24.0",
         "@types/chai": "^4.3.3",
         "@types/chai-as-promised": "^7.1.5",
@@ -94,13 +104,17 @@
         "git-format-staged": "^3.0.0",
         "husky": "^8.0.0",
         "mocha": "^10.1.0",
-        "prettier": "^2.8.8",
+        "prettier": "^3.8.1",
         "pretty-quick": "^3.1.3",
         "ts-mocha": "^10.0.0",
         "ts-node": "^10.9.1",
         "typescript": "*",
         "widdershins": "^4.0.1"
     },
+    "peerDependencies": {
+        "@mysten/bcs": "^2.0.3",
+        "@mysten/sui": "^2.0.0"
+    },
     "repository": {
         "type": "git",
         "url": "git+https://github.com/fireflyprotocol/ember-sdk.git"