Upstream merge up to 1.9.15 #1504

hbandura · 2021-04-12T21:54:45Z

First big conflict commit from upstream: b4a2681
ethereum/go-ethereum#20758
Completely rewrites the les server pool.
-- Currently accepted upstream version and DID NOT reimplement our changes on top of it: ( from #1132 )
-- -- The server pool entries RPC ( there are no more server pool entries now, moved to the node state machine)
-- -- The call to saveNodes may not be relevant now since this behaviour was moved to the NodeStateMachine
-- -- The use of clientDiscoveredNodesCounter. The counter was completely removed.

Upstream upgraded golangci-lint to 1.27 (was 1.24 upstream, 1.25 ours), but was kept at 1.25 (this should be done in a different issue, since it provokes some additional lint issues)

EIP-2315 related:
ethereum/go-ethereum#20619

Adds p2p wirev4 (we already had it)

Adds crypto/bls12381 (we already had it), but left our versions. Another commit made a change on it and since there was no conflict I left it there, needs review.

* accounts/abi: simplified reflection logic * accounts/abi: simplified reflection logic * accounts/abi: removed unpack * accounts/abi: removed comments * accounts/abi: removed uneccessary complications * accounts/abi: minor changes in error messages * accounts/abi: removed unnused code * accounts/abi: fixed indexed argument unpacking * accounts/abi: removed superfluous test cases This commit removes two test cases. The first one is trivially invalid as we have the same test cases as passing in packing_test.go L375. The second one passes now, because we don't need the mapArgNamesToStructFields in unpack_atomic anymore. Checking for purely underscored arg names generally should not be something we do as the abi/contract is generally out of the control of the user. * accounts/abi: removed comments, debug println * accounts/abi: added commented out code * accounts/abi: addressed comments * accounts/abi: remove unnecessary dst.CanSet check * accounts/abi: added dst.CanSet checks

* cmd/clef, signer/core: use better terminal input for passwords, make it possible to avoid boot-up warning * all: move commonly used prompter to isolated (small) package * cmd/clef: Add new --acceptWarn to clef README * cmd/clef: rename flag 'acceptWarn' to 'suppress-bootwarn' Co-authored-by: ligi <ligi@ligi.de>

* abi/bind/backends: testcase for double-lock * accounts: add blockByNumberNoLock to avoid double-lock * backend/simulated: use stateroot, not blockhash for retrieveing state Co-authored-by: Martin Holst Swende <martin@swende.se>

* trie: implement range proof with non-existent edge proof * trie: fix cornercase * trie: consider empty range * trie: add singleSide test * trie: support all-elements range proof * trie: fix typo * trie: tiny typos and formulations Co-authored-by: Péter Szilágyi <peterke@gmail.com>

This PR reimplements the light client server pool. It is also a first step to move certain logic into a new lespay package. This package will contain the implementation of the lespay token sale functions, the token buying and selling logic and other components related to peer selection/prioritization and service quality evaluation. Over the long term this package will be reusable for incentivizing future protocols. Since the LES peer logic is now based on enode.Iterator, it can now use DNS-based fallback discovery to find servers. This document describes the function of the new components: https://gist.github.com/zsfelfoldi/3c7ace895234b7b345ab4f71dab102d4

* metrics/prometheus: define type once for histograms * metrics/prometheus: test collector

…1073) * ethstats: avoid blocking chan when received invalid stats request * ethstats: minor code polishes Co-authored-by: Péter Szilágyi <peterke@gmail.com>

* trie: fix for range proof * trie: fix typo

* build: upgrade to golangci-lint v1.27.0 * build: raise lint timeout to 3 minutes

This adds a new API method on core.BlockChain to allow interrupting running data inserts, and calls the method before shutting down the downloader. The BlockChain interrupt checks are now done through a method instead of inlining the atomic load everywhere. There is no loss of efficiency from this and it makes the interrupt protocol a lot clearer because the check is defined next to the method that sets the flag.

Co-authored-by: linjing <linjingjing@baidu.com>

* trie: add hasRightElement indicator * trie: ensure the range is monotonic increasing * trie: address comment and fix lint * trie: address comment * trie: make linter happy Co-authored-by: Péter Szilágyi <peterke@gmail.com>

This PR makes use of go 1.13 error handling, wrapping errors and using errors.Is to check a wrapped root-cause. It also removes the travis builders for go 1.11 and go 1.12.

* replace gosigar with gopsutil * removed check for whether GOOS is openbsd * removed accidental import of runtime * potential fix for difference in units between gosig and gopsutil * fixed lint error * remove multiplication factor * uses cpu.ClocksPerSec as the multiplication factor * changed dependency from shirou to renaynay (#20) * updated dep * switching back from using renaynay fork to using upstream as PRs were merged on upstream * removed empty line * optimized imports * tidied go mod

* core/vm: implement EIP 2315, subroutines for the EVM * core/vm: eip 2315 - lintfix + check jump dest validity + check ret stack size constraints logger: markdown-friendly traces, validate jumpdest, more testcase, correct opcodes * core/vm: update subroutines acc to eip: disallow walk-into * core/vm/eips: gas cost changes for subroutines * core/vm: update opcodes for EIP-2315 * core/vm: define RETURNSUB as a 'jumping' operation + review concerns Co-authored-by: Martin Holst Swende <martin@swende.se>

This moves all v4 protocol definitions to a new package, p2p/discover/v4wire. The new package will be used for low-level protocol tests.

* rpc: send websocket ping when connection is idle * rpc: use non-blocking send for websocket pingReset

…ream-1.9.15

trianglesphere · 2021-05-03T17:55:42Z

Re the mobile discovery improvements, have we checked that we no longer need our changes for valora?

trianglesphere · 2021-05-03T19:15:33Z

crypto/bls12381/arithmetic_x86_adx.go

+// enableADX is true if the ADX/BMI2 instruction set was requested for the BLS
+// implementation. The system may still fall back to plain ASM if the necessary
+// instructions are unavailable on the CPU.
+const enableADX = true


Do we use enableADX anywhere?

Not according to grep, no

trianglesphere · 2021-05-03T19:26:41Z

I've taken a look at everything but the LES changes. I found one thing where we may have brought in a little too much of the upstream bls changes, but I'm not really familiar with that code.

My only ask is that we follow up on making sure that the LES changes will work with valora and then I think this is good to go.

hbandura · 2021-05-04T17:05:45Z

Re the mobile discovery improvements, have we checked that we no longer need our changes for valora?

I checked on the monorepo but will check in some other repos as well

/edit

according to https://github.com/search?q=org%3Acelo-org+serverPoolEntries&type=code we are not using it from our repos

gastonponti · 2021-05-04T17:19:47Z

core/vm/jump_table.go

@@ -62,14 +62,6 @@ var (
 // JumpTable contains the EVM opcodes supported at a given fork.
 type JumpTable [256]operation

-func newYoloV1InstructionSet() JumpTable {


This is because is not used and the lint failed?

exactly, plus the whole Yolo thing is a test network for ethereum

gastonponti · 2021-05-04T17:36:18Z

accounts/keystore/keystore.go

+
+	// ErrAccountAlreadyExists is returned if an account attempted to import is
+	// already present in the keystore.
+	ErrAccountAlreadyExists = errors.New("account alreaady exists")


the typo guy missed the doble a alreaaaaaaady

haha nice catch. do you mind if I fix this in the 1.9.16 branch so We don't re run the tests for this?

Yes, of course. I just was hating the typos guy for the big PR and tried to point it out.

cmd/utils/flags.go

gastonponti · 2021-05-04T17:46:07Z

core/vm/eips.go

@@ -32,6 +32,8 @@ func EnableEIP(eipNum int, jt *JumpTable) error {
 		enable1884(jt)
 	case 1344:
 		enable1344(jt)
+	case 2315:


Should we have this as an option? Does this work for us?

Do you know of anyone who con led some light into this?

missing the context here?
So there's an EIP 2315, but we don't have an cli option to enable it? Or is the question wether we should ahve the code for 2315?

To me, we should add all code from EIPs since probably we will have them enabled on a future HF. And they should be disable for now, which probalby is already true since they are enabled using a chainConfig flag.

I agree, this is just the code, I believe it wasn't activated yet

trianglesphere · 2021-05-04T19:09:33Z

I checked on the monorepo but will check in some other repos as well

Awesome. It seems like we're probably fine to delete this. I'd like to double check with the wallet team, but it seems like we're probably fine to go ahead with the removal.

gastonponti

LGTM

karalabe and others added 30 commits May 13, 2020 12:33

params: begin v1.9.15 release cycle

46698d7

cmd: fix log contexts (#21077)

677724a

console: fix unlockAccount argument count check (#21081)

3666da8

whisper: use canonical import name of package go-ethereum (#21099)

0a99efa

miner: replace use of 'self' as receiver name (#21113)

48e3b95

all: fix typos in comments (#21118)

4f2784b

consensus/clique: remove redundant pair of parentheses (#21104)

25a661e

core/vm: improve jumpdest lookup (#21123)

e868add

consensus/ethash: fix flaky test by reading seal results (#21085)

befecc9

cmd/utils: fix default DNS discovery configuration (#21124)

dbf6b8a

metrics/prometheus: define TYPE once, add tests (#21068)

2f66a8d

* metrics/prometheus: define type once for histograms * metrics/prometheus: test collector

ethdb/leveldb: use timer instead of time.After (#21066)

7ddb402

ethstats: avoid blocking chan when received invalid stats request (#2…

81e9cae

…1073) * ethstats: avoid blocking chan when received invalid stats request * ethstats: minor code polishes Co-authored-by: Péter Szilágyi <peterke@gmail.com>

trie: fix for range proof (#21107)

070a5e1

* trie: fix for range proof * trie: fix typo

build: upgrade to golangci lint v1.27.0 (#21127)

4873a9d

* build: upgrade to golangci-lint v1.27.0 * build: raise lint timeout to 3 minutes

consensus/clique: make internal error private (#21132)

b2c59e2

Co-authored-by: linjing <linjingjing@baidu.com>

eth/downloader: more context in errors (#21067)

a5eee8d

This PR makes use of go 1.13 error handling, wrapping errors and using errors.Is to check a wrapped root-cause. It also removes the travis builders for go 1.11 and go 1.12.

p2p/discover: move discv4 encoding to new 'v4wire' package (#21147)

723bd8c

This moves all v4 protocol definitions to a new package, p2p/discover/v4wire. The new package will be used for low-level protocol tests.

rpc: send websocket ping when connection is idle (#21142)

d98c42c

* rpc: send websocket ping when connection is idle * rpc: use non-blocking send for websocket pingReset

console: handle undefined + null in console funcs (#21160)

5f6f5e3

core: collect NewTxsEvent items without holding reorg lock (#21145)

3f649d4

hbandura requested review from gastonponti, kobigurk, nategraf, oneeman, trianglesphere and a team as code owners April 12, 2021 21:54

hbandura added 6 commits April 14, 2021 16:27

Merge remote-tracking branch 'origin/master' into hbandura/merge-upst…

2e60b17

…ream-1.9.15

Update golangci-lint version in circleci yaml config

9d03427

Revert golangci to 1.25

e5b3623

Fix lint issues

6fa5182

Fix lint gosec

f74fc2a

Add missing counter

e69d1ef

trianglesphere marked this pull request as draft April 20, 2021 15:54

trianglesphere added the do not merge label Apr 20, 2021

Remove clientDiscoveredNodesCounter

8e8f023

hbandura changed the title ~~[DONT MERGE YET] Upstream merge up to 1.9.15~~ Upstream merge up to 1.9.15 Apr 21, 2021

Merge remote-tracking branch 'origin/master' into hbandura/merge-upst…

2a37c8e

…ream-1.9.15

hbandura removed the do not merge label Apr 21, 2021

hbandura marked this pull request as ready for review April 21, 2021 17:28

trianglesphere self-assigned this Apr 28, 2021

trianglesphere reviewed May 3, 2021

View reviewed changes

gastonponti reviewed May 4, 2021

View reviewed changes

hbandura mentioned this pull request May 6, 2021

Upstream merge up to 1.9.16 #1536

Merged

gastonponti approved these changes May 10, 2021

View reviewed changes

hbandura merged commit 6c736da into master May 10, 2021

hbandura deleted the hbandura/merge-upstream-1.9.15 branch May 10, 2021 15:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upstream merge up to 1.9.15 #1504

Upstream merge up to 1.9.15 #1504

hbandura commented Apr 12, 2021 •

edited

Loading

trianglesphere commented May 3, 2021

trianglesphere May 3, 2021

hbandura May 4, 2021

trianglesphere commented May 3, 2021

hbandura commented May 4, 2021 •

edited

Loading

gastonponti May 4, 2021

hbandura May 4, 2021

gastonponti May 4, 2021

hbandura May 4, 2021

gastonponti May 4, 2021

gastonponti May 4, 2021

hbandura May 4, 2021

hbandura May 4, 2021

mcortesi May 7, 2021

hbandura May 7, 2021

trianglesphere commented May 4, 2021

gastonponti left a comment

Upstream merge up to 1.9.15 #1504

Upstream merge up to 1.9.15 #1504

Conversation

hbandura commented Apr 12, 2021 • edited Loading

trianglesphere commented May 3, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

trianglesphere commented May 3, 2021

hbandura commented May 4, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

trianglesphere commented May 4, 2021

gastonponti left a comment

Choose a reason for hiding this comment

hbandura commented Apr 12, 2021 •

edited

Loading

hbandura commented May 4, 2021 •

edited

Loading