edge-currency-monero 1.4.2 → 1.5.1

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## 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.
+
 ## 1.4.2 (2025-04-01)
 
 - fixed: Small internal implementation cleanup on how transactions are saved.

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 }
   }
 
@@ -601,10 +626,14 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
     }
 
     const options = {
-      amount: '0',
       isSweepTx: true,
       priority: translateFee(edgeSpendInfo.networkFeeOption),
-      targetAddress: publicAddress
+      targets: [
+        {
+          amount: '0',
+          targetAddress: publicAddress
+        }
+      ]
     }
 
     const result = await this.createMyMoneroTransaction(options, privateKeys)
@@ -625,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)
     }
   }
@@ -642,39 +679,45 @@ const PRIMARY_CURRENCY_TOKEN_ID = null
     const { memos = [] } = edgeSpendInfo
     const privateKeys = _moneroTypes.asPrivateKeys.call(void 0, _optionalChain([opts, 'optionalAccess', _7 => _7.privateKeys]))
 
-    // Monero can only have one output
-    // TODO: The new SDK fixes this!
-    if (edgeSpendInfo.spendTargets.length !== 1) {
-      throw new Error('Error: only one output allowed')
-    }
+    const { spendTargets } = edgeSpendInfo
 
-    const [spendTarget] = edgeSpendInfo.spendTargets
-    const { publicAddress, nativeAmount } = spendTarget
-    if (publicAddress == null) {
-      throw new TypeError('Missing destination address')
-    }
-    if (nativeAmount == null || _biggystring.eq.call(void 0, nativeAmount, '0')) {
-      throw new (0, _types.NoAmountSpecifiedError)()
-    }
+    let totalAmount = '0'
+    const targets = []
 
-    if (
-      _biggystring.gte.call(void 0, 
-        nativeAmount,
-        _nullishCoalesce(this.walletLocalData.totalBalances.get(PRIMARY_CURRENCY_TOKEN_ID), () => ( '0'))
-      )
-    ) {
-      if (_biggystring.gte.call(void 0, this.walletLocalData.lockedXmrBalance, nativeAmount)) {
-        throw new (0, _types.PendingFundsError)()
-      } else {
-        throw new (0, _types.InsufficientFundsError)({ tokenId: PRIMARY_CURRENCY_TOKEN_ID })
+    for (const spendTarget of spendTargets) {
+      const { publicAddress, nativeAmount } = spendTarget
+      if (publicAddress == null) {
+        throw new TypeError('Missing destination address')
+      }
+      if (nativeAmount == null || _biggystring.eq.call(void 0, nativeAmount, '0')) {
+        throw new (0, _types.NoAmountSpecifiedError)()
+      }
+      totalAmount = _biggystring.add.call(void 0, totalAmount, nativeAmount)
+      if (
+        _biggystring.gte.call(void 0, 
+          totalAmount,
+          _nullishCoalesce(this.walletLocalData.totalBalances.get(PRIMARY_CURRENCY_TOKEN_ID), () => (
+            '0'))
+        )
+      ) {
+        if (_biggystring.gte.call(void 0, this.walletLocalData.lockedXmrBalance, totalAmount)) {
+          throw new (0, _types.PendingFundsError)()
+        } else {
+          throw new (0, _types.InsufficientFundsError)({
+            tokenId: PRIMARY_CURRENCY_TOKEN_ID
+          })
+        }
       }
+      targets.push({
+        amount: _biggystring.div.call(void 0, nativeAmount, '1000000000000', 12),
+        targetAddress: publicAddress
+      })
     }
 
     const options = {
-      amount: _biggystring.div.call(void 0, nativeAmount, '1000000000000', 12),
       isSweepTx: false,
       priority: translateFee(edgeSpendInfo.networkFeeOption),
-      targetAddress: publicAddress
+      targets
     }
     this.log(`Creating transaction: ${JSON.stringify(options, null, 1)}`)
 

package/lib/MyMoneroApi.js

@@ -48,6 +48,8 @@ var _ResponseParser = require('./mymonero-utils/ResponseParser'); var _ResponseP
 
 
 
+
+
 
 
 
@@ -238,13 +240,7 @@ const asGetAddressTxsResponse = _cleaners.asObject.call(void 0, {
     opts
   ) {
     const { address, privateSpendKey, privateViewKey, publicSpendKey } = keys
-    const {
-      amount,
-      isSweepTx = false,
-      paymentId,
-      priority = 1,
-      targetAddress
-    } = opts
+    const { isSweepTx = false, paymentId, priority = 1, targets } = opts
 
     // Grab the UTXO set:
     const unspentOuts = await this.fetchPostMyMonero('get_unspent_outs', {
@@ -268,14 +264,14 @@ const asGetAddressTxsResponse = _cleaners.asObject.call(void 0, {
       })
     }
 
+    const destinations = targets.map(t => ({
+      send_amount: t.amount,
+      to_address: t.targetAddress
+    }))
+
     // Make the transaction:
     return await this.cppBridge.createTransaction({
-      destinations: [
-        {
-          send_amount: amount,
-          to_address: targetAddress
-        }
-      ],
+      destinations,
       priority,
       address,
       paymentId,