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

swarm-network-rewrite conflicts with master #589

Merged
merged 80 commits into from
May 24, 2018

Conversation

nonsense
Copy link
Contributor

No description provided.

countvonzero and others added 30 commits April 24, 2018 10:39
Indicate that --light and --fast options are replaced by --syncmode
core, eth: fix tracer dirty finalization
travis.yml: remove obsolete brew-cask install
vendor: Fix index out of range panic when size is bigger than 1 TiB
This fixes an issue where local transactions are discarded as
underpriced when the pool and queue are full.
…ced_txs

core: ensure local transactions aren't discarded as underpriced
cmd/evm: use block number from genesis
Smaller size on mobile is always good.
Might also solve our maven central upload problem
build: Add ldflags "-s -w" when building aar
clef: documentation about setup
* rpc/*: golint error with context as last parameter

* Update json.go
karalabe and others added 15 commits May 18, 2018 13:18
travis, appveyor: bump Go release to 1.10.2
all: collate new transaction events together
Fix some typos in comment code and output log
eth: propagate blocks and transactions async
* node: all golint warnings fixed

* node: rm per peter

* node: rm per peter
…(#16766)

* vendor: update leveldb package

* ethdb: print warning log if db is performing compaction

* ethdb: update annotation and log
trie: support proof generation from the iterator
* core: use a wrapped `map` and `sync.RWMutex` for `TxPool.all` to remove contention in `TxPool.Get`.

* core: Remove redundant `txLookup.Find` and improve comments on txLookup methods.
@gbalint gbalint merged commit 6f2d560 into swarm-network-rewrite May 24, 2018
@gbalint gbalint deleted the snr-conflicts-master branch May 24, 2018 14:14
dleonard00 pushed a commit to dleonard00/go-ethereum that referenced this pull request May 24, 2018
…t-warnings

* swarm-network-rewrite: (90 commits)
  swarm-network-rewrite conflicts with master (ethersphere#589)
  p2p, swarm: use different names for counter and timer
  swarm/network/simulations: Skip TestOverlaySim
  swarm/storage: Rename indexSize, edit comments
  eth, node, trie: fix minor typos (#16802)
  swarm/storage: Update validator to correct metadata chunk check
  swarm/storage: Add BinaryUnmarshaler to resource
  swarm/api: Delint + typo
  swarm/api, swarm/storage: Comment update
  swarm/api: Consolidate manifest key as entry point for mutable resource
  swarm/storage: Add function comments
  swarm/api, swarm/storage: Rewrite resource api for content addr key
  swarm/storage: Revert to name lookup, export LoadResource (takes key)
  swarm/storage: Change Lookup from name(hash) to key
  p2p, swarm: measure number of p2p.Send calls and time them; measure number of peers per registry/node
  trie: cleaner logic, one less func call
  swarm/network: fix bzz handshake tests
  swarm: Correct ResourceParams instantiation in testutils
  core: use a wrapped map to remove contention in `TxPool.Get`. (#16670)
  core/vm: fix typo in instructions.go (#16788)
  ...
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.