edge-currency-accountbased 2.2.4 → 2.3.0

package/lib/eos/EosEngine.js

@@ -27,6 +27,7 @@ var _urlparse = require('url-parse'); var _urlparse2 = _interopRequireDefault(_u
 
 var _CurrencyEngine = require('../common/CurrencyEngine');
 
+var _upgradeMemos = require('../common/upgradeMemos');
 
 
 
@@ -258,21 +259,22 @@ const bogusAccounts = {
     }
 
     const edgeTransaction = {
-      txid: trxId,
-      date: Date.parse(blockTime) / 1000,
-      currencyCode,
       blockHeight: blockNum > 0 ? blockNum : 0,
-      nativeAmount,
+      currencyCode,
+      date: Date.parse(blockTime) / 1000,
       isSend: nativeAmount.startsWith('-'),
-      networkFee: '0',
-      parentNetworkFee: '0',
-      ourReceiveAddresses,
-      signedTx: '',
-      otherParams: {},
+      memos: [],
       metadata: {
         name,
         notes: memo
       },
+      nativeAmount,
+      networkFee: '0',
+      otherParams: {},
+      ourReceiveAddresses,
+      parentNetworkFee: '0',
+      signedTx: '',
+      txid: trxId,
       walletId: this.walletId
     }
 
@@ -339,20 +341,21 @@ const bogusAccounts = {
       }
 
       const edgeTransaction = {
-        txid,
-        date,
-        currencyCode,
         blockHeight,
-        nativeAmount,
+        currencyCode,
+        date,
         isSend: nativeAmount.startsWith('-'),
-        networkFee: '0',
-        parentNetworkFee: '0',
-        ourReceiveAddresses,
-        signedTx: '',
+        memos: [],
         metadata: {
           notes: memo
         },
+        nativeAmount,
+        networkFee: '0',
         otherParams: { fromAddress: from, toAddress: to },
+        ourReceiveAddresses,
+        parentNetworkFee: '0',
+        signedTx: '',
+        txid,
         walletId: this.walletId
       }
 
@@ -870,19 +873,20 @@ const bogusAccounts = {
         }
       ]
       const edgeTransaction = {
-        txid: '',
-        date: 0,
-        currencyCode: this.currencyInfo.currencyCode,
         blockHeight: 0,
-        nativeAmount: '-3',
+        currencyCode: this.currencyInfo.currencyCode,
+        date: 0,
         isSend: true,
+        memos: [],
+        nativeAmount: '-3',
         networkFee: '0',
-        ourReceiveAddresses: [],
-        signedTx: '',
         otherParams: {
           actions: transferActions,
           signatures: []
         },
+        ourReceiveAddresses: [],
+        signedTx: '',
+        txid: '',
         walletId: this.walletId
       }
       const signedTx = await this.signTx(edgeTransaction, privateKeys)
@@ -949,8 +953,11 @@ const bogusAccounts = {
   }
 
   async makeSpend(edgeSpendInfoIn) {
+    edgeSpendInfoIn = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfoIn, this.currencyInfo)
     const { edgeSpendInfo, currencyCode, nativeBalance, denom } =
       this.makeSpendCheck(edgeSpendInfoIn)
+    const { memos = [] } = edgeSpendInfo
+
     const tokenInfo = this.getTokenInfo(currencyCode)
     if (tokenInfo == null) throw new Error('Unable to find token info')
     const { contractAddress = 'eosio.token' } = tokenInfo
@@ -1010,14 +1017,7 @@ const bogusAccounts = {
 
     const quantity =
       _biggystring.toFixed.call(void 0, exchangeAmount, nativePrecision) + ` ${currencyCode}`
-    let memo = ''
-    if (
-      edgeSpendInfo.spendTargets[0].otherParams != null &&
-      typeof edgeSpendInfo.spendTargets[0].otherParams.uniqueIdentifier ===
-        'string'
-    ) {
-      memo = edgeSpendInfo.spendTargets[0].otherParams.uniqueIdentifier
-    }
+    const memo = _optionalChain([memos, 'access', _6 => _6[0], 'optionalAccess', _7 => _7.type]) === 'text' ? memos[0].value : undefined
 
     const transferActions = [
       {
@@ -1041,19 +1041,20 @@ const bogusAccounts = {
     nativeAmount = `-${nativeAmount}`
 
     const edgeTransaction = {
-      txid: '', // txid
-      date: 0, // date
-      currencyCode, // currencyCode
       blockHeight: 0, // blockHeight
-      nativeAmount, // nativeAmount
+      currencyCode, // currencyCode
+      date: 0, // date
       isSend: nativeAmount.startsWith('-'),
+      memos,
+      nativeAmount, // nativeAmount
       networkFee, // networkFee
-      ourReceiveAddresses: [], // ourReceiveAddresses
-      signedTx: '', // signedTx
       otherParams: {
         actions: transferActions,
         signatures: []
       },
+      ourReceiveAddresses: [], // ourReceiveAddresses
+      signedTx: '', // signedTx
+      txid: '', // txid
       walletId: this.walletId
     }
     this.warn(
@@ -1100,7 +1101,7 @@ const bogusAccounts = {
     edgeTransaction,
     opts
   ) {
-    const eosPrivateKeys = _eosTypes.asEosPrivateKeys.call(void 0, _optionalChain([opts, 'optionalAccess', _6 => _6.privateKeys]))
+    const eosPrivateKeys = _eosTypes.asEosPrivateKeys.call(void 0, _optionalChain([opts, 'optionalAccess', _8 => _8.privateKeys]))
     await this.getResources(eosPrivateKeys)
 
     const otherParams = _utils.getOtherParams(edgeTransaction)
@@ -1132,13 +1133,13 @@ const bogusAccounts = {
       } catch (e2) {
         throw e
       }
-      if (_optionalChain([err, 'access', _7 => _7.error, 'optionalAccess', _8 => _8.name]) === 'tx_net_usage_exceeded') {
+      if (_optionalChain([err, 'access', _9 => _9.error, 'optionalAccess', _10 => _10.name]) === 'tx_net_usage_exceeded') {
         err = new Error('Insufficient NET available to send EOS transaction')
         err.name = 'ErrorEosInsufficientNet'
-      } else if (_optionalChain([err, 'access', _9 => _9.error, 'optionalAccess', _10 => _10.name]) === 'tx_cpu_usage_exceeded') {
+      } else if (_optionalChain([err, 'access', _11 => _11.error, 'optionalAccess', _12 => _12.name]) === 'tx_cpu_usage_exceeded') {
         err = new Error('Insufficient CPU available to send EOS transaction')
         err.name = 'ErrorEosInsufficientCpu'
-      } else if (_optionalChain([err, 'access', _11 => _11.error, 'optionalAccess', _12 => _12.name]) === 'ram_usage_exceeded') {
+      } else if (_optionalChain([err, 'access', _13 => _13.error, 'optionalAccess', _14 => _14.name]) === 'ram_usage_exceeded') {
         err = new Error('Insufficient RAM available to send EOS transaction')
         err.name = 'ErrorEosInsufficientRam'
       }

package/lib/eos/info/eosCommonInfo.js

@@ -0,0 +1,10 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+// https://developers.eos.io/manuals/eos/v2.1/cleos/command-reference/transfer
+ const eosMemoOptions = [
+  {
+    type: 'text',
+    memoName: 'memo',
+    maxLength: 256
+  }
+]; exports.eosMemoOptions = eosMemoOptions

package/lib/eos/info/eosInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 
 
 var _eosTypes = require('../eosTypes');
+var _eosCommonInfo = require('./eosCommonInfo');
 
 // ----EOSIO MAIN NET----
  const eosNetworkInfo = {
@@ -27,33 +28,30 @@ var _eosTypes = require('../eosTypes');
   uriProtocol: 'eos'
 }; exports.eosNetworkInfo = eosNetworkInfo
 
-const denominations = [
-  // An array of Objects of the possible denominations for this currency
-  {
-    name: 'EOS',
-    multiplier: '10000',
-    symbol: 'E'
-  }
-]
-
  const eosCurrencyInfo = {
-  // Basic currency information:
   currencyCode: 'EOS',
   displayName: 'EOS',
+  memoOptions: _eosCommonInfo.eosMemoOptions,
   pluginId: 'eos',
+  unsafeBroadcastTx: true,
   walletType: 'wallet:eos',
 
-  defaultSettings: {},
-
-  memoMaxLength: 256,
-
+  // Explorers:
   addressExplorer: 'https://bloks.io/account/%s',
   transactionExplorer: 'https://bloks.io/transaction/%s',
 
-  denominations,
-  metaTokens: [], // Deprecated
+  denominations: [
+    {
+      name: 'EOS',
+      multiplier: '10000',
+      symbol: 'E'
+    }
+  ],
 
-  unsafeBroadcastTx: true
+  // Deprecated:
+  defaultSettings: {},
+  memoMaxLength: 256,
+  metaTokens: []
 }; exports.eosCurrencyInfo = eosCurrencyInfo
 
  const eos = _innerPlugin.makeOuterPlugin({

package/lib/eos/info/telosInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 
 
 var _eosTypes = require('../eosTypes');
+var _eosCommonInfo = require('./eosCommonInfo');
 
 // ----TELOS MAIN NET----
  const telosNetworkInfo = {
@@ -20,30 +21,29 @@ var _eosTypes = require('../eosTypes');
   uriProtocol: 'telos'
 }; exports.telosNetworkInfo = telosNetworkInfo
 
-const denominations = [
-  {
-    name: 'TLOS',
-    multiplier: '10000',
-    symbol: 'T'
-  }
-]
-
  const telosCurrencyInfo = {
-  // Basic currency information:
   currencyCode: 'TLOS',
   displayName: 'Telos',
+  memoOptions: _eosCommonInfo.eosMemoOptions,
   pluginId: 'telos',
   walletType: 'wallet:telos',
 
-  defaultSettings: {},
-
-  memoMaxLength: 256,
-
+  // Explorers:
   addressExplorer: 'https://telos.bloks.io/account/%s',
   transactionExplorer: 'https://telos.bloks.io/transaction/%s',
 
-  denominations,
-  metaTokens: [] // Deprecated
+  denominations: [
+    {
+      name: 'TLOS',
+      multiplier: '10000',
+      symbol: 'T'
+    }
+  ],
+
+  // Deprecated:
+  defaultSettings: {},
+  memoMaxLength: 256,
+  metaTokens: []
 }; exports.telosCurrencyInfo = telosCurrencyInfo
 
  const telos = _innerPlugin.makeOuterPlugin({

package/lib/eos/info/waxInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 
 
 var _eosTypes = require('../eosTypes');
+var _eosCommonInfo = require('./eosCommonInfo');
 
 // ----WAX MAIN NET----
  const waxNetworkInfo = {
@@ -16,31 +17,29 @@ var _eosTypes = require('../eosTypes');
   uriProtocol: 'wax'
 }; exports.waxNetworkInfo = waxNetworkInfo
 
-const denominations = [
-  // An array of Objects of the possible denominations for this currency
-  {
-    name: 'WAX',
-    multiplier: '100000000',
-    symbol: 'W'
-  }
-]
-
  const waxCurrencyInfo = {
-  // Basic currency information:
   currencyCode: 'WAX',
   displayName: 'Wax',
+  memoOptions: _eosCommonInfo.eosMemoOptions,
   pluginId: 'wax',
   walletType: 'wallet:wax',
 
-  defaultSettings: {},
-
-  memoMaxLength: 256,
-
+  // Explorers:
   addressExplorer: 'https://wax.bloks.io/account/%s',
   transactionExplorer: 'https://wax.bloks.io/transaction/%s',
 
-  denominations,
-  metaTokens: [] // Deprecated
+  denominations: [
+    {
+      name: 'WAX',
+      multiplier: '100000000',
+      symbol: 'W'
+    }
+  ],
+
+  // Deprecated:
+  defaultSettings: {},
+  memoMaxLength: 256,
+  metaTokens: []
 }; exports.waxCurrencyInfo = waxCurrencyInfo
 
  const wax = _innerPlugin.makeOuterPlugin({

package/lib/ethereum/EthereumEngine.js

@@ -25,6 +25,7 @@ var _ethereumjswallet = require('ethereumjs-wallet'); var _ethereumjswallet2 = _
 
 var _CurrencyEngine = require('../common/CurrencyEngine');
 
+var _upgradeMemos = require('../common/upgradeMemos');
 
 
 
@@ -716,6 +717,7 @@ var _feeProviders = require('./fees/feeProviders');
   }
 
   async getMaxSpendable(spendInfo) {
+    spendInfo = _upgradeMemos.upgradeMemos.call(void 0, spendInfo, this.currencyInfo)
     const { edgeSpendInfo, currencyCode } = this.makeSpendCheck(spendInfo)
 
     const balance = this.getBalance({
@@ -809,17 +811,13 @@ var _feeProviders = require('./fees/feeProviders');
     currencyCode,
     currencyInfo
   ) {
+    const { memos = [] } = edgeSpendInfo
     const { spendTargets } = edgeSpendInfo
     const spendTarget = spendTargets[0]
     const { publicAddress, nativeAmount } = spendTarget
 
     // Get data:
-    let data =
-      _nullishCoalesce(spendTarget.memo, () => ( _optionalChain([spendTarget, 'access', _18 => _18.otherParams, 'optionalAccess', _19 => _19.data])))
-    if (data != null && data.length > 0 && !_utils.isHex.call(void 0, data)) {
-      throw new Error(`Memo/data field must be of type 'hex'`)
-    }
-    if (data === '') data = undefined
+    let data = _optionalChain([memos, 'access', _18 => _18[0], 'optionalAccess', _19 => _19.type]) === 'hex' ? memos[0].value : undefined
 
     // Get contractAddress and/or value:
     let value
@@ -865,8 +863,10 @@ var _feeProviders = require('./fees/feeProviders');
 
   // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
   async makeSpend(edgeSpendInfoIn) {
+    edgeSpendInfoIn = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfoIn, this.currencyInfo)
     const { edgeSpendInfo, currencyCode, skipChecks } =
       this.makeSpendCheck(edgeSpendInfoIn)
+    const { memos = [] } = edgeSpendInfo
 
     const { pendingTxs = [] } = edgeSpendInfo
 
@@ -1020,17 +1020,18 @@ var _feeProviders = require('./fees/feeProviders');
     //
 
     const edgeTransaction = {
-      txid: '', // txid
-      date: 0, // date
-      currencyCode, // currencyCode
       blockHeight: 0, // blockHeight
-      nativeAmount, // nativeAmount
+      currencyCode, // currencyCode
+      date: 0, // date
+      feeRateUsed: _EthereumNetwork.getFeeRateUsed.call(void 0, miningFees.gasPrice, otherParams.gas),
       isSend: nativeAmount.startsWith('-'),
+      memos,
+      nativeAmount, // nativeAmount
       networkFee: nativeNetworkFee, // networkFee
-      feeRateUsed: _EthereumNetwork.getFeeRateUsed.call(void 0, miningFees.gasPrice, otherParams.gas),
+      otherParams, // otherParams
       ourReceiveAddresses: [], // ourReceiveAddresses
       signedTx: '', // signedTx
-      otherParams, // otherParams
+      txid: '', // txid
       walletId: this.walletId
     }
 

package/lib/ethereum/EthereumNetwork.js

@@ -344,21 +344,22 @@ async function broadcastWrapper(promise, server) {
     if (blockHeight < 0) blockHeight = 0
 
     const edgeTransaction = {
-      txid,
-      date: parseInt(tx.timeStamp),
-      currencyCode,
       blockHeight,
-      nativeAmount,
-      isSend: nativeAmount.startsWith('-'),
-      networkFee,
+      currencyCode,
+      date: parseInt(tx.timeStamp),
       feeRateUsed:
         gasPrice != null
           ? exports.getFeeRateUsed.call(void 0, gasPrice, tx.gas, tx.gasUsed)
           : undefined,
-      parentNetworkFee,
+      isSend: nativeAmount.startsWith('-'),
+      memos: [],
+      nativeAmount,
+      networkFee,
+      otherParams,
       ourReceiveAddresses,
+      parentNetworkFee,
       signedTx: '',
-      otherParams,
+      txid,
       walletId: this.walletId
     }
 
@@ -440,17 +441,18 @@ async function broadcastWrapper(promise, server) {
     }
 
     const edgeTransaction = {
-      txid: tokenTransfer.relationships.transaction.data.id,
-      date: tokenTransfer.attributes.blockCreationTime,
-      currencyCode,
       blockHeight,
-      nativeAmount: netNativeAmount,
+      currencyCode,
+      date: tokenTransfer.attributes.blockCreationTime,
       isSend: netNativeAmount.startsWith('-'),
+      memos: [],
+      nativeAmount: netNativeAmount,
       networkFee,
+      otherParams,
       ourReceiveAddresses,
-      signedTx: '',
       parentNetworkFee,
-      otherParams,
+      signedTx: '',
+      txid: tokenTransfer.relationships.transaction.data.id,
       walletId: this.walletId
     }
 

package/lib/ethereum/info/avalancheInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {
   '60781c2586d68229fde47564546784ab3faca982': {
@@ -207,28 +208,29 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'AVAX',
   displayName: 'Avalanche',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'avalanche', // matching mnemonic here
   walletType: 'wallet:avalanche',
-  memoType: 'hex',
-
-  canReplaceByFee: true,
-  defaultSettings,
 
+  // Explorers:
   addressExplorer: 'https://snowtrace.io/address/%s',
   transactionExplorer: 'https://snowtrace.io/tx/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'AVAX',
       multiplier: '1000000000000000000',
       symbol: 'AVAX'
     }
   ],
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+
+  // Deprecated:
+  defaultSettings,
+  memoType: 'hex',
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const avalanche = _innerPlugin.makeOuterPlugin({

package/lib/ethereum/info/binancesmartchainInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {
   e9e7cea3dedca5984780bafc599bd69add087d56: {
@@ -82,28 +83,29 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'BNB',
   displayName: 'BNB Smart Chain',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'binancesmartchain',
   walletType: 'wallet:binancesmartchain',
-  memoType: 'hex',
-
-  canReplaceByFee: true,
-  defaultSettings,
 
+  // Explorers:
   addressExplorer: 'https://bscscan.com/address/%s',
   transactionExplorer: 'https://bscscan.com/tx/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'BNB',
       multiplier: '1000000000000000000',
       symbol: 'BNB'
     }
   ],
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+
+  // Deprecated:
+  defaultSettings,
+  memoType: 'hex',
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const binancesmartchain = _innerPlugin.makeOuterPlugin

package/lib/ethereum/info/celoInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {
   '765de816845861e75a25fca122bb6898b8b1282a': {
@@ -87,28 +88,29 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'CELO',
   displayName: 'Celo',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'celo',
   walletType: 'wallet:celo',
-  memoType: 'hex',
-
-  canReplaceByFee: true,
-  defaultSettings,
 
+  // Explorers:
   addressExplorer: 'https://explorer.celo.org/address/%s',
   transactionExplorer: 'https://explorer.celo.org/tx/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'CELO',
       multiplier: '1000000000000000000',
       symbol: 'CELO'
     }
   ],
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+
+  // Deprecated:
+  defaultSettings,
+  memoType: 'hex',
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const celo = _innerPlugin.makeOuterPlugin({

package/lib/ethereum/info/ethDevInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {
   ff795577d9ac8bd7d90ee22b6c1703490b6512fd: {
@@ -130,21 +131,18 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'ETH',
   displayName: 'Dev Ethereum',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'ethDev',
   walletType: 'wallet:ethDev',
-  memoType: 'hex',
-
-  canReplaceByFee: true,
-  defaultSettings,
 
+  // Explorers:
   addressExplorer: 'https://etherscan.io/address/%s',
   transactionExplorer: 'https://etherscan.io/tx/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'ETH',
       multiplier: '1000000000000000000',
@@ -156,7 +154,11 @@ const defaultSettings = {
       symbol: 'mΞ'
     }
   ],
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+
+  // Deprecated:
+  defaultSettings,
+  memoType: 'hex',
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const ethDev = _innerPlugin.makeOuterPlugin({

package/lib/ethereum/info/ethereumCommonInfo.js

@@ -0,0 +1,10 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+// We are using the memo to pass Ethereum contract calls:
+ const evmMemoOptions = [
+  {
+    type: 'hex',
+    hidden: true,
+    memoName: 'data'
+  }
+]; exports.evmMemoOptions = evmMemoOptions