Merge pull request #98 from EdgeApp/william/lws-fixes

LWS fixes

Author: swansontec

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- fixed: Handle REST responses from monero-lws.
+
 ## 2.0.0 (2025-10-02)
 
 - changed: *Breaking change* Change to use Edge LWS servers. Must specify edgeApiKey in plugin options, instead of apiKey

src/MoneroEngine.ts

@@ -261,12 +261,8 @@ export class MoneroEngine implements EdgeCurrencyEngine {
       ourReceiveAddresses.push(this.walletInfo.keys.moneroAddress.toLowerCase())
     }
 
-    let blockHeight = tx.height
-    if (tx.mempool) {
-      blockHeight = 0
-    }
-
-    const date = Date.parse(tx.timestamp) / 1000
+    const blockHeight = tx.height == null || tx.mempool ? 0 : tx.height
+    const date = tx.timestamp == null ? new Date() : new Date(tx.timestamp)
 
     // Expose legacy payment ID's to the GUI. This only applies
     // to really old transactions, before integrated addresses:
@@ -282,7 +278,7 @@ export class MoneroEngine implements EdgeCurrencyEngine {
     const edgeTransaction: EdgeTransaction = {
       blockHeight,
       currencyCode: 'XMR',
-      date,
+      date: date.valueOf() / 1000,
       isSend: lt(netNativeAmount, '0'),
       memos,
       nativeAmount: netNativeAmount,
@@ -401,20 +397,20 @@ export class MoneroEngine implements EdgeCurrencyEngine {
       })
     } else {
       const txs = this.getTxs(tokenId)
-      const edgeTx = txs[idx]
+      const oldTx = txs[idx]
+
+      // Keep the first-seen date for unconfirmed transactions:
+      if (edgeTransaction.blockHeight === 0) edgeTransaction.date = oldTx.date
 
       // Already have this tx in the database. Consider a change if blockHeight changed
-      if (edgeTx.blockHeight === edgeTransaction.blockHeight) return
+      if (oldTx.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
-      }
+      edgeTransaction.nativeAmount = oldTx.nativeAmount
 
       // Update the transaction
       txs[idx] = edgeTransaction

src/MyMoneroApi.ts

@@ -76,13 +76,13 @@ export interface ParsedTransaction {
   // See asGetAddressTxsResponse for these fields:
   coinbase: boolean
   hash: string
-  height: number
+  height?: number
   id: number
   mempool: boolean
   mixin: number
   payment_id?: string
   spent_outputs?: SpentOutput[]
-  timestamp: string
+  timestamp?: string
   total_received: string
   total_sent: string
   unlock_time: number
@@ -125,13 +125,13 @@ const asGetAddressTxsResponse = asObject({
       asObject({
         coinbase: asNumberBoolean, // True if tx is coinbase
         hash: asString, // Bytes of tx hash
-        height: asNumber, // Block height
+        height: asOptional(asNumber), // Block height
         id: asNumber, // Index of tx in blockchain
         mempool: asNumberBoolean, // True if tx is in mempool
         mixin: asNumber, // Mixin of the receive
         payment_id: asOptional(asString), // Bytes of tx payment id
         spent_outputs: asOptional(asArray(asSpentOutput)), // List of possible spends
-        timestamp: asString, // Timestamp of block
+        timestamp: asOptional(asString), // Timestamp of block
         total_received: asString, // Total XMR received
         total_sent: asString, // XMR possibly being spent
         unlock_time: asNumber // Tx unlock time field
@@ -252,6 +252,9 @@ export class MyMoneroApi {
       use_dust: true,
       view_key: privateViewKey
     })
+    for (const out of unspentOuts.outputs) {
+      if (out.spend_key_images == null) out.spend_key_images = []
+    }
 
     // Grab some random outputs to mix in:
     const randomOutsCb = async (count: number): Promise<any> => {