Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-08-01 12:31:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transaction: Update DEFAULT_TX_FEE. Fees have risen considerably.

Browse Source
This commit is contained in:
Andreas Schildbach
2017-02-28 23:58:57 +01:00
parent 5d4f0274e1
commit 2c546c357e
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -101,9 +101,9 @@ public class Transaction extends ChildMessage {
/** /**
* If using this feePerKb, transactions will get confirmed within the next couple of blocks. * 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. * This should be adjusted from time to time. Last adjustment: February 2017.
*/ */
public static final Coin DEFAULT_TX_FEE = Coin.valueOf(50000); // 0.5 mBTC public static final Coin DEFAULT_TX_FEE = Coin.valueOf(100000); // 1 mBTC
/** /**
* Any standard (ie pay-to-address) output smaller than this value (in satoshis) will most likely be rejected by the network. * Any standard (ie pay-to-address) output smaller than this value (in satoshis) will most likely be rejected by the network.

24
core/src/test/java/org/bitcoinj/wallet/WalletTest.java
View File

@@ -2441,7 +2441,7 @@ public class WalletTest extends TestWithWallet {
request15.feePerKb = Transaction.DEFAULT_TX_FEE; request15.feePerKb = Transaction.DEFAULT_TX_FEE;
request15.ensureMinRequiredFee = true; request15.ensureMinRequiredFee = true;
wallet.completeTx(request15); wallet.completeTx(request15);
assertEquals(Coin.valueOf(60650), request15.tx.getFee()); assertEquals(Coin.valueOf(121300), request15.tx.getFee());
Transaction spend15 = request15.tx; Transaction spend15 = request15.tx;
// If a transaction is over 1kb, 2 satoshis should be added. // If a transaction is over 1kb, 2 satoshis should be added.
assertEquals(31, spend15.getOutputs().size()); assertEquals(31, spend15.getOutputs().size());
@@ -2473,7 +2473,7 @@ public class WalletTest extends TestWithWallet {
request17.feePerKb = Transaction.DEFAULT_TX_FEE; request17.feePerKb = Transaction.DEFAULT_TX_FEE;
request17.ensureMinRequiredFee = true; request17.ensureMinRequiredFee = true;
wallet.completeTx(request17); wallet.completeTx(request17);
assertEquals(Coin.valueOf(49950), request17.tx.getFee()); assertEquals(Coin.valueOf(99900), request17.tx.getFee());
assertEquals(1, request17.tx.getInputs().size()); assertEquals(1, request17.tx.getInputs().size());
// Calculate its max length to make sure it is indeed 999 // Calculate its max length to make sure it is indeed 999
int theoreticalMaxLength17 = request17.tx.unsafeBitcoinSerialize().length + myKey.getPubKey().length + 75; int theoreticalMaxLength17 = request17.tx.unsafeBitcoinSerialize().length + myKey.getPubKey().length + 75;
@@ -2500,7 +2500,7 @@ public class WalletTest extends TestWithWallet {
request18.feePerKb = Transaction.DEFAULT_TX_FEE; request18.feePerKb = Transaction.DEFAULT_TX_FEE;
request18.ensureMinRequiredFee = true; request18.ensureMinRequiredFee = true;
wallet.completeTx(request18); wallet.completeTx(request18);
assertEquals(Coin.valueOf(50050), request18.tx.getFee()); assertEquals(Coin.valueOf(100100), request18.tx.getFee());
assertEquals(1, request18.tx.getInputs().size()); assertEquals(1, request18.tx.getInputs().size());
// Calculate its max length to make sure it is indeed 1001 // Calculate its max length to make sure it is indeed 1001
Transaction spend18 = request18.tx; Transaction spend18 = request18.tx;
@@ -2534,7 +2534,7 @@ public class WalletTest extends TestWithWallet {
request19.feePerKb = Transaction.DEFAULT_TX_FEE; request19.feePerKb = Transaction.DEFAULT_TX_FEE;
request19.shuffleOutputs = false; request19.shuffleOutputs = false;
wallet.completeTx(request19); wallet.completeTx(request19);
assertEquals(Coin.valueOf(187100), request19.tx.getFee()); assertEquals(Coin.valueOf(374200), request19.tx.getFee());
assertEquals(2, request19.tx.getInputs().size()); assertEquals(2, request19.tx.getInputs().size());
assertEquals(COIN, request19.tx.getInput(0).getValue()); assertEquals(COIN, request19.tx.getInput(0).getValue());
assertEquals(CENT, request19.tx.getInput(1).getValue()); assertEquals(CENT, request19.tx.getInput(1).getValue());
@@ -2555,7 +2555,7 @@ public class WalletTest extends TestWithWallet {
request20.feePerKb = Transaction.DEFAULT_TX_FEE; request20.feePerKb = Transaction.DEFAULT_TX_FEE;
wallet.completeTx(request20); wallet.completeTx(request20);
// 4kb tx. // 4kb tx.
assertEquals(Coin.valueOf(187100), request20.tx.getFee()); assertEquals(Coin.valueOf(374200), request20.tx.getFee());
assertEquals(2, request20.tx.getInputs().size()); assertEquals(2, request20.tx.getInputs().size());
assertEquals(COIN, request20.tx.getInput(0).getValue()); assertEquals(COIN, request20.tx.getInput(0).getValue());
assertEquals(CENT, request20.tx.getInput(1).getValue()); assertEquals(CENT, request20.tx.getInput(1).getValue());
@@ -2591,7 +2591,7 @@ public class WalletTest extends TestWithWallet {
request25.feePerKb = Transaction.DEFAULT_TX_FEE; request25.feePerKb = Transaction.DEFAULT_TX_FEE;
request25.shuffleOutputs = false; request25.shuffleOutputs = false;
wallet.completeTx(request25); wallet.completeTx(request25);
assertEquals(Coin.valueOf(139500), request25.tx.getFee()); assertEquals(Coin.valueOf(279000), request25.tx.getFee());
assertEquals(2, request25.tx.getInputs().size()); assertEquals(2, request25.tx.getInputs().size());
assertEquals(COIN, request25.tx.getInput(0).getValue()); assertEquals(COIN, request25.tx.getInput(0).getValue());
assertEquals(CENT, request25.tx.getInput(1).getValue()); assertEquals(CENT, request25.tx.getInput(1).getValue());
@@ -2742,7 +2742,7 @@ public class WalletTest extends TestWithWallet {
SendRequest request = SendRequest.to(OTHER_ADDRESS, CENT); SendRequest request = SendRequest.to(OTHER_ADDRESS, CENT);
request.feePerKb = Transaction.DEFAULT_TX_FEE; request.feePerKb = Transaction.DEFAULT_TX_FEE;
wallet.completeTx(request); wallet.completeTx(request);
assertEquals(Coin.valueOf(11350), request.tx.getFee()); assertEquals(Coin.valueOf(22700), request.tx.getFee());
} }
@Test @Test
@@ -2753,7 +2753,7 @@ public class WalletTest extends TestWithWallet {
SendRequest req = SendRequest.to(myAddress, Coin.CENT); SendRequest req = SendRequest.to(myAddress, Coin.CENT);
req.feePerKb = fee; req.feePerKb = fee;
wallet.completeTx(req); wallet.completeTx(req);
assertEquals(Coin.valueOf(11350).divide(feeFactor), req.tx.getFee()); assertEquals(Coin.valueOf(22700).divide(feeFactor), req.tx.getFee());
wallet.commitTx(req.tx); wallet.commitTx(req.tx);
SendRequest emptyReq = SendRequest.emptyWallet(myAddress); SendRequest emptyReq = SendRequest.emptyWallet(myAddress);
emptyReq.feePerKb = fee; emptyReq.feePerKb = fee;
@@ -2773,14 +2773,14 @@ public class WalletTest extends TestWithWallet {
SendRequest req = SendRequest.to(myAddress, Coin.CENT); SendRequest req = SendRequest.to(myAddress, Coin.CENT);
req.feePerKb = fee; req.feePerKb = fee;
wallet.completeTx(req); wallet.completeTx(req);
assertEquals(Coin.valueOf(11350).multiply(feeFactor), req.tx.getFee()); assertEquals(Coin.valueOf(22700).multiply(feeFactor), req.tx.getFee());
wallet.commitTx(req.tx); wallet.commitTx(req.tx);
SendRequest emptyReq = SendRequest.emptyWallet(myAddress); SendRequest emptyReq = SendRequest.emptyWallet(myAddress);
emptyReq.feePerKb = fee; emptyReq.feePerKb = fee;
emptyReq.emptyWallet = true; emptyReq.emptyWallet = true;
emptyReq.coinSelector = AllowUnconfirmedCoinSelector.get(); emptyReq.coinSelector = AllowUnconfirmedCoinSelector.get();
wallet.completeTx(emptyReq); wallet.completeTx(emptyReq);
assertEquals(Coin.valueOf(171000), emptyReq.tx.getFee()); assertEquals(Coin.valueOf(342000), emptyReq.tx.getFee());
wallet.commitTx(emptyReq.tx); wallet.commitTx(emptyReq.tx);
} }
@@ -2979,7 +2979,7 @@ public class WalletTest extends TestWithWallet {
Transaction tx = broadcaster.waitForTransactionAndSucceed(); Transaction tx = broadcaster.waitForTransactionAndSucceed();
final Coin THREE_CENTS = CENT.add(CENT).add(CENT); final Coin THREE_CENTS = CENT.add(CENT).add(CENT);
assertEquals(Coin.valueOf(24550), tx.getFee()); assertEquals(Coin.valueOf(49100), tx.getFee());
assertEquals(THREE_CENTS, tx.getValueSentFromMe(wallet)); assertEquals(THREE_CENTS, tx.getValueSentFromMe(wallet));
assertEquals(THREE_CENTS.subtract(tx.getFee()), tx.getValueSentToMe(wallet)); assertEquals(THREE_CENTS.subtract(tx.getFee()), tx.getValueSentToMe(wallet));
// TX sends to one of our addresses (for now we ignore married wallets). // TX sends to one of our addresses (for now we ignore married wallets).
@@ -3002,7 +3002,7 @@ public class WalletTest extends TestWithWallet {
tx = broadcaster.waitForTransactionAndSucceed(); tx = broadcaster.waitForTransactionAndSucceed();
assertNotNull(wallet.findKeyFromPubHash(tx.getOutput(0).getScriptPubKey().getPubKeyHash())); assertNotNull(wallet.findKeyFromPubHash(tx.getOutput(0).getScriptPubKey().getPubKeyHash()));
log.info("Unexpected thing: {}", tx); log.info("Unexpected thing: {}", tx);
assertEquals(Coin.valueOf(9650), tx.getFee()); assertEquals(Coin.valueOf(19300), tx.getFee());
assertEquals(1, tx.getInputs().size()); assertEquals(1, tx.getInputs().size());
assertEquals(1, tx.getOutputs().size()); assertEquals(1, tx.getOutputs().size());
assertEquals(CENT, tx.getValueSentFromMe(wallet)); assertEquals(CENT, tx.getValueSentFromMe(wallet));