edge-currency-accountbased 2.2.3 → 2.3.0

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({

package/lib/ripple/RippleEngine.js

@@ -27,6 +27,7 @@ var _biggystring = require('biggystring');
 
 
 var _types = require('edge-core-js/types');
+var _rfc4648 = require('rfc4648');
 
 
 
@@ -43,18 +44,14 @@ var _payment = require('xrpl/dist/npm/models/transactions/payment');
 var _CurrencyEngine = require('../common/CurrencyEngine');
 
 var _tokenHelpers = require('../common/tokenHelpers');
+var _upgradeMemos = require('../common/upgradeMemos');
+var _utf8 = require('../common/utf8');
 
 
 
 
 
 var _utils = require('../common/utils');
-
-
-
-
-
-var _pluginError = require('../pluginError');
 var _rippleInfo = require('./rippleInfo');
 
 
@@ -166,19 +163,20 @@ const SET_TRUST_LINE_FEE = '12'
               : this.allTokensMap[fromTokenId]
 
           const out = {
-            txid: '',
-            date: Date.now() / 1000,
-            currencyCode,
             blockHeight: 0, // blockHeight,
+            currencyCode,
+            date: Date.now() / 1000,
+            isSend: true,
+            memos: [],
             metadata,
             nativeAmount: `-${_biggystring.add.call(void 0, fromNativeAmount, networkFee)}`,
-            isSend: true,
             networkFee,
-            ourReceiveAddresses: [],
-            signedTx: '',
             otherParams: {
               xrpTransaction
             },
+            ourReceiveAddresses: [],
+            signedTx: '',
+            txid: '',
             walletId: this.walletId
           }
           return out
@@ -337,16 +335,17 @@ const SET_TRUST_LINE_FEE = '12'
           }
           // Parent currency like XRP
           this.addTransaction(currency, {
-            txid: hash.toLowerCase(),
-            date: _xrpl.rippleTimeToUnixTime.call(void 0, date) / 1000, // Returned date is in "ripple time" which is unix time if it had started on Jan 1 2000
-            currencyCode: currency,
             blockHeight: _nullishCoalesce(tx.ledger_index, () => ( -1)),
-            nativeAmount,
+            currencyCode: currency,
+            date: _xrpl.rippleTimeToUnixTime.call(void 0, date) / 1000, // Returned date is in "ripple time" which is unix time if it had started on Jan 1 2000
             isSend,
+            memos: [],
+            nativeAmount,
             networkFee,
+            otherParams: {},
             ourReceiveAddresses,
             signedTx: '',
-            otherParams: {},
+            txid: hash.toLowerCase(),
             walletId: this.walletId
           })
         } else {
@@ -372,16 +371,17 @@ const SET_TRUST_LINE_FEE = '12'
           }
 
           this.addTransaction(currencyCode, {
-            txid: hash.toLowerCase(),
-            date: _xrpl.rippleTimeToUnixTime.call(void 0, date) / 1000, // Returned date is in "ripple time" which is unix time if it had started on Jan 1 2000
-            currencyCode,
             blockHeight: _nullishCoalesce(tx.ledger_index, () => ( -1)),
-            nativeAmount,
+            currencyCode,
+            date: _xrpl.rippleTimeToUnixTime.call(void 0, date) / 1000, // Returned date is in "ripple time" which is unix time if it had started on Jan 1 2000
             isSend,
+            memos: [],
+            nativeAmount,
             networkFee: '0',
+            otherParams: {},
             ourReceiveAddresses,
             signedTx: '',
-            otherParams: {},
+            txid: hash.toLowerCase(),
             walletId: this.walletId
           })
         }
@@ -583,6 +583,7 @@ const SET_TRUST_LINE_FEE = '12'
   }
 
   async getMaxSpendable(spendInfo) {
+    spendInfo = _upgradeMemos.upgradeMemos.call(void 0, spendInfo, this.currencyInfo)
     const { currencyCode } = spendInfo
     let spendableBalance = this.getBalance({
       currencyCode
@@ -599,8 +600,11 @@ const SET_TRUST_LINE_FEE = '12'
   }
 
   async makeSpend(edgeSpendInfoIn) {
+    edgeSpendInfoIn = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfoIn, this.currencyInfo)
     const { edgeSpendInfo, currencyCode, nativeBalance } =
       this.makeSpendCheck(edgeSpendInfoIn)
+    const { memos = [] } = edgeSpendInfo
+
     const parentCurrencyCode = this.currencyInfo.currencyCode
 
     // Activation Transaction:
@@ -628,19 +632,20 @@ const SET_TRUST_LINE_FEE = '12'
       })
 
       return {
-        txid: '',
-        date: Date.now() / 1000,
-        currencyCode: this.currencyInfo.currencyCode,
         blockHeight: 0, // blockHeight,
+        currencyCode: this.currencyInfo.currencyCode,
+        date: Date.now() / 1000,
+        isSend: true,
+        memos,
         metadata: edgeSpendInfo.metadata,
         nativeAmount: `-${networkFee}`,
-        isSend: true,
         networkFee,
-        ourReceiveAddresses: [],
-        signedTx: '',
         otherParams: {
           xrpTransaction
         },
+        ourReceiveAddresses: [],
+        signedTx: '',
+        txid: '',
         walletId: this.walletId
       }
     }
@@ -688,44 +693,6 @@ const SET_TRUST_LINE_FEE = '12'
       }
     }
 
-    const uniqueIdentifier =
-      _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(edgeSpendInfo.spendTargets[0].memo, () => (
-      edgeSpendInfo.spendTargets[0].uniqueIdentifier)), () => (
-      _optionalChain([edgeSpendInfo, 'access', _18 => _18.spendTargets, 'access', _19 => _19[0], 'access', _20 => _20.otherParams, 'optionalAccess', _21 => _21.uniqueIdentifier]))), () => (
-      ''))
-
-    if (uniqueIdentifier !== '') {
-      // Destination Tag Checks
-      const { memoMaxLength = Infinity, memoMaxValue } = this.currencyInfo
-
-      if (Number.isNaN(parseInt(uniqueIdentifier))) {
-        throw new (0, _pluginError.PluginError)(
-          'Please enter a valid Destination Tag',
-          _pluginError.pluginErrorName.XRP_ERROR,
-          _pluginError.pluginErrorCodes[0],
-          _pluginError.pluginErrorLabels.UNIQUE_IDENTIFIER_FORMAT
-        )
-      }
-
-      if (uniqueIdentifier.length > memoMaxLength) {
-        throw new (0, _pluginError.PluginError)(
-          `Destination Tag must be ${memoMaxLength} characters or less`,
-          _pluginError.pluginErrorName.XRP_ERROR,
-          _pluginError.pluginErrorCodes[0],
-          _pluginError.pluginErrorLabels.UNIQUE_IDENTIFIER_EXCEEDS_LENGTH
-        )
-      }
-
-      if (memoMaxValue != null && _biggystring.gt.call(void 0, uniqueIdentifier, memoMaxValue)) {
-        throw new (0, _pluginError.PluginError)(
-          'XRP Destination Tag is above its maximum limit',
-          _pluginError.pluginErrorName.XRP_ERROR,
-          _pluginError.pluginErrorCodes[0],
-          _pluginError.pluginErrorLabels.UNIQUE_IDENTIFIER_EXCEEDS_LIMIT
-        )
-      }
-    }
-
     let payment
     if (currencyCode === parentCurrencyCode) {
       payment = {
@@ -765,8 +732,18 @@ const SET_TRUST_LINE_FEE = '12'
       nativeAmount = `-${nativeAmount}`
     }
 
-    if (uniqueIdentifier !== '') {
-      payment.DestinationTag = parseInt(uniqueIdentifier)
+    for (const memo of memos) {
+      if (memo.type === 'number') {
+        payment.DestinationTag = parseInt(memos[0].value)
+      } else if (memo.type === 'text') {
+        if (payment.Memos == null) payment.Memos = []
+        payment.Memos.push({
+          Memo: {
+            MemoFormat: _rfc4648.base16.stringify(_utf8.utf8.parse('text/plain')),
+            MemoData: _rfc4648.base16.stringify(_utf8.utf8.parse(memo.value))
+          }
+        })
+      }
     }
 
     const otherParams = {
@@ -774,17 +751,18 @@ const SET_TRUST_LINE_FEE = '12'
     }
 
     const edgeTransaction = {
-      txid: '', // txid
-      date: 0, // date
-      currencyCode, // currencyCode
       blockHeight: 0, // blockHeight
-      nativeAmount, // nativeAmount
+      currencyCode, // currencyCode
+      date: 0, // date
       isSend: true,
+      memos: [],
+      nativeAmount, // nativeAmount
       networkFee,
-      parentNetworkFee,
+      otherParams,
       ourReceiveAddresses: [], // ourReceiveAddresses
+      parentNetworkFee,
       signedTx: '', // signedTx
-      otherParams,
+      txid: '', // txid
       walletId: this.walletId
     }
 
@@ -904,7 +882,7 @@ const SET_TRUST_LINE_FEE = '12'
       )
     if (paymentTokenId != null)
       throw new Error(`Must activate with ${this.currencyInfo.currencyCode}`)
-    if (_optionalChain([paymentWallet, 'optionalAccess', _22 => _22.id]) !== this.walletId)
+    if (_optionalChain([paymentWallet, 'optionalAccess', _18 => _18.id]) !== this.walletId)
       throw new Error('Must pay with same wallet you are activating token with')
 
     for (const activateTokenId of activateTokenIds) {

package/lib/ripple/rippleInfo.js

@@ -15,29 +15,37 @@ const networkInfo = {
 }
 
  const currencyInfo = {
-  // Basic currency information:
   currencyCode: 'XRP',
   displayName: 'XRP',
   pluginId: 'ripple',
   walletType: 'wallet:ripple',
 
-  defaultSettings: {},
-
-  memoMaxLength: 10,
-  memoMaxValue: '4294967295',
-
+  // Explorers:
   addressExplorer: 'https://xrpscan.com/account/%s',
   transactionExplorer: 'https://xrpscan.com/tx/%s',
 
   denominations: [
-    // An array of Objects of the possible denominations for this currency
     {
       name: 'XRP',
       multiplier: '1000000',
       symbol: 'X'
     }
   ],
-  metaTokens: [] // Deprecated
+
+  memoOptions: [
+    // https://xrpl.org/payment.html#payment-fields
+    { type: 'number', memoName: 'destination tag', maxValue: '4294967295' },
+    // https://xrpl.org/transaction-common-fields.html#memos-field
+    { type: 'text', memoName: 'memo', maxLength: 990 }
+  ],
+  multipleMemos: true,
+
+  // Deprecated:
+  defaultSettings: {},
+  memoMaxLength: 10,
+  memoMaxValue: '4294967295',
+  memoType: 'number',
+  metaTokens: []
 }; exports.currencyInfo = currencyInfo
 
  const builtinTokens = {

package/lib/solana/SolanaEngine.js

@@ -16,6 +16,8 @@ var _rfc4648 = require('rfc4648');
 
 var _CurrencyEngine = require('../common/CurrencyEngine');
 
+var _upgradeMemos = require('../common/upgradeMemos');
+var _utf8 = require('../common/utf8');
 
 
 
@@ -176,15 +178,16 @@ const TRANSACTION_POLL_MILLISECONDS = 3000
       ourReceiveAddresses.push(this.base58PublicKey)
     }
     const edgeTransaction = {
-      txid: tx.transaction.signatures[0],
-      date: timestamp,
-      currencyCode: this.chainCode,
       blockHeight: tx.slot,
-      nativeAmount: amount.toString(),
+      currencyCode: this.chainCode,
+      date: timestamp,
       isSend: amount.toString().startsWith('-'),
+      memos: [],
+      nativeAmount: amount.toString(),
       networkFee: fee.toString(),
       ourReceiveAddresses,
       signedTx: '',
+      txid: tx.transaction.signatures[0],
       walletId: this.walletId
     }
     this.addTransaction(this.chainCode, edgeTransaction)
@@ -314,7 +317,9 @@ const TRANSACTION_POLL_MILLISECONDS = 3000
   }
 
   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')
@@ -348,8 +353,7 @@ const TRANSACTION_POLL_MILLISECONDS = 3000
       })
     )
 
-    const memo = _optionalChain([edgeSpendInfo, 'access', _ => _.spendTargets, 'access', _2 => _2[0], 'optionalAccess', _3 => _3.otherParams, 'optionalAccess', _4 => _4.uniqueIdentifier])
-    if (memo != null && memo !== '') {
+    if (_optionalChain([memos, 'access', _ => _[0], 'optionalAccess', _2 => _2.type]) === 'text') {
       const memoOpts = new TransactionInstruction({
         keys: [
           {
@@ -359,7 +363,7 @@ const TRANSACTION_POLL_MILLISECONDS = 3000
           }
         ],
         programId: new PublicKey(this.networkInfo.memoPublicKey),
-        data: Buffer.from(memo)
+        data: Buffer.from(_utf8.utf8.parse(memos[0].value))
       })
       solTx.add(memoOpts)
     }
@@ -374,16 +378,17 @@ const TRANSACTION_POLL_MILLISECONDS = 3000
     // 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
     }