diff --git a/src/cc/CCinclude.h b/src/cc/CCinclude.h index 8a5b60fd5..053a2bd9c 100644 --- a/src/cc/CCinclude.h +++ b/src/cc/CCinclude.h @@ -131,16 +131,6 @@ struct CCcontract_info /// @returns pointer to the passed CCcontract_info structure, it must not be freed struct CCcontract_info *CCinit(struct CCcontract_info *cp,uint8_t evalcode); -/// \cond INTERNAL -struct oracleprice_info -{ - CPubKey pk; - std::vector data; - int32_t height; -}; -/// \endcond - - typedef std::vector vscript_t; extern struct NSPV_CCmtxinfo NSPV_U; //!< global variable with info about mtx object and used utxo @@ -340,52 +330,6 @@ bool getCCopret(const CScript &scriptPubKey, CScript &opret); /// @private bool makeCCopret(CScript &opret, std::vector> &vData); -/// CCaddr2set sets private key for additional eval code global address. -/// This allows to spend from two cc global addresses in one transaction (the first one is set in cp object by @see CCinit function). -/// @param cp contract info structure (@see CCcontract_info) where the private key is set -/// @param evalcode eval code of the other contract -/// @param pk global public key of the other contract -/// @param priv private key for the global public key of the other contract -/// @param coinaddr cc address obtained for this global pubkey and eval code with _GetCCaddress -/// @see CCinit -/// @see CCcontract_info -/// @see _GetCCaddress -void CCaddr2set(struct CCcontract_info *cp,uint8_t evalcode,CPubKey pk,uint8_t *priv,char *coinaddr); - -/// CCaddr2set sets private key for yet another eval code global address. -/// This allows to spend from three cc global addresses in one transaction (the first one is set in cp object by CCinit function, the second is set by CCaddr2set function). -/// @param cp contract info structure where the private key is set -/// @param evalcode eval code of the other contract -/// @param pk global public key of the other contract -/// @param priv private key for the global public key of the other contract -/// @param coinaddr the cc address obtained for this global pubkey and eval code with _GetCCaddress -/// @see CCinit -/// @see CCcontract_info -/// @see CCaddr2set -/// @see _GetCCaddress -void CCaddr3set(struct CCcontract_info *cp,uint8_t evalcode,CPubKey pk,uint8_t *priv,char *coinaddr); - -/// CCaddr1of2set sets pubkeys, private key and cc addr for spending from 1of2 cryptocondition vout -/// @param cp contract info structure where the private key is set -/// @param pk1 one of the two public keys of the 1of2 cc -/// @param pk2 second of the two public keys of the 1of2 cc -/// @param priv private key for one of the two pubkeys -/// @param coinaddr the cc address obtained for this 1of2 cc with GetCCaddress1of2 -/// @see CCinit -/// @see CCcontract_info -/// @see GetCCaddress1of2 -void CCaddr1of2set(struct CCcontract_info *cp, CPubKey pk1, CPubKey pk2,uint8_t *priv,char *coinaddr); - -/// CCaddrTokens1of2set sets pubkeys, private key and cc addr for spending from 1of2 token cryptocondition vout -/// @param cp contract info structure where the private key is set -/// @param pk1 one of the two public keys of the 1of2 cc -/// @param pk2 second of the two public keys of the 1of2 cc -/// @param priv private key for one of the two pubkeys -/// @param coinaddr the cc address obtained for this 1of2 token cc with GetTokensCCaddress1of2 -/// @see GetTokensCCaddress -/// @see CCcontract_info -void CCaddrTokens1of2set(struct CCcontract_info *cp, CPubKey pk1, CPubKey pk2, uint8_t *priv, char *coinaddr); - /// IsCCInput checks if scriptSig object contains a cryptocondition /// @param scriptSig scriptSig object with a cryptocondition /// @returns true if the scriptSig object contains a cryptocondition diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp index 5d8e40c40..bb4c3cd12 100644 --- a/src/cc/CCutils.cpp +++ b/src/cc/CCutils.cpp @@ -100,22 +100,6 @@ uint32_t GetLatestTimestamp(int32_t height) return(hush_heightstamp(height)); } // :P -void CCaddr2set(struct CCcontract_info *cp,uint8_t evalcode,CPubKey pk,uint8_t *priv,char *coinaddr) -{ -} - -void CCaddr3set(struct CCcontract_info *cp,uint8_t evalcode,CPubKey pk,uint8_t *priv,char *coinaddr) -{ -} - -void CCaddr1of2set(struct CCcontract_info *cp, CPubKey pk1, CPubKey pk2, uint8_t *priv, char *coinaddr) -{ -} - -void CCaddrTokens1of2set(struct CCcontract_info *cp, CPubKey pk1, CPubKey pk2, uint8_t *priv, char *tokenaddr) -{ -} - bool Getscriptaddress(char *destaddr,const CScript &scriptPubKey) { CTxDestination address; txnouttype whichType;