Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bip9 signalling #842

Merged
merged 3 commits into from
Aug 26, 2023
Merged

Fix bip9 signalling #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
16352f1
chain: set bits for non-force deployments also
rithvikvibhu Aug 25, 2023
02bb45d
miner: default block version to chain calculated
rithvikvibhu Aug 25, 2023
ab0fa43
test: disable hardening in icann lockup test
rithvikvibhu Aug 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/blockchain/chain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/mining/miner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions test/chain-icann-lockup-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down