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
..
bitcoin	MERGE-FIX: Update src/primitives/bitcoin/	2019-05-20 12:52:30 +01:00
block.cpp	Merge 5b2fe5563b into merged_master (Elements PR #642)	2020-11-09 21:20:21 +00:00
block.h	Add fedpeg_program field in dynafed header	2019-09-05 10:51:09 -04:00
confidential.cpp	Add ConfidentialCommitment-based types	2019-03-20 12:05:40 +00:00
confidential.h	MERGE-FIX: Fix compilation errors	2019-05-03 17:46:12 +01:00
pak.cpp	Refactor IsPAKValid to not magically acquire chainparams	2019-09-05 10:51:09 -04:00
pak.h	Refactor IsPAKValid to not magically acquire chainparams	2019-09-05 10:51:09 -04:00
transaction.cpp	UPSTREAM MERGE BROKEN: Merge commit 'f617e05c38' into master	2019-05-01 19:18:18 +01:00
transaction.h	Merge 9bc016f460 into merged_master (Elements PR #669)	2020-11-09 03:58:18 +00:00
txwitness.cpp	[BROKEN] Introduce CA in data structures	2019-03-20 12:05:45 +00:00
txwitness.h	[BROKEN] Introduce CA in data structures	2019-03-20 12:05:45 +00:00