edge-currency-monero 1.5.0 → 1.5.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # edge-currency-monero
 
+## Unreleased
+
+## 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,13 +85,14 @@ 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
@@ -174,6 +175,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 +593,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 +654,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)
     }
   }