@sogni-ai/sogni-client 4.0.0-alpha.9 → 4.0.0

package/dist/lib/RestClient.js

@@ -34,7 +34,20 @@ class RestClient extends TypedEventEmitter_1.default {
     request(url_1) {
         return __awaiter(this, arguments, void 0, function* (url, options = {}) {
             const init = yield this.auth.authenticateRequest(options);
-            return fetch(url, init).then((r) => this.processResponse(r));
+            // Add a timeout to detect hanging requests
+            const controller = new AbortController();
+            const timeoutId = setTimeout(() => {
+                controller.abort();
+            }, 30000);
+            try {
+                const response = yield fetch(url, Object.assign(Object.assign({}, init), { signal: controller.signal }));
+                clearTimeout(timeoutId);
+                return this.processResponse(response);
+            }
+            catch (fetchError) {
+                clearTimeout(timeoutId);
+                throw fetchError;
+            }
         });
     }
     processResponse(response) {
@@ -58,7 +71,7 @@ class RestClient extends TypedEventEmitter_1.default {
         });
     }
     get(path, query = {}) {
-        return this.request(this.formatUrl(path, query), query);
+        return this.request(this.formatUrl(path, query));
     }
     post(path, body = {}) {
         return this.request(this.formatUrl(path), {

package/dist/lib/RestClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"RestClient.js","sourceRoot":"","sources":["../../src/lib/RestClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,4CAA0D;AAC1D,4EAAkE;AAKlE,MAAM,UAAuC,SAAQ,2BAAoB;IAKvE,YAAY,OAAe,EAAE,IAAiB,EAAE,MAAc;QAC5D,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEO,SAAS,CAAC,WAAmB,EAAE,QAAgC,EAAE;QACvE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACjC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;IAEa,OAAO;6DAAgB,GAAW,EAAE,UAAuB,EAAE;YACzE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAC1D,OAAO,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAM,CAAC,CAAC;QACpE,CAAC;KAAA;IAEa,eAAe,CAAC,QAAkB;;YAC9C,IAAI,YAAY,CAAC;YACjB,IAAI,CAAC;gBACH,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACvC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,CAAC,CAAC,CAAC;gBACnD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAC9C,CAAC;YACD,0FAA0F;YAC1F,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACpB,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,oBAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAgC,CAAC,CAAC;YACxE,CAAC;YACD,OAAO,YAAyB,CAAC;QACnC,CAAC;KAAA;IAED,GAAG,CAAgB,IAAY,EAAE,QAA6B,EAAE;QAC9D,OAAO,IAAI,CAAC,OAAO,CAAI,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,CAAgB,IAAY,EAAE,OAAgC,EAAE;QAClE,OAAO,IAAI,CAAC,OAAO,CAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YAC3C,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;CACF;AAED,kBAAe,UAAU,CAAC"}
+{"version":3,"file":"RestClient.js","sourceRoot":"","sources":["../../src/lib/RestClient.ts"],"names":[],"mappings":"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"}

package/dist/lib/validation.d.ts

@@ -1,4 +1,10 @@
 export declare function validateCustomImageSize(value: any): number;
+/**
+ * Validate video dimensions for Wan 2.2 models.
+ * Minimum dimension is 480px for both width and height.
+ */
+export declare function validateVideoSize(value: any, propertyName: 'width' | 'height'): number;
+export declare function validateVideoDuration(value: any): number;
 interface NumberValidationOptions {
     min?: number;
     max?: number;
@@ -6,6 +12,24 @@ interface NumberValidationOptions {
     defaultValue?: number;
 }
 export declare function validateNumber(value: any, { min, max, propertyName, defaultValue }?: NumberValidationOptions): number;
-export declare function validateSampler(value?: string): string | null;
-export declare function validateScheduler(value?: string): string | null;
+export declare function validateForgeSampler(value?: string): string | null;
+export declare function validateForgeScheduler(value?: string): string | null;
+/**
+ * Validate teacacheThreshold for T2V and I2V models.
+ * Range: 0.0-1.0. 0.0 = disabled.
+ */
+export declare function validateTeacacheThreshold(value?: number): number | undefined;
+/**
+ * Validate ComfyUI sampler for video models.
+ * Returns the sampler string directly (no mapping needed).
+ */
+export declare function validateComfySampler(value?: string): string | undefined;
+/**
+ * Validate ComfyUI scheduler for video models.
+ * Returns the scheduler string directly (no mapping needed).
+ */
+export declare function validateComfyScheduler(value?: string): string | undefined;
+export declare function isComfyModel(modelId: string): boolean;
+export declare function validateSampler(modelId: string, sampler: string): string | null | undefined;
+export declare function validateScheduler(modelId: string, scheduler: string): string | null | undefined;
 export {};

package/dist/lib/validation.js

@@ -1,14 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateCustomImageSize = validateCustomImageSize;
+exports.validateVideoSize = validateVideoSize;
+exports.validateVideoDuration = validateVideoDuration;
 exports.validateNumber = validateNumber;
+exports.validateForgeSampler = validateForgeSampler;
+exports.validateForgeScheduler = validateForgeScheduler;
+exports.validateTeacacheThreshold = validateTeacacheThreshold;
+exports.validateComfySampler = validateComfySampler;
+exports.validateComfyScheduler = validateComfyScheduler;
+exports.isComfyModel = isComfyModel;
 exports.validateSampler = validateSampler;
 exports.validateScheduler = validateScheduler;
-const SamplerParams_1 = require("../Projects/types/SamplerParams");
-const SchedulerParams_1 = require("../Projects/types/SchedulerParams");
+const ForgeSamplerParams_1 = require("../Projects/types/ForgeSamplerParams");
+const ForgeSchedulerParams_1 = require("../Projects/types/ForgeSchedulerParams");
+const ComfySamplerParams_1 = require("../Projects/types/ComfySamplerParams");
+const ComfySchedulerParams_1 = require("../Projects/types/ComfySchedulerParams");
 function validateCustomImageSize(value) {
     return validateNumber(value, { min: 256, max: 2048, propertyName: 'Width and height' });
 }
+/**
+ * Validate video dimensions for Wan 2.2 models.
+ * Minimum dimension is 480px for both width and height.
+ */
+function validateVideoSize(value, propertyName) {
+    return validateNumber(value, { min: 480, propertyName: `Video ${propertyName}` });
+}
+function validateVideoDuration(value) {
+    return validateNumber(value, { min: 1, max: 10, propertyName: 'Video duration' });
+}
 function validateNumber(value, { min, max, propertyName, defaultValue } = {}) {
     const number = Number(value);
     const hasDefaultValue = defaultValue !== undefined;
@@ -35,22 +55,87 @@ function validateNumber(value, { min, max, propertyName, defaultValue } = {}) {
     }
     return number;
 }
-function validateSampler(value) {
+function validateForgeSampler(value) {
     if (!value) {
         return null;
     }
-    if (!(0, SamplerParams_1.isSampler)(value)) {
-        throw new Error(`Invalid sampler: ${value}. Supported options: ${Object.keys(SamplerParams_1.SamplerMap).join(', ')}`);
+    if ((0, ForgeSamplerParams_1.isRawForgeSampler)(value)) {
+        return value;
+    }
+    if ((0, ForgeSamplerParams_1.isForgeSampler)(value)) {
+        return ForgeSamplerParams_1.SupportedForgeSamplers[value];
     }
-    return SamplerParams_1.SamplerMap[value];
+    throw new Error(`Invalid sampler: ${value}. Supported options: ${Object.keys(ForgeSamplerParams_1.SupportedForgeSamplers).join(', ')}`);
 }
-function validateScheduler(value) {
+function validateForgeScheduler(value) {
     if (!value) {
         return null;
     }
-    if (!(0, SchedulerParams_1.isScheduler)(value)) {
-        throw new Error(`Invalid scheduler: ${value}. Supported options: ${Object.keys(SchedulerParams_1.SchedulerMap).join(', ')}`);
+    if ((0, ForgeSchedulerParams_1.isRawForgeScheduler)(value)) {
+        return value;
+    }
+    if ((0, ForgeSchedulerParams_1.isForgeScheduler)(value)) {
+        return ForgeSchedulerParams_1.SupportedForgeSchedulers[value];
+    }
+    throw new Error(`Invalid scheduler: ${value}. Supported options: ${Object.keys(ForgeSchedulerParams_1.SupportedForgeSchedulers).join(', ')}`);
+}
+/**
+ * Validate teacacheThreshold for T2V and I2V models.
+ * Range: 0.0-1.0. 0.0 = disabled.
+ */
+function validateTeacacheThreshold(value) {
+    if (value === undefined || value === null) {
+        return undefined;
+    }
+    const num = Number(value);
+    if (isNaN(num)) {
+        throw new Error(`teacacheThreshold must be a number, got ${value}`);
+    }
+    if (num < 0.0 || num > 1.0) {
+        throw new Error(`teacacheThreshold must be between 0.0 and 1.0 (got ${num})`);
+    }
+    return num;
+}
+/**
+ * Validate ComfyUI sampler for video models.
+ * Returns the sampler string directly (no mapping needed).
+ */
+function validateComfySampler(value) {
+    if (!value) {
+        return undefined;
+    }
+    if ((0, ComfySamplerParams_1.isComfySampler)(value)) {
+        return ComfySamplerParams_1.SupportedComfySamplers[value];
+    }
+    throw new Error(`Invalid comfySampler: ${value}. Supported options: ${Object.keys(ComfySamplerParams_1.SupportedComfySamplers).join(', ')}`);
+}
+/**
+ * Validate ComfyUI scheduler for video models.
+ * Returns the scheduler string directly (no mapping needed).
+ */
+function validateComfyScheduler(value) {
+    if (!value) {
+        return undefined;
+    }
+    if ((0, ComfySchedulerParams_1.isComfyScheduler)(value)) {
+        return ComfySchedulerParams_1.SupportedComfySchedulers[value];
+    }
+    throw new Error(`Invalid comfyScheduler: ${value}. Supported options: ${Object.keys(ComfySchedulerParams_1.SupportedComfySchedulers).join(', ')}`);
+}
+function isComfyModel(modelId) {
+    const COMFY_PREFIXES = ['z_image_', 'qwen_image_', 'flux2_', 'wan_'];
+    return COMFY_PREFIXES.some((prefix) => modelId.startsWith(prefix));
+}
+function validateSampler(modelId, sampler) {
+    if (isComfyModel(modelId)) {
+        return validateComfySampler(sampler);
+    }
+    return validateForgeSampler(sampler);
+}
+function validateScheduler(modelId, scheduler) {
+    if (isComfyModel(modelId)) {
+        return validateComfyScheduler(scheduler);
     }
-    return SchedulerParams_1.SchedulerMap[value];
+    return validateForgeScheduler(scheduler);
 }
 //# sourceMappingURL=validation.js.map

package/dist/lib/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/lib/validation.ts"],"names":[],"mappings":";;AAGA,0DAEC;AASD,wCA4BC;AAED,0CAUC;AAED,8CAUC;AAlED,mEAAwE;AACxE,uEAA8E;AAE9E,SAAgB,uBAAuB,CAAC,KAAU;IAChD,OAAO,cAAc,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,kBAAkB,EAAE,CAAC,CAAC;AAC1F,CAAC;AASD,SAAgB,cAAc,CAC5B,KAAU,EACV,EAAE,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,KAA8B,EAAE;IAEtE,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,MAAM,eAAe,GAAG,YAAY,KAAK,SAAS,CAAC;IACnD,IAAI,YAAY,EAAE,CAAC;QACjB,YAAY,GAAG,OAAO,CAAC;IACzB,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;QAClB,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,YAAY,CAAC;QACtB,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,0BAA0B,KAAK,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,GAAG,KAAK,SAAS,IAAI,MAAM,GAAG,GAAG,EAAE,CAAC;QACtC,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,YAAY,CAAC;QACtB,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,0BAA0B,GAAG,SAAS,MAAM,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,IAAI,GAAG,KAAK,SAAS,IAAI,MAAM,GAAG,GAAG,EAAE,CAAC;QACtC,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,YAAY,CAAC;QACtB,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,GAAG,YAAY,0BAA0B,GAAG,SAAS,MAAM,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,eAAe,CAAC,KAAc;IAC5C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,IAAA,yBAAS,EAAC,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACb,oBAAoB,KAAK,wBAAwB,MAAM,CAAC,IAAI,CAAC,0BAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtF,CAAC;IACJ,CAAC;IACD,OAAO,0BAAU,CAAC,KAAK,CAAC,CAAC;AAC3B,CAAC;AAED,SAAgB,iBAAiB,CAAC,KAAc;IAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,IAAA,6BAAW,EAAC,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,sBAAsB,KAAK,wBAAwB,MAAM,CAAC,IAAI,CAAC,8BAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC1F,CAAC;IACJ,CAAC;IACD,OAAO,8BAAY,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/lib/validation.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "4.0.0-alpha.9",
+  "version": "4.0.0",
   "description": "Sogni Supernet Client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,6 +37,9 @@
   "homepage": "https://github.com/Sogni-AI/sogni-client#readme",
   "dependencies": {
     "@lukeed/uuid": "^2.0.1",
+    "@types/js-cookie": "^3.0.6",
+    "@types/lodash": "^4.17.13",
+    "@types/ws": "^8.5.13",
     "ethers": "^6.13.4",
     "isomorphic-ws": "^5.0.0",
     "js-cookie": "^3.0.5",
@@ -47,9 +50,6 @@
   "devDependencies": {
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "@types/js-cookie": "^3.0.6",
-    "@types/lodash": "^4.17.13",
-    "@types/ws": "^8.5.13",
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1",
     "semantic-release": "^24.2.1",

package/src/Account/index.ts

@@ -29,11 +29,11 @@ enum ErrorCode {
 }
 /**
  * Account API methods that let you interact with the user's account.
- * Can be accessed via `client.account`. Look for more samples below.
+ * Can be accessed via `sogni.account`. Look for more samples below.
  *
  * @example Retrieve the current account balance
  * ```typescript
- * const balance = await client.account.refreshBalance();
+ * const balance = await sogni.account.refreshBalance();
  * console.log(balance);
  * ```
  *
@@ -43,7 +43,12 @@ class AccountApi extends ApiGroup {
 
   constructor(config: ApiConfig) {
     super(config);
+    this.currentAccount._update({
+      networkStatus: this.client.socket.isConnected ? 'connected' : 'disconnected',
+      network: this.client.socket.supernetType
+    });
     this.client.socket.on('balanceUpdate', this.handleBalanceUpdate.bind(this));
+    this.client.socket.on('changeNetwork', this.handleChangeNetwork.bind(this));
     this.client.on('connected', this.handleServerConnected.bind(this));
     this.client.on('disconnected', this.handleServerDisconnected.bind(this));
     this.client.auth.on('updated', this.handleAuthUpdated.bind(this));
@@ -53,6 +58,10 @@ class AccountApi extends ApiGroup {
     this.currentAccount._update({ balance: data });
   }
 
+  private handleChangeNetwork({ network }: { network: SupernetType }) {
+    this.currentAccount._update({ network, networkStatus: 'connected' });
+  }
+
   private handleServerConnected({ network }: { network: SupernetType }) {
     this.currentAccount._update({
       networkStatus: 'connected',
@@ -70,6 +79,8 @@ class AccountApi extends ApiGroup {
   private handleAuthUpdated(isAuthenticated: boolean) {
     if (!isAuthenticated) {
       this.currentAccount._clear();
+    } else {
+      this.me();
     }
   }
 
@@ -92,7 +103,7 @@ class AccountApi extends ApiGroup {
    *
    * @example Create a wallet from username and password
    * ```typescript
-   * const wallet = client.account.getWallet('username', 'password');
+   * const wallet = sogni.account.getWallet('username', 'password');
    * console.log(wallet.address);
    * ```
    *
@@ -137,7 +148,6 @@ class AccountApi extends ApiGroup {
     } else {
       await auth.authenticate();
     }
-    await this.me();
     return res.data;
   }
 
@@ -146,7 +156,7 @@ class AccountApi extends ApiGroup {
    *
    * @example Login with username and password
    * ```typescript
-   * await client.account.login('username', 'password');
+   * await sogni.account.login('username', 'password');
    * console.log('Logged in');
    * ```
    *
@@ -173,7 +183,6 @@ class AccountApi extends ApiGroup {
     } else {
       await auth.authenticate();
     }
-    await this.me();
     return res.data;
   }
 
@@ -182,7 +191,7 @@ class AccountApi extends ApiGroup {
    *
    * @example Logout the user
    * ```typescript
-   * await client.account.logout();
+   * await sogni.account.logout();
    * console.log('Logged out');
    * ```
    */
@@ -200,7 +209,7 @@ class AccountApi extends ApiGroup {
    *
    * @example Refresh user account balance
    * ```typescript
-   * const balance = await client.account.refreshBalance();
+   * const balance = await sogni.account.refreshBalance();
    * console.log(balance);
    * ```
    */
@@ -216,7 +225,7 @@ class AccountApi extends ApiGroup {
    *
    * @example Get the account balance of the current user
    * ```typescript
-   * const balance = await client.account.accountBalance();
+   * const balance = await sogni.account.accountBalance();
    * console.log(balance);
    * ```
    */
@@ -232,19 +241,21 @@ class AccountApi extends ApiGroup {
    *
    * @example Get the balance of the wallet address
    * ```typescript
-   * const address = client.account.currentAccount.walletAddress;
-   * const balance = await client.account.walletBalance(address);
+   * const address = sogni.account.currentAccount.walletAddress;
+   * const balance = await sogni.account.walletBalance(address);
    * console.log(balance);
    * // { token: '100.000000', ether: '0.000000' }
    * ```
    *
    * @param walletAddress
+   * @param provider - blockchain provider, 'base' or 'etherlink' defaults to 'base'
    */
-  async walletBalance(walletAddress: string) {
+  async walletBalance(walletAddress: string, provider: 'base' | 'etherlink' = 'base') {
     const res = await this.client.rest.get<
       ApiResponse<{ sogni: string; spark: string; ether: string }>
     >('/v2/wallet/balance', {
-      walletAddress
+      walletAddress,
+      provider
     });
     return res.data;
   }
@@ -287,9 +298,9 @@ class AccountApi extends ApiGroup {
    *
    * @example Switch to the fast network
    * ```typescript
-   * await client.account.switchNetwork('fast');
+   * await sogni.account.switchNetwork('fast');
    * console.log('Switched to the fast network, now lets wait until we get list of models');
-   * await client.projects.waitForModels();
+   * await sogni.projects.waitForModels();
    * ```
    * @param network - Network type to switch to
    */
@@ -311,10 +322,10 @@ class AccountApi extends ApiGroup {
    *
    * @example Get the transaction history
    * ```typescript
-   * const { entries, next } = await client.account.transactionHistory({
+   * const { entries, next } = await sogni.account.transactionHistory({
    *  status: 'completed',
    *  limit: 10,
-   *  address: client.account.currentAccount.walletAddress
+   *  address: sogni.account.currentAccount.walletAddress
    * });
    * ```
    *
@@ -420,7 +431,7 @@ class AccountApi extends ApiGroup {
    * Withdraw funds from the current account to wallet.
    * @example withdraw to current wallet address
    * ```typescript
-   * await client.account.withdraw('your-account-password', 100);
+   * await sogni.account.withdraw('your-account-password', 100);
    * ```
    *
    * @param password - account password
@@ -452,7 +463,7 @@ class AccountApi extends ApiGroup {
    * Deposit tokens from wallet to account
    * @example withdraw to current wallet address
    * ```typescript
-   * await client.account.deposit('your-account-password', 100);
+   * await sogni.account.deposit('your-account-password', 100);
    * ```
    *
    * @param password - account password