From 5f3bcbe1c34829fa1c2efadb529af72d1a6825a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Wed, 29 Apr 2020 18:00:29 +0300 Subject: [PATCH] core/state/snapshot: fix journal nil deserialziation # Conflicts: # core/state/snapshot/journal.go --- to-merge.txt | 208 --------------------------------------------------- 1 file changed, 208 deletions(-) diff --git a/to-merge.txt b/to-merge.txt index c969a3946..96c9929cb 100644 --- a/to-merge.txt +++ b/to-merge.txt @@ -581,211 +581,3 @@ Author: Péter Szilágyi Date: Wed Apr 29 18:00:29 2020 +0300 core/state/snapshot: fix journal nil deserialziation - -commit 26d271dfbba1367326dec38068f9df828d462c61 -Author: Gary Rong -Date: Wed Apr 29 17:53:08 2020 +0800 - - core/state/snapshot: implement storage iterator (#20971) - - * core/state/snapshot: implement storage iterator - - * core/state/snapshot, tests: implement helper function - - * core/state/snapshot: fix storage issue - - If an account is deleted in the tx_1 but recreated in the tx_2, - the it can happen that in this diff layer, both destructedSet - and storageData records this account. In this case, the storage - iterator should be able to iterate the slots belong to new account - but disable further iteration in deeper layers(belong to old account) - - * core/state/snapshot: address peter and martin's comment - - * core/state: address comments - - * core/state/snapshot: fix test - -commit 1264c19f1153d6379b4df37ae7a9d996b90dd732 -Author: ucwong -Date: Tue Apr 28 19:57:07 2020 +0800 - - go.mod : goupnp v1.0.0 upgrade (#20996) - -commit 7f95a85fd474b93e9f6441fa7f582f9bd089aeb7 -Author: Martin Holst Swende -Date: Tue Apr 28 13:28:38 2020 +0200 - - signer, log: properly escape character sequences (#20987) - - * signer: properly handle terminal escape characters - - * log: use strconv conversion instead of custom escape function - - * log: remove relection tests for nil - -commit 0708b573bc38c1d393d2452cb97807dccda70b5f -Author: ucwong -Date: Tue Apr 28 16:53:08 2020 +0800 - - event, whisper/whisperv6: use defer where possible (#20940) - -commit 9887edd580d161d22d284e8778b090016bd24f80 -Author: Steven E. Harris -Date: Tue Apr 28 04:43:21 2020 -0400 - - rpc: add explicit 200 response for empty HTTP GET (#20952) - -commit 1893266c59c04eb55709b911578767f1ab8a9210 -Author: ucwong -Date: Tue Apr 28 16:22:23 2020 +0800 - - go.mod: upgrade to golang-lru v0.5.4 (#20992) - - golang-lru is now a go module, and the upgrade corrects a couple - of minor issues. In particular, the library could crash if you inserted - nil into an LRU cache. - -commit 92a7538ed3ffb23b372219ec2e7a36457217730e -Author: Felix Lange -Date: Tue Apr 28 10:06:49 2020 +0200 - - core: improve TestLogRebirth (#20961) - - This is a resubmit of #20668 which rewrites the problematic test - without any additional goroutines. It also documents the test better. - - The purpose of this test is checking whether log events are sent - correctly when importing blocks. The test was written at a time when - blockchain events were delivered asynchronously, making the check hard - to pull off. Now that core.BlockChain delivers events synchronously - during the call to InsertChain, the test can be simplified. - - Co-authored-by: BurtonQin - -commit 5c3993444d725aba00c7c8c976c5cc9f4bf6a317 -Author: Julian Y -Date: Mon Apr 27 08:25:24 2020 -0700 - - rpc: make ExampleClientSubscription work with the geth API (#19483) - - This corrects the call to eth_getBlockByNumber, which previously - returned this error: - - can't get latest block: missing value for required argument 1 - - Co-authored-by: Felix Lange - -commit ba068d40dd9a198ccc7ad9382c768f363aeb54cc -Author: Boqin Qin -Date: Mon Apr 27 21:16:30 2020 +0800 - - core: add check in AddChildIndexer to avoid double lock (#20982) - - This fixes a theoretical double lock condition which could occur in - - indexer.AddChildIndexer(indexer) - - Nobody would ever do that though. - - Co-authored-by: Felix Lange - -commit e32ee6ac05af434d6af330682a00cafa1ba32a66 -Author: Marius van der Wijden -Date: Mon Apr 27 15:07:33 2020 +0200 - - accounts/abi: added abi test cases, minor bug fixes (#20903) - - * accounts/abi: added documentation - - * accounts/abi: reduced usage of arguments.LengthNonIndexed - - * accounts/abi: simplified reflection logic - - * accounts/abi: moved testjson data into global declaration - - * accounts/abi: removed duplicate test cases - - * accounts/abi: reworked abi tests - - * accounts/abi: added more tests for abi packing - - * accounts/abi/bind: refactored base tests - - * accounts/abi: run pack tests as subtests - - * accounts/abi: removed duplicate tests - - * accounts/abi: removed unnused arguments.LengthNonIndexed - - Due to refactors to the code, we do not need the arguments.LengthNonIndexed function anymore. - You can still get the length by calling len(arguments.NonIndexed()) - - * accounts/abi: added type test - - * accounts/abi: modified unpack test to pack test - - * accounts/abi: length check on arrayTy - - * accounts/abi: test invalid abi - - * accounts/abi: fixed rebase error - - * accounts/abi: fixed rebase errors - - * accounts/abi: removed unused definition - - * accounts/abi: merged packing/unpacking tests - - * accounts/abi: fixed [][][32]bytes encoding - - * accounts/abi: added tuple test cases - - * accounts/abi: renamed getMockLog -> newMockLog - - * accounts/abi: removed duplicate test - - * accounts/abi: bools -> booleans - -commit 40283d0522e5bf2567e080b5eac9700597095704 -Author: Steven E. Harris -Date: Mon Apr 27 05:16:00 2020 -0400 - - node: shut down all node-related HTTP servers gracefully (#20956) - - Rather than just closing the underlying network listener to stop our - HTTP servers, use the graceful shutdown procedure, waiting for any - in-process requests to finish. - -commit a070e23178e8ad2213893a758fe87a3213ec1bff -Merge: 1aa83290f b0bbd4718 -Author: Péter Szilágyi -Date: Mon Apr 27 12:02:13 2020 +0300 - - Merge pull request #20988 from karalabe/catchup-shutdown - - eth: fix shutdown regression to abort downloads, not just cancel - -commit b0bbd4718511a8b2575e5feb8cbd54beb9675973 -Author: Péter Szilágyi -Date: Mon Apr 27 11:22:15 2020 +0300 - - eth: fix shutdown regression to abort downloads, not just cancel - -commit 1aa83290f5052ce275fc4f36b909a721afe6037a -Author: tgyKomgo <52910426+tgyKomgo@users.noreply.github.com> -Date: Fri Apr 24 16:50:03 2020 +0200 - - p2p/enode: update code comment (#20972) - - It is possible to specify enode URLs using domain name since - commit b90cdbaa79cf, but the code comment still said that only - IP addresses are allowed. - - Co-authored-by: admin@komgo.io - -commit 8a2e8faadd55a81090996afdd6b9e082bb32f72b -Author: Gary Rong -Date: Fri Apr 24 19:43:49 2020 +0800 - - core/state/snapshot: fix binary iterator (#20970) \ No newline at end of file