From 71c4f88bf9bb6a134772b98a108f07ad32a750e7 Mon Sep 17 00:00:00 2001 From: janko33bd Date: Sat, 6 Jan 2018 00:37:31 +0100 Subject: [PATCH] fixing to compile --- src/main.cpp | 6 +++--- src/script/script_error.h | 3 +++ src/test/script_P2SH_tests.cpp | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index fb6bf5ba2..513de47d1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1920,11 +1920,11 @@ public: virtual bool CountAcks(const std::vector& chainId, int periodAck, int periodLiveness, int& positive, int& negative) const; - CachingTransactionSignatureCheckerWithBlockReader(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amount, bool storeIn, int height); + CachingTransactionSignatureCheckerWithBlockReader(const CTransaction* txToIn, unsigned int nInIn, bool storeIn, int height); }; -CachingTransactionSignatureCheckerWithBlockReader::CachingTransactionSignatureCheckerWithBlockReader(const CTransaction* txToIn, unsigned int nInIn, const CAmount& amount, bool storeIn, int height) - : CachingTransactionSignatureChecker(txToIn, nInIn, amount, storeIn), nHeight(height), hash(txToIn->GetHash()) +CachingTransactionSignatureCheckerWithBlockReader::CachingTransactionSignatureCheckerWithBlockReader(const CTransaction* txToIn, unsigned int nInIn, bool storeIn, int height) + : CachingTransactionSignatureChecker(txToIn, nInIn, storeIn), nHeight(height), hash(txToIn->GetHash()) { } diff --git a/src/script/script_error.h b/src/script/script_error.h index 26df33932..d9c88a809 100644 --- a/src/script/script_error.h +++ b/src/script/script_error.h @@ -51,6 +51,9 @@ typedef enum ScriptError_t /* softfork safeness */ SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS, + + /* count acks */ + SCRIPT_ERR_COUNT_ACKS_INVALID_PARAM, SCRIPT_ERR_ERROR_COUNT } ScriptError; diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index 28b85e8d2..a49ca2fbb 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE(sign) { CScript sigSave = txTo[i].vin[0].scriptSig; txTo[i].vin[0].scriptSig = txTo[j].vin[0].scriptSig; - bool sigOK = CScriptCheck(CCoins(txFrom, 0), txTo[i], 0, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, false)(); + bool sigOK = CScriptCheck(CCoins(txFrom, 0), txTo[i], 0, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC, false, -1)(); if (i == j) BOOST_CHECK_MESSAGE(sigOK, strprintf("VerifySignature %d %d", i, j)); else