edge-currency-monero 1.4.0 → 1.4.2

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 1.4.2 (2025-04-01)
+
+- fixed: Small internal implementation cleanup on how transactions are saved.
+
+## 1.4.1 (2025-03-28)
+
+- fixed: Fixed `saveTx` regression. Transaction sends are properly saved.
+
 ## 1.4.0 (2025-03-25)
 
 - fixed: Remove race condition causing missing transaction between showing address and initial login.

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
+      )
+    }
   }
 
   // *************************************
@@ -746,7 +735,7 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
   }
 
   async saveTx(edgeTransaction) {
-    await this.addTransaction(edgeTransaction.currencyCode, edgeTransaction)
+    await this.saveTransactionState(edgeTransaction.tokenId, edgeTransaction)
   }
 
   getDisplayPrivateSeed(privateKeys) {

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
     // *************************************
@@ -3115,7 +3099,7 @@ var MoneroEngine = /*#__PURE__*/function () {
             switch (_context25.prev = _context25.next) {
               case 0:
                 _context25.next = 2;
-                return this.addTransaction(edgeTransaction.currencyCode, edgeTransaction);
+                return this.saveTransactionState(edgeTransaction.tokenId, edgeTransaction);
 
               case 2:
               case "end":

package/package.json

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