Skip to content

Remove bOPReturnEnabled and correct handling of OP_RETURN #1283

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
merged 1 commit into from
Sep 3, 2018
Merged

Remove bOPReturnEnabled and correct handling of OP_RETURN #1283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ CBigNum bnProofOfWorkLimitTestNet(~uint256(0) >> 16);
unsigned int nStakeMinAge = 16 * 60 * 60; // 16 hours
unsigned int nStakeMaxAge = -1; // unlimited
unsigned int nModifierInterval = 10 * 60; // time to elapse before new modifier is computed
bool bOPReturnEnabled = true;

// Gridcoin:
int nCoinbaseMaturity = 100;
Expand Down Expand Up @@ -5115,7 +5114,6 @@ bool LoadBlockIndex(bool fAllowNew)
nGrandfather = 196550;
nNewIndex = 10;
nNewIndex2 = 36500;
bOPReturnEnabled = false;
//1-24-2016
MAX_OUTBOUND_CONNECTIONS = (int)GetArg("-maxoutboundconnections", 8);
}
Expand Down
2 changes: 0 additions & 2 deletions src/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ extern std::set<CWallet*> setpwalletRegistered;
extern unsigned char pchMessageStart[4];
extern std::map<uint256, CBlock*> mapOrphanBlocks;

extern bool bOPReturnEnabled;

// Settings
extern int64_t nTransactionFee;
extern int64_t nReserveBalance;
Expand Down
11 changes: 11 additions & 0 deletions src/qt/transactionrecord.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,17 @@ bool TransactionRecord::showTransaction(const CWalletTx &wtx)
return false;
}
}

// Suppress OP_RETURN transactions if they did not originate from you.
// This is not "very" taxing but necessary since the transaction is in the wallet already.
if (!wtx.IsFromMe())
{
for (auto const& txout : wtx.vout)
{
if (txout.scriptPubKey == (CScript() << OP_RETURN))
Copy link
Member

@iFoggz iFoggz Sep 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the logic behind this is that if any tx with multiple txs contains this with no address in scriptpubkey it will display in all wallets. This allows OP_RETURN to be used with data in a transaction still however if its only a OP_RETURN and no valid address we just don't show the transaction.

The gibberish address we experienced and saw is the checksum of null for an address. Other coins experienced similar in the past.

return false;
}
}
return true;
}

Expand Down
9 changes: 4 additions & 5 deletions src/script.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1506,7 +1506,7 @@ int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned c
case TX_NONSTANDARD:
return -1; // Note, this was empty (thats -1);
case TX_NULL_DATA:
return (bOPReturnEnabled) ? -1 : -1;
return -1;
// Script Sig Args Expected: Bitcoin=-1, PPCoin=1
case TX_PUBKEY:
return 1;
Expand Down Expand Up @@ -1584,8 +1584,7 @@ bool IsMine(const CKeyStore &keystore, const CScript& scriptPubKey)
{
case TX_NONSTANDARD:
case TX_NULL_DATA:
// Note this was always false, til 3-13-2016.
return (bOPReturnEnabled) ? true : false;
return false;
case TX_PUBKEY:
keyID = CPubKey(vSolutions[0]).GetID();
return keystore.HaveKey(keyID);
Expand Down Expand Up @@ -1620,8 +1619,8 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
if (!Solver(scriptPubKey, whichType, vSolutions))
return false;

if (bOPReturnEnabled && whichType == TX_NULL_DATA)
return true;
if (whichType == TX_NULL_DATA)
return false;

if (whichType == TX_PUBKEY)
{
Expand Down
4 changes: 2 additions & 2 deletions src/wallet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,8 +818,8 @@ void CWalletTx::GetAmounts2(list<COutputEntry>& listReceived,
}
else
{
if ( ( !bOPReturnEnabled && !ExtractDestination(txout.scriptPubKey, address) )
|| ( bOPReturnEnabled && !ExtractDestination(txout.scriptPubKey, address) && txout.scriptPubKey[0] != OP_RETURN) )
if ( ( !ExtractDestination(txout.scriptPubKey, address) )
|| ( !ExtractDestination(txout.scriptPubKey, address) && txout.scriptPubKey[0] != OP_RETURN) )
{
LogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s",
this->GetHash().ToString().c_str());
Expand Down