GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge ddc6979b8b into merged_master (Bitcoin PR bitcoin/bitcoin#19438)

Browse source
This commit is contained in:
Andrew Poelstra 2021-07-30 16:16:50 +00:00
commit 47164a1e9c
20 changed files with 324 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/chainparams.cpp
View file

@ -7,12 +7,12 @@
#include <chainparamsseeds.h>
#include <consensus/merkle.h>
#include <deploymentinfo.h>
#include <hash.h> // for signet block challenge hash
#include <issuance.h>
#include <primitives/transaction.h>
#include <util/system.h>
#include <crypto/sha256.h>
#include <versionbitsinfo.h>
#include <assert.h>