edge-currency-plugins 2.1.1 → 2.2.1

package/lib/common/plugin/makeCurrencyTools.js

@@ -9,7 +9,6 @@ var _cleaners = require('cleaners');
 
 
 
-
 var _urijs = require('uri-js'); var uri = _interopRequireWildcard(_urijs);
 var _urlparse = require('url-parse'); var _urlparse2 = _interopRequireDefault(_urlparse);
 
@@ -98,10 +97,6 @@ var _utils3 = require('./utils');
       return wasCurrencyPrivateKey(privateKey)
     },
 
-    async validateMemo(memo) {
-      return _utils.validateMemo.call(void 0, memo)
-    },
-
     async derivePublicKey(
       unsafeWalletInfo
     ) {

package/lib/common/upgradeMemos.js

@@ -0,0 +1,47 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
+
+var _validateMemos = require('./validateMemos');
+
+/**
+ * Upgrades the memo fields inside an EdgeSpendTarget,
+ * since we need to be runtime-compatible with legacy core versions.
+ */
+ function upgradeMemos(
+  spendInfo,
+  currencyInfo
+) {
+  const { memoType } = currencyInfo
+
+  const legacyMemos = []
+
+  // If this chain supports legacy memos, grab those:
+  if (memoType === 'hex' || memoType === 'number' || memoType === 'text') {
+    for (const target of spendInfo.spendTargets) {
+      if (target.memo != null) {
+        legacyMemos.push({
+          type: memoType,
+          value: target.memo
+        })
+      } else if (target.uniqueIdentifier != null) {
+        legacyMemos.push({
+          type: memoType,
+          value: target.uniqueIdentifier
+        })
+      } else if (typeof _optionalChain([target, 'access', _ => _.otherParams, 'optionalAccess', _2 => _2.uniqueIdentifier]) === 'string') {
+        legacyMemos.push({
+          type: memoType,
+          value: target.otherParams.uniqueIdentifier
+        })
+      }
+    }
+  }
+
+  // If we don't have modern memos, use the legacy ones:
+  const out = {
+    ...spendInfo,
+    memos: _nullishCoalesce(spendInfo.memos, () => ( legacyMemos))
+  }
+
+  _validateMemos.validateMemos.call(void 0, out, currencyInfo)
+  return out
+} exports.upgradeMemos = upgradeMemos;

package/lib/common/utxobased/db/Models/ProcessorTransaction.js

@@ -1,4 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }var _altcoinjs = require('altcoin-js');
+var _biggystring = require('biggystring');
 var _bnjs = require('bn.js'); var _bnjs2 = _interopRequireDefault(_bnjs);
 
 
@@ -95,16 +96,18 @@ var _bnjs = require('bn.js'); var _bnjs2 = _interopRequireDefault(_bnjs);
   } catch (e) {}
 
   return {
-    walletId,
-    currencyCode: currencyInfo.currencyCode,
-    txid: tx.txid,
     blockHeight: tx.blockHeight,
     confirmations: tx.confirmations,
+    currencyCode: currencyInfo.currencyCode,
     date: tx.date,
+    isSend: _biggystring.lt.call(void 0, tx.ourAmount, '0'),
+    memos: [],
     nativeAmount: tx.ourAmount,
     networkFee: tx.fees,
-    signedTx: tx.hex,
     ourReceiveAddresses,
+    signedTx: tx.hex,
+    txid: tx.txid,
+    walletId,
     ...feeRes
   }
 }; exports.toEdgeTransaction = toEdgeTransaction

package/lib/common/utxobased/engine/makeUtxoEngine.js

@@ -24,6 +24,7 @@ var _makeFees = require('../../fees/makeFees');
 var _makeEngineEmitter = require('../../plugin/makeEngineEmitter');
 var _makeMetadata = require('../../plugin/makeMetadata');
 
+var _upgradeMemos = require('../../upgradeMemos');
 var _makeProcessor = require('../db/makeProcessor');
 
 
@@ -292,7 +293,8 @@ var _utils = require('./utils');
     },
 
     async makeSpend(edgeSpendInfo) {
-      const { spendTargets } = edgeSpendInfo
+      edgeSpendInfo = _upgradeMemos.upgradeMemos.call(void 0, edgeSpendInfo, currencyInfo)
+      const { memos = [], spendTargets } = edgeSpendInfo
       const txOptions =
         _optionalChain([edgeSpendInfo, 'access', _5 => _5.otherParams, 'optionalAccess', _6 => _6.txOptions])
       const { outputSort = 'bip69', utxoSourceAddress, forceChangeAddress } =
@@ -330,10 +332,7 @@ var _utils = require('./utils');
       let targets = []
       const ourReceiveAddresses = []
       for (const target of spendTargets) {
-        if (
-          target.memo == null &&
-          (target.publicAddress == null || target.nativeAmount == null)
-        ) {
+        if (target.publicAddress == null || target.nativeAmount == null) {
           throw new Error('Invalid spend target')
         }
 
@@ -350,8 +349,7 @@ var _utils = require('./utils');
               value:
                 target.nativeAmount == null
                   ? undefined
-                  : parseInt(target.nativeAmount),
-              memo: target.memo
+                  : parseInt(target.nativeAmount)
             })
           }
         } else {
@@ -368,13 +366,12 @@ var _utils = require('./utils');
             value:
               target.nativeAmount == null
                 ? undefined
-                : parseInt(target.nativeAmount),
-            memo: target.memo
+                : parseInt(target.nativeAmount)
           })
         }
       }
 
-      if (targets.length < 1) {
+      if (targets.length + memos.length < 1) {
         throw new Error('Need to provide Spend Targets')
       }
 
@@ -427,6 +424,7 @@ var _utils = require('./utils');
         utxos,
         forceUseUtxo: maxUtxo != null ? [maxUtxo] : [],
         targets,
+        memos,
         feeRate,
         coin: coinInfo.name,
         currencyCode: currencyInfo.currencyCode,
@@ -471,19 +469,21 @@ var _utils = require('./utils');
       }
 
       const transaction = {
-        walletId: walletInfo.id,
-        ourReceiveAddresses,
-        otherParams,
+        blockHeight: 0,
         currencyCode: currencyInfo.currencyCode,
-        txid: '',
         date: _unixTime.unixTime.call(void 0, ),
-        blockHeight: 0,
-        nativeAmount,
-        networkFee,
         feeRateUsed: {
           satPerVByte: feeRate
         },
-        signedTx: ''
+        isSend: true,
+        memos,
+        nativeAmount,
+        networkFee,
+        otherParams,
+        ourReceiveAddresses,
+        signedTx: '',
+        txid: '',
+        walletId: walletInfo.id
       }
 
       return transaction

package/lib/common/utxobased/engine/utils.js

@@ -39,19 +39,6 @@ var _keymanager = require('../keymanager/keymanager');
   }
 }; exports.getCurrencyFormatFromPurposeType = getCurrencyFormatFromPurposeType
 
-// Expect memo to be a hex string
- const validateMemo = (memo) => {
-  const result = {
-    passed: true,
-    tooLarge: false
-  }
-  if (Math.ceil(memo.length / 2) > 80) {
-    result.passed = false
-    result.tooLarge = true
-  }
-  return result
-}; exports.validateMemo = validateMemo
-
  const getAddressTypeFromPurposeType = (
   purpose
 ) => {

package/lib/common/utxobased/info/badcoin.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'badcoin',
@@ -26,12 +27,15 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://www.blockingbad.com/address/%s',
   blockExplorer: 'https://www.blockingbad.com/block/%s',
-  transactionExplorer: 'https://www.blockingbad.com/tx/%s'
+  transactionExplorer: 'https://www.blockingbad.com/tx/%s',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/bitcoin.js

@@ -2,6 +2,7 @@
 
 var _constants = require('../../constants');
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'bitcoin',
@@ -36,7 +37,7 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   blockExplorer: 'https://blockchair.com/bitcoin/block/%s',
@@ -45,7 +46,10 @@ const currencyInfo = {
 
   // Images:
   symbolImage: `${_constants.IMAGE_SERVER_URL}/bitcoin-logo-solo-64.png`,
-  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/bitcoin-logo-solo-64.png`
+  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/bitcoin-logo-solo-64.png`,
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/bitcoincash.js

@@ -4,6 +4,7 @@ var _cleaners = require('cleaners');
 
 var _constants = require('../../constants');
 
+var _commonInfo = require('./commonInfo');
 var _bitcoincashScriptTemplates = require('./scriptTemplates/bitcoincashScriptTemplates');
 
 const currencyInfo = {
@@ -37,7 +38,7 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   blockExplorer: 'https://blockchair.com/bitcoin-cash/block/%s',
@@ -47,7 +48,10 @@ const currencyInfo = {
 
   // Images:
   symbolImage: `${_constants.IMAGE_SERVER_URL}/bitcoincash-logo-solo-64.png`,
-  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/bitcoincash-logo-solo-64.png`
+  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/bitcoincash-logo-solo-64.png`,
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/bitcoincashtestnet.js

@@ -3,6 +3,7 @@
 
 var _constants = require('../../constants');
 
+var _commonInfo = require('./commonInfo');
 var _bitcoincashScriptTemplates = require('./scriptTemplates/bitcoincashScriptTemplates');
 
 const currencyInfo = {
@@ -22,7 +23,7 @@ const currencyInfo = {
     blockbookServers: [],
     enableCustomServers: false
   },
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   blockExplorer: 'https://blockchair.com/bitcoin-cash/block/%s',
@@ -32,7 +33,10 @@ const currencyInfo = {
 
   // Images:
   symbolImage: `${_constants.IMAGE_SERVER_URL}/bitcoincash-logo-solo-64.png`,
-  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/bitcoincash-logo-solo-64.png`
+  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/bitcoincash-logo-solo-64.png`,
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/bitcoingold.js

@@ -2,6 +2,7 @@
 
 
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'bitcoingold',
@@ -34,12 +35,15 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://explorer.bitcoingold.org/insight/address/%s',
   blockExplorer: 'https://explorer.bitcoingold.org/insight/block/%s',
-  transactionExplorer: 'https://explorer.bitcoingold.org/insight/tx/%s'
+  transactionExplorer: 'https://explorer.bitcoingold.org/insight/tx/%s',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/bitcoingoldtestnet.js

@@ -2,6 +2,7 @@
 
 
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'bitcoingoldtestnet',
@@ -20,12 +21,15 @@ const currencyInfo = {
     blockbookServers: [],
     enableCustomServers: false
   },
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://explorer.bitcoingold.org/insight/address/%s',
   blockExplorer: 'https://explorer.bitcoingold.org/insight/block/%s',
-  transactionExplorer: 'https://explorer.bitcoingold.org/insight/tx/%s'
+  transactionExplorer: 'https://explorer.bitcoingold.org/insight/tx/%s',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/bitcoinsv.js

@@ -9,6 +9,7 @@ var _constants = require('../../constants');
 
 
 var _keymanager = require('../keymanager/keymanager');
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'bitcoinsv',
@@ -35,7 +36,7 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   blockExplorer: 'https://whatsonchain.com/block/%s',
@@ -44,7 +45,10 @@ const currencyInfo = {
 
   // Images:
   symbolImage: `${_constants.IMAGE_SERVER_URL}/bitcoinsv-logo-solo-64.png`,
-  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/bitcoinsv-logo-solo-64.png`
+  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/bitcoinsv-logo-solo-64.png`,
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {
@@ -69,7 +73,7 @@ const engineInfo = {
   /*
   This is to support cashaddr and 1-addresses coming from the network.
   We always convert to a 1-address for internal use.
-  We send 1-address to the network because all servers should support legacy 
+  We send 1-address to the network because all servers should support legacy
   address (this is the uncleaner).
   */
   asBlockbookAddress: _cleaners.asCodec.call(void 0, 

package/lib/common/utxobased/info/bitcointestnet.js

@@ -2,6 +2,7 @@
 
 var _constants = require('../../constants');
 
+var _commonInfo = require('./commonInfo');
 
  const currencyInfo = {
   pluginId: 'bitcointestnet',
@@ -30,7 +31,7 @@ var _constants = require('../../constants');
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   blockExplorer: 'https://blockchair.com/bitcoin/testnet/block/%s',
@@ -39,7 +40,10 @@ var _constants = require('../../constants');
 
   // Images:
   symbolImage: `${_constants.IMAGE_SERVER_URL}/bitcoin-logo-solo-64.png`,
-  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/bitcoin-logo-solo-64.png`
+  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/bitcoin-logo-solo-64.png`,
+
+  // Deprecated:
+  metaTokens: []
 }; exports.currencyInfo = currencyInfo
 
  const engineInfo = {

package/lib/common/utxobased/info/commonInfo.js

@@ -0,0 +1,16 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});
+
+ const memoInfo = {
+  memoOptions: [
+    {
+      type: 'hex',
+      hidden: true,
+      maxBytes: 80,
+      memoName: 'OP_RETURN'
+    }
+  ],
+
+  // Deprecated:
+  memoMaxLength: 80,
+  memoType: 'text'
+}; exports.memoInfo = memoInfo

package/lib/common/utxobased/info/dash.js

@@ -3,6 +3,7 @@
 
 
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'dash',
@@ -34,12 +35,16 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://blockchair.com/dash/address/%s?from=edgeapp',
   blockExplorer: 'https://blockchair.com/dash/block/%s?from=edgeapp',
-  transactionExplorer: 'https://blockchair.com/dash/transaction/%s?from=edgeapp'
+  transactionExplorer:
+    'https://blockchair.com/dash/transaction/%s?from=edgeapp',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/digibyte.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'digibyte',
@@ -26,12 +27,15 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://digiexplorer.info/address/%s',
   blockExplorer: 'https://digiexplorer.info/block/%s',
-  transactionExplorer: 'https://digiexplorer.info/tx/%s'
+  transactionExplorer: 'https://digiexplorer.info/tx/%s',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/dogecoin.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _commonInfo = require('./commonInfo');
 var _dogeUtxoPicker = require('./utxoPickers/dogeUtxoPicker');
 
 const currencyInfo = {
@@ -30,13 +31,16 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://blockchair.com/dogecoin/address/%s?from=edgeapp',
   blockExplorer: 'https://blockchair.com/dogecoin/block/%s?from=edgeapp',
   transactionExplorer:
-    'https://blockchair.com/dogecoin/transaction/%s?from=edgeapp'
+    'https://blockchair.com/dogecoin/transaction/%s?from=edgeapp',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/eboost.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'eboost',
@@ -26,12 +27,15 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://www.blockexperts.com/ebst/address/%s',
   blockExplorer: 'https://www.blockexperts.com/ebst/hash/%s',
-  transactionExplorer: 'https://www.blockexperts.com/ebst/tx/%s'
+  transactionExplorer: 'https://www.blockexperts.com/ebst/tx/%s',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/feathercoin.js

@@ -2,6 +2,7 @@
 
 var _constants = require('../../constants');
 
+var _commonInfo = require('./commonInfo');
 
  const currencyInfo = {
   pluginId: 'feathercoin',
@@ -27,7 +28,7 @@ var _constants = require('../../constants');
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://fsight.chain.tips/address/%s',
@@ -36,7 +37,10 @@ var _constants = require('../../constants');
 
   // Images:
   symbolImage: `${_constants.IMAGE_SERVER_URL}/feathercoin-logo-solo-64.png`,
-  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/feathercoin-logo-solo-64.png`
+  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/feathercoin-logo-solo-64.png`,
+
+  // Deprecated:
+  metaTokens: []
 }; exports.currencyInfo = currencyInfo
 
  const engineInfo = {

package/lib/common/utxobased/info/groestlcoin.js

@@ -5,6 +5,7 @@ var _bs58grscheck = require('bs58grscheck'); var base58grs = _interopRequireWild
 var _wifgrs = require('wifgrs'); var wifgrs = _interopRequireWildcard(_wifgrs);
 
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'groestlcoin',
@@ -30,14 +31,17 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer:
     'https://blockchair.com/groestlcoin/address/%s?from=edgeapp?from=edgeapp',
   blockExplorer: 'https://blockchair.com/groestlcoin/block/%s?from=edgeapp',
   transactionExplorer:
-    'https://blockchair.com/groestlcoin/transaction/%s?from=edgeapp'
+    'https://blockchair.com/groestlcoin/transaction/%s?from=edgeapp',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/litecoin.js

@@ -2,6 +2,7 @@
 
 var _constants = require('../../constants');
 
+var _commonInfo = require('./commonInfo');
 
  const currencyInfo = {
   pluginId: 'litecoin',
@@ -34,7 +35,7 @@ var _constants = require('../../constants');
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   blockExplorer: 'https://blockchair.com/litecoin/block/%s',
@@ -43,7 +44,10 @@ var _constants = require('../../constants');
 
   // Images:
   symbolImage: `${_constants.IMAGE_SERVER_URL}/litecoin-logo-solo-64.png`,
-  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/litecoin-logo-solo-64.png`
+  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/litecoin-logo-solo-64.png`,
+
+  // Deprecated:
+  metaTokens: []
 }; exports.currencyInfo = currencyInfo
 
  const engineInfo = {

package/lib/common/utxobased/info/qtum.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'qtum',
@@ -23,12 +24,15 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://explorer.qtum.org/address/%s',
   blockExplorer: 'https://explorer.qtum.org/block/%s',
-  transactionExplorer: 'https://explorer.qtum.org/tx/%s'
+  transactionExplorer: 'https://explorer.qtum.org/tx/%s',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/ravencoin.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'ravencoin',
@@ -23,12 +24,15 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://ravencoin.network/address/%s',
   blockExplorer: 'https://ravencoin.network/block/%s',
-  transactionExplorer: 'https://ravencoin.network/tx/%s'
+  transactionExplorer: 'https://ravencoin.network/tx/%s',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/smartcash.js

@@ -4,6 +4,7 @@ var _bs58smartcheck = require('bs58smartcheck'); var base58smart = _interopRequi
 var _wifsmart = require('wif-smart'); var wifsmart = _interopRequireWildcard(_wifsmart);
 
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'smartcash',
@@ -29,12 +30,15 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://insight.smartcash.cc/address/%s',
   blockExplorer: 'https://insight.smartcash.cc/block/%s',
-  transactionExplorer: 'https://insight.smartcash.cc/tx/%s'
+  transactionExplorer: 'https://insight.smartcash.cc/tx/%s',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/ufo.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'ufo',
@@ -26,12 +27,15 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://explorer.ufobject.com/address/%s',
   blockExplorer: 'https://explorer.ufobject.com/block/%s',
-  transactionExplorer: 'https://explorer.ufobject.com/tx/%s'
+  transactionExplorer: 'https://explorer.ufobject.com/tx/%s',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/vertcoin.js

@@ -1,6 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
 
+var _commonInfo = require('./commonInfo');
 
 const currencyInfo = {
   pluginId: 'vertcoin',
@@ -32,12 +33,15 @@ const currencyInfo = {
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://insight.vertcoin.org/address/%s',
   blockExplorer: 'https://insight.vertcoin.org/block/%s',
-  transactionExplorer: 'https://insight.vertcoin.org/tx/%s'
+  transactionExplorer: 'https://insight.vertcoin.org/tx/%s',
+
+  // Deprecated:
+  metaTokens: []
 }
 
 const engineInfo = {

package/lib/common/utxobased/info/zcoin.js

@@ -2,6 +2,7 @@
 
 var _constants = require('../../constants');
 
+var _commonInfo = require('./commonInfo');
 
  const currencyInfo = {
   pluginId: 'zcoin',
@@ -27,7 +28,7 @@ var _constants = require('../../constants');
       displayMultiplier: '0'
     }
   ],
-  metaTokens: [],
+  ..._commonInfo.memoInfo,
 
   // Explorers:
   addressExplorer: 'https://insight.zcoin.io/address/%s',
@@ -36,7 +37,10 @@ var _constants = require('../../constants');
 
   // Images:
   symbolImage: `${_constants.IMAGE_SERVER_URL}/zcoin-logo-solo-64.png`,
-  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/zcoin-logo-solo-64.png`
+  symbolImageDarkMono: `${_constants.IMAGE_SERVER_URL}/zcoin-logo-solo-64.png`,
+
+  // Deprecated:
+  metaTokens: []
 }; exports.currencyInfo = currencyInfo
 
  const engineInfo = {

package/lib/common/utxobased/keymanager/keymanager.js

@@ -19,7 +19,6 @@ var _indexAtProtected = require('../../../util/indexAtProtected');
 var _undefinedIfEmptyString = require('../../../util/undefinedIfEmptyString');
 
 
-var _utils = require('../engine/utils');
 
 var _bip69 = require('./bip69');
 
@@ -926,7 +925,7 @@ const wifToPrivateKeyEncodingInternal = (
 } exports.signMessageBase64 = signMessageBase64;
 
  function makeTx(args) {
-  const { log, outputSort } = args
+  const { log, outputSort, memos } = args
   let sequence = 0xffffffff
   if (args.setRBF) {
     sequence -= 2
@@ -1016,22 +1015,19 @@ const wifToPrivateKeyEncodingInternal = (
         value: target.value
       })
     }
-
-    if (target.memo != null && target.memo !== '') {
-      const memoHex = Buffer.from(target.memo, 'utf8').toString('hex')
-      // check if hex string is within 80 bytes
-      const validatedMemo = _utils.validateMemo.call(void 0, memoHex)
-      if (!validatedMemo.passed) {
-        throw new Error('Memo size exceeds 80 bytes')
-      }
-      const script = _altcoinjs.script
-        .compile([_altcoinjs.opcodes.OP_RETURN, Buffer.from(target.memo, 'utf8')])
-        .toString('hex')
-      targets.push({
-        script,
-        value: 0
-      })
-    }
+  }
+  for (const memo of memos) {
+    const memoData =
+      memo.type === 'text'
+        ? Buffer.from(memo.value, 'utf8')
+        : Buffer.from(memo.value, 'hex')
+    const script = _altcoinjs.script
+      .compile([_altcoinjs.opcodes.OP_RETURN, memoData])
+      .toString('hex')
+    targets.push({
+      script,
+      value: 0
+    })
   }
 
   const changeScript = exports.addressToScriptPubkey.call(void 0, {

package/lib/common/validateMemos.js

@@ -0,0 +1,107 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }var _biggystring = require('biggystring');
+var _cleaners = require('cleaners');
+
+
+
+
+
+
+
+var _cleaners3 = require('../util/cleaners');
+
+/**
+ * Validates the memos on an spend request.
+ * Throws an error if any of the memos are wrong.
+ */
+ function validateMemos(
+  spendInfo,
+  currencyInfo
+) {
+  const { memos = [] } = spendInfo
+  const {
+    displayName,
+    memoMaxLength,
+    memoMaxValue,
+    memoOptions = [],
+    multipleMemos = false,
+    memoType
+  } = currencyInfo
+
+  // Not all coins keep the legacy memo type in the modern list,
+  // but we still need to validate the legacy type if present:
+  const allOptions = [...memoOptions]
+  if (memoType === 'text') {
+    allOptions.push({ type: 'text', maxLength: memoMaxLength })
+  }
+  if (memoType === 'number') {
+    allOptions.push({ type: 'number', maxValue: memoMaxValue })
+  }
+  if (memoType === 'hex') {
+    allOptions.push({
+      type: 'hex',
+      maxBytes: memoMaxLength == null ? undefined : memoMaxLength / 2
+    })
+  }
+
+  // What we should call a "memo" in our error messages:
+  const { memoName = 'memo' } = _nullishCoalesce(memoOptions[0], () => ( {}))
+
+  // Now validate our memos:
+  for (const memo of memos) {
+    const options = allOptions.filter(option => memo.type === option.type)
+    if (options.length < 1) {
+      throw new Error(`${displayName} ${memoName}: cannot be type ${memo.type}`)
+    }
+    const problem = options
+      .map(option => getMemoError(memo, option))
+      .find(problem => problem != null)
+    if (problem != null) {
+      throw new Error(`${displayName} {memoName}: ${problem}`)
+    }
+  }
+
+  // Validate the number of memos:
+  if (!multipleMemos && memos.length > 1) {
+    throw new Error(`${displayName} only supports one ${memoName}`)
+  }
+} exports.validateMemos = validateMemos;
+
+/**
+ * Checks a memo against a memo option.
+ * Returns `undefined` if valid, or an error string if invalid.
+ */
+function getMemoError(
+  memo,
+  option
+) {
+  if (
+    option.type === 'text' &&
+    option.maxLength != null &&
+    memo.value.length > option.maxLength
+  ) {
+    return `cannot be longer than ${option.maxLength}`
+  }
+
+  if (option.type === 'number') {
+    const value = _cleaners.asMaybe.call(void 0, (0, _cleaners3.asIntegerString))(memo.value)
+    if (value == null) {
+      return `is not a valid number`
+    }
+    if (option.maxValue != null && _biggystring.gt.call(void 0, value, option.maxValue)) {
+      return `cannot be greater than ${option.maxValue}`
+    }
+  }
+
+  if (option.type === 'hex') {
+    const value = _cleaners.asMaybe.call(void 0, (0, _cleaners3.asBase16))(memo.value)
+    if (value == null) {
+      return `is not valid hexadecimal`
+    }
+    if (option.maxBytes != null && value.length > option.maxBytes) {
+      return `cannot be longer than ${option.maxBytes} bytes`
+    }
+    if (option.minBytes != null && value.length < option.minBytes) {
+      return `cannot be shorter than ${option.minBytes} bytes`
+    }
+  }
+}

package/lib/src/common/upgradeMemos.d.ts

@@ -0,0 +1,6 @@
+import { EdgeCurrencyInfo, EdgeSpendInfo } from 'edge-core-js/types';
+/**
+ * Upgrades the memo fields inside an EdgeSpendTarget,
+ * since we need to be runtime-compatible with legacy core versions.
+ */
+export declare function upgradeMemos(spendInfo: EdgeSpendInfo, currencyInfo: EdgeCurrencyInfo): EdgeSpendInfo;

package/lib/src/common/utxobased/engine/utils.d.ts

@@ -1,12 +1,11 @@
 import { Disklet } from 'disklet';
-import { EdgeMemoRules, EdgeParsedUri } from 'edge-core-js/types';
+import { EdgeParsedUri } from 'edge-core-js/types';
 import { ChangePath, CurrencyFormat, EngineInfo } from '../../plugin/types';
 import { IUTXO } from '../db/types';
 import { ScriptTemplates } from '../info/scriptTemplates/types';
 import { PrivateKey } from '../keymanager/cleaners';
 import { AddressTypeEnum, BIP43PurposeTypeEnum, ScriptTypeEnum } from '../keymanager/keymanager';
 export declare const getCurrencyFormatFromPurposeType: (purpose: BIP43PurposeTypeEnum) => CurrencyFormat;
-export declare const validateMemo: (memo: string) => EdgeMemoRules;
 export declare const getAddressTypeFromPurposeType: (purpose: BIP43PurposeTypeEnum) => AddressTypeEnum;
 export declare const getScriptTypeFromPurposeType: (purpose: BIP43PurposeTypeEnum) => ScriptTypeEnum;
 export declare const validScriptPubkeyFromAddress: (args: {

package/lib/src/common/utxobased/info/commonInfo.d.ts

@@ -0,0 +1,2 @@
+import { EdgeCurrencyInfo } from 'edge-core-js/types';
+export declare const memoInfo: Partial<EdgeCurrencyInfo>;

package/lib/src/common/utxobased/keymanager/keymanager.d.ts

@@ -1,4 +1,4 @@
-import { EdgeLog } from 'edge-core-js/types';
+import { EdgeLog, EdgeMemo } from 'edge-core-js/types';
 import { ChangePath } from '../../plugin/types';
 import { IUTXO } from '../db/types';
 import { ScriptTemplate, ScriptTemplates } from '../info/scriptTemplates/types';
@@ -134,6 +134,7 @@ export interface MakeTxArgs {
     forceUseUtxo: IUTXO[];
     utxos: IUTXO[];
     targets: MakeTxTarget[];
+    memos: EdgeMemo[];
     feeRate: number;
     setRBF: boolean;
     coin: string;
@@ -146,7 +147,6 @@ export interface MakeTxArgs {
 export interface MakeTxTarget {
     address?: string;
     value?: number;
-    memo?: string | null;
 }
 interface MakeTxReturn extends Required<utxopicker.UtxoPickerResult> {
     hex: string;

package/lib/src/common/validateMemos.d.ts

@@ -0,0 +1,6 @@
+import { EdgeCurrencyInfo, EdgeSpendInfo } from 'edge-core-js/types';
+/**
+ * Validates the memos on an spend request.
+ * Throws an error if any of the memos are wrong.
+ */
+export declare function validateMemos(spendInfo: EdgeSpendInfo, currencyInfo: EdgeCurrencyInfo): void;

package/lib/src/util/cleaners.d.ts

@@ -0,0 +1,6 @@
+import { Cleaner } from 'cleaners';
+/**
+ * A string of hex-encoded binary data.
+ */
+export declare const asBase16: Cleaner<Uint8Array>;
+export declare function asIntegerString(raw: unknown): string;

package/lib/util/cleaners.js

@@ -0,0 +1,18 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});var _cleaners = require('cleaners');
+var _rfc4648 = require('rfc4648');
+
+/**
+ * A string of hex-encoded binary data.
+ */
+ const asBase16 = _cleaners.asCodec.call(void 0, 
+  raw => _rfc4648.base16.parse(_cleaners.asString.call(void 0, raw)),
+  clean => _rfc4648.base16.stringify(clean).toLowerCase()
+); exports.asBase16 = asBase16
+
+ function asIntegerString(raw) {
+  const clean = _cleaners.asString.call(void 0, raw)
+  if (!/^\d+$/.test(clean)) {
+    throw new Error('Expected an integer string')
+  }
+  return clean
+} exports.asIntegerString = asIntegerString;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-plugins",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "description": "Edge currency plugins to fetch and process wallet accounts, balances and transactions.",
   "repository": "https://github.com/EdgeApp/edge-currency-plugins",
   "license": "MIT",
@@ -79,7 +79,7 @@
     "base-x": "^4.0.0",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "edge-core-js": "^0.19.48",
+    "edge-core-js": "^1.6.0",
     "eslint": "^7.14.0",
     "eslint-config-standard-kit": "0.15.1",
     "eslint-plugin-import": "^2.22.1",