Gregory Sanders
2ed093efca
Merge #264 : Re-activate transaction replacement functional test
...
5af4d7692b5911
2017-09-22 10:58:13 -04:00
Gregory Sanders
e91a507f4c
Merge #267 : don't assert false when checking commitment types
...
224f7b8
2017-09-22 10:31:53 -04:00
Gregory Sanders
885a52294a
Merge #269 : include the CTxWitness structure in memory usage accounting
...
fb37954
2017-09-22 09:56:37 -04:00
Arvid Norberg
fb37954969
include the CTxWitness structure in memory usage accounting.
2017-09-21 13:25:17 -07:00
Gregory Sanders
224f7b83be
remove asserts from verifyamounts, test commitment types
2017-09-21 10:14:34 -04:00
Jorge Timón
808300b66e
Merge #265 : Remove chainparamsseeds.h
...
52dcf9b
2017-09-21 13:34:27 +02:00
Jorge Timón
52dcf9bd88
Remove chainparamsseeds.h
2017-09-21 06:59:14 +02:00
Gregory Sanders
37ae000daf
Merge #256 : work towards bringing mininode.py up to date with the main node
...
3c21411
2017-09-20 21:54:36 -04:00
Gregory Sanders
5af4d76f18
re-activate transaction replacement functional test
2017-09-20 21:50:50 -04:00
Gregory Sanders
92b5911234
mininode: CTxOut has default asset bitcoin, sets explicit value via int
2017-09-20 15:37:30 -04:00
Arvid Norberg
3c21411c67
work towards bringing mininode.py up to date with the main node and towards re-enabling rpc tests
2017-09-19 12:19:12 +02:00
Gregory Sanders
8a61c33ed0
Merge #257 : Speed up peg-in validation
...
25c8a4942b6330
2017-09-12 20:45:23 -04:00
Jonas Nick
25c8a49b32
Remove unnecessary genesis hash check in IsConfirmedBitcoinBlock
2017-09-11 18:09:23 +02:00
Jonas Nick
42b6330e14
Use getblockheader instead of getblock when checking if block is in the main chain
2017-09-11 17:14:16 +02:00
Gregory Sanders
1e1a2e580e
Merge #255 : fix incorrect bounds check to wit.vtxinwit access in ContextualCheckBlock
...
feb64d9aa2e0f09ecd8a18ef
2017-09-11 08:48:59 -04:00
Arvid Norberg
feb64d9ca6
cherry-pick of aa2e0f09ec from bitcoin repository
2017-09-08 20:31:13 +02:00
Arvid Norberg
d8a18ef34f
fix incorrect bounds check to wit.vtxinwit access in ContextualCheckBlock
2017-09-08 00:02:24 +02:00
Jorge Timón
15825adf09
Merge #253 : Update trusted-git-root
...
c864a8a
2017-08-29 22:49:01 +02:00
Jorge Timón
c864a8a40a
Update trusted-git-root
2017-08-29 01:50:49 +02:00
Gregory Sanders
49d58e3ade
Merge pull request #244 from instagibbs/parentchaindepth
...
Implement hidden arg to set parent confirmation depth requirements
2017-08-28 18:38:28 -04:00
Gregory Sanders
8cd7757f13
add test for peginconfirmationdepth
2017-08-28 11:24:29 -04:00
Gregory Sanders
b2cc54836c
implement hidden arg to set parent confirmation depth requirements
2017-08-28 11:24:28 -04:00
Gregory Sanders
2e44516710
Merge #247 : add gsanders(instagibbs) and jtimon to git signing list
...
8f8878d
2017-08-25 21:02:20 -04:00
Gregory Sanders
8f8878dc87
add gsanders(instagibbs) and jtimon to git signing list
2017-08-25 20:00:56 -04:00
Gregory Sanders
4ff073fa50
Merge #238 : Replace static BITCOINID with asset-derivation style generation
...
b76b0b28c1ba39ae1f058000ab24
2017-08-25 08:55:12 -04:00
Gregory Sanders
b76b0b2270
Change network settings commitment to sha2, include in asset type def
2017-08-24 15:28:44 -04:00
Gregory Sanders
8c1ba39a02
Replace static BITCOINID with generated pegged_asset using standard issuance derivation
2017-08-24 14:30:35 -04:00
Gregory Sanders
ae1f058433
Only use chainparams to access BITCOINID as pegged_asset
2017-08-24 14:30:35 -04:00
Gregory Sanders
000ab241f7
Add pegged_asset field to consensus params
2017-08-24 14:30:35 -04:00
Gregory Sanders
8df0f0e8be
Merge pull request #243 from instagibbs/fixtravis2
...
Fix Travis, part 2
2017-08-24 13:23:19 -04:00
Gregory Sanders
e75fe981e4
listtransactions.py mature coinbase
2017-08-24 12:28:45 -04:00
Gregory Sanders
b284e6482b
ifdef wallet stuff in blind_tests
2017-08-24 11:40:55 -04:00
Gregory Sanders
4a7fb2fb12
disable jni
2017-08-24 11:40:55 -04:00
Jorge Timón
cad3e3cd07
[FIXME] Travis: Don't build Mac or no-gui
2017-08-24 11:40:55 -04:00
Jorge Timón
e7d3408232
remove some warnings if wallet not enabled
2017-08-24 10:59:09 -04:00
Gregory Sanders
134524409e
add test_impl to makefile
2017-08-24 10:59:09 -04:00
Gregory Sanders
2d88f075ba
only include wallet if defined
2017-08-24 10:59:06 -04:00
Gregory Sanders
00a28a64d9
fix travis building
2017-08-24 10:59:06 -04:00
Gregory Sanders
820caaba28
Merge pull request #246 from tdudz/rpcargfix
...
added missing label for "output_assets" argument to createrawtransaction rpc
2017-08-24 08:07:36 -04:00
Gregory Sanders
2ca0460bb8
Merge pull request #245 from tdudz/isfeefix
...
remove unnecessary code in IsFee() method
2017-08-24 08:05:51 -04:00
Tom Dudzik
26c59bff65
added missing label for args to createrawtransaction rpc
2017-08-24 12:16:34 +02:00
Tom Dudzik
e0df838f7f
remove unnecessary code in IsFee() method
2017-08-24 11:17:56 +02:00
Gregory Sanders
d57e5e5622
Merge pull request #239 from instagibbs/assettutgett
...
python tutorial: gettransaction needs optional include_watchonly arg
2017-08-16 17:15:30 -04:00
Gregory Sanders
d9207fc4f4
Merge pull request #240 from tdudz/settoassetfix
...
fix SetToAsset bug where vchCommitment wasn't cleared before writing
2017-08-16 17:13:46 -04:00
tdudz
15f31cfcac
fix SetToAsset() bug where vchCommitment wasn't cleared before writing
2017-08-11 15:12:34 -07:00
Gregory Sanders
1a4e2b4082
python tutorial: gettransaction needs optional include_watchonly arg
2017-08-10 13:54:37 -04:00
Gregory Sanders
4985bc5092
Merge pull request #235 from kallewoof/getnewblockhex-coinbase
...
getnewblockhex would use regtest coinbase hard coded, instead of fetc…
2017-08-10 07:38:43 -04:00
Karl-Johan Alm
a3035b3892
getnewblockhex would use regtest coinbase hard coded, instead of fetching CoinbaseDestination from Params.
2017-08-10 13:06:25 +09:00
Gregory Sanders
b947fa5788
Merge pull request #236 from instagibbs/fixqtreserve
...
fixup! Don't use pointers for CReserveKeys
2017-08-09 14:31:02 -04:00
Gregory Sanders
4e4fe7f602
fixup! Don't use pointers for CReserveKeys
2017-08-09 14:29:19 -04:00
