Andrew Poelstra
e765fc93ea
Merge 3caee16946 into merged_master (Bitcoin PR #19953 )
...
Taproot :D
2020-12-01 02:54:57 +00:00
Andrew Poelstra
009bc2fdfb
Merge 99813a9745 into merged_master (Bitcoin PR #17829 )
2020-11-14 16:52:02 +00:00
Andrew Poelstra
9cc26a716a
Merge 5b2fe5563b into merged_master (Elements PR #642 )
...
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
2020-11-09 21:20:21 +00:00
Pieter Wuille
d7ff237f29
Activate Taproot/Tapscript on regtest (BIP 341, BIP 342)
...
Define a versionbits-based activation for the new consensus rules on regtest.
No activation or activation mechanism is defined for testnet or mainnet.
2020-10-12 17:18:47 -07:00
MarcoFalke
aaaaad6ac9
scripted-diff: Bump copyright of files changed in 2019
...
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
2019-12-30 10:42:20 +13:00
Gregory Sanders
47db75e39f
Dynafed RPC support, tests, and deployment for custom chains
2019-09-05 10:51:09 -04:00
John Newbery
0328dcdcfc
[Consensus] Bury segwit deployment
...
Hardcode segwit deployment height to 481824 for mainnet.
2019-08-14 15:52:52 -04:00
John Newbery
1c93b9b31c
[Consensus] Bury CSV deployment height
...
Hard code CSV deployment height to 419328 for mainnet.
2019-08-14 15:52:52 -04:00
Jorge Timón
875a47cc41
MOVEONLY: Move versionbits info out of versionbits.o
2018-10-12 20:51:54 +02:00
Jorge Timón
980b38f8a1
MOVEONLY: Move versionbits info out of versionbits.o
2018-09-23 22:55:11 +02:00
