From 4b80614b5e29ada7e95b9b5ae73d8e54f0084571 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sat, 21 Jul 2018 02:56:09 -1100
Subject: [PATCH] Test

---
 src/cc/assets.cpp       | 14 ++++++--------
 src/script/standard.cpp |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/cc/assets.cpp b/src/cc/assets.cpp
index 1f52d9e24..99fef6b16 100644
--- a/src/cc/assets.cpp
+++ b/src/cc/assets.cpp
@@ -230,15 +230,13 @@ bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey)
     for (i=0; i<scriptPubKey.size(); i++)
         fprintf(stderr,"%02x",ptr[i]);
     fprintf(stderr," scriptPubKey\n");
-    if ( IsStandard(scriptPubKey,whichType) != 0 )
+    if ( ExtractDestination(scriptPubKey,address) != 0 )
     {
-        if ( ExtractDestination(scriptPubKey,address) != 0 )
-        {
-            strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
-            return(true);
-        }
-        fprintf(stderr,"ExtractDestination failed\n");
-    } else fprintf(stderr,"Getscriptaddress nonstandard\n");
+        strcpy(destaddr,(char *)CBitcoinAddress(address).ToString().c_str());
+        fprintf("destaddr.(%s)\n",destaddr);
+        return(true);
+    }
+    fprintf(stderr,"ExtractDestination failed\n");
     return(false);
 }
 
diff --git a/src/script/standard.cpp b/src/script/standard.cpp
index e2b4e13dd..69477c558 100644
--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@@ -254,6 +254,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
     
     else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
     {
+        fprintf(stderr,"found CC type\n");
         addressRet = CScriptID(uint160(vSolutions[0]));
         return true;
     }