Merge PR #927 from 'rithvikvibhu/end-airdrop'

Author: nodech

CHANGELOG.md

@@ -5,6 +5,11 @@
 **When upgrading to this version of hsd, you must pass `--chain-migrate=4`
 and `--wallet-migrate=7` when you run it for the first time.**
 
+### Network
+
+**End Airdrop soft fork has been included. ([#927](https://github.com/handshake-org/hsd/pull/927))
+Miners who want to support the soft-fork need to start signalling with `airstop` bit.**
+
 ### Wallet Changes
 
 #### Wallet HTTP API
@@ -213,6 +218,11 @@ The following methods have been deprecated:
 
 ## v6.0.0
 
+### Network
+
+**ICANN Lockup soft fork has been included. ([#819](https://github.com/handshake-org/hsd/pull/819), [#828](https://github.com/handshake-org/hsd/pull/828), [#834](https://github.com/handshake-org/hsd/pull/834))
+Miners who want to support the soft-fork need to start signalling with `icannlockup` bit.**
+
 ### Node and Wallet HTTP API
   Validation errors, request paremeter errors or bad HTTP requests will no
 longer return (and log) `500` status code, instead will return `400`.

lib/blockchain/chain.js

@@ -644,6 +644,14 @@ class Chain extends AsyncEmitter {
 
       // Airdrop proof.
       if (!output.covenant.isClaim()) {
+        // Disable airdrop claims if airstop is activated
+        if (state.hasAirstop) {
+          throw new VerifyError(block,
+            'invalid',
+            'bad-airdrop-disabled',
+            100);
+        }
+
         let proof;
         try {
           proof = AirdropProof.decode(witness.items[0]);
@@ -739,6 +747,10 @@ class Chain extends AsyncEmitter {
     if (await this.isActive(prev, deployments.icannlockup))
       state.nameFlags |= rules.nameFlags.VERIFY_COVENANTS_LOCKUP;
 
+    // Disable airdrop claims.
+    if (await this.isActive(prev, deployments.airstop))
+      state.hasAirstop = true;
+
     return state;
   }
 
@@ -762,6 +774,9 @@ class Chain extends AsyncEmitter {
     if (!this.state.hasICANNLockup() && state.hasICANNLockup())
       this.logger.warning('ICANN lockup has been activated.');
 
+    if (!this.state.hasAirstop && state.hasAirstop)
+      this.logger.warning('Airdrop claims has been disabled.');
+
     this.state = state;
   }
 
@@ -4115,6 +4130,7 @@ class DeploymentState {
     this.flags = Script.flags.MANDATORY_VERIFY_FLAGS;
     this.lockFlags = common.MANDATORY_LOCKTIME_FLAGS;
     this.nameFlags = rules.MANDATORY_VERIFY_COVENANT_FLAGS;
+    this.hasAirstop = false;
   }
 
   hasHardening() {

lib/mempool/mempool.js

@@ -41,6 +41,9 @@ const Claim = require('../primitives/claim');
 const AirdropProof = require('../primitives/airdropproof');
 const {types} = rules;
 
+/** @typedef {import('../types').Hash} Hash */
+/** @typedef {import('../blockchain/chainentry')} ChainEntry */
+
 /**
  * Mempool
  * Represents a mempool.
@@ -274,6 +277,7 @@ class Mempool extends EventEmitter {
     // for a now expired name. Another
     // example is a stale BID for a name
     // which has now reached the REVEAL state.
+    const prevState = this.nextState;
     const state = await this.getNextState();
     const hardened = state.hasHardening();
     const invalid = this.contracts.invalidate(block.height, hardened);
@@ -316,13 +320,18 @@ class Mempool extends EventEmitter {
       }
     }
 
+    // If the next block activates airstop we drop any leftover proofs,
+    // they can no longer be mined.
+    if (!prevState.hasAirstop && state.hasAirstop)
+      this.dropAirdrops();
+
     this.cache.sync(block.hash);
 
     await this.cache.flush();
 
     this.tip = block.hash;
 
-    if (invalid.length > 0) {
+    if (invalid.size > 0) {
       this.logger.info(
         'Invalidated %d txs for block %d.',
         invalid.size, block.height);
@@ -375,7 +384,7 @@ class Mempool extends EventEmitter {
         const proof = AirdropProof.decode(witness.items[0]);
         const entry = AirdropEntry.fromAirdrop(proof, this.chain.height);
 
-        this.trackAirdrop(entry, -1);
+        this.trackAirdrop(entry);
 
         continue;
       }
@@ -387,7 +396,7 @@ class Mempool extends EventEmitter {
 
       const entry = ClaimEntry.fromClaim(claim, data, this.chain.height);
 
-      this.trackClaim(entry, -1);
+      this.trackClaim(entry);
     }
 
     let total = 0;
@@ -1048,11 +1057,10 @@ class Mempool extends EventEmitter {
    * fully processed.
    * @method
    * @param {Claim} claim
-   * @param {Number?} id
    * @returns {Promise}
    */
 
-  async addClaim(claim, id) {
+  async addClaim(claim) {
     if (this.chain.height + 1 < this.network.txStart) {
       throw new VerifyError(claim,
         'invalid',
@@ -1063,7 +1071,7 @@ class Mempool extends EventEmitter {
     const hash = claim.hash();
     const unlock = await this.locker.lock(hash);
     try {
-      return await this._addClaim(claim, id);
+      return await this._addClaim(claim);
     } finally {
       unlock();
     }
@@ -1074,15 +1082,11 @@ class Mempool extends EventEmitter {
    * @method
    * @private
    * @param {Claim} claim
-   * @param {Number?} id
    * @returns {Promise}
    */
 
-  async _addClaim(claim, id) {
-    if (id == null)
-      id = -1;
-
-    await this.insertClaim(claim, id);
+  async _addClaim(claim) {
+    await this.insertClaim(claim);
 
     if (util.now() - this.lastFlush > 10) {
       await this.cache.flush();
@@ -1095,11 +1099,10 @@ class Mempool extends EventEmitter {
    * @method
    * @private
    * @param {Claim} claim
-   * @param {Number?} id
    * @returns {Promise}
    */
 
-  async insertClaim(claim, id) {
+  async insertClaim(claim) {
     const height = this.chain.height + 1;
     const tip = this.chain.tip;
     const hash = claim.hash();
@@ -1175,7 +1178,7 @@ class Mempool extends EventEmitter {
 
     const entry = ClaimEntry.fromClaim(claim, data, this.chain.height);
 
-    this.trackClaim(entry, id);
+    this.trackClaim(entry);
 
     // Trim size if we're too big.
     if (this.limitSize(hash)) {
@@ -1192,10 +1195,9 @@ class Mempool extends EventEmitter {
   /**
    * Track claim entry.
    * @param {ClaimEntry} entry
-   * @param {Number} id
    */
 
-  trackClaim(entry, id) {
+  trackClaim(entry) {
     assert(!this.claims.has(entry.hash));
     assert(!this.claimNames.has(entry.nameHash));
 
@@ -1213,7 +1215,6 @@ class Mempool extends EventEmitter {
   /**
    * Untrack claim entry.
    * @param {ClaimEntry} entry
-   * @param {Number} id
    */
 
   untrackClaim(entry) {
@@ -1261,11 +1262,10 @@ class Mempool extends EventEmitter {
    * fully processed.
    * @method
    * @param {AirdropProof} proof
-   * @param {Number?} id
    * @returns {Promise}
    */
 
-  async addAirdrop(proof, id) {
+  async addAirdrop(proof) {
     if (this.chain.height + 1 < this.network.txStart) {
       throw new VerifyError(proof,
         'invalid',
@@ -1276,7 +1276,7 @@ class Mempool extends EventEmitter {
     const hash = proof.hash();
     const unlock = await this.locker.lock(hash);
     try {
-      return await this._addAirdrop(proof, id);
+      return await this._addAirdrop(proof);
     } finally {
       unlock();
     }
@@ -1287,15 +1287,11 @@ class Mempool extends EventEmitter {
    * @method
    * @private
    * @param {AirdropProof} proof
-   * @param {Number?} id
    * @returns {Promise}
    */
 
-  async _addAirdrop(proof, id) {
-    if (id == null)
-      id = -1;
-
-    await this.insertAirdrop(proof, id);
+  async _addAirdrop(proof) {
+    await this.insertAirdrop(proof);
 
     if (util.now() - this.lastFlush > 10) {
       await this.cache.flush();
@@ -1308,11 +1304,10 @@ class Mempool extends EventEmitter {
    * @method
    * @private
    * @param {AirdropProof} proof
-   * @param {Number?} id
    * @returns {Promise}
    */
 
-  async insertAirdrop(proof, id) {
+  async insertAirdrop(proof) {
     const hash = proof.hash();
 
     // We can maybe ignore this.
@@ -1326,6 +1321,9 @@ class Mempool extends EventEmitter {
     if (!proof.isSane())
       throw new VerifyError(proof, 'invalid', 'bad-airdrop-proof', 100);
 
+    if (this.nextState.hasAirstop)
+      throw new VerifyError(proof, 'invalid', 'bad-airdrop-disabled', 0);
+
     if (this.chain.height + 1 >= this.network.goosigStop) {
       const key = proof.getKey();
 
@@ -1365,7 +1363,7 @@ class Mempool extends EventEmitter {
 
     const entry = AirdropEntry.fromAirdrop(proof, this.chain.height);
 
-    this.trackAirdrop(entry, id);
+    this.trackAirdrop(entry);
 
     // Trim size if we're too big.
     if (this.limitSize(hash)) {
@@ -1382,10 +1380,9 @@ class Mempool extends EventEmitter {
   /**
    * Track airdrop proof entry.
    * @param {AirdropEntry} entry
-   * @param {Number} id
    */
 
-  trackAirdrop(entry, id) {
+  trackAirdrop(entry) {
     assert(!this.airdrops.has(entry.hash));
     assert(!this.airdropIndex.has(entry.position));
 
@@ -1402,7 +1399,6 @@ class Mempool extends EventEmitter {
   /**
    * Untrack airdrop proof entry.
    * @param {AirdropEntry} entry
-   * @param {Number} id
    */
 
   untrackAirdrop(entry) {
@@ -2557,7 +2553,7 @@ class Mempool extends EventEmitter {
    * Map a transaction to the mempool.
    * @private
    * @param {MempoolEntry} entry
-   * @param {CoinView} view
+   * @param {CoinView} [view]
    */
 
   trackEntry(entry, view) {