Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-02 05:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Introduce a Transaction.DEFAULT_TX_FEE and use it as a default for sends and for wallet maintenance.

Browse Source 
Previously we were using Transaction.REFERENCE_DEFAULT_MIN_TX_FEE which is the absolute minimum but it can be
too low. This value should be adjusted from time to time; we're starting with 0.1 mBTC.
This commit is contained in:
Andreas Schildbach
2016-03-25 11:43:46 +01:00
parent 34f2fad07d
commit 01365ca00b
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/src/main/java/org/bitcoinj/tools/WalletTool.java
View File

@@ -357,7 +357,7 @@ public class WalletTool {
System.err.println("--payment-request and --output cannot be used together.");
return;
} else if (options.has(outputFlag)) {
Coin feePerKb = Coin.ZERO;
Coin feePerKb = null;
if (options.has(feePerKbOption))
feePerKb = parseCoin((String) options.valueOf(feePerKbOption));
String lockTime = null;
@@ -378,7 +378,7 @@ public class WalletTool {
System.err.println("You must specify a --output=addr:value");
return;
}
Coin feePerKb = Coin.ZERO;
Coin feePerKb = null;
if (options.has(feePerKbOption))
feePerKb = parseCoin((String) options.valueOf(feePerKbOption));
if (!options.has("locktime")) {
@@ -398,7 +398,7 @@ public class WalletTool {
System.err.println("You must specify a --output=addr:value");
return;
}
Coin feePerKb = Coin.ZERO;
Coin feePerKb = null;
if (options.has(feePerKbOption))
feePerKb = parseCoin((String) options.valueOf(feePerKbOption));
boolean allowUnconfirmed = options.has("allow-unconfirmed");
@@ -413,7 +413,7 @@ public class WalletTool {
System.err.println("You must specify a --output=addr:value");
return;
}
Coin feePerKb = Coin.ZERO;
Coin feePerKb = null;
if (options.has(feePerKbOption))
feePerKb = parseCoin((String) options.valueOf(feePerKbOption));
boolean allowUnconfirmed = options.has("allow-unconfirmed");
@@ -596,7 +596,8 @@ public class WalletTool {
log.info("Emptying out wallet, recipient may get less than what you expect");
req.emptyWallet = true;
}
req.feePerKb = feePerKb;
if (feePerKb != null)
req.feePerKb = feePerKb;
if (allowUnconfirmed) {
wallet.allowSpendingUnconfirmedTransactions();
}
@@ -727,7 +728,8 @@ public class WalletTool {
log.info("Emptying out wallet, recipient may get less than what you expect");
req.emptyWallet = true;
}
req.feePerKb = feePerKb;
if (feePerKb != null)
req.feePerKb = feePerKb;
if (allowUnconfirmed) {
wallet.allowSpendingUnconfirmedTransactions();
}
@@ -794,7 +796,8 @@ public class WalletTool {
Wallet.SendRequest req = outputSpec.isAddress() ?
Wallet.SendRequest.to(outputSpec.addr, value) :
Wallet.SendRequest.to(params, outputSpec.key, value);
req.feePerKb = feePerKb;
if (feePerKb != null)
req.feePerKb = feePerKb;
Transaction lockTimeVerify = wallet.getTransaction(Sha256Hash.wrap(txHash));
if (lockTimeVerify == null) {
@@ -897,7 +900,8 @@ public class WalletTool {
Wallet.SendRequest req = outputSpec.isAddress() ?
Wallet.SendRequest.to(outputSpec.addr, value) :
Wallet.SendRequest.to(params, outputSpec.key, value);
req.feePerKb = feePerKb;
if (feePerKb != null)
req.feePerKb = feePerKb;
Transaction lockTimeVerify = wallet.getTransaction(Sha256Hash.wrap(txHash));
if (lockTimeVerify == null) {