Ava Chow 4a31f8ccc9
Merge bitcoin/bitcoin#31156: test: Don't enforce BIP94 on regtest unless specified by arg
e60cecc8115d3b28be076792baa5e4ea26d353a6 doc: add release note for 31156 (Martin Zumsande)
fc7dfb3df5b932cc015817c4461e7017601d607f test: Don't enforce BIP94 on regtest unless specified by arg (Martin Zumsande)

Pull request description:

  The added arg `-test=bip94` is only used in a functional test for BIP94. This is done because the default regtest consensus rules should follow mainnet, not testnet.

  Fixes #31137.

ACKs for top commit:
  achow101:
    ACK e60cecc8115d3b28be076792baa5e4ea26d353a6
  tdb3:
    cr and light test ACK e60cecc8115d3b28be076792baa5e4ea26d353a6
  rkrux:
    tACK e60cecc8115d3b28be076792baa5e4ea26d353a6
  BrandonOdiwuor:
    utACK e60cecc8115d3b28be076792baa5e4ea26d353a6
  laanwj:
    Code review ACK e60cecc8115d3b28be076792baa5e4ea26d353a6

Tree-SHA512: ca2f322f89d8808dfc3565fe020d2615cfcc110e188a02128ad7108fef51c735b33d55b5e6a70c505d78f7291f3c635dc7dfbcd78be1348d4d6e483883be4216
2024-10-30 17:00:14 -04:00
..
2024-05-16 10:16:08 -05:00