near-api-js 2.1.1 → 2.1.2

package/dist/near-api-js.js

@@ -24766,11 +24766,12 @@ const bn_js_1 = __importDefault(require("bn.js"));
  */
 class Near {
     constructor(config) {
+        var _a;
         this.config = config;
         this.connection = accounts_1.Connection.fromConfig({
             networkId: config.networkId,
             provider: { type: 'JsonRpcProvider', args: { url: config.nodeUrl, headers: config.headers } },
-            signer: config.signer || { type: 'InMemorySigner', keyStore: config.keyStore },
+            signer: config.signer || { type: 'InMemorySigner', keyStore: config.keyStore || ((_a = config.deps) === null || _a === void 0 ? void 0 : _a.keyStore) },
             jsvmAccountId: config.jsvmAccountId || `jsvm.${config.networkId}`
         });
         if (config.masterAccount) {

package/dist/near-api-js.min.js

@@ -1913,7 +1913,7 @@ module.exports={
 "use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.WalletConnection=exports.ConnectedWalletAccount=exports.Near=void 0;var near_1=require("./near");Object.defineProperty(exports,"Near",{enumerable:!0,get:function(){return near_1.Near}});var wallet_account_1=require("./wallet_account");Object.defineProperty(exports,"ConnectedWalletAccount",{enumerable:!0,get:function(){return wallet_account_1.ConnectedWalletAccount}}),Object.defineProperty(exports,"WalletConnection",{enumerable:!0,get:function(){return wallet_account_1.WalletConnection}});
 
 },{"./near":235,"./wallet_account":236}],235:[function(require,module,exports){
-"use strict";var __awaiter=this&&this.__awaiter||function(t,n,e,o){return new(e||(e=Promise))(function(c,r){function i(t){try{s(o.next(t))}catch(t){r(t)}}function a(t){try{s(o.throw(t))}catch(t){r(t)}}function s(t){var n;t.done?c(t.value):(n=t.value,n instanceof e?n:new e(function(t){t(n)})).then(i,a)}s((o=o.apply(t,n||[])).next())})},__importDefault=this&&this.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.Near=void 0;const accounts_1=require("@near-js/accounts"),bn_js_1=__importDefault(require("bn.js"));class Near{constructor(t){if(this.config=t,this.connection=accounts_1.Connection.fromConfig({networkId:t.networkId,provider:{type:"JsonRpcProvider",args:{url:t.nodeUrl,headers:t.headers}},signer:t.signer||{type:"InMemorySigner",keyStore:t.keyStore},jsvmAccountId:t.jsvmAccountId||`jsvm.${t.networkId}`}),t.masterAccount){const n=t.initialBalance?new bn_js_1.default(t.initialBalance):new bn_js_1.default("500000000000000000000000000");this.accountCreator=new accounts_1.LocalAccountCreator(new accounts_1.Account(this.connection,t.masterAccount),n)}else t.helperUrl?this.accountCreator=new accounts_1.UrlAccountCreator(this.connection,t.helperUrl):this.accountCreator=null}account(t){return __awaiter(this,void 0,void 0,function*(){return new accounts_1.Account(this.connection,t)})}createAccount(t,n){return __awaiter(this,void 0,void 0,function*(){if(!this.accountCreator)throw new Error("Must specify account creator, either via masterAccount or helperUrl configuration settings.");return yield this.accountCreator.createAccount(t,n),new accounts_1.Account(this.connection,t)})}}exports.Near=Near;
+"use strict";var __awaiter=this&&this.__awaiter||function(t,e,n,o){return new(n||(n=Promise))(function(r,c){function i(t){try{s(o.next(t))}catch(t){c(t)}}function a(t){try{s(o.throw(t))}catch(t){c(t)}}function s(t){var e;t.done?r(t.value):(e=t.value,e instanceof n?e:new n(function(t){t(e)})).then(i,a)}s((o=o.apply(t,e||[])).next())})},__importDefault=this&&this.__importDefault||function(t){return t&&t.__esModule?t:{default:t}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.Near=void 0;const accounts_1=require("@near-js/accounts"),bn_js_1=__importDefault(require("bn.js"));class Near{constructor(t){var e;if(this.config=t,this.connection=accounts_1.Connection.fromConfig({networkId:t.networkId,provider:{type:"JsonRpcProvider",args:{url:t.nodeUrl,headers:t.headers}},signer:t.signer||{type:"InMemorySigner",keyStore:t.keyStore||(null===(e=t.deps)||void 0===e?void 0:e.keyStore)},jsvmAccountId:t.jsvmAccountId||`jsvm.${t.networkId}`}),t.masterAccount){const e=t.initialBalance?new bn_js_1.default(t.initialBalance):new bn_js_1.default("500000000000000000000000000");this.accountCreator=new accounts_1.LocalAccountCreator(new accounts_1.Account(this.connection,t.masterAccount),e)}else t.helperUrl?this.accountCreator=new accounts_1.UrlAccountCreator(this.connection,t.helperUrl):this.accountCreator=null}account(t){return __awaiter(this,void 0,void 0,function*(){return new accounts_1.Account(this.connection,t)})}createAccount(t,e){return __awaiter(this,void 0,void 0,function*(){if(!this.accountCreator)throw new Error("Must specify account creator, either via masterAccount or helperUrl configuration settings.");return yield this.accountCreator.createAccount(t,e),new accounts_1.Account(this.connection,t)})}}exports.Near=Near;
 
 },{"@near-js/accounts":155,"bn.js":69}],236:[function(require,module,exports){
 (function (Buffer){(function (){

package/lib/connect.js

@@ -21,6 +21,7 @@ exports.connect = void 0;
  * To sign transactions you can also pass:
  * 1. {@link ConnectConfig.keyStore}
  * 2. {@link ConnectConfig.keyPath}
+ * 3. {@link ConnectConfig.deps.keyStore} (deprecated, only for use in legacy applications)
  *
  * If all three are passed they are prioritize in that order.
  *
@@ -46,9 +47,10 @@ global.fetch = setup_node_fetch_1.default;
  * Initialize connection to Near network.
  */
 function connect(config) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         // Try to find extra key in `KeyPath` if provided.
-        if (config.keyPath && config.keyStore) {
+        if (config.keyPath && (config.keyStore || ((_a = config.deps) === null || _a === void 0 ? void 0 : _a.keyStore))) {
             try {
                 const accountKeyFile = yield (0, unencrypted_file_system_keystore_1.readKeyFile)(config.keyPath);
                 if (accountKeyFile[0]) {
@@ -61,7 +63,7 @@ function connect(config) {
                     }
                     config.keyStore = new key_stores_1.MergeKeyStore([
                         keyPathStore,
-                        config.keyStore
+                        config.keyStore || ((_b = config.deps) === null || _b === void 0 ? void 0 : _b.keyStore)
                     ], { writeKeyStoreIndex: 1 });
                     if (!process.env['NEAR_NO_LOGS']) {
                         console.log(`Loaded master account ${accountKeyFile[0]} key from ${config.keyPath} with public key = ${keyPair.getPublicKey()}`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "near-api-js",
   "description": "JavaScript library to interact with NEAR Protocol via RPC API",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/near/near-api-js.git"
@@ -21,17 +21,17 @@
     "near-abi": "0.1.1",
     "node-fetch": "^2.6.1",
     "tweetnacl": "^1.0.1",
-    "@near-js/accounts": "0.1.1",
-    "@near-js/crypto": "0.0.3",
-    "@near-js/keystores": "0.0.3",
-    "@near-js/keystores-browser": "0.0.3",
-    "@near-js/keystores-node": "0.0.3",
-    "@near-js/providers": "0.0.4",
-    "@near-js/signers": "0.0.3",
-    "@near-js/transactions": "0.1.0",
-    "@near-js/types": "0.0.3",
-    "@near-js/utils": "0.0.3",
-    "@near-js/wallet-account": "0.0.4"
+    "@near-js/accounts": "0.1.2",
+    "@near-js/crypto": "0.0.4",
+    "@near-js/keystores": "0.0.4",
+    "@near-js/keystores-browser": "0.0.4",
+    "@near-js/keystores-node": "0.0.4",
+    "@near-js/providers": "0.0.5",
+    "@near-js/signers": "0.0.4",
+    "@near-js/transactions": "0.1.1",
+    "@near-js/types": "0.0.4",
+    "@near-js/utils": "0.0.4",
+    "@near-js/wallet-account": "0.0.5"
   },
   "devDependencies": {
     "@types/bn.js": "^5.1.0",