@portal-hq/provider 2.0.4 → 2.0.7

package/lib/commonjs/providers/index.js

@@ -107,6 +107,7 @@ class Provider {
             return this.gatewayConfig;
         }
         else if (typeof this.gatewayConfig === 'object' &&
+            // eslint-disable-next-line no-prototype-builtins
             !this.gatewayConfig.hasOwnProperty(this.chainId)) {
             // If there's no explicit mapping for the current chainId, error out
             throw new Error(`[PortalProvider] No RPC endpoint configured for chainId: ${this.chainId}`);
@@ -258,7 +259,7 @@ class Provider {
             }
             // Dispatch 'connect' event
             this.dispatchConnect();
-            return this;
+            return new Promise((resolve) => resolve(this));
         });
     }
     /**
@@ -321,10 +322,8 @@ class Provider {
         });
     }
     dispatchConnect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.emit('connect', {
-                chainId: `0x${this.chainId.toString(16)}`,
-            });
+        this.emit('connect', {
+            chainId: `0x${this.chainId.toString(16)}`,
         });
     }
     /**
@@ -372,7 +371,7 @@ class Provider {
                 case 'eth_signTransaction':
                 case 'eth_signTypedData_v3':
                 case 'eth_signTypedData_v4':
-                case 'personal_sign':
+                case 'personal_sign': {
                     const result = yield ((_a = this.signer) === null || _a === void 0 ? void 0 : _a.sign({ chainId: this.chainId, method, params }, this));
                     if (result) {
                         try {
@@ -394,6 +393,7 @@ class Provider {
                         }
                     }
                     return result;
+                }
                 default:
                     throw new Error('[PortalProvider] Method "' + method + '" not supported');
             }

package/lib/commonjs/signers/abstract.js

@@ -1,19 +1,8 @@
 "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 });
 class Signer {
     sign(_, __) {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error('[Portal] sign() method must be implemented in a subclass of Signer');
-        });
+        throw new Error('[Portal] sign() method must be implemented in a subclass of Signer');
     }
 }
 exports.default = Signer;

package/lib/commonjs/signers/mpc.js

@@ -62,12 +62,13 @@ class MpcSigner {
                     break;
             }
             const signingShare = yield this.signingShare;
-            const metadata = JSON.stringify({
+            const metadata = {
                 clientPlatform: 'REACT_NATIVE',
                 mpcServerVersion: this.version,
                 optimized: this.featureFlags.optimized,
-            });
-            const result = yield this.mpc.sign(apiKey, this.mpcHost, signingShare, message.method, JSON.stringify(this.buildParams(method, params)), provider.gatewayUrl, provider.chainId.toString(), metadata);
+            };
+            const stringifiedMetadata = JSON.stringify(metadata);
+            const result = yield this.mpc.sign(apiKey, this.mpcHost, signingShare, message.method, JSON.stringify(this.buildParams(method, params)), provider.gatewayUrl, provider.chainId.toString(), stringifiedMetadata);
             const { data, error } = JSON.parse(String(result));
             if (error && error.code > 0) {
                 throw new utils_1.PortalMpcError(error);

package/lib/esm/providers/index.js

@@ -105,6 +105,7 @@ class Provider {
             return this.gatewayConfig;
         }
         else if (typeof this.gatewayConfig === 'object' &&
+            // eslint-disable-next-line no-prototype-builtins
             !this.gatewayConfig.hasOwnProperty(this.chainId)) {
             // If there's no explicit mapping for the current chainId, error out
             throw new Error(`[PortalProvider] No RPC endpoint configured for chainId: ${this.chainId}`);
@@ -256,7 +257,7 @@ class Provider {
             }
             // Dispatch 'connect' event
             this.dispatchConnect();
-            return this;
+            return new Promise((resolve) => resolve(this));
         });
     }
     /**
@@ -319,10 +320,8 @@ class Provider {
         });
     }
     dispatchConnect() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.emit('connect', {
-                chainId: `0x${this.chainId.toString(16)}`,
-            });
+        this.emit('connect', {
+            chainId: `0x${this.chainId.toString(16)}`,
         });
     }
     /**
@@ -370,7 +369,7 @@ class Provider {
                 case 'eth_signTransaction':
                 case 'eth_signTypedData_v3':
                 case 'eth_signTypedData_v4':
-                case 'personal_sign':
+                case 'personal_sign': {
                     const result = yield ((_a = this.signer) === null || _a === void 0 ? void 0 : _a.sign({ chainId: this.chainId, method, params }, this));
                     if (result) {
                         try {
@@ -392,6 +391,7 @@ class Provider {
                         }
                     }
                     return result;
+                }
                 default:
                     throw new Error('[PortalProvider] Method "' + method + '" not supported');
             }

package/lib/esm/signers/abstract.js

@@ -1,17 +1,6 @@
-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());
-    });
-};
 class Signer {
     sign(_, __) {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error('[Portal] sign() method must be implemented in a subclass of Signer');
-        });
+        throw new Error('[Portal] sign() method must be implemented in a subclass of Signer');
     }
 }
 export default Signer;

package/lib/esm/signers/mpc.js

@@ -60,12 +60,13 @@ class MpcSigner {
                     break;
             }
             const signingShare = yield this.signingShare;
-            const metadata = JSON.stringify({
+            const metadata = {
                 clientPlatform: 'REACT_NATIVE',
                 mpcServerVersion: this.version,
                 optimized: this.featureFlags.optimized,
-            });
-            const result = yield this.mpc.sign(apiKey, this.mpcHost, signingShare, message.method, JSON.stringify(this.buildParams(method, params)), provider.gatewayUrl, provider.chainId.toString(), metadata);
+            };
+            const stringifiedMetadata = JSON.stringify(metadata);
+            const result = yield this.mpc.sign(apiKey, this.mpcHost, signingShare, message.method, JSON.stringify(this.buildParams(method, params)), provider.gatewayUrl, provider.chainId.toString(), stringifiedMetadata);
             const { data, error } = JSON.parse(String(result));
             if (error && error.code > 0) {
                 throw new PortalMpcError(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portal-hq/provider",
-  "version": "2.0.4",
+  "version": "2.0.7",
   "license": "MIT",
   "main": "lib/commonjs/index",
   "module": "lib/esm/index",
@@ -19,8 +19,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@portal-hq/connect": "^2.0.4",
-    "@portal-hq/utils": "^2.0.4"
+    "@portal-hq/connect": "^2.0.7",
+    "@portal-hq/utils": "^2.0.7"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.18.6",
@@ -30,5 +30,5 @@
     "ts-jest": "^29.0.3",
     "typescript": "^4.8.4"
   },
-  "gitHead": "2d2f1ef628bc8788fa4a9cd32cc44795e547b3a7"
+  "gitHead": "fdd0c978b9d62ff729189eae6664dafb039dc1fa"
 }

package/src/providers/index.ts

@@ -20,6 +20,7 @@ import {
   type SwitchEthereumChainParameter,
 } from '../../types'
 import PortalConnect from '@portal-hq/connect'
+import { RpcErrorOptions } from '@portal-hq/utils/types'
 
 const passiveSignerMethods = [
   'eth_accounts',
@@ -154,11 +155,12 @@ class Provider implements IPortalProvider {
       return this.gatewayConfig
     } else if (
       typeof this.gatewayConfig === 'object' &&
+      // eslint-disable-next-line no-prototype-builtins
       !this.gatewayConfig.hasOwnProperty(this.chainId)
     ) {
       // If there's no explicit mapping for the current chainId, error out
       throw new Error(
-        `[PortalProvider] No RPC endpoint configured for chainId: ${this.chainId}`,
+        `[PortalProvider] No RPC endpoint configured for chainId: ${this.chainId}`
       )
     }
 
@@ -171,7 +173,7 @@ class Provider implements IPortalProvider {
 
     // If we got this far, there's no way to support the chain with the current config
     throw new Error(
-      `[PortalProvider] Could not find a valid gatewayConfig entry for chainId: ${this.chainId}`,
+      `[PortalProvider] Could not find a valid gatewayConfig entry for chainId: ${this.chainId}`
     )
   }
 
@@ -225,7 +227,7 @@ class Provider implements IPortalProvider {
 
   public removeEventListener(
     event: string,
-    listenerToRemove?: EventHandler,
+    listenerToRemove?: EventHandler
   ): void {
     if (!this.events[event]) {
       return
@@ -235,7 +237,7 @@ class Provider implements IPortalProvider {
       this.events[event] = []
     } else {
       const filterEventHandlers = (
-        registeredEventHandler: RegisteredEventHandler,
+        registeredEventHandler: RegisteredEventHandler
       ) => {
         return registeredEventHandler.handler !== listenerToRemove
       }
@@ -275,7 +277,7 @@ class Provider implements IPortalProvider {
       })
 
       if (response.error) {
-        throw new ProviderRpcError(response.error)
+        throw new ProviderRpcError(response.error as RpcErrorOptions)
       }
 
       result = response.result
@@ -320,7 +322,7 @@ class Provider implements IPortalProvider {
    */
   public async setChainId(
     chainId: number,
-    connect?: PortalConnect,
+    connect?: PortalConnect
   ): Promise<Provider> {
     // Update the chainId
     this.chainId = chainId
@@ -343,7 +345,7 @@ class Provider implements IPortalProvider {
     // Dispatch 'connect' event
     this.dispatchConnect()
 
-    return this
+    return new Promise((resolve) => resolve(this))
   }
 
   /**
@@ -366,7 +368,7 @@ class Provider implements IPortalProvider {
 
     if (!connect && (!signingHandlers || signingHandlers.length === 0)) {
       throw new Error(
-        `[PortalProvider] Auto-approve is disabled. Cannot perform Provider signing requests without an event handler for the 'portal_signingRequested' event.`,
+        `[PortalProvider] Auto-approve is disabled. Cannot perform Provider signing requests without an event handler for the 'portal_signingRequested' event.`
       )
     }
 
@@ -390,7 +392,7 @@ class Provider implements IPortalProvider {
           ) {
             resolve(true)
           }
-        },
+        }
       )
 
       // If the signing request has been rejected, resolve to false
@@ -408,7 +410,7 @@ class Provider implements IPortalProvider {
           ) {
             resolve(false)
           }
-        },
+        }
       )
 
       // Tell any listening clients that signing has been requested
@@ -428,7 +430,7 @@ class Provider implements IPortalProvider {
     })
   }
 
-  private async dispatchConnect(): Promise<void> {
+  private dispatchConnect() {
     this.emit('connect', {
       chainId: `0x${this.chainId.toString(16)}`,
     })
@@ -473,7 +475,7 @@ class Provider implements IPortalProvider {
 
     if (!isApproved) {
       this.log.info(
-        `[PortalProvider] Request for signing method '${method}' could not be completed because it was not approved by the user.`,
+        `[PortalProvider] Request for signing method '${method}' could not be completed because it was not approved by the user.`
       )
       return
     }
@@ -488,10 +490,10 @@ class Provider implements IPortalProvider {
       case 'eth_signTransaction':
       case 'eth_signTypedData_v3':
       case 'eth_signTypedData_v4':
-      case 'personal_sign':
+      case 'personal_sign': {
         const result = await this.signer?.sign(
           { chainId: this.chainId, method, params },
-          this,
+          this
         )
 
         if (result) {
@@ -514,9 +516,10 @@ class Provider implements IPortalProvider {
         }
 
         return result
+      }
       default:
         throw new Error(
-          '[PortalProvider] Method "' + method + '" not supported',
+          '[PortalProvider] Method "' + method + '" not supported'
         )
     }
   }

package/src/signers/abstract.ts

@@ -2,9 +2,9 @@ import { SigningRequestArguments } from '@portal-hq/utils'
 import { type SignResult } from '../../types'
 
 abstract class Signer {
-  public async sign(_: SigningRequestArguments, __?: any): Promise<SignResult> {
+  public sign(_: SigningRequestArguments, __?: any): Promise<SignResult> {
     throw new Error(
-      '[Portal] sign() method must be implemented in a subclass of Signer',
+      '[Portal] sign() method must be implemented in a subclass of Signer'
     )
   }
 }

package/src/signers/mpc.ts

@@ -9,6 +9,7 @@ import {
 import Signer from './abstract'
 
 import {
+  PortalMobileMpcMetadata,
   type MpcSignerOptions,
   type PortalMobileMpc,
   type SigningResponse,
@@ -20,7 +21,7 @@ class MpcSigner implements Signer {
   private keychain: KeychainAdapter
   private mpc: PortalMobileMpc
   private mpcHost: string // should we add a default here mpc.portalhq.io
-  private version: string = 'v4'
+  private version = 'v4'
   private featureFlags: FeatureFlags
 
   private get address(): Promise<string | undefined> {
@@ -47,14 +48,14 @@ class MpcSigner implements Signer {
 
     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.`,
+        `[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.`
       )
     }
   }
 
   public async sign(
     message: SigningRequestArguments,
-    provider: IPortalProvider,
+    provider: IPortalProvider
   ): Promise<any> {
     const address = await this.address
     const apiKey = provider.apiKey
@@ -72,12 +73,12 @@ class MpcSigner implements Signer {
 
     const signingShare = await this.signingShare
 
-    const metadata = JSON.stringify({
+    const metadata: PortalMobileMpcMetadata = {
       clientPlatform: 'REACT_NATIVE',
       mpcServerVersion: this.version,
       optimized: this.featureFlags.optimized,
-    })
-
+    }
+    const stringifiedMetadata = JSON.stringify(metadata)
     const result = await this.mpc.sign(
       apiKey,
       this.mpcHost,
@@ -86,7 +87,7 @@ class MpcSigner implements Signer {
       JSON.stringify(this.buildParams(method, params)),
       provider.gatewayUrl,
       provider.chainId.toString(),
-      metadata,
+      stringifiedMetadata
     )
 
     const { data, error } = JSON.parse(String(result)) as SigningResponse

package/types.d.ts

@@ -35,14 +35,14 @@ export interface PortalMobileMpc {
   generate: (
     clientApiKey: string,
     mpcApiUrl: string,
-    metadata: string,
+    metadata: string
   ) => Promise<string>
   rotate: (
     clientApiKey: string,
     mpcApiUrl: string,
     isSim: boolean,
     dkgResult?: string,
-    metadata: string,
+    metadata: string
   ) => Promise<string>
   sign: (
     clientApiKey: string,
@@ -52,7 +52,7 @@ export interface PortalMobileMpc {
     requestId: string,
     mpcUrl: string,
     chainId: string,
-    metadata: string,
+    metadata: string
   ) => Promise<string>
 }