diff --git a/lib/blockchain/chain.js b/lib/blockchain/chain.js index bacee34a2..7e943a0b5 100644 --- a/lib/blockchain/chain.js +++ b/lib/blockchain/chain.js @@ -3582,7 +3582,7 @@ class Chain extends AsyncEmitter { const state = await this.getState(prev, deployment); if (state === thresholdStates.LOCKED_IN - || (state === thresholdStates.STARTED && deployment.force)) { + || state === thresholdStates.STARTED) { version |= 1 << deployment.bit; } } diff --git a/lib/mining/miner.js b/lib/mining/miner.js index daa067eeb..9a8913c78 100644 --- a/lib/mining/miner.js +++ b/lib/mining/miner.js @@ -469,7 +469,7 @@ class MinerOptions { this.chain = null; this.mempool = null; - this.version = 0; + this.version = -1; this.addresses = []; this.coinbaseFlags = Buffer.from(`mined by ${pkg.name}`, 'ascii'); this.preverify = false; diff --git a/test/chain-icann-lockup-test.js b/test/chain-icann-lockup-test.js index f5b79c05f..477624cf3 100644 --- a/test/chain-icann-lockup-test.js +++ b/test/chain-icann-lockup-test.js @@ -1062,6 +1062,10 @@ async function mineBlock(node, opts = {}) { const job = await miner.cpu.createJob(chain.tip); + // opt out of all (esp. `hardening`) as + // some domains in this test still use RSA-1024 + job.attempt.version = 0; + if (setICANNLockup) job.attempt.version |= (1 << deployments[SOFT_FORK_NAME].bit);