Commit graph

326 commits

Author SHA1 Message Date
Pablo Greco
24cafa50cf Implement vbparams for Elements (evbparams) 2021-11-23 14:36:03 +00:00
Glenn Willen
a4b66a24b7 Update hardcoded PAK list for Liquid v1 2021-10-06 14:57:10 +00:00
Andrew Poelstra
0628311b53 chainparams: change magic bytes for liquidv1test
This is basically a Liquid-prod-ish version of regtest. Its default magic
should not collide with that for Liquid prod.
2021-09-28 17:29:13 +00:00
Andrew Poelstra
f7f9555792
Merge ElementsProject/elements#1044: Define Taproot activation parameters for Liquid
3cb9612faa test: add test for Taproot activation (Andrew Poelstra)
5291c0d9d9 chainparams: add undocumented regtest/testnet only -con_taproot_signal_start option (Andrew Poelstra)
cc6b933478 add missing taproot activation params for Liquid v1 (Andrew Poelstra)
bec6bcf31b versionbits: allow specific deployments to override the signalling/threshold values (Andrew Poelstra)

Pull request description:

  Sets Taproot to start signalling around noon (California time) on Nov 1, 2021, assuming 95% of blocks are produced between now and then.

  Will activate after one week of 100% signalling. If we can pull this off on the first or second try, we will beat Bitcoin which currently looks like it will activate on Nov 16.

  **Edit:** actually, even without Speedy Trial, there is one full period (week) where Taproot will be "locked in" but not "active". So it will activate on Nov 15 at the earliest.

ACKs for top commit:
  achow101:
    ACK 3cb9612faa

Tree-SHA512: c3a80d39ba86a0d762a3057cb9c45e379c70c2daee8ff2e54978a4c32118c935c8909d872ac9f873e283441c52c1974c06268f10dc7bf9e9e000c21063ac84d7
2021-09-18 03:22:30 +00:00
Andrew Poelstra
5291c0d9d9 chainparams: add undocumented regtest/testnet only -con_taproot_signal_start option 2021-09-15 19:57:06 +00:00
Andrew Poelstra
cc6b933478 add missing taproot activation params for Liquid v1 2021-09-15 18:33:34 +00:00
Andrew Poelstra
e57b4c51ad regtest: change network magic away from liquid v1
We don't want connectivity issues between Liquid and custom test networks.
2021-09-10 17:20:20 +00:00
Glenn Willen
b47c279ee1 Fix compilation errors after rebase onto master 2021-04-29 15:00:54 -07:00
Glenn Willen
6d19c44bd0 Add liquidv1test chainparams. 2021-04-07 15:59:22 -07:00
Glenn Willen
188283eecb Change stray uses of global gArgs to args in CCustomParams 2021-04-07 15:55:44 -07:00
Andrew Poelstra
1670bdfa0b ci: fix benchmarks, fuzztests and unit tests
Includes a memory leak in the checkqueue unit test (but not in
the actual code). WE really need to switch our checkqueue to use
std::unique_pointer rather than bare pointers. But this would be
invasive enough that I want to do it in a followup PR.

Also pretty-much disable the validation_flush_cache unit test.
This is a stupid and irritating test which tries to unit-test
exact memory usage of std containers. It already has at least
one "remove wrong assumptions" update upstream and after many
tries I was unable to change all the magic numbers in a way
that'd consistently pass CI for Elements.

Also adds a couple ubsan suppressions about perfectly-legitimate
conversions of integer types.
2021-03-26 17:33:05 +00:00
Andrew Poelstra
59076ca8f3 Merge 0c82c2743b into merged_master (Elements PR #970) 2021-03-26 00:27:13 +00:00
Andrew Poelstra
d89112072c Merge 3b8e4070c8 into merged_master (Elements PR #958)
Conflicts due to change of error state formatting upstream.
2021-03-26 00:21:11 +00:00
Steven Roose
70390ee638
Specify the dynafed epoch length for liquidv1 2021-03-11 17:34:37 +00:00
Steven Roose
fe03729338
dynafed: Support changing mainnet dynafed activation
This should obviously only be done by blocksigners. The flag used is not
documented.
2021-02-10 14:07:06 +01:00
Andrew Poelstra
8712faa87c Merge 1e17114917 into merged_master (Bitcoin PR #20238) 2020-12-02 15:44:44 +00:00
Andrew Poelstra
0a4ca5becf Merge ca18860563 into merged_master (Bitcoin PR #20263) 2020-12-02 01:27:52 +00:00
Andrew Poelstra
eebfc818d0 Merge 0f86e7f128 into merged_master (Bitcoin PR #20157) 2020-12-01 14:25:00 +00:00
Andrew Poelstra
205b628304 Merge 2947ae6f85 into merged_master (Bitcoin PR #20035) 2020-12-01 04:33:11 +00:00
Andrew Poelstra
e765fc93ea Merge 3caee16946 into merged_master (Bitcoin PR #19953)
Taproot :D
2020-12-01 02:54:57 +00:00
Andrew Poelstra
3ce8ed9bb5 Merge 88067ddbe4 into merged_master (Elements PR #912)
Also fixed an intermittent failure in feature_assetsdir.py that has
been bugging me for the entire rebase.
2020-11-30 15:19:14 +00:00
Andrew Poelstra
e5875a75bc Merge 9fc2f011ba into merged_master (Bitcoin PR #20048) 2020-11-30 03:46:23 +00:00
Andrew Poelstra
86c430b852 Merge 3487e421a7 into merged_master (Bitcoin PR #20004) 2020-11-30 03:25:50 +00:00
Andrew Poelstra
e3853b414c Merge 5c435c78e3 into merged_master (Bitcoin PR #20036) 2020-11-30 02:29:24 +00:00
Andrew Poelstra
455f61c0db Merge 8c5f68118c into merged_master (Bitcoin PR #18267)
This commit adds signet support, which is a little bit silly/redundant for us :)
Was a surprisingly easy merge to handle, and hopefully in future Core is more
mindful of signed blocks when they are changing code architecture.

I had to change a couple lines of src/signet.cpp to add blank assets to the
CTxOuts and to find transaction input scriptWitnesses. No need to add any
other tx witness data (and the CAsset()s that I did add to make things compile
won't be used..) because signet will always have g_con_elementsmode off.
2020-11-29 16:57:55 +00:00
Andrew Poelstra
87a94621e7 Merge ce3bdd0ed1 into merged_master (Bitcoin PR #19316) 2020-11-27 16:20:25 +00:00
Andrew Poelstra
2942044881 Merge 62d137ac3b into merged_master (Bitcoin PR #19561) 2020-11-26 22:20:40 +00:00
Andrew Poelstra
b9258b80c0 Merge 86590c17fc into merged_master (Bitcoin PR #19284) 2020-11-26 01:09:06 +00:00
Andrew Poelstra
fd37b7c5d6 Merge 54f812d9d2 into merged_master (Bitcoin PR #18673) 2020-11-26 01:08:23 +00:00
Andrew Poelstra
6a9d7ff23b Merge b83565625e into merged_master (Bitcoin PR #18500) 2020-11-26 01:08:08 +00:00
Andrew Poelstra
70819cbab4 Merge 36f42e1bf4 into merged_master (Bitcoin PR #18037) 2020-11-26 01:07:43 +00:00
MarcoFalke
1e17114917
Merge #20238: doc: Missing comments for signet parameters
9c08f3332c doc: Missing comments for signet parameters (kanon)

Pull request description:

  We have such comment in chainparams.cpp. However in Signet the comments are missing.

  In example...

  - Mainnet
  d67883d01e/src/chainparams.cpp (L83-L84)

  - Testnet
  d67883d01e/src/chainparams.cpp (L196-L197)

  - Regtest
  d67883d01e/src/chainparams.cpp (L392-L393)

ACKs for top commit:
  theStack:
    ACK 9c08f3332c

Tree-SHA512: d4e488cf01e50d6320282b29d776c11e6b3d423f9268226749f738a57a51f456b6bd48334d2d5a43afa782df65ea15525a0af1688003c1be6ef915c05650e147
2020-11-16 10:40:56 +01:00
Andrew Poelstra
009bc2fdfb Merge 99813a9745 into merged_master (Bitcoin PR #17829) 2020-11-14 16:52:02 +00:00
Andrew Poelstra
28623acd36 Merge 45f04d9753 into merged_master (Elements PR #784) 2020-11-14 16:51:50 +00:00
Andrew Poelstra
2213cc6334 Merge 21ee676dd6 into merged_master (Bitcoin PR #17449) 2020-11-09 23:10:11 +00:00
Andrew Poelstra
19ad9587c8 Merge ccf6697e3b into merged_master (Elements PR #780) 2020-11-09 23:10:11 +00:00
Andrew Poelstra
3613ae283d Merge f60e0684d1 into merged_master (Elements PR #773) 2020-11-09 23:10:10 +00:00
Andrew Poelstra
ca29b12b22 Merge 53afce3b0b into merged_master (Elements PR #769)
This PR was broken; also pull in the change from #770 which fixes it,
so #770 will be an empty merge.
2020-11-09 21:20:52 +00:00
Andrew Poelstra
d4adfa0935 Merge f129170b85 into merged_master (Bitcoin PR #17306) 2020-11-09 21:20:47 +00:00
Andrew Poelstra
c7eefa8ea4 Merge 4b51ed89cf into merged_master (Bitcoin PR #17002) 2020-11-09 21:20:32 +00:00
Andrew Poelstra
d1ed1db7fc Merge 6b2210f101 into merged_master (Bitcoin PR #16713) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
acb351bf48 Merge 690fed668c into merged_master (Elements PR #720) 2020-11-09 21:20:29 +00:00
Andrew Poelstra
dad5fd9884 Merge 1e5da20b5e into merged_master (Elements PR #717) 2020-11-09 21:20:28 +00:00
Andrew Poelstra
f818373174 Merge 4d9fa049af into merged_master (Elements PR #708) 2020-11-09 21:20:24 +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
Andrew Poelstra
5f280a6068 Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
29e9ba5bc9 Merge dfb7fd60f2 into merged_master (Bitcoin PR #16402) 2020-11-09 21:20:08 +00:00
Andrew Poelstra
b57516e11a Merge 24dbcf3808 into merged_master (Bitcoin PR #15891)
Disabled a test that `-acceptnonstdtxn` is disabled on mainnet, because
I couldn't figure out how to make the test jig choose mainnet.
2020-11-09 21:20:06 +00:00
Andrew Poelstra
69dd3ef807 Merge c799976c86 into merged_master (Bitcoin PR #16128) 2020-11-09 03:58:20 +00:00
MarcoFalke
fa90ba36d3
Update assumed chain params 2020-11-02 09:22:08 +01:00