From 42f8bcb3d40caf3a51d9f1c0c90c494b90a51b96 Mon Sep 17 00:00:00 2001 From: gary rong Date: Wed, 28 Oct 2020 20:00:22 +0800 Subject: [PATCH] core/state: maintain one more diff layer (#21730) * core/state: maintain one more diff layer * core/state: address comment # Conflicts: # core/state/statedb.go --- to-merge.txt | 50 -------------------------------------------------- 1 file changed, 50 deletions(-) diff --git a/to-merge.txt b/to-merge.txt index 3e63e7f8c..c80660955 100644 --- a/to-merge.txt +++ b/to-merge.txt @@ -376,53 +376,3 @@ Date: Wed Oct 28 20:00:22 2020 +0800 * core/state: maintain one more diff layer * core/state: address comment - -commit 296a27d10624fa07b4fcb8c1964eefa6a0ba850d -Author: Marius van der Wijden -Date: Tue Oct 27 17:22:44 2020 +0100 - - accounts/abi/bind: restore error functionality (#21743) - - * accounts/abi/bind: restore error functionality - - * Update accounts/abi/bind/base.go - - Co-authored-by: Guillaume Ballet - - Co-authored-by: Guillaume Ballet - -commit 1a55e20d3562b08a4cf31b5b6b66d39d9acc43df -Author: James Prestwich <10149425+prestwich@users.noreply.github.com> -Date: Mon Oct 26 05:45:08 2020 -0700 - - cmd/geth: fix dir path in geth attach for yolov2 network (#21749) - -commit 7b748e550a3234c5240427d0164a058829dc83dc -Merge: 8a94aa91f 68ac4eb79 -Author: Péter Szilágyi -Date: Fri Oct 23 17:48:43 2020 +0300 - - Merge pull request #21747 from holiman/yolov2update - - params: update yolov2 bootnode with elastic ip - -commit 68ac4eb796a243b9c79405ffdafab2a6125acb7a -Author: Martin Holst Swende -Date: Fri Oct 23 16:47:26 2020 +0200 - - params: update yolov2 bootnode with elastic ip - -commit 8a94aa91fbe4985e8e48f81f2e89fb447b0dfd37 -Merge: 95f720fff f5182c7b9 -Author: Péter Szilágyi -Date: Fri Oct 23 16:42:08 2020 +0300 - - Merge pull request #21745 from holiman/yolov2_bootnodes - - utils, params: add yolov2 bootnode - -commit f5182c7b9c874aa77e90cc4c104ca01352fac6d2 -Author: Martin Holst Swende -Date: Fri Oct 23 15:40:48 2020 +0200 - - utils, params: add yolov2 bootnode