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

Removing extras data from retracted blocks. #2375

Merged
merged 2 commits into from
Sep 28, 2016
Merged

Conversation

tomusdrw
Copy link
Collaborator

No description provided.

@tomusdrw tomusdrw added A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. B0-patch M4-core ⛓ Core client code / Rust. labels Sep 28, 2016
@tomusdrw tomusdrw added A0-pleasereview 🤓 Pull request needs code review. and removed A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. B0-patch labels Sep 28, 2016
@tomusdrw
Copy link
Collaborator Author

Fixes #2361

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) to 85.162% when pulling 27b105c on fix-extrascache into fb92a98 on master.

@tomusdrw tomusdrw mentioned this pull request Sep 28, 2016
@gavofyork
Copy link
Contributor

looks good to me on a cursory glance, but @debris should take a closer look.

@gavofyork gavofyork added this to the 1.3.2 milestone Sep 28, 2016
@debris debris 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 Sep 28, 2016
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.03%) to 85.152% when pulling 27b105c on fix-extrascache into fb92a98 on master.

@gavofyork gavofyork merged commit baa2fea into master Sep 28, 2016
@gavofyork gavofyork deleted the fix-extrascache branch September 28, 2016 13:49
jacogr added a commit that referenced this pull request Sep 29, 2016
* master:
  Fixing Delegate Call in JIT (#2378)
  Prioritizing re-imported transactions (#2372)
  Revert #2172, pretty much. (#2387)
  correct sync memory usage calculation (#2385)
  Update gitlab-ci
  Fix the traceAddress field in transaction traces. (#2373)
  Removing extras data from retracted blocks. (#2375)
  fixed #2263, geth keys with ciphertext shorter than 32 bytes (#2318)
  Expanse compatibility (#2369)
  Specify column cache sizes explicitly; default fallback of 2MB (#2358)
  Canonical state cache (master) (#2311)
  make block queue into a more generic verification queue and fix block heap size calculation (#2095)
  Hash Content RPC method (#2355)
  Reorder transaction_by_hash to favour canon search (#2332)
  DIV optimization (#2327)
  Error when deserializing invalid hex (#2339)
  Changed http:// to https:// on some links (#2349)
  add a test
  fix migration system, better errors

# Conflicts:
#	.gitlab-ci.yml
tomusdrw added a commit that referenced this pull request Sep 29, 2016
* Removing extras data from retracted blocks.

* Adding a test case

Conflicts:
	ethcore/src/blockchain/blockchain.rs
@tomusdrw tomusdrw mentioned this pull request Sep 29, 2016
arkpar pushed a commit that referenced this pull request Sep 29, 2016
* Removing extras data from retracted blocks. (#2375)

* Removing extras data from retracted blocks.

* Adding a test case

Conflicts:
	ethcore/src/blockchain/blockchain.rs

* Fixing transaction queue

Conflicts:
	ethcore/src/miner/transaction_queue.rs

* Prioritizing re-imported transactions (#2372)

* Prioritizing re-imported transactions

* Fixing compilation on beta

Conflicts:
	Cargo.lock
	ethcore/src/client/client.rs
	ethcore/src/miner/transaction_queue.rs

* Post-merge fixes
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. M4-core ⛓ Core client code / Rust.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants