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.

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

Don't reserve Alexa Top100 names, only reserve ICANN TLDs and "custom" list #823

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ class Chain extends AsyncEmitter {
if (await this.isActive(prev, deployments.hardening))
state.nameFlags |= rules.nameFlags.VERIFY_COVENANTS_HARDENED;

// Disable ICANN, TOP100 and CUSTOM TLDs from getting auctioned.
// Disable ICANN and CUSTOM TLDs from getting auctioned.
if (await this.isActive(prev, deployments.icannlockup))
state.nameFlags |= rules.nameFlags.VERIFY_COVENANTS_LOCKUP;

Expand Down
2 changes: 1 addition & 1 deletion lib/covenants/rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ rules.isLockedUp = function isLockedUp(nameHash, height, network) {
if (!item)
return false;

if (item.root || item.top100 || item.custom)
if (item.root || item.custom)
return true;

return false;
Expand Down
9 changes: 4 additions & 5 deletions test/chain-icann-lockup-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const ACTUAL_RENEWAL_WINDOW = network.names.renewalWindow;
* Test will run failure and success paths and make sure both give
* results soft-fork expects:
* - on failure: names can be auctioned.
* - on success: root, top100, custom and zero become
* - on success: root, custom, and zero become
* unauctionable via mempool and blocks, for those running
* the node with updated software.
*/
Expand Down Expand Up @@ -118,14 +118,14 @@ describe('BIP9 - ICANN lockup (integration)', function() {
});
}

for (const name of [...ROOT, ...TOP100, ...CUSTOM]) {
for (const name of [...ROOT, ...CUSTOM]) {
testCases.push({
name,
lockup: true,
reserved: false,
height: claimPeriod,
testName: `should lockup after extended period times out (${name}), `
+ 'and not be reserved (ROOT, TOP100, CUSTOM)'
+ 'and not be reserved (ROOT, CUSTOM)'
});
}

Expand Down Expand Up @@ -884,9 +884,8 @@ describe('BIP9 - ICANN lockup (integration)', function() {
it('should fail to open the auction for ICANN TLDs', async () => {
const root = FROOT.shift();
const custom = FCUSTOM.shift();
const top100 = FTOP100.shift();

const names = [root, custom, top100];
const names = [root, custom];

for (const name of names) {
const mtx = await wallet.createOpen(name);
Expand Down