UdjinM6
6af7a58d92
Merge remote-tracking branch 'bitcoin/0.12' into mergebtc12, fix/dashify
...
NOTE: .travis.yml was mostly preserved, probably needs additional attention
2016-08-26 04:09:20 +03:00
UdjinM6
c04e14fa61
Merge #958 : test: fix determinism of address index test
...
5765e5f cherry-pick 05cf410839dd48882768412d2637b53e6569a677
2016-08-23 05:27:52 -06:00
Tim Flynn
9a8f2e4507
V0.12.1.x governance bugfix 1 ( #952 )
...
* Fix governance message handling bug
* Added a 2 second delay to the addressindex blockchain reorganization test
2016-08-20 20:51:01 +04:00
Tim Flynn
123aa04d5b
Merge #950 : V0.12.1.x governance pr 2
...
13316a4 Return true from IsBlockValueValid when masternode data is not synced
- This restores behavior very close to that in 12.0
- Needed to prevent the forking problem currently being seen on
testnet between online and offline nodes
- This is expected to be a temporary fix while we develop a
long-term solution for this problem
427086e Restore miner payments for superblocks
794b90d Added IsSynced field to JSON output of mnsync status RPC command
- This is needed to allow fixing RPC tests so that they wait until
the nodes are fully synced before performing tests
a9ddf6f Wait for nodes to sync masternode data during p2p-fullblocktest
2016-08-19 05:53:49 -06:00
Evan Duffield
338b0ce934
Merge pull request #914 from UdjinM6/dashBitcore1
...
Merge Bitpay's version of Bitcoin Core (additional indexes)
2016-08-08 12:53:34 -07:00
UdjinM6
3e0eee4c84
Merge #921 : Fix project name Dash -> Dash Core
...
ef1612a Fix project name Dash -> Dash Core
2016-07-29 07:30:19 +02:00
UdjinM6
1e1a02be36
fix tests
2016-07-19 11:15:54 +03:00
UdjinM6
48d0edcbdf
Merge remote-tracking branch 'bitpay/0.12.1-bitcore' into dashBitcore1
...
Resolved Conflicts:
.travis.yml (ignoring changes, leaving dash version)
src/Makefile.am
src/main.cpp
src/main.h
src/rpcclient.cpp
src/rpcserver.cpp
src/script/script.cpp
src/script/script.h
2016-07-19 08:49:28 +03:00
BtcDrak
c4e5688230
Rename NOP3 to CHECSEQUENCEVERIFY in rpc tests
2016-07-08 11:44:16 +01:00
BtcDrak
ac5577b512
Rename OP_NOP3 to OP_CHECKSEQUENCEVERIFY
2016-07-08 11:44:16 +01:00
Holger Schinzel
f4e4dd65e7
Tag 0.12.1 final
...
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEbBAABCgAGBQJXD/i3AAoJEHSBCwEjRsmmOHsH+L5eRpiPeLhrDYyBFbp9RFKU
TztyoeKAM4llEPmk6vAawgSL8HNY4va6lbY84sDfvCdLJqCxVR7MyiuQ4AQPXG4R
Ke5DJ/G/K4ngyqruCBsSh2RJdVDrbE3zCmjN5gxPxrNKpi+mXs//A6gjvfxn4U1F
WZepN3FzNFcqFG/ndKxptMYZoIuiK9JIhK7V/ksFKRPlUhipa1jh5sIWvCeFjiLT
Wt8wGlHPHDFsPJW1o7EWMTHRhNCVqYhMDU7GT6FixIJFRGANIGlwfIUuqqUt0sil
7YWIwD/+ai3dfeODazauqJAOEBXjoWCkuXn9IN/VhtvHOFR6AZO2aljS9ks6Cw==
=6vRi
-----END PGP SIGNATURE-----
Merge bitcoin tag 'v0.12.1' into dash v0.12.1.x
Merging Bitcoin 0.12.1 into Dash 0.12.1.x
2016-07-04 11:20:16 +02:00
Braydon Fuller
d28f886684
Revert "rpc: add input confirmations to getrawtransaction"
2016-06-15 20:22:35 -04:00
Chris Kleeschulte
645ae33bec
Merge pull request #20 from braydonf/0.12.1-bitcore-inputconfs
...
rpc: add input confirmations to getrawtransaction
2016-06-15 13:36:31 -04:00
Braydon Fuller
c01f78375e
mempool: same address and index for an input and output bug
...
fixes a bug that would happen when an output would match an input with
the same address and index, and would lead to the outputs not appearing
in results.
2016-06-13 11:23:30 -04:00
Braydon Fuller
4dcf3e821c
mempool: fix bug with mempool address index iteration
...
fixes a minor bug where iteration would not end when there are matching
hashes for a p2sh and p2pkh address, and would return results for
both addresses
2016-06-13 11:23:30 -04:00
Braydon Fuller
809a8abff6
tests: expanded address index mempool testing
2016-06-13 11:23:30 -04:00
Braydon Fuller
fea930aa8c
rpc: add input confirmations to getrawtransaction
2016-06-13 11:15:34 -04:00
MarcoFalke
dc38a53d56
[qa] Move create_tx() to util.py
...
(cherry picked from commit fa8cd46f39778925eaf2caf812cccd9fb8503368)
2016-06-10 00:33:26 +02:00
MarcoFalke
c0fe8b5c7d
[qa] smartfees: Properly use ordered dict
...
Github-Pull: #7980
Rebased-From: fa17f93fbd2889c020849b941a94c5bd8a619a3c 43bbcd075355630544a530f3cc52014edb3787b2
2016-06-10 00:25:22 +02:00
MarcoFalke
493b89e959
[qa] test_framework: Properly print exceptions and assert empty dict
...
Github-Pull: #7951
Rebased-From: 5555528b47b7d33a5b963c076e6bb09ee25931b5 fada064f67302502f6b51d9d22927381c2707cbb
2016-06-10 00:22:41 +02:00
Suhas Daftuar
7a8348994b
Tests: Fix deserialization of reject messages
...
Github-Pull: #7912
Rebased-From: 807fa47a1e5c9f072d7dbf549bf17f66c47dbf46
2016-06-10 00:20:33 +02:00
Wladimir J. van der Laan
d5a9de352c
tests: Check Content-Type header returned from RPC server
...
Github-Pull: #7833
Rebased-From: 5078ca45438e8f8d8e7cd937659887fb8ec70038
2016-06-10 00:03:57 +02:00
MarcoFalke
ed2f0e3ac1
[qa] maxblocksinflight: Actually enable test
...
Github-Pull: #7803
Rebased-From: fac724c78f281168ea174c36cada4f95112aea6d
2016-06-10 00:01:51 +02:00
MarcoFalke
3036282c7a
[qa] httpbasics: Actually test second connection
...
Github-Pull: #7802
Rebased-From: fa24456d0c4cd0f6571bcf3d8f1f51d8d4242a3e
2016-06-10 00:01:08 +02:00
Wladimir J. van der Laan
afbc000b0b
test_framework: python3.4 authproxy compat
...
Github-Pull: #7751
Rebased-From: d7b80b54fbb73acc92ddee84697ac4cc10d4d336 e7e48ba66cb597621a30945da9ca7fc36a6dc84c
2016-06-09 23:55:27 +02:00
Wladimir J. van der Laan
80b6bfaeaa
test_framework: detect failure of bitcoind startup
...
Github-Pull: #7744
Rebased-From: 018b60c5ea703ed12edcde034a185f79e77e5576
2016-06-09 23:51:53 +02:00
Alex Morcos
4ffd309b25
Create SingleNodeConnCB class for RPC tests
...
(cherry picked from commit 5fa66e4682a59047d2ed2934760ccc052fd85f50)
2016-06-09 23:44:55 +02:00
Braydon Fuller
55fa4798eb
main: spentindex for the mempool
2016-06-02 12:15:59 -04:00
Braydon Fuller
4c7dc871d1
rpc: add input value and address to getrawtransaction if spentindex enabled
2016-06-02 12:15:38 -04:00
Braydon Fuller
87dfd13694
rpc: include satoshis in verbose raw transaction
2016-06-02 12:15:38 -04:00
Braydon Fuller
1c022b9fc2
rpc: add blockindex to getaddressdeltas method
...
for the purposes of secondary sorting by block order
2016-06-02 12:15:37 -04:00
Wladimir J. van der Laan
9c5b709c6f
tests: Make proxy_test work on travis servers without IPv6
...
Github-Pull: #7489
Rebased-From: 7539f1aae3b41279dc5d49e09f448a78a071e114
Cherry-picked-From: 9ca957bcd4
2016-06-02 12:15:37 -04:00
Braydon Fuller
98f8fdddc8
rpc: optional "start" and "end" params for getaddressdeltas
2016-06-02 12:15:37 -04:00
Braydon Fuller
8391ff0b0a
rpc: include base58check encoded address in results
2016-06-02 12:15:37 -04:00
Braydon Fuller
28f9ae7853
test: test for getaddressmempool prevhash and prevout values
2016-06-02 12:15:37 -04:00
Braydon Fuller
94ea69a4d5
rpc: fix issue with querying txids by block heights
2016-06-02 12:15:37 -04:00
Braydon Fuller
96d8307b55
rpc: query txids for addresses within block height range
2016-06-02 12:15:37 -04:00
Braydon Fuller
abe40712ce
rpc: include height in spentinfo
2016-06-02 12:15:37 -04:00
Braydon Fuller
b752fbe09e
rpc: include spent info if spentindex enabled with getrawtransaction verbose
2016-06-02 12:15:37 -04:00
Braydon Fuller
e3d9207e5a
main: add spentindex option
2016-06-02 12:15:37 -04:00
Braydon Fuller
b66eff47cf
main: mempool address index
2016-06-02 12:15:14 -04:00
Braydon Fuller
1bd65a5c4b
main: sort address index utxos by height
2016-06-02 12:15:14 -04:00
Braydon Fuller
d0483c9aa0
main: remove spent address utxo indexes
2016-06-02 12:15:14 -04:00
Braydon Fuller
24894cb748
main: update unspent address index during reorgs
2016-06-02 12:15:14 -04:00
Braydon Fuller
0b42ba227a
main: index unspent outputs by address
2016-06-02 12:15:14 -04:00
Braydon Fuller
186e11fde7
main: update address index during reorgs
2016-06-02 12:15:14 -04:00
Braydon Fuller
cad092aebb
main: get address deltas between range of block heights
2016-06-02 12:15:14 -04:00
Braydon Fuller
206882cd4b
main: fixed bug with overlapping address index keys
...
There was a bug where the spending address index could have the same key
as the receiving address index if the input and output indexes matched. This lead
to the output always overwriting the input index leading to incorrect balances
with missing spent amounts. This patch separates the two so that they have unique
keys so balances will be correctly calculated.
2016-06-02 12:15:14 -04:00
Braydon Fuller
f76c2585f0
test: added to for balance after spending
2016-06-02 12:15:13 -04:00
Braydon Fuller
935ca8f832
main: add block timestamp index
2016-06-02 12:15:13 -04:00