fix: upgrade polkadot sdk version

CHANGELOG.md

@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - [\#51](https://github.com/Manta-Network/sdk/pull/51) Update to MantaPay v1
 
 ### Changed
+- [\#156](https://github.com/Manta-Network/sdk/pull/156) Upgrade Polkadot.js SDK version to v10.1.4 and update BaseWallet Api constructor
 - [\#124](https://github.com/Manta-Network/sdk/pull/124) Upgrade manta-rs dependencies to v0.5.15.
 - [\#103](https://github.com/Manta-Network/sdk/pull/103) Update manta-rs to v0.5.12.
 - [\#102](https://github.com/Manta-Network/sdk/pull/102) Include sink accounts in ToPublic. Removes `assetIdToUInt8Array` function as it encodes values < 255 incorrectly, now changed to use polkadot.js utility function.

manta-js/docs/how-to-use-manta-js-sdk.md

@@ -26,16 +26,14 @@ export type GetStorageStateFromLocal = (
 
 export interface IBaseWallet {
   api: ApiPromise;
-  apiEndpoint: string | string[];
-  apiTimeout: number;
   wasm: any;
   loggingEnabled: boolean;
   fullParameters: any;
   multiProvingContext: any;
   saveStorageStateToLocal: SaveStorageStateToLocal;
   getStorageStateFromLocal: GetStorageStateFromLocal;
   walletIsBusy: boolean;
-  updateApi(apiEndpoint: string | string[], apiTimeout?: number): ApiPromise;
+  updateApi(api: string | string[] | ApiPromise, apiTimeout?: number): ApiPromise;
   disconnectApi(): Promise<boolean>;
   log(message: string, name?: string): void;
 }

manta-js/package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manta-extension-sdk",
-  "version": "1.2.2",
+  "version": "1.5.0-beta.0",
   "description": "manta.js sdk",
   "main": "./dist/browser/index.js",
   "exports": {
@@ -28,10 +28,10 @@
     "build-all": "yarn clean && yarn build-browser && yarn build-node"
   },
   "dependencies": {
-    "@polkadot/api": "^10.1.4",
-    "@polkadot/types": "^10.1.4",
-    "@polkadot/util": "^11.1.1",
-    "@polkadot/util-crypto": "^11.1.1",
+    "@polkadot/api": "^12.1.1",
+    "@polkadot/types": "^12.1.1",
+    "@polkadot/util": "^12.6.2",
+    "@polkadot/util-crypto": "^12.6.2",
     "bn.js": "^5.2.0",
     "manta-scale-codec": "^0.11.0-beta.1"
   },

manta-js/package/src/BaseWallet.ts

@@ -14,8 +14,6 @@ import TaskSchedule, { TaskTimeoutError } from './utils/TaskSchedule';
 
 export default class BaseWallet implements IBaseWallet {
   api: ApiPromise;
-  apiEndpoint: string | string[];
-  apiTimeout: number;
   wasm: any;
   loggingEnabled: boolean;
   fullParameters: any;
@@ -28,7 +26,7 @@ export default class BaseWallet implements IBaseWallet {
 
   constructor(
     wasm: any,
-    apiEndpoint: string | string[],
+    api: string | string[] | ApiPromise,
     fullParameters: any,
     multiProvingContext: any,
     saveStorageStateToLocal: SaveStorageStateToLocal,
@@ -46,7 +44,7 @@ export default class BaseWallet implements IBaseWallet {
 
     this.taskSchedule = new TaskSchedule();
 
-    this.updateApi(apiEndpoint, apiTimeout, partialApiOptions);
+    this.updateApi(api, apiTimeout, partialApiOptions);
   }
 
   protected static log(
@@ -72,22 +70,24 @@ export default class BaseWallet implements IBaseWallet {
         : apiEndpoint;
       return new HttpProvider(endPoint);
     } else {
-      return new WsProvider(this.apiEndpoint, 2500, {}, apiTimeout);
+      return new WsProvider(apiEndpoint, 2500, {}, apiTimeout);
     }
   }
 
   updateApi(
-    apiEndpoint: string | string[],
+    api: string | string[] | ApiPromise,
     apiTimeout?: number,
     partialApiOptions?: Partial<ApiOptions>,
   ) {
     this.log('Initial api');
 
-    this.apiEndpoint = apiEndpoint;
-    this.apiTimeout = apiTimeout || 60 * 1000;
+    if (api instanceof ApiPromise) {
+      this.api = api;
+      return api;
+    }
 
     this.api = new ApiPromise({
-      provider: this.getApiProvider(apiEndpoint, apiTimeout),
+      provider: this.getApiProvider(api, apiTimeout || 60 * 1000),
       types: mantaConfig.TYPES,
       rpc: mantaConfig.RPC,
       ...partialApiOptions,

manta-js/package/src/index.ts

@@ -3,6 +3,9 @@ import type * as interfaces from './interfaces';
 import BaseWallet from './BaseWallet';
 import PrivateWallet from './PrivateWallet';
 
+import ApiConfig from './config.json';
+
 export * from './pallets';
 export { BaseWallet, PrivateWallet };
+export { ApiConfig };
 export type { interfaces };

manta-js/package/src/interfaces.ts

@@ -58,7 +58,7 @@ export type GetStorageStateFromLocal = (
 ) => Promise<any>;
 
 export type BaseWalletConfig = {
-  apiEndpoint: string | string[];
+  apiEndpoint: string | string[] | ApiPromise;
   apiTimeout?: number;
   loggingEnabled: boolean;
   provingFilePath: string;
@@ -94,8 +94,6 @@ export type UtxoInfo = {
 
 export interface IBaseWallet {
   api: ApiPromise;
-  apiEndpoint: string | string[];
-  apiTimeout: number;
   wasm: any;
   loggingEnabled: boolean;
   fullParameters: any;
@@ -104,7 +102,7 @@ export interface IBaseWallet {
   getStorageStateFromLocal: GetStorageStateFromLocal;
   walletIsBusy: boolean;
   updateApi(
-    apiEndpoint: string | string[],
+    api: string | string[] | ApiPromise,
     apiTimeout?: number,
     partialApiOptions?: Partial<ApiOptions>,
   ): ApiPromise;