Browse Source

Test

pull/4/head
jl777 6 years ago
parent
commit
fa62690da2
  1. 1
      src/rpcrawtransaction.cpp
  2. 4
      src/script/standard.cpp

1
src/rpcrawtransaction.cpp

@ -181,7 +181,6 @@ void TxToJSONExpanded(const CTransaction& tx, const uint256 hashBlock, UniValue&
{
const CTxOut& txout = tx.vout[i];
UniValue out(UniValue::VOBJ);
fprintf(stderr,"decode vout.%d\n",i);
out.push_back(Pair("value", ValueFromAmount(txout.nValue)));
if ( ASSETCHAINS_SYMBOL[0] == 0 && pindex != 0 && tx.nLockTime >= 500000000 && (tipindex= chainActive.LastTip()) != 0 )
{

4
src/script/standard.cpp

@ -260,9 +260,9 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
return true;
}
else if (IsCryptoConditionsEnabled() != 0 && whichType == TX_CRYPTOCONDITION)
else if ( whichType == TX_CRYPTOCONDITION)
{
//fprintf(stderr,"found CC type\n");
fprintf(stderr,"found CC type\n");
addressRet = CScriptID(uint160(vSolutions[0]));
return true;
}

Loading…
Cancel
Save