Commit Graph

16678 Commits

Author SHA1 Message Date
Jack Grigg
bec25c91cb Revert "Closes #1680, temporary fix for rpc deadlock inherited from upstream."
This reverts commit f4404d7b5b.
2017-03-24 09:03:59 +13:00
jl777
a13fb56e55 Test 2017-03-23 21:40:31 +02:00
jl777
ad8796cf7c Test 2017-03-23 21:35:19 +02:00
jl777
f59302b668 Merge pull request #360 from jl777/dev
Check against pblock->nTime
2017-03-23 20:54:36 +02:00
jl777
628220bc5d Check against pblock->nTime 2017-03-23 20:54:07 +02:00
jl777
741b884ec6 Merge pull request #359 from jl777/dev
Dev
2017-03-23 20:48:48 +02:00
jl777
e40b78e93c Crash fix 2017-03-23 20:47:47 +02:00
jl777
e4f53bd20a Test 2017-03-23 20:23:25 +02:00
zkbot
7d9bf65501 Auto merge of #2168 - str4d:2164-getblock-anchor, r=daira
Add anchor to output of getblock

Closes #2164.
2017-03-23 18:21:10 +00:00
jl777
110696f9e1 Test 2017-03-23 20:09:55 +02:00
jl777
88e117ada6 Test 2017-03-23 20:09:07 +02:00
jl777
a2f017de08 Test 2017-03-23 20:05:02 +02:00
jl777
9b7233cf17 Test 2017-03-23 19:58:23 +02:00
jl777
944bf4b091 Test 2017-03-23 19:57:18 +02:00
jl777
0a0ec219d7 Test 2017-03-23 19:44:40 +02:00
jl777
da7775433d Test 2017-03-23 19:40:37 +02:00
jl777
6460b5b19c Test 2017-03-23 19:38:59 +02:00
zkbot
00e59e5935 Auto merge of #2175 - str4d:2074-txn-mempool, r=bitcartel
Bitcoin 0.12 mempool memory usage PRs

Cherry-picked from the following upstream PRs:

- bitcoin/bitcoin#6410
- bitcoin/bitcoin#6453
- bitcoin/bitcoin#6013 (excludes changes to docs we deleted)

Part of #2074.
2017-03-23 17:29:35 +00:00
jl777
55d65e32ca Test 2017-03-23 19:26:19 +02:00
jl777
25d900ccd5 Merge pull request #358 from jl777/dev
Test
2017-03-23 18:37:56 +02:00
jl777
2ef1dfb6f1 Test 2017-03-23 18:35:11 +02:00
jl777
bf49cc6524 Merge pull request #357 from jl777/dev
Dev
2017-03-23 15:44:19 +02:00
jl777
89a2e5273c Test 2017-03-23 15:37:34 +02:00
jl777
9e8b81f637 Remove print 2017-03-23 14:20:16 +02:00
ca333
9fe0c0c126 Merge pull request #6 from jl777/master
master update
2017-03-23 11:34:53 +01:00
Jack Grigg
dec148f498 Fix prioritisetransaction RPC test
Part of #1884.
2017-03-23 18:57:46 +13:00
jl777
7674e37ff8 Merge pull request #356 from jl777/dPoW
DPoW
2017-03-23 07:29:18 +02:00
jl777
58d2e02b85 Merge pull request #355 from jl777/beta
Beta
2017-03-23 07:28:42 +02:00
jl777
cf3fe7e69e Merge pull request #354 from jl777/dev
Post-fork with mining
2017-03-23 07:26:26 +02:00
jl777
3fb7710470 Post-fork with mining 2017-03-23 07:25:53 +02:00
jl777
bee549f5a6 Merge pull request #353 from jl777/dev
Dev
2017-03-23 06:54:04 +02:00
jl777
253b7bc01d Test 2017-03-23 06:46:30 +02:00
jl777
3915943450 Test 2017-03-23 06:37:28 +02:00
jl777
7a57bbb446 Test 2017-03-23 06:28:05 +02:00
jl777
d5ecb91b00 Test 2017-03-23 06:21:21 +02:00
jl777
2d14730eeb Test 2017-03-23 06:17:53 +02:00
jl777
67cb4250ed Test 2017-03-23 05:53:28 +02:00
jl777
7ef5540bca Test 2017-03-23 05:47:19 +02:00
jl777
e9c0c24d5b Merge pull request #352 from jl777/dev
Test
2017-03-23 05:33:01 +02:00
jl777
fc901e2f4a Test 2017-03-23 05:31:12 +02:00
Jack Grigg
b7e5b7d5ee Simplify z_importkey by making rescan a string
Transparently handles older boolean values as well.
2017-03-23 15:57:11 +13:00
jl777
aef232bc92 Merge pull request #351 from jl777/dev
Dev
2017-03-23 04:45:36 +02:00
jl777
b11963b5b0 Test 2017-03-23 04:39:44 +02:00
jl777
43aafea7c9 Test 2017-03-23 04:32:03 +02:00
jl777
eca6ba0d9f Test 2017-03-23 04:29:57 +02:00
jl777
7f32cee639 Test 2017-03-23 04:23:54 +02:00
jl777
9f07c80c9f Test 2017-03-23 04:22:21 +02:00
Jack Grigg
493d8d81fb Expand on reasons for mining being paused 2017-03-23 15:16:04 +13:00
jl777
807949f42f Test 2017-03-23 04:05:11 +02:00
jl777
92266e9959 Test 2017-03-23 03:35:44 +02:00