edge-currency-monero 1.4.1 → 1.5.0

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # edge-currency-monero
 
-## Unreleased
+## 1.5.0 (2025-04-21)
+
+- added: Support for multiple spend targets.
+
+## 1.4.2 (2025-04-01)
+
+- fixed: Small internal implementation cleanup on how transactions are saved.
 
 ## 1.4.1 (2025-03-28)
 

package/lib/MoneroEngine.js

@@ -267,7 +267,7 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
       })
     }
 
-    let edgeTransaction = {
+    const edgeTransaction = {
       blockHeight,
       currencyCode: 'XMR',
       date,
@@ -284,33 +284,9 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
       walletId: this.walletId
     }
 
-    const idx = this.findTransaction(PRIMARY_CURRENCY_TOKEN_ID, tx.hash)
-    if (idx === -1) {
-      this.log(`New transaction: ${tx.hash}`)
-
-      // New transaction not in database
-      this.addTransaction(PRIMARY_CURRENCY_TOKEN_ID, edgeTransaction)
-
-      this.edgeTxLibCallbacks.onTransactions(this.transactionEventArray)
-      this.transactionEventArray = []
-    } else {
-      // Already have this tx in the database. See if anything changed
-      const transactionsArray = this.getTxs(PRIMARY_CURRENCY_TOKEN_ID)
-      const edgeTx = transactionsArray[idx]
-
-      if (edgeTx.blockHeight !== edgeTransaction.blockHeight) {
-        // The native amounts returned from the API take some time before they're accurate. We can trust the amounts we saved instead.
-        edgeTransaction = {
-          ...edgeTransaction,
-          nativeAmount: edgeTx.nativeAmount
-        }
-
-        this.log(`Update transaction: ${tx.hash} height:${tx.height}`)
-        this.updateTransaction(PRIMARY_CURRENCY_TOKEN_ID, edgeTransaction, idx)
-        this.edgeTxLibCallbacks.onTransactions(this.transactionEventArray)
-        this.transactionEventArray = []
-      }
-    }
+    this.saveTransactionState(PRIMARY_CURRENCY_TOKEN_ID, edgeTransaction)
+    this.edgeTxLibCallbacks.onTransactions(this.transactionEventArray)
+    this.transactionEventArray = []
 
     return blockHeight
   }
@@ -379,11 +355,15 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
     return txs 
   }
 
-  addTransaction(tokenId, edgeTransaction) {
+  saveTransactionState(
+    tokenId,
+    edgeTransaction
+  ) {
     // Add or update tx in transactionsObj
     const idx = this.findTransaction(tokenId, edgeTransaction.txid)
 
     if (idx === -1) {
+      this.log(`New transaction: ${edgeTransaction.txid}`)
       this.log.warn(
         'addTransaction: adding and sorting:' +
           edgeTransaction.txid +
@@ -408,26 +388,35 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
         transaction: edgeTransaction
       })
     } else {
-      this.updateTransaction(tokenId, edgeTransaction, idx)
-    }
-  }
+      const txs = this.getTxs(tokenId)
+      const edgeTx = txs[idx]
 
-  updateTransaction(
-    tokenId,
-    edgeTransaction,
-    idx
-  ) {
-    // Update the transaction
-    const txs = this.getTxs(tokenId)
-    txs[idx] = edgeTransaction
-    this.walletLocalDataDirty = true
-    this.transactionEventArray.push({
-      isNew: false,
-      transaction: edgeTransaction
-    })
-    this.log.warn(
-      'updateTransaction' + edgeTransaction.txid + edgeTransaction.nativeAmount
-    )
+      // Already have this tx in the database. Consider a change if blockHeight changed
+      if (edgeTx.blockHeight === edgeTransaction.blockHeight) return
+      this.log(
+        `Update transaction: ${edgeTransaction.txid} height:${edgeTransaction.blockHeight}`
+      )
+
+      // The native amounts returned from the API take some time before they're
+      // accurate. We can trust the amounts we saved instead.
+      edgeTransaction = {
+        ...edgeTransaction,
+        nativeAmount: edgeTx.nativeAmount
+      }
+
+      // Update the transaction
+      txs[idx] = edgeTransaction
+      this.walletLocalDataDirty = true
+      this.transactionEventArray.push({
+        isNew: false,
+        transaction: edgeTransaction
+      })
+      this.log.warn(
+        'updateTransaction' +
+          edgeTransaction.txid +
+          edgeTransaction.nativeAmount
+      )
+    }
   }
 
   // *************************************
@@ -612,10 +601,14 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
     }
 
     const options = {
-      amount: '0',
       isSweepTx: true,
       priority: translateFee(edgeSpendInfo.networkFeeOption),
-      targetAddress: publicAddress
+      targets: [
+        {
+          amount: '0',
+          targetAddress: publicAddress
+        }
+      ]
     }
 
     const result = await this.createMyMoneroTransaction(options, privateKeys)
@@ -653,39 +646,45 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
     const { memos = [] } = edgeSpendInfo
     const privateKeys = _moneroTypes.asPrivateKeys.call(void 0, _optionalChain([opts, 'optionalAccess', _7 => _7.privateKeys]))
 
-    // Monero can only have one output
-    // TODO: The new SDK fixes this!
-    if (edgeSpendInfo.spendTargets.length !== 1) {
-      throw new Error('Error: only one output allowed')
-    }
+    const { spendTargets } = edgeSpendInfo
 
-    const [spendTarget] = edgeSpendInfo.spendTargets
-    const { publicAddress, nativeAmount } = spendTarget
-    if (publicAddress == null) {
-      throw new TypeError('Missing destination address')
-    }
-    if (nativeAmount == null || _biggystring.eq.call(void 0, nativeAmount, '0')) {
-      throw new (0, _types.NoAmountSpecifiedError)()
-    }
+    let totalAmount = '0'
+    const targets = []
 
-    if (
-      _biggystring.gte.call(void 0, 
-        nativeAmount,
-        _nullishCoalesce(this.walletLocalData.totalBalances.get(PRIMARY_CURRENCY_TOKEN_ID), () => ( '0'))
-      )
-    ) {
-      if (_biggystring.gte.call(void 0, this.walletLocalData.lockedXmrBalance, nativeAmount)) {
-        throw new (0, _types.PendingFundsError)()
-      } else {
-        throw new (0, _types.InsufficientFundsError)({ tokenId: PRIMARY_CURRENCY_TOKEN_ID })
+    for (const spendTarget of spendTargets) {
+      const { publicAddress, nativeAmount } = spendTarget
+      if (publicAddress == null) {
+        throw new TypeError('Missing destination address')
+      }
+      if (nativeAmount == null || _biggystring.eq.call(void 0, nativeAmount, '0')) {
+        throw new (0, _types.NoAmountSpecifiedError)()
       }
+      totalAmount = _biggystring.add.call(void 0, totalAmount, nativeAmount)
+      if (
+        _biggystring.gte.call(void 0, 
+          totalAmount,
+          _nullishCoalesce(this.walletLocalData.totalBalances.get(PRIMARY_CURRENCY_TOKEN_ID), () => (
+            '0'))
+        )
+      ) {
+        if (_biggystring.gte.call(void 0, this.walletLocalData.lockedXmrBalance, totalAmount)) {
+          throw new (0, _types.PendingFundsError)()
+        } else {
+          throw new (0, _types.InsufficientFundsError)({
+            tokenId: PRIMARY_CURRENCY_TOKEN_ID
+          })
+        }
+      }
+      targets.push({
+        amount: _biggystring.div.call(void 0, nativeAmount, '1000000000000', 12),
+        targetAddress: publicAddress
+      })
     }
 
     const options = {
-      amount: _biggystring.div.call(void 0, nativeAmount, '1000000000000', 12),
       isSweepTx: false,
       priority: translateFee(edgeSpendInfo.networkFeeOption),
-      targetAddress: publicAddress
+      targets
     }
     this.log(`Creating transaction: ${JSON.stringify(options, null, 1)}`)
 
@@ -746,7 +745,7 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
   }
 
   async saveTx(edgeTransaction) {
-    await this.addTransaction(edgeTransaction.tokenId, edgeTransaction)
+    await this.saveTransactionState(edgeTransaction.tokenId, edgeTransaction)
   }
 
   getDisplayPrivateSeed(privateKeys) {

package/lib/MyMoneroApi.js

@@ -48,6 +48,8 @@ var _ResponseParser = require('./mymonero-utils/ResponseParser'); var _ResponseP
 
 
 
+
+
 
 
 
@@ -238,13 +240,7 @@ const asGetAddressTxsResponse = _cleaners.asObject.call(void 0, {
     opts
   ) {
     const { address, privateSpendKey, privateViewKey, publicSpendKey } = keys
-    const {
-      amount,
-      isSweepTx = false,
-      paymentId,
-      priority = 1,
-      targetAddress
-    } = opts
+    const { isSweepTx = false, paymentId, priority = 1, targets } = opts
 
     // Grab the UTXO set:
     const unspentOuts = await this.fetchPostMyMonero('get_unspent_outs', {
@@ -268,14 +264,14 @@ const asGetAddressTxsResponse = _cleaners.asObject.call(void 0, {
       })
     }
 
+    const destinations = targets.map(t => ({
+      send_amount: t.amount,
+      to_address: t.targetAddress
+    }))
+
     // Make the transaction:
     return await this.cppBridge.createTransaction({
-      destinations: [
-        {
-          send_amount: amount,
-          to_address: targetAddress
-        }
-      ],
+      destinations,
       priority,
       address,
       paymentId,

package/lib/react-native/edge-currency-monero.ts

@@ -2167,31 +2167,9 @@ var MoneroEngine = /*#__PURE__*/function () {
         txid: tx.hash,
         walletId: this.walletId
       };
-      var idx = this.findTransaction(PRIMARY_CURRENCY_TOKEN_ID, tx.hash);
-
-      if (idx === -1) {
-        this.log("New transaction: ".concat(tx.hash)); // New transaction not in database
-
-        this.addTransaction(PRIMARY_CURRENCY_TOKEN_ID, edgeTransaction);
-        this.edgeTxLibCallbacks.onTransactions(this.transactionEventArray);
-        this.transactionEventArray = [];
-      } else {
-        // Already have this tx in the database. See if anything changed
-        var transactionsArray = this.getTxs(PRIMARY_CURRENCY_TOKEN_ID);
-        var edgeTx = transactionsArray[idx];
-
-        if (edgeTx.blockHeight !== edgeTransaction.blockHeight) {
-          // The native amounts returned from the API take some time before they're accurate. We can trust the amounts we saved instead.
-          edgeTransaction = _objectSpread(_objectSpread({}, edgeTransaction), {}, {
-            nativeAmount: edgeTx.nativeAmount
-          });
-          this.log("Update transaction: ".concat(tx.hash, " height:").concat(tx.height));
-          this.updateTransaction(PRIMARY_CURRENCY_TOKEN_ID, edgeTransaction, idx);
-          this.edgeTxLibCallbacks.onTransactions(this.transactionEventArray);
-          this.transactionEventArray = [];
-        }
-      }
-
+      this.saveTransactionState(PRIMARY_CURRENCY_TOKEN_ID, edgeTransaction);
+      this.edgeTxLibCallbacks.onTransactions(this.transactionEventArray);
+      this.transactionEventArray = [];
       return blockHeight;
     }
   }, {
@@ -2283,12 +2261,13 @@ var MoneroEngine = /*#__PURE__*/function () {
       return txs;
     }
   }, {
-    key: "addTransaction",
-    value: function addTransaction(tokenId, edgeTransaction) {
+    key: "saveTransactionState",
+    value: function saveTransactionState(tokenId, edgeTransaction) {
       // Add or update tx in transactionsObj
       var idx = this.findTransaction(tokenId, edgeTransaction.txid);
 
       if (idx === -1) {
+        this.log("New transaction: ".concat(edgeTransaction.txid));
         this.log.warn('addTransaction: adding and sorting:' + edgeTransaction.txid + edgeTransaction.nativeAmount);
         var txs = this.getTxs(tokenId);
         txs.push(edgeTransaction); // Sort
@@ -2305,21 +2284,26 @@ var MoneroEngine = /*#__PURE__*/function () {
           transaction: edgeTransaction
         });
       } else {
-        this.updateTransaction(tokenId, edgeTransaction, idx);
+        var _txs2 = this.getTxs(tokenId);
+
+        var edgeTx = _txs2[idx]; // Already have this tx in the database. Consider a change if blockHeight changed
+
+        if (edgeTx.blockHeight === edgeTransaction.blockHeight) return;
+        this.log("Update transaction: ".concat(edgeTransaction.txid, " height:").concat(edgeTransaction.blockHeight)); // The native amounts returned from the API take some time before they're
+        // accurate. We can trust the amounts we saved instead.
+
+        edgeTransaction = _objectSpread(_objectSpread({}, edgeTransaction), {}, {
+          nativeAmount: edgeTx.nativeAmount
+        }); // Update the transaction
+
+        _txs2[idx] = edgeTransaction;
+        this.walletLocalDataDirty = true;
+        this.transactionEventArray.push({
+          isNew: false,
+          transaction: edgeTransaction
+        });
+        this.log.warn('updateTransaction' + edgeTransaction.txid + edgeTransaction.nativeAmount);
       }
-    }
-  }, {
-    key: "updateTransaction",
-    value: function updateTransaction(tokenId, edgeTransaction, idx) {
-      // Update the transaction
-      var txs = this.getTxs(tokenId);
-      txs[idx] = edgeTransaction;
-      this.walletLocalDataDirty = true;
-      this.transactionEventArray.push({
-        isNew: false,
-        transaction: edgeTransaction
-      });
-      this.log.warn('updateTransaction' + edgeTransaction.txid + edgeTransaction.nativeAmount);
     } // *************************************
     // Save the wallet data store
     // *************************************
@@ -2852,10 +2836,12 @@ var MoneroEngine = /*#__PURE__*/function () {
 
               case 5:
                 options = {
-                  amount: '0',
                   isSweepTx: true,
                   priority: translateFee(edgeSpendInfo.networkFeeOption),
-                  targetAddress: publicAddress
+                  targets: [{
+                    amount: '0',
+                    targetAddress: publicAddress
+                  }]
                 };
                 _context20.next = 8;
                 return this.createMyMoneroTransaction(options, privateKeys);
@@ -2927,74 +2913,85 @@ var MoneroEngine = /*#__PURE__*/function () {
     key: "makeSpend",
     value: function () {
       var _makeSpend = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee22(edgeSpendInfo, opts) {
-        var _this$walletLocalData8;
-
-        var _edgeSpendInfo$memos, memos, privateKeys, _edgeSpendInfo$spendT2, spendTarget, publicAddress, nativeAmount, options, result, date, edgeTransaction;
+        var _edgeSpendInfo$memos, memos, privateKeys, spendTargets, totalAmount, targets, _i4, _this$walletLocalData8, spendTarget, publicAddress, nativeAmount, options, result, date, edgeTransaction;
 
         return regeneratorRuntime.wrap(function _callee22$(_context22) {
           while (1) {
             switch (_context22.prev = _context22.next) {
               case 0:
                 _edgeSpendInfo$memos = edgeSpendInfo.memos, memos = _edgeSpendInfo$memos === void 0 ? [] : _edgeSpendInfo$memos;
-                privateKeys = (0,_moneroTypes__WEBPACK_IMPORTED_MODULE_4__.asPrivateKeys)(opts === null || opts === void 0 ? void 0 : opts.privateKeys); // Monero can only have one output
-                // TODO: The new SDK fixes this!
+                privateKeys = (0,_moneroTypes__WEBPACK_IMPORTED_MODULE_4__.asPrivateKeys)(opts === null || opts === void 0 ? void 0 : opts.privateKeys);
+                spendTargets = edgeSpendInfo.spendTargets;
+                totalAmount = '0';
+                targets = [];
+                _i4 = 0;
 
-                if (!(edgeSpendInfo.spendTargets.length !== 1)) {
-                  _context22.next = 4;
+              case 6:
+                if (!(_i4 < spendTargets.length)) {
+                  _context22.next = 24;
                   break;
                 }
 
-                throw new Error('Error: only one output allowed');
-
-              case 4:
-                _edgeSpendInfo$spendT2 = _slicedToArray(edgeSpendInfo.spendTargets, 1), spendTarget = _edgeSpendInfo$spendT2[0];
+                spendTarget = spendTargets[_i4];
                 publicAddress = spendTarget.publicAddress, nativeAmount = spendTarget.nativeAmount;
 
                 if (!(publicAddress == null)) {
-                  _context22.next = 8;
+                  _context22.next = 11;
                   break;
                 }
 
                 throw new TypeError('Missing destination address');
 
-              case 8:
+              case 11:
                 if (!(nativeAmount == null || (0,biggystring__WEBPACK_IMPORTED_MODULE_0__.eq)(nativeAmount, '0'))) {
-                  _context22.next = 10;
+                  _context22.next = 13;
                   break;
                 }
 
                 throw new edge_core_js_types__WEBPACK_IMPORTED_MODULE_1__.NoAmountSpecifiedError();
 
-              case 10:
-                if (!(0,biggystring__WEBPACK_IMPORTED_MODULE_0__.gte)(nativeAmount, (_this$walletLocalData8 = this.walletLocalData.totalBalances.get(PRIMARY_CURRENCY_TOKEN_ID)) !== null && _this$walletLocalData8 !== void 0 ? _this$walletLocalData8 : '0')) {
-                  _context22.next = 16;
+              case 13:
+                totalAmount = (0,biggystring__WEBPACK_IMPORTED_MODULE_0__.add)(totalAmount, nativeAmount);
+
+                if (!(0,biggystring__WEBPACK_IMPORTED_MODULE_0__.gte)(totalAmount, (_this$walletLocalData8 = this.walletLocalData.totalBalances.get(PRIMARY_CURRENCY_TOKEN_ID)) !== null && _this$walletLocalData8 !== void 0 ? _this$walletLocalData8 : '0')) {
+                  _context22.next = 20;
                   break;
                 }
 
-                if (!(0,biggystring__WEBPACK_IMPORTED_MODULE_0__.gte)(this.walletLocalData.lockedXmrBalance, nativeAmount)) {
-                  _context22.next = 15;
+                if (!(0,biggystring__WEBPACK_IMPORTED_MODULE_0__.gte)(this.walletLocalData.lockedXmrBalance, totalAmount)) {
+                  _context22.next = 19;
                   break;
                 }
 
                 throw new edge_core_js_types__WEBPACK_IMPORTED_MODULE_1__.PendingFundsError();
 
-              case 15:
+              case 19:
                 throw new edge_core_js_types__WEBPACK_IMPORTED_MODULE_1__.InsufficientFundsError({
                   tokenId: PRIMARY_CURRENCY_TOKEN_ID
                 });
 
-              case 16:
-                options = {
+              case 20:
+                targets.push({
                   amount: (0,biggystring__WEBPACK_IMPORTED_MODULE_0__.div)(nativeAmount, '1000000000000', 12),
+                  targetAddress: publicAddress
+                });
+
+              case 21:
+                _i4++;
+                _context22.next = 6;
+                break;
+
+              case 24:
+                options = {
                   isSweepTx: false,
                   priority: translateFee(edgeSpendInfo.networkFeeOption),
-                  targetAddress: publicAddress
+                  targets: targets
                 };
                 this.log("Creating transaction: ".concat(JSON.stringify(options, null, 1)));
-                _context22.next = 20;
+                _context22.next = 28;
                 return this.createMyMoneroTransaction(options, privateKeys);
 
-              case 20:
+              case 28:
                 result = _context22.sent;
                 date = Date.now() / 1000;
                 this.log("Total sent: ".concat(result.total_sent, ", Fee: ").concat(result.used_fee));
@@ -3023,7 +3020,7 @@ var MoneroEngine = /*#__PURE__*/function () {
                 this.log.warn("makeSpend edgeTransaction ".concat((0,_utils__WEBPACK_IMPORTED_MODULE_6__.cleanTxLogs)(edgeTransaction)));
                 return _context22.abrupt("return", edgeTransaction);
 
-              case 26:
+              case 34:
               case "end":
                 return _context22.stop();
             }
@@ -3115,7 +3112,7 @@ var MoneroEngine = /*#__PURE__*/function () {
             switch (_context25.prev = _context25.next) {
               case 0:
                 _context25.next = 2;
-                return this.addTransaction(edgeTransaction.tokenId, edgeTransaction);
+                return this.saveTransactionState(edgeTransaction.tokenId, edgeTransaction);
 
               case 2:
               case "end":
@@ -3985,14 +3982,14 @@ var MyMoneroApi = /*#__PURE__*/function () {
       var _createTransaction = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(keys, opts) {
         var _this = this;
 
-        var address, privateSpendKey, privateViewKey, publicSpendKey, amount, _opts$isSweepTx, isSweepTx, paymentId, _opts$priority, priority, targetAddress, unspentOuts, randomOutsCb;
+        var address, privateSpendKey, privateViewKey, publicSpendKey, _opts$isSweepTx, isSweepTx, paymentId, _opts$priority, priority, targets, unspentOuts, randomOutsCb, destinations;
 
         return regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) {
             switch (_context5.prev = _context5.next) {
               case 0:
                 address = keys.address, privateSpendKey = keys.privateSpendKey, privateViewKey = keys.privateViewKey, publicSpendKey = keys.publicSpendKey;
-                amount = opts.amount, _opts$isSweepTx = opts.isSweepTx, isSweepTx = _opts$isSweepTx === void 0 ? false : _opts$isSweepTx, paymentId = opts.paymentId, _opts$priority = opts.priority, priority = _opts$priority === void 0 ? 1 : _opts$priority, targetAddress = opts.targetAddress; // Grab the UTXO set:
+                _opts$isSweepTx = opts.isSweepTx, isSweepTx = _opts$isSweepTx === void 0 ? false : _opts$isSweepTx, paymentId = opts.paymentId, _opts$priority = opts.priority, priority = _opts$priority === void 0 ? 1 : _opts$priority, targets = opts.targets; // Grab the UTXO set:
 
                 _context5.next = 4;
                 return this.fetchPostMyMonero('get_unspent_outs', {
@@ -4043,15 +4040,18 @@ var MyMoneroApi = /*#__PURE__*/function () {
                   return function randomOutsCb(_x6) {
                     return _ref.apply(this, arguments);
                   };
-                }(); // Make the transaction:
+                }();
 
+                destinations = targets.map(function (t) {
+                  return {
+                    send_amount: t.amount,
+                    to_address: t.targetAddress
+                  };
+                }); // Make the transaction:
 
-                _context5.next = 8;
+                _context5.next = 9;
                 return this.cppBridge.createTransaction({
-                  destinations: [{
-                    send_amount: amount,
-                    to_address: targetAddress
-                  }],
+                  destinations: destinations,
                   priority: priority,
                   address: address,
                   paymentId: paymentId,
@@ -4064,10 +4064,10 @@ var MyMoneroApi = /*#__PURE__*/function () {
                   randomOutsCb: randomOutsCb
                 });
 
-              case 8:
+              case 9:
                 return _context5.abrupt("return", _context5.sent);
 
-              case 9:
+              case 10:
               case "end":
                 return _context5.stop();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edge-currency-monero",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Edge Monero currency plugin",
   "homepage": "https://edge.app",
   "repository": {