mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-13 12:33:42 +02:00
Merge 389cf32aca into merged_master (Bitcoin PR bitcoin/bitcoin#30604)
This commit is contained in:
commit
d2e2c989ec
4 changed files with 28 additions and 3 deletions
|
|
@ -528,7 +528,7 @@ public:
|
|||
consensus.vDeployments[Consensus::DEPLOYMENT_SIMPLICITY].nTimeout = Consensus::BIP9Deployment::NO_TIMEOUT;
|
||||
consensus.vDeployments[Consensus::DEPLOYMENT_SIMPLICITY].min_activation_height = 0; // No activation delay
|
||||
|
||||
consensus.nMinimumChainWork = uint256{};
|
||||
consensus.nMinimumChainWork = uint256{"000000000000000000000000000000000000000000000056faca98a0cd9bdf5f"};
|
||||
consensus.defaultAssumeValid = uint256{};
|
||||
|
||||
pchMessageStart[0] = 0x1c;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue