Merge branch 'master' into error-handling/string-to-typed

src/browser-connect.ts

@@ -0,0 +1,12 @@
+import { Near, NearConfig } from './near';
+
+export type ConnectConfig = NearConfig & {
+    keyPath?: string;
+}
+
+/**
+ * Initialize connection to Near network.
+ */
+export async function connect(config: ConnectConfig): Promise<Near> {
+    return new Near(config);
+}

src/browser-index.ts

@@ -1,4 +1,5 @@
 export * as keyStores from './key_stores/browser-index';
 export * from './common-index';
+export * from './browser-connect';
 
 import 'error-polyfill';

src/common-index.ts

@@ -10,7 +10,7 @@ import { Connection } from './connection';
 import { Signer, InMemorySigner } from './signer';
 import { Contract } from './contract';
 import { KeyPair } from './utils/key_pair';
-import { connect, Near } from './near';
+import { Near } from './near';
 
 // TODO: Deprecate and remove WalletAccount
 import { WalletAccount, WalletConnection } from './wallet-account';
@@ -30,7 +30,6 @@ export {
     Signer,
     KeyPair,
 
-    connect,
     Near,
 
     WalletAccount,

src/connect.ts

@@ -0,0 +1,33 @@
+import { readKeyFile } from './key_stores/unencrypted_file_system_keystore';
+import { InMemoryKeyStore, MergeKeyStore } from './key_stores';
+import { Near, NearConfig } from './near';
+
+export type ConnectConfig = NearConfig & {
+    keyPath?: string;
+}
+
+/**
+ * Initialize connection to Near network.
+ */
+export async function connect(config: ConnectConfig): Promise<Near> {
+    // Try to find extra key in `KeyPath` if provided.
+    if (config.keyPath && config.deps && config.deps.keyStore) {
+        try {
+            const accountKeyFile = await readKeyFile(config.keyPath);
+            if (accountKeyFile[0]) {
+                // TODO: Only load key if network ID matches
+                const keyPair = accountKeyFile[1];
+                const keyPathStore = new InMemoryKeyStore();
+                await keyPathStore.setKey(config.networkId, accountKeyFile[0], keyPair);
+                if (!config.masterAccount) {
+                    config.masterAccount = accountKeyFile[0];
+                }
+                config.deps.keyStore = new MergeKeyStore([config.deps.keyStore, keyPathStore]);
+                console.log(`Loaded master account ${accountKeyFile[0]} key from ${config.keyPath} with public key = ${keyPair.getPublicKey()}`);
+            }
+        } catch (error) {
+            console.warn(`Failed to load master account key from ${config.keyPath}: ${error}`);
+        }
+    }
+    return new Near(config);
+}

src/index.ts

@@ -1,2 +1,3 @@
 export * as keyStores from './key_stores/index';
-export * from './common-index';
+export * from './common-index';
+export * from './connect';

src/near.ts

@@ -1,15 +1,13 @@
-
 import BN from 'bn.js';
 import { Account } from './account';
 import { Connection } from './connection';
 import { Signer } from './signer';
 import { Contract } from './contract';
-import { readKeyFile } from './key_stores/unencrypted_file_system_keystore';
 import { PublicKey } from './utils/key_pair';
 import { AccountCreator, LocalAccountCreator, UrlAccountCreator } from './account_creator';
-import { InMemoryKeyStore, KeyStore, MergeKeyStore } from './key_stores';
+import { KeyStore } from './key_stores';
 
-type NearConfig = {
+export type NearConfig = {
   keyStore?: KeyStore;
   signer?: Signer;
   deps?: { keyStore: KeyStore };
@@ -91,33 +89,3 @@ export class Near {
         return result.transaction_outcome.id;
     }
 }
-
-type ConnectConfig = NearConfig & {
-  keyPath?: string;
-}
-
-/**
- * Initialize connection to Near network.
- */
-export async function connect(config: ConnectConfig): Promise<Near> {
-    // Try to find extra key in `KeyPath` if provided.
-    if (config.keyPath && config.deps && config.deps.keyStore) {
-        try {
-            const accountKeyFile = await readKeyFile(config.keyPath);
-            if (accountKeyFile[0]) {
-                // TODO: Only load key if network ID matches
-                const keyPair = accountKeyFile[1];
-                const keyPathStore = new InMemoryKeyStore();
-                await keyPathStore.setKey(config.networkId, accountKeyFile[0], keyPair);
-                if (!config.masterAccount) {
-                    config.masterAccount = accountKeyFile[0];
-                }
-                config.deps.keyStore = new MergeKeyStore([config.deps.keyStore, keyPathStore]);
-                console.log(`Loaded master account ${accountKeyFile[0]} key from ${config.keyPath} with public key = ${keyPair.getPublicKey()}`);
-            }
-        } catch (error) {
-            console.warn(`Failed to load master account key from ${config.keyPath}: ${error}`);
-        }
-    }
-    return new Near(config);
-}

src/signer.ts

@@ -1,6 +1,7 @@
 import sha256 from 'js-sha256';
 import { Signature, KeyPair, PublicKey } from './utils/key_pair';
-import { KeyStore, InMemoryKeyStore } from './key_stores';
+import { KeyStore } from './key_stores/keystore';
+import { InMemoryKeyStore } from './key_stores/in_memory_key_store';
 
 /**
  * General signing interface, can be used for in memory signing, RPC singing, external wallet, HSM, etc.