diff --git a/src/assets/assets.h b/src/assets/assets.h index c3882904fb..c218561d23 100644 --- a/src/assets/assets.h +++ b/src/assets/assets.h @@ -37,7 +37,6 @@ #define ASSET_TRANSFER_STRING "transfer_asset" #define ASSET_NEW_STRING "new_asset" #define ASSET_REISSUE_STRING "reissue_asset" -#define ASSET_RESERVED_STRING "reserved_asset" class CScript; class CDataStream; diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp index b456524554..64f95353a3 100644 --- a/src/script/ismine.cpp +++ b/src/script/ismine.cpp @@ -62,7 +62,6 @@ isminetype IsMine(const CKeyStore &keystore, const CScript& scriptPubKey, bool& switch (whichType) { case TX_NONSTANDARD: case TX_NULL_DATA: - case TX_RESERVED_ASSET: break; case TX_PUBKEY: keyID = CPubKey(vSolutions[0]).GetID(); diff --git a/src/script/script.cpp b/src/script/script.cpp index 7d8465afe7..8a95f6fa27 100644 --- a/src/script/script.cpp +++ b/src/script/script.cpp @@ -273,9 +273,6 @@ bool CScript::IsAssetScript(int& nType, bool& fIsOwner, int& nStartingIndex) con } else if ((*this)[index] == RVN_R) { nType = TX_REISSUE_ASSET; return true; - } else { - nType = TX_RESERVED_ASSET; - return false; } } } @@ -324,16 +321,6 @@ bool CScript::IsTransferAsset() const return false; } - -bool CScript::IsReservedAsset() const -{ - int nType = 0; - bool fIsOwner = false; - if (!IsAssetScript(nType, fIsOwner)) - return nType == TX_RESERVED_ASSET; - - return false; -} /** RVN END */ bool CScript::IsPayToWitnessScriptHash() const diff --git a/src/script/script.h b/src/script/script.h index 2233e59adf..e5c3e6c447 100644 --- a/src/script/script.h +++ b/src/script/script.h @@ -660,7 +660,6 @@ class CScript : public CScriptBase bool IsOwnerAsset() const; bool IsReissueAsset() const; bool IsTransferAsset() const; - bool IsReservedAsset() const; bool IsAsset() const; /** RVN END */ diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 23b21a444a..3c681654ae 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -79,7 +79,6 @@ static bool SignStep(const BaseSignatureCreator& creator, const CScript& scriptP switch (whichTypeRet) { case TX_NONSTANDARD: - case TX_RESERVED_ASSET: case TX_NULL_DATA: return false; /** RVN START */ diff --git a/src/script/standard.cpp b/src/script/standard.cpp index 0bd023e307..2e7cccc0ee 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -38,7 +38,6 @@ const char* GetTxnOutputType(txnouttype t) case TX_NEW_ASSET: return ASSET_NEW_STRING; case TX_TRANSFER_ASSET: return ASSET_TRANSFER_STRING; case TX_REISSUE_ASSET: return ASSET_REISSUE_STRING; - case TX_RESERVED_ASSET: return ASSET_RESERVED_STRING; /** RVN END */ } return nullptr; @@ -220,7 +219,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet) addressRet = CScriptID(uint160(vSolutions[0])); return true; /** RVN START */ - } else if (whichType == TX_NEW_ASSET || whichType == TX_REISSUE_ASSET || whichType == TX_TRANSFER_ASSET || whichType == TX_RESERVED_ASSET) { + } else if (whichType == TX_NEW_ASSET || whichType == TX_REISSUE_ASSET || whichType == TX_TRANSFER_ASSET) { addressRet = CKeyID(uint160(vSolutions[0])); return true; } diff --git a/src/script/standard.h b/src/script/standard.h index 8babd59b8e..794b62f634 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -68,8 +68,7 @@ enum txnouttype /** RVN START */ TX_NEW_ASSET = 8, TX_REISSUE_ASSET = 9, - TX_TRANSFER_ASSET = 10, - TX_RESERVED_ASSET = 11 + TX_TRANSFER_ASSET = 10 /** RVN END */ };