edge-currency-accountbased 0.22.21 → 0.23.0

package/lib/common/engine.js

@@ -17,6 +17,8 @@
 
 
 
+
+
 
 
 var _types = require('edge-core-js/types');
@@ -36,6 +38,7 @@ var _tokenHelpers = require('./tokenHelpers');
 
 
 
+
 var _types3 = require('./types');
 
 
@@ -51,7 +54,12 @@ const DROPPED_TX_TIME_GAP = 3600 * 24 // 1 Day
 
  class CurrencyEngine
 
- {
+
+
+
+
+
+{
   
   
   
@@ -263,8 +271,7 @@ const DROPPED_TX_TIME_GAP = 3600 * 24 // 1 Day
     const { currencyCode } = this.currencyInfo
 
     if (this.walletInfo.keys.publicKey == null) {
-      const pubKeys = await this.tools.derivePublicKey(this.walletInfo)
-      this.walletInfo.keys.publicKey = pubKeys.publicKey
+      this.walletInfo.keys.publicKey = walletInfo.keys.publicKey
     }
 
     const disklet = this.walletLocalDisklet
@@ -1064,4 +1071,41 @@ const DROPPED_TX_TIME_GAP = 3600 * 24 // 1 Day
       )
     }
   }
+
+  //
+  // Virtual functions to be override by extension:
+  //
+
+  getDisplayPrivateSeed(privateKeys) {
+    throw new Error('not implemented')
+  }
+
+  getDisplayPublicSeed() {
+    throw new Error('not implemented')
+  }
+
+  async resyncBlockchain() {
+    throw new Error('not implemented')
+  }
+
+  async makeSpend(
+    edgeSpendInfoIn,
+    opts
+  ) {
+    throw new Error('not implemented')
+  }
+
+  async signTx(
+    edgeTransaction,
+    privateKeys
+  ) {
+    throw new Error('not implemented')
+  }
+
+  async broadcastTx(
+    edgeTransaction,
+    opts
+  ) {
+    throw new Error('not implemented')
+  }
 } exports.CurrencyEngine = CurrencyEngine;

package/lib/common/types.js

@@ -8,6 +8,7 @@
 
 
 
+
 var _cleaners = require('cleaners');
 
 
@@ -54,3 +55,22 @@ var _cleaners = require('cleaners');
 }); exports.asWalletLocalData = asWalletLocalData
 
 
+
+
+
+
+
+
+ const asWalletInfo = (
+  asKeys
+) =>
+  _cleaners.asObject.call(void 0, {
+    id: _cleaners.asString,
+    type: _cleaners.asString,
+    keys: asKeys
+  }); exports.asWalletInfo = asWalletInfo
+
+
+ const asSafeCommonWalletInfo = exports.asWalletInfo.call(void 0, 
+  _cleaners.asObject.call(void 0, { publicKey: _cleaners.asString })
+); exports.asSafeCommonWalletInfo = asSafeCommonWalletInfo

package/lib/declare-modules.d.js

@@ -19,28 +19,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 

package/lib/eos/eosEngine.js

@@ -21,6 +21,8 @@ var _cleaners = require('cleaners');
 
 
 
+
+
 var _types = require('edge-core-js/types');
 var _urlparse = require('url-parse'); var _urlparse2 = _interopRequireDefault(_urlparse);
 
@@ -58,6 +60,10 @@ var _eosSchema = require('./eosSchema');
 
 
 
+
+
+
+
 var _eosTypes = require('./eosTypes');
 
 const ADDRESS_POLL_MILLISECONDS = 10000
@@ -192,6 +198,7 @@ const bogusAccounts = {
     opts
   ) {
     await super.loadEngine(plugin, walletInfo, opts)
+
     if (typeof this.walletInfo.keys.ownerPublicKey !== 'string') {
       if (walletInfo.keys.ownerPublicKey != null) {
         this.walletInfo.keys.ownerPublicKey = walletInfo.keys.ownerPublicKey
@@ -795,7 +802,7 @@ const bogusAccounts = {
     }
   }
 
-  async getResources() {
+  async getResources(privateKeys) {
     if (this.getResourcesMutex) return
     const { cpu, net } = this.accountResources
     if (cpu > 500 && net > 500) {
@@ -870,9 +877,9 @@ const bogusAccounts = {
         },
         walletId: this.walletId
       }
-      const signedTx = await this.signTx(edgeTransaction)
+      const signedTx = await this.signTx(edgeTransaction, privateKeys)
       this.getResourcesMutex = true
-      await this.broadcastTx(signedTx)
+      await this.broadcastTx(signedTx, { privateKeys })
       this.log.warn('getResources purchase SUCCESS')
     } catch (e) {
       this.log.warn('getResources purchase FAILURE\n', e)
@@ -1044,7 +1051,11 @@ const bogusAccounts = {
     return edgeTransaction
   }
 
-  async signTx(edgeTransaction) {
+  async signTx(
+    edgeTransaction,
+    privateKeys
+  ) {
+    const eosPrivateKeys = _eosTypes.asEosPrivateKeys.call(void 0, privateKeys)
     const otherParams = _utils.getOtherParams(edgeTransaction)
 
     const abi =
@@ -1059,7 +1070,7 @@ const bogusAccounts = {
       abi
     )
     const txDigest = transaction.signingDigest(this.networkInfo.chainId)
-    const privateKey = _eosio.PrivateKey.from(this.walletInfo.keys.eosKey)
+    const privateKey = _eosio.PrivateKey.from(eosPrivateKeys.eosKey)
     const signature = privateKey.signDigest(txDigest)
     const signedTransaction = _eosio.SignedTransaction.from({
       ...transaction,
@@ -1075,9 +1086,11 @@ const bogusAccounts = {
   }
 
   async broadcastTx(
-    edgeTransaction
+    edgeTransaction,
+    opts
   ) {
-    await this.getResources()
+    const eosPrivateKeys = _eosTypes.asEosPrivateKeys.call(void 0, _optionalChain([opts, 'optionalAccess', _5 => _5.privateKeys]))
+    await this.getResources(eosPrivateKeys)
 
     const otherParams = _utils.getOtherParams(edgeTransaction)
     const { signatures } = otherParams
@@ -1108,13 +1121,13 @@ const bogusAccounts = {
       } catch (e2) {
         throw e
       }
-      if (_optionalChain([err, 'access', _5 => _5.error, 'optionalAccess', _6 => _6.name]) === 'tx_net_usage_exceeded') {
+      if (_optionalChain([err, 'access', _6 => _6.error, 'optionalAccess', _7 => _7.name]) === 'tx_net_usage_exceeded') {
         err = new Error('Insufficient NET available to send EOS transaction')
         err.name = 'ErrorEosInsufficientNet'
-      } else if (_optionalChain([err, 'access', _7 => _7.error, 'optionalAccess', _8 => _8.name]) === 'tx_cpu_usage_exceeded') {
+      } else if (_optionalChain([err, 'access', _8 => _8.error, 'optionalAccess', _9 => _9.name]) === 'tx_cpu_usage_exceeded') {
         err = new Error('Insufficient CPU available to send EOS transaction')
         err.name = 'ErrorEosInsufficientCpu'
-      } else if (_optionalChain([err, 'access', _9 => _9.error, 'optionalAccess', _10 => _10.name]) === 'ram_usage_exceeded') {
+      } else if (_optionalChain([err, 'access', _10 => _10.error, 'optionalAccess', _11 => _11.name]) === 'ram_usage_exceeded') {
         err = new Error('Insufficient RAM available to send EOS transaction')
         err.name = 'ErrorEosInsufficientRam'
       }
@@ -1122,28 +1135,25 @@ const bogusAccounts = {
     }
   }
 
-  getDisplayPrivateSeed() {
+  getDisplayPrivateSeed(privateKeys) {
+    const eosPrivateKeys = _eosTypes.asEosPrivateKeys.call(void 0, privateKeys)
     let out = ''
     // usage of eosOwnerKey must be protected by conditional
     // checking for its existence
-    if (_optionalChain([this, 'access', _11 => _11.walletInfo, 'access', _12 => _12.keys, 'optionalAccess', _13 => _13.eosOwnerKey]) != null) {
-      out += 'owner key\n' + String(this.walletInfo.keys.eosOwnerKey) + '\n\n'
-    }
-    if (_optionalChain([this, 'access', _14 => _14.walletInfo, 'access', _15 => _15.keys, 'optionalAccess', _16 => _16.eosKey]) != null) {
-      out += 'active key\n' + String(this.walletInfo.keys.eosKey) + '\n\n'
-    }
+    out += 'owner key\n' + String(eosPrivateKeys.eosOwnerKey) + '\n\n'
+    out += 'active key\n' + String(eosPrivateKeys.eosKey) + '\n\n'
     return out
   }
 
   getDisplayPublicSeed() {
     let out = ''
-    if (_optionalChain([this, 'access', _17 => _17.walletInfo, 'access', _18 => _18.keys, 'optionalAccess', _19 => _19.ownerPublicKey]) != null) {
+    if (_optionalChain([this, 'access', _12 => _12.walletInfo, 'access', _13 => _13.keys, 'optionalAccess', _14 => _14.ownerPublicKey]) != null) {
       out +=
         'owner publicKey\n' +
         String(this.walletInfo.keys.ownerPublicKey) +
         '\n\n'
     }
-    if (_optionalChain([this, 'access', _20 => _20.walletInfo, 'access', _21 => _21.keys, 'optionalAccess', _22 => _22.publicKey]) != null) {
+    if (_optionalChain([this, 'access', _15 => _15.walletInfo, 'access', _16 => _16.keys, 'optionalAccess', _17 => _17.publicKey]) != null) {
       out +=
         'active publicKey\n' + String(this.walletInfo.keys.publicKey) + '\n\n'
     }
@@ -1157,8 +1167,9 @@ const bogusAccounts = {
   walletInfo,
   opts
 ) {
-  const engine = new EosEngine(env, tools, walletInfo, opts)
-  await engine.loadEngine(tools, walletInfo, opts)
+  const safeWalletInfo = _eosTypes.asSafeEosWalletInfo.call(void 0, walletInfo)
+  const engine = new EosEngine(env, tools, safeWalletInfo, opts)
+  await engine.loadEngine(tools, safeWalletInfo, opts)
 
   return engine
 } exports.makeCurrencyEngine = makeCurrencyEngine;

package/lib/eos/eosTypes.js

@@ -1,5 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});var _cleaners = require('cleaners');
 
+var _types = require('../common/types');
+
 
 
 
@@ -80,3 +82,17 @@
 
 
 
+
+
+ const asSafeEosWalletInfo = _types.asWalletInfo.call(void 0, 
+  _cleaners.asObject.call(void 0, {
+    publicKey: _cleaners.asString,
+    ownerPublicKey: _cleaners.asOptional.call(void 0, _cleaners.asString)
+  })
+); exports.asSafeEosWalletInfo = asSafeEosWalletInfo
+
+
+ const asEosPrivateKeys = _cleaners.asObject.call(void 0, {
+  eosOwnerKey: _cleaners.asString,
+  eosKey: _cleaners.asString
+}); exports.asEosPrivateKeys = asEosPrivateKeys

package/lib/eos/info/eosInfo.js

@@ -51,7 +51,9 @@ const denominations = [
   transactionExplorer: 'https://bloks.io/transaction/%s',
 
   denominations,
-  metaTokens: [] // Deprecated
+  metaTokens: [], // Deprecated
+
+  unsafeBroadcastTx: true
 }; exports.eosCurrencyInfo = eosCurrencyInfo
 
  const eos = _innerPlugin.makeOuterPlugin({