diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-04-15 10:18:21 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-04-15 10:19:02 +0200 |
| commit | 7cb0bcb6811070786937fb5cc0af82cf4ef21ff0 (patch) | |
| tree | 57086166e8b856c1d0f50acaa8842e1efe7f2d55 /src/blockencodings.h | |
| parent | a5e756b74e181cb007669baeb6a6d2eedef4eb73 (diff) | |
| parent | f979b3237f1cfc28f9c4ccb07beab558d5357a55 (diff) | |
| download | bitcoin-7cb0bcb6811070786937fb5cc0af82cf4ef21ff0.tar.xz | |
Merge #21686: Speedy trial activation parameters for Taproot
f979b3237f1cfc28f9c4ccb07beab558d5357a55 Add mainnet and testnet taproot activation params (Andrew Chow)
Pull request description:
Adds the activation parameters for taproot as specified in https://github.com/bitcoin/bips/pull/1104
ACKs for top commit:
gmaxwell:
utACK f979b3237f1cfc28f9c4ccb07beab558d5357a55
ajtowns:
ACK f979b3237f1cfc28f9c4ccb07beab558d5357a55
instagibbs:
ACK f979b32
clarkmoody:
ACK f979b32
Sjors:
ACK f979b3237f1cfc28f9c4ccb07beab558d5357a55
jonatack:
utACK f979b3237f1cfc28f9c4ccb07beab558d5357a55 verified with the BIP draft
Tree-SHA512: f95538bcec46c36f9532a99fcf697b143083c25b2427dd578b88514add0a807371530c18f0a8ed040dc885ad6eca8234235e1d762f6f837eafc5daed856a9dcf
Diffstat (limited to 'src/blockencodings.h')
0 files changed, 0 insertions, 0 deletions