Pieter Wuille
10 years ago
No known key found for this signature in database
GPG Key ID: 8F653255C87992E0
13 changed files with
34 additions and
33 deletions
-
src/Makefile.am
-
src/script/compressor.cpp
-
src/script/compressor.h
-
src/script/interpreter.cpp
-
src/script/interpreter.h
-
src/script/script.cpp
-
src/script/script.h
-
src/script/sign.cpp
-
src/script/sign.h
-
src/script/standard.cpp
-
src/script/standard.h
-
src/wallet_ismine.cpp
-
src/wallet_ismine.h
|
|
@ -98,8 +98,8 @@ BITCOIN_CORE_H = \ |
|
|
|
rpcclient.h \
|
|
|
|
rpcprotocol.h \
|
|
|
|
rpcserver.h \
|
|
|
|
script/interpreter.h \
|
|
|
|
script/compressor.h \
|
|
|
|
script/interpreter.h \
|
|
|
|
script/script.h \
|
|
|
|
script/sign.h \
|
|
|
|
script/standard.h \
|
|
|
@ -212,8 +212,8 @@ libbitcoin_common_a_SOURCES = \ |
|
|
|
keystore.cpp \
|
|
|
|
netbase.cpp \
|
|
|
|
protocol.cpp \
|
|
|
|
script/interpreter.cpp \
|
|
|
|
script/compressor.cpp \
|
|
|
|
script/interpreter.cpp \
|
|
|
|
script/script.cpp \
|
|
|
|
script/sign.cpp \
|
|
|
|
script/standard.cpp \
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#include "compressor.h" |
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#ifndef H_BITCOIN_SCRIPT_COMPRESSOR |
|
|
@ -81,4 +81,4 @@ public: |
|
|
|
} |
|
|
|
}; |
|
|
|
|
|
|
|
#endif |
|
|
|
#endif // H_BITCOIN_SCRIPT_COMPRESSOR
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#include "interpreter.h" |
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#ifndef H_BITCOIN_SCRIPT_INTERPRETER |
|
|
@ -10,9 +10,9 @@ |
|
|
|
#include <stdint.h> |
|
|
|
#include <string> |
|
|
|
|
|
|
|
class uint256; |
|
|
|
class CScript; |
|
|
|
class CTransaction; |
|
|
|
class uint256; |
|
|
|
|
|
|
|
/** Signature hash types/flags */ |
|
|
|
enum |
|
|
@ -42,4 +42,4 @@ bool CheckSig(std::vector<unsigned char> vchSig, const std::vector<unsigned char |
|
|
|
bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType); |
|
|
|
bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType); |
|
|
|
|
|
|
|
#endif |
|
|
|
#endif // H_BITCOIN_SCRIPT_INTERPRETER
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#include "script.h" |
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#ifndef H_BITCOIN_SCRIPT |
|
|
@ -642,4 +642,4 @@ public: |
|
|
|
} |
|
|
|
}; |
|
|
|
|
|
|
|
#endif |
|
|
|
#endif // H_BITCOIN_SCRIPT
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#include "script/sign.h" |
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#ifndef H_BITCOIN_SCRIPT_SIGN |
|
|
@ -11,6 +11,7 @@ |
|
|
|
class CKeyStore; |
|
|
|
class CScript; |
|
|
|
class CTransaction; |
|
|
|
|
|
|
|
struct CMutableTransaction; |
|
|
|
|
|
|
|
bool SignSignature(const CKeyStore& keystore, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL); |
|
|
@ -20,4 +21,4 @@ bool SignSignature(const CKeyStore& keystore, const CTransaction& txFrom, CMutab |
|
|
|
// combine them intelligently and return the result.
|
|
|
|
CScript CombineSignatures(CScript scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CScript& scriptSig1, const CScript& scriptSig2); |
|
|
|
|
|
|
|
#endif |
|
|
|
#endif // H_BITCOIN_SCRIPT_SIGN
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#include "script/standard.h" |
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#ifndef H_BITCOIN_SCRIPT_STANDARD |
|
|
@ -53,4 +53,4 @@ bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType); |
|
|
|
bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet); |
|
|
|
bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<CTxDestination>& addressRet, int& nRequiredRet); |
|
|
|
|
|
|
|
#endif |
|
|
|
#endif // H_BITCOIN_SCRIPT_STANDARD
|
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#include "wallet_ismine.h" |
|
|
|
|
|
@ -1,6 +1,6 @@ |
|
|
|
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
|
|
// Copyright (c) 2009-2013 The Bitcoin developers
|
|
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
|
|
// Distributed under the MIT software license, see the accompanying
|
|
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
|
|
|
|
#ifndef H_BITCOIN_WALLET_ISMINE |
|
|
@ -25,4 +25,4 @@ typedef uint8_t isminefilter; |
|
|
|
isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey); |
|
|
|
isminetype IsMine(const CKeyStore& keystore, const CTxDestination& dest); |
|
|
|
|
|
|
|
#endif // H_BITCOIN_SCRIPT
|
|
|
|
#endif // H_BITCOIN_WALLET_ISMINE
|
|
|
|