From 39f0d9686095bce469dbfa52333331a5d15c6545 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Thu, 19 Jan 2012 13:30:54 -0500 Subject: Make transactions with extra data in their scriptSig's non-standard. --- src/script.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/script.cpp') diff --git a/src/script.cpp b/src/script.cpp index 66962d78b..c0523855b 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -1312,6 +1312,25 @@ bool Solver(const CKeyStore& keystore, const CScript& scriptPubKey, uint256 hash return false; } +int ScriptSigArgsExpected(txnouttype t, const std::vector >& vSolutions) +{ + switch (t) + { + case TX_NONSTANDARD: + return -1; + case TX_PUBKEY: + return 1; + case TX_PUBKEYHASH: + return 2; + case TX_MULTISIG: + if (vSolutions.size() < 1 || vSolutions[0].size() < 1) + return -1; + return vSolutions[0][0] + 1; + case TX_SCRIPTHASH: + return 1; // doesn't include args needed by the script + } + return -1; +} bool IsStandard(const CScript& scriptPubKey) { -- cgit v1.2.3