@portal-hq/web 2.0.1 → 3.0.1

package/lib/esm/mpc/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { PortalMpcError } from './errors';
 import { BackupMethods } from '../index';
-const WEB_SDK_VERSION = '2.0.1';
+const WEB_SDK_VERSION = '3.0.1';
 class Mpc {
     constructor({ portal }) {
         this.configureIframe = () => {
@@ -18,11 +18,9 @@ class Mpc {
                 authToken: this.portal.authToken,
                 authUrl: this.portal.authUrl,
                 autoApprove: this.portal.autoApprove,
-                chainId: this.portal.chainId,
                 gdrive: this.portal.gDriveConfig,
                 passkey: this.portal.passkeyConfig,
                 host: this.portal.host,
-                rpcUrl: this.portal.getRpcUrl(),
                 mpcHost: this.portal.mpcHost,
                 mpcVersion: this.portal.mpcVersion,
                 featureFlags: this.portal.featureFlags,
@@ -258,7 +256,7 @@ class Mpc {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 const handleEject = (message) => {
-                    const { type, data } = message.data;
+                    const { type, data: result } = message.data;
                     const { origin } = message;
                     // ignore any broadcast postMessages
                     if (origin !== this.getOrigin()) {
@@ -267,12 +265,12 @@ class Mpc {
                     if (type === 'portal:wasm:ejectError') {
                         // Remove the event listeners
                         window.removeEventListener('message', handleEject);
-                        reject(new PortalMpcError(data));
+                        reject(new PortalMpcError(result));
                     }
                     else if (type === 'portal:wasm:ejectResult') {
                         // Remove the event listeners
                         window.removeEventListener('message', handleEject);
-                        resolve(data);
+                        resolve(result);
                     }
                 };
                 window.addEventListener('message', handleEject);
@@ -287,10 +285,6 @@ class Mpc {
         // Noop
     }) {
         return __awaiter(this, void 0, void 0, function* () {
-            const message = {
-                type: 'portal:wasm:sign',
-                data,
-            };
             return new Promise((resolve, reject) => {
                 // Create a function to be bound when sign is triggered
                 const handleSign = (event) => {
@@ -330,7 +324,43 @@ class Mpc {
                 window.addEventListener('message', handleSign);
                 window.addEventListener('message', handleProgress);
                 // Send the request to the iframe
-                this.postMessage(message);
+                this.postMessage({
+                    type: 'portal:wasm:sign',
+                    data,
+                });
+            });
+        });
+    }
+    checkSharesOnDevice() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                const handleCheckSharesOnDevice = (event) => {
+                    const { type, data } = event.data;
+                    const { origin } = event;
+                    // ignore any broadcast postMessages
+                    if (origin !== this.getOrigin()) {
+                        return;
+                    }
+                    if (type === 'portal:checkSharesOnDeviceError') {
+                        // Remove the event listener
+                        window.removeEventListener('message', handleCheckSharesOnDevice);
+                        // Reject the promise with the error
+                        return reject(new PortalMpcError(data));
+                    }
+                    else if (type === 'portal:checkSharesOnDeviceResult') {
+                        // Remove the event listener
+                        window.removeEventListener('message', handleCheckSharesOnDevice);
+                        // Resolve the promise with the result
+                        resolve(data);
+                    }
+                };
+                // Bind the function to the message event
+                window.addEventListener('message', handleCheckSharesOnDevice);
+                // Send the request to the iframe
+                this.postMessage({
+                    type: 'portal:checkSharesOnDevice',
+                    data: {},
+                });
             });
         });
     }
@@ -509,7 +539,7 @@ class Mpc {
             });
         });
     }
-    getTransactions(limit, offset, order, chainId) {
+    getTransactions(chainId, limit, offset, order) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve, reject) => {
                 const handleGetTransactions = (event) => {
@@ -538,10 +568,10 @@ class Mpc {
                 this.postMessage({
                     type: 'portal:getTransactions',
                     data: {
+                        chainId,
                         limit,
                         offset,
                         order,
-                        chainId,
                     },
                 });
             });
@@ -652,72 +682,6 @@ class Mpc {
             });
         });
     }
-    getBackupShareMetadata() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleGetBackupShareMetadata = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:getBackupShareMetadataError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetBackupShareMetadata);
-                        // Reject the promise with the error
-                        return reject(new PortalMpcError(data));
-                    }
-                    else if (type === 'portal:getBackupShareMetadataResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetBackupShareMetadata);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGetBackupShareMetadata);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:getBackupShareMetadata',
-                    data: {},
-                });
-            });
-        });
-    }
-    getSigningShareMetadata() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const handleGetSigningShareMetadata = (event) => {
-                    const { type, data } = event.data;
-                    const { origin } = event;
-                    // ignore any broadcast postMessages
-                    if (origin !== this.getOrigin()) {
-                        return;
-                    }
-                    if (type === 'portal:getSigningShareMetadataError') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetSigningShareMetadata);
-                        // Reject the promise with the error
-                        return reject(new PortalMpcError(data));
-                    }
-                    else if (type === 'portal:getSigningShareMetadataResult') {
-                        // Remove the event listener
-                        window.removeEventListener('message', handleGetSigningShareMetadata);
-                        // Resolve the promise with the result
-                        resolve(data);
-                    }
-                };
-                // Bind the function to the message event
-                window.addEventListener('message', handleGetSigningShareMetadata);
-                // Send the request to the iframe
-                this.postMessage({
-                    type: 'portal:getSigningShareMetadata',
-                    data: {},
-                });
-            });
-        });
-    }
     /***************************
      * Private Methods
      ***************************/

package/lib/esm/provider/index.js

@@ -23,9 +23,29 @@ const signerMethods = [
     'eth_signTypedData_v3',
     'eth_signTypedData_v4',
     'personal_sign',
+    'sol_signAndConfirmTransaction',
+    'sol_signAndSendTransaction',
+    'sol_signMessage',
+    'sol_signTransaction',
 ];
 class Provider {
     constructor({ portal }) {
+        this.enforceEip155ChainId = (chainId) => {
+            if (!chainId) {
+                throw new Error('[PortalProvider] Chain ID is required for the operation');
+            }
+            if (!chainId.startsWith('eip155:')) {
+                throw new Error(`[PortalProvider] Chain ID must be prefixed with "eip155:" for the operation, got ${chainId}`);
+            }
+        };
+        this.enforceSolanaChainId = (chainId) => {
+            if (!chainId) {
+                throw new Error('[PortalProvider] Chain ID is required for the operation');
+            }
+            if (!chainId.startsWith('solana:')) {
+                throw new Error(`[PortalProvider] Chain ID must be prefixed with "solana:" for the operation, got ${chainId}`);
+            }
+        };
         this.buildParams = (method, txParams) => {
             let params = txParams;
             switch (method) {
@@ -33,6 +53,10 @@ class Provider {
                 case 'personal_sign':
                 case 'eth_signTypedData_v3':
                 case 'eth_signTypedData_v4':
+                case 'sol_signAndConfirmTransaction':
+                case 'sol_signAndSendTransaction':
+                case 'sol_signMessage':
+                case 'sol_signTransaction':
                     if (!Array.isArray(txParams)) {
                         params = [txParams];
                     }
@@ -110,9 +134,6 @@ class Provider {
      */
     request({ chainId, method, params, }) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (method === 'eth_chainId') {
-                return chainId ? parseInt(chainId.split(':')[1]) : this.portal.chainId;
-            }
             const isSignerMethod = signerMethods.includes(method);
             if (!isSignerMethod && !method.startsWith('wallet_')) {
                 // Send to Gateway for RPC calls
@@ -223,16 +244,21 @@ class Provider {
      */
     handleGatewayRequest({ chainId, method, params, }) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Pass request off to the gateway
-            const result = yield fetch(this.portal.getRpcUrl(), {
+            // Prepare the request body
+            const requestBody = {
                 body: JSON.stringify({
                     jsonrpc: '2.0',
-                    id: chainId ? parseInt(chainId.split(':')[1]) : this.portal.chainId,
+                    id: '0',
                     method,
                     params,
                 }),
                 method: 'POST',
-            });
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            };
+            // Pass request off to the gateway
+            const result = yield fetch(this.portal.getRpcUrl(chainId), requestBody);
             return result.json();
         });
     }
@@ -252,24 +278,41 @@ class Provider {
                 return;
             }
             switch (method) {
-                case 'eth_chainId':
-                    return `0x${this.portal.chainId.toString(16)}`;
+                case 'eth_chainId': {
+                    this.enforceEip155ChainId(chainId);
+                    const chainReferenceId = parseInt(chainId.split(':')[1]);
+                    return `0x${chainReferenceId.toString(16)}`;
+                }
                 case 'eth_accounts':
-                case 'eth_requestAccounts':
+                case 'eth_requestAccounts': {
+                    this.enforceEip155ChainId(chainId);
                     return [this.portal.address];
+                }
                 case 'eth_sendTransaction':
                 case 'eth_sign':
                 case 'eth_signTransaction':
                 case 'eth_signTypedData_v3':
                 case 'eth_signTypedData_v4':
                 case 'personal_sign': {
+                    this.enforceEip155ChainId(chainId);
+                    const result = yield this.portal.mpc.sign({
+                        chainId: chainId,
+                        method,
+                        params: this.buildParams(method, params),
+                        rpcUrl: this.portal.getRpcUrl(chainId),
+                    });
+                    return result;
+                }
+                case 'sol_signAndConfirmTransaction':
+                case 'sol_signAndSendTransaction':
+                case 'sol_signMessage':
+                case 'sol_signTransaction': {
+                    this.enforceSolanaChainId(chainId);
                     const result = yield this.portal.mpc.sign({
-                        chainId: chainId
-                            ? chainId.split(':')[1]
-                            : this.portal.chainId.toString(),
+                        chainId: chainId,
                         method,
                         params: this.buildParams(method, params),
-                        rpcUrl: this.portal.getRpcUrl(),
+                        rpcUrl: this.portal.getRpcUrl(chainId),
                     });
                     return result;
                 }

package/package.json

@@ -3,7 +3,7 @@
   "description": "Portal MPC Support for Web",
   "author": "Portal Labs, Inc.",
   "homepage": "https://portalhq.io/",
-  "version": "2.0.1",
+  "version": "3.0.1",
   "license": "MIT",
   "main": "lib/commonjs/index",
   "module": "lib/esm/index",
@@ -45,5 +45,8 @@
     "typescript": "^4.8.4",
     "webpack": "^5.87.0",
     "webpack-cli": "^5.1.4"
+  },
+  "dependencies": {
+    "@solana/web3.js": "^1.91.8"
   }
 }