Skip to content

Commit

Permalink
Merge quorum v22.1.0
Browse files Browse the repository at this point in the history
commit c50aaab3911681ac0174b24527627a4f3e22e1d6
Author: Antony Denyer <git@antonydenyer.co.uk>
Date:   Thu Jan 27 09:49:19 2022 +0000

    Bump version to v22.1.0

commit d258a138864999157cbcd7be4037b70d7cb772e5
Author: Quorum Bot <46820074+quorumbot@users.noreply.github.com>
Date:   Thu Jan 27 09:14:50 2022 +0000

    [Upgrade] Go-Ethereum release v1.10.0 (#1249)

    * consensus/ethash: implement faster difficulty calculators (#21976)

    This PR adds re-written difficulty calculators, which are based on uint256. It also adds a fuzzer + oss-fuzz integration for the new fuzzer. It does differential fuzzing between the new and old calculators.

    Note: this PR does not actually enable the new calculators.

    * consensus: refactor FinalizeAndAssemble to use Finalize (#21993)

    * core, eth, les: implement unclean-shutdown marker (#21893)

    This PR implements unclean shutdown marker. Every time geth boots, it adds a timestamp to a list of timestamps in the database. This list is capped at 10. At a clean shutdown, the timestamp is removed again.
    Thus, when geth exits unclean, the marker remains, and at boot up we show the most recent unclean shutdowns to the user, which makes it easier to diagnose root-causes to certain problems.

    Co-authored-by: Nagy Salem <me@muhnagy.com>

    * abi/bind: fix error-handling in generated wrappers for functions returning structs (#22005)

    Fixes the template used when generating code, which in some scenarios would lead to panic instead of returning an error.

    * cmd/abigen: clarify abigen alias flag usage (#21875)

    * doc: clarify abigen alias flag usage

    update the `abigen --alias` flag help info, give an example to make it more clear

    related issue: https://github.com/ethereum/go-ethereum/issues/21846

    * Update cmd/abigen/main.go

    Co-authored-by: ligi <ligi@ligi.de>

    Co-authored-by: Martin Holst Swende <martin@swende.se>
    Co-authored-by: ligi <ligi@ligi.de>

    * core, eth: split eth package, implement snap protocol (#21482)

    This commit splits the eth package, separating the handling of eth and snap protocols. It also includes the capability to run snap sync (https://github.com/ethereum/devp2p/blob/master/caps/snap.md) , but does not enable it by default.

    Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de>
    Co-authored-by: Martin Holst Swende <martin@swende.se>

    * cmd/geth: fixed parallelization flaw in account import test (#22002)

    * eth/protocols/eth: remove magic numbers in test (#21999)

    * eth, core: speed up some tests (#22000)

    * les: les/4 minimalistic version (#21909)

    * les: allow tx unindexing in les/4 light server mode

    * les: minor fixes

    * les: more small fixes

    * les: add meaningful constants for recentTxIndex handshake field

    * cmd/faucet: sort requests by newest first (#22018)

    * eth/download/statesync : optimize to avoid a copy in state sync hashing  (#22035)

    * eth/download/statesync : state hash sum optimized

    * go fmt with blank in imports

    * keccak read arg fix

    * eth/downloader: fix typo in comment (#22019)

    * internal/ethapi: restore net_version RPC method (#22061)

    During the snap and eth refactor, the net_version rpc call was falsely deprecated.
    This restores the net_version RPC handler as most eth2 nodes and other software
    depend on it.

    * common,crypto: move fuzzers out of core (#22029)

    * common,crypto: move fuzzers out of core

    * fuzzers: move vm fuzzer out from core

    * fuzzing: rework cover package logic

    * fuzzers: lint

    * README.md: update Travis badge (#22079)

    The legacy dot-org URL was displaying a message about the repository
    having migrated to the dot-com service, which now covers open-source
    projects as well.

    * eth, eth/tracers: include intrinsic gas in calltracer, expose for all tracers (#22038)

    * eth/tracers: share tx gas price with js tracer

    * eth/tracers: use `go generate`

    * eth/tracers: try with another version of go-bindata

    * eth/tracers: export txGas

    * eth, eth/tracers: pass intrinsic gas to js tracers

    eth/tracers: include tx gas in tracers usedGas

    eth/tracers: fix prestate tracer's sender balance

    eth/tracers: rm unnecessary import

    eth/tracers: pass intrinsicGas separately to tracer

    eth/tracers: fix tests broken by lack of txdata

    eth, eth/tracers: minor fix

    * eth/tracers: regenerate assets + unexport test-struct + add testcase

    * eth/tracers: simplify tests + make table-driven

    Co-authored-by: Guillaume Ballet <gballet@gmail.com>
    Co-authored-by: Martin Holst Swende <martin@swende.se>

    * tests/fuzzers: fix false positive in bitutil fuzzer (#22076)

    * cmd/geth: replace wiki links with new doc pages (#22071)

    * eth/filters: replace wiki links with new doc pages (#22070)

    * signer: docs - replace wiki links with new doc pages (#22069)

    * eth/downloader: remove unnecessary condition (#22052)

    * docs: replace wiki links with new doc pages in readme.md (#22065) (#22066)

    * core/rawdb, eth/protocols : Method name typo fix (#22026)

    * accounts/abi/bind: fix erroneous test (#22053)

    closes #22049

    * core/state/snapshot: gethring -> gathering typo (#22104)

    * cmd/geth: update copyright year (#22099)

    * .github: Replace wiki links with new doc pages (#22065) (#22068)

    * node: rename startNetworking to openEndpoints (#22105)

    * SECURITY.md: link to release page (#22067)

    Add links to go-ethereum's GitHub release page.

    Co-authored-by: Felix Lange <fjl@twurst.com>

    * cmd: support v1.1 Twitter API in faucet, fix puppeth

    * miner: avoid sleeping in miner (#22108)

    This PR removes a logic in the miner, which was originally intended to help temporary testnets based on ethash from "running off into the future". If the difficulty was low, and a few computers started mining several blocks per second, the ethash rules (which demand 1s delay between blocks) would push the blocktimes further and further away.
    The solution was to make the miner sleep while this happened.

    Nowadays, this problem is solved instead by PoA chains, and it's recommended to let testnets and devnets be based on clique instead. The existing logic is problematic, since it can cause stalls within the miner making it difficult for remote workers to submit work if the channel is blocked on a sleep.

    Credits to Saar Tochner for reporting this via the bug bounty

    * cmd/geth: usb is off by default (#21984)

    * graphql: use a decimal representation for gas limit and gas used (#21883)

    This changes the JSON encoding of blocks returned by the API
    to have decimal instead of hexadecimal numbers. The spec wants
    it this way.

    Co-authored-by: Martin Holst Swende <martin@swende.se>

    * cmd/geth: added --mainnet flag (#21932)

    * cmd/geth: added --mainnet flag

    * cmd/utils: set default genesis if --mainnet is specified

    * cmd/utils: addressed comments

    * common/compiler: fix parsing of solc output with solidity v.0.8.0 (#22092)

    Solidity 0.8.0 changes the way that output is marshalled. This patch allows to parse both
    the legacy format used previously and the new format.

    See also https://docs.soliditylang.org/en/breaking/080-breaking-changes.html#interface-changes

    * eth/downloader: enhanced test cases for downloader queue (#22114)

    * cmd/utils, eth/downloader: minor snap nitpicks

    * crypto: fix ineffectual assignments (#22124)

    * crypto/bls12381: fixed ineffectual assignment

    * crypto/signify: fix ineffectual assignment

    * graphql: return decimal for `estimateGas` and `cumulativeGas` queries  (#22126)

    * estimateGas, cumulativeGas
    * linted
    * add test for estimateGas

    * snapshot, trie: fixed typos, mostly in snapshot pkg (#22133)

    * cmd/faucet: fix websocket race regression after switching to gorilla

    * eth/protocols/snap: track reverts when peer rejects request (#22016)

    * eth/protocols/snap: reschedule missed deliveries

    * eth/protocols/snap: clarify log message

    * eth/protocols/snap: revert failures async and update runloop

    Co-authored-by: Péter Szilágyi <peterke@gmail.com>

    * eth/protocols/snap: speed up hash checks (#22023)

    * eth/protocols/snap: speed up hash checks

    * eth/protocols/snap: nit fix

    Co-authored-by: Péter Szilágyi <peterke@gmail.com>

    * cmd/faucet: switch Facebook auth over to mobile site

    * les: remove transaction propagation limits (#22125)

    * cmd/faucet: fix nonce-gap problem (#22145)

    * cmd/faucet: avoid encoding for each client

    * cmd/faucet: fix flaw in clearing of txs, avoid sending more than necessary

    * cmd/faucet: fix flaw in tx cropping

    * cmd/faucet: revert change to not always send tx info

    * cmd/faucet: review fixes

    * cmd/faucet: revert #22018, fix order in UI

    * cmd/faucet: fix lock error

    * cmd/faucet: revert json changes

    * squashme

    * ethclient: better test suite for ethclient package (#22127)

    This commit extends the ethclient test suite and increases code coverage of the ethclient
    package from ~15% to >55%. These tests act as early smoke tests to signal issues in the
    RPC-interface. E.g. if a functionality like eth_chainId or eth_call breaks, the test
    will break.

    * eth/downloader: fix race condition in tests (#22140)

    * downloader: fix race condition in tests

    * eth/downloader: fix race condition in tests

    * Revert "downloader: fix race condition in tests"

    This reverts commit 108033ebc6985de83791d375b6e6647a77d28d5a.

    * core: persist bad blocks (#21827)

    * core: persist bad blocks

    * core, eth, internal: address comments

    * core/rawdb: add badblocks to inspector

    * core, eth: update

    * internal: revert

    * core, eth: only save 10 bad blocks

    * core/rawdb: address comments

    * core/rawdb: fix

    * core: address comments

    * common/prque: pull in tests and benchmarks from upstream

    * eth: improve log message (#22146)

    * eth: fixed typos

    * eth: fixed log message

    * graphql: fix issue with unmarshalling int32 into `Long` type #22153

    * eth: return error from eth_chainID during sync before EIP-155 activates (#21686)

    This changes the chainID RPC method to return an error when EIP-155 is not yet
    active at the current block height. It used to simply return zero in this case, but
    that's confusing.

    * cmd/utils: avoid making console preloads absolute (#22109)

    Resolves https://github.com/etclabscore/core-geth/issues/273

    jsre.JSRE already handles establishing preload
    file paths relative to the 'assets' path (aka docroot),
    where it joins the assets dir and the file path if relative,
    or uses the file path only if absolute.

    The duplication of this logic by MakeConsolePreloads
    caused preloaded files to have paths which contained
    duplicate references to the assets dir path.

    Date: 2020-12-30 08:25:01-06:00
    Signed-off-by: meows <b5c6@protonmail.com>

    * go.mod: use github.com/holiman/bloomfilter/v2 (#22044)

    * deps: use improved bloom filter implementation

    * eth/handler, trie: use 4 keys for syncbloom + minor fixes

    * eth/protocols, trie: revert change on syncbloom method signature

    * cmd/utils: don't enumerate USB unless --usb is set (#22130)

    USB enumeration still occured. Make sure it will only occur if --usb is set.
    This also deprecates the 'NoUSB' config file option in favor of a new option 'USB'.

    * tests: update the reference tests (#22009)

    * graphql: fix spurious error in test (#22164)

    This solves an issue in graphql tests:

        graphql_test.go:38: could not create new node: datadir already used by another process

    * consensus/ethash: increase seal timeout for tests (#22162)

    It seems that the 2 second timeout is not enough for Travis CI:

       --- FAIL: TestTestMode (2.00s)
           ethash_test.go:53: sealing result timeout

    * graphql: fix spurious travis failure (#22166)

    The tests sometimes failed with certain go versions because
    the behavior of http.Server.Shutdown changed over time. A bug
    that was fixed in Go 1.15 could cause active connections on unrelated
    servers to close unexpectedly. This is fixed by avoiding use of the
    same port number in all tests.

    * cmd/faucet: update the embedded website asset

    * core/state/snapshot: add generation logs to storage too

    * les: don't drop sentTo for normal cases (#22048)

    * eth/protocols/eth: fix slice resize flaw (#22181)

    * les: remove useless protocol defines (#22115)

    This PR has two changes in the les protocol:

    - the auxRoot is not supported. See ethereum/devp2p#171 for more information
    - the empty response will be returned in GetHelperTrieProofsMsg request if the merkle
       proving is failed. note, for backward compatibility, the empty merkle proof as well as
       the request auxiliary data will still be returned in  les2/3 protocol no matter the proving
       is successful or not. the proving failure can happen e.g. request the proving for a
       non-included entry in helper trie (unstable header).

    * tests/fuzzers/abi: better test generation (#22158)

    * tests/fuzzers/abi: better test generation

    * tests/fuzzers/abi: fixed packing issue

    * oss-fuzz: enable abi fuzzer

    * cmd/geth: dump config for metrics (#22083)

    * cmd/geth: dump config

    * cmd/geth: dump config

    * cmd/geth: properly read config again

    * cmd/geth: override metrics if flags are set

    * cmd/geth: write metrics regardless if enabled

    * cmd/geth: renamed to metricsfromcliargs

    * metrics: add default configuration

    * core/state/snapshot: write snapshot generator in batch (#22163)

    * core/state/snapshot: write snapshot generator in batch

    * core: refactor the tests

    * core: update tests

    * core: update tests

    * cmd/geth: graceful shutdown if disk is full (#22103)

    Adding warnings of free disk space left and graceful shutdown when there is not enough space left.
    This also adds a flag datadir.minfreedisk which can be used to set the trigger for low disk space, and setting it to zero disables the check.

    Co-authored-by: Martin Holst Swende <martin@swende.se>
    Co-authored-by: Felix Lange <fjl@twurst.com>

    * eth, les: add new config field SyncFromCheckpoint (#22123)

    This PR introduces a new config field SyncFromCheckpoint for light client.

    In some special scenarios, it's required to start synchronization from some
    arbitrary checkpoint or even from the scratch. So this PR offers this
    flexibility to users so that the synchronization start point can be configured.

    There are two relevant configs: SyncFromCheckpoint and Checkpoint.

    - If the SyncFromCheckpoint is true, the light client will try to sync from the
      specified checkpoint.

    - If the Checkpoint is not configured, then the light client will sync from the
      scratch(from the latest header if the database is not empty)

    Additional notes: these two configs are not visible in the CLI flags but only
    accessable in the config file.

    Example Usage:

    [Eth]
    SyncFromCheckpoint = true

    [Eth.Checkpoint]
    SectionIndex = 100
    SectionHead = "0xabc"
    CHTRoot = "0xabc"
    BloomRoot = "0xabc"

    PS. Historical checkpoint can be retrieved from the synced full node or light
    client via les_getCheckpoint API.

    * oss-fuzz: fix abi fuzzer (#22199)

    * go.mod: upgrade golang-lru (#22134)

    * downloader: extract findAncestor search functions (#21744)

    This is a simple refactoring, extracting common ancestor
    negotiation logic to named function

    * core: implement background trie prefetcher

    Squashed from the following commits:

    core/state: lazily init snapshot storage map
    core/state: fix flawed meter on storage reads
    core/state: make statedb/stateobjects reuse a hasher
    core/blockchain, core/state: implement new trie prefetcher
    core: make trie prefetcher deliver tries to statedb
    core/state: refactor trie_prefetcher, export storage tries
    blockchain: re-enable the next-block-prefetcher
    state: remove panics in trie prefetcher
    core/state/trie_prefetcher: address some review concerns

    sq

    * core/state: convert prefetcher to concurrent per-trie loader

    * eth/filters: fix potential deadlock in filter timeout loop (#22178)

    This fixes #22131 and adds a test reproducing the issue.

    * event: add ResubscribeErr (#22191)

    This adds a way to get the error of the failing subscription
    for logging/debugging purposes.

    Co-authored-by: Felix Lange <fjl@twurst.com>

    * trie: fix range prover (#22210)

    Fixes a special case when the trie only has a single trie node and the range proof only contains a single element.

    * common/mclock: remove dependency on github.com/aristanetworks/goarista (#22211)

    It takes three lines of code to get to runtime.nanotime, no need to
    pull a dependency for that.

    * cmd, geth: CLI help fixes (#22220)

    * cmd, geth: Reflect command being optional - closes 22218

    * cmd, geth: Set current year to 2021

    * cmd, geth: CLI help fixes (#22220)

    * cmd, geth: Reflect command being optional - closes 22218

    * cmd, geth: Set current year to 2021

    * eth/protocols/snap: snap sync testing (#22179)

    * eth/protocols/snap: make timeout configurable

    * eth/protocols/snap: snap sync testing

    * eth/protocols/snap: test to trigger panic

    * eth/protocols/snap: fix race condition on timeouts

    * eth/protocols/snap: return error on cancelled sync

    * squashme: updates + test causing panic + properly serve accounts in order

    * eth/protocols/snap: revert failing storage response

    * eth/protocols/snap: revert on bad responses (storage, code)

    * eth/protocols/snap: fix account handling stall

    * eth/protocols/snap: fix remaining revertal-issues

    * eth/protocols/snap: timeouthandler for bytecode requests

    * eth/protocols/snap: debugging + fix log message

    * eth/protocols/snap: fix misspelliings in docs

    * eth/protocols/snap: fix race in bytecode handling

    * eth/protocols/snap: undo deduplication of storage roots

    * synctests: refactor + minify panic testcase

    * eth/protocols/snap: minor polishes

    * eth: minor polishes to make logs more useful

    * eth/protocols/snap: remove excessive logs from the test runs

    * eth/protocols/snap: stress tests with concurrency

    * eth/protocols/snap: further fixes to test cancel channel handling

    * eth/protocols/snap: extend test timeouts on CI

    Co-authored-by: Péter Szilágyi <peterke@gmail.com>

    * go.mod: update dependencies (#22216)

    This updates go module dependencies as discussed in #22050.

    * graphql: change receipt status to decimal instead of hex (#22187)

    This PR fixes the receipt status field to be decimal instead of a hex string,
    as called for by the spec.

    Co-authored-by: Martin Holst Swende <martin@swende.se>

    * go.mod: upgrade github.com/huin/goupnp (#22227)

    This updates the goupnp dependency, fixing huin/goupnp#33

    * snapshot: merge loops for better performance (#22160)

    * core: reset to genesis when middle block is missing (#22135)

    When a sethead/rewind finds that the targeted block is missing, it resets to genesis instead of crashing. Closes #22129

    * eth/tracers: move tracing APIs into eth/tracers (#22161)

    This moves the tracing RPC API implementation to package eth/tracers.
    By doing so, package eth no longer depends on tracing and the duktape JS engine.

    The change also enables tracing using the light client. All tracing methods work with the
    light client, but it's a lot slower compared to using a full node.

    * eth, p2p: reserve half peer slots for snap peers during snap sync (#22171)

    * eth, p2p: reserve half peer slots for snap peers during snap sync

    * eth: less logging

    * eth: rework the eth/snap peer reservation logic

    * eth: rework the eth/snap peer reservation logic (again)

    * tests/fuzzers/abi: fixed one-off panic with int.Min64 value (#22233)

    * tests/fuzzers/abi: fixed one-off panic with int.Min64 value

    * tests/fuzzers/abi: fixed one-off panic with int.Min64 value

    * internal/ethapi: print tx details when submitting (#22170)

    This adds more info about submitted transactions in log messages.

    Co-authored-by: Felix Lange <fjl@twurst.com>

    * core/state: fix panic in state dumping (#22225)

    * core: speed up header import (#21967)

    This PR implements the following modifications

    - Don't shortcut check if block is present, thus avoid disk lookup
    - Don't check hash ancestry in early-check (it's still done in parallel checker)
    - Don't check time.Now for every single header

    Charts and background info can be found here: https://github.com/holiman/headerimport/blob/main/README.md
    With these changes, writing 1M headers goes down to from 80s to 62s.

    * accounts/scwallet: use go-ethereum crypto instead of go-ecdh (#22212)

    * accounts/scwallet: use go-ethereum crypto instead of go-ecdh

    github.com/wsddn/go-ecdh is a wrapper package for ECDH functionality
    with any elliptic curve.

    Since 'generic' ECDH is not required in accounts/scwallet (the curve is
    always secp256k1), we can just use the standard library functionality
    and our own crypto libraries to perform ECDH and save a dependency.

    * Update accounts/scwallet/securechannel.go

    Co-authored-by: Guillaume Ballet <gballet@gmail.com>

    * Use the correct key

    Co-authored-by: Guillaume Ballet <gballet@gmail.com>

    * accounts/scwallet: update documentation (#22242)

    * les: switch to new discv5 (#21940)

    This PR enables running the new discv5 protocol in both LES client
    and server mode. In client mode it mixes discv5 and dnsdisc iterators
    (if both are enabled) and filters incoming ENRs for "les" tag and fork ID.
    The old p2p/discv5 package and all references to it are removed.

    Co-authored-by: Felix Lange <fjl@twurst.com>

    * rpc: deprecate Client.ShhSubscribe (#22239)

    It never worked, whisper uses polling.

    Co-authored-by: Felix Lange <fjl@twurst.com>

    * cmd,core,eth,params,tests: define yolov3 + enable EIP-2565 (#22213)

    Removes the yolov2 definition, adds yolov3, including EIP-2565. This PR also disables some of the erroneously generated blockchain and statetests, and adds the new genesis hash + alloc for yolov3.
    This PR disables the CLI switches for yolo, since it's not complete until we merge support for 2930.

    * les/utils: UDP rate limiter (#21930)

    * les/utils: Limiter

    * les/utils: dropped prior weight vs variable cost logic, using fixed weights

    * les/utils: always create node selector in addressGroup

    * les/utils: renamed request weight to request cost

    * les/utils: simplified and improved the DoS penalty mechanism

    * les/utils: minor fixes

    * les/utils: made selection weight calculation nicer

    * les/utils: fixed linter warning

    * les/utils: more precise and reliable probabilistic test

    * les/utils: fixed linter warning

    * cmd/clef: don't check file permissions on windows (#22251)

    Fixes #20123

    * eth/tracers: fix unigram tracer (#22248)

    * eth: check snap satelliteness, delegate drop to eth (#22235)

    * eth: check snap satelliteness, delegate drop to eth

    * eth: better handle eth/snap satellite relation, merge reg/unreg paths

    * cmd/geth, node: allow configuring JSON-RPC on custom path prefix (#22184)

    This change allows users to set a custom path prefix on which to mount the http-rpc
    or ws-rpc handlers via the new flags --http.rpcprefix and --ws.rpcprefix.

    Fixes #21826

    Co-authored-by: Felix Lange <fjl@twurst.com>

    * all: remove unneeded parentheses (#21921)

    * remove uneeded convertion type

    * remove redundant type in composite literal

    * omit explicit type where implicit

    * remove unused redundant parenthesis

    * remove redundant import alias duktape

    * trie : use trie.NewStackTrie instead of new(trie.Trie) (#22246)

    The PR makes use of the stacktrie, which is is more lenient on resource consumption, than the regular trie, in cases where we only need it for DeriveSha

    * core: reset txpool state on sethead (#22247)

    fixes an issue where local transactions that were included in the chain before a SetHead were rejected if resubmitted, since the txpool had not reset the state to the current (older) state.

    * fuzzers: added consensys/gurvy library to bn256 differential fuzzer (#21812)

    This pr adds consensys' gurvy bn256 variant into the code for differential fuzzing.

    * internal/ethapi: comment nitpick (#22270)

    * eth: move eth.Config to a common package (#22205)

    This moves the eth config definition into a separate package, eth/ethconfig.
    Packages eth and les can now import this common package instead of
    importing eth from les, reducing dependencies.

    Co-authored-by: Felix Lange <fjl@twurst.com>

    * internal/ethapi: fix typo in comment (#22271)

    * eth: don't wait for snap registration if we're not running snap (#22272)

    Prevents a situation where we (not running snap) connects with a peer running snap, and get stalled waiting for snap registration to succeed (which will never happen), which cause a waitgroup wait to halt shutdown

    * consensus: remove seal verification from the consensus engine interface (#22274)

    * cmd/utils: enable snapshots by default

    * metrics: fix cast omission in cpu_syscall.go (#22262)

    fixes an regression which caused build failure on certain platforms

    * params: just to make snapshots a bit more official

    * all: bloom-filter based pruning mechanism (#21724)

    * cmd, core, tests: initial state pruner

    core: fix db inspector

    cmd/geth: add verify-state

    cmd/geth: add verification tool

    core/rawdb: implement flatdb

    cmd, core: fix rebase

    core/state: use new contract code layout

    core/state/pruner: avoid deleting genesis state

    cmd/geth: add helper function

    core, cmd: fix extract genesis

    core: minor fixes

    contracts: remove useless

    core/state/snapshot: plugin stacktrie

    core: polish

    core/state/snapshot: iterate storage concurrently

    core/state/snapshot: fix iteration

    core: add comments

    core/state/snapshot: polish code

    core/state: polish

    core/state/snapshot: rebase

    core/rawdb: add comments

    core/rawdb: fix tests

    core/rawdb: improve tests

    core/state/snapshot: fix concurrent iteration

    core/state: run pruning during the recovery

    core, trie: implement martin's idea

    core, eth: delete flatdb and polish pruner

    trie: fix import

    core/state/pruner: add log

    core/state/pruner: fix issues

    core/state/pruner: don't read back

    core/state/pruner: fix contract code write

    core/state/pruner: check root node presence

    cmd, core: polish log

    core/state: use HEAD-127 as the target

    core/state/snapshot: improve tests

    cmd/geth: fix verification tool

    cmd/geth: use HEAD as the verification default target

    all: replace the bloomfilter with martin's fork

    cmd, core: polish code

    core, cmd: forcibly delete state root

    core/state/pruner: add hash64

    core/state/pruner: fix blacklist

    core/state: remove blacklist

    cmd, core: delete trie clean cache before pruning

    cmd, core: fix lint

    cmd, core: fix rebase

    core/state: fix the special case for clique networks

    core/state/snapshot: remove useless code

    core/state/pruner: capping the snapshot after pruning

    cmd, core, eth: fixes

    core/rawdb: update db inspector

    cmd/geth: polish code

    core/state/pruner: fsync bloom filter

    cmd, core: print warning log

    core/state/pruner: adjust the parameters for bloom filter

    cmd, core: create the bloom filter by size

    core: polish

    core/state/pruner: sanitize invalid bloomfilter size

    cmd: address comments

    cmd/geth: address comments

    cmd/geth: address comment

    core/state/pruner: address comments

    core/state/pruner: rename homedir to datadir

    cmd, core: address comments

    core/state/pruner: address comment

    core/state: address comments

    core, cmd, tests: address comments

    core: address comments

    core/state/pruner: release the iterator after each commit

    core/state/pruner: improve pruner

    cmd, core: adjust bloom paramters

    core/state/pruner: fix lint

    core/state/pruner: fix tests

    core: fix rebase

    core/state/pruner: remove atomic rename

    core/state/pruner: address comments

    all: run go mod tidy

    core/state/pruner: avoid false-positive for the middle state roots

    core/state/pruner: add checks for middle roots

    cmd/geth: replace crit with error

    * core/state/pruner: fix lint

    * core: drop legacy bloom filter

    * core/state/snapshot: improve pruner

    * core/state/snapshot: polish concurrent logs to report ETA vs. hashes

    * core/state/pruner: add progress report for pruning and compaction too

    * core: fix snapshot test API

    * core/state: fix some pruning logs

    * core/state/pruner: support recovering from bloom flush fail

    Co-authored-by: Péter Szilágyi <peterke@gmail.com>

    * core/state/pruner: fix compaction after pruning

    * core/state/pruner: fix compaction range error

    * internal/debug: add switch to format logs with json (#22207)

    adds a flag --log.json which if enabled makes the client format logs with JSON.

    * accounts/abi/bind: fixed unpacking error (#22230)

    There was a dormant error with structured inputs that failed unpacking.
    This commit fixes the error by switching casting to the better abi.ConvertType function.
    It also adds a test for calling a view function that returns a struct

    * cmd/utils, eth/ethconfig: unindex txs older than ~1 year

    * cmd/devp2p: fix documentation for eth-test (#22298)

    * core: fix temp memory blowup caused by defers holding on to state

    * les: enable les/4 and add tests (#22321)

    * cmd/utils: add workaround for FreeBSD statfs quirk (#22310)

    Make geth build on FreeBSD, fixes #22309.

    * cmd/geth: fix js unclean shutdown (#22302)

    * trie: fix bloom crash on fast sync restart

    * rpc: increase the number of subscriptions in storm test (#22316)

    * core/state/snapshot: ensure Cap retains a min number of layers

    * eth: fix snap sync cancellation

    * cmd/devp2p/internal/ethtest: use shared message types (#22315)

    This updates the eth protocol test suite to use the message type
    definitions of the 'production' protocol implementation in eth/protocols/eth.

    * eth/handler, broadcast: optimize tx broadcast mechanism (#22176)

    This PR optimizes the broadcast loop. Instead of iterating twice through a given set of transactions to weed out which peers have and which do not have a tx, to send/announce transactions, we do it only once.

    * core/state: copy the snap when copying the state (#22340)

    * core/state: copy the snap when copying the state

    * core/state: deep-copy snap stuff during state Copy

    * rlp: handle case of normal EOF in Stream.readFull (#22336)

    io.Reader may return n > 0 and io.EOF at the end of the input stream.
    readFull did not handle this correctly, looking only at the error. This fixes
    it to check for n == len(buf) as well.

    * node: always show websocket url in logs (#22307)

    * eth: implement eth66 (#22241)

    * eth/protocols/eth: split up the eth protocol handlers

    * eth/protocols/eth: define eth-66 protocol messages

    * eth/protocols/eth: poc implement getblockheaders on eth/66

    * eth/protocols/eth: implement remaining eth-66 handlers

    * eth/protocols: define handler map for eth 66

    * eth/downloader: use protocol constants from eth package

    * eth/protocols/eth: add ETH66 capability

    * eth/downloader: tests for eth66

    * eth/downloader: fix error in tests

    * eth/protocols/eth: use eth66 for outgoing requests

    * eth/protocols/eth: remove unused error type

    * eth/protocols/eth: define protocol length

    * eth/protocols/eth: fix pooled tx over eth66

    * protocols/eth/handlers: revert behavioural change which caused tests to fail

    * eth/downloader: fix failing test

    * eth/protocols/eth: add testcases + fix flaw with header requests

    * eth/protocols: change comments

    * eth/protocols/eth: review fixes + fixed flaw in RequestOneHeader

    * eth/protocols: documentation

    * eth/protocols/eth: review concerns about types

    * p2p/dnsdisc: fix hot-spin when all trees are empty (#22313)

    In the random sync algorithm used by the DNS node iterator, we first pick a random
    tree and then perform one sync action on that tree. This happens in a loop until any
    node is found. If no trees contain any nodes, the iterator will enter a hot loop spinning
    at 100% CPU.

    The fix is complicated. The iterator now checks if a meaningful sync action can
    be performed on any tree. If there is nothing to do, it waits for the next root record
    recheck time to arrive and then tries again.

    Fixes #22306

    * les: renamed lespay to vflux (#22347)

    * cmd/utils: disable caching preimages by default

    * travis, appveyor, build: bump Go to 1.16

    * les: fix balance expiration (#22343)

    * les/lespay/server: fix balance expiration and add test

    * les: move client balances to a new db

    * les: rename lespayDb to lesDb

    * tests/fuzzers/les: add fuzzer for les server handler (#22282)

    * les: refactored server handler

    * tests/fuzzers/les: add fuzzer for les server handler

    * tests, les: update les fuzzer

    tests: update les fuzzer

    tests/fuzzer/les: release resources

    tests/fuzzer/les: pre-initialize all resources

    * les: refactored server handler and fuzzer

    Co-authored-by: rjl493456442 <garyrong0905@gmail.com>

    * les: clean up server handler (#22357)

    * cmd/geth: add db commands stats, compact, put, get, delete (#22014)

    This PR introduces:

    - db.put to put a value into the database
    - db.get to read a value from the database
    - db.delete to delete a value from the database
    - db.stats to check compaction info from the database
    - db.compact to trigger a db compaction

    It also moves inspectdb to db.inspect.

    * internal/ethapi: reject non-replay-protected txs over RPC (#22339)

    This PR prevents users from submitting transactions without EIP-155 enabled. This behaviour can be overridden by specifying the flag --rpc.allow-unprotected-txs=true.

    * accounts/abi/bind: fix up Go mod files for Go 1.16

    * Dockerfile: bump to Go 1.16 base images

    * travis: bump Android NDK version

    * travis: bump builders to Bionic

    * travis: manually install Android since Travis is stale (#22373)

    * cmd/utils: remove deprecated command line flags (#22263)

    This removes support for all deprecated flags except --rpc*.

    * eth/protocols/snap: lower abortion and resumption logs to debug

    * cmd, eth, les: enable serving light clients when non-synced (#22250)

    This PR adds a more CLI flag, so that the les-server can serve light clients even the local node is not synced yet.

    This functionality is needed in some testing environments(e.g. hive). After launching the les server, no more blocks will be imported so the node is always marked as "non-synced".

    * les, light: improve txstatus retrieval (#22349)

    Transaction unindexing will be enabled by default as of 1.10, which causes tx status retrieval will be broken without this PR.

    This PR introduces a retry mechanism in TxStatus retrieval.

    * all: add support for EIP-2718, EIP-2930 transactions (#21502)

    This adds support for EIP-2718 typed transactions as well as EIP-2930
    access list transactions (tx type 1). These EIPs are scheduled for the
    Berlin fork.

    There very few changes to existing APIs in core/types, and several new APIs
    to deal with access list transactions. In particular, there are two new
    constructor functions for transactions: types.NewTx and types.SignNewTx.
    Since the canonical encoding of typed transactions is not RLP-compatible,
    Transaction now has new methods for encoding and decoding: MarshalBinary
    and UnmarshalBinary.

    The existing EIP-155 signer does not support the new transaction types.
    All code dealing with transaction signatures should be updated to use the
    newer EIP-2930 signer. To make this easier for future updates, we have
    added new constructor functions for types.Signer: types.LatestSigner and
    types.LatestSignerForChainID.

    This change also adds support for the YoloV3 testnet.

    Co-authored-by: Martin Holst Swende <martin@swende.se>
    Co-authored-by: Felix Lange <fjl@twurst.com>
    Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>

    * cmd/devp2p: add eth66 test suite (#22363)

    Co-authored-by: Martin Holst Swende <martin@swende.se>

    * les: move server pool to les/vflux/client (#22377)

    * les: move serverPool to les/vflux/client

    * les: add metrics

    * les: moved ValueTracker inside ServerPool

    * les: protect against node registration before server pool is started

    * les/vflux/client: fixed tests

    * les: make peer registration safe

    * all: define Berlin hard fork spec

    * rpc: add separate size limit for websocket (#22385)

    This makes the WebSocket message size limit independent of the
    limit used for HTTP requests. The new limit for WebSocket messages
    is 15MB.

    * accounts/keystore: use github.com/google/uuid (#22217)

    This replaces the github.com/pborman/uuid dependency with
    github.com/google/uuid because the former is only a wrapper for
    the latter (since v1.0.0).

    Co-authored-by: Felix Lange <fjl@twurst.com>

    * core/state: fix eta calculation on pruning (#22386)

    * les: UDP pre-negotiation of available server capacity (#22183)

    This PR implements the first one of the "lespay" UDP queries which
    is already useful in itself: the capacity query. The server pool is making
    use of this query by doing a cheap UDP query to determine whether it is
    worth starting the more expensive TCP connection process.

    * core/rawdb: fix the transaction indexer (#22395)

    * cmd/geth: put allowUnsecureTx flag in RPC section (#22412)

    * params: update chts (#22418)

    * cmd/utils: fix txlookuplimit for archive node (#22419)

    * cmd/utils: fix exclusive check for archive node

    * cmd/utils: set the txlookuplimit to 0

    * core/forkid, params: unset Berlin fork number (#22413)

    * les: fix nodiscover option on the client side (#22422)

    * cmd: retire whisper flags (#22421)

    * cmd: retire whisper flags

    * cmd/geth: remove whisper configs

    * tests: update to latest tests (#22290)

    This updates the consensus tests to commit 31d6630 and
    adds support for access list transactions in the test runner.

    Co-authored-by: Martin Holst Swende <martin@swende.se>

    * params: release geth 1.10.0 stable

    * Update after the tracers factoring and solve some linting

    * fix all the linting issues

    * fix graphql test

    * fix wallet test

    * fix cmd package test

    * fix internal package test

    * fix internal package test

    * fix accounts and contracts package test

    * fix light package test

    * fix some unit tests and changes on the state_prefetcher.go

    * fix core unit test

    * fix unit test

    * faucet: do not replace normal url to mobile version

    * faucet: revert change

    * eth: added UT for transaction propagation

    * internal/eth: fixed merging side effect

    * accounts: copy signer

    * Added Quorum tag for the UT

    * fix: add some fixes and UT (#3)

    * faucet: revert change

    * eth: added UT for transaction propagation

    * internal/eth: fixed merging side effect

    * accounts: copy signer

    * Added Quorum tag for the UT

    * fix: eth/handler.go accept tx for raft consensus

    * fix: internal/ethapi add check for accessList if its nil

    * add eth66 protocol to consensus

    * fix: broadcaster

    * revert: logs

    * disable flakey facebook test

    * fix: eth/api_backend.go use the modified GetReceipts to get the private receipts for PSI

    * fix: eth/traces fix the tracer to ignore the tx that the party is not part of

    * fix: raft/snapshot remove the trimming of the peer ID

    * Accept chainId on permissioning endpoints

    * fix: force preimages for making complete dumps
    preimages is disabled by default by geth 1.10, but needed for contract extension

    * Specify chainId against permision contracts

    * Specify chainId with NewWalletTransactor

    * Remove chainId from NewWalletTransactor

    * Pass chainId through to NewWalletTransactor from config

    * fix lint

    * fix unit tests

    * fix lint

    * Upgrade protobuf to 1.5.1

    * remove commented code

    * added few error checks and some code cleaning

    * added few error checks and some code cleaning

    * fix conflict merge

    * fix linter

    * Prevent prune-state from being used when IsQuorum is enabled

    Signed-off-by: Antony Denyer <git@antonydenyer.co.uk>

    * Remove date for deprecation notice, made more generic

    * fix: miner/worker.go mix-up when resolving conflicts about miner sleeping

    Co-authored-by: Martin Holst Swende <martin@swende.se>
    Co-authored-by: Mr-Leshiy <alex_pozhilenkov@adoriasoft.com>
    Co-authored-by: Nagy Salem <me@muhnagy.com>
    Co-authored-by: Connor Stein <connor.stein@mail.mcgill.ca>
    Co-authored-by: Shiming <codingmylife@gmail.com>
    Co-authored-by: ligi <ligi@ligi.de>
    Co-authored-by: Péter Szilágyi <peterke@gmail.com>
    Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de>
    Co-authored-by: Mr-Leshiy <leshiy12345678@gmail.com>
    Co-authored-by: Felföldi Zsolt <zsfelfoldi@gmail.com>
    Co-authored-by: ucwong <ucwong@126.com>
    Co-authored-by: Timo Tijhof <krinklemail@gmail.com>
    Co-authored-by: Sina Mahmoodi <1591639+s1na@users.noreply.github.com>
    Co-authored-by: Guillaume Ballet <gballet@gmail.com>
    Co-authored-by: Suriyaa Sundararuban <isc.suriyaa@gmail.com>
    Co-authored-by: jk-jeongkyun <45347815+jeongkyun-oh@users.noreply.github.com>
    Co-authored-by: yumiel yoomee1313 <yumiel.ko@groundx.xyz>
    Co-authored-by: Melvin Junhee Woo <melvin.woo@groundx.xyz>
    Co-authored-by: Vie <yangchenzhong@gmail.com>
    Co-authored-by: rene <41963722+renaynay@users.noreply.github.com>
    Co-authored-by: Felix Lange <fjl@twurst.com>
    Co-authored-by: Antoine Toulme <atoulme@users.noreply.github.com>
    Co-authored-by: gary rong <garyrong0905@gmail.com>
    Co-authored-by: Chris Ziogas <ziogaschr@gmail.com>
    Co-authored-by: meowsbits <b5c6@protonmail.com>
    Co-authored-by: Dan DeGreef <dan.degreef@gmail.com>
    Co-authored-by: Alex Mazalov <mazalov@gmail.com>
    Co-authored-by: Łukasz Zimnoch <lukaszzimnoch1994@gmail.com>
    Co-authored-by: Alex Prut <1648497+alexprut@users.noreply.github.com>
    Co-authored-by: isdyaufh8o7cq <sebaskil@icloud.com>
    Co-authored-by: Or Neeman <oneeman@gmail.com>
    Co-authored-by: lightclient <14004106+lightclient@users.noreply.github.com>
    Co-authored-by: Ryan Schneider <ryanleeschneider@gmail.com>
    Co-authored-by: achraf <achraf.sellami@consensys.net>
    Co-authored-by: achraf17 <achrafsellami0@gmail.com>
    Co-authored-by: Baptiste Boussemart <baptiste.boussemart@consensys.net>
    Co-authored-by: Antony Denyer <git@antonydenyer.co.uk>
    Co-authored-by: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com>
    Co-authored-by: Antony Denyer <email@antonydenyer.co.uk>

commit cd11c38e7bc0345a70ef85a8b085e7755bb0ee78
Author: Antony Denyer <email@antonydenyer.co.uk>
Date:   Mon Jan 24 10:39:07 2022 +0000

    bump version to 21.10.2 (#1310)

commit 393ed37d277098d89fca478eb5565c006949ba5a
Author: Satpal <28562234+SatpalSandhu61@users.noreply.github.com>
Date:   Mon Jan 24 10:35:17 2022 +0000

    Fix issue with inconsistent private state root when using MPS with PMT. (#1283)

    * Fix issue with inconsistent private state root when using MPS with PMT.

    * Extend debug.dumpBlock() to allow dump of private state when second parameter set to "private".

commit 559b9f8207cda6656a5ad465fb31679b9aa2a93b
Author: achraf17 <achraf.sellami@consensys.net>
Date:   Fri Jan 14 14:01:55 2022 +0400

    fix readme link for transaction lifecycle (#1309)

commit 111641ff8be49fc209cfdbfcd3aca91133780817
Author: Antony Denyer <email@antonydenyer.co.uk>
Date:   Thu Jan 13 16:03:56 2022 +0000

    readme fix links (#1307)

commit 595520d9d220cd0d350a9dab1b59294ea7eb3893
Author: Antony Denyer <email@antonydenyer.co.uk>
Date:   Thu Jan 13 15:42:24 2022 +0000

    Update readme to fix dead links (#1306)

    * Update readme to fix dead links

    Co-authored-by: achraf17 <achrafsellami0@gmail.com>

commit 729f58f57840e8c5eadf8d5620341393de0fd5a7
Author: Antony Denyer <email@antonydenyer.co.uk>
Date:   Thu Jan 13 08:56:11 2022 +0000

    Bump version to v21.10.1 (#1304)

commit 5c9f94d5f81a5608e051ffd6a06454dc527adcf1
Author: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com>
Date:   Thu Jan 13 09:55:50 2022 +0100

    Fix errors when there is high load (#1302)

    * fix: concurrent modification on map

    * fix: seg fault
    write cache in same routine

    * revert modification

    Co-authored-by: Antony Denyer <email@antonydenyer.co.uk>

commit f45e6858f0ce4788ddbd8ee3e4a22f49b1345bdc
Author: Antony Denyer <email@antonydenyer.co.uk>
Date:   Wed Jan 12 12:35:27 2022 +0000

    Update packages to fix issues identified by cve db (#1303)

    CVE-2019-11254
    CVE-2020-27813

commit f6a2b20a7fb7dba7d10e49a72e4a6a9a47e9bf76
Author: Lucas Saldanha <lucas.saldanha@consensys.net>
Date:   Thu Jan 13 01:01:54 2022 +1300

    Merge pull request #1280 from lucassaldanha/qbft-logs

    Remove warn log when receiving pre-prepare msg for future block

commit aa9e5b879b883c569b7e7a91400e94270f0f0866
Merge: 07dd08ea6 8abac49bc
Author: Antony Denyer <email@antonydenyer.co.uk>
Date:   Wed Jan 12 11:52:32 2022 +0000

    Merge pull request #1289 from ConsenSys/github/template

    add contributing statement on issues

commit 8abac49bcad055c1a5df9ee9f21715c2eec1267c
Merge: 38440a65b 07dd08ea6
Author: Antony Denyer <email@antonydenyer.co.uk>
Date:   Wed Jan 12 09:51:50 2022 +0000

    Merge branch 'master' into github/template

commit 38440a65ba4bf01ea3f0ab2852fc6b2ef21501e8
Author: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com>
Date:   Wed Jan 12 10:33:42 2022 +0100

    Update .github/CONTRIBUTING.md

commit 07dd08ea61076e107507aa2fe17503e2a86eb4f5
Author: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com>
Date:   Tue Jan 11 15:29:39 2022 +0100

    fix: limit number of concurrent ATs running (#1276)

    limit number of concurrent ATs running and the size of the matrix

commit d755fa1babe8b73b65156d808e7023caf71dfbfa
Author: Baptiste Boussemart <baptiste.boussemart@consensys.net>
Date:   Tue Jan 4 14:49:57 2022 +0100

    add contributing statement on issues

commit 919800f019cc5d2b931b5cd81600640a8e7cd444
Author: Jitendra Bhurat <jbhurat@gmail.com>
Date:   Tue Nov 2 05:57:47 2021 -0400

    Added test to confirm that there is no deadlock when testQBFTBlock is set to 1 (#1272)

    Co-authored-by: Ricardo Silva <1945557+ricardolyn@users.noreply.github.com>

commit de5e8b25875295547f30a9419f47abd1fa115e0e
Merge: 3bb2ae67b ef940787d
Author: Antony Denyer <email@antonydenyer.co.uk>
Date:   Tue Nov 2 09:31:04 2021 +0000

    Merge pull request #1274 from antonydenyer/master

    Bump version to v21.10.0

commit ef940787de3fa14e7a7c0fca356ae95944882225
Merge: cf7fdc489 3bb2ae67b
Author: Antony Denyer <email@antonydenyer.co.uk>
Date:   Tue Nov 2 09:02:25 2021 +0000

    Merge branch 'master' into master

commit 3bb2ae67b4abde6419c0d1f2f0304c4a54386a51
Merge: 9b8739efc 6be279da7
Author: Antony Denyer <email@antonydenyer.co.uk>
Date:   Tue Nov 2 09:02:13 2021 +0000

    Merge pull request #1273 from chris-j-h/upstream-merge-fixes

    Upstream merge fixes

commit cf7fdc489f520ed2afaa5ea833073afee74a5903
Author: Antony Denyer <git@antonydenyer.co.uk>
Date:   Mon Nov 1 10:36:09 2021 +0000

    Bump version to v21.10.0

commit 6be279da746cc11a9550da03b5db72518cd7678b
Author: chris <chrishounsom@icloud.com>
Date:   Mon Nov 1 10:24:27 2021 +0000

    Add Quorum Privacy Precompile to ActivePrecompiles list
    This is currently only used for the experimental YoloV2 EIP 2929 (where all active precompiles for the current block height must be known) so not critical but worth fixing ahead of the concrete release that will be pulled in from a future upstream geth merge

    Also includes core/vm: fix Byzantium address list (#22603) (cherry picked from commit 44fe466999ce7f8b02de7e83de955f8847342309)

commit 9b8739efc933036b8956c6c2c236d3a5f30afaa4
Author: Satpal <28562234+SatpalSandhu61@users.noreply.github.com>
Date:   Thu Oct 7 14:28:00 2021 +0100

    Receipt unit test was not checking QuorumReceiptExtraData in PSReceipt (#1266)

commit 3d453a45fd0e69ed2e33c5cb51560bd2473c544b
Author: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com>
Date:   Fri Oct 1 10:01:57 2021 +0200

    Revert "fix: private trie cache db with gc (#1235)" (#1262)

    Bug found in the MPS, want to package this feature for both dual state and MPS.

    This reverts commit 614b212d4f99565acde226dd7c74dfa7d559aee2.

commit 87648f6a39064efc5ba4fc775f32ff2af4531fa1
Author: Ricardo Silva <1945557+ricardolyn@users.noreply.github.com>
Date:   Thu Sep 30 17:01:56 2021 +0100

    Send transactions to all peers instead of a sub-set (#1261)

    * send transactions to all peers

    * add unit test

    * tidy up

    * fix lint issues

    * add wait for peers to be synced

    * Apply suggestions from code review

    Co-authored-by: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com>

    * improve handling of peers registration and fix issues from suggestion.

    Co-authored-by: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com>

commit 743e4a164b39d1186bbc27367b4cd2cfc4bb635c
Author: Vinod Damle <vdamle@users.noreply.github.com>
Date:   Thu Sep 30 09:31:07 2021 -0400

    IBFT: Ensure that Committed Seal is not zero value (#1118)

    * Ensure there is no zero addr Committed Seal

    When a commit message is processed, if the Proposal is missing due to
    some reason, we should not generate a Zero address Committed Seal. Such
    an incorrect seal causes `BAD BLOCK` failure with an `invalid signature`
    error during operations such as Block import

    * run gofmt

    * Remove stale comment

    * Add unit test

    * Revert "Remove stale comment"

    This reverts commit 279be718b6ee3926125fa2b0397ca75f9e90b972.

    * Move comment

    * Update test with error checking

    Co-authored-by: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com>

    Co-authored-by: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com>

commit b57775d045863adfe84764a3849713086bb6f378
Author: Loïc Vincent-Genod <37535451+VGLoic@users.noreply.github.com>
Date:   Thu Sep 30 10:57:20 2021 +0200

    replace crypto secp256k1 (#1260)

    * delete internal module

    * remove crypto/secp256k1 dependency

    * precise new repository in README

commit 155bcdb483e59b5e5930e5360998b8fcf3b54e0a
Author: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com>
Date:   Wed Sep 22 11:04:22 2021 +0200

    typo: change whitelist to autorization list (#1257)

    * typo: change whitelist to autorization list

    * add unit test

    * fix: add log when using deprecated flag

commit 90307a783873eafa9406c7a2d3fb1c05258a84db
Author: Loïc Vincent-Genod <37535451+VGLoic@users.noreply.github.com>
Date:   Tue Sep 21 12:44:14 2021 +0200

    feat: add build sentinel job in the build workflow (#1256)

    Co-authored-by: Ricardo Silva <1945557+ricardolyn@users.noreply.github.com>

commit c6bce6491817dc790584804d84d6c750b750cf9e
Author: Nam Truong <nam.p.truong@outlook.com>
Date:   Tue Sep 14 14:32:52 2021 +0100

    Contract extension with mandatory recipients (#1252)

    * Add MandatoryRecipients data in SendRequest and SendSignedTxRequest to private TM

    * Update send and sendsignedtx method to include MandatoryRecipients, reject if PTM does not support correct version

    * Add new Tessera feature version - mandatoryRecipientsVersion

    * Add PrivacyFlagMandatoryRecipients and new feature to support MandatoryRecipients

    * Add mandatoryFor to PrivateTxArgs, validations and unit tests

    * Implement GetMandatory api call to Tessera

    * interface impl

    * update mock generation

    * update mock generation

    * Cater for mandatory recipients data when extending contract

    * api to retrieve privacymetadata - also include mandatory recipients for relevant flag type

    * unit tests

    * fix lint check

    * don't fetch mr when tx is standardprivate

    Co-authored-by: Krish Swaminathan <39480483+Krish1979@users.noreply.github.com>

commit 58ac9bae4eb2da01eb645391cf6827526b3f3aed
Author: Nam Truong <nam.p.truong@outlook.com>
Date:   Tue Sep 14 10:30:38 2021 +0100

    Fix private receipt of privacy marker transaction (#1253)

    * Add MandatoryRecipients data in SendRequest and SendSignedTxRequest to private TM

    * Update send and sendsignedtx method to include MandatoryRecipients, reject if PTM does not support correct version

    * Add new Tessera feature version - mandatoryRecipientsVersion

    * Add PrivacyFlagMandatoryRecipients and new feature to support MandatoryRecipients

    * Add mandatoryFor to PrivateTxArgs, validations and unit tests

    * fix return private receipt if transaction is a privacy marker transaction

commit c1add76e3effe97fd6c2eb2329bc0d63512b9f39
Author: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com>
Date:   Wed Sep 8 10:25:24 2021 +0200

    upgradebot with git configured so git merge works (#1250)

    Co-authored-by: Ricardo Silva <1945557+ricardolyn@users.noreply.github.com>

commit 38999c7f221f77077864270d1948be0f8fc1ef04
Author: Nam Truong <nam.p.truong@outlook.com>
Date:   Tue Sep 7 16:23:34 2021 +0100

    Support mandatory recipients (#1243)

    * Add MandatoryRecipients data in SendRequest and SendSignedTxRequest to private TM

    * Update send and sendsignedtx method to include MandatoryRecipients, reject if PTM does not support correct version

    * Add new Tessera feature version - mandatoryRecipientsVersion

    * Add PrivacyFlagMandatoryRecipients and new feature to support MandatoryRecipients

    * Add mandatoryFor to PrivateTxArgs, validations and unit tests

    Co-authored-by: Krish Swaminathan <39480483+Krish1979@users.noreply.github.com>

commit 15fceadfd0c0173ecdaf21807e9bb6a1871d58df
Author: baptiste-b-pegasys <85155432+baptiste-b-pegasys@users.noreply.github.com>
Date:   Fri Sep 3 11:18:34 2021 +0200

    fix: flacky unit test (#1248)

    * fix: flacky unit test
    wait group outside the go routine
    retry loop for test that depends on non-triggered state

    * fix: review

    Co-authored-by: Ricardo Silva <1945557+ricardolyn@users.noreply.github.com>

commit df651519a53790676dbef401b5f24b1bc0b183da
Author: Quorum Bot <46820074+quorumbot@users.noreply.github.com>
Date:   Fri Sep 3 09:20:44 2021 +0100

    [Upgrade] Go-Ethereum release v1.9.25 (#1223)

    * params: begin v1.9.25 release cycle

    * crypto/bn256: improve bn256 fuzzer (#21815)

    * crypto/cloudflare: fix nil deref in random G1/G2 reading

    * crypto/bn256: improve fuzzer

    * crypto/bn256: fix some flaws in fuzzer

    * crypto/bn256: better comments for u, P and Order (#21836)

    * tests/fuzzers: improve the fuzzers (#21829)

    * tests/fuzzers, common/bitutil: make fuzzers use correct returnvalues + remove output

    * tests/fuzzers/stacktrie: fix duplicate-key insertion in stacktrie (false positive)

    * tests/fuzzers/stacktrie: fix compilation error

    * tests/fuzzers: linter nits

    * core/vm, protocol_params: implement eip-2565 modexp repricing (#21607)

    * core/vm, protocol_params: implement eip-2565 modexp repricing

    * core/vm: fix review concerns

    * core, all: split vm.Context into BlockContext and TxContext (#21672)

    * all: core: split vm.Config into BlockConfig and TxConfig

    * core: core/vm: reset EVM between tx in block instead of creating new

    * core/vm: added docs

    * accounts/abi: template: set events Raw field in Parse methods (#21807)

    * common: fix documentation of Address.SetBytes (#21814)

    * crypto/bn256: refine comments according to #19577, #21595, and #21836 (#21847)

    * consensus/ethash: fix usage of *reflect.SliceHeader (#21372)

    * consensus/ethash: only use *reflect.SliceHeader, not reflect.SliceHeader. See comment here: https://github.com/golang/go/issues/40397\#issuecomment-663748689

    * consensus/ethash: pr feedback from @mdempsky, makes a copy of dest such that is not mutated

    * consensus/ethash: remove noop assign

    * consensus/ethash: apply same fix to another location

    Co-authored-by: Péter Szilágyi <peterke@gmail.com>
    Co-authored-by: Martin Holst Swende <martin@swende.se>

    * cmd/geth: remove retesteth

    * crypto/secp256k1: add checking z sign in affineFromJacobian (#18419)

    The z == 0 check is hit whenever we Add two points with the same x1/x2
    coordinate. crypto/elliptic uses the same check in their affineFromJacobian
    function. This change does not affect block processing or tx signature verification
    in any way, because it does not use the Add or Double methods.

    * cmd/geth: improve les test on windows (#21860)

    * all: disable recording preimage of trie keys (#21402)

    * cmd, core, eth, light, trie: disable recording preimage by default

    * core, eth: fix unit tests

    * core: fix import

    * all: change to nopreimage

    * cmd, core, eth, trie: use cache.preimages flag

    * cmd: enable preimages for archive node

    * cmd/utils, trie: simplify preimage tracking a bit

    * core: fix linter

    Co-authored-by: Péter Szilágyi <peterke@gmail.com>

    * metrics: fix the panic for reading empty cpu stats (#21864)

    * node: support expressive origin rules in ws.origins (#21481)

    * Only compare hostnames in ws.origins

    Also using a helper function for ToLower consolidates all preparation steps in one function for more maintainable consistency.

    Spaces => tabs

    Remove a semicolon

    Add space at start of comment

    Remove parens around conditional

    Handle case wehre parsed hostname is empty

    When passing a single word like "localhost" the parsed hostname is an empty string. Handle this and the error-parsing case together as default, and the nonempty hostname case in the conditional.

    Refactor with new originIsAllowed functions

    Adds originIsAllowed() & ruleAllowsOrigin(); removes prepOriginForComparison

    Remove blank line

    Added tests for simple allowed-orign rule

    which does not specify a protocol or port, just a hostname

    Fix copy-paste: `:=` => `=`

    Remove parens around conditional

    Remove autoadded whitespace on blank lines

    Compare scheme, hostname, and port with rule

    if the rule specifies those portions.

    Remove one autoadded trailing whitespace

    Better handle case where only origin host is given

    e.g. "localhost"

    Remove parens around conditional

    Refactor: attemptWebsocketConnectionFromOrigin DRY

    Include return type on helper function

    Provide srv obj in helper fn

    Provide srv to helper fn

    Remove stray underscore

    Remove blank line

    parent 93e666b4c1e7e49b8406dc83ed93f4a02ea49ac1
    author wbt <wbt@users.noreply.github.com> 1598559718 -0400
    committer Martin Holst Swende <martin@swende.se> 1605602257 +0100
    gpgsig -----BEGIN PGP SIGNATURE-----

     iQFFBAABCAAvFiEEypmrtbNuJK1doP1AaDtDjAWl3fAFAl+zi9ARHG1hcnRpbkBz
     d2VuZGUuc2UACgkQaDtDjAWl3fDRiwgAoMtzU8dwRV7Q9xkCwWEx9Wz2f3n6jUr2
     VWBycDKGKwRkPPOER3oc9kzjGU/P1tFlK07PjfnAKZ9KWzxpDcJZwYM3xCBurG7A
     16y4YsQnzgPNONv3xIkdi3RZtDBIiPFFEmdZFFvZ/jKexfI6JIYPngCAoqdTIFb9
     On/aPvvVWQn1ExfmarsvvJ7kUDUG77tZipuacEH5FfFsfelBWOEYPe+I9ToUHskv
     +qO6rOkV1Ojk8eBc6o0R1PnApwCAlEhJs7aM/SEOg4B4ZJJneiFuEXBIG9+0yS2I
     NOicuDPLGucOB5nBsfIKI3USPeE+3jxdT8go2lN5Nrhm6MimoILDsQ==
     =sgUp
     -----END PGP SIGNATURE-----

    Refactor: drop err var for more concise test lines

    Add several tests for new WebSocket origin checks

    Remove autoadded whitespace on blank lines

    Restore TestWebsocketOrigins originally-named test

    and rename the others to be helpers rather than full tests

    Remove autoadded whitespace on blank line

    Temporarily comment out new test sets

    Uncomment test around origin rule with scheme

    Remove tests without scheme on browser origin

    per https://github.com/ethereum/go-ethereum/pull/21481/files#r479371498

    Uncomment tests with port; remove some blank lines

    Handle when browser does not specify scheme/port

    Uncomment test for including scheme & port in rule

    Add IP tests

    * node: more tests + table-driven, ws origin changes

    Co-authored-by: Martin Holst Swende <martin@swende.se>

    * trie, rpc, cmd/geth: fix tests on 32-bit and windows + minor rpc fixes (#21871)

    * trie: fix tests to work on 32-bit systems

    * les: make test work on 32-bit platform

    * cmd/geth: fix windows-issues on tests

    * trie: improve balance

    * cmd/geth: make account tests less verbose + less mem intense

    * rpc: make debug-level log output less verbose

    * cmd/geth: lint

    * crypto/bn256: fix bn256Mul fuzzer to not hang on large input (#21872)

    * crypto/bn256: fix bn256Mul fuzzer to not hang on large input

    * Update crypto/bn256/bn256_fuzz.go

    Co-authored-by: ligi <ligi@ligi.de>

    Co-authored-by: ligi <ligi@ligi.de>

    * p2p: avoid spinning loop on out-of-handles (#21878)

    * p2p: avoid busy-loop on temporary errors

    * p2p: address review concerns

    * les/utils: protect against WeightedRandomSelect overflow (#21839)

    Also fixes a bug in les/flowcontrol that caused the overflow.

    * github: Add new style of issue-templates

    closes #20024

    * tests/fuzzers/bls1381: add bls fuzzer (#21796)

    * added bls fuzzer

    * crypto/bls12381: revert bls-changes, fixup fuzzer tests

    * fuzzers: split bls fuzzing into 8 different units

    * fuzzers/bls: remove (now stale) corpus

    * crypto/bls12381: added blsfuzz corpus

    * fuzzers/bls12381: fix the bls corpus

    * fuzzers: fix oss-fuzz script

    * tests/fuzzers: fixups on bls corpus

    * test/fuzzers: remove leftover corpus

    Co-authored-by: Marius van der Wijden <m.vanderwijden@live.de>

    * cmd/faucet: improve handling of facebook post url (#21838)

    Resolves #21532

    Co-authored-by: roger <dengjun@huobi.com>

    * les: fix GetProofsV2 bug (#21896)

    * github: Remove vulnerability.md (#21894)

    This type is automatically offered by github after changing to the new style and a security.md being present

    * cmd/devp2p/internal/ethtest: add 'large announcement' tests (#21792)

    * cmd/devp2p/internal/ethtest: added large announcement tests

    * cmd/devp2p/internal/ethtest: added large announcement tests

    * cmd/devp2p/internal/ethtest: refactored stuff a bit

    * cmd/devp2p/internal/ethtest: added TestMaliciousStatus/Handshake

    * cmd/devp2p/internal/ethtest: fixed rebasing issue

    * happy linter, happy life

    * cmd/devp2p/internal/ethtest: used readAndServe

    * stuff

    * cmd/devp2p/internal/ethtest: fixed test cases

    * core/types: fixed typo (#21897)

    * all: simplify nested complexity and if blocks ending with a return statement (#21854)

    Changes:

        Simplify nested complexity
        If an if blocks ends with a return statement then remove the else nesting.

    Most of the changes has also been reported in golint https://goreportcard.com/report/github.com/ethereum/go-ethereum#golint

    * graphql: always return 400 if errors are present in the response (#21882)

    * Make sure to return 400 when errors are present in the response

    * graphql: use less memory in chainconfig for tests

    Co-authored-by: Martin Holst Swende <martin@swende.se>

    * all: remove redundant conversions and import names (#21903)

    * p2p/discover: fix deadlock in discv5 message dispatch (#21858)

    This fixes a deadlock that could occur when a response packet arrived
    after a call had already rece…
  • Loading branch information
acoshift committed Feb 8, 2022
1 parent 3967093 commit 07f2632
Show file tree
Hide file tree
Showing 603 changed files with 34,372 additions and 18,200 deletions.
10 changes: 8 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Contributing

Thank you for your interest in contributing to Quorum!
Thank you for your interest in contributing to GoQuorum!

We welcome contributions from anyone on the internet, and are grateful for even the
smallest of fixes!

Expand Down Expand Up @@ -31,6 +32,11 @@ and help.

## Configuration, dependencies, and tests

Please see the [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide)
Please see the [Developers' Guide](https://geth.ethereum.org/docs/developers/devguide)
for more details on configuring your environment, managing project dependencies
and testing procedures.

## Issue reproductibility

Before you create an issue, please try to reproduce it with [quorum quick dev start framework](https://github.com/ConsenSys/quorum-dev-quickstart) with the latest release.
Many issues have been creating under an environment we are not able to reproduce quickly.
28 changes: 0 additions & 28 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

Empty file added .github/ISSUE_TEMPLATE/bug.md
Empty file.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Request a feature
about: Report a missing feature - e.g. as a step before submitting a PR
title: ''
labels: 'type:feature'
assignees: ''
---

# Rationale

Why should this feature exist?
What are the use-cases?

# Implementation

Do you have ideas regarding the implementation of this feature?
Are you willing to implement this feature?
9 changes: 9 additions & 0 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
name: Ask a question
about: Something is unclear
title: ''
labels: 'type:docs'
assignees: ''
---

This should only be used in very rare cases e.g. if you are not 100% sure if something is a bug or asking a question that leads to improving the documentation. For general questions please use [discord](https://discord.gg/nthXNEv) or the Ethereum stack exchange at https://ethereum.stackexchange.com.
225 changes: 221 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
branches:
- master
env:
GO_VERSION: 1.15.5
GO_VERSION: 1.15.6
GOPATH: ${{ github.workspace }}/go
WORKING_DIR: ${{ github.workspace }}/go/src/github.com/ethereum/go-ethereum
jobs:
Expand Down Expand Up @@ -69,13 +69,14 @@ jobs:
with:
name: docker-image
path: ${{ steps.build.outputs.output_dir }}
acceptance-tests:
acceptance-tests-1:
name: Acceptance tests (${{ matrix.tag }})
needs:
- docker-build
if: success()
strategy:
fail-fast: false
max-parallel: 6
matrix:
# list of tag expression being executed in parallel
# for PR, only selective tests are run.
Expand All @@ -101,6 +102,77 @@ jobs:
- 'basic-rpc-security || networks/plugins::qbft-rpc-security'
- 'basic-rpc-security || networks/plugins::istanbul-rpc-security'
- 'migration && networks/template::raft-4nodes'
#- 'migration && networks/template::istanbul-4nodes'
#- 'migration && networks/template::raft-4nodes-ancientdb'
#- 'migration && networks/template::istanbul-4nodes-ancientdb'
#- 'permissions-v1 && networks/template::raft-3plus1'
#- 'permissions-v2 && networks/template::raft-3plus1'
#- 'privacy-enhancements-upgrade || networks/template::raft-4nodes-pe'
#- 'privacy-enhancements-upgrade || networks/template::istanbul-4nodes-pe'
#- 'multitenancy && networks/plugins::raft-multitenancy'
#- 'basic || basic-raft || (advanced && raft) || networks/typical::raft-simple-mps'
#- 'basic || basic-istanbul || (advanced && istanbul) || networks/typical::qbft-simple-mps'
#- 'basic || basic-istanbul || (advanced && istanbul) || networks/typical::istanbul-simple-mps'
#- 'basic || networks/typical::raftmps'
#- 'basic || networks/typical::qbftmps'
#- 'basic || networks/typical::istanbulmps'
#- 'mps-upgrade-txtrace || networks/template::raft-4nodes-mps'
#- 'mps-upgrade-txtrace || networks/template::istanbul-4nodes-mps'
#- '(basic && !nosupport && !mps && !(spam && !raw) && !eth-api-signed && !privacy-enhancements-disabled && !graphql && !async && !extension && !storage-root && !personal-api-signed) || networks/typical-besu::ibft2'
#- '(basic && !nosupport && !mps && !(spam && !raw) && !eth-api-signed && !privacy-enhancements-disabled && !graphql && !async && !extension && !storage-root && !personal-api-signed) || networks/typical-hybrid::hybrid'
privacy-enhancements:
- 'false'
#include:
# - tag: '(basic && !privacy-enhancements-disabled) || privacy-enhancements || basic-raft || (advanced && raft) || networks/typical::raft'
# privacy-enhancements: 'true'
# - tag: '(basic && !privacy-enhancements-disabled) || privacy-enhancements || basic-istanbul || (advanced && istanbul) || networks/typical::istanbul'
# privacy-enhancements: 'true'
runs-on: ubuntu-18.04
steps:
- name: 'Download workflow artifact - Docker image'
uses: actions/download-artifact@v1
with:
name: docker-image
- name: 'Load Docker image'
id: setup
run: |
tar xfvz docker-image/quorum-pr.tar.gz
docker load --input quorum-pr.tar
docker_env_file="${{ runner.temp }}/env.list"
echo "TF_VAR_quorum_docker_image={ name = \"quorumengineering/quorum:pr\", local = true }" >> $docker_env_file
echo "TF_VAR_privacy_enhancements={block=0, enabled=${{ matrix.privacy-enhancements}}}" >> $docker_env_file
echo "::set-output name=outputDir::${{ runner.temp }}"
echo "::set-output name=dockerEnvFile::$docker_env_file"
- name: 'Run acceptance tests'
run: |
cat ${{ steps.setup.outputs.dockerEnvFile }}
docker run --rm \
--network host \
-v /var/run/docker.sock:/var/run/docker.sock \
-v ${{ steps.setup.outputs.outputDir }}:${{ steps.setup.outputs.outputDir }} \
--env-file ${{ steps.setup.outputs.dockerEnvFile }} \
quorumengineering/acctests:latest test \
-Pauto \
-Dauto.outputDir=${{ steps.setup.outputs.outputDir }} \
-Dtags="${{ matrix.tag }}"
- name: 'Debug'
run: |
docker images
docker ps -a
acceptance-tests-2:
name: Acceptance tests (${{ matrix.tag }})
needs:
- docker-build
- acceptance-tests-1
if: success()
strategy:
fail-fast: false
max-parallel: 6
matrix:
# list of tag expression being executed in parallel
# for PR, only selective tests are run.
# More comprehensive suites are scheduled to run in master
tag:
- 'migration && networks/template::istanbul-4nodes'
- 'migration && networks/template::raft-4nodes-ancientdb'
- 'migration && networks/template::istanbul-4nodes-ancientdb'
Expand Down Expand Up @@ -162,7 +234,7 @@ jobs:
name: Publish Docker Image
needs:
- build
- acceptance-tests
- acceptance-tests-2
runs-on: ubuntu-18.04
steps:
- name: 'Checkout'
Expand Down Expand Up @@ -380,4 +452,149 @@ jobs:
_post() {
curl -X POST ${{ secrets.SLACK_WEBHOOK_URL }} -H "Content-type: application/json" --data "@${1}"
}
_post "long_message.json" || _post "short_message.json"
_post "long_message.json" || _post "short_message.json"
build-sentinel:
if: always()
needs:
- build
- docker-build
- acceptance-tests-1
- acceptance-tests-2
- publish-docker
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 14
- run: npm install @slack/web-api
- uses: actions/github-script@v4
env:
SLACK_TOKEN: "${{ secrets.BUILD_SENTINEL_SLACK_TOKEN }}"
CHANNEL_NAME: "${{ secrets.BUILD_SENTINEL_CHANNEL_NAME }}"
# The value of the WORKFLOW_ID variable must be equal of the workflow filename, in this case build.yml
WORKFLOW_ID: build.yml
with:
script: |
const { WebClient } = require('@slack/web-api')
const {
SLACK_TOKEN,
CHANNEL_NAME,
WORKFLOW_ID
} = process.env;
const { data: { workflow_runs: runs } } = await github.actions.listWorkflowRuns({
owner: context.repo.owner,
repo: context.repo.repo,
workflow_id: WORKFLOW_ID
});
const runId = "${{ github.run_id }}"
const isLatestRun = runs[0].id == runId;
// Only the latest run may publish a new message
if (!isLatestRun) return;
const slackClient = new WebClient(SLACK_TOKEN);
const repository = "${{ github.repository }}";
const pipelineUrl = `https://github.com/${repository}/actions/runs/${runId}`;
const pipelineLinkBlock = {
"type": "actions",
"elements": [
{
"type": "button",
"url": pipelineUrl,
"text": {
"type": "plain_text",
"text": "Visit pipeline",
"emoji": true
}
}
]
};
const successEmoji = ":large_green_circle:";
const successBlocks = [
{
"type": "section",
"text": {
"type": "plain_text",
"text": `${successEmoji} The build on ${repository} is back to green!`,
"emoji": true
}
},
pipelineLinkBlock
];
const failureEmoji = ":red_circle:";
const failureBlocks = [
{
"type": "section",
"text": {
"type": "plain_text",
"text": `${failureEmoji} A build job on ${repository} has failed!`,
"emoji": true
}
},
pipelineLinkBlock
];
const results = [
"${{ needs['build'].result }}",
"${{ needs['docker-build'].result }}",
"${{ needs['acceptance-tests-1'].result }}",
"${{ needs['acceptance-tests-2'].result }}",
"${{ needs['publish-docker'].result }}",
];
const isCurrentRunSuccessful = results.every(r => r === "success");
// Find channel
const { channels } = await slackClient.conversations.list({ types: "private_channel" });
const channel = channels.find(c => c.name === CHANNEL_NAME);
// Find latest bot message among the 100 latest channel messages
// The number of loaded messages may be increased
const { messages } = await slackClient.conversations.history({
channel: channel.id,
});
const latestBotMessage = messages.find(m => {
const isWrittenByTheBot = Boolean(m.bot_profile);
if (!isWrittenByTheBot) return false;
const notificationText = m.text || "";
return notificationText.includes(repository) && (notificationText.startsWith(successEmoji) || notificationText.startsWith(failureEmoji));
});
if (!latestBotMessage) {
/**
* The bot is optimistic, if the latest message has not been found
* and the run is successful, we assume the situation is fine
* if the run is not successful, we publish (possibly again) an error message
*/
if (!isCurrentRunSuccessful) {
await slackClient.chat.postMessage({
channel: channel.id,
text: failureBlocks[0].text.text,
blocks: failureBlocks
})
}
return;
}
const isInSuccessState = latestBotMessage.text.startsWith(successEmoji);
// If no change occurs, do not post any message
if (isInSuccessState === isCurrentRunSuccessful) return;
// Else, create the message and post it
const blocks = isCurrentRunSuccessful
? successBlocks
: failureBlocks;
await slackClient.chat.postMessage({
channel: channel.id,
text: blocks[0].text.text,
blocks
})
3 changes: 2 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- '**.md'
- .gitignore
env:
GO_VERSION: 1.15.5
GO_VERSION: 1.15.6
jobs:
lint:
name: 'Code linters'
Expand Down Expand Up @@ -80,6 +80,7 @@ jobs:
if: success()
strategy:
fail-fast: false
max-parallel: 6
matrix:
# list of tag expression being executed in parallel
# for PR, only selective tests are run.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
tags:
- 'v*'
env:
GO_VERSION: 1.15.5
GO_VERSION: 1.15.6
GOPATH: ${{ github.workspace }}/go
WORKING_DIR: ${{ github.workspace }}/go/src/github.com/ethereum/go-ethereum
jobs:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/upgradebot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@ jobs:
git clone https://github.com/Consensys/quorum-bots.git $GOPATH/src/upgradebot
- name: Execute upgrade geth bot
run: |
git config --global user.email "${{github.actor}}@users.noreply.github.com"
git config --global user.name "${{github.actor}}"
go run upgradebot/cmd
Loading

0 comments on commit 07f2632

Please sign in to comment.