Add withdraw lock to script/standard.h (and, thus, RPC raw txn)

This commit is contained in:
Matt Corallo 2014-11-14 16:58:12 -08:00 committed by Gregory Sanders
parent c51a6f32d0
commit cca18eee8d
4 changed files with 12 additions and 1 deletions

View file

@ -33,6 +33,7 @@ const char* GetTxnOutputType(txnouttype t)
case TX_NULL_DATA: return "nulldata";
case TX_WITNESS_V0_KEYHASH: return "witness_v0_keyhash";
case TX_WITNESS_V0_SCRIPTHASH: return "witness_v0_scripthash";
case TX_WITHDRAW_LOCK: return "withdraw";
}
return NULL;
}
@ -94,6 +95,12 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
return true;
}
if (scriptPubKey.IsWithdrawLock())
{
typeRet = TX_WITHDRAW_LOCK;
return true;
}
// Scan templates
const CScript& script1 = scriptPubKey;
BOOST_FOREACH(const PAIRTYPE(txnouttype, CScript)& tplate, mTemplates)
@ -216,7 +223,7 @@ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, vecto
vector<valtype> vSolutions;
if (!Solver(scriptPubKey, typeRet, vSolutions))
return false;
if (typeRet == TX_NULL_DATA){
if (typeRet == TX_NULL_DATA || typeRet == TX_WITHDRAW_LOCK){
// This is data, not addresses
return false;
}