Fixed namespace/key update checking.

src/keva/main.cpp

@@ -45,28 +45,6 @@ CKevaTxUndo::apply(CCoinsViewCache& view) const
 /* ************************************************************************** */
 /* CKevaMemPool.  */
 
-uint256
-CKevaMemPool::getTxForNamespace(const valtype& nameSpace) const
-{
-#if 0
-  // JWU TODO: implement this!
-  NamespaceTxMap::const_iterator mi;
-
-  mi = mapNamespaceRegs.find(nameSpace);
-  if (mi != mapNamespaceRegs.end()) {
-    assert(mapNamespaceKeyUpdates.count(name) == 0);
-    return mi->second;
-  }
-
-  mi = mapNamespaceKeyUpdates.find(name);
-  if (mi != mapNameUpdates.end ()) {
-    assert (mapNameRegs.count (name) == 0);
-    return mi->second;
-  }
-#endif
-  return uint256();
-}
-
 void
 CKevaMemPool::addUnchecked (const uint256& hash, const CTxMemPoolEntry& entry)
 {
@@ -80,10 +58,8 @@ CKevaMemPool::addUnchecked (const uint256& hash, const CTxMemPoolEntry& entry)
 
   if (entry.isNamespaceKeyUpdate ()) {
     const valtype& nameSpace = entry.getNamespace();
-    const valtype& key = entry.getKey();
+    assert(mapNamespaceUpdates.count(nameSpace) == 0);
-    NamespaceKeyTuple tuple(nameSpace, key);
+    mapNamespaceUpdates.insert (std::make_pair(nameSpace, hash));
-    assert(mapNamespaceKeyUpdates.count(tuple) == 0);
-    mapNamespaceKeyUpdates.insert (std::make_pair(tuple, hash));
   }
 }
 
@@ -99,10 +75,9 @@ CKevaMemPool::remove (const CTxMemPoolEntry& entry)
   }
 
   if (entry.isNamespaceKeyUpdate()) {
-    NamespaceKeyTuple tuple(entry.getNamespace(), entry.getKey());
+    const NamespaceTxMap::iterator mit = mapNamespaceUpdates.find(entry.getNamespace());
-    const NamespaceKeyTxMap::iterator mit = mapNamespaceKeyUpdates.find(tuple);
+    assert (mit != mapNamespaceUpdates.end());
-    assert (mit != mapNamespaceKeyUpdates.end());
+    mapNamespaceUpdates.erase(mit);
-    mapNamespaceKeyUpdates.erase (mit);
   }
 }
 
@@ -143,7 +118,7 @@ CKevaMemPool::check(const CCoinsView& coins) const
     nHeight = mapBlockIndex.find (blockHash)->second->nHeight;
 
   std::set<valtype> nameRegs;
-  std::set<std::tuple<valtype, valtype>> namespaceKeyUpdates;
+  std::set<valtype> namespaceKeyUpdates;
   for (const auto& entry : pool.mapTx) {
     const uint256 txHash = entry.GetTx ().GetHash ();
     if (entry.isNamespaceRegistration()) {
@@ -167,14 +142,12 @@ CKevaMemPool::check(const CCoinsView& coins) const
 
     if (entry.isNamespaceKeyUpdate()) {
       const valtype& nameSpace = entry.getNamespace();
-      const valtype& key = entry.getKey();
+      const NamespaceTxMap::const_iterator mit = mapNamespaceUpdates.find(nameSpace);
-      std::tuple<valtype, valtype> tuple(nameSpace, key);
+      assert (mit != mapNamespaceUpdates.end ());
-      const NamespaceKeyTxMap::const_iterator mit = mapNamespaceKeyUpdates.find(tuple);
-      assert (mit != mapNamespaceKeyUpdates.end ());
       assert (mit->second == txHash);
 
-      assert (namespaceKeyUpdates.count(tuple) == 0);
+      assert (namespaceKeyUpdates.count(nameSpace) == 0);
-      namespaceKeyUpdates.insert(tuple);
+      namespaceKeyUpdates.insert(nameSpace);
 
 #if 0
       /* As above, use nHeight+1 for the expiration check.  */
@@ -188,7 +161,7 @@ CKevaMemPool::check(const CCoinsView& coins) const
   }
 
   assert(nameRegs.size() == mapNamespaceRegs.size());
-  assert(namespaceKeyUpdates.size() == mapNamespaceKeyUpdates.size());
+  assert(namespaceKeyUpdates.size() == mapNamespaceUpdates.size());
 
   /* Check that nameRegs and nameUpdates are disjoint.  They must be since
      a name can only be in either category, depending on whether it exists
@@ -200,8 +173,8 @@ CKevaMemPool::check(const CCoinsView& coins) const
   }
 #endif
 
-  for (const auto& namespaceKey : namespaceKeyUpdates) {
+  for (const auto& nameSpace : namespaceKeyUpdates) {
-    assert(nameRegs.count(std::get<0>(namespaceKey)) == 0);
+    assert(nameRegs.count(nameSpace) == 0);
   }
 }
 
@@ -238,8 +211,9 @@ CKevaMemPool::checkTx (const CTransaction& tx) const
       {
         const valtype& nameSpace = nameOp.getOpNamespace();
         const valtype& key = nameOp.getOpKey();
-        if (updatesKey(nameSpace, key))
+        if (updatesNamespace(nameSpace)) {
           return false;
+        }
         break;
       }
 

src/keva/main.h

@@ -134,7 +134,7 @@ private:
    * Keep track of key that are updated by transactions in the pool.
    * Map key to registering transaction.
    */
-  NamespaceKeyTxMap mapNamespaceKeyUpdates;
+  NamespaceTxMap mapNamespaceUpdates;
 
 public:
 
@@ -160,15 +160,14 @@ public:
   }
 
   /**
-   * Check whether a particular name has a pending update.  Does not lock.
+   * Check whether a particular namespace has a pending update.  Does not lock.
-   * @param name The name to check for.
+   * @param name The namespace to check for.
-   * @return True iff there's a matching name update in the pool.
+   * @return True iff there's a matching namespace update in the pool.
    */
   inline bool
-  updatesKey (const valtype& nameSpace, const valtype& key) const
+  updatesNamespace(const valtype& nameSpace) const
   {
-    NamespaceKeyTuple tuple(nameSpace, key);
+    return mapNamespaceUpdates.count(nameSpace) > 0;
-    return mapNamespaceKeyUpdates.count(tuple) > 0;
   }
 
   /**
@@ -188,7 +187,7 @@ public:
   clear ()
   {
     mapNamespaceRegs.clear();
-    mapNamespaceKeyUpdates.clear();
+    mapNamespaceUpdates.clear();
   }
 
   /**

src/txmempool.h

@@ -671,10 +671,10 @@ public:
         return kevaMemPool.registersNamespace(nameSpace);
     }
 
-    inline bool updatesKey(const valtype& nameSpace, const valtype& key) const
+    inline bool updatesNamespace(const valtype& nameSpace) const
     {
         AssertLockHeld(cs);
-        return kevaMemPool.updatesKey(nameSpace, key);
+        return kevaMemPool.updatesNamespace(nameSpace);
     }
 
     inline uint256 getTxForNamespace(const valtype& name) const

src/wallet/rpckeva.cpp

@@ -232,7 +232,7 @@ UniValue keva_put(const JSONRPCRequest& request)
      rules, but it is necessary with the current mempool implementation.  */
   {
     LOCK (mempool.cs);
-    if (mempool.updatesKey(nameSpace, key)) {
+    if (mempool.updatesNamespace(nameSpace)) {
       throw JSONRPCError (RPC_TRANSACTION_ERROR,
                           "there is already a pending update for this name");
     }