Merge remote-tracking branch 'upstream/master' into bet

chips-blockchain · Nov 16, 2018 · a04a2e7 · a04a2e7
2 parents 08ef24b + d09ef71
commit a04a2e7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -109,3 +109,5 @@ test/cache/*
 
 libbitcoinconsensus.pc
 contrib/devtools/split-debug.sh
+
+bet/
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2812,7 +2812,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P
 
     // Check transactions
     for (const auto& tx : block.vtx)
-        if (!CheckTransaction(*tx, state, false))
+        if (!CheckTransaction(*tx, state, true))
             return state.Invalid(false, state.GetRejectCode(), state.GetRejectReason(),
                                  strprintf("Transaction check failed (tx hash %s) %s", tx->GetHash().ToString(), state.GetDebugMessage()));
Original file line number	Diff line number	Diff line change
Expand Up		@@ -109,3 +109,5 @@ test/cache/*

		libbitcoinconsensus.pc
		contrib/devtools/split-debug.sh

		bet/