This repository was archived by the owner on Aug 2, 2021. It is now read-only.

swarm-network-rewrite conflicts with master#589

Merged

gbalint merged 80 commits intoswarm-network-rewritefrom

snr-conflicts-master

May 24, 2018

Commits on Apr 24, 2018

core/types: avoid duplicating transactions on changing signer (#16435)

countvonzero
authored and
karalabe
committed

Commits on Apr 27, 2018

Commits on May 1, 2018

travis.yml: remove obsolete brew-cask install
reductionista
committed

Commits on May 2, 2018

whisper: Golint fixes in whisper packages (#16637)

roveneliah
authored and
gballet
committed
vendor: fix leveldb crash when bigger than 1 TiB

timothy
authored and
karalabe
committed
Merge pull request #16636 from reductionista/travis
karalabe
authored
Merge pull request #16630 from tstranex/master
karalabe
authored
core: ensure local transactions aren't discarded as underpriced

Crispin Flowerday
authored and
karalabe
committed
evm/main: use blocknumber from genesis
holiman
committed
accounts: golint updates for this or self warning (#16627)

kielbarry
authored and
karalabe
committed
tests: golint fixes for tests directory (#16640)

roveneliah
authored and
karalabe
committed
trie: golint iterator fixes (#16639)

roveneliah
authored and
karalabe
committed
internal: golint updates for this or self warning (#16634)

kielbarry
authored and
karalabe
committed
core: golint updates for this or self warning (#16633)

kielbarry
authored and
karalabe
committed
Merge pull request #16576 from CrispinFlowerday/bugfix/local_underpriced_txs
karalabe
authored
Merge pull request #16569 from holiman/evm_blocknum
karalabe
authored
build: Add ldflags -s -w when building aar
ligi
committed
Merge pull request #16644 from ligi/reduce_aar_size
karalabe
authored
cmd/clef: documentation about setup (#16568)

holiman
authored and
karalabe
committed
params: release geth 1.8.7
karalabe
committed
VERSION, params: begin v1.8.8 release cycle
karalabe
committed

Commits on May 3, 2018

log: changed if-else blocks to conform with golint (#16661)

GagziW
authored and
karalabe
committed
p2p: changed if-else blocks to conform with golint (#16660)

GagziW
authored and
karalabe
committed
les: changed if-else blocks to conform with golint (#16658)

GagziW
authored and
karalabe
committed
accounts: changed if-else blocks to conform with golint (#16654)

GagziW
authored and
karalabe
committed
rpc: golint error with context as last parameter (#16657)

kielbarry
authored and
karalabe
committed
metrics: golint updates for this or self warning (#16635)

kielbarry
authored and
karalabe
committed
consensus/ethash: fixed typo (#16665)

YH-Zhou
authored and
karalabe
committed
event: golint updates for this or self warning (#16631)

kielbarry
authored and
karalabe
committed
eth: golint updates for this or self warning (#16632)

kielbarry
authored and
karalabe
committed

Commits on May 4, 2018

signer: fix golint errors (#16653)

roveneliah
authored and
karalabe
committed
whisper/mailserver: pass init error to the caller (#16671)

divan
authored and
karalabe
committed

Commits on May 7, 2018

common: changed if-else blocks to conform with golint (#16656)

GagziW
authored and
karalabe
committed
mobile: add GetStatus Method for Receipt (#16598)

erichin
authored and
karalabe
committed
core/rawdb: separate raw database access to own package (#16666)
karalabe
authored

Commits on May 8, 2018

rlp: fix some golint warnings (#16659)

kielbarry
authored and
fjl
committed
p2p: fix some golint warnings (#16577)

kielbarry
authored and
fjl
committed
eth/filters: derive FilterCriteria from ethereum.FilterQuery (#16629)

reductionista
authored and
fjl
committed
p2p/simulations/adapters: fix websocket log line parsing in exec adapter (#16667)

divan
authored and
fjl
committed
build: specify the key to use when invoking gpg:sign-and-deploy-file (#16696)

ligi
authored and
fjl
committed
crypto: fix golint warnings (#16710)

kielbarry
authored and
fjl
committed
p2p: don't discard reason set by Disconnect (#16559)

gsalgado
authored and
fjl
committed

Commits on May 9, 2018

Commits on May 10, 2018

event: document select case slice use and add edge case test (#16680)

fjl
authored and
karalabe
committed
travis: use Android NDK 16b (#16562)

ligi
authored and
karalabe
committed
bmt: golint updates for this or self warning (#16628)

kielbarry
authored and
karalabe
committed

Commits on May 17, 2018

p2p/enr: updates for discovery v4 compatibility (#16679)
fjl
authored

Commits on May 19, 2018

Commits on May 21, 2018

Commits on May 22, 2018

log: fixes for golint warnings (#16775)

kielbarry
authored and
karalabe
committed
node: all golint warnings fixed (#16773)

kielbarry
authored and
karalabe
committed
vendor, ethdb: print warning log if leveldb is performing compaction (#16766)

rjl493456442
authored and
karalabe
committed

Commits on May 24, 2018

swarm: resolve merge conflicts
nonsense
committed