Commit graph

13676 commits

Author SHA1 Message Date
Gregory Sanders
257602efc1
Merge #322: add better reject reason for immature peg-in, with test
20dee2e slight peg-test language fixup (Gregory Sanders)
248eb91 add better reject reason for immature peg-in, with test (Gregory Sanders)
2018-03-27 12:31:29 -04:00
Gregory Sanders
20dee2e4a4 slight peg-test language fixup 2018-03-27 10:15:58 -04:00
Jorge Timón
aa449da559
Merge #320: fix segfault when block from disk has pegin failure
2d1a092 fix segfault when block from disk has pegin failure (Gregory Sanders)
2018-03-27 07:16:24 +02:00
Gregory Sanders
248eb9157b add better reject reason for immature peg-in, with test 2018-03-26 18:11:38 -04:00
Gregory Sanders
2d1a092ff2 fix segfault when block from disk has pegin failure 2018-03-26 12:18:57 -04:00
Gregory Sanders
e93a6fb502
Merge #316: fix testproposedblock standardness issues
fa34426 remove witnessEnabled standardness logic (Gregory Sanders)
b8ba4eb don't enforce standardness on coinbase (Gregory Sanders)
2018-03-15 12:33:31 -04:00
Gregory Sanders
77ed5c04d5
Merge #317: Tutorial: Use sendtomainchain
d6dac4a Tutorial: Use sendtomainchain (Jorge Timón)
2018-03-14 11:53:30 -04:00
Jorge Timón
d6dac4a47a
Tutorial: Use sendtomainchain 2018-03-14 00:18:59 +01:00
Gregory Sanders
fa34426ab1 remove witnessEnabled standardness logic 2018-03-13 12:20:24 -04:00
Gregory Sanders
b8ba4ebee7 don't enforce standardness on coinbase 2018-03-13 12:20:24 -04:00
Gregory Sanders
44176787e7
Merge #314: Cleanup: There's no validatepegout option
6bddc68 Cleanup: There's no validatepegout option (Jorge Timón)
2018-03-13 12:04:50 -04:00
Jorge Timón
6bddc684b7
Cleanup: There's no validatepegout option 2018-03-13 02:39:35 +01:00
Jorge Timón
731ec1ab56
Merge #312: Chainparams: Make parentGenesisBlockHash customizable
4770001 Chainparams: Make parentGenesisBlockHash customizable (Jorge Timón)
2018-03-12 22:52:47 +01:00
Jorge Timón
477000128d
Chainparams: Make parentGenesisBlockHash customizable 2018-03-12 20:40:44 +01:00
Gregory Sanders
aa876a8762
Merge #310: correctly account for witness data in peg-in fee calc, add test
81ac5a6 correctly account for witness data in peg-in fee calc, add test (Gregory Sanders)
2018-03-12 11:31:17 -04:00
Gregory Sanders
81ac5a670e correctly account for witness data in peg-in fee calc, add test 2018-02-23 11:29:49 -06:00
Gregory Sanders
3912654e7d
Merge #309: Small fix to #306
6be1e70 f'Chainparams: Unify CRegTestParams and CCustomParams' (Jorge Timón)
2018-02-21 08:54:40 -06:00
Jorge Timón
6be1e70628
f'Chainparams: Unify CRegTestParams and CCustomParams' 2018-02-21 01:11:42 +01:00
Gregory Sanders
c6ef55b23a
Merge #306: Chainparams: Unify CRegTestParams and CCustomParams
b553501 Chainparams: Unify CRegTestParams and CCustomParams (Jorge Timón)
2018-02-20 14:12:23 -06:00
Jorge Timón
b553501cb2
Chainparams: Unify CRegTestParams and CCustomParams
bitcoin-backport-12128: One CBaseChainParams should be enough
2018-02-19 09:38:26 +01:00
Jorge Timón
3a55ca6f25
Merge #308: Chainparams: rename "main" to "___old_main" to avoid confusion
3102f91 Chainparams: rename "main" to "___old_main" since it is reserved (Jorge Timón)
2018-02-19 06:55:07 +01:00
Jorge Timón
3102f91f9a
Chainparams: rename "main" to "___old_main" since it is reserved 2018-02-19 06:43:55 +01:00
Jorge Timón
52cc5f4d80
Merge #266: Chainparams: Remove CElementsParams
920254e Chainparams: Remove CElementsParams (Jorge Timón)
2018-02-19 06:35:42 +01:00
Jorge Timón
920254e6a4
Chainparams: Remove CElementsParams
was:

- MOVEONLY: Move CMainParams after CCustomParams
- Chainparams: Now CMainParams depends on CRegTestParams instead of CElementsParams
- Chainparams: Remove unused CElementsParams
2018-02-19 06:01:07 +01:00
Gregory Sanders
79c6c071dd
Merge #286: 2WP: -mainchainrpccookiefile defaults to regtest/.cookie for all chains
6a174d4 2wp: QA: Introduce second bitcoin to test -mainchainrpccookiefile (Jorge Timón)
74ca348 2wp: QA: Destroy things (Jorge Timón)
c2d549a 2wp: QA: Refactor: Introduce get_pseudorandom_str (Jorge Timón)
a58d229 2wp: -mainchainrpccookiefile defaults to regtest/.cookie for all chains (Jorge Timón)
2018-02-16 18:05:52 -05:00
Jorge Timón
6a174d4504
2wp: QA: Introduce second bitcoin to test -mainchainrpccookiefile 2018-02-16 03:03:00 +01:00
Jorge Timón
74ca34896b
2wp: QA: Destroy things 2018-02-15 07:04:39 +01:00
Jorge Timón
c2d549ad23
2wp: QA: Refactor: Introduce get_pseudorandom_str
Also make the dirs in temp more clear
2018-02-15 07:04:38 +01:00
Jorge Timón
a58d2293c2
2wp: -mainchainrpccookiefile defaults to regtest/.cookie for all chains 2018-02-15 07:04:31 +01:00
Gregory Sanders
b979d44271
Merge #302: testproposedblock option to reject non-standard block
0476298 testproposedblock option to reject non-standard block (Gregory Sanders)
904d35f allow any number of op return outputs in a transaction (Gregory Sanders)
2018-02-05 13:00:21 -05:00
Gregory Sanders
047629873a testproposedblock option to reject non-standard block 2018-02-05 10:44:36 -05:00
Gregory Sanders
904d35f899 allow any number of op return outputs in a transaction 2018-02-05 10:44:36 -05:00
Gregory Sanders
3828ad2517
Merge #297: remove orphaned descendents of peg-ins on block receive
9cb8b44 remove orphaned descendents of peg-ins on block receive (Gregory Sanders)
2018-01-25 12:34:58 -05:00
Gregory Sanders
9cb8b449f5 remove orphaned descendents of peg-ins on block receive 2018-01-24 09:51:18 -05:00
Jorge Timón
e1860fcec6
Merge #304: commit genesis block transactions to txindex
d74234b commit genesis block transactions to txindex (Gregory Sanders)
2018-01-23 21:39:18 +01:00
Gregory Sanders
d74234b422 commit genesis block transactions to txindex 2018-01-23 09:11:59 -05:00
Gregory Sanders
d207f2754b
Merge #301: In pegging.py test use sidechain binary in the same repo per default
dc23bee In pegging.py test use sidechain binary in the same repo per default (Jonas Nick)
2018-01-22 12:42:58 -05:00
Jonas Nick
dc23bee8d1 In pegging.py test use sidechain binary in the same repo per default 2018-01-22 08:20:33 +00:00
Gregory Sanders
28b20e406f
Merge #281: re-add transaction comments to univalue returns
7e954d1 re-add transaction comments to univalue returns (Gregory Sanders)
2018-01-05 14:23:28 -05:00
Gregory Sanders
a41db2a2fc
Merge #299: Make boost::multi_index comparators const
f40c7ff Make boost::multi_index comparators const (Suhas Daftuar)
2018-01-05 14:22:45 -05:00
Suhas Daftuar
f40c7ff5ec Make boost::multi_index comparators const
This fixes compatibility with boost 1.66
2017-12-22 15:46:04 +09:00
Gregory Sanders
9627f30bd7
Merge #291: fix standardness check ordering of scriptpubkey
cc4b9bf fix standardness check ordering of scriptpubkey (Gregory Sanders)
2017-12-14 17:56:17 -05:00
Gregory Sanders
b78c2a2497
Merge #294: skip balance checks when assumevalid is active
2ccbf87 skip balance checks when assumevalid is active (Gregory Sanders)
2017-12-12 14:11:09 -05:00
Gregory Sanders
0c0c17fc50
Merge #292: callrpc: Check correct mainchainrpc field
add80bb callrpc: Check correct mainchainrpc field (Gregory Sanders)
2017-12-12 14:10:32 -05:00
Gregory Sanders
28fb2a2044
Merge #295: Fix mainchain host arg name from mainchainhost to mainchainrpchost
3dab38f Fix mainchain host arg name from mainchainhost to mainchainrpchost (azuchi)
2017-12-12 14:09:40 -05:00
azuchi
3dab38f720 Fix mainchain host arg name from mainchainhost to mainchainrpchost 2017-12-12 13:41:18 +09:00
Gregory Sanders
2ccbf87b04 skip balance checks when assumevalid is active 2017-12-11 11:00:55 -05:00
Gregory Sanders
93cabbf1e9
Merge #287: list mainchain* commandline startup arguments
08fba49 list mainchain* commandline startup aguments (Gregory Sanders)
2017-11-30 13:26:39 -05:00
Gregory Sanders
add80bbdcd callrpc: Check correct mainchainrpc field 2017-11-29 11:36:41 -05:00
Gregory Sanders
0f9e9fd2c5
Merge #284: fix help text for listunspent asset filter
4ac6a67 fix help text for listunspent asset filter (Gregory Sanders)
2017-11-29 10:41:11 -05:00