near-api-js 6.4.0 → 6.4.1

package/lib/browser-index.d.ts

@@ -1,6 +1,6 @@
 export { b as keyStores } from './browser-index-RhYalP0h.js';
 export { i as providers } from './index-BDdRUK93.js';
-export { i as utils } from './index-B3Nnuq00.js';
+export { i as utils } from './index-CIVdT9gH.js';
 export { t as transactions } from './transaction-C81hWIM7.js';
 export { v as validators } from './validators-q97R8D1k.js';
 export { Account, Connection, Contract } from '@near-js/accounts';

package/lib/common-index.d.ts

@@ -1,5 +1,5 @@
 export { i as providers } from './index-BDdRUK93.js';
-export { i as utils } from './index-B3Nnuq00.js';
+export { i as utils } from './index-CIVdT9gH.js';
 export { t as transactions } from './transaction-C81hWIM7.js';
 export { v as validators } from './validators-q97R8D1k.js';
 export { Account, Connection, Contract } from '@near-js/accounts';

package/lib/{index-B3Nnuq00.d.ts → index-CIVdT9gH.d.ts}

@@ -3,7 +3,7 @@ import { s as serialize } from './serialize-DKM2UWTl.js';
 import { e as enums } from './enums-BOxGXwY_.js';
 import { f as format } from './format-BlG-d3wc.js';
 import { r as rpc_errors } from './rpc_errors-BbA15mFX.js';
-import { Logger } from '@near-js/utils';
+import { Logger, keyToImplicitAddress } from '@near-js/utils';
 import { KeyPair, KeyPairEd25519, KeyPairString, PublicKey } from '@near-js/crypto';
 
 declare const index_KeyPair: typeof KeyPair;
@@ -13,11 +13,12 @@ declare const index_Logger: typeof Logger;
 declare const index_PublicKey: typeof PublicKey;
 declare const index_enums: typeof enums;
 declare const index_format: typeof format;
+declare const index_keyToImplicitAddress: typeof keyToImplicitAddress;
 declare const index_key_pair: typeof key_pair;
 declare const index_rpc_errors: typeof rpc_errors;
 declare const index_serialize: typeof serialize;
 declare namespace index {
-  export { index_KeyPair as KeyPair, index_KeyPairEd25519 as KeyPairEd25519, index_KeyPairString as KeyPairString, index_Logger as Logger, index_PublicKey as PublicKey, index_enums as enums, index_format as format, index_key_pair as key_pair, index_rpc_errors as rpc_errors, index_serialize as serialize };
+  export { index_KeyPair as KeyPair, index_KeyPairEd25519 as KeyPairEd25519, index_KeyPairString as KeyPairString, index_Logger as Logger, index_PublicKey as PublicKey, index_enums as enums, index_format as format, index_keyToImplicitAddress as keyToImplicitAddress, index_key_pair as key_pair, index_rpc_errors as rpc_errors, index_serialize as serialize };
 }
 
 export { index as i };

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 export { i as keyStores } from './index-Dvb6OQET.js';
 export { i as providers } from './index-BDdRUK93.js';
-export { i as utils } from './index-B3Nnuq00.js';
+export { i as utils } from './index-CIVdT9gH.js';
 export { t as transactions } from './transaction-C81hWIM7.js';
 export { v as validators } from './validators-q97R8D1k.js';
 export { Account, Connection, Contract } from '@near-js/accounts';

package/lib/near.d.ts

@@ -1,7 +1,7 @@
 import { Connection, AccountCreator, Account } from '@near-js/accounts';
 import { PublicKey } from '@near-js/crypto';
 import { KeyStore } from '@near-js/keystores';
-import { Signer } from '@near-js/signers';
+import { InMemorySigner } from '@near-js/signers';
 import { LoggerService } from '@near-js/utils';
 import { Provider } from '@near-js/providers';
 
@@ -20,7 +20,7 @@ interface NearConfig {
     /** Holds {@link "@near-js/crypto".key_pair.KeyPair | KeyPair} for signing transactions */
     keyStore?: KeyStore;
     /** @hidden */
-    signer?: Signer;
+    signer?: InMemorySigner;
     /**
      * [NEAR Contract Helper](https://github.com/near/near-contract-helper) url used to create accounts if no master account is provided
      * @see {@link UrlAccountCreator}
@@ -89,6 +89,7 @@ declare class Near {
     readonly connection: Connection;
     readonly accountCreator: AccountCreator;
     constructor(config: NearConfig);
+    private resolveKeyPairSigner;
     /**
      * @param accountId near accountId used to interact with the network.
      */

package/lib/near.js

@@ -32,6 +32,7 @@ __export(near_exports, {
 });
 module.exports = __toCommonJS(near_exports);
 var import_accounts = require("@near-js/accounts");
+var import_signers = require("@near-js/signers");
 var import_depd = __toESM(require("depd"));
 class Near {
   constructor(config) {
@@ -45,18 +46,24 @@ class Near {
     });
     if (config.masterAccount) {
       const initialBalance = config.initialBalance ? BigInt(config.initialBalance) : 500000000000000000000000000n;
-      this.accountCreator = new import_accounts.LocalAccountCreator(new import_accounts.Account(config.masterAccount, this.connection.provider, this.connection.signer), initialBalance);
+      const account = new import_accounts.Account(config.masterAccount, this.connection.provider);
+      this.resolveKeyPairSigner(config.masterAccount).then((signer) => account.setSigner(signer));
+      this.accountCreator = new import_accounts.LocalAccountCreator(account, initialBalance);
     } else if (config.helperUrl) {
       this.accountCreator = new import_accounts.UrlAccountCreator(this.connection, config.helperUrl);
     } else {
       this.accountCreator = null;
     }
   }
+  async resolveKeyPairSigner(accountId) {
+    const keyPair = await this.connection.signer.keyStore.getKey(this.connection.networkId, accountId);
+    return keyPair ? new import_signers.KeyPairSigner(keyPair) : void 0;
+  }
   /**
    * @param accountId near accountId used to interact with the network.
    */
   async account(accountId) {
-    const account = new import_accounts.Account(accountId, this.connection.provider, this.connection.signer);
+    const account = new import_accounts.Account(accountId, this.connection.provider, await this.resolveKeyPairSigner(accountId));
     return account;
   }
   /**
@@ -73,7 +80,7 @@ class Near {
       throw new Error("Must specify account creator, either via masterAccount or helperUrl configuration settings.");
     }
     await this.accountCreator.createAccount(accountId, publicKey);
-    return new import_accounts.Account(accountId, this.connection.provider, this.connection.signer);
+    return new import_accounts.Account(accountId, this.connection.provider, await this.resolveKeyPairSigner(accountId));
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/lib/utils/index.d.ts

@@ -3,7 +3,7 @@ export { s as serialize } from '../serialize-DKM2UWTl.js';
 export { e as enums } from '../enums-BOxGXwY_.js';
 export { f as format } from '../format-BlG-d3wc.js';
 export { r as rpc_errors } from '../rpc_errors-BbA15mFX.js';
-export { Logger } from '@near-js/utils';
+export { Logger, keyToImplicitAddress } from '@near-js/utils';
 export { KeyPair, KeyPairEd25519, KeyPairString, PublicKey } from '@near-js/crypto';
 import 'borsh';
 import '@near-js/types';

package/lib/utils/index.js

@@ -35,6 +35,7 @@ __export(utils_exports, {
   PublicKey: () => import_key_pair.PublicKey,
   enums: () => enums,
   format: () => format,
+  keyToImplicitAddress: () => import_utils.keyToImplicitAddress,
   key_pair: () => key_pair,
   rpc_errors: () => rpc_errors,
   serialize: () => serialize
@@ -47,6 +48,7 @@ var format = __toESM(require('./format.js'));
 var rpc_errors = __toESM(require('./rpc_errors.js'));
 var import_key_pair = require('./key_pair.js');
 var import_logger = require('./logger.js');
+var import_utils = require("@near-js/utils");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   KeyPair,
@@ -56,6 +58,7 @@ var import_logger = require('./logger.js');
   PublicKey,
   enums,
   format,
+  keyToImplicitAddress,
   key_pair,
   rpc_errors,
   serialize

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "near-api-js",
   "description": "JavaScript library to interact with NEAR Protocol via RPC API",
-  "version": "6.4.0",
+  "version": "6.4.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/near/near-api-js.git"
@@ -17,16 +17,16 @@
     "http-errors": "1.7.2",
     "near-abi": "0.2.0",
     "node-fetch": "2.6.7",
-    "@near-js/accounts": "2.4.0",
-    "@near-js/crypto": "2.4.0",
-    "@near-js/keystores": "2.4.0",
-    "@near-js/keystores-browser": "2.4.0",
-    "@near-js/keystores-node": "2.4.0",
-    "@near-js/providers": "2.4.0",
-    "@near-js/signers": "2.4.0",
-    "@near-js/transactions": "2.4.0",
-    "@near-js/types": "2.4.0",
-    "@near-js/utils": "2.4.0"
+    "@near-js/accounts": "2.4.1",
+    "@near-js/crypto": "2.4.1",
+    "@near-js/keystores": "2.4.1",
+    "@near-js/keystores-browser": "2.4.1",
+    "@near-js/keystores-node": "2.4.1",
+    "@near-js/providers": "2.4.1",
+    "@near-js/signers": "2.4.1",
+    "@near-js/transactions": "2.4.1",
+    "@near-js/types": "2.4.1",
+    "@near-js/utils": "2.4.1"
   },
   "devDependencies": {
     "@types/depd": "^1.1.37",