X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fscript.h;h=7177339b8dd469ce64b822f62da3e789ba695ba0;hb=15e9a03687e99d6b1a7a90e56e69a37faa6bb9b8;hp=00b05253c656ac97f270fb3cf96513d5b0919699;hpb=3124bcacd821fc2cd6153e10cbcd8f4fb9cd9f8e;p=novacoin.git diff --git a/src/script.h b/src/script.h index 00b0525..7177339 100644 --- a/src/script.h +++ b/src/script.h @@ -12,10 +12,12 @@ #include "keystore.h" #include "bignum.h" +#include "base58.h" typedef std::vector valtype; class CTransaction; +class CBitcoinAddress; static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; // bytes @@ -583,7 +585,7 @@ public: bool HasCanonicalPushes() const; void SetDestination(const CTxDestination& address); - void SetDestination(const CPubKey& R, CPubKey& pubKeyVariant); + void SetAddress(const CBitcoinAddress& dest); void SetMultisig(int nRequired, const std::vector& keys); @@ -636,6 +638,7 @@ int ScriptSigArgsExpected(txnouttype t, const std::vector &vKeys); bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet); bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::vector& addressRet, int& nRequiredRet);