Merge pull request #1027 from jl777/beta

Beta

src/Makefile.am

@@ -261,7 +261,6 @@ BITCOIN_CORE_H = \
   wallet/wallet.h \
   wallet/wallet_ismine.h \
   wallet/walletdb.h \
-  veruslaunch.h \
   zmq/zmqabstractnotifier.h \
   zmq/zmqconfig.h\
   zmq/zmqnotificationinterface.h \
@@ -483,7 +482,6 @@ libbitcoin_common_a_SOURCES = \
   script/script_error.cpp \
   script/sign.cpp \
   script/standard.cpp \
-  veruslaunch.cpp \
   transaction_builder.cpp \
   $(BITCOIN_CORE_H) \
   $(LIBZCASH_H)

src/coins.cpp

@@ -557,7 +557,7 @@ extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
 const CScript &CCoinsViewCache::GetSpendFor(const CCoins *coins, const CTxIn& input)
 {
     assert(coins);
-    if (coins->nHeight < 6400 && !strcmp(ASSETCHAINS_SYMBOL, "VRSC"))
+    /*if (coins->nHeight < 6400 && !strcmp(ASSETCHAINS_SYMBOL, "VRSC"))
     {
         std::string hc = input.prevout.hash.ToString();
         if (LaunchMap().lmap.count(hc))
@@ -568,7 +568,7 @@ const CScript &CCoinsViewCache::GetSpendFor(const CCoins *coins, const CTxIn& in
                 return txData.scriptPubKey;
             }
         }
-    }
+    }*/
     return coins->vout[input.prevout.n].scriptPubKey;
 }
 

src/coins.h

@@ -24,7 +24,7 @@
 #include <boost/foreach.hpp>
 #include <boost/unordered_map.hpp>
 #include "zcash/IncrementalMerkleTree.hpp"
-#include "veruslaunch.h"
+//#include "veruslaunch.h"
 
 /** 
  * Pruned version of CTransaction: only retains metadata and unspent transaction outputs
@@ -456,7 +456,7 @@ class CTransactionExceptionData
         CTransactionExceptionData() : scriptPubKey(), voutMask() {}
 };
 
-class CLaunchMap
+/*class CLaunchMap
 {
     public:
         std::unordered_map<std::string, CTransactionExceptionData> lmap;
@@ -477,7 +477,7 @@ class CLaunchMap
             }
         }
 };
-static CLaunchMap launchMap = CLaunchMap();
+static CLaunchMap launchMap = CLaunchMap();*/
 
 /** CCoinsView that adds a memory cache for transactions to another CCoinsView */
 class CCoinsViewCache : public CCoinsViewBacked
@@ -507,7 +507,7 @@ public:
     ~CCoinsViewCache();
 
     // Standard CCoinsView methods
-    static CLaunchMap &LaunchMap() { return launchMap; }
+    //static CLaunchMap &LaunchMap() { return launchMap; }
     bool GetSproutAnchorAt(const uint256 &rt, SproutMerkleTree &tree) const;
     bool GetSaplingAnchorAt(const uint256 &rt, SaplingMerkleTree &tree) const;
     bool GetNullifier(const uint256 &nullifier, ShieldedType type) const;

src/miner.cpp

@@ -737,7 +737,7 @@ CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey, int32_t nHeight,
     }
     else
     {
-        if (!isStake)
+        //if ( !isStake || ASSETCHAINS_STAKED != 0 )
         {
             if (!reservekey.GetReservedKey(pubkey))
             {

src/rpc/client.cpp

@@ -136,7 +136,6 @@ static const CRPCConvertParam vRPCConvertParams[] =
     { "z_shieldcoinbase", 3},
     { "z_getoperationstatus", 0},
     { "z_getoperationresult", 0},
-    { "z_importkey", 1 },
     { "paxprice", 4 },
     { "paxprices", 3 },
     { "paxpending", 0 },

src/veruslaunch.h

@@ -1,17 +0,0 @@
-
-// Copyright (c) 2018 The Verus developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#ifndef VERUS_LAUNCH_H
-#define VERUS_LAUNCH_H
-
-#include <string>
-
-#define WHITELIST_COUNT 704
-
-extern const char *whitelist_ids[WHITELIST_COUNT];
-extern const char *whitelist_address;
-extern uint64_t whitelist_masks[WHITELIST_COUNT];
-
-#endif