@portal-hq/provider 0.2.0-beta11 → 0.2.0-beta2

package/lib/commonjs/providers/index.js

@@ -30,7 +30,7 @@ const signerMethods = [
 class Provider {
     constructor({ 
     // Required options
-    apiKey, chainId, keychain, 
+    apiKey, chainId, 
     // Optional options
     apiUrl = 'api.portalhq.io', autoApprove = false, enableMpc = true, mpcUrl = 'mpc.portalhq.io', gatewayConfig = {}, }) {
         // Handle required fields
@@ -50,7 +50,6 @@ class Provider {
         this.chainId = chainId;
         this.events = {};
         this.isMPC = enableMpc;
-        this.keychain = keychain;
         this.log = console;
         this.mpcUrl = mpcUrl;
         this.portal = new requesters_1.HttpRequester({
@@ -65,7 +64,6 @@ class Provider {
             // If MPC is enabled, initialize an MpcSigner
             this.signer = new signers_1.MpcSigner({
                 mpcUrl: this.mpcUrl,
-                keychain: this.keychain,
             });
         }
         else {

package/lib/commonjs/signers/http.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const keychain_1 = require("@portal-hq/keychain");
+const core_1 = require("@portal-hq/core");
 const utils_1 = require("@portal-hq/utils");
 class HttpSigner {
     constructor(opts) {
@@ -19,7 +19,7 @@ class HttpSigner {
                 option: 'portal',
             });
         }
-        this.keychain = new keychain_1.Keychain();
+        this.keychain = new core_1.Keychain();
         this.portal = opts.portal;
     }
     sign(message, provider) {

package/lib/commonjs/signers/mpc.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_native_1 = require("react-native");
+const core_1 = require("@portal-hq/core");
 const utils_1 = require("@portal-hq/utils");
 class MpcSigner {
     constructor(opts) {
@@ -29,12 +30,12 @@ class MpcSigner {
             }
             return params;
         };
-        this.keychain = opts.keychain;
         this.mpc = react_native_1.NativeModules.PortalMobileMpc;
         this.mpcUrl = opts.mpcUrl;
         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.`);
         }
+        this.keychain = new core_1.Keychain();
     }
     get address() {
         return (() => __awaiter(this, void 0, void 0, function* () {

package/lib/esm/providers/index.js

@@ -28,7 +28,7 @@ const signerMethods = [
 class Provider {
     constructor({ 
     // Required options
-    apiKey, chainId, keychain, 
+    apiKey, chainId, 
     // Optional options
     apiUrl = 'api.portalhq.io', autoApprove = false, enableMpc = true, mpcUrl = 'mpc.portalhq.io', gatewayConfig = {}, }) {
         // Handle required fields
@@ -48,7 +48,6 @@ class Provider {
         this.chainId = chainId;
         this.events = {};
         this.isMPC = enableMpc;
-        this.keychain = keychain;
         this.log = console;
         this.mpcUrl = mpcUrl;
         this.portal = new HttpRequester({
@@ -63,7 +62,6 @@ class Provider {
             // If MPC is enabled, initialize an MpcSigner
             this.signer = new MpcSigner({
                 mpcUrl: this.mpcUrl,
-                keychain: this.keychain,
             });
         }
         else {

package/lib/esm/signers/http.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { Keychain } from '@portal-hq/keychain';
+import { Keychain } from '@portal-hq/core';
 import { MissingOptionError } from '@portal-hq/utils';
 class HttpSigner {
     constructor(opts) {

package/lib/esm/signers/mpc.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { NativeModules } from 'react-native';
+import { Keychain } from '@portal-hq/core';
 import { MpcSigningError } from '@portal-hq/utils';
 class MpcSigner {
     constructor(opts) {
@@ -27,12 +28,12 @@ class MpcSigner {
             }
             return params;
         };
-        this.keychain = opts.keychain;
         this.mpc = NativeModules.PortalMobileMpc;
         this.mpcUrl = opts.mpcUrl;
         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.`);
         }
+        this.keychain = new Keychain();
     }
     get address() {
         return (() => __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portal-hq/provider",
-  "version": "0.2.0-beta11",
+  "version": "0.2.0-beta2",
   "license": "MIT",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -17,7 +17,8 @@
     "prepare:esm": "tsc --outDir lib/esm --module es2015 --target es2015"
   },
   "dependencies": {
-    "@portal-hq/utils": "^0.2.0-beta11"
+    "@portal-hq/core": "^0.2.0-beta1",
+    "@portal-hq/utils": "^0.2.0-beta1"
   },
   "devDependencies": {
     "typescript": "^4.8.4"

package/src/providers/index.ts

@@ -2,7 +2,6 @@ import {
   InvalidApiKeyError,
   InvalidChainIdError,
   InvalidGatewayConfigError,
-  KeychainAdapter,
   ProviderRpcError,
   RpcErrorCodes,
 } from '@portal-hq/utils'
@@ -47,7 +46,6 @@ class Provider {
   private apiUrl: string
   private autoApprove?: boolean
   private events: Record<string, RegisteredEventHandler[]>
-  private keychain: KeychainAdapter
   private log: Console
   private gatewayConfig: GatewayLike
   private rpc: HttpRequester
@@ -58,7 +56,6 @@ class Provider {
     // Required options
     apiKey,
     chainId,
-    keychain,
 
     // Optional options
     apiUrl = 'api.portalhq.io',
@@ -85,7 +82,6 @@ class Provider {
     this.chainId = chainId
     this.events = {}
     this.isMPC = enableMpc
-    this.keychain = keychain
     this.log = console
     this.mpcUrl = mpcUrl
     this.portal = new HttpRequester({
@@ -103,7 +99,6 @@ class Provider {
       // 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

package/src/signers/http.ts

@@ -1,4 +1,4 @@
-import { Keychain } from '@portal-hq/keychain'
+import { Keychain } from '@portal-hq/core'
 import { MissingOptionError } from '@portal-hq/utils'
 
 import {

package/src/signers/mpc.ts

@@ -1,5 +1,6 @@
 import { NativeModules } from 'react-native'
-import { KeychainAdapter, MpcSigningError } from '@portal-hq/utils'
+import { Keychain } from '@portal-hq/core'
+import { MpcSigningError } from '@portal-hq/utils'
 
 import { Provider } from '../index'
 import Signer from './abstract'
@@ -13,12 +14,11 @@ import {
 
 class MpcSigner implements Signer {
   public _address: string
-  private keychain: KeychainAdapter
+  private keychain: Keychain
   private mpc: PortalMobileMpc
   private mpcUrl: string
 
   constructor(opts: MpcSignerOptions) {
-    this.keychain = opts.keychain
     this.mpc = NativeModules.PortalMobileMpc
     this.mpcUrl = opts.mpcUrl
 
@@ -27,6 +27,8 @@ class MpcSigner implements Signer {
         `[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.`,
       )
     }
+
+    this.keychain = new Keychain()
   }
 
   public get address() {

package/types.d.ts

@@ -1,7 +1,5 @@
 // Types
 
-import { KeychainAdapter } from '@portal-hq/utils'
-
 export type EventHandler = (data: any) => void
 
 export type GatewayLike = GatewayConfig | string
@@ -23,7 +21,6 @@ export interface HttpSignerOptions extends SignerOptions {
 }
 
 export interface MpcSignerOptions extends SignerOptions {
-  keychain: KeychainAdapter
   mpcUrl: string
 }
 
@@ -50,7 +47,6 @@ export interface ProviderOptions {
   // Required options
   apiKey: string
   chainId: number
-  keychain: KeychainAdapter
   gatewayConfig: GatewayLike
 
   // Optional options