mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-01-19 05:33:44 +01: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/bitcoinj/core/Context.java
View File

@ -32,7 +32,7 @@ public class Context {
private NetworkParameters params;
private int eventHorizon = 100;
private boolean ensureMinRequiredFee = true;
private Coin feePerKb = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE;
private Coin feePerKb = Transaction.DEFAULT_TX_FEE;
/**
* Creates a new context object. For now, this will be done for you by the framework. Eventually you will be

10
core/src/main/java/org/bitcoinj/core/Transaction.java
View File

@ -94,9 +94,15 @@ public class Transaction extends ChildMessage {
public static final int MAX_STANDARD_TX_SIZE = 100000;
/**
* If fee is lower than this value (in satoshis), Bitcoin Core will treat it as if there were no fee.
* If feePerKb is lower than this, Bitcoin Core will treat it as if there were no fee.
*/
public static final Coin REFERENCE_DEFAULT_MIN_TX_FEE = Coin.valueOf(5000); // satoshis
public static final Coin REFERENCE_DEFAULT_MIN_TX_FEE = Coin.valueOf(5000); // 0.05 mBTC
/**
* If using this feePerKb, transactions will get confirmed within the next couple of blocks.
* This should be adjusted from time to time. Last adjustment: March 2016.
*/
public static final Coin DEFAULT_TX_FEE = Coin.valueOf(10000); // 0.1 mBTC
/**
* Any standard (ie pay-to-address) output smaller than this value (in satoshis) will most likely be rejected by the network.

2
core/src/main/java/org/bitcoinj/core/Wallet.java
View File

@ -5459,7 +5459,7 @@ public class Wallet extends BaseTaggableObject
}
// When not signing, don't waste addresses.
rekeyTx.addOutput(toMove.valueGathered, sign ? freshReceiveAddress() : currentReceiveAddress());
if (!adjustOutputDownwardsForFee(rekeyTx, toMove, Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, true)) {
if (!adjustOutputDownwardsForFee(rekeyTx, toMove, Transaction.DEFAULT_TX_FEE, true)) {
log.error("Failed to adjust rekey tx for fees.");
return null;
}

10
core/src/test/java/org/bitcoinj/core/WalletTest.java
View File

@ -2794,14 +2794,14 @@ public class WalletTest extends TestWithWallet {
// Create a transaction
SendRequest request = SendRequest.to(OTHER_ADDRESS, CENT);
request.feePerKb = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE;
request.feePerKb = Transaction.DEFAULT_TX_FEE;
wallet.completeTx(request);
assertEquals(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE, request.tx.getFee());
assertEquals(Transaction.DEFAULT_TX_FEE, request.tx.getFee());
}
@Test
public void lowerThanDefaultFee() throws InsufficientMoneyException {
Coin fee = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.divide(10);
Coin fee = Transaction.DEFAULT_TX_FEE.divide(10);
receiveATransactionAmount(wallet, myAddress, Coin.COIN);
SendRequest req = SendRequest.to(myAddress, Coin.CENT);
req.feePerKb = fee;
@ -2820,7 +2820,7 @@ public class WalletTest extends TestWithWallet {
@Test
public void higherThanDefaultFee() throws InsufficientMoneyException {
Coin fee = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.multiply(10);
Coin fee = Transaction.DEFAULT_TX_FEE.multiply(10);
receiveATransactionAmount(wallet, myAddress, Coin.COIN);
SendRequest req = SendRequest.to(myAddress, Coin.CENT);
req.feePerKb = fee;
@ -2832,7 +2832,7 @@ public class WalletTest extends TestWithWallet {
emptyReq.emptyWallet = true;
emptyReq.coinSelector = AllowUnconfirmedCoinSelector.get();
wallet.completeTx(emptyReq);
assertEquals(Coin.valueOf(17100), emptyReq.tx.getFee());
assertEquals(Coin.valueOf(34200), emptyReq.tx.getFee());
wallet.commitTx(emptyReq.tx);
}

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) {