Merge #13439: rpc: Avoid "duplicate" return value for invalid submitblock
ClosedPublic
Actions

Authored by jasonbcox on Aug 12 2019, 18:31.

Details

Reviewers

deadalnix
nakihito

Group Reviewers

Restricted Project

Commits

rSTAGINGa1f94345f230: Merge #13439: rpc: Avoid "duplicate" return value for invalid submitblock
rABCa1f94345f230: Merge #13439: rpc: Avoid "duplicate" return value for invalid submitblock

Summary

f74894480 Only set fNewBlock to true in AcceptBlock when we write to disk (Matt Corallo)
fa6e49731 rpc: Avoid "duplicate" return value for invalid submitblock (MarcoFalke)

Pull request description:

This is #13395 with one more commit tacked on. MarcoFalke got tired of dealing with the stupidity of fixing a return code with too many rounds of review (not that I blame him). Honestly we should probably have no return whatsoever, but for now, this fixes it (as well as nLastBlockTime for eviction purposes).

Original description:

When `submitblock` of an invalid block, the return value should not be `"duplicate"`.

This is only seen when the header was previously found (denoted by the incorrectly named boolean `fBlockPresent`). Fix this bug by removing `fBlockPresent`.

Tree-SHA512: 0ce3092655d5d904b4c8c5ff7479f73ce387144a738f20472b8af132564005c6db5594ae366e589508f6258506ee7a28b1c7995a83a8328b334f99316006bf2d

Backport of Core PR13439
https://github.com/bitcoin/bitcoin/pull/13439/files

Test Plan

make check
test_runner.py

Diff Detail

Repository

rABC Bitcoin ABC

Branch

pr13439

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 7433
Build 12909: Bitcoin ABC Buildbot (legacy)
Build 12908: arc lint + arc unit

Event Timeline

jasonbcox created this revision.Aug 12 2019, 18:31

Herald added a reviewer: deadalnix. · View Herald TranscriptAug 12 2019, 18:31

Build Bitcoin-ABC / Diffs / Diff Testing started.

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7118: Diff 10734.Aug 12 2019, 18:38

nakihito accepted this revision.Aug 12 2019, 22:54

This revision is now accepted and ready to land.Aug 12 2019, 22:54

Build Bitcoin-ABC / Resource Intensive Builds / Bitcoin-ABC IBD Diff Testing (w/o checkpoints) started.

Build Bitcoin-ABC / Resource Intensive Builds / Bitcoin-ABC IBD Diff Testing (w/o checkpoints) passed.

After some discussion with Fabien, we decided it wasn't urgent to get this change in without tests to accompany it (or at least be landed shortly after). https://github.com/bitcoin/bitcoin/pull/13983/ This PR and it's dependencies get us there, but will take some more time. Putting this diff on the back burner until then.

Tracking PR13983 in T686

jasonbcox added a child revision: D4046: Merge #13399: rpc: Add submitheader.Sep 11 2019, 21:07

D4047 (T686) is ready for review. Consider it while reviewing this change and I will land the stack together once they're all green.

This revision is now accepted and ready to land.Sep 11 2019, 21:18

Build Bitcoin-ABC / Diffs / Diff Testing started.

jasonbcox requested review of this revision.Sep 11 2019, 21:19

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B7407: Diff 11228.Sep 11 2019, 21:29

deadalnix accepted this revision.Sep 12 2019, 08:24

This revision is now accepted and ready to land.Sep 12 2019, 08:24

Rebase

Build Bitcoin-ABC / Diffs / Diff Testing started.