Release v6.1.0 (#843)

handshake-org · Aug 26, 2023 · 59d84bf · 59d84bf
2 parents b0a0fed + b539dea
commit 59d84bf
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 7 deletions.
diff --git a/docs/release-notes/release-notes-6.x.md b/docs/release-notes/release-notes-6.x.md
@@ -3,7 +3,7 @@ v6.x Release notes
 
 <!-- toc -->
 
-- [v6.0](#v60)
+- [v6.0.0](#v600)
   * [How to Upgrade](#how-to-upgrade)
   * [Notable Changes](#notable-changes)
     + [Network](#network)
@@ -13,10 +13,12 @@ v6.x Release notes
       - [Configuration](#configuration)
       - [Wallet API](#wallet-api)
   * [Changelog](#changelog)
+- [v6.1.0](#v610)
+  * [Changelog](#changelog-1)
 
 <!-- tocstop -->
 
-# v6.0
+# v6.0.0
 ## How to Upgrade
   This version does not have any migrations, so upgrade does not need an action.
 
@@ -79,3 +81,11 @@ a plugin. Configurations with `wallet-` prefix will be passed to the wallet.
   - \[[`500d638d`](https://github.com/handshake-org/hsd/commit/500d638d)] - [#838](https://github.com/handshake-org/hsd/pull/838) - **scripts**: Update hs-client generator.  (@nodech - Nodari Chkuaselidze)
 
 [hs-client]: https://github.com/handshake-org/hs-client
+
+# v6.1.0
+Re-enable bip9 signalling that was disabled in v2. See [#842](https://github.com/handshake-org/hsd/pull/842)
+- `getblocktemplate` can now start signalling soft-forks again using `rules` parameter. (e.g. `getblocktemplate '{ "rules": [ "icannlockup" ] }'`)
+- `getwork` will now signal **ALL** soft-forks again.
+
+## Changelog
+  - \[[`6dc5249d`](https://github.com/handshake-org/hsd/commit/6dc5249d)] - [#842](https://github.com/handshake-org/hsd/pull/842) - **SEMVER-MINOR miner**: Fix bip9 signalling.  (@rithvikvibhu - Rithvik Vibhu)
diff --git 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
@@ -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/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hsd",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "Cryptocurrency bike-shed",
   "license": "MIT",
   "repository": "git://github.com/handshake-org/hsd.git",

diff --git 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);