@portal-hq/provider 1.1.0 → 1.1.2

package/lib/commonjs/providers/index.js

@@ -237,7 +237,7 @@ class Provider {
      * @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* () {
             // Update the chainId
             this.chainId = chainId;
@@ -249,6 +249,11 @@ class Provider {
             this.emit('chainChanged', {
                 chainId: this.chainId,
             });
+            if (connect) {
+                connect.emit('portalConnect_chainChanged', {
+                    chainId: this.chainId,
+                });
+            }
             // Dispatch 'connect' event
             this.dispatchConnect();
             return this;

package/lib/esm/providers/index.js

@@ -235,7 +235,7 @@ class Provider {
      * @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* () {
             // Update the chainId
             this.chainId = chainId;
@@ -247,6 +247,11 @@ class Provider {
             this.emit('chainChanged', {
                 chainId: this.chainId,
             });
+            if (connect) {
+                connect.emit('portalConnect_chainChanged', {
+                    chainId: this.chainId,
+                });
+            }
             // Dispatch 'connect' event
             this.dispatchConnect();
             return this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portal-hq/provider",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "license": "MIT",
   "main": "lib/commonjs/index",
   "module": "lib/esm/index",
@@ -19,8 +19,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@portal-hq/connect": "^1.1.0",
-    "@portal-hq/utils": "^1.1.0"
+    "@portal-hq/connect": "^1.1.2",
+    "@portal-hq/utils": "^1.1.2"
   },
   "devDependencies": {
     "@babel/preset-typescript": "^7.18.6",
@@ -30,5 +30,5 @@
     "ts-jest": "^29.0.3",
     "typescript": "^4.8.4"
   },
-  "gitHead": "b65beeaf1dd0423244a099aaa0f3d55734ae676a"
+  "gitHead": "fe11c271c1d85aca8f4e323a5a69b277483dbe89"
 }

package/src/providers/index.ts

@@ -1,11 +1,13 @@
 import {
   Events,
   HttpRequester,
+  IPortalProvider,
   InvalidApiKeyError,
   InvalidChainIdError,
   InvalidGatewayConfigError,
   KeychainAdapter,
   ProviderRpcError,
+  type RequestArguments,
   RpcErrorCodes,
 } from '@portal-hq/utils'
 
@@ -15,9 +17,9 @@ import {
   type GatewayLike,
   type ProviderOptions,
   type RegisteredEventHandler,
-  type RequestArguments,
   type SwitchEthereumChainParameter,
 } from '../../types'
+import PortalConnect from '@portal-hq/connect'
 
 const passiveSignerMethods = [
   'eth_accounts',
@@ -37,7 +39,7 @@ const signerMethods = [
   'personal_sign',
 ]
 
-class Provider {
+class Provider implements IPortalProvider {
   public apiKey: string
   public autoApprove: boolean
   public chainId: number
@@ -124,7 +126,7 @@ class Provider {
    * @param data The data to be passed to registered event handlers
    * @returns BaseProvider
    */
-  public emit(event: string, data: any): Provider {
+  public emit(event: string, data: any): IPortalProvider {
     // Grab the registered event handlers if any are available
     const handlers = this.events[event] || []
 
@@ -178,7 +180,7 @@ class Provider {
    * @param callback The callback to be invoked when the event is emitted
    * @returns BaseProvider
    */
-  public on(event: string, callback: EventHandler): Provider {
+  public on(event: string, callback: EventHandler): IPortalProvider {
     // If no handlers are registered for this event, create an entry for the event
     if (!this.events[event]) {
       this.events[event] = []
@@ -202,7 +204,7 @@ class Provider {
    * @param callback The callback to be invoked the next time the event is emitted
    * @returns BaseProvider
    */
-  public once(event: string, callback: EventHandler): Provider {
+  public once(event: string, callback: EventHandler): IPortalProvider {
     // If no handlers are registered for this event, create an entry for the event
     if (!this.events[event]) {
       this.events[event] = []
@@ -312,7 +314,7 @@ class Provider {
    * @param chainId The numerical ID of the chain to switch to
    * @returns BaseProvider
    */
-  public async setChainId(chainId: number): Promise<Provider> {
+  public async setChainId(chainId: number, connect?: PortalConnect): Promise<Provider> {
     // Update the chainId
     this.chainId = chainId
 
@@ -326,6 +328,12 @@ class Provider {
       chainId: this.chainId,
     } as SwitchEthereumChainParameter)
 
+
+    if (connect) {
+      connect.emit('portalConnect_chainChanged', {
+        chainId: this.chainId,
+      } as SwitchEthereumChainParameter)
+    }
     // Dispatch 'connect' event
     this.dispatchConnect()
 

package/src/signers/mpc.ts

@@ -1,11 +1,11 @@
 import { NativeModules } from 'react-native'
 import {
+  IPortalProvider,
   KeychainAdapter,
   PortalMpcError,
   type SigningRequestArguments,
 } from '@portal-hq/utils'
 
-import { Provider } from '../index'
 import Signer from './abstract'
 
 import {
@@ -50,7 +50,7 @@ class MpcSigner implements Signer {
 
   public async sign(
     message: SigningRequestArguments,
-    provider: Provider,
+    provider: IPortalProvider,
   ): Promise<any> {
     const address = await this.address
     const apiKey = provider.apiKey

package/lib/commonjs/requesters/http.js

@@ -1,52 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@portal-hq/utils");
-class HttpRequester {
-    constructor({ baseUrl }) {
-        this.baseUrl = baseUrl.startsWith('https://')
-            ? baseUrl
-            : `https://${baseUrl}`;
-    }
-    get(path, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const requestOptions = {
-                method: 'GET',
-                url: `${this.baseUrl}${path}`,
-            };
-            if (options && options.headers) {
-                requestOptions.headers = this.buildHeaders(options.headers);
-            }
-            const request = new utils_1.HttpRequest(requestOptions);
-            const response = (yield request.send());
-            return response;
-        });
-    }
-    post(path, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const requestOptions = {
-                method: 'POST',
-                url: `${this.baseUrl}${path}`,
-            };
-            requestOptions.headers = this.buildHeaders(options && options.headers ? options.headers : {});
-            if (options && options.body) {
-                requestOptions.body = options.body;
-            }
-            const request = new utils_1.HttpRequest(requestOptions);
-            const response = (yield request.send());
-            return response;
-        });
-    }
-    buildHeaders(headers) {
-        return Object.assign({ 'Content-Type': 'application/json' }, headers);
-    }
-}
-exports.default = HttpRequester;

package/lib/commonjs/requesters/index.js

@@ -1,8 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpRequester = void 0;
-var http_1 = require("./http");
-Object.defineProperty(exports, "HttpRequester", { enumerable: true, get: function () { return __importDefault(http_1).default; } });

package/lib/commonjs/signers/http.js

@@ -1,56 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("@portal-hq/utils");
-class HttpSigner {
-    constructor(opts) {
-        if (!opts.portal) {
-            throw new utils_1.MissingOptionError({
-                className: 'HttpSigner',
-                option: 'portal',
-            });
-        }
-        this.keychain = opts.keychain;
-        this.portal = opts.portal;
-    }
-    sign(message, provider) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const address = yield 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 = yield this.portal.post('/api/v1/clients/transactions/sign', {
-                body: {
-                    chainId,
-                    method,
-                    params: JSON.stringify([params]),
-                },
-                headers: {
-                    Authorization: `Bearer ${provider.apiKey}`,
-                    'Content-Type': 'application/json',
-                },
-            });
-            return signatureResponse;
-        });
-    }
-}
-exports.default = HttpSigner;

package/lib/esm/requesters/http.js

@@ -1,50 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { HttpRequest, } from '@portal-hq/utils';
-class HttpRequester {
-    constructor({ baseUrl }) {
-        this.baseUrl = baseUrl.startsWith('https://')
-            ? baseUrl
-            : `https://${baseUrl}`;
-    }
-    get(path, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const requestOptions = {
-                method: 'GET',
-                url: `${this.baseUrl}${path}`,
-            };
-            if (options && options.headers) {
-                requestOptions.headers = this.buildHeaders(options.headers);
-            }
-            const request = new HttpRequest(requestOptions);
-            const response = (yield request.send());
-            return response;
-        });
-    }
-    post(path, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const requestOptions = {
-                method: 'POST',
-                url: `${this.baseUrl}${path}`,
-            };
-            requestOptions.headers = this.buildHeaders(options && options.headers ? options.headers : {});
-            if (options && options.body) {
-                requestOptions.body = options.body;
-            }
-            const request = new HttpRequest(requestOptions);
-            const response = (yield request.send());
-            return response;
-        });
-    }
-    buildHeaders(headers) {
-        return Object.assign({ 'Content-Type': 'application/json' }, headers);
-    }
-}
-export default HttpRequester;

package/lib/esm/requesters/index.js

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

package/lib/esm/signers/http.js

@@ -1,54 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { MissingOptionError, } from '@portal-hq/utils';
-class HttpSigner {
-    constructor(opts) {
-        if (!opts.portal) {
-            throw new MissingOptionError({
-                className: 'HttpSigner',
-                option: 'portal',
-            });
-        }
-        this.keychain = opts.keychain;
-        this.portal = opts.portal;
-    }
-    sign(message, provider) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const address = yield 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 = yield this.portal.post('/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;