From 1702dceff370bfcefeecc52d70e1fd978c96f889 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 30 Jul 2018 01:13:05 -1100
Subject: [PATCH] CCaddress fixes

---
 src/wallet/rpcwallet.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 0bc73e9f1..aaa0f2a8e 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -4850,12 +4850,12 @@ int32_t ensure_CCrequirements()
 
 UniValue CCaddress(struct CCcontract_info *cp,char *name,std::vector<unsigned char> &pubkey)
 {
-    UniValue result(UniValue::VOBJ); ; char destaddr[64],str[64],marker[64];
+    UniValue result(UniValue::VOBJ); ; char destaddr[64],str[64];
     result.push_back(Pair("result", "success"));
     sprintf(str,"%sCCaddress",name);
-    sprintf(marker,"%smarker",name);
-    if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )
-        result.push_back(Pair(str,destaddr));
+    result.push_back(Pair(str,cp->unspendableCCaddr));
+    sprintf(str,"%smarker",name);
+    result.push_back(Pair(str,cp->normaladdr));
     if ( pubkey.size() == 33 )
     {
         if ( GetCCaddress(cp,destaddr,pubkey2pk(pubkey)) != 0 )