GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
27049 commits 49 branches 359 tags 252 MiB
Commit graph

277 commits

Author SHA1 Message Date
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
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
fa488f131f
scripted-diff: Bump copyright headers 
-BEGIN VERIFY SCRIPT-
./contrib/devtools/copyright_header.py update ./
-END VERIFY SCRIPT-
 2020-04-16 13:33:09 -04:00
MarcoFalke
222253e37d
chainparams: Bump assumed valid hash 2020-04-02 05:34:47 +08:00
Amiti Uttarwar
930d837542 [test] add chainparams property to indicate chain allows time mocking 2020-02-13 08:59:51 -08: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
547a2f7bdf Fill out expected liquidv1 chain size 
Currently it is 1.1 GB according to my local machine.

Overshooting by 3x to account for growth.
 2019-11-19 10:30:40 -05:00
Gregory Sanders
6fc3fe04ef Change elements mode to activating BIP9 signaling based on height 2019-11-13 16:07:29 -05:00
NullFunctor
edb6b768a4 fix uninitialized variable nMinerConfirmationWindow 
fix uninitialized variable hard code the MinBIP9WarningHeight

fix uninitialized var hard code the MinBIP9WarningHeight instead
 2019-11-12 17:59:52 -06:00
Gregory Sanders
fd5ec4bff6 HF: Simplify legacy->dynafed transition max sig size 2019-11-08 14:07:07 -05:00
Gregory Sanders
610d8d7afa Revert errant line change committed in bf66a93cbd 2019-11-05 12:29:50 -05:00
Gregory Sanders
bf66a93cbd Correctly seed the liquidv1 paklist pre-dynafed 2019-11-05 10:39:22 -05:00
Jorge Timón
37b8475dcf
Chainparams: Use name constants in chainparams initialization 2019-10-29 20:27:30 +01:00
MarcoFalke
fa3a733116
chainparams: Bump assumed chain params 2019-10-01 07:33:24 -04:00
Gregory Sanders
85de70cdfa Don't activate dynafed like custom chains 2019-09-26 09:06:31 -04:00
Gregory Sanders
b73ff4ccfe Fix liquidv1 sync 
A single field wasn't given a positive value which
meant it considers no peg-ins to be valid.
 2019-09-26 09:06:31 -04:00
Gregory Sanders
8f6266dae4 Add legacy pak arg for custom chains 2019-09-25 09:10:13 -04:00
Steven Roose
a712796108
Fix nit in blech32_hrp assignment in Bitcoin chains 2019-09-11 16:21:49 +01:00
Anthony Towns
fdb3e8f8b2 Ignore old versionbit activations 
Adds a hardcoded height to the consensus chain parameters for
ignoring versionbit activations prior to a fixed height.
 2019-09-05 13:51:01 -04:00
Gregory Sanders
f7905d6dfb Generalize the number of epochs old a peg-in can be and still be valid 2019-09-05 10:51:09 -04:00
Gregory Sanders
47db75e39f Dynafed RPC support, tests, and deployment for custom chains 2019-09-05 10:51:09 -04:00
Gregory Sanders
24535d6a9f Add unused dynamic genesis block style in chainparams 2019-09-03 10:55:09 -04:00
Gregory Sanders
d10c42a26e Create epoch length chainparam 2019-09-03 10:55:09 -04:00
Gregory Sanders
b996a425e1 Set default of multi_data_permitted to enforce_pak 2019-09-03 10:55:06 -04:00
Gregory Sanders
f17d7de526 Add dynafed helper functions 2019-09-03 10:55:06 -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
MarcoFalke
fa4a605a4c
Remove wallet settings from chainparams 2019-07-16 16:22:14 -04:00
MarcoFalke
fa89badf88
test: Require standard txs in regtest 2019-06-21 16:45:16 -04:00
MarcoFalke
fa613ca0a8
chainparams: Remove unused fMineBlocksOnDemand 
It is equal to consensus.fPowNoRetargeting
 2019-06-18 14:48:11 -04:00
Steven Roose
0a6f0551d2
Rename -con_connect_coinbase to -con_connect_genesis_outputs 2019-06-05 10:02:41 +01:00
Steven Roose
f4889a5253
UPSTREAM MERGE BROKEN: Merge upstream commit '519b0bc5dc' into master 2019-05-17 16:17:09 +01:00