@portal-hq/provider 3.0.6 → 4.0.0

package/lib/esm/providers/index.js

@@ -7,7 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Events, HttpRequester, InvalidApiKeyError, InvalidChainIdError, InvalidGatewayConfigError, ProviderRpcError, RpcErrorCodes, } from '@portal-hq/utils';
+import { PortalCurve } from '@portal-hq/core';
+import { Events, HttpRequester, InvalidApiKeyError, InvalidGatewayConfigError, PortalRequests, ProviderRpcError, RpcErrorCodes, } from '@portal-hq/utils';
 import { MpcSigner } from '../signers';
 const passiveSignerMethods = [
     'eth_accounts',
@@ -24,26 +25,28 @@ const signerMethods = [
     'eth_signTypedData_v3',
     'eth_signTypedData_v4',
     'personal_sign',
+    'sol_signAndConfirmTransaction',
+    'sol_signAndSendTransaction',
+    'sol_signMessage',
+    'sol_signTransaction',
+    'raw_sign',
 ];
 class Provider {
-    get address() {
-        return this.keychain.getAddress(this.isSimulator);
+    get addresses() {
+        return this.keychain.getAddresses();
     }
-    get gatewayUrl() {
-        return this.getGatewayUrl();
+    get address() {
+        return this.keychain.getAddress();
     }
     constructor({ 
     // Required
-    apiKey, chainId, keychain, gatewayConfig, 
+    apiKey, keychain, gatewayConfig, 
     // Optional
-    isSimulator = false, autoApprove = false, apiHost = 'api.portalhq.io', mpcHost = 'mpc.portalhq.io', version = 'v6', featureFlags = { optimized: false }, }) {
+    autoApprove = false, apiHost = 'api.portalhq.io', mpcHost = 'mpc.portalhq.io', version = 'v6', chainId = 'eip155:11155111', featureFlags = {}, }) {
         // Handle required fields
         if (!apiKey || apiKey.length === 0) {
             throw new InvalidApiKeyError();
         }
-        if (!chainId) {
-            throw new InvalidChainIdError();
-        }
         if (!gatewayConfig) {
             throw new InvalidGatewayConfigError();
         }
@@ -53,7 +56,6 @@ class Provider {
         this.chainId = chainId;
         this.events = {};
         this.gatewayConfig = gatewayConfig;
-        this.isSimulator = isSimulator;
         this.keychain = keychain;
         // Add a logger
         this.log = console;
@@ -64,9 +66,7 @@ class Provider {
                 : `https://${apiHost}`,
         });
         // Initialize Gateway HttpRequester
-        this.gateway = new HttpRequester({
-            baseUrl: this.getGatewayUrl(),
-        });
+        this.gateway = new PortalRequests();
         // Initialize an MpcSigner
         this.signer = new MpcSigner({
             mpcHost,
@@ -99,24 +99,28 @@ class Provider {
      *
      * @returns string
      */
-    getGatewayUrl() {
+    getGatewayUrl(chainId) {
+        chainId = chainId !== null && chainId !== void 0 ? chainId : this.chainId;
+        if (!chainId) {
+            throw new Error('[PortalProvider] No chainId provided');
+        }
         if (typeof this.gatewayConfig === 'string') {
             // If the gatewayConfig is just a static URL, return that
             return this.gatewayConfig;
         }
         else if (typeof this.gatewayConfig === 'object' &&
             // eslint-disable-next-line no-prototype-builtins
-            !this.gatewayConfig.hasOwnProperty(this.chainId)) {
+            !this.gatewayConfig.hasOwnProperty(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}`);
+            throw new Error(`[PortalProvider] No RPC endpoint configured for chainId: ${chainId}`);
         }
         // Get the entry for the current chainId from the gatewayConfig
-        const config = this.gatewayConfig[this.chainId];
+        const config = this.gatewayConfig[chainId];
         if (typeof config === 'string') {
             return config;
         }
         // 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}`);
+        throw new Error(`[PortalProvider] Could not find a valid gatewayConfig entry for chainId: ${chainId}`);
     }
     /**
      * Registers an event handler for the provided event
@@ -183,14 +187,23 @@ class Provider {
      */
     request({ method, params, chainId, connect, }) {
         return __awaiter(this, void 0, void 0, function* () {
+            chainId = chainId !== null && chainId !== void 0 ? chainId : this.chainId;
+            if (!chainId) {
+                throw new Error('[PortalProvider] No chainId provided');
+            }
             if (method === 'eth_chainId') {
-                return this.chainId;
+                if (typeof chainId === 'string' && chainId.includes(':')) {
+                    return chainId.split(':')[1];
+                }
+                else {
+                    throw new Error("[PortalProvider] Invalid chainId format. Must be 'namespace:reference'");
+                }
             }
             // Handle changing chains
             if (method == 'wallet_switchEthereumChain') {
                 const param = params[0];
                 const chainId = parseInt(param.chainId, 16);
-                this.chainId = chainId;
+                this.chainId = `eip155:${String(chainId)}`;
                 this.emit('portal_signatureReceived', {
                     method,
                     params,
@@ -201,7 +214,11 @@ class Provider {
             let result;
             if (!isSignerMethod && !method.startsWith('wallet_')) {
                 // Send to Gateway for RPC calls
-                const response = yield this.handleGatewayRequests({ method, params });
+                const response = yield this.handleGatewayRequests({
+                    method,
+                    params,
+                    chainId,
+                });
                 this.emit('portal_signatureReceived', {
                     method,
                     params,
@@ -220,6 +237,25 @@ class Provider {
                     chainId,
                     connect,
                 });
+                if (transactionHash) {
+                    try {
+                        yield this.portalApi.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
+                    }
+                }
                 if (transactionHash) {
                     this.emit('portal_signatureReceived', {
                         method,
@@ -251,23 +287,29 @@ class Provider {
      */
     setChainId(chainId, connect) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (typeof chainId === 'number') {
+                chainId = `eip155:${String(chainId)}`;
+            }
             // Update the chainId
             this.chainId = chainId;
-            // Re-initialize the Gateway HttpRequester
-            this.gateway = new HttpRequester({
-                baseUrl: this.getGatewayUrl(),
-            });
-            // Emit event for update
-            this.emit('chainChanged', {
-                chainId: this.chainId,
-            });
-            if (connect && connect.connected) {
-                connect.emit('portalConnect_chainChanged', {
-                    chainId: this.chainId,
+            if (chainId.includes(':')) {
+                const chainIdParts = chainId.split(':');
+                const reference = parseInt(chainIdParts[1]);
+                // Emit event for update
+                this.emit('chainChanged', {
+                    chainId: reference,
                 });
+                if (connect && connect.connected) {
+                    connect.emit('portalConnect_chainChanged', {
+                        chainId: reference,
+                    });
+                }
+                // Dispatch 'connect' event
+                this.dispatchConnect(chainId);
+            }
+            else {
+                console.error(`[PortalProvider] Invalid chainId format. Must be 'namespace:reference', but got ${chainId}`);
             }
-            // Dispatch 'connect' event
-            this.dispatchConnect();
             return new Promise((resolve) => resolve(this));
         });
     }
@@ -330,9 +372,10 @@ class Provider {
             });
         });
     }
-    dispatchConnect() {
+    dispatchConnect(chainId) {
+        const reference = chainId.split(':')[1];
         this.emit('connect', {
-            chainId: `0x${this.chainId.toString(16)}`,
+            chainId: `0x${Number(reference).toString(16)}`,
         });
     }
     /**
@@ -341,13 +384,15 @@ class Provider {
      * @param args The arguments of the request being made
      * @returns Promise<any>
      */
-    handleGatewayRequests({ method, params, }) {
+    handleGatewayRequests({ method, params, chainId, }) {
         return __awaiter(this, void 0, void 0, function* () {
+            const gatewayUrl = this.getGatewayUrl(chainId);
             // Pass request off to the gateway
-            return yield this.gateway.post('', {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+            return yield this.gateway.post(gatewayUrl, '', {
                 body: {
                     jsonrpc: '2.0',
-                    id: this.chainId,
+                    id: chainId,
                     method,
                     params,
                 },
@@ -361,7 +406,7 @@ class Provider {
      * @returns Promise<any>
      */
     handleSigningRequests({ method, params, chainId, connect, }) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const isApproved = passiveSignerMethods.includes(method)
                 ? true
@@ -370,9 +415,17 @@ class Provider {
                 this.log.info(`[PortalProvider] Request for signing method '${method}' could not be completed because it was not approved by the user.`);
                 return;
             }
+            let namespace = 'eip155';
+            let reference = chainId;
+            if (typeof chainId == 'string' && chainId.includes(':')) {
+                const tmp = chainId.split(':');
+                namespace = tmp[0];
+                reference = tmp[1];
+            }
+            const curve = namespace == 'eip155' ? PortalCurve.SECP256K1 : PortalCurve.ED25519;
             switch (method) {
                 case 'eth_chainId':
-                    return `0x${this.chainId.toString(16)}`;
+                    return `0x${Number(reference).toString(16)}`;
                 case 'eth_accounts':
                 case 'eth_requestAccounts':
                 case 'eth_sendTransaction':
@@ -380,27 +433,28 @@ class Provider {
                 case 'eth_signTransaction':
                 case 'eth_signTypedData_v3':
                 case 'eth_signTypedData_v4':
-                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 {
-                            yield this.portalApi.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
-                        }
-                    }
+                case 'personal_sign':
+                case 'sol_signAndConfirmTransaction':
+                case 'sol_signAndSendTransaction':
+                case 'sol_signMessage':
+                case 'sol_signTransaction': {
+                    const result = yield ((_a = this.signer) === null || _a === void 0 ? void 0 : _a.sign({
+                        chainId: `${namespace}:${reference}`,
+                        method,
+                        params,
+                        curve,
+                        isRaw: false,
+                    }, this));
+                    return result;
+                }
+                case 'raw_sign': {
+                    const result = yield ((_b = this.signer) === null || _b === void 0 ? void 0 : _b.sign({
+                        chainId: '',
+                        method: '',
+                        params,
+                        curve,
+                        isRaw: true,
+                    }, this));
                     return result;
                 }
                 default:

package/lib/esm/signers/mpc.js

@@ -7,16 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { PortalCurve } from '@portal-hq/core';
 import { PortalMpcError, } from '@portal-hq/utils';
 import { NativeModules } from 'react-native';
 class MpcSigner {
-    get address() {
-        return this.keychain.getAddress(this.isSimulator);
-    }
-    get signingShare() {
-        return this.keychain.getDkgResult(this.isSimulator);
-    }
-    constructor({ keychain, isSimulator = false, mpcHost = 'mpc.portalhq.io', version = 'v6', featureFlags = { optimized: false }, }) {
+    constructor({ keychain, mpcHost = 'mpc.portalhq.io', version = 'v6', featureFlags = {}, }) {
         this.version = 'v6';
         this.buildParams = (method, txParams) => {
             let params = txParams;
@@ -25,18 +20,23 @@ class MpcSigner {
                 case 'personal_sign':
                 case 'eth_signTypedData_v3':
                 case 'eth_signTypedData_v4':
+                case 'sol_signMessage':
+                case 'sol_signTransaction':
+                case 'sol_signAndSendTransaction':
+                case 'sol_signAndConfirmTransaction':
                     if (!Array.isArray(txParams)) {
                         params = [txParams];
                     }
                     break;
                 default:
                     if (Array.isArray(txParams)) {
-                        params = txParams[0];
+                        if (txParams.length === 1) {
+                            params = txParams[0];
+                        }
                     }
             }
             return params;
         };
-        this.isSimulator = isSimulator;
         this.keychain = keychain;
         this.mpc = NativeModules.PortalMobileMpc;
         this.mpcHost = mpcHost;
@@ -47,27 +47,52 @@ class MpcSigner {
         }
     }
     sign(message, provider) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const address = yield this.address;
+            const addresses = yield this.keychain.getAddresses();
+            const legacyAddress = yield this.keychain.getAddress();
             const apiKey = provider.apiKey;
-            const { method, params } = message;
+            const { method, chainId, curve, isRaw } = message;
             switch (method) {
                 case 'eth_requestAccounts':
-                    return [address];
+                    return [(_a = addresses.eip155) !== null && _a !== void 0 ? _a : legacyAddress];
                 case 'eth_accounts':
-                    return [address];
+                    return [(_b = addresses.eip155) !== null && _b !== void 0 ? _b : legacyAddress];
                 default:
                     break;
             }
-            const signingShare = yield this.signingShare;
+            const shares = yield this.keychain.getShares();
+            let signingShare = shares.secp256k1.share;
+            if (curve === PortalCurve.ED25519) {
+                if (!shares.ed25519) {
+                    throw new Error('[Portal.Provider.MpcSigner] The ED25519 share is missing from the keychain.');
+                }
+                signingShare = shares.ed25519.share;
+            }
             const metadata = {
                 clientPlatform: 'REACT_NATIVE',
                 isMultiBackupEnabled: this.featureFlags.isMultiBackupEnabled,
                 mpcServerVersion: this.version,
-                optimized: this.featureFlags.optimized,
+                optimized: true,
+                curve,
+                chainId,
+                isRaw,
             };
             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);
+            let formattedParams;
+            let rpcUrl;
+            if (isRaw) {
+                formattedParams = this.buildParams(method, message.params);
+                rpcUrl = '';
+            }
+            else {
+                formattedParams = JSON.stringify(this.buildParams(method, message.params));
+                rpcUrl = provider.getGatewayUrl(chainId);
+            }
+            if (typeof formattedParams !== 'string') {
+                throw new Error(`[Portal.Provider.MpcSigner] The formatted params for the signing request could not be converted to a string. The params were: ${formattedParams}`);
+            }
+            const result = yield this.mpc.sign(apiKey, this.mpcHost, JSON.stringify(signingShare), message.method, formattedParams, rpcUrl, chainId, 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": "3.0.6",
+  "version": "4.0.0",
   "license": "MIT",
   "main": "lib/commonjs/index",
   "module": "lib/esm/index",
@@ -19,8 +19,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@portal-hq/connect": "^3.0.6",
-    "@portal-hq/utils": "^3.0.6"
+    "@portal-hq/connect": "^4.0.0",
+    "@portal-hq/utils": "^4.0.0"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.18.6",
@@ -30,5 +30,5 @@
     "ts-jest": "^29.0.3",
     "typescript": "^4.8.4"
   },
-  "gitHead": "884d505870ff81f79fde92abdcea508619eaf86e"
+  "gitHead": "a1c6f51ff156d3d1922cdaa29ee43fe4cfefd932"
 }