diff options
| author | Gavin Andresen <[email protected]> | 2012-05-31 16:01:16 -0400 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2012-07-05 12:50:09 -0400 |
| commit | a2709fad7f57b000333371954016045e12fc4bed (patch) | |
| tree | 378022e0c8b67dbd02a138b792bdb7be777e5822 /src/script.h | |
| parent | RPCTypeCheck method to make type-checking JSON Arrays easier. (diff) | |
| download | discoin-a2709fad7f57b000333371954016045e12fc4bed.tar.xz discoin-a2709fad7f57b000333371954016045e12fc4bed.zip | |
Implement raw transaction RPC calls
Implement listunspent / getrawtransaction / createrawtransaction /
signrawtransaction, to support creation and
signing-on-multiple-device multisignature transactions.
Diffstat (limited to 'src/script.h')
| -rw-r--r-- | src/script.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/script.h b/src/script.h index 38f346936..f4db112dd 100644 --- a/src/script.h +++ b/src/script.h @@ -597,4 +597,8 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C bool fValidatePayToScriptHash, int nHashType); bool VerifySignature(const CTransaction& txFrom, const CTransaction& txTo, unsigned int nIn, bool fValidatePayToScriptHash, int nHashType); +// Given two sets of signatures for scriptPubKey, possibly with OP_0 placeholders, +// combine them intelligently and return the result. +CScript CombineSignatures(CScript scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CScript& scriptSig1, const CScript& scriptSig2); + #endif |