edge-currency-accountbased 2.2.4 → 2.3.0

package/lib/ethereum/info/ethereumInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {
   '111111111117dc0aa78b770fa6a738034120c302': {
@@ -1112,21 +1113,18 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'ETH',
   displayName: 'Ethereum',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'ethereum',
   walletType: 'wallet:ethereum',
-  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',
@@ -1138,7 +1136,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 ethereum = _innerPlugin.makeOuterPlugin({

package/lib/ethereum/info/ethereumclassicInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {
   '2c78f1b70ccf63cdee49f9233e9faa99d43aa07e': {
@@ -97,21 +98,18 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'ETC',
   displayName: 'Ethereum Classic',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'ethereumclassic',
   walletType: 'wallet:ethereumclassic',
-  memoType: 'hex',
-
-  canReplaceByFee: true,
-  defaultSettings,
 
+  // Explorers:
   addressExplorer: 'https://blockscout.com/etc/mainnet/address/%s',
   transactionExplorer: 'https://blockscout.com/etc/mainnet/tx/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'ETC',
       multiplier: '1000000000000000000',
@@ -123,7 +121,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 ethereumclassic = _innerPlugin.makeOuterPlugin

package/lib/ethereum/info/ethereumpowInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {
   '2ad7868ca212135c6119fd7ad1ce51cfc5702892': {
@@ -78,21 +79,18 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'ETHW',
   displayName: 'EthereumPoW',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'ethereumpow',
   walletType: 'wallet:ethereumpow',
-  memoType: 'hex',
-
-  canReplaceByFee: true,
-  defaultSettings,
 
+  // Explorers:
   addressExplorer: 'https://www.oklink.com/en/ethw/address/%s',
   transactionExplorer: 'https://www.oklink.com/en/ethw/tx/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'ETHW',
       multiplier: '1000000000000000000',
@@ -104,7 +102,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 ethereumpow = _innerPlugin.makeOuterPlugin({

package/lib/ethereum/info/fantomInfo.js

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

package/lib/ethereum/info/goerliInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {}
 
@@ -108,21 +109,18 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'GOR',
   displayName: 'Goerli Testnet',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'goerli',
   walletType: 'wallet:goerli',
-  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: 'GOR',
       multiplier: '1000000000000000000',
@@ -134,7 +132,11 @@ const defaultSettings = {
       symbol: 'mG'
     }
   ],
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+
+  // Deprecated:
+  defaultSettings,
+  memoType: 'hex',
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const goerli = _innerPlugin.makeOuterPlugin({

package/lib/ethereum/info/kovanInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {
   b597cd8d3217ea6477232f9217fa70837ff667af: {
@@ -255,21 +256,18 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'KOV',
   displayName: 'Kovan Testnet',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'kovan',
   walletType: 'wallet:kovan',
-  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: 'KOV',
       multiplier: '1000000000000000000',
@@ -281,7 +279,11 @@ const defaultSettings = {
       symbol: 'mK'
     }
   ],
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+
+  // Deprecated:
+  defaultSettings,
+  memoType: 'hex',
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const kovan = _innerPlugin.makeOuterPlugin({

package/lib/ethereum/info/optimismInfo.js

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

package/lib/ethereum/info/polygonInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {
   '2791bca1f2de4661ed88a30c99a7a9449aa84174': {
@@ -190,21 +191,18 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'MATIC',
   displayName: 'Polygon',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'polygon', // matching mnemonic here
   walletType: 'wallet:polygon',
-  memoType: 'hex',
-
-  canReplaceByFee: true,
-  defaultSettings,
 
+  // Explorers:
   addressExplorer: 'https://polygonscan.com/address/%s',
   transactionExplorer: 'https://polygonscan.com/tx/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'MATIC',
       multiplier: '1000000000000000000',
@@ -216,7 +214,11 @@ const defaultSettings = {
       symbol: 'mMATIC'
     }
   ],
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+
+  // Deprecated:
+  defaultSettings,
+  memoType: 'hex',
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const polygon = _innerPlugin.makeOuterPlugin({

package/lib/ethereum/info/pulsechainInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {
   a1077a294dde1b09bb078844df40758a5d0f9a27: {
@@ -75,21 +76,18 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'PLS',
   displayName: 'PulseChain',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'pulsechain',
   walletType: 'wallet:pulsechain',
-  memoType: 'hex',
-
-  canReplaceByFee: true,
-  defaultSettings,
 
+  // Explorers:
   addressExplorer: 'https://scan.pulsechain.com/address/%s',
   transactionExplorer: 'https://scan.pulsechain.com/tx/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'PLS',
       multiplier: '1000000000000000000',
@@ -101,7 +99,11 @@ const defaultSettings = {
       symbol: 'mPLS'
     }
   ],
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+
+  // Deprecated:
+  defaultSettings,
+  memoType: 'hex',
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const pulsechain = _innerPlugin.makeOuterPlugin({

package/lib/ethereum/info/rinkebyInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {}
 
@@ -108,21 +109,18 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'RIN',
   displayName: 'Rinkeby Testnet',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'rinkeby',
   walletType: 'wallet:rinkeby',
-  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: 'RIN',
       multiplier: '1000000000000000000',
@@ -134,7 +132,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 rinkeby = _innerPlugin.makeOuterPlugin({

package/lib/ethereum/info/ropstenInfo.js

@@ -4,6 +4,7 @@ var _innerPlugin = require('../../common/innerPlugin');
 var _tokenHelpers = require('../../common/tokenHelpers');
 
 
+var _ethereumCommonInfo = require('./ethereumCommonInfo');
 
 const builtinTokens = {}
 
@@ -111,21 +112,18 @@ const defaultSettings = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
+  canReplaceByFee: true,
   currencyCode: 'ROP',
   displayName: 'Ropsten Testnet',
+  memoOptions: _ethereumCommonInfo.evmMemoOptions,
   pluginId: 'ropsten',
   walletType: 'wallet:ropsten',
-  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: 'ROP',
       multiplier: '1000000000000000000',
@@ -137,7 +135,11 @@ const defaultSettings = {
       symbol: 'mR'
     }
   ],
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+
+  // Deprecated:
+  defaultSettings,
+  memoType: 'hex',
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const ropsten = _innerPlugin.makeOuterPlugin({

package/lib/ethereum/info/rskInfo.js

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

package/lib/ethereum/info/zksyncInfo.js

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

package/lib/filecoin/FilecoinEngine.js

@@ -23,6 +23,7 @@ var _types = require('edge-core-js/types');
 
 var _CurrencyEngine = require('../common/CurrencyEngine');
 
+var _upgradeMemos = require('../common/upgradeMemos');
 
 
 
@@ -161,7 +162,9 @@ const CHECK_TRANSACTION_INTERVAL = 15000
   }
 
   async makeSpend(edgeSpendInfoIn) {
+    edgeSpendInfoIn = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfoIn, this.currencyInfo)
     const { edgeSpendInfo, currencyCode } = this.makeSpendCheck(edgeSpendInfoIn)
+    const { memos = [] } = edgeSpendInfo
     const spendTarget = edgeSpendInfo.spendTargets[0]
     const { publicAddress, nativeAmount } = spendTarget
 
@@ -192,16 +195,17 @@ const CHECK_TRANSACTION_INTERVAL = 15000
     const txNativeAmount = _biggystring.mul.call(void 0, _biggystring.add.call(void 0, nativeAmount, networkFee), '-1')
 
     const edgeTransaction = {
-      txid: '',
-      date: 0,
-      currencyCode,
       blockHeight: 0,
-      nativeAmount: txNativeAmount,
+      currencyCode,
+      date: 0,
       isSend: true,
+      memos,
+      nativeAmount: txNativeAmount,
       networkFee,
-      ourReceiveAddresses: [],
       otherParams,
+      ourReceiveAddresses: [],
       signedTx: '',
+      txid: '',
       walletId: this.walletId
     }
 
@@ -473,16 +477,17 @@ const CHECK_TRANSACTION_INTERVAL = 15000
     }
 
     const edgeTransaction = {
-      txid: messageDetails.cid,
-      date: messageDetails.timestamp,
-      currencyCode: this.currencyInfo.currencyCode,
       blockHeight: messageDetails.height,
-      nativeAmount,
+      currencyCode: this.currencyInfo.currencyCode,
+      date: messageDetails.timestamp,
       isSend: nativeAmount.startsWith('-'),
+      memos: [],
+      nativeAmount,
       networkFee,
+      otherParams: {},
       ourReceiveAddresses, // blank if you sent money otherwise array of addresses that are yours in this transaction
       signedTx: '',
-      otherParams: {},
+      txid: messageDetails.cid,
       walletId: this.walletId
     }
 
@@ -509,16 +514,17 @@ const CHECK_TRANSACTION_INTERVAL = 15000
     }
 
     const edgeTransaction = {
-      txid: message.cid,
-      date: message.block_time,
-      currencyCode: this.currencyInfo.currencyCode,
       blockHeight: message.height,
-      nativeAmount,
+      currencyCode: this.currencyInfo.currencyCode,
+      date: message.block_time,
       isSend: nativeAmount.startsWith('-'),
+      memos: [],
+      nativeAmount,
       networkFee,
+      otherParams: {},
       ourReceiveAddresses, // blank if you sent money otherwise array of addresses that are yours in this transaction
       signedTx: '',
-      otherParams: {},
+      txid: message.cid,
       walletId: this.walletId
     }