diff --git a/src/main.cpp b/src/main.cpp index ef126376f..54e56d974 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -4090,7 +4090,7 @@ bool static DisconnectTip(CValidationState &state, bool fBare = false) { { CTransaction &tx = block.vtx[i]; //if ((i == (block.vtx.size() - 1)) && ((ASSETCHAINS_LWMAPOS && block.IsVerusPOSBlock()) || (ASSETCHAINS_STAKED != 0 && (komodo_isPoS((CBlock *)&block) != 0)))) - if ( komodo_newStakerActive(0, pindexDelete->nTime) == 0 && i == block.vtx.size()-1 && komodo_isPoS((CBlock *)&block,pindexDelete->GetHeight(),0) != 0 ) + if (0) // komodo_newStakerActive(0, pindexDelete->nTime) == 0 && i == block.vtx.size()-1 && komodo_isPoS((CBlock *)&block,pindexDelete->GetHeight(),0) != 0 ) { #ifdef ENABLE_WALLET // new staking tx cannot be accepted to mempool and expires in 1 block, so no need for this! :D diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 624e7f006..d27826ec3 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -311,8 +311,6 @@ UniValue getinfo(const UniValue& params, bool fHelp) obj.push_back(Pair("rpcport", ASSETCHAINS_RPCPORT)); if ( ASSETCHAINS_SYMBOL[0] != 0 ) { - if ( is_STAKED(ASSETCHAINS_SYMBOL) != 0 ) - obj.push_back(Pair("StakedEra", STAKED_ERA)); //obj.push_back(Pair("name", ASSETCHAINS_SYMBOL)); obj.push_back(Pair("magic", (int)ASSETCHAINS_MAGIC)); obj.push_back(Pair("premine", ASSETCHAINS_SUPPLY)); diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index 70c68eb27..278ef77b0 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -38,7 +38,7 @@ #include "zcbenchmarks.h" #include "script/interpreter.h" #include "zcash/zip32.h" - +#include "cc/CCinclude.h" #include "utiltime.h" #include "asyncrpcoperation.h" #include "asyncrpcqueue.h" @@ -5622,12 +5622,6 @@ UniValue setpubkey(const UniValue& params, bool fHelp) else { result.push_back(Pair("ismine", "true")); - std::string notaryname; - if ( (IS_STAKED_NOTARY= StakedNotaryID(notaryname, Raddress)) > -1 ) - { - result.push_back(Pair("IsNotary", notaryname)); - IS_KOMODO_NOTARY = 0; - } } NOTARY_PUBKEY = params[0].get_str(); decode_hex(NOTARY_PUBKEY33,33,(char *)NOTARY_PUBKEY.c_str());