From 883ca5d96805d23bdab8d7dbc50ebfa46837f8c0 Mon Sep 17 00:00:00 2001 From: Aaron Oxborrow Date: Wed, 21 Jun 2023 12:54:50 -0700 Subject: [PATCH] Don't reserve Alexa Top100 names, only reserve ICANN TLDs and "custom" list custom list is here: https://gist.github.com/nodech/a5a308e2b01456d1ea0e34f4be4bd609#file-custom-details-json Alexa top 100k names (to be released) here: https://gist.github.com/paste/4228c764c139a447de30de62afb9a393 --- lib/blockchain/chain.js | 2 +- lib/covenants/rules.js | 2 +- test/chain-icann-lockup-test.js | 9 ++++----- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/blockchain/chain.js b/lib/blockchain/chain.js index bacee34a2..e4806ffa1 100644 --- a/lib/blockchain/chain.js +++ b/lib/blockchain/chain.js @@ -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; diff --git a/lib/covenants/rules.js b/lib/covenants/rules.js index 72766b081..eabb5066f 100644 --- a/lib/covenants/rules.js +++ b/lib/covenants/rules.js @@ -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; diff --git a/test/chain-icann-lockup-test.js b/test/chain-icann-lockup-test.js index e8df238e1..1326a4715 100644 --- a/test/chain-icann-lockup-test.js +++ b/test/chain-icann-lockup-test.js @@ -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. */ @@ -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)' }); } @@ -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);