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

delay bomb for Classic (ECIP-1010) #3144

Closed
wants to merge 27 commits into from
Closed

delay bomb for Classic (ECIP-1010) #3144

wants to merge 27 commits into from

Conversation

splix
Copy link
Contributor

@splix splix commented Nov 3, 2016 •
edited
Loading

This is an implementations for Bomb Delay that is planed for January ETC protocol upgrade (block 3,000,000). It's already implemented in Classic Geth, and these commits are adding compatibility for future fork into Parity as well.

See also:

PS it also includes unit tests for difficulty calculation, which were in your TODO

@parity-cla-bot
Copy link

It looks like @splix hasn'signed our Contributor License Agreement, yet.

The purpose of a CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen licence.
Wikipedia

You can read and sign our full Contributor License Agreement at the following URL: https://cla.ethcore.io

Once you've signed, plesae reply to this thread with [clabot:check] to prove it.

Many thanks,

Ethcore CLA Bot

@splix
Copy link
Contributor Author

splix commented Nov 3, 2016

[clabot:check]

@parity-cla-bot
Copy link

It looks like @splix signed our Contributor License Agreement. 👍

Many thanks,

Ethcore CLA Bot

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling de33ab5 on ethereumproject:splix/bombdelay into * on ethcore:master*.

arkpar and others added 3 commits November 3, 2016 20:01
@arkpar @gavofyork
Better shortcut (openethereum#3147)
d1b9aa7
@jacogr
[ci skip] js-precompiled 20161103-190201
29c8350
@jacogr @gavofyork
Speed up unresponsive Contract events & Account transactions (openeth…
34e3c1e 
…ereum#3145)

* Don't load method via redux

* Don't redux fetchTransaction (contracts)

* Move isTest to top-level passing

* transaction list with local blocks/transactions

* Combine calls (allows future chunking)

* Progressive loading of transactions

* Cleanups

* Never try tracing
@gavofyork
Copy link
Contributor

looks good in general; is there some way to combine bombPauseTransition and bombDiffuseTransition?

@keorn keorn added A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust. labels Nov 3, 2016
jacogr and others added 6 commits November 3, 2016 20:17
@jacogr @gavofyork
Remove network label from TabBar (openethereum#3142)
2f665ba
@jacogr
[ci skip] js-precompiled 20161103-192710
b447d69
@jacogr
[ci skip] js-precompiled 20161103-194213
f32c6af
@arkpar
Fix histogram (openethereum#3150)
0c2cfc9 
* fix histogram

* remove outdated comment
@jacogr
[ci skip] js-precompiled 20161103-202525
7e592e5
@gavofyork
EIPs 155, 160, 161 (openethereum#2976)
d3de475 
* The front-end for each hard-fork, also EIP-160.

* Address EIP161 a/c

* Include EIP-161b

* EIP-161 part d.

* Fix test build.

* Fix one test, add another.

* Fix use of bloom & renaming.

* Initial groundwork for EIP-155

* Fix minor bug.

* Fix all tests finally.

* Rest of EIP-155.

* Add tests for EIP-155 algorithm.

Update transaction tests validation.

* Minor reformat.

* Address grumbles.

* Remove unused code.

* Fix SUICIDE gas mechanism and add consensus tests.

* Remove commented code.

* Set Frontier hardfork block number

* Fix warning.

* Transaction tests,
@gavofyork
Copy link
Contributor

will also need a rebase.

jacogr and others added 5 commits November 4, 2016 06:38
@jacogr
[ci skip] js-precompiled 20161104-063713
a892fcd
@General-Beck
Update gilab-ci
72a1db8 
1. Builds only  beta, stable, tags
2. test script for check js changes in `test-linux`
3. `js-test` and `js-release` only for jg* ng* ui* brances
@General-Beck
Update gitlab-ci
8575dfd 
fix lint error in gitlab-ci.yml
@General-Beck
Update gitlab-ci
38bd842 
change tags `rust-test` - `rust-stable` etc
add rust stable, beta, nightly test's
@splix
Merge branch 'splix/bombdelay' of github.com:ethereumproject/parity i…
581f513 
…nto splix/bombdelay

Conflicts:
	ethcore/res/ethereum/classic.json
	ethcore/src/ethereum/ethash.rs
	json/src/spec/ethash.rs
@splix
Copy link
Contributor Author

splix commented Nov 4, 2016

rebased

@splix
Copy link
Contributor Author

splix commented Nov 4, 2016

bombDiffuseTransition is a different thing imho. It could be set to some block too some time later when ETC community will decide about diffusion, but for now it's just a pause.

Also, I've noticed that other parameters are prefixed with eip number, like eip160_transition. If that's a standard naming schema, I can rename our options to ecip1010_pause_transition, ecip1010_continue_transition. Should I do that?

@gavofyork
Copy link
Contributor

re: naming - sure.

not sure what went wrong with the rebase but it's now brought in all the changes from the EIP-155/160/161 hardfork PR.

will need to be untangled before sign off.

@splix
Copy link
Contributor Author

splix commented Nov 4, 2016

Ok, I'm going to rename options and will make a new clean Pull Request

@splix splix mentioned this pull request Nov 4, 2016
Merged
@splix
Copy link
Contributor Author

splix commented Nov 4, 2016

Resubmitted with #3179

@splix splix closed this Nov 4, 2016
@snyk-bot snyk-bot mentioned this pull request Jan 12, 2023
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
A0-pleasereview 🤓 Pull request needs code review. M4-core ⛓ Core client code / Rust.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@splix @parity-cla-bot @coveralls @gavofyork @keorn @arkpar @jacogr @derhuerst @General-Beck