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

EthMiner crate #653

Closed
wants to merge 49 commits into from
Closed

EthMiner crate #653

wants to merge 49 commits into from

Conversation

tomusdrw
Copy link
Collaborator

Same as #632 but to master
Please merge #640 & #650 & #651 first.

@tomusdrw tomusdrw added the A0-pleasereview 🤓 Pull request needs code review. label Mar 10, 2016
gavofyork and others added 4 commits March 10, 2016 11:07
Gas price threshold for transactions
Conflicts:
	Cargo.lock
	Cargo.toml
	hook.sh
	miner/src/transaction_queue.rs
	rpc/Cargo.toml
	sync/Cargo.toml
	sync/src/chain.rs
@gavofyork gavofyork added A1-onice 🌨 Pull request is reviewed well, but should not yet be merged. A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. and removed A0-pleasereview 🤓 Pull request needs code review. labels Mar 10, 2016
@tomusdrw
Copy link
Collaborator Author

We should probably wait with this until #641 #609 #587 are merged.
I will resolve all conflicts in a single batch.

@gavofyork
Copy link
Contributor

presumably this kind of reverses/rewrites #641, no?

Tomasz Drwięga added 3 commits March 10, 2016 15:35
Conflicts:
	ethcore/src/client.rs
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/chain.rs
@tomusdrw tomusdrw removed the A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. label Mar 11, 2016
Tomasz Drwięga and others added 9 commits March 11, 2016 15:56
Conflicts:
	rpc/src/v1/impls/eth.rs
Conflicts:
	util/bigint/src/uint.rs
Conflicts:
	ethcore/src/client/client.rs
	parity/main.rs
	sync/src/chain.rs
	sync/src/lib.rs
Conflicts:
	miner/src/miner.rs
	parity/main.rs
Conflicts:
	Cargo.toml
	rpc/Cargo.toml
	sync/Cargo.toml
@gavofyork gavofyork added A0-pleasereview 🤓 Pull request needs code review. and removed A1-onice 🌨 Pull request is reviewed well, but should not yet be merged. labels Mar 12, 2016
Conflicts:
	parity/main.rs
}

/// New chain head event. Restart mining operation.
pub fn prepare_sealing(&self) {
fn prepare_sealing(&self, author: Address, extra_data: Bytes, transactions: Vec<SignedTransaction>) -> Option<ClosedBlock> {
Copy link
Contributor

Choose a reason for hiding this comment

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

will be nice to move this function into the ethminer crate eventually - that can happen in civility though.

@gavofyork
Copy link
Contributor

looks like this has some of the other recent changes in. can we get a proper diff to review?

@tomusdrw
Copy link
Collaborator Author

It contains #661 and #640 which has been reviewed and merged to this branch.
#632 Was also reviewed earlier.

This PR only introduces ethminer crate and includes transactions to mined block. I can split it into couple of PRs if you prefer (but it basicly requires reverting commits and reverting the reverts in separate prs)

@gavofyork
Copy link
Contributor

ahh i see. that rather makes it hard to see what changes have been reviewed and what are new :-/


{
let good = good.par_iter().map(|h| fetch_transactions(chain, h));
let bad = bad.par_iter().map(|h| fetch_transactions(chain, h));
Copy link
Contributor

Choose a reason for hiding this comment

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

is this really "bad" (i.e. invalid)? or just retracted? if retracted, then rest of logic is fine. if invalid, then rest of logic is broken (we don't want to be adding transactions from invalid blocks).

@gavofyork
Copy link
Contributor

1000+ lines changed over 32 files. this is too big, and more importantly, diffuse. the fact that some arbitrary set of those changes have already been reviewed doesn't help a bit, since we can't tell which parts.

this includes various refactorings, some small, some big. i've reviewed it as best as i can and the style and basic premise is good, but there is no way i would sign off on the logic or there being no unintended consequences.

would have been much nicer if we had incremental alterations where each step can be logic-checked.

@gavofyork gavofyork added A6-mustntgrumble 💦 Pull request has areas for improvement. The author need not address them before merging. and removed A0-pleasereview 🤓 Pull request needs code review. labels Mar 12, 2016
@tomusdrw tomusdrw closed this Mar 12, 2016
@tomusdrw tomusdrw deleted the ethminer_crate branch March 15, 2016 08:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A6-mustntgrumble 💦 Pull request has areas for improvement. The author need not address them before merging.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants