Remove more cc stuff

src/script/script.cpp

@@ -156,9 +156,6 @@ const char* GetOpName(opcodetype opcode)
     case OP_CHECKSIGVERIFY         : return "OP_CHECKSIGVERIFY";
     case OP_CHECKMULTISIG          : return "OP_CHECKMULTISIG";
     case OP_CHECKMULTISIGVERIFY    : return "OP_CHECKMULTISIGVERIFY";
-    case OP_CHECKCRYPTOCONDITION   : return "OP_CHECKCRYPTOCONDITION";
-    case OP_CHECKCRYPTOCONDITIONVERIFY
-                                   : return "OP_CHECKCRYPTOCONDITIONVERIFY";
 
     // expansion
     case OP_NOP1                   : return "OP_NOP1";

src/script/script.h

@@ -40,9 +40,6 @@
 
 static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; // bytes
 
-// Max size of pushdata in a CC sig in bytes
-static const unsigned int MAX_SCRIPT_CRYPTOCONDITION_FULFILLMENT_SIZE = 2048;
-
 // Maximum script length in bytes
 static const int MAX_SCRIPT_SIZE = 10000;
 
@@ -178,8 +175,6 @@ enum opcodetype
     OP_CHECKSIGVERIFY = 0xad,
     OP_CHECKMULTISIG = 0xae,
     OP_CHECKMULTISIGVERIFY = 0xaf,
-    OP_CHECKCRYPTOCONDITION = 0xcc,
-    OP_CHECKCRYPTOCONDITIONVERIFY = 0xcd,
 
     // expansion
     OP_NOP1 = 0xb0,
@@ -200,7 +195,6 @@ enum opcodetype
     OP_PUBKEYS = 0xfb,
     OP_PUBKEYHASH = 0xfd,
     OP_PUBKEY = 0xfe,
-    OP_CRYPTOCONDITION = 0xfc,
 
     OP_INVALIDOPCODE = 0xff,
 };

src/script/script_error.cpp

@@ -83,8 +83,6 @@ const char* ScriptErrorString(const ScriptError serror)
             return "NOPx reserved for soft-fork upgrades";
         case SCRIPT_ERR_PUBKEYTYPE:
             return "Public key is neither compressed or uncompressed";
-        case SCRIPT_ERR_CRYPTOCONDITION_INVALID_FULFILLMENT:
-            return "Crypto-Condition payload is invalid";
         case SCRIPT_ERR_UNKNOWN_ERROR:
         case SCRIPT_ERR_ERROR_COUNT:
         default: break;

src/script/script_error.h

@@ -70,9 +70,6 @@ typedef enum ScriptError_t
 
     SCRIPT_ERR_ERROR_COUNT,
 
-    /* crypto-condition script errors */
-    SCRIPT_ERR_CRYPTOCONDITION_VERIFY,
-    SCRIPT_ERR_CRYPTOCONDITION_INVALID_FULFILLMENT
 } ScriptError;
 
 #define SCRIPT_ERR_LAST SCRIPT_ERR_ERROR_COUNT

src/script/sign.cpp

@@ -128,29 +128,6 @@ static bool SignN(const vector<valtype>& multisigdata, const BaseSignatureCreato
     return nSigned==nRequired;
 }
 
-std::vector<CCcontract_info> &GetCryptoConditions()
-{
-    static bool initialized = false;
-    static std::vector<CCcontract_info> vCC = std::vector<CCcontract_info>();
-    CCcontract_info C;
-    
-    if (!initialized)
-    {
-        // this should initialize any desired auto-signed crypto-conditions
-    }
-    return vCC;
-}
-
-bool GetCCByUnspendableAddress(struct CCcontract_info *cp, char *addrstr)
-{
-	return false;
-}
-
-bool CCinitLite(struct CCcontract_info *cp, uint8_t evalcode)
-{
-	return false;
-}
-
 bool _Getscriptaddress(char *destaddr, const CScript &scriptPubKey)
 {
     CTxDestination address;
@@ -239,9 +216,6 @@ static bool SignStep(const BaseSignatureCreator& creator, const CScript& scriptP
             }
             return false;
             
-        case TX_CRYPTOCONDITION:
-            return SignStepCC(creator, scriptPubKey, vSolutions, ret, consensusBranchId);
-            
         case TX_MULTISIG:
             ret.push_back(valtype()); // workaround CHECKMULTISIG bug
             return (SignN(vSolutions, creator, scriptPubKey, ret, consensusBranchId));
@@ -429,11 +403,6 @@ static Stacks CombineSignatures(const CScript& scriptPubKey, const BaseSignature
             return sigs2;
         case TX_PUBKEY:
         case TX_PUBKEYHASH:
-        case TX_CRYPTOCONDITION:
-            // Signatures are bigger than placeholders or empty scripts:
-            if (sigs1.script.empty() || sigs1.script[0].empty())
-                return sigs2;
-            return sigs1;
         case TX_SCRIPTHASH:
             if (sigs1.script.empty() || sigs1.script.back().empty())
                 return sigs2;

src/script/standard.cpp

@@ -143,7 +143,6 @@ const char* GetTxnOutputType(txnouttype t)
     case TX_SCRIPTHASH: return "scripthash";
     case TX_MULTISIG: return "multisig";
     case TX_NULL_DATA: return "nulldata";
-    case TX_CRYPTOCONDITION: return "cryptocondition";
     default: return "invalid";
     }
     return NULL;
@@ -294,8 +293,6 @@ int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned c
         return vSolutions[0][0] + 1;
     case TX_SCRIPTHASH:
         return 1; // doesn't include args needed by the script
-    case TX_CRYPTOCONDITION:
-        return 1;
     }
     return -1;
 }

src/script/standard.h

@@ -75,7 +75,6 @@ enum txnouttype
     TX_PUBKEYHASH,
     TX_SCRIPTHASH,
     TX_MULTISIG,
-    TX_CRYPTOCONDITION,
     TX_NULL_DATA,
 };