edge-currency-accountbased 2.2.4 → 2.3.0

package/lib/filecoin/filecoinInfo.js

@@ -16,20 +16,18 @@ const networkInfo = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
   currencyCode: 'FIL',
   displayName: 'Filecoin',
   pluginId: 'filecoin',
   requiredConfirmations: 900,
+  unsafeBroadcastTx: true,
   walletType: 'wallet:filecoin',
 
-  defaultSettings: {},
-
+  // Explorers:
   addressExplorer: 'https://filscan.io/en/address/%s',
   transactionExplorer: 'https://filscan.io/en/message/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'FIL',
       multiplier: '1000000000000000000',
@@ -67,9 +65,9 @@ const networkInfo = {
     }
   ],
 
-  metaTokens: [], // Deprecated
-
-  unsafeBroadcastTx: true
+  // Deprecated:
+  defaultSettings: {},
+  metaTokens: []
 }; exports.currencyInfo = currencyInfo
 
  const filecoin = _innerPlugin.makeOuterPlugin({

package/lib/fio/FioEngine.js

@@ -26,6 +26,7 @@ var _types = require('edge-core-js/types');
 
 var _CurrencyEngine = require('../common/CurrencyEngine');
 
+var _upgradeMemos = require('../common/upgradeMemos');
 
 
 
@@ -483,16 +484,17 @@ const SYNC_NETWORK_INTERVAL = 10000
       otherParams.meta.isTransferProcessed = true
 
       const edgeTransaction = {
-        txid: action.action_trace.trx_id,
-        date: this.getUTCDate(action.block_time) / 1000,
-        currencyCode,
         blockHeight: action.block_num > 0 ? action.block_num : 0,
-        nativeAmount,
+        currencyCode,
+        date: this.getUTCDate(action.block_time) / 1000,
         isSend: nativeAmount.startsWith('-'),
+        memos: [],
+        nativeAmount,
         networkFee,
+        otherParams,
         ourReceiveAddresses,
         signedTx: '',
-        otherParams,
+        txid: action.action_trace.trx_id,
         walletId: this.walletId
       }
       this.addTransaction(currencyCode, edgeTransaction)
@@ -570,16 +572,17 @@ const SYNC_NETWORK_INTERVAL = 10000
 
       otherParams.meta.isFeeProcessed = true
       const edgeTransaction = {
-        txid: action.action_trace.trx_id,
-        date: this.getUTCDate(action.block_time) / 1000,
-        currencyCode,
         blockHeight: action.block_num > 0 ? action.block_num : 0,
-        nativeAmount,
+        currencyCode,
+        date: this.getUTCDate(action.block_time) / 1000,
         isSend: nativeAmount.startsWith('-'),
+        memos: [],
+        nativeAmount,
         networkFee,
-        signedTx: '',
-        ourReceiveAddresses: [],
         otherParams,
+        ourReceiveAddresses: [],
+        signedTx: '',
+        txid: action.action_trace.trx_id,
         walletId: this.walletId
       }
       this.addTransaction(currencyCode, edgeTransaction)
@@ -1376,6 +1379,7 @@ const SYNC_NETWORK_INTERVAL = 10000
   }
 
   async getMaxSpendable(spendInfo) {
+    spendInfo = _upgradeMemos.upgradeMemos.call(void 0, spendInfo, this.currencyInfo)
     const balance = this.getBalance({
       currencyCode: spendInfo.currencyCode
     })
@@ -1397,8 +1401,11 @@ const SYNC_NETWORK_INTERVAL = 10000
   }
 
   async makeSpend(edgeSpendInfoIn) {
+    edgeSpendInfoIn = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfoIn, this.currencyInfo)
     const { edgeSpendInfo, nativeBalance, currencyCode } =
       this.makeSpendCheck(edgeSpendInfoIn)
+    const { memos = [] } = edgeSpendInfo
+
     const lockedBalance =
       _nullishCoalesce(this.walletLocalData.totalBalances[
         this.networkInfo.balanceCurrencyCodes.locked
@@ -1678,19 +1685,20 @@ const SYNC_NETWORK_INTERVAL = 10000
     }
 
     const edgeTransaction = {
-      txid: '',
-      date: 0,
-      currencyCode,
       blockHeight: 0,
-      nativeAmount: _biggystring.sub.call(void 0, `-${quantity}`, `${fee}`),
+      currencyCode,
+      date: 0,
       isSend: true,
+      memos,
+      nativeAmount: _biggystring.sub.call(void 0, `-${quantity}`, `${fee}`),
       networkFee: `${fee}`,
-      ourReceiveAddresses: [],
-      signedTx: '',
       otherParams: {
         ...otherParams,
         txParams
       },
+      ourReceiveAddresses: [],
+      signedTx: '',
+      txid: '',
       walletId: this.walletId
     }
 

package/lib/fio/fioInfo.js

@@ -48,28 +48,30 @@ const networkInfo = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
   currencyCode: 'FIO',
   displayName: 'FIO',
   pluginId: 'fio',
+  unsafeSyncNetwork: true,
   walletType: 'wallet:fio',
 
-  defaultSettings: { ...networkInfo },
-
+  // Explorers:
   addressExplorer: 'https://fio.bloks.io/key/%s',
   transactionExplorer: 'https://fio.bloks.io/transaction/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'FIO',
       multiplier: '1000000000',
       symbol: 'ᵮ'
     }
   ],
-  metaTokens: [], // Deprecated
 
-  unsafeSyncNetwork: true
+  // No memo support:
+  memoOptions: [],
+
+  // Deprecated:
+  defaultSettings: { ...networkInfo },
+  metaTokens: []
 }; exports.currencyInfo = currencyInfo
 
  const fio = _innerPlugin.makeOuterPlugin({

package/lib/hedera/HederaEngine.js

@@ -16,6 +16,7 @@ var _rfc4648 = require('rfc4648');
 
 var _CurrencyEngine = require('../common/CurrencyEngine');
 
+var _upgradeMemos = require('../common/upgradeMemos');
 var _utils = require('../common/utils');
 
 
@@ -365,18 +366,19 @@ var _hederaTypes = require('./hederaTypes');
       if (_biggystring.gt.call(void 0, nativeAmount, '0')) ourReceiveAddresses.push(accountIdStr)
 
       txs.push({
-        txid: hashToTxid(_rfc4648.base64.parse(tx.transaction_hash)),
-        date: parseInt(tx.valid_start_timestamp),
-        currencyCode: this.currencyInfo.currencyCode, // currencyCode
         blockHeight: 1, // blockHeight
-        nativeAmount,
+        currencyCode: this.currencyInfo.currencyCode, // currencyCode
+        date: parseInt(tx.valid_start_timestamp),
         isSend: nativeAmount.startsWith('-'),
+        memos: [],
+        nativeAmount,
         networkFee: tx.charged_tx_fee.toString(), // networkFee
-        ourReceiveAddresses, // ourReceiveAddresses
-        signedTx: '', // signedTx
         otherParams: {
           consensusAt: tx.consensus_timestamp
         },
+        ourReceiveAddresses, // ourReceiveAddresses
+        signedTx: '', // signedTx
+        txid: hashToTxid(_rfc4648.base64.parse(tx.transaction_hash)),
         walletId: this.walletId
       })
     }
@@ -411,18 +413,19 @@ var _hederaTypes = require('./hederaTypes');
   }
 
   async makeSpend(edgeSpendInfoIn) {
+    edgeSpendInfoIn = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfoIn, this.currencyInfo)
+    const { edgeSpendInfo, currencyCode } = this.makeSpendCheck(edgeSpendInfoIn)
+    const { memos = [] } = edgeSpendInfo
+
     if (this.otherData.hederaAccount == null) {
       throw Error('ErrorAccountNotActivated')
     }
-
-    const { edgeSpendInfo, currencyCode } = this.makeSpendCheck(edgeSpendInfoIn)
-
     if (edgeSpendInfo.spendTargets.length !== 1) {
       throw new Error('Error: only one output allowed')
     }
 
-    const { publicAddress, uniqueIdentifier = '' } =
-      edgeSpendInfo.spendTargets[0]
+    const memo = _optionalChain([memos, 'access', _2 => _2[0], 'optionalAccess', _3 => _3.type]) === 'text' ? memos[0].value : ''
+    const { publicAddress } = edgeSpendInfo.spendTargets[0]
     let { nativeAmount } = edgeSpendInfo.spendTargets[0]
 
     if (publicAddress == null)
@@ -455,25 +458,26 @@ var _hederaTypes = require('./hederaTypes');
       .addHbarTransfer(this.otherData.hederaAccount, hbar.negated())
       .addHbarTransfer(publicAddress, hbar)
       .setMaxTransactionFee(txnFee)
-      .setTransactionMemo(uniqueIdentifier)
+      .setTransactionMemo(memo)
       .build(this.client)
 
     const edgeTransaction = {
-      txid: '',
-      date: 0,
-      currencyCode, // currencyCode
       blockHeight: 0, // blockHeight
-      nativeAmount: `-${nativeAmount}`,
+      currencyCode, // currencyCode
+      date: 0,
       isSend: true,
+      memos,
+      nativeAmount: `-${nativeAmount}`,
       // UI shows the fee subtracted from the sent amount which doesn't make sense here
       networkFee, // networkFee
-      ourReceiveAddresses: [], // ourReceiveAddresses
-      signedTx: '', // signedTx
       otherParams: {
         fromAddress: this.walletLocalData.publicKey,
         toAddress: publicAddress,
         transferTx: _rfc4648.base64.stringify(transferTx.toBytes())
       },
+      ourReceiveAddresses: [], // ourReceiveAddresses
+      signedTx: '', // signedTx
+      txid: '',
       walletId: this.walletId
     }
     return edgeTransaction

package/lib/hedera/hederaInfo.js

@@ -14,22 +14,17 @@ const networkInfo = {
 }
 
 const currencyInfo = {
-  // Basic currency information:
   currencyCode: 'HBAR',
   displayName: 'Hedera',
   pluginId: 'hedera',
   walletType: 'wallet:hedera',
 
-  defaultSettings: {},
-
-  memoMaxLength: 100,
-
+  // Explorers:
   addressExplorer: 'https://hashscan.io/mainnet/account/%s',
   transactionExplorer: 'https://hashscan.io/mainnet/transaction/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
-    // other denominations are specified but these are the most common
+    // Other denominations are specified but these are the most common:
     {
       name: 'HBAR',
       multiplier: '100000000', // 100,000,000
@@ -41,7 +36,15 @@ const currencyInfo = {
       symbol: 'tℏ'
     }
   ],
-  metaTokens: [] // Deprecated
+
+  // https://docs.hedera.com/hedera/sdks-and-apis/sdks/transactions/modify-transaction-fields
+  memoOptions: [{ type: 'text', memoName: 'memo', maxLength: 100 }],
+
+  // Deprecated:
+  defaultSettings: {},
+  memoMaxLength: 100,
+  memoType: 'text',
+  metaTokens: []
 }
 
  const hedera = _innerPlugin.makeOuterPlugin({

package/lib/hedera/hederaTestnetInfo.js

@@ -13,20 +13,17 @@ const networkInfo = {
 }
 
 const currencyInfo = {
-  // Basic currency information:
   currencyCode: 'THBAR',
   displayName: 'Hedera Testnet',
   pluginId: 'hederatestnet',
   walletType: 'wallet:hederatestnet',
 
-  defaultSettings: {},
-
+  // Explorers:
   addressExplorer: `https://explorer.kabuto.sh/testnet/id/%s`,
   transactionExplorer: `https://explorer.kabuto.sh/testnet/transaction/%s`,
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
-    // other denominations are specified but these are the most common
+    // Other denominations are specified but these are the most common:
     {
       name: 'THBAR',
       multiplier: '100000000', // 100,000,000
@@ -38,7 +35,10 @@ const currencyInfo = {
       symbol: 'tℏ'
     }
   ],
-  metaTokens: [] // Deprecated
+
+  // Deprecated:
+  defaultSettings: {},
+  metaTokens: []
 }
 
  const hederatestnet = _innerPlugin.makeOuterPlugin({

package/lib/polkadot/PolkadotEngine.js

@@ -20,6 +20,7 @@ var _rfc4648 = require('rfc4648');
 var _CurrencyEngine = require('../common/CurrencyEngine');
 
 var _tokenHelpers = require('../common/tokenHelpers');
+var _upgradeMemos = require('../common/upgradeMemos');
 
 
 
@@ -189,15 +190,16 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
     }
 
     const edgeTransaction = {
-      txid: hash,
-      date,
-      currencyCode: this.currencyInfo.currencyCode,
       blockHeight,
-      nativeAmount,
+      currencyCode: this.currencyInfo.currencyCode,
+      date,
       isSend: nativeAmount.startsWith('-'),
+      memos: [],
+      nativeAmount,
       networkFee: fee,
       ourReceiveAddresses,
       signedTx: '',
+      txid: hash,
       walletId: this.walletId
     }
     this.addTransaction(this.currencyInfo.currencyCode, edgeTransaction)
@@ -320,6 +322,7 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
   }
 
   async getMaxSpendable(spendInfo) {
+    spendInfo = _upgradeMemos.upgradeMemos.call(void 0, spendInfo, this.currencyInfo)
     if (
       spendInfo.spendTargets.length === 0 ||
       spendInfo.spendTargets[0].publicAddress == null
@@ -385,7 +388,9 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
   }
 
   async makeSpend(edgeSpendInfoIn) {
+    edgeSpendInfoIn = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfoIn, this.currencyInfo)
     const { edgeSpendInfo, currencyCode } = this.makeSpendCheck(edgeSpendInfoIn)
+    const { memos = [] } = edgeSpendInfo
 
     if (edgeSpendInfo.spendTargets.length !== 1) {
       throw new Error('Error: only one output allowed')
@@ -482,16 +487,17 @@ const queryTxMutex = _utils.makeMutex.call(void 0, )
     // **********************************
     // Create the unsigned EdgeTransaction
     const edgeTransaction = {
-      txid: '',
-      date: 0,
-      currencyCode,
       blockHeight: 0,
-      nativeAmount: _biggystring.mul.call(void 0, totalTxAmount, '-1'),
+      currencyCode,
+      date: 0,
       isSend: true,
+      memos,
+      nativeAmount: _biggystring.mul.call(void 0, totalTxAmount, '-1'),
       networkFee: nativeNetworkFee,
+      otherParams,
       ourReceiveAddresses: [],
       signedTx: '',
-      otherParams,
+      txid: '',
       walletId: this.walletId
     }
 

package/lib/polkadot/info/liberlandInfo.js

@@ -30,6 +30,7 @@ const networkInfo = {
   pluginId: 'liberland',
   walletType: 'wallet:liberland',
 
+  // Explorers:
   addressExplorer: '',
   transactionExplorer:
     'https://polkadot.js.org/apps/?rpc=wss%%3A%%2F%%2Fmainnet.liberland.org%%2F#/explorer/query/%s',
@@ -42,9 +43,9 @@ const networkInfo = {
     }
   ],
 
-  // Deprecated
+  // Deprecated:
   defaultSettings: {},
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const liberland = _innerPlugin.makeOuterPlugin({

package/lib/polkadot/info/liberlandTestnetInfo.js

@@ -30,6 +30,7 @@ const networkInfo = {
   pluginId: 'liberlandtestnet',
   walletType: 'wallet:liberlandtestnet',
 
+  // Explorers:
   addressExplorer: '',
   transactionExplorer:
     'https://polkadot.js.org/apps/?rpc=wss%%3A%%2F%%2Ftestchain.liberland.org%%2F#/explorer/query/%s',
@@ -42,9 +43,9 @@ const networkInfo = {
     }
   ],
 
-  // Deprecated
+  // Deprecated:
   defaultSettings: {},
-  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens) // Deprecated
+  metaTokens: _tokenHelpers.makeMetaTokens.call(void 0, builtinTokens)
 }; exports.currencyInfo = currencyInfo
 
  const liberlandtestnet = _innerPlugin.makeOuterPlugin

package/lib/polkadot/info/polkadotInfo.js

@@ -13,26 +13,29 @@ const networkInfo = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
   currencyCode: 'DOT',
   displayName: 'Polkadot',
   pluginId: 'polkadot',
   walletType: 'wallet:polkadot',
 
-  defaultSettings: {},
-
+  // Explorers:
   addressExplorer: 'https://polkadot.subscan.io/account/%s',
   transactionExplorer: 'https://polkadot.subscan.io/extrinsic/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'DOT',
       multiplier: '10000000000',
       symbol: ''
     }
   ],
-  metaTokens: [] // Deprecated
+
+  // No memo support:
+  memoOptions: [],
+
+  // Deprecated:
+  defaultSettings: {},
+  metaTokens: []
 }; exports.currencyInfo = currencyInfo
 
  const polkadot = _innerPlugin.makeOuterPlugin({