@portal-hq/provider 1.0.5 → 1.1.1

package/lib/commonjs/providers/index.js

@@ -29,10 +29,10 @@ const signerMethods = [
 ];
 class Provider {
     constructor({ 
-    // Required options
-    apiKey, chainId, keychain, 
-    // Optional options
-    apiUrl = 'api.portalhq.io', autoApprove = false, mpcUrl = 'mpc.portalhq.io', mpcVersion = 'v4', gatewayConfig = {}, }) {
+    // Required
+    apiKey, chainId, keychain, gatewayConfig, 
+    // Optional
+    isSimulator = false, autoApprove = false, apiHost = 'api.portalhq.io', mpcHost = 'mpc.portalhq.io', version = 'v4', }) {
         // Handle required fields
         if (!apiKey || apiKey.length === 0) {
             throw new utils_1.InvalidApiKeyError();
@@ -45,39 +45,37 @@ class Provider {
         }
         // Handle the stuff we can auto-set
         this.apiKey = apiKey;
-        this.apiUrl = apiUrl;
         this.autoApprove = autoApprove;
         this.chainId = chainId;
-        this.connected = false;
         this.events = {};
         this.gatewayConfig = gatewayConfig;
-        this.isMPC = true;
+        this.isSimulator = isSimulator;
         this.keychain = keychain;
-        this.mpcUrl = mpcUrl;
-        this.rpcUrl = this.getRpcUrl();
-        this.mpcVersion = mpcVersion;
         // Add a logger
         this.log = console;
         // Initialize Portal API HttpRequester
-        this.portal = new utils_1.HttpRequester({
-            baseUrl: this.apiUrl,
+        this.portalApi = new utils_1.HttpRequester({
+            baseUrl: apiHost.startsWith('localhost')
+                ? `http://${apiHost}`
+                : `https://${apiHost}`,
         });
         // Initialize Gateway HttpRequester
-        this.rpc = new utils_1.HttpRequester({
-            baseUrl: this.rpcUrl,
+        this.gateway = new utils_1.HttpRequester({
+            baseUrl: this.getGatewayUrl(),
         });
         // Initialize an MpcSigner
         this.signer = new signers_1.MpcSigner({
-            mpcUrl: this.mpcUrl,
-            keychain: this.keychain,
-            mpcVersion: mpcVersion,
-        });
-        this.signer.getAddress().then((address) => {
-            if (typeof address !== 'undefined' && address.length) {
-                this.address = address;
-            }
+            mpcHost: mpcHost,
+            keychain: keychain,
+            version: version,
         });
     }
+    get address() {
+        return this.keychain.getAddress(this.isSimulator);
+    }
+    get gatewayUrl() {
+        return this.getGatewayUrl();
+    }
     /**
      * Invokes all registered event handlers with the data provided
      * - If any `once` handlers exist, they are removed after all handlers are invoked
@@ -102,7 +100,7 @@ class Provider {
      *
      * @returns string
      */
-    getRpcUrl() {
+    getGatewayUrl() {
         if (typeof this.gatewayConfig === 'string') {
             // If the gatewayConfig is just a static URL, return that
             return this.gatewayConfig;
@@ -183,7 +181,7 @@ class Provider {
      * @param args The arguments of the request being made
      * @returns Promise<any>
      */
-    request({ method, params }) {
+    request({ method, params, connect, }) {
         return __awaiter(this, void 0, void 0, function* () {
             if (method === 'eth_chainId') {
                 return this.chainId;
@@ -208,6 +206,7 @@ class Provider {
                 const transactionHash = yield this.handleSigningRequests({
                     method,
                     params,
+                    connect,
                 });
                 if (transactionHash) {
                     this.emit('portal_signatureReceived', {
@@ -231,33 +230,30 @@ class Provider {
             return result;
         });
     }
-    _setAddress(address) {
-        this.address = address;
-        if (!this.connected) {
-            this.dispatchConnect();
-        }
-    }
     /**
      * Updates the chainId of this instance and builds a new RPC HttpRequester for
      * the gateway used for the new chain
      *
-     * @param chainId A hex string of the chainId to use for this connection
+     * @param chainId The numerical ID of the chain to switch to
      * @returns BaseProvider
      */
-    setChainId(chainId) {
+    setChainId(chainId, connect) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Disconnect from the current chain
-            this.connected = false;
             // Update the chainId
-            this.chainId = Number(`${chainId}`);
+            this.chainId = chainId;
             // Re-initialize the Gateway HttpRequester
-            this.rpc = new utils_1.HttpRequester({
-                baseUrl: this.getRpcUrl(),
+            this.gateway = new utils_1.HttpRequester({
+                baseUrl: this.getGatewayUrl(),
             });
             // Emit event for update
             this.emit('chainChanged', {
                 chainId: this.chainId,
             });
+            if (connect) {
+                connect.emit('portalConnect_chainChanged', {
+                    chainId: this.chainId,
+                });
+            }
             // Dispatch 'connect' event
             this.dispatchConnect();
             return this;
@@ -268,15 +264,15 @@ class Provider {
      *
      * @param args The arguments of the request being made
      */
-    getApproval({ method, params, }) {
+    getApproval({ method, params, connect, }) {
         return __awaiter(this, void 0, void 0, function* () {
             // If autoApprove is enabled, just resolve to true
             if (this.autoApprove) {
                 return true;
             }
             const signingHandlers = this.events['portal_signingRequested'];
-            if (!signingHandlers || signingHandlers.length === 0) {
-                throw new Error(`[PortalProvider] Auto-approve is disabled. Cannot perform signing requests without an event handler for the 'portal_signingRequested' event.`);
+            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.`);
             }
             return new Promise((resolve) => {
                 // Remove already used listeners
@@ -305,16 +301,23 @@ class Provider {
                     }
                 });
                 // Tell any listening clients that signing has been requested
-                this.emit('portal_signingRequested', {
-                    method,
-                    params,
-                });
+                if (connect) {
+                    connect.emit('portalConnect_signingRequested', {
+                        method,
+                        params,
+                    });
+                }
+                else {
+                    this.emit('portal_signingRequested', {
+                        method,
+                        params,
+                    });
+                }
             });
         });
     }
     dispatchConnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.connected = true;
             this.emit('connect', {
                 chainId: `0x${this.chainId.toString(16)}`,
             });
@@ -329,7 +332,7 @@ class Provider {
     handleGatewayRequests({ method, params, }) {
         return __awaiter(this, void 0, void 0, function* () {
             // Pass request off to the gateway
-            return yield this.rpc.post('', {
+            return yield this.gateway.post('', {
                 body: {
                     jsonrpc: '2.0',
                     id: this.chainId,
@@ -345,12 +348,12 @@ class Provider {
      * @param args The arguments of the request being made
      * @returns Promise<any>
      */
-    handleSigningRequests({ method, params, }) {
+    handleSigningRequests({ method, params, connect, }) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const isApproved = passiveSignerMethods.includes(method)
                 ? true
-                : yield this.getApproval({ method, params });
+                : yield this.getApproval({ method, params, 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;
@@ -369,7 +372,7 @@ class Provider {
                     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', {
+                            yield this.portalApi.post('/api/v1/analytics/track', {
                                 headers: {
                                     Authentication: `Bearer ${this.apiKey}`,
                                 },

package/lib/commonjs/signers/abstract.js

@@ -10,11 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 class Signer {
-    getAddress() {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error(`[Portal] getAddress() method must be implemented as a subclass of Signer`);
-        });
-    }
     sign(_, __) {
         return __awaiter(this, void 0, void 0, function* () {
             throw new Error('[Portal] sign() method must be implemented in a subclass of Signer');

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 = 'v4' }) {
-        this.mpcVersion = 'v4';
+    constructor({ keychain, isSimulator = false, mpcHost = 'mpc.portalhq.io', version = 'v4', }) {
+        this.version = 'v4';
         this.buildParams = (method, txParams) => {
             let params = txParams;
             switch (method) {
@@ -32,29 +32,24 @@ class MpcSigner {
             }
             return params;
         };
+        this.isSimulator = isSimulator;
         this.keychain = keychain;
         this.mpc = react_native_1.NativeModules.PortalMobileMpc;
-        this.mpcUrl = mpcUrl;
-        this.mpcVersion = mpcVersion;
+        this.mpcHost = mpcHost;
+        this.version = version;
         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.`);
         }
     }
-    getAddress() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.address) {
-                return this.address;
-            }
-            const address = yield this.keychain.getAddress();
-            if (typeof address !== 'undefined' && address.length) {
-                this.address = address;
-            }
-            return address;
-        });
+    get address() {
+        return this.keychain.getAddress(this.isSimulator);
+    }
+    get signingShare() {
+        return this.keychain.getDkgResult(this.isSimulator);
     }
     sign(message, provider) {
         return __awaiter(this, void 0, void 0, function* () {
-            const address = yield this.keychain.getAddress();
+            const address = yield this.address;
             const apiKey = provider.apiKey;
             const { method, params } = message;
             switch (method) {
@@ -65,8 +60,8 @@ class MpcSigner {
                 default:
                     break;
             }
-            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 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 { data, error } = JSON.parse(String(result));
             if (error && error.code > 0) {
                 throw new utils_1.PortalMpcError(error);

package/lib/esm/providers/index.js

@@ -27,10 +27,10 @@ const signerMethods = [
 ];
 class Provider {
     constructor({ 
-    // Required options
-    apiKey, chainId, keychain, 
-    // Optional options
-    apiUrl = 'api.portalhq.io', autoApprove = false, mpcUrl = 'mpc.portalhq.io', mpcVersion = 'v4', gatewayConfig = {}, }) {
+    // Required
+    apiKey, chainId, keychain, gatewayConfig, 
+    // Optional
+    isSimulator = false, autoApprove = false, apiHost = 'api.portalhq.io', mpcHost = 'mpc.portalhq.io', version = 'v4', }) {
         // Handle required fields
         if (!apiKey || apiKey.length === 0) {
             throw new InvalidApiKeyError();
@@ -43,39 +43,37 @@ class Provider {
         }
         // Handle the stuff we can auto-set
         this.apiKey = apiKey;
-        this.apiUrl = apiUrl;
         this.autoApprove = autoApprove;
         this.chainId = chainId;
-        this.connected = false;
         this.events = {};
         this.gatewayConfig = gatewayConfig;
-        this.isMPC = true;
+        this.isSimulator = isSimulator;
         this.keychain = keychain;
-        this.mpcUrl = mpcUrl;
-        this.rpcUrl = this.getRpcUrl();
-        this.mpcVersion = mpcVersion;
         // Add a logger
         this.log = console;
         // Initialize Portal API HttpRequester
-        this.portal = new HttpRequester({
-            baseUrl: this.apiUrl,
+        this.portalApi = new HttpRequester({
+            baseUrl: apiHost.startsWith('localhost')
+                ? `http://${apiHost}`
+                : `https://${apiHost}`,
         });
         // Initialize Gateway HttpRequester
-        this.rpc = new HttpRequester({
-            baseUrl: this.rpcUrl,
+        this.gateway = new HttpRequester({
+            baseUrl: this.getGatewayUrl(),
         });
         // Initialize an MpcSigner
         this.signer = new MpcSigner({
-            mpcUrl: this.mpcUrl,
-            keychain: this.keychain,
-            mpcVersion: mpcVersion,
-        });
-        this.signer.getAddress().then((address) => {
-            if (typeof address !== 'undefined' && address.length) {
-                this.address = address;
-            }
+            mpcHost: mpcHost,
+            keychain: keychain,
+            version: version,
         });
     }
+    get address() {
+        return this.keychain.getAddress(this.isSimulator);
+    }
+    get gatewayUrl() {
+        return this.getGatewayUrl();
+    }
     /**
      * Invokes all registered event handlers with the data provided
      * - If any `once` handlers exist, they are removed after all handlers are invoked
@@ -100,7 +98,7 @@ class Provider {
      *
      * @returns string
      */
-    getRpcUrl() {
+    getGatewayUrl() {
         if (typeof this.gatewayConfig === 'string') {
             // If the gatewayConfig is just a static URL, return that
             return this.gatewayConfig;
@@ -181,7 +179,7 @@ class Provider {
      * @param args The arguments of the request being made
      * @returns Promise<any>
      */
-    request({ method, params }) {
+    request({ method, params, connect, }) {
         return __awaiter(this, void 0, void 0, function* () {
             if (method === 'eth_chainId') {
                 return this.chainId;
@@ -206,6 +204,7 @@ class Provider {
                 const transactionHash = yield this.handleSigningRequests({
                     method,
                     params,
+                    connect,
                 });
                 if (transactionHash) {
                     this.emit('portal_signatureReceived', {
@@ -229,33 +228,30 @@ class Provider {
             return result;
         });
     }
-    _setAddress(address) {
-        this.address = address;
-        if (!this.connected) {
-            this.dispatchConnect();
-        }
-    }
     /**
      * Updates the chainId of this instance and builds a new RPC HttpRequester for
      * the gateway used for the new chain
      *
-     * @param chainId A hex string of the chainId to use for this connection
+     * @param chainId The numerical ID of the chain to switch to
      * @returns BaseProvider
      */
-    setChainId(chainId) {
+    setChainId(chainId, connect) {
         return __awaiter(this, void 0, void 0, function* () {
-            // Disconnect from the current chain
-            this.connected = false;
             // Update the chainId
-            this.chainId = Number(`${chainId}`);
+            this.chainId = chainId;
             // Re-initialize the Gateway HttpRequester
-            this.rpc = new HttpRequester({
-                baseUrl: this.getRpcUrl(),
+            this.gateway = new HttpRequester({
+                baseUrl: this.getGatewayUrl(),
             });
             // Emit event for update
             this.emit('chainChanged', {
                 chainId: this.chainId,
             });
+            if (connect) {
+                connect.emit('portalConnect_chainChanged', {
+                    chainId: this.chainId,
+                });
+            }
             // Dispatch 'connect' event
             this.dispatchConnect();
             return this;
@@ -266,15 +262,15 @@ class Provider {
      *
      * @param args The arguments of the request being made
      */
-    getApproval({ method, params, }) {
+    getApproval({ method, params, connect, }) {
         return __awaiter(this, void 0, void 0, function* () {
             // If autoApprove is enabled, just resolve to true
             if (this.autoApprove) {
                 return true;
             }
             const signingHandlers = this.events['portal_signingRequested'];
-            if (!signingHandlers || signingHandlers.length === 0) {
-                throw new Error(`[PortalProvider] Auto-approve is disabled. Cannot perform signing requests without an event handler for the 'portal_signingRequested' event.`);
+            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.`);
             }
             return new Promise((resolve) => {
                 // Remove already used listeners
@@ -303,16 +299,23 @@ class Provider {
                     }
                 });
                 // Tell any listening clients that signing has been requested
-                this.emit('portal_signingRequested', {
-                    method,
-                    params,
-                });
+                if (connect) {
+                    connect.emit('portalConnect_signingRequested', {
+                        method,
+                        params,
+                    });
+                }
+                else {
+                    this.emit('portal_signingRequested', {
+                        method,
+                        params,
+                    });
+                }
             });
         });
     }
     dispatchConnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.connected = true;
             this.emit('connect', {
                 chainId: `0x${this.chainId.toString(16)}`,
             });
@@ -327,7 +330,7 @@ class Provider {
     handleGatewayRequests({ method, params, }) {
         return __awaiter(this, void 0, void 0, function* () {
             // Pass request off to the gateway
-            return yield this.rpc.post('', {
+            return yield this.gateway.post('', {
                 body: {
                     jsonrpc: '2.0',
                     id: this.chainId,
@@ -343,12 +346,12 @@ class Provider {
      * @param args The arguments of the request being made
      * @returns Promise<any>
      */
-    handleSigningRequests({ method, params, }) {
+    handleSigningRequests({ method, params, connect, }) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const isApproved = passiveSignerMethods.includes(method)
                 ? true
-                : yield this.getApproval({ method, params });
+                : yield this.getApproval({ method, params, 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;
@@ -367,7 +370,7 @@ class Provider {
                     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', {
+                            yield this.portalApi.post('/api/v1/analytics/track', {
                                 headers: {
                                     Authentication: `Bearer ${this.apiKey}`,
                                 },

package/lib/esm/signers/abstract.js

@@ -8,11 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 class Signer {
-    getAddress() {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error(`[Portal] getAddress() method must be implemented as a subclass of Signer`);
-        });
-    }
     sign(_, __) {
         return __awaiter(this, void 0, void 0, function* () {
             throw new Error('[Portal] sign() method must be implemented in a subclass of Signer');

package/lib/esm/signers/mpc.js

@@ -10,8 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { NativeModules } from 'react-native';
 import { PortalMpcError, } from '@portal-hq/utils';
 class MpcSigner {
-    constructor({ keychain, mpcUrl, mpcVersion = 'v4' }) {
-        this.mpcVersion = 'v4';
+    constructor({ keychain, isSimulator = false, mpcHost = 'mpc.portalhq.io', version = 'v4', }) {
+        this.version = 'v4';
         this.buildParams = (method, txParams) => {
             let params = txParams;
             switch (method) {
@@ -30,29 +30,24 @@ class MpcSigner {
             }
             return params;
         };
+        this.isSimulator = isSimulator;
         this.keychain = keychain;
         this.mpc = NativeModules.PortalMobileMpc;
-        this.mpcUrl = mpcUrl;
-        this.mpcVersion = mpcVersion;
+        this.mpcHost = mpcHost;
+        this.version = version;
         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.`);
         }
     }
-    getAddress() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.address) {
-                return this.address;
-            }
-            const address = yield this.keychain.getAddress();
-            if (typeof address !== 'undefined' && address.length) {
-                this.address = address;
-            }
-            return address;
-        });
+    get address() {
+        return this.keychain.getAddress(this.isSimulator);
+    }
+    get signingShare() {
+        return this.keychain.getDkgResult(this.isSimulator);
     }
     sign(message, provider) {
         return __awaiter(this, void 0, void 0, function* () {
-            const address = yield this.keychain.getAddress();
+            const address = yield this.address;
             const apiKey = provider.apiKey;
             const { method, params } = message;
             switch (method) {
@@ -63,8 +58,8 @@ class MpcSigner {
                 default:
                     break;
             }
-            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 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 { 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": "1.0.5",
+  "version": "1.1.1",
   "license": "MIT",
   "main": "lib/commonjs/index",
   "module": "lib/esm/index",
@@ -19,7 +19,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@portal-hq/utils": "^1.0.5"
+    "@portal-hq/connect": "^1.1.1",
+    "@portal-hq/utils": "^1.1.1"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.18.6",
@@ -29,5 +30,5 @@
     "ts-jest": "^29.0.3",
     "typescript": "^4.8.4"
   },
-  "gitHead": "acac6640bcad15621912376d95c0bd09509387e1"
+  "gitHead": "2ba5caccbaae676a2b207bab294bbd59cfc136ca"
 }

package/src/providers/index.ts

@@ -18,6 +18,7 @@ import {
   type RequestArguments,
   type SwitchEthereumChainParameter,
 } from '../../types'
+import PortalConnect from '@portal-hq/connect'
 
 const passiveSignerMethods = [
   'eth_accounts',
@@ -38,37 +39,40 @@ const signerMethods = [
 ]
 
 class Provider {
-  public readonly mpcUrl: string
-  public readonly portal: HttpRequester
-
-  public address?: string
   public apiKey: string
-  public apiUrl: string
-  public autoApprove?: boolean
+  public autoApprove: boolean
   public chainId: number
-  public connected: boolean
-  public events: Record<string, RegisteredEventHandler[]>
-  public gatewayConfig: GatewayLike
-  public isMPC: boolean
-  public keychain: KeychainAdapter
   public log: Console
-  public rpc: HttpRequester
-  public rpcUrl: string
-  public signer: Signer
-  public mpcVersion: string
+  public gateway: HttpRequester
+
+  private events: Record<string, RegisteredEventHandler[]>
+  private gatewayConfig: GatewayLike
+  private isSimulator: boolean
+  private keychain: KeychainAdapter
+  private readonly portalApi: HttpRequester
+  private signer: Signer
+
+  public get address(): Promise<string | undefined> {
+    return this.keychain.getAddress(this.isSimulator)
+  }
+
+  public get gatewayUrl(): string {
+    return this.getGatewayUrl()
+  }
 
   constructor({
-    // Required options
+    // Required
     apiKey,
     chainId,
     keychain,
+    gatewayConfig,
 
-    // Optional options
-    apiUrl = 'api.portalhq.io',
+    // Optional
+    isSimulator = false,
     autoApprove = false,
-    mpcUrl = 'mpc.portalhq.io',
-    mpcVersion = 'v4',
-    gatewayConfig = {},
+    apiHost = 'api.portalhq.io',
+    mpcHost = 'mpc.portalhq.io',
+    version = 'v4',
   }: ProviderOptions) {
     // Handle required fields
     if (!apiKey || apiKey.length === 0) {
@@ -83,41 +87,33 @@ class Provider {
 
     // Handle the stuff we can auto-set
     this.apiKey = apiKey
-    this.apiUrl = apiUrl
     this.autoApprove = autoApprove
     this.chainId = chainId
-    this.connected = false
     this.events = {}
     this.gatewayConfig = gatewayConfig
-    this.isMPC = true
+    this.isSimulator = isSimulator
     this.keychain = keychain
-    this.mpcUrl = mpcUrl
-    this.rpcUrl = this.getRpcUrl()
-    this.mpcVersion = mpcVersion
+
     // Add a logger
     this.log = console
 
     // Initialize Portal API HttpRequester
-    this.portal = new HttpRequester({
-      baseUrl: this.apiUrl,
+    this.portalApi = new HttpRequester({
+      baseUrl: apiHost.startsWith('localhost')
+        ? `http://${apiHost}`
+        : `https://${apiHost}`,
     })
 
     // Initialize Gateway HttpRequester
-    this.rpc = new HttpRequester({
-      baseUrl: this.rpcUrl,
+    this.gateway = new HttpRequester({
+      baseUrl: this.getGatewayUrl(),
     })
 
     // Initialize an MpcSigner
     this.signer = new MpcSigner({
-      mpcUrl: this.mpcUrl,
-      keychain: this.keychain,
-      mpcVersion: mpcVersion,
-    })
-
-    this.signer.getAddress().then((address) => {
-      if (typeof address !== 'undefined' && address.length) {
-        this.address = address
-      }
+      mpcHost: mpcHost,
+      keychain: keychain,
+      version: version,
     })
   }
 
@@ -149,7 +145,7 @@ class Provider {
    *
    * @returns string
    */
-  public getRpcUrl(): string {
+  public getGatewayUrl(): string {
     if (typeof this.gatewayConfig === 'string') {
       // If the gatewayConfig is just a static URL, return that
       return this.gatewayConfig
@@ -252,7 +248,11 @@ class Provider {
    * @param args The arguments of the request being made
    * @returns Promise<any>
    */
-  public async request({ method, params }: RequestArguments): Promise<any> {
+  public async request({
+    method,
+    params,
+    connect,
+  }: RequestArguments): Promise<any> {
     if (method === 'eth_chainId') {
       return this.chainId
     }
@@ -280,6 +280,7 @@ class Provider {
       const transactionHash = await this.handleSigningRequests({
         method,
         params,
+        connect,
       })
 
       if (transactionHash) {
@@ -305,31 +306,20 @@ class Provider {
     return result
   }
 
-  public _setAddress(address: string): void {
-    this.address = address
-
-    if (!this.connected) {
-      this.dispatchConnect()
-    }
-  }
-
   /**
    * Updates the chainId of this instance and builds a new RPC HttpRequester for
    * the gateway used for the new chain
    *
-   * @param chainId A hex string of the chainId to use for this connection
+   * @param chainId The numerical ID of the chain to switch to
    * @returns BaseProvider
    */
-  public async setChainId(chainId: string): Promise<Provider> {
-    // Disconnect from the current chain
-    this.connected = false
-
+  public async setChainId(chainId: number, connect?: PortalConnect): Promise<Provider> {
     // Update the chainId
-    this.chainId = Number(`${chainId}`)
+    this.chainId = chainId
 
     // Re-initialize the Gateway HttpRequester
-    this.rpc = new HttpRequester({
-      baseUrl: this.getRpcUrl(),
+    this.gateway = new HttpRequester({
+      baseUrl: this.getGatewayUrl(),
     })
 
     // Emit event for update
@@ -337,6 +327,12 @@ class Provider {
       chainId: this.chainId,
     } as SwitchEthereumChainParameter)
 
+
+    if (connect) {
+      connect.emit('portalConnect_chainChanged', {
+        chainId: this.chainId,
+      } as SwitchEthereumChainParameter)
+    }
     // Dispatch 'connect' event
     this.dispatchConnect()
 
@@ -351,6 +347,7 @@ class Provider {
   protected async getApproval({
     method,
     params,
+    connect,
   }: RequestArguments): Promise<boolean> {
     // If autoApprove is enabled, just resolve to true
     if (this.autoApprove) {
@@ -359,9 +356,9 @@ class Provider {
 
     const signingHandlers = this.events['portal_signingRequested']
 
-    if (!signingHandlers || signingHandlers.length === 0) {
+    if (!connect && (!signingHandlers || signingHandlers.length === 0)) {
       throw new Error(
-        `[PortalProvider] Auto-approve is disabled. Cannot perform 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.`,
       )
     }
 
@@ -407,15 +404,21 @@ class Provider {
       )
 
       // Tell any listening clients that signing has been requested
-      this.emit('portal_signingRequested', {
-        method,
-        params,
-      })
+      if (connect) {
+        connect.emit('portalConnect_signingRequested', {
+          method,
+          params,
+        })
+      } else {
+        this.emit('portal_signingRequested', {
+          method,
+          params,
+        })
+      }
     })
   }
 
   private async dispatchConnect(): Promise<void> {
-    this.connected = true
     this.emit('connect', {
       chainId: `0x${this.chainId.toString(16)}`,
     })
@@ -432,7 +435,7 @@ class Provider {
     params,
   }: RequestArguments): Promise<any> {
     // Pass request off to the gateway
-    return await this.rpc.post<any>('', {
+    return await this.gateway.post<any>('', {
       body: {
         jsonrpc: '2.0',
         id: this.chainId,
@@ -451,10 +454,11 @@ class Provider {
   private async handleSigningRequests({
     method,
     params,
+    connect,
   }: RequestArguments): Promise<any> {
     const isApproved = passiveSignerMethods.includes(method)
       ? true
-      : await this.getApproval({ method, params })
+      : await this.getApproval({ method, params, connect })
 
     if (!isApproved) {
       this.log.info(
@@ -481,7 +485,7 @@ class Provider {
 
         if (result) {
           try {
-            await this.portal.post('/api/v1/analytics/track', {
+            await this.portalApi.post('/api/v1/analytics/track', {
               headers: {
                 Authentication: `Bearer ${this.apiKey}`,
               },

package/src/signers/abstract.ts

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

package/src/signers/mpc.ts

@@ -15,18 +15,31 @@ import {
 } from '../../types'
 
 class MpcSigner implements Signer {
+  private isSimulator: boolean
+  private keychain: KeychainAdapter
   private mpc: PortalMobileMpc
+  private mpcHost: string // should we add a default here mpc.portalhq.io
+  private version: string = 'v4'
 
-  public address?: string
-  public keychain: KeychainAdapter
-  public mpcUrl: string // should we add a default here mpc.portalhq.io
-  public mpcVersion: string = 'v4'
+  private get address(): Promise<string | undefined> {
+    return this.keychain.getAddress(this.isSimulator)
+  }
+
+  private get signingShare(): Promise<string> {
+    return this.keychain.getDkgResult(this.isSimulator)
+  }
 
-  constructor({ keychain, mpcUrl, mpcVersion = 'v4' }: MpcSignerOptions) {
+  constructor({
+    keychain,
+    isSimulator = false,
+    mpcHost = 'mpc.portalhq.io',
+    version = 'v4',
+  }: MpcSignerOptions) {
+    this.isSimulator = isSimulator
     this.keychain = keychain
     this.mpc = NativeModules.PortalMobileMpc
-    this.mpcUrl = mpcUrl
-    this.mpcVersion = mpcVersion
+    this.mpcHost = mpcHost
+    this.version = version
 
     if (!this.mpc) {
       throw new Error(
@@ -35,25 +48,11 @@ class MpcSigner implements Signer {
     }
   }
 
-  public async getAddress(): Promise<string> {
-    if (this.address) {
-      return this.address
-    }
-
-    const address = await this.keychain.getAddress()
-
-    if (typeof address !== 'undefined' && address.length) {
-      this.address = address
-    }
-
-    return address
-  }
-
   public async sign(
     message: SigningRequestArguments,
     provider: Provider,
   ): Promise<any> {
-    const address = await this.keychain.getAddress()
+    const address = await this.address
     const apiKey = provider.apiKey
 
     const { method, params } = message
@@ -67,17 +66,17 @@ class MpcSigner implements Signer {
         break
     }
 
-    const dkg = await this.keychain.getDkgResult()
+    const signingShare = await this.signingShare
 
     const result = await this.mpc.sign(
       apiKey,
-      this.mpcUrl,
-      dkg,
+      this.mpcHost,
+      signingShare,
       message.method,
       JSON.stringify(this.buildParams(method, params)),
-      provider.rpcUrl,
+      provider.gatewayUrl,
       provider.chainId.toString(),
-      this.mpcVersion,
+      this.version,
     )
 
     const { data, error } = JSON.parse(String(result)) as SigningResponse

package/types.d.ts

@@ -1,5 +1,6 @@
 // Types
 
+import PortalConnect from '@portal-hq/connect'
 import { KeychainAdapter, type PortalError } from '@portal-hq/utils'
 
 export type EventHandler = (data: any) => void
@@ -16,8 +17,11 @@ export interface GatewayConfig {
 
 export interface MpcSignerOptions extends SignerOptions {
   keychain: KeychainAdapter
-  mpcUrl: string
-  mpcVersion?: string
+
+  // Optional
+  isSimulator?: boolean
+  mpcHost?: string
+  version?: string
 }
 
 export interface PortalMobileMpc {
@@ -46,18 +50,18 @@ export interface PortalMobileMpc {
 }
 
 export interface ProviderOptions {
-  // Required options
+  // Required
   apiKey: string
   chainId: number
   keychain: KeychainAdapter
   gatewayConfig: GatewayLike
 
-  // Optional options
-  apiUrl?: string
+  // Optional
+  isSimulator?: boolean
   autoApprove?: boolean
-  enableMpc?: boolean
-  mpcUrl?: string
-  mpcVersion?: string
+  apiHost?: string
+  mpcHost?: string
+  version?: string
 }
 
 export interface RegisteredEventHandler {
@@ -68,6 +72,7 @@ export interface RegisteredEventHandler {
 export interface RequestArguments {
   method: string
   params?: unknown[] | SigningRequestParams
+  connect?: PortalConnect
 }
 
 export interface SignResult {