Commit Graph

17214 Commits

Author SHA1 Message Date
Jack Grigg
a0e6d5a185 Adjust gen-manpages.sh for Zcash, use in Debian builds 2017-03-02 11:18:44 -08:00
nomnombtc
076406650c improved gen-manpages.sh, includes bitcoin-tx and strips commit tag, now also runs binaries from build dir by default, added variables for more control 2017-03-02 11:18:43 -08:00
nomnombtc
4a558b2bea regenerated all manpages with commit tag stripped, also add bitcoin-tx 2017-03-02 11:18:42 -08:00
nomnombtc
1b5e712c72 change help string --enable-man to --disable-man 2017-03-02 11:18:40 -08:00
nomnombtc
abfcaefe3d add conditional for --enable-man, default is yes 2017-03-02 11:18:22 -08:00
zkbot
6ee75b3b7b Auto merge of #2014 - arcalinea:test-prioritisetransaction, r=arcalinea
Test prioritisetransaction

After talking with @str4d about #1884 , I wrote a test for prioritisetransaction. It uses small blocks (11kb), and checks whether a transaction makes it into the next block after being prioritized by that node.

Should this be improved with a larger number of txs in the mempool, or by testing over multiple runs?

As for getblocktemplate(), it seems to return the prioritized transaction within the block size set by the node (about 50 txs fit in an 11kb block), but the block "sizelimit" it displays is set at 2 MB in `rpcmining.cpp` line 690:
```
result.push_back(Pair("sizelimit", (int64_t)MAX_BLOCK_SIZE));
```

This was quite confusing, I didn't think the `-blockmaxsize` parameter I was setting was working for awhile.
2017-03-02 06:47:04 +00:00
zkbot
14711a4a43 Auto merge of #2141 - bitcartel:1969_free_rate_limiter, r=daira
Closes #1969. Large shielded transactions using the default fee are no longer treated as "free" transactions
2017-03-02 03:51:14 +00:00
zkbot
c1cff6069f Auto merge of #2130 - str4d:2095-metrics-reindex-msg, r=arcalinea
Do not ask a UI question on metrics screen

Based on bitcoin/bitcoin#8257.

Closes #2095.
2017-03-02 03:08:29 +00:00
zkbot
1a41597af8 Auto merge of #2114 - bitcartel:fix_fr_test_bug_and_new_testnet_addresses, r=daira
Closes #2113. Fixes bug in test and updates testnet fr addresses.

Updating the testnet fr addresses will introduce a consensus change on testnet, so all testnet nodes will be required to upgrade.  See #2113 for more information.
2017-03-02 02:18:33 +00:00
zkbot
312fbd9d0e Auto merge of #1932 - aniemerg:1522-pause-mining-for-joinsplit, r=arcalinea
Pause mining during JoinSplit creation

Closes #1522 .
2017-03-02 01:23:44 +00:00
Allan Niemerg
49c2cecb9f Pause mining during joinsplit creation 2017-03-01 16:54:26 -08:00
zkbot
44ccf1ff20 Auto merge of #2123 - bitcartel:2112_z_getoperationresult_returns_executing_status, r=arcalinea
Closes #2112 where z_getoperationresult could return stale status.

The problem was similar to a check-then-act race condition.  Status object was obtained from an operation, which might be in an 'executing' state.  Instead of checking the state recorded in the status object, the operation was queried again to see if it was in a finished state (failed,success,cancelled) and if yes, the status object was returned to the user.  However, if the operation had changed state in the background, the status object would be stale.
2017-03-02 00:24:26 +00:00
Simon
85c9ecb846 Part of #1969. Update tests to avoid error 'absurdly high fee' from change in min fee calc. 2017-02-28 11:44:51 -08:00
Simon
ebe750a882 Part of #1969. Changing min fee calculation also changes the dust threshold. 2017-02-28 11:44:07 -08:00
Simon
0f724e716d Closes #1969. Default fee now sufficient for large shielded tx.
Sets default min relay tx fee to 100, which is used to initialize
nSatoshisPerK for min fee calculation.  The default z_sendmany
fee of 10000 is now sufficient to cover a tx of size 100000 bytes,
so txs will not be treated as "free" and hit the free rate limiter.
2017-02-28 11:43:04 -08:00
zkbot
6f5d8fbe81 Auto merge of #2126 - bitcartel:checkpoint_mainnet_67500, r=daira
Add checkpoint at block 67500 (mainnet)

Close #2125
2017-02-28 01:01:56 +00:00
zkbot
98ddf87d18 Auto merge of #2128 - bitcartel:checkpoint_testnet_38000, r=daira
Add checkpoint at block 38000 (testnet)

Closes #2127
2017-02-28 00:12:04 +00:00
Jay Graber
8d2dac6e3f Inc num of txs in test mempool 2017-02-27 14:11:09 -08:00
jl777
d8de3e0e98 Revert "Remove prints"
This reverts commit dc64e81e0f.
2017-02-27 21:45:21 +02:00
jl777
dc64e81e0f Remove prints 2017-02-27 21:45:10 +02:00
Daira Hopwood
d76ed723c5 Don't assume sizes of unsigned short and unsigned int in GetSizeOfCompactSize and WriteCompactSize.
Fixes #2137

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
2017-02-27 19:34:23 +00:00
jl777
703fee7dc6 Merge pull request #220 from jl777/dPoW
DPoW
2017-02-27 08:30:34 +02:00
jl777
19045e5489 Merge pull request #219 from jl777/beta
Beta
2017-02-27 08:29:32 +02:00
jl777
cf8b7395f7 Merge pull request #217 from jl777/dev
Dev
2017-02-26 16:14:28 +02:00
jl777
cfd94f88ba Test 2017-02-26 16:10:10 +02:00
jl777
dd42fd9b20 Test 2017-02-26 15:47:26 +02:00
jl777
38671f757e Test 2017-02-26 15:21:03 +02:00
jl777
5c81c5719f Test 2017-02-26 15:16:30 +02:00
jl777
3ddd280040 Test 2017-02-26 14:48:10 +02:00
jl777
eaf1e6145f Test 2017-02-26 14:46:12 +02:00
jl777
017d82119c Test 2017-02-26 14:34:39 +02:00
jl777
08d0b73ce3 Test 2017-02-26 14:26:00 +02:00
jl777
a8ffc9b98e Test 2017-02-26 14:17:43 +02:00
jl777
41b528bb97 Test 2017-02-26 14:10:27 +02:00
jl777
f8e7086088 Test 2017-02-26 14:03:36 +02:00
jl777
81a991e482 Test 2017-02-26 13:58:21 +02:00
jl777
ebd3b25254 Test 2017-02-26 13:53:45 +02:00
jl777
9e44127296 Test 2017-02-26 13:42:41 +02:00
jl777
649a9ebfed Test 2017-02-26 13:31:01 +02:00
jl777
68cfaa1356 Test 2017-02-26 12:56:04 +02:00
jl777
1dc7baaae3 Test 2017-02-26 12:54:19 +02:00
jl777
9aefc81b62 Test 2017-02-26 12:26:10 +02:00
jl777
846304163c Test 2017-02-26 12:13:58 +02:00
jl777
a822a07057 Test 2017-02-26 11:54:27 +02:00
jl777
fe348242d7 Test 2017-02-26 11:43:06 +02:00
jl777
4f83a8f7f2 Test 2017-02-26 11:42:10 +02:00
jl777
b8cceac522 Test 2017-02-26 11:25:44 +02:00
jl777
430d3c7766 Test 2017-02-26 10:33:40 +02:00
jl777
5254630aec Test 2017-02-26 10:29:23 +02:00
jl777
e22dcc1e45 Test 2017-02-26 10:17:48 +02:00