edge-currency-monero 1.5.0 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # edge-currency-monero
 
+## Unreleased
+
+## 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.
+- fixed: Handle insufficient funds errors from native library into `InsufficientFundsError`.
+
 ## 1.5.0 (2025-04-21)
 
 - added: Support for multiple spend targets.

package/lib/MoneroEngine.js

@@ -85,18 +85,19 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
   
   
   
+  __init() {this.loginPromise = null}
 
   constructor(
     env,
     tools,
     walletInfo,
     opts
-  ) {
+  ) {;MoneroEngine.prototype.__init.call(this);
     const { callbacks, userSettings = {}, walletLocalDisklet } = opts
     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
@@ -109,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
@@ -133,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
 
@@ -174,6 +172,20 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
   // Login to mymonero.com server
   // **********************************************
   async loginIfNewAddress(privateKeys) {
+    if (this.loginPromise != null) {
+      return await this.loginPromise
+    }
+    this.loginPromise = this.performLogin(privateKeys)
+
+    try {
+      await this.loginPromise
+    } finally {
+      // Clear the promise once completed (success OR failure)
+      this.loginPromise = null
+    }
+  }
+
+   async performLogin(privateKeys) {
     try {
       const result = await this.myMoneroApi.login({
         address: this.walletInfo.keys.moneroAddress,
@@ -578,8 +590,18 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
   async getFreshAddress(
     options
   ) {
+    // Wait for login to complete if it's in progress
+    if (this.loginPromise != null) {
+      await this.loginPromise
+    }
+
     // Do not show the address before logging into my monero...
-    if (!this.walletLocalData.hasLoggedIn) return { publicAddress: '' }
+    if (!this.walletLocalData.hasLoggedIn) {
+      this.log.warn(
+        'Attempted to retrieve `publicAddress` before successfully logging in'
+      )
+      return { publicAddress: '' }
+    }
     return { publicAddress: this.walletInfo.keys.moneroAddress }
   }
 
@@ -629,12 +651,20 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
         },
         options
       )
-    } catch (e) {
+    } catch (error) {
+      if (!(error instanceof Error)) {
+        throw new Error(String(error))
+      }
+      if (error.message === 'Not enough spendables') {
+        throw new (0, _types.InsufficientFundsError)({
+          tokenId: PRIMARY_CURRENCY_TOKEN_ID
+        })
+      }
       // This error is specific to mymonero-core-js: github.com/mymonero/mymonero-core-cpp/blob/a53e57f2a376b05bb0f4d851713321c749e5d8d9/src/monero_transfer_utils.hpp#L112-L162
-      this.log.error(e.message)
+      this.log.error(error.message)
       const regex = / Have (\d*\.?\d+) XMR; need (\d*\.?\d+) XMR./gm
       const subst = `\nHave: $1 XMR.\nNeed: $2 XMR.`
-      const msgFormatted = e.message.replace(regex, subst)
+      const msgFormatted = error.message.replace(regex, subst)
       throw new Error(msgFormatted)
     }
   }

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/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