Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Use static call and apparent value transfer for block reward contract code #9603

Merged
merged 2 commits into from
Sep 25, 2018
Merged

Use static call and apparent value transfer for block reward contract code #9603

merged 2 commits into from
Sep 25, 2018

Conversation

sorpaas
Copy link
Collaborator

@sorpaas sorpaas commented Sep 20, 2018

Make block reward contract code to use static call and apparent value transfer, so that system address will never be touched by it.

@sorpaas sorpaas added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Sep 20, 2018
@sorpaas sorpaas added this to the 2.2 milestone Sep 20, 2018
@andresilva andresilva mentioned this pull request Sep 20, 2018
Merged
andresilva
andresilva approved these changes Sep 20, 2018
View reviewed changes
Copy link
Contributor

@andresilva andresilva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andresilva andresilva added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Sep 20, 2018
@andresilva
Copy link
Contributor

andresilva commented Sep 20, 2018 •
edited
Loading

We need to document that a block reward contract deployed with blockRewardContractCode must be pure.

@5chdn 5chdn added A7-looksgoodtestsfail 🤖 Pull request is reviewed well, but cannot be merged due to tests failing. and removed A8-looksgood 🦄 Pull request is reviewed well. labels Sep 21, 2018
@debris debris self-requested a review September 25, 2018 10:39
@debris debris merged commit 4c2301f into master Sep 25, 2018
@debris debris added A8-looksgood 🦄 Pull request is reviewed well. and removed A7-looksgoodtestsfail 🤖 Pull request is reviewed well, but cannot be merged due to tests failing. labels Sep 25, 2018
@ordian ordian deleted the sp-block-reward-code-fix branch September 25, 2018 11:34
dvdplm added a commit that referenced this pull request Sep 27, 2018
@dvdplm
Merge remote-tracking branch 'origin/master' into dp/chore/update-com…
d86ba16 
…mon-deps

* origin/master:
  ethereum libfuzzer integration small change (#9547)
  cli: remove reference to --no-ui in --unlock flag help (#9616)
  remove master from releasable branches (#9655)
  ethcore/VerificationQueue don't spawn up extra `worker-threads` when explictly specified not to (#9620)
  RPC: parity_getBlockReceipts (#9527)
  Remove unused dependencies (#9589)
  ignore key_server_cluster randomly failing tests (#9639)
  ethcore: handle vm exception when estimating gas (#9615)
  fix bad-block reporting no reason (#9638)
  Use static call and apparent value transfer for block reward contract code (#9603)
  HF in POA Sokol (2018-09-19) (#9607)
  bump smallvec to 0.6 in ethcore-light, ethstore and whisper (#9588)
  Add constantinople conf to EvmTestClient. (#9570)
@andresilva andresilva mentioned this pull request Oct 9, 2018
Merged
@5chdn
Copy link
Contributor

5chdn commented Oct 10, 2018

Do we want to backport this?

@sorpaas
Copy link
Collaborator Author

sorpaas commented Oct 10, 2018

This is a potentially breaking change (but also a bugfix that makes block reward contract code work!). So I think we may need to backport this, but it's not urgent. Sorry I missed the backport tag!

andresilva pushed a commit that referenced this pull request Oct 10, 2018
@sorpaas @andresilva
Use static call and apparent value transfer for block reward contract…
533a112 
… code (#9603)
@andresilva andresilva mentioned this pull request Oct 10, 2018
Merged
7 tasks
5chdn pushed a commit that referenced this pull request Oct 10, 2018
@andresilva @5chdn
[beta] More backports for 2.1.2 (#9733)
d35f4c1 
* produce portable binaries (#9725)

* HF in POA Core (2018-10-22) (#9724)

poanetwork/poa-chain-spec#87

* Use static call and apparent value transfer for block reward contract code (#9603)

* Verify block syncing responses against requests (#9670)

* sync: Validate received BlockHeaders packets against stored request.

* sync: Validate received BlockBodies and BlockReceipts.

* sync: Fix broken tests.

* sync: Unit tests for BlockDownloader::import_headers.

* sync: Unit tests for import_{bodies,receipts}.

* tests: Add missing method doc.

* Fix ancient blocks sync (#9531)

* Log block set in block_sync for easier debugging

* logging macros

* Match no args in sync logging macros

* Add QueueFull error

* Only allow importing headers if the first matches requested

* WIP

* Test for chain head gaps and log

* Calc distance even with 2 heads

* Revert previous commits, preparing simple fix

This reverts commit 5f38aa8.

* Reject headers with no gaps when ChainHead

* Reset block sync download when queue full

* Simplify check for subchain heads

* Add comment to explain subchain heads filter

* Fix is_subchain_heads check and comment

* Prevent premature round completion after restart

This is a problem on mainnet where multiple stale peer requests will
force many rounds to complete quickly, forcing the retraction.

* Reset stale old blocks request after queue full

* Revert "Reject headers with no gaps when ChainHead"

This reverts commit 0eb8655.

* Add BlockSet to BlockDownloader logging

Currently it is difficult to debug this because there are two instances,
one for OldBlocks and one for NewBlocks. This adds the BlockSet to all
log messages for easy log filtering.

* Reset OldBlocks download from last enqueued

Previously when the ancient block queue was full it would restart the
download from the last imported block, so the ones still in the queue would be
redownloaded. Keeping the existing downloader instance and just
resetting it will start again from the last enqueued block.:wq

* Ignore expired Body and Receipt requests

* Log when ancient block download being restarted

* Only request old blocks from peers with >= difficulty

#9226 might be too
permissive and causing the behaviour of the retraction soon after the
fork block. With this change the peer difficulty has to be greater than
or euqal to our syncing difficulty, so should still fix
#9225

* Some logging and clear stalled blocks head

* Revert "Some logging and clear stalled blocks head"

This reverts commit 757641d.

* Reset stalled header if useless more than once

* Store useless headers in HashSet

* Add sync target to logging macro

* Don't disable useless peer and fix log macro

* Clear useless headers on reset and comments

* Use custom error for collecting blocks

Previously we resued BlockImportError, however only the Invalid case and
this made little sense with the QueueFull error.

* Remove blank line

* Test for reset sync after consecutive useless headers

* Don't reset after consecutive headers when chain head

* Delete commented out imports

* Return DownloadAction from collect_blocks instead of error

* Don't reset after round complete, was causing test hangs

* Add comment explaining reset after useless

* Replace HashSet with counter for useless headers

* Refactor sync reset on bad block/queue full

* Add missing target for log message

* Fix compiler errors and test after merge

* ethcore: revert ethereum tests submodule update

* Add hardcoded headers (#9730)

* add foundation hardcoded header #6486017

* add ropsten hardcoded headers #4202497

* add kovan hardcoded headers #9023489

* gitlab ci: releasable_branches: change variables condition to schedule (#9729)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@andresilva andresilva andresilva approved these changes

@debris debris debris approved these changes

Assignees
No one assigned
Labels
A8-looksgood 🦄 Pull request is reviewed well. M4-core ⛓ Core client code / Rust.
Projects
None yet
Milestone
2.2
Development

Successfully merging this pull request may close these issues.
4 participants
@sorpaas @andresilva @5chdn @debris