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

Upgrade parity-common deps to latest #11620

Merged
merged 18 commits into from
Apr 11, 2020
Merged

Conversation

dvdplm
Copy link
Collaborator

@dvdplm dvdplm commented Apr 9, 2020

@dvdplm dvdplm changed the title Upgrade parity-common deps to lates Upgrade parity-common deps to latest Apr 9, 2020
@ordian
Copy link
Collaborator

ordian commented Apr 10, 2020

  • sort out doubts

paritytech/parity-common#370

ethash/src/keccak.rs Outdated Show resolved Hide resolved
dvdplm and others added 5 commits April 10, 2020 17:40
…h/parity-ethereum into dp/chore/upgrade-parity-crypto

* 'dp/chore/upgrade-parity-crypto' of github.com:paritytech/parity-ethereum:
  ethash: use overlapping bytes after all
  ethash: sneaky spaces
  ethash: upgrade keccak-hash
@niklasad1
Copy link
Collaborator

What's up with the change of ethcore/res/ethereum/tests in this PR?

@ordian
Copy link
Collaborator

ordian commented Apr 10, 2020

What's up with the change of ethcore/res/ethereum/tests in this PR?

Sorry, my fault, will revert.

ordian and others added 3 commits April 10, 2020 20:53
…h/parity-ethereum into dp/chore/upgrade-parity-crypto

* 'dp/chore/upgrade-parity-crypto' of github.com:paritytech/parity-ethereum:
  revert submodule update
@@ -197,21 +198,17 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
// improvements, since I can't imagine that 3-5% of our runtime is taken up by catting two
// arrays together.
let mut buf: MixBuf = MixBuf {
half_mix: unsafe {
Copy link
Collaborator

Choose a reason for hiding this comment

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

👍

keccak-hash = "0.4.0"
kvdb = "0.4.0"
kvdb-rocksdb = "0.6.0"
keccak-hash = "0.5.0"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should probably be 0.5.1?

Fixed in Cargo.lock so it is fine to ignore.

Copy link
Collaborator

@niklasad1 niklasad1 left a comment

Choose a reason for hiding this comment

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

LGTM

Comment on lines +142 to +149
let end = hash_len + mem::size_of::<u64>();
buf[hash_len..end].copy_from_slice(&nonce.to_ne_bytes());

keccak_512::unchecked(buf.as_mut_ptr(), 64, buf.as_ptr(), 40);
keccak_512::inplace_range(&mut buf, 0..end);
buf[64..].copy_from_slice(mix_hash);

let mut hash = [0u8; 32];
keccak_256::unchecked(hash.as_mut_ptr(), hash.len(), buf.as_ptr(), buf.len());
keccak_256::write(&buf, &mut hash);
Copy link
Collaborator

Choose a reason for hiding this comment

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

this change introduced a substantial regression, nothing stands out in benches paritytech/parity-common#372 though

it shouldn't be a blocker for merging this PR though, I'll work on bringing the perf back

Comment on lines -1055 to -1063
[[package]]
name = "error-chain"
version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd"
dependencies = [
"version_check",
]

Copy link
Collaborator

Choose a reason for hiding this comment

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

❤️

@ordian
Copy link
Collaborator

ordian commented Apr 10, 2020

@q9f does this branch fixes the issues you're seeing in görli?

EDIT: Sorry, spoke too early, the fix will be in another PR.

@dvdplm dvdplm mentioned this pull request Apr 10, 2020
@dvdplm dvdplm marked this pull request as ready for review April 10, 2020 20:33
@ordian ordian merged commit 1b23af3 into master Apr 11, 2020
@ordian ordian deleted the dp/chore/upgrade-parity-crypto branch April 11, 2020 11:16
dvdplm added a commit that referenced this pull request Apr 14, 2020
* master:
  Upgrade parity-common deps to latest (#11620)
dvdplm added a commit that referenced this pull request Apr 14, 2020
* master: (25 commits)
  Update .gitmodules (#11628)
  ethcore/res: activate ecip-1088 phoenix on classic (#11598)
  Upgrade parity-common deps to latest (#11620)
  Fix Goerli syncing (#11604)
  deps: switch to upstream ctrlc (#11617)
  Deduplicating crate dependencies (part 3 of n) (#11614)
  Deduplicating crate dependencies (part 2 of n, `slab`) (#11613)
  Actually save ENR on creation and modification (#11602)
  Activate POSDAO on xDai chain and update bootnodes (#11610)
  Activate on-chain randomness in POA Core (#11609)
  Deduplicating crate dependencies (part 1 of n) (#11606)
  Update enodes for POA Sokol (#11611)
  Remove .git folder from dogerignore file so vergen library can get build date and commit hash in the binary generatio vergen library can get build date and commit hash in the binary generation (#11608)
  Reduced gas cost for static calls made to precompiles EIP2046/1352 (#11583)
  [easy] `ethcore-bloom-journal` was renamed to `accounts-bloom` (#11605)
  Use serde_json to export hardcoded sync (#11601)
  Node Discovery v4 ENR Extension (EIP-868) (#11540)
  Fix compile warnings (#11595)
  Update version to 3.0.0-alpha.1 (#11592)
  ethcore/res: bump canon fork hash for mordor and kotti testnets (#11584)
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants