diff --git a/to-merge.txt b/to-merge.txt index 1e37aff7c..457af7f01 100644 --- a/to-merge.txt +++ b/to-merge.txt @@ -952,99 +952,3 @@ Date: Wed Jun 17 15:41:07 2020 +0800 * fix(freezer): tailId filenum offset were misplaced * core/rawdb: assume first item in freezer always start from zero - -commit eb9d7d15ecf08cd5104e01a8af64489f01f700b0 -Merge: a981b60c2 8523ad450 -Author: Péter Szilágyi -Date: Tue Jun 16 11:35:16 2020 +0300 - - Merge pull request #21170 from duanhao0814/fix-dup-ecrecover - - core: filter out txs with invalid signatures as soon as possible - -commit a981b60c25e6be35ec37cf9b9625017c5fa67fdc -Author: sixdays -Date: Mon Jun 15 20:46:27 2020 +0800 - - eth/downloader: don't use defer for unlock before return (#21227) - - Co-authored-by: linjing - -commit 9371b2f70c70f887999d10750440fb09fe1e184f -Author: HackyMiner -Date: Thu Jun 11 22:41:43 2020 +0900 - - internal/web3ext: add missing params to debug.accountRange (#21208) - -commit c85fdb76eeff83133cbad23111684085582abf73 -Author: Martin Holst Swende -Date: Thu Jun 11 06:27:43 2020 +0200 - - go.mod: update uint256 to 1.1.0 (#21206) - -commit e30c0af86127fd605281bd5b3de3ce2fb8ac95aa -Author: Yang Hau -Date: Thu Jun 11 04:25:32 2020 +0800 - - build, internal/ethapi, crypto/bls12381: fix typos (#21210) - - speicifc -> specific - assigened -> assigned - frobenious -> frobenius - -commit 4a19c0e7b81e553a9e2e4ec4d50e3c2cdb957e3a -Author: Gary Rong -Date: Wed Jun 10 17:46:13 2020 +0800 - - core, eth, internal: include read storage entries in structlog output (#21204) - - * core, eth, internal: extend structLog tracer - - * core/vm, internal: add storage view - - * core, internal: add slots to storage directly - - * core: remove useless - - * core: address martin's comment - - * core/vm: fix tests - -commit e9ba536d85b591f3314c3fd983f2e294774416a7 -Author: Martin Holst Swende -Date: Tue Jun 9 11:39:19 2020 +0200 - - eth/downloader: fix spuriously failing tests (#21149) - - * eth/downloader tests: fix spurious failing test due to race between receipts/headers - - * miner tests: fix travis failure on arm64 - - * eth/downloader: tests - store td in ancients too - -commit 89043cba75e317c9bd7ba01a8ce5af44d4fa9ca1 -Author: Natsu Kagami -Date: Tue Jun 9 04:26:56 2020 -0400 - - accounts/abi: make GetType public again (#21157) - -commit d5c267fd30535610184bed914e3541a57c962ff6 -Author: Pau -Date: Tue Jun 9 10:23:42 2020 +0200 - - accounts/keystore: fix typo in error message (#21200) - -commit a0797e37f880bcaa248127be9671b0c563f73bbf -Merge: cf6674539 80e887d7b -Author: Péter Szilágyi -Date: Mon Jun 8 16:38:05 2020 +0300 - - Merge pull request #21192 from karalabe/fix-escape-analysis - - core/state: avoid escape analysis fault when accessing cached state - -commit 80e887d7bfbbb76fa57322d6b1121f127f3275cb -Author: Péter Szilágyi -Date: Mon Jun 8 16:11:37 2020 +0300 - - core/state: avoid escape analysis fault when accessing cached state