Mercurial > hg > bitcoin

diff src/script.h @ 3154:6c1eeeb7e4c2 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement raw transaction RPC calls Implement listunspent / getrawtransaction / createrawtransaction / signrawtransaction, to support creation and signing-on-multiple-device multisignature transactions.
author Gavin Andresen <gavinandresen@gmail.com>
date Thu, 31 May 2012 16:01:16 -0400 (2012-05-31)
parents bf716647e542
children ed27f924d951
line wrap: on
line diff
--- a/src/script.h
+++ b/src/script.h
@@ -597,4 +597,8 @@
                   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