@portal-hq/provider 0.2.16 → 0.2.18

package/lib/commonjs/providers/index.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("@portal-hq/utils");
-const requesters_1 = require("../requesters");
 const signers_1 = require("../signers");
 const passiveSignerMethods = [
     'eth_accounts',
@@ -32,8 +31,7 @@ class Provider {
     // Required options
     apiKey, chainId, keychain, 
     // Optional options
-    apiUrl = 'api.portalhq.io', autoApprove = false, enableMpc = true, mpcUrl = 'mpc.portalhq.io', gatewayConfig = {}, }) {
-        this._address = '';
+    apiUrl = 'api.portalhq.io', autoApprove = false, mpcUrl = 'mpc.portalhq.io', gatewayConfig = {}, }) {
         // Handle required fields
         if (!apiKey || apiKey.length === 0) {
             throw new utils_1.InvalidApiKeyError();
@@ -49,47 +47,33 @@ class Provider {
         this.apiUrl = apiUrl;
         this.autoApprove = autoApprove;
         this.chainId = chainId;
+        this.connected = false;
         this.events = {};
-        this.isMPC = enableMpc;
+        this.gatewayConfig = gatewayConfig;
+        this.isMPC = true;
         this.keychain = keychain;
-        this.log = console;
         this.mpcUrl = mpcUrl;
-        this.portal = new requesters_1.HttpRequester({
+        this.rpcUrl = this.getRpcUrl();
+        // Add a logger
+        this.log = console;
+        // Initialize Portal API HttpRequester
+        this.portal = new utils_1.HttpRequester({
             baseUrl: this.apiUrl,
         });
-        // Handle RPC Initialization
-        this.gatewayConfig = gatewayConfig;
-        this.rpc = new requesters_1.HttpRequester({
-            baseUrl: this.getRpcUrl(),
+        // Initialize Gateway HttpRequester
+        this.rpc = new utils_1.HttpRequester({
+            baseUrl: this.rpcUrl,
+        });
+        // Initialize an MpcSigner
+        this.signer = new signers_1.MpcSigner({
+            mpcUrl: this.mpcUrl,
+            keychain: this.keychain,
+        });
+        this.signer.getAddress().then((address) => {
+            if (typeof address !== 'undefined' && address.length) {
+                this.address = address;
+            }
         });
-        if (this.isMPC) {
-            // If MPC is enabled, initialize an MpcSigner
-            this.signer = new signers_1.MpcSigner({
-                mpcUrl: this.mpcUrl,
-                keychain: this.keychain,
-            });
-        }
-        else {
-            // If MPC is disabled, initialize an HttpSigner, talking to whatever httpHost was provided
-            this.signer = new signers_1.HttpSigner({
-                keychain: this.keychain,
-                portal: this.portal,
-            });
-        }
-        this.dispatchConnect();
-    }
-    get address() {
-        return this._address;
-    }
-    set address(value) {
-        this._address = value;
-        if (this.signer && this.isMPC) {
-            ;
-            this.signer._address = value;
-        }
-    }
-    get rpcUrl() {
-        return this.getRpcUrl();
     }
     /**
      * Invokes all registered event handlers with the data provided
@@ -110,6 +94,29 @@ class Provider {
         this.events[event] = handlers.filter((handler) => !handler.once);
         return this;
     }
+    /**
+     * Determines the RPC URL to be used for the current chain
+     *
+     * @returns string
+     */
+    getRpcUrl() {
+        if (typeof this.gatewayConfig === 'string') {
+            // If the gatewayConfig is just a static URL, return that
+            return this.gatewayConfig;
+        }
+        else if (typeof this.gatewayConfig === 'object' &&
+            !this.gatewayConfig.hasOwnProperty(this.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}`);
+        }
+        // Get the entry for the current chainId from the gatewayConfig
+        const config = this.gatewayConfig[this.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}`);
+    }
     /**
      * Registers an event handler for the provided event
      *
@@ -154,7 +161,6 @@ class Provider {
     }
     removeEventListener(event, listenerToRemove) {
         if (!this.events[event]) {
-            this.log.info(`[PortalProvider] Attempted to remove a listener from unregistered event '${event}'. Ignoring.`);
             return;
         }
         if (!listenerToRemove) {
@@ -201,7 +207,6 @@ class Provider {
                     params,
                 });
                 if (transactionHash) {
-                    console.log(`Received transaction hash: `, transactionHash);
                     this.emit('portal_signatureReceived', {
                         method,
                         params,
@@ -223,6 +228,12 @@ 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
@@ -230,13 +241,22 @@ class Provider {
      * @param chainId A hex string of the chainId to use for this connection
      * @returns BaseProvider
      */
-    updateChainId(chainId) {
+    setChainId(chainId) {
         return __awaiter(this, void 0, void 0, function* () {
+            // Disconnect from the current chain
+            this.connected = false;
+            // Update the chainId
             this.chainId = Number(`${chainId}`);
-            this.rpc = new requesters_1.HttpRequester({
+            // Re-initialize the Gateway HttpRequester
+            this.rpc = new utils_1.HttpRequester({
                 baseUrl: this.getRpcUrl(),
             });
-            this.emit('chainChanged', { chainId });
+            // Emit event for update
+            this.emit('chainChanged', {
+                chainId: this.chainId,
+            });
+            // Dispatch 'connect' event
+            this.dispatchConnect();
             return this;
         });
     }
@@ -251,7 +271,8 @@ class Provider {
             if (this.autoApprove) {
                 return true;
             }
-            if (!this.events['portal_signingRequested']) {
+            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.`);
             }
             return new Promise((resolve) => {
@@ -260,7 +281,6 @@ class Provider {
                 this.removeEventListener('portal_signingRejected');
                 // If the signing has been approved, resolve to true
                 this.once('portal_signingApproved', ({ method: approvedMethod, params: approvedParams }) => {
-                    console.log(`[PortalProvider] Signing Approved`, method, params);
                     // Remove already used listeners
                     this.removeEventListener('portal_signingApproved');
                     this.removeEventListener('portal_signingRejected');
@@ -272,7 +292,6 @@ class Provider {
                 });
                 // If the signing request has been rejected, resolve to false
                 this.once('portal_signingRejected', ({ method: rejectedMethod, params: rejectedParams }) => {
-                    console.log(`[PortalProvider] Signing Approved`, method, params);
                     // Remove already used listeners
                     this.removeEventListener('portal_signingApproved');
                     this.removeEventListener('portal_signingRejected');
@@ -292,35 +311,12 @@ class Provider {
     }
     dispatchConnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log(`[PortalProvider] Connected on chainId: 0x${this.chainId.toString(16)}`);
+            this.connected = true;
             this.emit('connect', {
                 chainId: `0x${this.chainId.toString(16)}`,
             });
         });
     }
-    /**
-     * Determines the RPC URL to be used for the current chain
-     *
-     * @returns string
-     */
-    getRpcUrl() {
-        if (typeof this.gatewayConfig === 'string') {
-            // If the gatewayConfig is just a static URL, return that
-            return this.gatewayConfig;
-        }
-        else if (typeof this.gatewayConfig === 'object' &&
-            !this.gatewayConfig.hasOwnProperty(this.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}`);
-        }
-        // Get the entry for the current chainId from the gatewayConfig
-        const config = this.gatewayConfig[this.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}`);
-    }
     /**
      * Sends the provided request payload along to the RPC HttpRequester
      *

package/lib/commonjs/signers/abstract.js

@@ -10,9 +10,14 @@ 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 child of BaseSigner');
+            throw new Error('[Portal] sign() method must be implemented in a subclass of Signer');
         });
     }
 }

package/lib/commonjs/signers/index.js

@@ -3,10 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MpcSigner = exports.HttpSigner = exports.Signer = void 0;
+exports.MpcSigner = exports.Signer = void 0;
 var abstract_1 = require("./abstract");
 Object.defineProperty(exports, "Signer", { enumerable: true, get: function () { return __importDefault(abstract_1).default; } });
-var http_1 = require("./http");
-Object.defineProperty(exports, "HttpSigner", { enumerable: true, get: function () { return __importDefault(http_1).default; } });
 var mpc_1 = require("./mpc");
 Object.defineProperty(exports, "MpcSigner", { enumerable: true, get: function () { return __importDefault(mpc_1).default; } });

package/lib/commonjs/signers/mpc.js

@@ -13,7 +13,6 @@ const react_native_1 = require("react-native");
 const utils_1 = require("@portal-hq/utils");
 class MpcSigner {
     constructor(opts) {
-        this._address = '';
         this.buildParams = (method, txParams) => {
             let params = txParams;
             switch (method) {
@@ -37,15 +36,17 @@ class MpcSigner {
             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.`);
         }
     }
-    get address() {
-        return (() => __awaiter(this, void 0, void 0, function* () {
-            if (this._address) {
-                return this._address;
+    getAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.address) {
+                return this.address;
             }
             const address = yield this.keychain.getAddress();
-            this._address = address;
+            if (typeof address !== 'undefined' && address.length) {
+                this.address = address;
+            }
             return address;
-        }))();
+        });
     }
     sign(message, provider) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -60,11 +61,8 @@ class MpcSigner {
                 default:
                     break;
             }
-            console.log(`[Portal:MpcSigner] Requesting signature from PortalMobileMpc for:`, JSON.stringify(message, null, 2));
             const dkg = yield this.keychain.getDkgResult();
-            console.log(`[PortalMpcSigner] RPC URL: ${provider.rpcUrl}`);
             const result = yield this.mpc.sign(apiKey, this.mpcUrl, dkg, message.method, JSON.stringify(this.buildParams(method, params)), provider.rpcUrl, provider.chainId.toString());
-            console.log(`[PortalMpcSigner] Result: `, result);
             const { data, error } = JSON.parse(String(result));
             if (error && error.length) {
                 throw new utils_1.MpcSigningError(error);

package/lib/esm/providers/index.js

@@ -7,9 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { InvalidApiKeyError, InvalidChainIdError, InvalidGatewayConfigError, ProviderRpcError, RpcErrorCodes, } from '@portal-hq/utils';
-import { HttpRequester } from '../requesters';
-import { HttpSigner, MpcSigner } from '../signers';
+import { HttpRequester, InvalidApiKeyError, InvalidChainIdError, InvalidGatewayConfigError, ProviderRpcError, RpcErrorCodes, } from '@portal-hq/utils';
+import { MpcSigner } from '../signers';
 const passiveSignerMethods = [
     'eth_accounts',
     'eth_chainId',
@@ -30,8 +29,7 @@ class Provider {
     // Required options
     apiKey, chainId, keychain, 
     // Optional options
-    apiUrl = 'api.portalhq.io', autoApprove = false, enableMpc = true, mpcUrl = 'mpc.portalhq.io', gatewayConfig = {}, }) {
-        this._address = '';
+    apiUrl = 'api.portalhq.io', autoApprove = false, mpcUrl = 'mpc.portalhq.io', gatewayConfig = {}, }) {
         // Handle required fields
         if (!apiKey || apiKey.length === 0) {
             throw new InvalidApiKeyError();
@@ -47,47 +45,33 @@ class Provider {
         this.apiUrl = apiUrl;
         this.autoApprove = autoApprove;
         this.chainId = chainId;
+        this.connected = false;
         this.events = {};
-        this.isMPC = enableMpc;
+        this.gatewayConfig = gatewayConfig;
+        this.isMPC = true;
         this.keychain = keychain;
-        this.log = console;
         this.mpcUrl = mpcUrl;
+        this.rpcUrl = this.getRpcUrl();
+        // Add a logger
+        this.log = console;
+        // Initialize Portal API HttpRequester
         this.portal = new HttpRequester({
             baseUrl: this.apiUrl,
         });
-        // Handle RPC Initialization
-        this.gatewayConfig = gatewayConfig;
+        // Initialize Gateway HttpRequester
         this.rpc = new HttpRequester({
-            baseUrl: this.getRpcUrl(),
+            baseUrl: this.rpcUrl,
+        });
+        // Initialize an MpcSigner
+        this.signer = new MpcSigner({
+            mpcUrl: this.mpcUrl,
+            keychain: this.keychain,
+        });
+        this.signer.getAddress().then((address) => {
+            if (typeof address !== 'undefined' && address.length) {
+                this.address = address;
+            }
         });
-        if (this.isMPC) {
-            // If MPC is enabled, initialize an MpcSigner
-            this.signer = new MpcSigner({
-                mpcUrl: this.mpcUrl,
-                keychain: this.keychain,
-            });
-        }
-        else {
-            // If MPC is disabled, initialize an HttpSigner, talking to whatever httpHost was provided
-            this.signer = new HttpSigner({
-                keychain: this.keychain,
-                portal: this.portal,
-            });
-        }
-        this.dispatchConnect();
-    }
-    get address() {
-        return this._address;
-    }
-    set address(value) {
-        this._address = value;
-        if (this.signer && this.isMPC) {
-            ;
-            this.signer._address = value;
-        }
-    }
-    get rpcUrl() {
-        return this.getRpcUrl();
     }
     /**
      * Invokes all registered event handlers with the data provided
@@ -108,6 +92,29 @@ class Provider {
         this.events[event] = handlers.filter((handler) => !handler.once);
         return this;
     }
+    /**
+     * Determines the RPC URL to be used for the current chain
+     *
+     * @returns string
+     */
+    getRpcUrl() {
+        if (typeof this.gatewayConfig === 'string') {
+            // If the gatewayConfig is just a static URL, return that
+            return this.gatewayConfig;
+        }
+        else if (typeof this.gatewayConfig === 'object' &&
+            !this.gatewayConfig.hasOwnProperty(this.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}`);
+        }
+        // Get the entry for the current chainId from the gatewayConfig
+        const config = this.gatewayConfig[this.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}`);
+    }
     /**
      * Registers an event handler for the provided event
      *
@@ -152,7 +159,6 @@ class Provider {
     }
     removeEventListener(event, listenerToRemove) {
         if (!this.events[event]) {
-            this.log.info(`[PortalProvider] Attempted to remove a listener from unregistered event '${event}'. Ignoring.`);
             return;
         }
         if (!listenerToRemove) {
@@ -199,7 +205,6 @@ class Provider {
                     params,
                 });
                 if (transactionHash) {
-                    console.log(`Received transaction hash: `, transactionHash);
                     this.emit('portal_signatureReceived', {
                         method,
                         params,
@@ -221,6 +226,12 @@ 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
@@ -228,13 +239,22 @@ class Provider {
      * @param chainId A hex string of the chainId to use for this connection
      * @returns BaseProvider
      */
-    updateChainId(chainId) {
+    setChainId(chainId) {
         return __awaiter(this, void 0, void 0, function* () {
+            // Disconnect from the current chain
+            this.connected = false;
+            // Update the chainId
             this.chainId = Number(`${chainId}`);
+            // Re-initialize the Gateway HttpRequester
             this.rpc = new HttpRequester({
                 baseUrl: this.getRpcUrl(),
             });
-            this.emit('chainChanged', { chainId });
+            // Emit event for update
+            this.emit('chainChanged', {
+                chainId: this.chainId,
+            });
+            // Dispatch 'connect' event
+            this.dispatchConnect();
             return this;
         });
     }
@@ -249,7 +269,8 @@ class Provider {
             if (this.autoApprove) {
                 return true;
             }
-            if (!this.events['portal_signingRequested']) {
+            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.`);
             }
             return new Promise((resolve) => {
@@ -258,7 +279,6 @@ class Provider {
                 this.removeEventListener('portal_signingRejected');
                 // If the signing has been approved, resolve to true
                 this.once('portal_signingApproved', ({ method: approvedMethod, params: approvedParams }) => {
-                    console.log(`[PortalProvider] Signing Approved`, method, params);
                     // Remove already used listeners
                     this.removeEventListener('portal_signingApproved');
                     this.removeEventListener('portal_signingRejected');
@@ -270,7 +290,6 @@ class Provider {
                 });
                 // If the signing request has been rejected, resolve to false
                 this.once('portal_signingRejected', ({ method: rejectedMethod, params: rejectedParams }) => {
-                    console.log(`[PortalProvider] Signing Approved`, method, params);
                     // Remove already used listeners
                     this.removeEventListener('portal_signingApproved');
                     this.removeEventListener('portal_signingRejected');
@@ -290,35 +309,12 @@ class Provider {
     }
     dispatchConnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            console.log(`[PortalProvider] Connected on chainId: 0x${this.chainId.toString(16)}`);
+            this.connected = true;
             this.emit('connect', {
                 chainId: `0x${this.chainId.toString(16)}`,
             });
         });
     }
-    /**
-     * Determines the RPC URL to be used for the current chain
-     *
-     * @returns string
-     */
-    getRpcUrl() {
-        if (typeof this.gatewayConfig === 'string') {
-            // If the gatewayConfig is just a static URL, return that
-            return this.gatewayConfig;
-        }
-        else if (typeof this.gatewayConfig === 'object' &&
-            !this.gatewayConfig.hasOwnProperty(this.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}`);
-        }
-        // Get the entry for the current chainId from the gatewayConfig
-        const config = this.gatewayConfig[this.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}`);
-    }
     /**
      * Sends the provided request payload along to the RPC HttpRequester
      *

package/lib/esm/signers/abstract.js

@@ -8,9 +8,14 @@ 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 child of BaseSigner');
+            throw new Error('[Portal] sign() method must be implemented in a subclass of Signer');
         });
     }
 }

package/lib/esm/signers/index.js

@@ -1,3 +1,2 @@
 export { default as Signer } from './abstract';
-export { default as HttpSigner } from './http';
 export { default as MpcSigner } from './mpc';

package/lib/esm/signers/mpc.js

@@ -11,7 +11,6 @@ import { NativeModules } from 'react-native';
 import { MpcSigningError, } from '@portal-hq/utils';
 class MpcSigner {
     constructor(opts) {
-        this._address = '';
         this.buildParams = (method, txParams) => {
             let params = txParams;
             switch (method) {
@@ -35,15 +34,17 @@ class MpcSigner {
             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.`);
         }
     }
-    get address() {
-        return (() => __awaiter(this, void 0, void 0, function* () {
-            if (this._address) {
-                return this._address;
+    getAddress() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.address) {
+                return this.address;
             }
             const address = yield this.keychain.getAddress();
-            this._address = address;
+            if (typeof address !== 'undefined' && address.length) {
+                this.address = address;
+            }
             return address;
-        }))();
+        });
     }
     sign(message, provider) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -58,11 +59,8 @@ class MpcSigner {
                 default:
                     break;
             }
-            console.log(`[Portal:MpcSigner] Requesting signature from PortalMobileMpc for:`, JSON.stringify(message, null, 2));
             const dkg = yield this.keychain.getDkgResult();
-            console.log(`[PortalMpcSigner] RPC URL: ${provider.rpcUrl}`);
             const result = yield this.mpc.sign(apiKey, this.mpcUrl, dkg, message.method, JSON.stringify(this.buildParams(method, params)), provider.rpcUrl, provider.chainId.toString());
-            console.log(`[PortalMpcSigner] Result: `, result);
             const { data, error } = JSON.parse(String(result));
             if (error && error.length) {
                 throw new MpcSigningError(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portal-hq/provider",
-  "version": "0.2.16",
+  "version": "0.2.18",
   "license": "MIT",
   "main": "lib/commonjs/index",
   "module": "lib/esm/index",
@@ -14,12 +14,18 @@
   "scripts": {
     "prepare": "yarn prepare:cjs && yarn prepare:esm",
     "prepare:cjs": "tsc --outDir lib/commonjs --module commonjs",
-    "prepare:esm": "tsc --outDir lib/esm --module es2015 --target es2015"
+    "prepare:esm": "tsc --outDir lib/esm --module es2015 --target es2015",
+    "test": "jest"
   },
   "dependencies": {
-    "@portal-hq/utils": "^0.2.16"
+    "@portal-hq/utils": "^0.2.17"
   },
   "devDependencies": {
+    "@babel/preset-typescript": "^7.18.6",
+    "@types/jest": "^29.2.0",
+    "jest": "^29.2.1",
+    "jest-environment-jsdom": "^29.2.2",
+    "ts-jest": "^29.0.3",
     "typescript": "^4.8.4"
   }
 }

package/src/providers/index.ts

@@ -1,4 +1,5 @@
 import {
+  HttpRequester,
   InvalidApiKeyError,
   InvalidChainIdError,
   InvalidGatewayConfigError,
@@ -7,8 +8,7 @@ import {
   RpcErrorCodes,
 } from '@portal-hq/utils'
 
-import { HttpRequester } from '../requesters'
-import { HttpSigner, MpcSigner, Signer } from '../signers'
+import { MpcSigner, Signer } from '../signers'
 import {
   type EventHandler,
   type GatewayLike,
@@ -38,21 +38,21 @@ const signerMethods = [
 class Provider {
   public readonly mpcUrl: string
   public readonly portal: HttpRequester
-  public apiKey: string
 
+  public address?: string
+  public apiKey: string
+  public apiUrl: string
+  public autoApprove?: boolean
   public chainId: number
-  public isMPC?: boolean
-
-  private _address: string = ''
-  private apiUrl: string
-  private autoApprove?: boolean
-  private events: Record<string, RegisteredEventHandler[]>
-  private keychain: KeychainAdapter
-  private log: Console
-  private gatewayConfig: GatewayLike
-  private rpc: HttpRequester
-
-  public signer?: Signer
+  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
 
   constructor({
     // Required options
@@ -63,7 +63,6 @@ class Provider {
     // Optional options
     apiUrl = 'api.portalhq.io',
     autoApprove = false,
-    enableMpc = true,
     mpcUrl = 'mpc.portalhq.io',
     gatewayConfig = {},
   }: ProviderOptions) {
@@ -83,53 +82,38 @@ class Provider {
     this.apiUrl = apiUrl
     this.autoApprove = autoApprove
     this.chainId = chainId
+    this.connected = false
     this.events = {}
-    this.isMPC = enableMpc
+    this.gatewayConfig = gatewayConfig
+    this.isMPC = true
     this.keychain = keychain
-    this.log = console
     this.mpcUrl = mpcUrl
+    this.rpcUrl = this.getRpcUrl()
+
+    // Add a logger
+    this.log = console
+
+    // Initialize Portal API HttpRequester
     this.portal = new HttpRequester({
       baseUrl: this.apiUrl,
     })
 
-    // Handle RPC Initialization
-    this.gatewayConfig = gatewayConfig
-
+    // Initialize Gateway HttpRequester
     this.rpc = new HttpRequester({
-      baseUrl: this.getRpcUrl(),
+      baseUrl: this.rpcUrl,
     })
 
-    if (this.isMPC) {
-      // If MPC is enabled, initialize an MpcSigner
-      this.signer = new MpcSigner({
-        mpcUrl: this.mpcUrl,
-        keychain: this.keychain,
-      })
-    } else {
-      // If MPC is disabled, initialize an HttpSigner, talking to whatever httpHost was provided
-      this.signer = new HttpSigner({
-        keychain: this.keychain,
-        portal: this.portal,
-      })
-    }
-
-    this.dispatchConnect()
-  }
-
-  get address(): string {
-    return this._address
-  }
-
-  set address(value: string) {
-    this._address = value
-
-    if (this.signer && this.isMPC) {
-      ;(this.signer as MpcSigner)._address = value
-    }
-  }
+    // Initialize an MpcSigner
+    this.signer = new MpcSigner({
+      mpcUrl: this.mpcUrl,
+      keychain: this.keychain,
+    })
 
-  get rpcUrl(): string {
-    return this.getRpcUrl()
+    this.signer.getAddress().then((address) => {
+      if (typeof address !== 'undefined' && address.length) {
+        this.address = address
+      }
+    })
   }
 
   /**
@@ -155,6 +139,38 @@ class Provider {
     return this
   }
 
+  /**
+   * Determines the RPC URL to be used for the current chain
+   *
+   * @returns string
+   */
+  public getRpcUrl(): string {
+    if (typeof this.gatewayConfig === 'string') {
+      // If the gatewayConfig is just a static URL, return that
+      return this.gatewayConfig
+    } else if (
+      typeof this.gatewayConfig === 'object' &&
+      !this.gatewayConfig.hasOwnProperty(this.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}`,
+      )
+    }
+
+    // Get the entry for the current chainId from the gatewayConfig
+    const config = this.gatewayConfig[this.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}`,
+    )
+  }
+
   /**
    * Registers an event handler for the provided event
    *
@@ -208,9 +224,6 @@ class Provider {
     listenerToRemove?: EventHandler,
   ): void {
     if (!this.events[event]) {
-      this.log.info(
-        `[PortalProvider] Attempted to remove a listener from unregistered event '${event}'. Ignoring.`,
-      )
       return
     }
 
@@ -265,8 +278,6 @@ class Provider {
       })
 
       if (transactionHash) {
-        console.log(`Received transaction hash: `, transactionHash)
-
         this.emit('portal_signatureReceived', {
           method,
           params,
@@ -289,6 +300,14 @@ 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
@@ -296,14 +315,25 @@ class Provider {
    * @param chainId A hex string of the chainId to use for this connection
    * @returns BaseProvider
    */
-  public async updateChainId(chainId: string): Promise<Provider> {
+  public async setChainId(chainId: string): Promise<Provider> {
+    // Disconnect from the current chain
+    this.connected = false
+
+    // Update the chainId
     this.chainId = Number(`${chainId}`)
 
+    // Re-initialize the Gateway HttpRequester
     this.rpc = new HttpRequester({
       baseUrl: this.getRpcUrl(),
     })
 
-    this.emit('chainChanged', { chainId } as SwitchEthereumChainParameter)
+    // Emit event for update
+    this.emit('chainChanged', {
+      chainId: this.chainId,
+    } as SwitchEthereumChainParameter)
+
+    // Dispatch 'connect' event
+    this.dispatchConnect()
 
     return this
   }
@@ -322,7 +352,9 @@ class Provider {
       return true
     }
 
-    if (!this.events['portal_signingRequested']) {
+    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.`,
       )
@@ -337,7 +369,6 @@ class Provider {
       this.once(
         'portal_signingApproved',
         ({ method: approvedMethod, params: approvedParams }) => {
-          console.log(`[PortalProvider] Signing Approved`, method, params)
           // Remove already used listeners
           this.removeEventListener('portal_signingApproved')
           this.removeEventListener('portal_signingRejected')
@@ -356,7 +387,6 @@ class Provider {
       this.once(
         'portal_signingRejected',
         ({ method: rejectedMethod, params: rejectedParams }) => {
-          console.log(`[PortalProvider] Signing Approved`, method, params)
           // Remove already used listeners
           this.removeEventListener('portal_signingApproved')
           this.removeEventListener('portal_signingRejected')
@@ -380,46 +410,12 @@ class Provider {
   }
 
   private async dispatchConnect(): Promise<void> {
-    console.log(
-      `[PortalProvider] Connected on chainId: 0x${this.chainId.toString(16)}`,
-    )
+    this.connected = true
     this.emit('connect', {
       chainId: `0x${this.chainId.toString(16)}`,
     })
   }
 
-  /**
-   * Determines the RPC URL to be used for the current chain
-   *
-   * @returns string
-   */
-  private getRpcUrl(): string {
-    if (typeof this.gatewayConfig === 'string') {
-      // If the gatewayConfig is just a static URL, return that
-      return this.gatewayConfig
-    } else if (
-      typeof this.gatewayConfig === 'object' &&
-      !this.gatewayConfig.hasOwnProperty(this.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}`,
-      )
-    }
-
-    // Get the entry for the current chainId from the gatewayConfig
-    const config = this.gatewayConfig[this.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}`,
-    )
-  }
-
   /**
    * Sends the provided request payload along to the RPC HttpRequester
    *

package/src/signers/abstract.ts

@@ -2,9 +2,14 @@ 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 child of BaseSigner',
+      '[Portal] sign() method must be implemented in a subclass of Signer',
     )
   }
 }

package/src/signers/index.ts

@@ -1,3 +1,2 @@
 export { default as Signer } from './abstract'
-export { default as HttpSigner } from './http'
 export { default as MpcSigner } from './mpc'

package/src/signers/mpc.ts

@@ -15,10 +15,11 @@ import {
 } from '../../types'
 
 class MpcSigner implements Signer {
-  public _address: string = ''
-  private keychain: KeychainAdapter
   private mpc: PortalMobileMpc
-  private mpcUrl: string
+
+  public address?: string
+  public keychain: KeychainAdapter
+  public mpcUrl: string
 
   constructor(opts: MpcSignerOptions) {
     this.keychain = opts.keychain
@@ -32,18 +33,18 @@ class MpcSigner implements Signer {
     }
   }
 
-  public get address() {
-    return (async () => {
-      if (this._address) {
-        return this._address
-      }
+  public async getAddress(): Promise<string> {
+    if (this.address) {
+      return this.address
+    }
 
-      const address = await this.keychain.getAddress()
+    const address = await this.keychain.getAddress()
 
-      this._address = address
+    if (typeof address !== 'undefined' && address.length) {
+      this.address = address
+    }
 
-      return address
-    })()
+    return address
   }
 
   public async sign(
@@ -64,15 +65,8 @@ class MpcSigner implements Signer {
         break
     }
 
-    console.log(
-      `[Portal:MpcSigner] Requesting signature from PortalMobileMpc for:`,
-      JSON.stringify(message, null, 2),
-    )
-
     const dkg = await this.keychain.getDkgResult()
 
-    console.log(`[PortalMpcSigner] RPC URL: ${provider.rpcUrl}`)
-
     const result = await this.mpc.sign(
       apiKey,
       this.mpcUrl,
@@ -83,8 +77,6 @@ class MpcSigner implements Signer {
       provider.chainId.toString(),
     )
 
-    console.log(`[PortalMpcSigner] Result: `, result)
-
     const { data, error } = JSON.parse(String(result)) as SigningResponse
 
     if (error && error.length) {

package/types.d.ts

@@ -14,15 +14,6 @@ export interface GatewayConfig {
   [key: number]: string
 }
 
-export interface HttpRequesterOptions {
-  baseUrl: string
-}
-
-export interface HttpSignerOptions extends SignerOptions {
-  keychain: KeychainAdapter
-  portal: HttpRequester
-}
-
 export interface MpcSignerOptions extends SignerOptions {
   keychain: KeychainAdapter
   mpcUrl: string
@@ -88,5 +79,5 @@ export interface SigningResponse {
 }
 
 export interface SwitchEthereumChainParameter {
-  chainId: string
+  chainId: number
 }

package/src/requesters/http.ts

@@ -1,61 +0,0 @@
-import {
-  HttpRequest,
-  type HttpRequestOptions,
-  type HttpOptions,
-  type HttpRequesterOptions,
-} from '@portal-hq/utils'
-
-class HttpRequester {
-  private baseUrl: string
-
-  constructor({ baseUrl }: HttpRequesterOptions) {
-    this.baseUrl = baseUrl.startsWith('https://')
-      ? baseUrl
-      : `https://${baseUrl}`
-  }
-
-  public async get<T>(path: string, options?: HttpOptions): Promise<T> {
-    const requestOptions = {
-      method: 'GET',
-      url: `${this.baseUrl}${path}`,
-    } as HttpRequestOptions
-
-    if (options && options.headers) {
-      requestOptions.headers = this.buildHeaders(options.headers)
-    }
-
-    const request = new HttpRequest(requestOptions)
-    const response = (await request.send()) as T
-
-    return response
-  }
-
-  public async post<T>(path: string, options?: HttpOptions): Promise<T> {
-    const requestOptions = {
-      method: 'POST',
-      url: `${this.baseUrl}${path}`,
-    } as HttpRequestOptions
-
-    requestOptions.headers = this.buildHeaders(
-      options && options.headers ? options.headers : {},
-    )
-
-    if (options && options.body) {
-      requestOptions.body = options.body
-    }
-
-    const request = new HttpRequest(requestOptions)
-    const response = (await request.send()) as T
-
-    return response
-  }
-
-  private buildHeaders(headers: Record<string, any>): Record<string, any> {
-    return {
-      'Content-Type': 'application/json',
-      ...headers,
-    }
-  }
-}
-
-export default HttpRequester

package/src/requesters/index.ts

@@ -1 +0,0 @@
-export { default as HttpRequester } from './http'

package/src/signers/http.ts

@@ -1,77 +0,0 @@
-import {
-  KeychainAdapter,
-  MissingOptionError,
-  SigningRequestArguments,
-} from '@portal-hq/utils'
-
-import { type HttpSignerOptions, type SignResult } from '../../types'
-
-import Signer from './abstract'
-import { Provider } from '../index'
-import HttpRequester from '../requesters/http'
-
-class HttpSigner implements Signer {
-  private portal: HttpRequester
-  private keychain: KeychainAdapter
-
-  constructor(opts: HttpSignerOptions) {
-    if (!opts.portal) {
-      throw new MissingOptionError({
-        className: 'HttpSigner',
-        option: 'portal',
-      })
-    }
-
-    this.keychain = opts.keychain
-    this.portal = opts.portal
-  }
-
-  public async sign(
-    message: SigningRequestArguments,
-    provider: Provider,
-  ): Promise<any> {
-    const address = await this.keychain.getAddress()
-    const { chainId, method, params } = message
-
-    switch (method) {
-      case 'eth_requestAccounts':
-        return [address]
-      case 'eth_accounts':
-        return [address]
-      default:
-        break
-    }
-
-    console.log(
-      `[Portal:HttpSigner] Requesting signature from exchange for:`,
-      JSON.stringify(
-        {
-          chainId,
-          method,
-          params: JSON.stringify([params]),
-        },
-        null,
-        2,
-      ),
-    )
-
-    const signatureResponse = await this.portal.post<SignResult>(
-      '/api/v1/clients/transactions/sign',
-      {
-        body: {
-          chainId,
-          method,
-          params: JSON.stringify([params]),
-        },
-        headers: {
-          Authorization: `Bearer ${provider.apiKey}`,
-          'Content-Type': 'application/json',
-        },
-      },
-    )
-
-    return signatureResponse
-  }
-}
-
-export default HttpSigner