diff options
author | Luke Dashjr <luke-jr+git@utopios.org> | 2014-10-11 22:41:05 +0000 |
---|---|---|
committer | Jorge Timón <jtimon@jtimon.cc> | 2015-06-26 17:59:10 +0200 |
commit | 9238ecb41752e097443d0bc117df35ebd4ac932e (patch) | |
tree | 31c253bebd26069a8917cb1c993f72d4bb604538 /src/script/standard.cpp | |
parent | 627b9deff4e8e18fc6d001b6eb9818c13c648820 (diff) |
Policy: MOVEONLY: 3 functions to policy.o:
- [script/standard.o] IsStandard
- [main.o] IsStandardTx
- [main.o] AreInputsStandard
Also, don't use namespace std in policy.cpp
Diffstat (limited to 'src/script/standard.cpp')
-rw-r--r-- | src/script/standard.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/script/standard.cpp b/src/script/standard.cpp index ce50e3aad8..66657127ab 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -180,26 +180,6 @@ int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned c return -1; } -bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType) -{ - vector<valtype> vSolutions; - if (!Solver(scriptPubKey, whichType, vSolutions)) - return false; - - if (whichType == TX_MULTISIG) - { - unsigned char m = vSolutions.front()[0]; - unsigned char n = vSolutions.back()[0]; - // Support up to x-of-3 multisig txns as standard - if (n < 1 || n > 3) - return false; - if (m < 1 || m > n) - return false; - } - - return whichType != TX_NONSTANDARD; -} - bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet) { vector<valtype> vSolutions; |