diff options
| author | Jonas Schnelli <[email protected]> | 2016-06-04 16:01:24 +0200 |
|---|---|---|
| committer | Jonas Schnelli <[email protected]> | 2016-06-04 16:01:35 +0200 |
| commit | d46b8b50fc3e725df75378db2d81aa48f9a1bd74 (patch) | |
| tree | a87e2c12b6d5fa56b63556c74fccef9425bc190a /src/main.cpp | |
| parent | Merge #7967: [RPC] add feerate option to fundrawtransaction (diff) | |
| parent | comment nit: miners don't vote (diff) | |
| download | discoin-d46b8b50fc3e725df75378db2d81aa48f9a1bd74.tar.xz discoin-d46b8b50fc3e725df75378db2d81aa48f9a1bd74.zip | |
Merge #8143: comment nit: miners don't vote
e39dc69 comment nit: miners don't vote (instagibbs)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp index c98f42d7c..527d4f570 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1886,8 +1886,8 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi // such nodes as they are not following the protocol. That // said during an upgrade careful thought should be taken // as to the correct behavior - we may want to continue - // peering with non-upgraded nodes even after a soft-fork - // super-majority vote has passed. + // peering with non-upgraded nodes even after soft-fork + // super-majority signaling has occurred. return state.DoS(100,false, REJECT_INVALID, strprintf("mandatory-script-verify-flag-failed (%s)", ScriptErrorString(check.GetScriptError()))); } } |