Skip to content

Removes misguided reserved script code. #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cfox merged 2 commits into from
Sep 4, 2018
Merged

Removes misguided reserved script code. #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
383baa9
Removes misguided reserved script code.
cfox Sep 4, 2018
189e87a
Merge branch 'develop2' of github.com:RavenProject/Ravencoin into cfo…
cfox Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/assets/assets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/script/ismine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
13 changes: 0 additions & 13 deletions src/script/script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/script/script.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down
1 change: 0 additions & 1 deletion src/script/sign.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
3 changes: 1 addition & 2 deletions src/script/standard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
3 changes: 1 addition & 2 deletions src/script/standard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
};

Expand Down