From 997c7844a57b200d83e302efa8ac76f1dc82ef29 Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Fri, 2 Nov 2018 10:52:39 +0800
Subject: [PATCH] try this

---
 src/komodo_globals.h     |  2 +-
 src/wallet/rpcwallet.cpp |  4 ++--
 src/wallet/wallet.cpp    | 15 +++------------
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/komodo_globals.h b/src/komodo_globals.h
index 33d269793..133743c52 100644
--- a/src/komodo_globals.h
+++ b/src/komodo_globals.h
@@ -47,7 +47,7 @@ int COINBASE_MATURITY = _COINBASE_MATURITY;//100;
 
 int32_t KOMODO_MININGTHREADS = -1,IS_KOMODO_NOTARY,ASSETCHAINS_STREAM,USE_EXTERNAL_PUBKEY,KOMODO_CHOSEN_ONE,ASSETCHAINS_SEED,KOMODO_ON_DEMAND,KOMODO_EXTERNAL_NOTARIES,KOMODO_PASSPORT_INITDONE,KOMODO_PAX,KOMODO_EXCHANGEWALLET,KOMODO_REWIND,KOMODO_CONNECTING = -1;
 int32_t KOMODO_INSYNC,KOMODO_LASTMINED,prevKOMODO_LASTMINED,KOMODO_CCACTIVATE,JUMBLR_PAUSE = 1;
-std::string ASSETCHAINS_OVERRIDE_ADDRESS,NOTARY_PUBKEY,ASSETCHAINS_NOTARIES,ASSETCHAINS_,ASSETCHAINS_OVERRIDE_PUBKEY,DONATION_PUBKEY;
+std::string NOTARY_ADDRESS,ASSETCHAINS_OVERRIDE_ADDRESS,NOTARY_PUBKEY,ASSETCHAINS_NOTARIES,ASSETCHAINS_,ASSETCHAINS_OVERRIDE_PUBKEY,DONATION_PUBKEY;
 uint8_t NOTARY_PUBKEY33[33],ASSETCHAINS_OVERRIDE_PUBKEY33[33],ASSETCHAINS_PUBLIC,ASSETCHAINS_PRIVATE;
 
 char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN],ASSETCHAINS_USERPASS[4096];
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 56793f78b..d9255ce70 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4989,7 +4989,7 @@ UniValue setpubkey(const UniValue& params, bool fHelp)
     char Raddress[18];
     uint8_t pubkey33[33];
     extern uint8_t NOTARY_PUBKEY33[];
-    extern std::string NOTARY_PUBKEY;
+    extern std::string NOTARY_PUBKEY,NOTARY_ADDRESS;
     if ( NOTARY_PUBKEY33[0] == 0 ) {
         if (strlen(params[0].get_str().c_str()) == 66) {
             decode_hex(pubkey33,33,(char *)params[0].get_str().c_str());
@@ -5002,7 +5002,7 @@ UniValue setpubkey(const UniValue& params, bool fHelp)
                 if (isValid)
                 {
                     CTxDestination dest = address.Get();
-                    string currentAddress = address.ToString();
+                    string currentAddress = address.ToString() = NOTARY_ADDRESS;
                     result.push_back(Pair("address", currentAddress));
 #ifdef ENABLE_WALLET
                     isminetype mine = pwalletMain ? IsMine(*pwalletMain, dest) : ISMINE_NO;
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 59bbf3731..d2767fa1e 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -1201,16 +1201,9 @@ bool CWallet::UpdatedNoteData(const CWalletTx& wtxIn, CWalletTx& wtx)
  * If fUpdate is true, existing transactions will be updated.
  */
 extern uint8_t NOTARY_PUBKEY33[33];
+extern std::string NOTARY_ADDRESS;
 bool pubkey2addr(char destaddr,uint8_t *pubkey33);
 
-bool RaddIsPubkey(char *address) {
-  char exaddress[18];
-  pubkey2addr((char *)exaddress,(uint8_t *)NOTARY_PUBKEY33);
-  if ( strcmp(address,exaddress) == 0 )
-      return true;
-  return false;
-}
-
 bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pblock, bool fUpdate)
 {
     {
@@ -1228,8 +1221,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
                 {
                     if (ExtractDestination(txin.vout[tx.vin[0].prevout.n].scriptPubKey, address)) {
                         //fprintf(stderr, "address on prev vin is in wallet: %s\n",CBitcoinAddress(address).ToString().c_str());
-                        char chraddress[18]; strcpy(chraddress,CBitcoinAddress(address).ToString().c_str());
-                        if ( RaddIsPubkey(chraddress) == true ) {
+                        if ( strcmp(CBitcoinAddress(address).ToString().c_str(),NOTARY_ADDRESS) == 0 ) {
                             numvinIsOurs++;
                             fprintf(stderr, "address on prev vin is in wallet: %s\n",CBitcoinAddress(address).ToString().c_str());
                         }
@@ -1240,8 +1232,7 @@ bool CWallet::AddToWalletIfInvolvingMe(const CTransaction& tx, const CBlock* pbl
                 for (size_t i = 0; i < tx.vout.size() ; i++) {
                     CTxDestination address2;
                     if ( ExtractDestination(tx.vout[i].scriptPubKey, address2)) {
-                        char chraddress[18]; strcpy(chraddress,CBitcoinAddress(address).ToString().c_str());
-                        if ( RaddIsPubkey(chraddress) == true ) {
+                        if ( strcmp(CBitcoinAddress(address2).ToString().c_str(),NOTARY_ADDRESS) == 0 ) {
                           fprintf(stderr, "vout is to our address: %s\n",CBitcoinAddress(address2).ToString().c_str());
                           numvoutIsOurs++;
                           totalvoutvalue = totalvoutvalue + tx.vout[i].nValue;