Skip to content
This repository has been archived by the owner on Aug 2, 2021. It is now read-only.

master merge to swarm-network-rewrite #716

Merged
merged 75 commits into from
Jun 14, 2018
Merged

Conversation

nonsense
Copy link
Contributor

@nonsense nonsense commented Jun 14, 2018

This PR is a master merge plus:

  1. Removal of socket adapter as it is not supported on Windows.
  2. Replaced ToECDSAPub with error-checking func UnmarshalPubkey in PSS, as crypto.ToECDSAPub was removed in master - see 0255951

karalabe and others added 30 commits May 28, 2018 12:58
Fix a spelling mistake in comment
This commit adds many comments and removes unused code.
It also removes the EmptyHash function, which had some uses
but was silly.
core/vm: fix typo in comment
This removes a golint warning: type name will be used as trie.TrieSync by
other packages, and that stutters; consider calling this Sync.

In hexToKeybytes len(hex) is even and (even+1)/2 == even/2, remove the +1.
core: fix transaction event asynchronicity
Use Read instead of Sum to avoid internal allocations and
copying the state.

name                      old time/op  new time/op  delta
CacheGeneration-8          764ms ± 1%   579ms ± 1%  -24.22%  (p=0.000 n=20+17)
SmallDatasetGeneration-8  75.2ms ±12%  60.6ms ±10%  -19.37%  (p=0.000 n=20+20)
HashimotoLight-8          1.58ms ±11%  1.55ms ± 8%     ~     (p=0.322 n=20+19)
HashimotoFullSmall-8      4.90µs ± 1%  4.88µs ± 1%   -0.31%  (p=0.013 n=19+18)
* core, eth, trie: streaming GC for the trie cache

* trie: track memcache statistics
* metrics: expvar support for ResettingTimer

* metrics: use integers for percentiles; remove Overall

* metrics: fix edge-case panic for index-out-of-range
rpc: set timeouts for http server, see #16859
cmd: cap cache size if exceeds reasonable range
core: fix typo in comment code
* tracing: fix minor off-by-one error

* tracers: go generate
fjl and others added 15 commits June 12, 2018 15:26
…#16932)

ToECDSAPub was unsafe because it returned a non-nil key with nil X, Y in
case of invalid input. This change replaces ToECDSAPub with
UnmarshalPubkey across the codebase.
This PR fixes a retriever logic bug. When a peer had a soft timeout
and then a response arrived, it always assumed it was the same peer
even though it could have been a later requested one that did not time
out at all yet. In this case the logic went to an illegal state and
deadlocked, causing a goroutine leak.

Fixes #16243 and replaces #16359.
Thanks to @riceke for finding the bug in the logic.
core/asm/lexer: correct comments typo
console/console: correct some comments typo
…tead of hardcoded port 30303 (#15687)

Improves test portability by resolving 127.0.0.1:0
to get a random free port instead of the hard coded one. Now
the test works if you have a running node on the same
interface already.

Fixes #15685
This commit adds all changes needed for the merge of swarm-network-rewrite.
The changes:

- build: increase linter timeout
- contracts/ens: export ensNode
- log: add Output method and enable fractional seconds in format
- metrics: relax test timeout
- p2p: reduced some log levels, updates to simulation packages
- rpc: increased maxClientSubscriptionBuffer to 20000
* vm/test: add tests+benchmarks for mstore

* core/vm: less alloc and copying for mstore

* core/vm: less allocs in sload

* vm: check for errors more correctly
Prior to this change, when geth was started with `geth -dev -rpc`,
it would report a network id of `1` in response to the `net_version` RPC
request. But the actual network id it used to verify transactions
was `1337`.

This change causes geth instead respond with `1337` to the `net_version`
RPC when geth is started with `geth -dev -rpc`.
@nonsense nonsense merged commit d151d9e into swarm-network-rewrite Jun 14, 2018
@nonsense nonsense deleted the master_to_snrw branch June 14, 2018 15:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.