From 54054b83970ff5bb190050c41d97ff6a308db716 Mon Sep 17 00:00:00 2001
From: blackjok3r <blackjok3r@gmail.com>
Date: Fri, 2 Nov 2018 22:47:16 +0800
Subject: [PATCH] try again

---
 src/bitcoin-cli.cpp |  2 ++
 src/cc/utils.cpp    | 20 --------------------
 src/cc/utils.h      |  3 +--
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index a886c27f2..420123d93 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -78,6 +78,8 @@ public:
 #include "komodo_cJSON.c"
 #include "komodo_notary.h"
 #include "notaries_staked.cpp"
+#include "main.h"
+#include "cc/CCutils.cpp"
 
 
 void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals,int32_t KMDheight,uint32_t KMDtimestamp,uint64_t opretvalue,uint8_t *opretbuf,uint16_t opretlen,uint16_t vout,uint256 MoM,int32_t MoMdepth)
diff --git a/src/cc/utils.cpp b/src/cc/utils.cpp
index fb41aaabf..e69de29bb 100644
--- a/src/cc/utils.cpp
+++ b/src/cc/utils.cpp
@@ -1,20 +0,0 @@
-#include "../main.h"
-bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
-{
-    CTxDestination address; txnouttype whichType;
-    if ( ExtractDestination(scriptPubKey,address) != 0 )
-    {
-        strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-        return(true);
-    }
-    fprintf(stderr,"ExtractDestination failed\n");
-    return(false);
-}
-
-bool pubkey2addr(char *destaddr,uint8_t *pubkey33)
-{
-    std::vector<uint8_t>pk; int32_t i;
-    for (i=0; i<33; i++)
-        pk.push_back(pubkey33[i]);
-    return(Getscriptaddress(destaddr,CScript() << pk << OP_CHECKSIG));
-}
diff --git a/src/cc/utils.h b/src/cc/utils.h
index 6a70b6828..69410adbb 100644
--- a/src/cc/utils.h
+++ b/src/cc/utils.h
@@ -20,6 +20,7 @@
 #include "version.h"
 
 
+
 /*
  * Serialisation boilerplate
  */
@@ -42,8 +43,6 @@ bool DeserializeF(const std::vector<unsigned char> vIn, T f)
     } catch(...) {}
     return false;
 }
-bool pubkey2addr(char *destaddr,uint8_t *pubkey33);
-bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey);
 
 #define E_MARSHAL(body) SerializeF([&] (CDataStream &ss) {body;})
 #define E_UNMARSHAL(params, body) DeserializeF(params, [&] (CDataStream &ss) {body;})