@portal-hq/provider 2.0.1 → 2.0.3

package/lib/commonjs/providers/index.js

@@ -181,7 +181,7 @@ class Provider {
      * @param args The arguments of the request being made
      * @returns Promise<any>
      */
-    request({ method, params, connect, }) {
+    request({ method, params, chainId, connect, }) {
         return __awaiter(this, void 0, void 0, function* () {
             if (method === 'eth_chainId') {
                 return this.chainId;
@@ -206,6 +206,7 @@ class Provider {
                 const transactionHash = yield this.handleSigningRequests({
                     method,
                     params,
+                    chainId,
                     connect,
                 });
                 if (transactionHash) {
@@ -249,7 +250,7 @@ class Provider {
             this.emit('chainChanged', {
                 chainId: this.chainId,
             });
-            if (connect) {
+            if (connect && connect.connected) {
                 connect.emit('portalConnect_chainChanged', {
                     chainId: this.chainId,
                 });
@@ -264,7 +265,7 @@ class Provider {
      *
      * @param args The arguments of the request being made
      */
-    getApproval({ method, params, connect, }) {
+    getApproval({ method, params, chainId, connect, }) {
         return __awaiter(this, void 0, void 0, function* () {
             // If autoApprove is enabled, just resolve to true
             if (this.autoApprove) {
@@ -305,12 +306,14 @@ class Provider {
                     connect.emit('portalConnect_signingRequested', {
                         method,
                         params,
+                        chainId,
                     });
                 }
                 else {
                     this.emit('portal_signingRequested', {
                         method,
                         params,
+                        chainId,
                     });
                 }
             });
@@ -348,12 +351,12 @@ class Provider {
      * @param args The arguments of the request being made
      * @returns Promise<any>
      */
-    handleSigningRequests({ method, params, connect, }) {
+    handleSigningRequests({ method, params, chainId, connect, }) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const isApproved = passiveSignerMethods.includes(method)
                 ? true
-                : yield this.getApproval({ method, params, connect });
+                : yield this.getApproval({ method, params, chainId, connect });
             if (!isApproved) {
                 this.log.info(`[PortalProvider] Request for signing method '${method}' could not be completed because it was not approved by the user.`);
                 return;

package/lib/commonjs/signers/mpc.js

@@ -61,7 +61,11 @@ class MpcSigner {
                     break;
             }
             const signingShare = yield this.signingShare;
-            const result = yield this.mpc.sign(apiKey, this.mpcHost, signingShare, message.method, JSON.stringify(this.buildParams(method, params)), provider.gatewayUrl, provider.chainId.toString(), this.version);
+            const metadata = JSON.stringify({
+                clientPlatform: 'REACT_NATIVE',
+                mpcServerVersion: this.version,
+            });
+            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 { data, error } = JSON.parse(String(result));
             if (error && error.code > 0) {
                 throw new utils_1.PortalMpcError(error);

package/lib/esm/providers/index.js

@@ -179,7 +179,7 @@ class Provider {
      * @param args The arguments of the request being made
      * @returns Promise<any>
      */
-    request({ method, params, connect, }) {
+    request({ method, params, chainId, connect, }) {
         return __awaiter(this, void 0, void 0, function* () {
             if (method === 'eth_chainId') {
                 return this.chainId;
@@ -204,6 +204,7 @@ class Provider {
                 const transactionHash = yield this.handleSigningRequests({
                     method,
                     params,
+                    chainId,
                     connect,
                 });
                 if (transactionHash) {
@@ -247,7 +248,7 @@ class Provider {
             this.emit('chainChanged', {
                 chainId: this.chainId,
             });
-            if (connect) {
+            if (connect && connect.connected) {
                 connect.emit('portalConnect_chainChanged', {
                     chainId: this.chainId,
                 });
@@ -262,7 +263,7 @@ class Provider {
      *
      * @param args The arguments of the request being made
      */
-    getApproval({ method, params, connect, }) {
+    getApproval({ method, params, chainId, connect, }) {
         return __awaiter(this, void 0, void 0, function* () {
             // If autoApprove is enabled, just resolve to true
             if (this.autoApprove) {
@@ -303,12 +304,14 @@ class Provider {
                     connect.emit('portalConnect_signingRequested', {
                         method,
                         params,
+                        chainId,
                     });
                 }
                 else {
                     this.emit('portal_signingRequested', {
                         method,
                         params,
+                        chainId,
                     });
                 }
             });
@@ -346,12 +349,12 @@ class Provider {
      * @param args The arguments of the request being made
      * @returns Promise<any>
      */
-    handleSigningRequests({ method, params, connect, }) {
+    handleSigningRequests({ method, params, chainId, connect, }) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const isApproved = passiveSignerMethods.includes(method)
                 ? true
-                : yield this.getApproval({ method, params, connect });
+                : yield this.getApproval({ method, params, chainId, connect });
             if (!isApproved) {
                 this.log.info(`[PortalProvider] Request for signing method '${method}' could not be completed because it was not approved by the user.`);
                 return;

package/lib/esm/signers/mpc.js

@@ -59,7 +59,11 @@ class MpcSigner {
                     break;
             }
             const signingShare = yield this.signingShare;
-            const result = yield this.mpc.sign(apiKey, this.mpcHost, signingShare, message.method, JSON.stringify(this.buildParams(method, params)), provider.gatewayUrl, provider.chainId.toString(), this.version);
+            const metadata = JSON.stringify({
+                clientPlatform: 'REACT_NATIVE',
+                mpcServerVersion: this.version,
+            });
+            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 { 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.1",
+  "version": "2.0.3",
   "license": "MIT",
   "main": "lib/commonjs/index",
   "module": "lib/esm/index",
@@ -19,8 +19,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@portal-hq/connect": "^2.0.1",
-    "@portal-hq/utils": "^2.0.1"
+    "@portal-hq/connect": "^2.0.3",
+    "@portal-hq/utils": "^2.0.3"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.18.6",
@@ -30,5 +30,5 @@
     "ts-jest": "^29.0.3",
     "typescript": "^4.8.4"
   },
-  "gitHead": "95132d009b1a7a08d6c05be9323dd21354c4adf0"
+  "gitHead": "c333fe5280f16a5c5f70b7ae768f112baf7156ba"
 }

package/src/providers/index.ts

@@ -252,6 +252,7 @@ class Provider implements IPortalProvider {
   public async request({
     method,
     params,
+    chainId,
     connect,
   }: RequestArguments): Promise<any> {
     if (method === 'eth_chainId') {
@@ -281,6 +282,7 @@ class Provider implements IPortalProvider {
       const transactionHash = await this.handleSigningRequests({
         method,
         params,
+        chainId,
         connect,
       })
 
@@ -314,7 +316,10 @@ class Provider implements IPortalProvider {
    * @param chainId The numerical ID of the chain to switch to
    * @returns BaseProvider
    */
-  public async setChainId(chainId: number, connect?: PortalConnect): Promise<Provider> {
+  public async setChainId(
+    chainId: number,
+    connect?: PortalConnect,
+  ): Promise<Provider> {
     // Update the chainId
     this.chainId = chainId
 
@@ -328,8 +333,7 @@ class Provider implements IPortalProvider {
       chainId: this.chainId,
     } as SwitchEthereumChainParameter)
 
-
-    if (connect) {
+    if (connect && connect.connected) {
       connect.emit('portalConnect_chainChanged', {
         chainId: this.chainId,
       } as SwitchEthereumChainParameter)
@@ -348,6 +352,7 @@ class Provider implements IPortalProvider {
   protected async getApproval({
     method,
     params,
+    chainId,
     connect,
   }: RequestArguments): Promise<boolean> {
     // If autoApprove is enabled, just resolve to true
@@ -409,11 +414,13 @@ class Provider implements IPortalProvider {
         connect.emit('portalConnect_signingRequested', {
           method,
           params,
+          chainId,
         })
       } else {
         this.emit('portal_signingRequested', {
           method,
           params,
+          chainId,
         })
       }
     })
@@ -455,11 +462,12 @@ class Provider implements IPortalProvider {
   private async handleSigningRequests({
     method,
     params,
+    chainId,
     connect,
   }: RequestArguments): Promise<any> {
     const isApproved = passiveSignerMethods.includes(method)
       ? true
-      : await this.getApproval({ method, params, connect })
+      : await this.getApproval({ method, params, chainId, connect })
 
     if (!isApproved) {
       this.log.info(

package/src/signers/mpc.ts

@@ -68,6 +68,11 @@ class MpcSigner implements Signer {
 
     const signingShare = await this.signingShare
 
+    const metadata = JSON.stringify({
+      clientPlatform: 'REACT_NATIVE',
+      mpcServerVersion: this.version,
+    })
+
     const result = await this.mpc.sign(
       apiKey,
       this.mpcHost,
@@ -76,7 +81,7 @@ class MpcSigner implements Signer {
       JSON.stringify(this.buildParams(method, params)),
       provider.gatewayUrl,
       provider.chainId.toString(),
-      this.version,
+      metadata,
     )
 
     const { data, error } = JSON.parse(String(result)) as SigningResponse

package/types.d.ts

@@ -24,18 +24,23 @@ export interface MpcSignerOptions extends SignerOptions {
   version?: string
 }
 
+export interface PortalMobileMpcMetadata {
+  clientPlatform: string
+  mpcServerVersion: string
+}
+
 export interface PortalMobileMpc {
   generate: (
     clientApiKey: string,
     mpcApiUrl: string,
-    mpcVersion: string,
+    metadata: string,
   ) => Promise<string>
   rotate: (
     clientApiKey: string,
     mpcApiUrl: string,
     isSim: boolean,
     dkgResult?: string,
-    mpcVersion: string,
+    metadata: string,
   ) => Promise<string>
   sign: (
     clientApiKey: string,
@@ -45,7 +50,7 @@ export interface PortalMobileMpc {
     requestId: string,
     mpcUrl: string,
     chainId: string,
-    mpcVersion: string,
+    metadata: string,
   ) => Promise<string>
 }