@sogni-ai/sogni-client 3.0.0-alpha.8 → 3.0.0

package/dist/Projects/types/index.d.ts

@@ -1,5 +1,6 @@
 import { SupernetType } from '../../ApiClient/WebSocketClient/types';
 import { ControlNetParams } from './ControlNetParams';
+import { TokenType } from '../../types/token';
 export interface SupportedModel {
     id: string;
     name: string;
@@ -90,12 +91,14 @@ export interface ProjectParams {
      */
     numberOfImages: number;
     /**
-     * Generate images based on starting image.
+     * Generate images based on the starting image.
+     * Supported types:
      * `File` - file object from input[type=file]
-     * `Buffer` - buffer object with image data
+     * `Buffer` - Node.js buffer object with image data
      * `Blob` - blob object with image data
+     * `true` - indicates that the image is already uploaded to the server
      */
-    startingImage?: File | Buffer | Blob;
+    startingImage?: File | Buffer | Blob | boolean;
     /**
      * How strong effect of starting image should be. From 0 to 1, default 0.5
      */
@@ -129,6 +132,11 @@ export interface ProjectParams {
      * ControlNet model parameters
      */
     controlNet?: ControlNetParams;
+    /**
+     * Select which tokens to use for the project.
+     * If not specified, the Sogni token will be used.
+     */
+    tokenType?: TokenType;
 }
 export type ImageUrlParams = {
     imageId: string;
@@ -141,6 +149,10 @@ export interface EstimateRequest {
      * Network to use. Can be 'fast' or 'relaxed'
      */
     network: SupernetType;
+    /**
+     * Token type
+     */
+    tokenType?: TokenType;
     /**
      * Model ID
      */
@@ -180,3 +192,4 @@ export interface EstimateRequest {
      */
     height?: number;
 }
+export type EnhancementStrength = 'light' | 'medium' | 'heavy';

package/dist/Projects/utils.d.ts

@@ -0,0 +1,2 @@
+import { EnhancementStrength } from './types';
+export declare function getEnhacementStrength(strength: EnhancementStrength): number;

package/dist/Projects/utils.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEnhacementStrength = getEnhacementStrength;
+function getEnhacementStrength(strength) {
+    switch (strength) {
+        case 'light':
+            return 0.15;
+        case 'heavy':
+            return 0.49;
+        default:
+            return 0.35;
+    }
+}
+//# sourceMappingURL=utils.js.map

package/dist/Projects/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/Projects/utils.ts"],"names":[],"mappings":";;AAEA,sDASC;AATD,SAAgB,qBAAqB,CAAC,QAA6B;IACjE,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,OAAO;YACV,OAAO,IAAI,CAAC;QACd,KAAK,OAAO;YACV,OAAO,IAAI,CAAC;QACd;YACE,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC"}

package/dist/index.d.ts

@@ -9,7 +9,8 @@ import Project, { ProjectStatus } from './Projects/Project';
 import { AvailableModel, ProjectParams, Scheduler, TimeStepSpacing } from './Projects/types';
 import StatsApi from './Stats';
 import ErrorData from './types/ErrorData';
-export type { AvailableModel, ErrorData, JobStatus, Logger, LogLevel, ProjectParams, ProjectStatus, Scheduler, SupernetType, TimeStepSpacing };
+import { TokenType } from './types/token';
+export type { AvailableModel, ErrorData, JobStatus, Logger, LogLevel, ProjectParams, ProjectStatus, Scheduler, SupernetType, TimeStepSpacing, TokenType };
 export { ApiError, CurrentAccount, Job, Project };
 export interface SogniClientConfig {
     /**
@@ -26,6 +27,13 @@ export interface SogniClientConfig {
      * @internal
      */
     socketEndpoint?: string;
+    /**
+     * Disable WebSocket connection. Useful for testing or when WebSocket is not needed.
+     * Note that many may not work without WebSocket connection.
+     * @experimental
+     * @internal
+     */
+    disableSocket?: boolean;
     /**
      * Which network to use after logging in. Can be 'fast' or 'relaxed'
      */
@@ -39,10 +47,6 @@ export interface SogniClientConfig {
      * @default 'warn'
      **/
     logLevel?: LogLevel;
-    /**
-     * If provided, the client will connect to this JSON-RPC endpoint to interact with the blockchain
-     */
-    jsonRpcUrl?: string;
     /**
      * If true, the client will connect to the testnet. Ignored if jsonRpcUrl is provided
      */
@@ -56,7 +60,7 @@ export declare class SogniClient {
     private constructor();
     get currentAccount(): CurrentAccount;
     /**
-     * Instance creation may involve async operations, so we use a static method
+     * Create client instance, with default configuration
      * @param config
      */
     static createInstance(config: SogniClientConfig): Promise<SogniClient>;

package/dist/index.js

@@ -36,7 +36,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SogniClient = exports.Project = exports.Job = exports.CurrentAccount = exports.ApiError = void 0;
-const ethers_1 = require("ethers");
 // Account API
 const Account_1 = __importDefault(require("./Account"));
 const CurrentAccount_1 = __importDefault(require("./Account/CurrentAccount"));
@@ -66,7 +65,7 @@ class SogniClient {
         return this.account.currentAccount;
     }
     /**
-     * Instance creation may involve async operations, so we use a static method
+     * Create client instance, with default configuration
      * @param config
      */
     static createInstance(config) {
@@ -75,22 +74,14 @@ class SogniClient {
             const socketEndpoint = config.socketEndpoint || 'wss://socket.sogni.ai';
             const network = config.network || 'fast';
             const logger = config.logger || new DefaultLogger_1.DefaultLogger(config.logLevel || 'warn');
-            const isTestnet = config.testnet !== undefined ? config.testnet : true;
-            const client = new ApiClient_1.default(restEndpoint, socketEndpoint, config.appId, network, logger);
-            let provider;
-            if ('jsonRpcUrl' in config) {
-                provider = new ethers_1.JsonRpcProvider(config.jsonRpcUrl);
-            }
-            else {
-                provider = (0, ethers_1.getDefaultProvider)(isTestnet ? 84532 : 8453);
-            }
-            const chainId = yield provider.getNetwork().then((network) => network.chainId);
+            const isTestnet = config.testnet !== undefined ? config.testnet : false;
+            const client = new ApiClient_1.default(restEndpoint, socketEndpoint, config.appId, network, logger, config.disableSocket);
             const eip712 = new EIP712Helper_1.default({
-                name: 'Sogni-testnet',
+                name: isTestnet ? 'Sogni-testnet' : 'Sogni AI',
                 version: '1',
-                chainId: chainId.toString()
+                chainId: isTestnet ? '84532' : '8453'
             });
-            return new SogniClient({ client, provider, eip712 });
+            return new SogniClient({ client, eip712 });
         });
     }
 }

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAA+E;AAC/E,cAAc;AACd,wDAAmC;AACnC,8EAAsD;AA+BnC,yBA/BZ,wBAAc,CA+BY;AA9BjC,YAAY;AACZ,yDAAkD;AA6BzC,yFA7BW,oBAAQ,OA6BX;AA1BjB,QAAQ;AACR,uDAAsE;AACtE,sEAA8C;AAC9C,eAAe;AACf,0DAAqC;AACrC,yDAAgD;AAqBb,cArB5B,aAAG,CAqB4B;AApBtC,iEAA4D;AAoBpB,kBApBjC,iBAAO,CAoBiC;AAlB/C,YAAY;AACZ,oDAA+B;AAyD/B,MAAa,WAAW;IAOtB,YAAoB,MAAiB;QACnC,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAU,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAW,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,eAAQ,CAAC,MAAM,CAAC,CAAC;QAElC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IACjC,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,MAAM,CAAO,cAAc,CAAC,MAAyB;;YACnD,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,sBAAsB,CAAC;YACnE,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,uBAAuB,CAAC;YACxE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC;YACzC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,IAAI,6BAAa,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC;YAC7E,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;YAEvE,MAAM,MAAM,GAAG,IAAI,mBAAS,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1F,IAAI,QAA0B,CAAC;YAC/B,IAAI,YAAY,IAAI,MAAM,EAAE,CAAC;gBAC3B,QAAQ,GAAG,IAAI,wBAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACpD,CAAC;iBAAM,CAAC;gBACN,QAAQ,GAAG,IAAA,2BAAkB,EAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC1D,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC/E,MAAM,MAAM,GAAG,IAAI,sBAAY,CAAC;gBAC9B,IAAI,EAAE,eAAe;gBACrB,OAAO,EAAE,GAAG;gBACZ,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE;aAC5B,CAAC,CAAC;YACH,OAAO,IAAI,WAAW,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QACvD,CAAC;KAAA;CACF;AA7CD,kCA6CC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,cAAc;AACd,wDAAmC;AACnC,8EAAsD;AAiCnC,yBAjCZ,wBAAc,CAiCY;AAhCjC,YAAY;AACZ,yDAAkD;AA+BzC,yFA/BW,oBAAQ,OA+BX;AA5BjB,QAAQ;AACR,uDAAsE;AACtE,sEAA8C;AAC9C,eAAe;AACf,0DAAqC;AACrC,yDAAgD;AAuBb,cAvB5B,aAAG,CAuB4B;AAtBtC,iEAA4D;AAsBpB,kBAtBjC,iBAAO,CAsBiC;AApB/C,YAAY;AACZ,oDAA+B;AA8D/B,MAAa,WAAW;IAOtB,YAAoB,MAAiB;QACnC,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAU,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAW,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,eAAQ,CAAC,MAAM,CAAC,CAAC;QAElC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IACjC,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,MAAM,CAAO,cAAc,CAAC,MAAyB;;YACnD,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,sBAAsB,CAAC;YACnE,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,uBAAuB,CAAC;YACxE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC;YACzC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,IAAI,6BAAa,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC;YAC7E,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;YAExE,MAAM,MAAM,GAAG,IAAI,mBAAS,CAC1B,YAAY,EACZ,cAAc,EACd,MAAM,CAAC,KAAK,EACZ,OAAO,EACP,MAAM,EACN,MAAM,CAAC,aAAa,CACrB,CAAC;YACF,MAAM,MAAM,GAAG,IAAI,sBAAY,CAAC;gBAC9B,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU;gBAC9C,OAAO,EAAE,GAAG;gBACZ,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;aACtC,CAAC,CAAC;YACH,OAAO,IAAI,WAAW,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC7C,CAAC;KAAA;CACF;AA7CD,kCA6CC"}

package/dist/lib/utils.d.ts

@@ -6,3 +6,4 @@ export declare function decodeRefreshToken(token: string): {
     env: string;
     expiresAt: Date;
 };
+export declare function delay(ms: number): Promise<unknown>;

package/dist/lib/utils.js

@@ -1,7 +1,17 @@
 "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.decodeToken = decodeToken;
 exports.decodeRefreshToken = decodeRefreshToken;
+exports.delay = delay;
 const jwt_decode_1 = require("jwt-decode");
 function decodeToken(token) {
     const data = (0, jwt_decode_1.jwtDecode)(token);
@@ -17,4 +27,9 @@ function decodeRefreshToken(token) {
         expiresAt: new Date(data.exp * 1000)
     };
 }
+function delay(ms) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve) => setTimeout(resolve, ms));
+    });
+}
 //# sourceMappingURL=utils.js.map

package/dist/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;AAEA,kCAMC;AAED,gDAMC;AAhBD,2CAAuC;AAEvC,SAAgB,WAAW,CAAC,KAAa;IACvC,MAAM,IAAI,GAAG,IAAA,sBAAS,EAA0D,KAAK,CAAC,CAAC;IACvF,OAAO;QACL,aAAa,EAAE,IAAI,CAAC,IAAI;QACxB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;KACrC,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,KAAa;IAC9C,MAAM,IAAI,GAAG,IAAA,sBAAS,EAA0D,KAAK,CAAC,CAAC;IACvF,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;KACrC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;;;;;;;;;;AAEA,kCAMC;AAED,gDAMC;AAED,sBAEC;AApBD,2CAAuC;AAEvC,SAAgB,WAAW,CAAC,KAAa;IACvC,MAAM,IAAI,GAAG,IAAA,sBAAS,EAA0D,KAAK,CAAC,CAAC;IACvF,OAAO;QACL,aAAa,EAAE,IAAI,CAAC,IAAI;QACxB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;KACrC,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,KAAa;IAC9C,MAAM,IAAI,GAAG,IAAA,sBAAS,EAA0D,KAAK,CAAC,CAAC;IACvF,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;KACrC,CAAC;AACJ,CAAC;AAED,SAAsB,KAAK,CAAC,EAAU;;QACpC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;CAAA"}

package/dist/types/token.d.ts

@@ -0,0 +1 @@
+export type TokenType = 'sogni' | 'spark';

package/dist/types/token.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=token.js.map

package/dist/types/token.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/types/token.ts"],"names":[],"mappings":""}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "1.0.0-alpha.4";
+export declare const LIB_VERSION: string;

package/dist/version.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LIB_VERSION = void 0;
-exports.LIB_VERSION = "1.0.0-alpha.4";
+const package_json_1 = require("../package.json");
+exports.LIB_VERSION = package_json_1.version;
 //# sourceMappingURL=version.js.map

package/dist/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,eAAe,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAA,kDAA0C;AAC7B,QAAA,WAAW,GAAG,sBAAO,CAAC"}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.0.0-alpha.8",
+  "version": "3.0.0",
   "description": "Sogni Supernet Client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/Account/CurrentAccount.ts

@@ -1,5 +1,5 @@
 import DataEntity from '../lib/DataEntity';
-import { BalanceData } from './types';
+import { Balances } from './types';
 import { SupernetType } from '../ApiClient/WebSocketClient/types';
 /**
  * @inline
@@ -16,7 +16,7 @@ export interface AccountData {
    */
   networkStatus: 'connected' | 'disconnected' | 'connecting' | 'switching';
   network: SupernetType | null;
-  balance: BalanceData;
+  balance: Balances;
   walletAddress?: string;
   username?: string;
   token?: string;
@@ -28,10 +28,18 @@ function getDefaults(): AccountData {
     networkStatus: 'disconnected',
     network: null,
     balance: {
-      credit: '0',
-      debit: '0',
-      net: '0',
-      settled: '0'
+      sogni: {
+        credit: '0',
+        debit: '0',
+        net: '0',
+        settled: '0'
+      },
+      spark: {
+        credit: '0',
+        debit: '0',
+        net: '0',
+        settled: '0'
+      }
     },
     walletAddress: undefined,
     username: undefined,

package/src/Account/index.ts

@@ -1,22 +1,31 @@
 import {
   AccountCreateData,
   AccountCreateParams,
-  BalanceData,
+  Balances,
+  ClaimOptions,
+  FullBalances,
   LoginData,
   Nonce,
   Reward,
   RewardRaw,
+  RewardsQuery,
   TxHistoryData,
   TxHistoryEntry,
   TxHistoryParams
 } from './types';
 import ApiGroup, { ApiConfig } from '../ApiGroup';
-import { Wallet, pbkdf2, toUtf8Bytes, Signature, parseEther } from 'ethers';
-import { ApiError, ApiReponse } from '../ApiClient';
+import { parseEther, pbkdf2, toUtf8Bytes, Wallet } from 'ethers';
+import { ApiError, ApiResponse } from '../ApiClient';
 import CurrentAccount from './CurrentAccount';
 import { SupernetType } from '../ApiClient/WebSocketClient/types';
 import { AuthUpdatedEvent, Tokens } from '../lib/AuthManager';
+import { delay } from '../lib/utils';
 
+const MAX_DEPOSIT_ATTEMPTS = 4;
+enum ErrorCode {
+  INSUFFICIENT_BALANCE = 123,
+  INSUFFICIENT_ALLOWANCE = 149
+}
 /**
  * Account API methods that let you interact with the user's account.
  * Can be accessed via `client.account`. Look for more samples below.
@@ -39,7 +48,7 @@ class AccountApi extends ApiGroup {
     this.client.auth.on('updated', this.handleAuthUpdated.bind(this));
   }
 
-  private handleBalanceUpdate(data: BalanceData) {
+  private handleBalanceUpdate(data: Balances) {
     this.currentAccount._update({ balance: data });
   }
 
@@ -62,8 +71,13 @@ class AccountApi extends ApiGroup {
     }
   }
 
-  private async getNonce(walletAddress: string): Promise<string> {
-    const res = await this.client.rest.post<ApiReponse<Nonce>>('/v1/account/nonce', {
+  /**
+   * Get the nonce for the given wallet address.
+   * @param walletAddress
+   * @internal
+   */
+  async getNonce(walletAddress: string): Promise<string> {
+    const res = await this.client.rest.post<ApiResponse<Nonce>>('/v1/account/nonce', {
       walletAddress
     });
     return res.data.nonce;
@@ -87,7 +101,7 @@ class AccountApi extends ApiGroup {
     const pwd = toUtf8Bytes(username.toLowerCase() + password);
     const salt = toUtf8Bytes('sogni-salt-value');
     const pkey = pbkdf2(pwd, salt, 10000, 32, 'sha256');
-    return new Wallet(pkey, this.provider);
+    return new Wallet(pkey);
   }
 
   /**
@@ -113,7 +127,7 @@ class AccountApi extends ApiGroup {
       turnstileToken
     };
     const signature = await this.eip712.signTypedData(wallet, 'signup', { ...payload, nonce });
-    const res = await this.client.rest.post<ApiReponse<AccountCreateData>>('/v1/account/create', {
+    const res = await this.client.rest.post<ApiResponse<AccountCreateData>>('/v1/account/create', {
       ...payload,
       referralCode,
       signature
@@ -176,7 +190,7 @@ class AccountApi extends ApiGroup {
       walletAddress: wallet.address,
       nonce
     });
-    const res = await this.client.rest.post<ApiReponse<LoginData>>('/v1/account/login', {
+    const res = await this.client.rest.post<ApiResponse<LoginData>>('/v1/account/login', {
       walletAddress: wallet.address,
       signature
     });
@@ -205,18 +219,33 @@ class AccountApi extends ApiGroup {
    * Refresh the balance of the current account.
    *
    * Usually, you don't need to call this method manually. Balance is updated automatically
-   * through WebSocket events. But you can call this method to force a balance refresh.
+   * through WebSocket events. But you can call this method to force a balance refresh. Note that
+   * will also trigger updated event on the current account.
    *
    * @example Refresh user account balance
    * ```typescript
    * const balance = await client.account.refreshBalance();
    * console.log(balance);
-   * // { net: '100.000000', settled: '100.000000', credit: '0.000000', debit: '0.000000' }
    * ```
    */
-  async refreshBalance(): Promise<BalanceData> {
-    const res = await this.client.rest.get<ApiReponse<BalanceData>>('/v1/account/balance');
-    this.currentAccount._update({ balance: res.data });
+  async refreshBalance(): Promise<Balances> {
+    const balance = await this.accountBalance();
+    this.currentAccount._update({ balance: balance });
+    return balance;
+  }
+
+  /**
+   * Get the account balance of the current account.
+   * This method returns the account balance of the current user, including settled, credit, debit, and unclaimed earnings amounts.
+   *
+   * @example Get the account balance of the current user
+   * ```typescript
+   * const balance = await client.account.accountBalance();
+   * console.log(balance);
+   * ```
+   */
+  async accountBalance(): Promise<FullBalances> {
+    const res = await this.client.rest.get<ApiResponse<FullBalances>>('/v3/account/balance');
     return res.data;
   }
 
@@ -236,12 +265,11 @@ class AccountApi extends ApiGroup {
    * @param walletAddress
    */
   async walletBalance(walletAddress: string) {
-    const res = await this.client.rest.get<ApiReponse<{ token: string; ether: string }>>(
-      '/v1/wallet/balance',
-      {
-        walletAddress
-      }
-    );
+    const res = await this.client.rest.get<
+      ApiResponse<{ sogni: string; spark: string; ether: string }>
+    >('/v2/wallet/balance', {
+      walletAddress
+    });
     return res.data;
   }
 
@@ -252,7 +280,7 @@ class AccountApi extends ApiGroup {
    */
   async validateUsername(username: string) {
     try {
-      return await this.client.rest.post<ApiReponse<undefined>>('/v1/account/username/validate', {
+      return await this.client.rest.post<ApiResponse<undefined>>('/v1/account/username/validate', {
         username
       });
     } catch (e) {
@@ -310,11 +338,21 @@ class AccountApi extends ApiGroup {
   async transactionHistory(
     params: TxHistoryParams
   ): Promise<{ entries: TxHistoryEntry[]; next: TxHistoryParams }> {
-    const res = await this.client.rest.get<ApiReponse<TxHistoryData>>('/v1/transactions/list', {
+    const query: Record<string, string> = {
       status: params.status,
       address: params.address,
       limit: params.limit.toString()
-    });
+    };
+    if (params.offset) {
+      query.offset = params.offset.toString();
+    }
+    if (params.provider) {
+      query.provider = params.provider;
+    }
+    const res = await this.client.rest.get<ApiResponse<TxHistoryData>>(
+      '/v1/transactions/list',
+      query
+    );
 
     return {
       entries: res.data.transactions.map(
@@ -326,6 +364,7 @@ class AccountApi extends ApiGroup {
           status: tx.status,
           role: tx.role,
           amount: tx.amount,
+          tokenType: tx.tokenType,
           description: tx.description,
           source: tx.source,
           endTime: new Date(tx.endTime),
@@ -343,9 +382,11 @@ class AccountApi extends ApiGroup {
    * Get the rewards of the current account.
    * @internal
    */
-  async rewards(): Promise<Reward[]> {
-    const r =
-      await this.client.rest.get<ApiReponse<{ rewards: RewardRaw[] }>>('/v2/account/rewards');
+  async rewards(query: RewardsQuery = {}): Promise<Reward[]> {
+    const r = await this.client.rest.get<ApiResponse<{ rewards: RewardRaw[] }>>(
+      '/v4/account/rewards',
+      query
+    );
 
     return r.data.rewards.map(
       (raw: RewardRaw): Reward => ({
@@ -354,9 +395,11 @@ class AccountApi extends ApiGroup {
         title: raw.title,
         description: raw.description,
         amount: raw.amount,
+        tokenType: raw.tokenType,
         claimed: !!raw.claimed,
         canClaim: !!raw.canClaim,
         lastClaim: new Date(raw.lastClaimTimestamp * 1000),
+        provider: query.provider || 'base',
         nextClaim:
           raw.lastClaimTimestamp && raw.claimResetFrequencySec > -1
             ? new Date(raw.lastClaimTimestamp * 1000 + raw.claimResetFrequencySec * 1000)
@@ -369,13 +412,22 @@ class AccountApi extends ApiGroup {
    * Claim rewards by reward IDs.
    * @internal
    * @param rewardIds
-   * @param turnstileToken - Turnstile token, required to claim rewards
+   * @param options - Options for claiming rewards
+   * @param options.turnstileToken - Turnstile token for anti-bot protection
+   * @param options.provider - Provider name for the rewards
    */
-  async claimRewards(rewardIds: string[], turnstileToken?: string): Promise<void> {
-    await this.client.rest.post('/v2/account/reward/claim', {
+  async claimRewards(
+    rewardIds: string[],
+    { turnstileToken, provider }: ClaimOptions = {}
+  ): Promise<void> {
+    const payload: Record<string, any> = {
       claims: rewardIds,
-      turnstileToken
-    });
+      provider: provider || 'base'
+    };
+    if (turnstileToken) {
+      payload.turnstileToken = turnstileToken;
+    }
+    await this.client.rest.post('/v3/account/reward/claim', payload);
   }
 
   /**
@@ -388,7 +440,7 @@ class AccountApi extends ApiGroup {
    * @param password - account password
    * @param amount - amount of tokens to withdraw from account to wallet
    */
-  async withdraw(password: string, amount: number): Promise<void> {
+  async withdraw(password: string, amount: number | string): Promise<void> {
     const wallet = this.getWallet(this.currentAccount.username!, password);
     const walletAddress = wallet.address;
     const nonce = await this.getNonce(walletAddress);
@@ -396,6 +448,13 @@ class AccountApi extends ApiGroup {
       walletAddress: walletAddress,
       amount: parseEther(amount.toString()).toString()
     };
+    if (walletAddress !== this.currentAccount.walletAddress) {
+      throw new ApiError(400, {
+        status: 'error',
+        message: 'Incorrect password',
+        errorCode: 0
+      });
+    }
     const signature = await this.eip712.signTypedData(wallet, 'withdraw', { ...payload, nonce });
     await this.client.rest.post('/v1/account/token/withdraw', {
       ...payload,
@@ -413,35 +472,80 @@ class AccountApi extends ApiGroup {
    * @param password - account password
    * @param amount - amount to transfer
    */
-  async deposit(password: string, amount: number): Promise<void> {
+  async deposit(password: string, amount: number | string): Promise<void> {
+    return this._deposit(password, amount, 1);
+  }
+
+  private async _deposit(
+    password: string,
+    amount: number | string,
+    attemptCount: number = 1
+  ): Promise<void> {
     const wallet = this.getWallet(this.currentAccount.username!, password);
-    const walletAddress = wallet.address;
-    const nonce = await this.getNonce(walletAddress);
-    const payload = {
-      walletAddress,
-      amount: parseEther(amount.toString()).toString()
-    };
-    const { data } = await this.client.rest.post<ApiReponse<any>>(
-      '/v1/account/token/deposit/permit',
-      payload
+    if (wallet.address !== this.currentAccount.walletAddress) {
+      throw new ApiError(400, {
+        status: 'error',
+        message: 'Incorrect password',
+        errorCode: 0
+      });
+    }
+    try {
+      await this.client.rest.post('/v3/account/token/deposit', {
+        walletAddress: wallet.address,
+        amount: parseEther(amount.toString()).toString(),
+        provider: 'base'
+      });
+    } catch (error) {
+      if (error instanceof ApiError) {
+        if (error.payload.errorCode === ErrorCode.INSUFFICIENT_ALLOWANCE) {
+          // If this is the first attempt, we need to approve the token usage,
+          // otherwise we can retry the deposit directly.
+          if (attemptCount === 1) {
+            await this.approveTokenUsage(password, 'account');
+          }
+          if (attemptCount >= MAX_DEPOSIT_ATTEMPTS) {
+            throw error;
+          }
+          await delay(10000); // Wait for the approval transaction to be processed
+          await this._deposit(password, amount, attemptCount + 1);
+          return;
+        }
+        throw error;
+      }
+      throw error;
+    }
+  }
+
+  /**
+   * Approve SOGNI token usage for the specified spender.
+   * @internal
+   *
+   * @param password - user account password
+   * @param spender - Spender type, either 'account' for deposit or 'staker' for staking contract
+   * @param provider - Provider name, defaults to 'base', can be 'base', 'etherlink', etc.
+   */
+  async approveTokenUsage(
+    password: string,
+    spender: 'account' | 'staker',
+    provider: string = 'base'
+  ): Promise<void> {
+    const wallet = this.getWallet(this.currentAccount.username!, password);
+    const permitR = await this.client.rest.post<{ data: Record<string, any> }>(
+      '/v1/contract/token/approve/permit',
+      {
+        walletAddress: wallet.address,
+        spender: spender,
+        provider: provider
+      }
     );
-    const { deadline } = data.message;
-    const permitSig = await wallet.signTypedData(data.domain, data.types, data.message);
-    const permitSignature = Signature.from(permitSig);
-    const depositPayload = {
-      ...payload,
-      deadline,
-      v: permitSignature.v,
-      r: permitSignature.r,
-      s: permitSignature.s
-    };
-    const depositSignature = await this.eip712.signTypedData(wallet, 'deposit', {
-      ...depositPayload,
-      nonce
-    });
-    await this.client.rest.post('/v1/account/token/deposit', {
-      ...depositPayload,
-      signature: depositSignature
+    const { domain, types, message } = permitR.data;
+    const signature = await wallet.signTypedData(domain, types, message);
+    await this.client.rest.post('/v1/contract/token/approve', {
+      walletAddress: wallet.address,
+      spender: spender,
+      provider: provider,
+      deadline: message.deadline,
+      approveSignature: signature
     });
   }
 }