@portal-hq/provider 0.3.3 → 0.3.5

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', mpcVersion = 'v1', gatewayConfig = {}, }) {
+    apiUrl = 'api.portalhq.io', autoApprove = false, mpcUrl = 'mpc.portalhq.io', mpcVersion = 'v2', gatewayConfig = {}, }) {
         // Handle required fields
         if (!apiKey || apiKey.length === 0) {
             throw new utils_1.InvalidApiKeyError();
@@ -364,7 +364,27 @@ class Provider {
                 case 'eth_signTransaction':
                 case 'eth_signTypedData':
                 case 'personal_sign':
-                    return yield ((_a = this.signer) === null || _a === void 0 ? void 0 : _a.sign({ chainId: this.chainId, method, params }, this));
+                    const result = yield ((_a = this.signer) === null || _a === void 0 ? void 0 : _a.sign({ chainId: this.chainId, method, params }, this));
+                    if (result) {
+                        try {
+                            yield this.portal.post('/api/v1/analytics/track', {
+                                headers: {
+                                    Authentication: `Bearer ${this.apiKey}`,
+                                },
+                                body: {
+                                    event: utils_1.Events.TransactionSigned,
+                                    properties: {
+                                        method,
+                                    },
+                                },
+                            });
+                        }
+                        catch (error) {
+                            // Do nothing, because we don't want metrics gathering
+                            // to block the SDK
+                        }
+                    }
+                    return result;
                 default:
                     throw new Error('[PortalProvider] Method "' + method + '" not supported');
             }

package/lib/commonjs/signers/mpc.js

@@ -12,8 +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({ keychain, mpcUrl, mpcVersion = 'v1' }) {
-        this.mpcVersion = 'v1';
+    constructor({ keychain, mpcUrl, mpcVersion = 'v2' }) {
+        this.mpcVersion = 'v2';
         this.buildParams = (method, txParams) => {
             let params = txParams;
             switch (method) {
@@ -66,8 +66,8 @@ class MpcSigner {
             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(), this.mpcVersion);
             const { data, error } = JSON.parse(String(result));
-            if (error && error.length) {
-                throw new utils_1.MpcSigningError(error);
+            if (error && error.code > 0) {
+                throw new utils_1.PortalMpcError(error);
             }
             return data;
         });

package/lib/esm/providers/index.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { HttpRequester, InvalidApiKeyError, InvalidChainIdError, InvalidGatewayConfigError, ProviderRpcError, RpcErrorCodes, } from '@portal-hq/utils';
+import { Events, HttpRequester, InvalidApiKeyError, InvalidChainIdError, InvalidGatewayConfigError, ProviderRpcError, RpcErrorCodes, } from '@portal-hq/utils';
 import { MpcSigner } from '../signers';
 const passiveSignerMethods = [
     'eth_accounts',
@@ -29,7 +29,7 @@ class Provider {
     // Required options
     apiKey, chainId, keychain, 
     // Optional options
-    apiUrl = 'api.portalhq.io', autoApprove = false, mpcUrl = 'mpc.portalhq.io', mpcVersion = 'v1', gatewayConfig = {}, }) {
+    apiUrl = 'api.portalhq.io', autoApprove = false, mpcUrl = 'mpc.portalhq.io', mpcVersion = 'v2', gatewayConfig = {}, }) {
         // Handle required fields
         if (!apiKey || apiKey.length === 0) {
             throw new InvalidApiKeyError();
@@ -362,7 +362,27 @@ class Provider {
                 case 'eth_signTransaction':
                 case 'eth_signTypedData':
                 case 'personal_sign':
-                    return yield ((_a = this.signer) === null || _a === void 0 ? void 0 : _a.sign({ chainId: this.chainId, method, params }, this));
+                    const result = yield ((_a = this.signer) === null || _a === void 0 ? void 0 : _a.sign({ chainId: this.chainId, method, params }, this));
+                    if (result) {
+                        try {
+                            yield this.portal.post('/api/v1/analytics/track', {
+                                headers: {
+                                    Authentication: `Bearer ${this.apiKey}`,
+                                },
+                                body: {
+                                    event: Events.TransactionSigned,
+                                    properties: {
+                                        method,
+                                    },
+                                },
+                            });
+                        }
+                        catch (error) {
+                            // Do nothing, because we don't want metrics gathering
+                            // to block the SDK
+                        }
+                    }
+                    return result;
                 default:
                     throw new Error('[PortalProvider] Method "' + method + '" not supported');
             }

package/lib/esm/signers/mpc.js

@@ -8,10 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { NativeModules } from 'react-native';
-import { MpcSigningError, } from '@portal-hq/utils';
+import { PortalMpcError, } from '@portal-hq/utils';
 class MpcSigner {
-    constructor({ keychain, mpcUrl, mpcVersion = 'v1' }) {
-        this.mpcVersion = 'v1';
+    constructor({ keychain, mpcUrl, mpcVersion = 'v2' }) {
+        this.mpcVersion = 'v2';
         this.buildParams = (method, txParams) => {
             let params = txParams;
             switch (method) {
@@ -64,8 +64,8 @@ class MpcSigner {
             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(), this.mpcVersion);
             const { data, error } = JSON.parse(String(result));
-            if (error && error.length) {
-                throw new MpcSigningError(error);
+            if (error && error.code > 0) {
+                throw new PortalMpcError(error);
             }
             return data;
         });

package/package.json

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

package/src/providers/index.ts

@@ -1,4 +1,5 @@
 import {
+  Events,
   HttpRequester,
   InvalidApiKeyError,
   InvalidChainIdError,
@@ -65,7 +66,7 @@ class Provider {
     apiUrl = 'api.portalhq.io',
     autoApprove = false,
     mpcUrl = 'mpc.portalhq.io',
-    mpcVersion = 'v1',
+    mpcVersion = 'v2',
     gatewayConfig = {},
   }: ProviderOptions) {
     // Handle required fields
@@ -471,10 +472,31 @@ class Provider {
       case 'eth_signTransaction':
       case 'eth_signTypedData':
       case 'personal_sign':
-        return await this.signer?.sign(
+        const result = await this.signer?.sign(
           { chainId: this.chainId, method, params },
           this,
         )
+
+        if (result) {
+          try {
+            await this.portal.post('/api/v1/analytics/track', {
+              headers: {
+                Authentication: `Bearer ${this.apiKey}`,
+              },
+              body: {
+                event: Events.TransactionSigned,
+                properties: {
+                  method,
+                },
+              },
+            })
+          } catch (error) {
+            // Do nothing, because we don't want metrics gathering
+            // to block the SDK
+          }
+        }
+
+        return result
       default:
         throw new Error(
           '[PortalProvider] Method "' + method + '" not supported',

package/src/signers/mpc.ts

@@ -1,7 +1,7 @@
 import { NativeModules } from 'react-native'
 import {
   KeychainAdapter,
-  MpcSigningError,
+  PortalMpcError,
   type SigningRequestArguments,
 } from '@portal-hq/utils'
 
@@ -20,9 +20,9 @@ class MpcSigner implements Signer {
   public address?: string
   public keychain: KeychainAdapter
   public mpcUrl: string // should we add a default here mpc.portalhq.io
-  public mpcVersion: string = 'v1'
+  public mpcVersion: string = 'v2'
 
-  constructor({ keychain, mpcUrl, mpcVersion = 'v1' }: MpcSignerOptions) {
+  constructor({ keychain, mpcUrl, mpcVersion = 'v2' }: MpcSignerOptions) {
     this.keychain = keychain
     this.mpc = NativeModules.PortalMobileMpc
     this.mpcUrl = mpcUrl
@@ -77,13 +77,13 @@ class MpcSigner implements Signer {
       JSON.stringify(this.buildParams(method, params)),
       provider.rpcUrl,
       provider.chainId.toString(),
-      this.mpcVersion
+      this.mpcVersion,
     )
 
     const { data, error } = JSON.parse(String(result)) as SigningResponse
 
-    if (error && error.length) {
-      throw new MpcSigningError(error as string)
+    if (error && error.code > 0) {
+      throw new PortalMpcError(error)
     }
 
     return data

package/types.d.ts

@@ -1,6 +1,6 @@
 // Types
 
-import { KeychainAdapter } from '@portal-hq/utils'
+import { KeychainAdapter, type PortalError } from '@portal-hq/utils'
 
 export type EventHandler = (data: any) => void
 
@@ -21,13 +21,17 @@ export interface MpcSignerOptions extends SignerOptions {
 }
 
 export interface PortalMobileMpc {
-  generate: (clientApiKey: string, mpcApiUrl: string, mpcVersion: string) => Promise<string>
+  generate: (
+    clientApiKey: string,
+    mpcApiUrl: string,
+    mpcVersion: string,
+  ) => Promise<string>
   rotate: (
     clientApiKey: string,
     mpcApiUrl: string,
     isSim: boolean,
     dkgResult?: string,
-    mpcVersion: string
+    mpcVersion: string,
   ) => Promise<string>
   sign: (
     clientApiKey: string,
@@ -37,7 +41,7 @@ export interface PortalMobileMpc {
     requestId: string,
     mpcUrl: string,
     chainId: string,
-    mpcVersion: string
+    mpcVersion: string,
   ) => Promise<string>
 }
 
@@ -71,7 +75,7 @@ export interface SignResult {
   S: string
 }
 
-export interface SignerOptions { }
+export interface SignerOptions {}
 
 export interface Eip1559 {
   gasLimit?: string
@@ -90,7 +94,7 @@ export type SigningRequestParams = Eip1559 | LegacyTx
 
 export interface SigningResponse {
   data: string
-  error?: string
+  error: PortalError
 }
 
 export interface SwitchEthereumChainParameter {