aboutsummaryrefslogtreecommitdiff
path: root/src/script.h
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-05-31 16:01:16 -0400
committerGavin Andresen <gavinandresen@gmail.com>2012-07-05 12:50:09 -0400
commita2709fad7f57b000333371954016045e12fc4bed (patch)
tree378022e0c8b67dbd02a138b792bdb7be777e5822 /src/script.h
parent899d373b3ccb3003f8f6e518ba4cf7ba4028e58b (diff)
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.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/script.h b/src/script.h
index 38f3469364..f4db112dd6 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