@portal-hq/provider 0.2.33 → 0.3.0

package/lib/commonjs/providers/index.js

@@ -31,7 +31,7 @@ class Provider {
     // Required options
     apiKey, chainId, keychain, 
     // Optional options
-    apiUrl = 'api.portalhq.io', autoApprove = false, mpcUrl = 'mpc.portalhq.io', gatewayConfig = {}, }) {
+    apiUrl = 'api.portalhq.io', autoApprove = false, mpcUrl = 'mpc.portalhq.io', mpcVersion = 'v1', gatewayConfig = {}, }) {
         // Handle required fields
         if (!apiKey || apiKey.length === 0) {
             throw new utils_1.InvalidApiKeyError();
@@ -54,6 +54,7 @@ class Provider {
         this.keychain = keychain;
         this.mpcUrl = mpcUrl;
         this.rpcUrl = this.getRpcUrl();
+        this.mpcVersion = mpcVersion;
         // Add a logger
         this.log = console;
         // Initialize Portal API HttpRequester

package/lib/commonjs/signers/mpc.js

@@ -12,7 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const react_native_1 = require("react-native");
 const utils_1 = require("@portal-hq/utils");
 class MpcSigner {
-    constructor(opts) {
+    constructor({ keychain, mpcUrl, mpcVersion = 'v1' }) {
+        this.mpcVersion = 'v1';
         this.buildParams = (method, txParams) => {
             let params = txParams;
             switch (method) {
@@ -29,9 +30,10 @@ class MpcSigner {
             }
             return params;
         };
-        this.keychain = opts.keychain;
+        this.keychain = keychain;
         this.mpc = react_native_1.NativeModules.PortalMobileMpc;
-        this.mpcUrl = opts.mpcUrl;
+        this.mpcUrl = mpcUrl;
+        this.mpcVersion = mpcVersion;
         if (!this.mpc) {
             throw new Error(`[Portal.Provider.MpcSigner] The MPC module could not be found by the signer. This is usually an issue with React Native linking. Please verify that the 'PortalReactNative' module is properly linked to this project.`);
         }
@@ -62,7 +64,7 @@ class MpcSigner {
                     break;
             }
             const dkg = yield this.keychain.getDkgResult();
-            const result = yield this.mpc.sign(apiKey, this.mpcUrl, dkg, message.method, JSON.stringify(this.buildParams(method, params)), provider.rpcUrl, provider.chainId.toString());
+            const result = yield this.mpc.sign(apiKey, this.mpcUrl, dkg, message.method, JSON.stringify(this.buildParams(method, params)), provider.rpcUrl, provider.chainId.toString(), this.mpcVersion);
             const { data, error } = JSON.parse(String(result));
             if (error && error.length) {
                 throw new utils_1.MpcSigningError(error);

package/lib/esm/providers/index.js

@@ -29,7 +29,7 @@ class Provider {
     // Required options
     apiKey, chainId, keychain, 
     // Optional options
-    apiUrl = 'api.portalhq.io', autoApprove = false, mpcUrl = 'mpc.portalhq.io', gatewayConfig = {}, }) {
+    apiUrl = 'api.portalhq.io', autoApprove = false, mpcUrl = 'mpc.portalhq.io', mpcVersion = 'v1', gatewayConfig = {}, }) {
         // Handle required fields
         if (!apiKey || apiKey.length === 0) {
             throw new InvalidApiKeyError();
@@ -52,6 +52,7 @@ class Provider {
         this.keychain = keychain;
         this.mpcUrl = mpcUrl;
         this.rpcUrl = this.getRpcUrl();
+        this.mpcVersion = mpcVersion;
         // Add a logger
         this.log = console;
         // Initialize Portal API HttpRequester

package/lib/esm/signers/mpc.js

@@ -10,7 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { NativeModules } from 'react-native';
 import { MpcSigningError, } from '@portal-hq/utils';
 class MpcSigner {
-    constructor(opts) {
+    constructor({ keychain, mpcUrl, mpcVersion = 'v1' }) {
+        this.mpcVersion = 'v1';
         this.buildParams = (method, txParams) => {
             let params = txParams;
             switch (method) {
@@ -27,9 +28,10 @@ class MpcSigner {
             }
             return params;
         };
-        this.keychain = opts.keychain;
+        this.keychain = keychain;
         this.mpc = NativeModules.PortalMobileMpc;
-        this.mpcUrl = opts.mpcUrl;
+        this.mpcUrl = mpcUrl;
+        this.mpcVersion = mpcVersion;
         if (!this.mpc) {
             throw new Error(`[Portal.Provider.MpcSigner] The MPC module could not be found by the signer. This is usually an issue with React Native linking. Please verify that the 'PortalReactNative' module is properly linked to this project.`);
         }
@@ -60,7 +62,7 @@ class MpcSigner {
                     break;
             }
             const dkg = yield this.keychain.getDkgResult();
-            const result = yield this.mpc.sign(apiKey, this.mpcUrl, dkg, message.method, JSON.stringify(this.buildParams(method, params)), provider.rpcUrl, provider.chainId.toString());
+            const result = yield this.mpc.sign(apiKey, this.mpcUrl, dkg, message.method, JSON.stringify(this.buildParams(method, params)), provider.rpcUrl, provider.chainId.toString(), this.mpcVersion);
             const { data, error } = JSON.parse(String(result));
             if (error && error.length) {
                 throw new MpcSigningError(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portal-hq/provider",
-  "version": "0.2.33",
+  "version": "0.3.0",
   "license": "MIT",
   "main": "lib/commonjs/index",
   "module": "lib/esm/index",
@@ -19,7 +19,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@portal-hq/utils": "^0.2.33"
+    "@portal-hq/utils": "^0.3.0"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.18.6",

package/src/providers/index.ts

@@ -53,6 +53,7 @@ class Provider {
   public rpc: HttpRequester
   public rpcUrl: string
   public signer: Signer
+  public mpcVersion: string
 
   constructor({
     // Required options
@@ -64,6 +65,7 @@ class Provider {
     apiUrl = 'api.portalhq.io',
     autoApprove = false,
     mpcUrl = 'mpc.portalhq.io',
+    mpcVersion = 'v1',
     gatewayConfig = {},
   }: ProviderOptions) {
     // Handle required fields
@@ -89,7 +91,7 @@ class Provider {
     this.keychain = keychain
     this.mpcUrl = mpcUrl
     this.rpcUrl = this.getRpcUrl()
-
+    this.mpcVersion = mpcVersion
     // Add a logger
     this.log = console
 

package/src/signers/mpc.ts

@@ -19,12 +19,14 @@ class MpcSigner implements Signer {
 
   public address?: string
   public keychain: KeychainAdapter
-  public mpcUrl: string
+  public mpcUrl: string // should we add a default here mpc.portalhq.io
+  public mpcVersion: string = 'v1'
 
-  constructor(opts: MpcSignerOptions) {
-    this.keychain = opts.keychain
+  constructor({ keychain, mpcUrl, mpcVersion = 'v1' }: MpcSignerOptions) {
+    this.keychain = keychain
     this.mpc = NativeModules.PortalMobileMpc
-    this.mpcUrl = opts.mpcUrl
+    this.mpcUrl = mpcUrl
+    this.mpcVersion = mpcVersion
 
     if (!this.mpc) {
       throw new Error(
@@ -75,6 +77,7 @@ class MpcSigner implements Signer {
       JSON.stringify(this.buildParams(method, params)),
       provider.rpcUrl,
       provider.chainId.toString(),
+      this.mpcVersion
     )
 
     const { data, error } = JSON.parse(String(result)) as SigningResponse

package/types.d.ts

@@ -17,15 +17,17 @@ export interface GatewayConfig {
 export interface MpcSignerOptions extends SignerOptions {
   keychain: KeychainAdapter
   mpcUrl: string
+  mpcVersion?: string
 }
 
 export interface PortalMobileMpc {
-  generate: (clientApiKey: string, mpcApiUrl: string) => Promise<string>
+  generate: (clientApiKey: string, mpcApiUrl: string, mpcVersion: string) => Promise<string>
   rotate: (
     clientApiKey: string,
     mpcApiUrl: string,
     isSim: boolean,
     dkgResult?: string,
+    mpcVersion: string
   ) => Promise<string>
   sign: (
     clientApiKey: string,
@@ -35,6 +37,7 @@ export interface PortalMobileMpc {
     requestId: string,
     mpcUrl: string,
     chainId: string,
+    mpcVersion: string
   ) => Promise<string>
 }
 
@@ -50,6 +53,7 @@ export interface ProviderOptions {
   autoApprove?: boolean
   enableMpc?: boolean
   mpcUrl?: string
+  mpcVersion?: string
 }
 
 export interface RegisteredEventHandler {