Pull changes from head fork #3

nkuba · 2018-10-02T06:23:01Z

Update keep-network/go-ethereum fork with latest changes from head repository ethereum/go-ethereum.

Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>

cmd/swarm: password threw on upload manifest

* swarm/network: simplify kademlia/hive; rid interfaces * swarm, swarm/network/stream, swarm/netork/simulations,, swarm/pss: adapt to new Kad API * swarm/network: minor changes re review; add missing lock to NeighbourhoodDepthC

…17484) * swarm/storage: remove redundant increments for dataIdx and entryCnt * swarm/storage: add Delete to LDBStore * swarm/storage: wait for garbage collection

Co-authored-by: Janos Guljas <janos@resenje.org> Co-authored-by: Balint Gabor <balint.g@gmail.com> Co-authored-by: Anton Evangelatov <anton.evangelatov@gmail.com> Co-authored-by: Viktor Trón <viktor.tron@gmail.com>

cmd/clef: fix incorrect file permissions for secrets.dat

README: Change gitter badge to discord

consensus/clique, core: chain maker clique + error tests

* ethdb: unified code comment style. * puppeth: it is unnecessary to alloc pre-funded to 256 addresses * Revert "puppeth: it is unnecessary to alloc pre-funded to 256 addresses" This reverts commit 5e04fbc. * puppeth: fix comment typo * Revert "ethdb: unified code comment style." This reverts commit a581efb.

Eip1234

* swarm/network: Protocol bump (for chunk refactor) * swarm/network: Increase discovery and stream protocol version too * swarm/network: Increase priority queue cap

* ethdb: unified code comment style. * puppeth: it is unnecessary to alloc pre-funded to 256 addresses * Revert "puppeth: it is unnecessary to alloc pre-funded to 256 addresses" This reverts commit 5e04fbc. * puppeth: fix comment typo * Revert "ethdb: unified code comment style." This reverts commit a581efb. * cmd/puppeth: fix comment typo

…ty (#17692)

…tion (#17559) * swarm/storage/mru: Adaptive Frequency swarm/storage/mru/lookup: fixed getBaseTime Added NewEpoch constructor swarm/api/client: better error handling in GetResource() swarm/storage/mru: Renamed structures. Renamed ResourceMetadata to ResourceID. Renamed ResourceID.Name to ResourceID.Topic swarm/storage/mru: Added binarySerializer interface and test tools swarm/storage/mru/lookup: Changed base time to time and + marshallers swarm/storage/mru: Added ResourceID (former resourceMetadata) swarm/storage/mru: Added ResourceViewId and serialization tests swarm/storage/mru/lookup: fixed epoch unmarshaller. Added Epoch Equals swarm/storage/mru: Fixes as per review comments cmd/swarm: reworded resource create/update help text regarding topic swarm/storage/mru: Added UpdateLookup and serializer tests swarm/storage/mru: Added UpdateHeader, serializers and tests swarm/storage/mru: changed UpdateAddr / epoch to Base() swarm/storage/mru: Added resourceUpdate serializer and tests swarm/storage/mru: Added SignedResourceUpdate tests and serializers swarm/storage/mru/lookup: fixed GetFirstEpoch bug swarm/storage/mru: refactor, comments, cleanup Also added tests for Topic swarm/storage/mru: handler tests pass swarm/storage/mru: all resource package tests pass swarm/storage/mru: resource test pass after adding timestamp checking support swarm/storage/mru: Added JSON serializers to ResourceIDView structures swarm/storage/mru: Sever, client, API test pass swarm/storage/mru: server test pass swarm/storage/mru: Added topic length check swarm/storage/mru: removed some literals, improved "previous lookup" test case swarm/storage/mru: some fixes and comments as per review swarm/storage/mru: first working version without metadata chunk swarm/storage/mru: Various fixes as per review swarm/storage/mru: client test pass swarm/storage/mru: resource query strings and manifest-less queries swarm/storage/mru: simplify naming swarm/storage/mru: first autofreq working version swarm/storage/mru: renamed ToValues to AppendValues swarm/resource/mru: Added ToValues / FromValues for URL query strings swarm/storage/mru: Changed POST resource to work with query strings. No more JSON. swarm/storage/mru: removed resourceid swarm/storage/mru: Opened up structures swarm/storage/mru: Merged Request and SignedResourceUpdate swarm/storage/mru: removed initial data from CLI resource create swarm/storage/mru: Refactor Topic as a direct fixed-length array swarm/storage/mru/lookup: Comprehensive GetNextLevel tests swarm/storage/mru: Added comments Added length checks in Topic swarm/storage/mru: fixes in tests and some code comments swarm/storage/mru/lookup: new optimized lookup algorithm swarm/api: moved getResourceView to api out of server swarm/storage/mru: Lookup algorithm working swarm/storage/mru: comments and renamed NewLookupParams Deleted commented code swarm/storage/mru/lookup: renamed Epoch.LaterThan to After swarm/storage/mru/lookup: Comments and tidying naming swarm/storage/mru: fix lookup algorithm swarm/storage/mru: exposed lookup hint removed updateheader swarm/storage/mru/lookup: changed GetNextEpoch for initial values swarm/storage/mru: resource tests pass swarm/storage/mru: valueSerializer interface and tests swarm/storage/mru/lookup: Comments, improvements, fixes, more tests swarm/storage/mru: renamed UpdateLookup to ID, LookupParams to Query swarm/storage/mru: renamed query receiver var swarm/cmd: MRU CLI tests * cmd/swarm: remove rogue fmt * swarm/storage/mru: Add version / header for future use * swarm/storage/mru: Fixes/comments as per review cmd/swarm: remove rogue fmt swarm/storage/mru: Add version / header for future use- * swarm/storage/mru: fix linter errors * cmd/swarm: Speeded up TestCLIResourceUpdate

* signer: implement USB interaction with hw wallets * signer: fix failing testcases

cmd/swarm: trim new lines from files

I am planning to use this to resolve names to user addresses for Swarm/MRU feeds.

When CLI tests were spanning new nodes, the log level verbosity was hard coded as 6. So the Swarm process was always polluting the test output with TRACE level logs. Now `go test -v ./cmd/swarm -loglevel 0` works as expected.

- update go-colorable, go-isatty, go-runewidth packages - use go-isatty instead of log/term and remove log/term package

This implements EIP-695.

)

- Mime types generator (Standard "mime" package rely on system-settings, see mime.osInitMime) - Changed swarm/api.Upload: - simplify I/O throttling by semaphore primitive and use file name where possible - f.Close() must be called in Defer - otherwise panic or future added early return will cause leak of file descriptors - one error was suppressed

…_win cmd/swarm: disable export and upload tests on Windows

cmd/swarm: correct swarm version on --help

Shadowfiend · 2018-10-02T14:55:49Z

This will actually end up with some very weird history divergences for our branch.

The best way to pull in upstream* here is:

# Assuming origin is keep-network/go-ethereum and ethereum is ethereum/go-ethereum…
git fetch ethereum
git checkout master
git reset --hard ethereum/master
git push -f origin master

That'll make sure our master == ethereum/go-ethereum's master.

nkuba · 2019-05-20T06:39:46Z

Thank you for detailed instruction @Shadowfiend!

We also need to push tags for this repo, so the commands which worked for me were:

# Assuming origin is keep-network/go-ethereum and upstream is ethereum/go-ethereum…
git fetch --tags upstream
git checkout master
git reset --hard upstream/master
git push --tags -f origin master

karalabe and others added 30 commits September 11, 2018 16:40

consensus/clique, core: chain maker clique + error tests

4bb2504

cmd/swarm: password threw on upload manifest

933ebaa

cmd/clef: fix incorrect file permissions for secrets.dat

b040b75

Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>

Merge pull request #17651 from ethersphere/wet-run-bug

b06ff56

cmd/swarm: password threw on upload manifest

Kademlia refactor (#17641)

bfce003

* swarm/network: simplify kademlia/hive; rid interfaces * swarm, swarm/network/stream, swarm/netork/simulations,, swarm/pss: adapt to new Kad API * swarm/network: minor changes re review; add missing lock to NeighbourhoodDepthC

consensus: implement Constantinople EIP 1234

0732617

swarm/storage: remove redundant increments for dataIdx and entryCnt (#…

ff3a5d2

…17484) * swarm/storage: remove redundant increments for dataIdx and entryCnt * swarm/storage: add Delete to LDBStore * swarm/storage: wait for garbage collection

swarm: Chunk refactor (#17659)

3ff2f75

Co-authored-by: Janos Guljas <janos@resenje.org> Co-authored-by: Balint Gabor <balint.g@gmail.com> Co-authored-by: Anton Evangelatov <anton.evangelatov@gmail.com> Co-authored-by: Viktor Trón <viktor.tron@gmail.com>

core/vm: fix typo 'EVM EVM' ==> 'EVM' (#17654)

72c820c

Merge pull request #17652 from YaoZengzeng/file-permission

7bb95a9

cmd/clef: fix incorrect file permissions for secrets.dat

README: Change gitter badge to discord

44a1764

all: simplify s[:] to s where s is a slice (#17673)

86a03f9

les: fix distReq.sentChn double close bug (#17639)

d4a28a1

Merge pull request #17674 from eosclassicteam/discord

7c71e93

README: Change gitter badge to discord

ethash: less copy-paste for EIP 1234

3df7df0

Merge pull request #17622 from karalabe/chain-maker-seal

cc21928

consensus/clique, core: chain maker clique + error tests

ethash: documentation + cleanup

7efb12d

Merge pull request #17675 from holiman/eip1234

41ac8dd

Eip1234

consensus, ethdb, metrics: implement forced-meter (#17667)

5d1d1a8

swarm: Chunk refactor improvements (#17683)

bd58098

* swarm/network: Protocol bump (for chunk refactor) * swarm/network: Increase discovery and stream protocol version too * swarm/network: Increase priority queue cap

core, state: initial implementation of Eip-1283

58374e2

core,state: finish implementing Eip 1283

caa2c23

swarm/network: downgrade fetcher unable to request log message severi…

1f45ba9

…ty (#17692)

core, params: polish net gas metering PR a bit

5d921fa

tests: disable constantinople statetests

360a72d

travis, Dockerfile, appveyor, build: bump to Go 1.11

67c332e

core, eth: fix goimports for Go 1.11

faa69be

consensus/clique: hide no transaction error (#17614)

0b47771

jpeletier and others added 26 commits September 28, 2018 12:07

Clef: USB hw wallet support (#17756)

dcaabfe

* signer: implement USB interaction with hw wallets * signer: fix failing testcases

cmd/swarm: trim new lines from files

d5837e8

swarm/storage: make linter happy

0ee44e7

Merge pull request #17781 from ethersphere/trim_newline

7910dd5

cmd/swarm: trim new lines from files

swarm/storage: ensure 64bit hasherStore struct alignment (#17766)

7e1c374

build: fix typo (#17773)

4d8c724

tests: update slow test lists, skip on windows/386 (#17758)

79ca6c7

contracts/ens: expose Add and SetAddr in ENS (#17661)

f1b9a3e

I am planning to use this to resolve names to user addresses for Swarm/MRU feeds.

accounts/abi/bind/backends: fix typo (#17749)

a5aaab2

cmd/swarm: respect --loglevel in run_test helpers (#17739)

d9e324a

When CLI tests were spanning new nodes, the log level verbosity was hard coded as 6. So the Swarm process was always polluting the test output with TRACE level logs. Now `go test -v ./cmd/swarm -loglevel 0` works as expected.

internal/debug: support color terminal for cygwin/msys2 (#17740)

44eb695

- update go-colorable, go-isatty, go-runewidth packages - use go-isatty instead of log/term and remove log/term package

internal/ethapi: add eth_chainId method (#17617)

107f556

This implements EIP-695.

core/types: fix typos (#17762)

ffca6df

eth/downloader: use intermediate variable for better readability (#17510

024b22c

)

cmd/swarm: remove swarm binary (#17784)

01d9f29

eth: broadcast blocks to at least 4 peers (#17725)

3d782bc

core/types: make tx signature values optional in JSON (#17742)

86ec213

core, internal/ethapi: add and use LRU cache for receipts (#17610)

b69942b

cmd/swarm: correct swarm version on --help

9a749dc

cmd/swarm: disable export and upload tests on Windows

634e963

accounts/abi: fix panic in MethodById lookup. Fixes #17797 (#17798)

96fd50b

les: limit state ODR retrievals to the last 100 blocks (#17744)

b7bbe66

Merge pull request #17800 from ethersphere/disable_cmd_swarm_tests_on…

2c8d5de

…_win cmd/swarm: disable export and upload tests on Windows

Merge pull request #17799 from ethersphere/correct_swarm_version

83116a3

cmd/swarm: correct swarm version on --help

nkuba requested a review from pdyraga October 2, 2018 06:24

nkuba merged commit 83116a3 into keep-network:master Oct 2, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pull changes from head fork #3

Pull changes from head fork #3

nkuba commented Oct 2, 2018 •

edited

Loading

Shadowfiend commented Oct 2, 2018 •

edited

Loading

nkuba commented May 20, 2019

Pull changes from head fork #3

Pull changes from head fork #3

Conversation

nkuba commented Oct 2, 2018 • edited Loading

Shadowfiend commented Oct 2, 2018 • edited Loading

nkuba commented May 20, 2019

nkuba commented Oct 2, 2018 •

edited

Loading

Shadowfiend commented Oct 2, 2018 •

edited

Loading