cmd/faucet: update the embedded website asset

# Conflicts:
#	cmd/faucet/website.go
This commit is contained in:
Péter Szilágyi 2021-01-14 12:10:52 +02:00 committed by Igor Mandrigin
parent 94556a7db7
commit c933238203

193
diff.txt
View File

@ -1573,196 +1573,3 @@ Date: Thu Jan 14 12:10:52 2021 +0200
cmd/faucet: update the embedded website asset
commit 96157a897be2032be5fdb87f947fbe5df8a53bd4
Author: Martin Holst Swende <martin@swende.se>
Date: Wed Jan 13 22:43:07 2021 +0100
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.
commit 2aaff0ad76991be8851ae30454d2e2e967704102
Author: Marius van der Wijden <m.vanderwijden@live.de>
Date: Wed Jan 13 11:44:20 2021 +0100
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
commit 6296211a3ee2502bdec73256eadaf9185fb4d946
Author: Martin Holst Swende <martin@swende.se>
Date: Wed Jan 13 11:42:26 2021 +0100
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
commit c94081774f6c8c43e10deb5735c3f9a09a7bcd04
Author: Martin Holst Swende <martin@swende.se>
Date: Wed Jan 13 11:29:28 2021 +0100
tests: update the reference tests (#22009)
commit c7a6be163f07c967172dfcb3fe2ef25ff08dd4de
Author: Guillaume Ballet <gballet@gmail.com>
Date: Wed Jan 13 10:14:36 2021 +0000
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'.
commit 93a89b26819c9b21ff32ab650b8916076b53b471
Author: Martin Holst Swende <martin@swende.se>
Date: Tue Jan 12 17:39:31 2021 +0100
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
commit 23f837c38827d7c1ea67b71eb6f79934562f0d98
Author: meowsbits <b5c6@protonmail.com>
Date: Tue Jan 12 08:50:11 2021 -0600
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>
commit 984e752ce52b09142ed936c337456df27128e3bc
Author: rene <41963722+renaynay@users.noreply.github.com>
Date: Tue Jan 12 10:52:13 2021 +0100
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.
commit 39b3b8ffb44983a260031d5077226d952ddfb9bf
Author: rene <41963722+renaynay@users.noreply.github.com>
Date: Mon Jan 11 14:55:42 2021 +0100
graphql: fix issue with unmarshalling int32 into `Long` type #22153
commit 49c2816d5464ed208389d52ed7cf47f35630b1c2
Author: Marius van der Wijden <m.vanderwijden@live.de>
Date: Mon Jan 11 12:53:13 2021 +0100
eth: improve log message (#22146)
* eth: fixed typos
* eth: fixed log message
commit 79e2174e4d58ede93cce8fafbd13dd5566cbb729
Merge: 5a1b38435 ab5e3f400
Author: Péter Szilágyi <peterke@gmail.com>
Date: Mon Jan 11 10:52:46 2021 +0200
Merge pull request #22157 from karalabe/prque-tests
common/prque: pull in tests and benchmarks from upstream
commit ab5e3f400f9dd3832508208ecef8b75c681728ce
Author: Péter Szilágyi <peterke@gmail.com>
Date: Mon Jan 11 10:31:03 2021 +0200
common/prque: pull in tests and benchmarks from upstream
commit 5a1b38435270336fd86fe742c9951abad870b84d
Author: Gary Rong <garyrong0905@gmail.com>
Date: Sun Jan 10 19:54:15 2021 +0800
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
commit 89030ec0b442a08fb82d4452f3132ab1602b8182
Author: Chris Ziogas <ziogaschr@gmail.com>
Date: Sat Jan 9 18:29:19 2021 +0200
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.
commit 889f5645b57dde5b5d4cccf1561bdb449293d2d8
Author: Marius van der Wijden <m.vanderwijden@live.de>
Date: Fri Jan 8 21:29:25 2021 +0100
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.
commit 6b88ab75bcbc5eaecaf5619ec730aa00f5e7c941
Author: Martin Holst Swende <martin@swende.se>
Date: Fri Jan 8 11:17:15 2021 +0100
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