rottenwheel/mysu_anon
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/mysu.git synced 2024-11-26 09:24:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

When selecting UTXOs, account for basic tx fee. Based on Monero's C++ code, this method doesn't seem to work all that well

Browse source
This commit is contained in:
pokkst 2022-09-24 13:45:42 -05:00
parent f3d2ba2591
commit ddf5ea66eb
No known key found for this signature in database
GPG key ID: 90C2ED85E67A50FF
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/net/mynero/wallet/service/UTXOService.java
View file

@ -1,9 +1,12 @@
package net.mynero.wallet.service; package net.mynero.wallet.service;
import android.util.Pair;
import androidx.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.MutableLiveData;
import net.mynero.wallet.model.CoinsInfo; import net.mynero.wallet.model.CoinsInfo;
import net.mynero.wallet.model.PendingTransaction;
import net.mynero.wallet.model.TransactionInfo; import net.mynero.wallet.model.TransactionInfo;
import net.mynero.wallet.model.Wallet; import net.mynero.wallet.model.Wallet;
import net.mynero.wallet.model.WalletManager; import net.mynero.wallet.model.WalletManager;
@ -34,6 +37,8 @@ public class UTXOService extends ServiceBase {
} }
public ArrayList<String> selectUtxos(long amount, boolean sendAll) throws Exception { public ArrayList<String> selectUtxos(long amount, boolean sendAll) throws Exception {
final long basicFeeEstimate = calculateBasicFee(amount);
final long amountWithBasicFee = amount + basicFeeEstimate;
ArrayList<String> selectedUtxos = new ArrayList<>(); ArrayList<String> selectedUtxos = new ArrayList<>();
ArrayList<String> seenTxs = new ArrayList<>(); ArrayList<String> seenTxs = new ArrayList<>();
List<CoinsInfo> utxos = getUtxos(); List<CoinsInfo> utxos = getUtxos();
@ -48,7 +53,7 @@ public class UTXOService extends ServiceBase {
amountSelected = Wallet.SWEEP_ALL; amountSelected = Wallet.SWEEP_ALL;
} else { } else {
//if amount selected is still less than amount needed, and the utxos tx hash hasn't already been seen, add utxo //if amount selected is still less than amount needed, and the utxos tx hash hasn't already been seen, add utxo
if (amountSelected <= amount && !seenTxs.contains(coinsInfo.getHash())) { if (amountSelected <= amountWithBasicFee && !seenTxs.contains(coinsInfo.getHash())) {
selectedUtxos.add(coinsInfo.getKeyImage()); selectedUtxos.add(coinsInfo.getKeyImage());
// we don't want to spend multiple utxos from the same transaction, so we prevent that from happening here. // we don't want to spend multiple utxos from the same transaction, so we prevent that from happening here.
seenTxs.add(coinsInfo.getHash()); seenTxs.add(coinsInfo.getHash());
@ -58,10 +63,18 @@ public class UTXOService extends ServiceBase {
} }
} }
if (amountSelected <= amount && !sendAll) { if (amountSelected < amountWithBasicFee && !sendAll) {
throw new Exception("insufficient wallet balance"); throw new Exception("insufficient wallet balance");
} }
return selectedUtxos; return selectedUtxos;
} }
private long calculateBasicFee(long amount) {
ArrayList<Pair<String, Long>> destinations = new ArrayList<>();
destinations.add(new Pair<>("87MRtZPrWUCVUgcFHdsVb5MoZUcLtqfD3FvQVGwftFb8eSdMnE39JhAJcbuSW8X2vRaRsB9RQfuCpFciybJFHaz3QYPhCLw", amount));
// destination string doesn't actually matter here, so i'm using the donation address. amount also technically doesn't matter
// priority also isn't accounted for in the Monero C++ code. maybe this is a bug by the core Monero team, or i'm using an outdated method.
return WalletManager.getInstance().getWallet().estimateTransactionFee(destinations, PendingTransaction.Priority.Priority_Low);
}
} }