edge-currency-monero 1.5.1 → 2.0.1

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+## 2.0.1 (2025-11-17)
+
+- 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
+
 ## 1.5.1 (2025-07-03)
 
 - fixed: Fix `getFreshAddress` to return a non-empty `publicAddress` when calling immediately after creating a wallet.

package/lib/MoneroEngine.js

@@ -97,7 +97,7 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
     const initOptions = _moneroTypes.asMoneroInitOptions.call(void 0, _nullishCoalesce(env.initOptions, () => ( {})))
     const { networkInfo } = tools
 
-    this.apiKey = initOptions.apiKey
+    this.apiKey = initOptions.edgeApiKey
     this.io = env.io
     this.log = opts.log
     this.engineOn = false
@@ -110,7 +110,7 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
     this.currencyInfo = _moneroInfo.currencyInfo
     this.currencyTools = tools
     this.myMoneroApi = new (0, _MyMoneroApi.MyMoneroApi)(tools.cppBridge, {
-      apiKey: initOptions.apiKey,
+      apiKey: initOptions.edgeApiKey,
       apiServer: networkInfo.defaultServer,
       fetch: env.io.fetch,
       nettype: networkInfo.nettype
@@ -134,9 +134,6 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
       )
     }
 
-    // Hard coded for testing
-    // this.walletInfo.keys.moneroKey = '389b07b3466eed587d6bdae09a3613611de9add2635432d6cd1521af7bbc3757'
-    // this.walletInfo.keys.moneroAddress = '0x9fa817e5A48DD1adcA7BEc59aa6E3B1F5C4BeA9a'
     this.edgeTxLibCallbacks = callbacks
     this.walletLocalDisklet = walletLocalDisklet
 
@@ -264,12 +261,8 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
       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:
@@ -285,7 +278,7 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
     const edgeTransaction = {
       blockHeight,
       currencyCode: 'XMR',
-      date,
+      date: date.valueOf() / 1000,
       isSend: _biggystring.lt.call(void 0, netNativeAmount, '0'),
       memos,
       nativeAmount: netNativeAmount,
@@ -404,20 +397,20 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
       })
     } 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

package/lib/MoneroTools.js

@@ -37,7 +37,7 @@ function getParameterByName(param, url) {
   
   
   __init() {this.networkInfo = {
-    defaultServer: 'https://edge.mymonero.com:8443',
+    defaultServer: _moneroInfo.MONERO_LWS_SERVER,
     nettype: 'MAINNET'
   }}
 

package/lib/MyMoneroApi.js

@@ -125,13 +125,13 @@ const asGetAddressTxsResponse = _cleaners.asObject.call(void 0, {
       _cleaners.asObject.call(void 0, {
         coinbase: asNumberBoolean, // True if tx is coinbase
         hash: _cleaners.asString, // Bytes of tx hash
-        height: _cleaners.asNumber, // Block height
+        height: _cleaners.asOptional.call(void 0, _cleaners.asNumber), // Block height
         id: _cleaners.asNumber, // Index of tx in blockchain
         mempool: asNumberBoolean, // True if tx is in mempool
         mixin: _cleaners.asNumber, // Mixin of the receive
         payment_id: _cleaners.asOptional.call(void 0, _cleaners.asString), // Bytes of tx payment id
         spent_outputs: _cleaners.asOptional.call(void 0, _cleaners.asArray.call(void 0, asSpentOutput)), // List of possible spends
-        timestamp: _cleaners.asString, // Timestamp of block
+        timestamp: _cleaners.asOptional.call(void 0, _cleaners.asString), // Timestamp of block
         total_received: _cleaners.asString, // Total XMR received
         total_sent: _cleaners.asString, // XMR possibly being spent
         unlock_time: _cleaners.asNumber // Tx unlock time field
@@ -252,6 +252,9 @@ const asGetAddressTxsResponse = _cleaners.asObject.call(void 0, {
       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) => {

package/lib/moneroInfo.js

@@ -2,9 +2,11 @@
 
 
 
+ const MONERO_LWS_SERVER = 'https://monerolws1.edge.app'; exports.MONERO_LWS_SERVER = MONERO_LWS_SERVER
+
 const defaultSettings = {
   enableCustomServers: false,
-  moneroLightwalletServer: 'https://edge.mymonero.com:8443'
+  moneroLightwalletServer: exports.MONERO_LWS_SERVER
 }
 
  const currencyInfo = {

package/lib/moneroTypes.js

@@ -16,7 +16,7 @@ var _cleaners = require('cleaners');
 
 
  const asMoneroInitOptions = _cleaners.asObject.call(void 0, {
-  apiKey: _cleaners.asOptional.call(void 0, _cleaners.asString, '')
+  edgeApiKey: _cleaners.asOptional.call(void 0, _cleaners.asString, '')
 }); exports.asMoneroInitOptions = asMoneroInitOptions
 
 

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

@@ -1923,7 +1923,7 @@ var MoneroEngine = /*#__PURE__*/function () {
         walletLocalDisklet = opts.walletLocalDisklet;
     var initOptions = (0,_moneroTypes__WEBPACK_IMPORTED_MODULE_4__.asMoneroInitOptions)((_env$initOptions = env.initOptions) !== null && _env$initOptions !== void 0 ? _env$initOptions : {});
     var networkInfo = tools.networkInfo;
-    this.apiKey = initOptions.apiKey;
+    this.apiKey = initOptions.edgeApiKey;
     this.io = env.io;
     this.log = opts.log;
     this.engineOn = false;
@@ -1937,7 +1937,7 @@ var MoneroEngine = /*#__PURE__*/function () {
     this.currencyInfo = _moneroInfo__WEBPACK_IMPORTED_MODULE_2__.currencyInfo;
     this.currencyTools = tools;
     this.myMoneroApi = new _MyMoneroApi__WEBPACK_IMPORTED_MODULE_5__.MyMoneroApi(tools.cppBridge, {
-      apiKey: initOptions.apiKey,
+      apiKey: initOptions.edgeApiKey,
       apiServer: networkInfo.defaultServer,
       fetch: env.io.fetch,
       nettype: networkInfo.nettype
@@ -1949,10 +1949,7 @@ var MoneroEngine = /*#__PURE__*/function () {
 
     if (this.currentSettings.enableCustomServers && this.currentSettings.moneroLightwalletServer != null) {
       this.myMoneroApi.changeServer(this.currentSettings.moneroLightwalletServer, '');
-    } // Hard coded for testing
-    // this.walletInfo.keys.moneroKey = '389b07b3466eed587d6bdae09a3613611de9add2635432d6cd1521af7bbc3757'
-    // this.walletInfo.keys.moneroAddress = '0x9fa817e5A48DD1adcA7BEc59aa6E3B1F5C4BeA9a'
-
+    }
 
     this.edgeTxLibCallbacks = callbacks;
     this.walletLocalDisklet = walletLocalDisklet;
@@ -2176,13 +2173,8 @@ var MoneroEngine = /*#__PURE__*/function () {
         ourReceiveAddresses.push(this.walletInfo.keys.moneroAddress.toLowerCase());
       }
 
-      var blockHeight = tx.height;
-
-      if (tx.mempool) {
-        blockHeight = 0;
-      }
-
-      var date = Date.parse(tx.timestamp) / 1000; // Expose legacy payment ID's to the GUI. This only applies
+      var blockHeight = tx.height == null || tx.mempool ? 0 : tx.height;
+      var 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:
 
       var memos = [];
@@ -2198,7 +2190,7 @@ var MoneroEngine = /*#__PURE__*/function () {
       var edgeTransaction = {
         blockHeight: blockHeight,
         currencyCode: 'XMR',
-        date: date,
+        date: date.valueOf() / 1000,
         isSend: (0,biggystring__WEBPACK_IMPORTED_MODULE_0__.lt)(netNativeAmount, '0'),
         memos: memos,
         nativeAmount: netNativeAmount,
@@ -2333,15 +2325,15 @@ var MoneroEngine = /*#__PURE__*/function () {
       } else {
         var _txs2 = this.getTxs(tokenId);
 
-        var edgeTx = _txs2[idx]; // Already have this tx in the database. Consider a change if blockHeight changed
+        var oldTx = _txs2[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: ".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
+        edgeTransaction.nativeAmount = oldTx.nativeAmount; // Update the transaction
 
         _txs2[idx] = edgeTransaction;
         this.walletLocalDataDirty = true;
@@ -3443,7 +3435,7 @@ var MoneroTools = /*#__PURE__*/function () {
     _classCallCheck(this, MoneroTools);
 
     _defineProperty(this, "networkInfo", {
-      defaultServer: 'https://edge.mymonero.com:8443',
+      defaultServer: _moneroInfo__WEBPACK_IMPORTED_MODULE_3__.MONERO_LWS_SERVER,
       nettype: 'MAINNET'
     });
 
@@ -3876,7 +3868,7 @@ var asGetAddressTxsResponse = (0,cleaners__WEBPACK_IMPORTED_MODULE_0__.asObject)
     // True if tx is coinbase
     hash: cleaners__WEBPACK_IMPORTED_MODULE_0__.asString,
     // Bytes of tx hash
-    height: cleaners__WEBPACK_IMPORTED_MODULE_0__.asNumber,
+    height: (0,cleaners__WEBPACK_IMPORTED_MODULE_0__.asOptional)(cleaners__WEBPACK_IMPORTED_MODULE_0__.asNumber),
     // Block height
     id: cleaners__WEBPACK_IMPORTED_MODULE_0__.asNumber,
     // Index of tx in blockchain
@@ -3888,7 +3880,7 @@ var asGetAddressTxsResponse = (0,cleaners__WEBPACK_IMPORTED_MODULE_0__.asObject)
     // Bytes of tx payment id
     spent_outputs: (0,cleaners__WEBPACK_IMPORTED_MODULE_0__.asOptional)((0,cleaners__WEBPACK_IMPORTED_MODULE_0__.asArray)(asSpentOutput)),
     // List of possible spends
-    timestamp: cleaners__WEBPACK_IMPORTED_MODULE_0__.asString,
+    timestamp: (0,cleaners__WEBPACK_IMPORTED_MODULE_0__.asOptional)(cleaners__WEBPACK_IMPORTED_MODULE_0__.asString),
     // Timestamp of block
     total_received: cleaners__WEBPACK_IMPORTED_MODULE_0__.asString,
     // Total XMR received
@@ -4058,7 +4050,7 @@ var MyMoneroApi = /*#__PURE__*/function () {
       var _createTransaction = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(keys, opts) {
         var _this = this;
 
-        var address, privateSpendKey, privateViewKey, publicSpendKey, _opts$isSweepTx, isSweepTx, paymentId, _opts$priority, priority, targets, unspentOuts, randomOutsCb, destinations;
+        var address, privateSpendKey, privateViewKey, publicSpendKey, _opts$isSweepTx, isSweepTx, paymentId, _opts$priority, priority, targets, unspentOuts, _i2, _unspentOuts$outputs2, out, randomOutsCb, destinations;
 
         return regeneratorRuntime.wrap(function _callee5$(_context5) {
           while (1) {
@@ -4081,7 +4073,12 @@ var MyMoneroApi = /*#__PURE__*/function () {
               case 4:
                 unspentOuts = _context5.sent;
 
-                // Grab some random outputs to mix in:
+                for (_i2 = 0, _unspentOuts$outputs2 = unspentOuts.outputs; _i2 < _unspentOuts$outputs2.length; _i2++) {
+                  out = _unspentOuts$outputs2[_i2];
+                  if (out.spend_key_images == null) out.spend_key_images = [];
+                } // Grab some random outputs to mix in:
+
+
                 randomOutsCb = /*#__PURE__*/function () {
                   var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(count) {
                     var amounts, i;
@@ -4125,7 +4122,7 @@ var MyMoneroApi = /*#__PURE__*/function () {
                   };
                 }); // Make the transaction:
 
-                _context5.next = 9;
+                _context5.next = 10;
                 return this.cppBridge.createTransaction({
                   destinations: destinations,
                   priority: priority,
@@ -4140,10 +4137,10 @@ var MyMoneroApi = /*#__PURE__*/function () {
                   randomOutsCb: randomOutsCb
                 });
 
-              case 9:
+              case 10:
                 return _context5.abrupt("return", _context5.sent);
 
-              case 10:
+              case 11:
               case "end":
                 return _context5.stop();
             }
@@ -4254,11 +4251,13 @@ var MyMoneroApi = /*#__PURE__*/function () {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   MONERO_LWS_SERVER: () => (/* binding */ MONERO_LWS_SERVER),
 /* harmony export */   currencyInfo: () => (/* binding */ currencyInfo)
 /* harmony export */ });
+var MONERO_LWS_SERVER = 'https://monerolws1.edge.app';
 var defaultSettings = {
   enableCustomServers: false,
-  moneroLightwalletServer: 'https://edge.mymonero.com:8443'
+  moneroLightwalletServer: MONERO_LWS_SERVER
 };
 var currencyInfo = {
   // Basic currency information:
@@ -4382,7 +4381,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  */
 
 var asMoneroInitOptions = (0,cleaners__WEBPACK_IMPORTED_MODULE_0__.asObject)({
-  apiKey: (0,cleaners__WEBPACK_IMPORTED_MODULE_0__.asOptional)(cleaners__WEBPACK_IMPORTED_MODULE_0__.asString, '')
+  edgeApiKey: (0,cleaners__WEBPACK_IMPORTED_MODULE_0__.asOptional)(cleaners__WEBPACK_IMPORTED_MODULE_0__.asString, '')
 });
 var asMoneroUserSettings = (0,cleaners__WEBPACK_IMPORTED_MODULE_0__.asObject)({
   enableCustomServers: (0,cleaners__WEBPACK_IMPORTED_MODULE_0__.asMaybe)(cleaners__WEBPACK_IMPORTED_MODULE_0__.asBoolean, false),

package/package.json

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