From f4abf1d559c285cdde4806212dd938a100003bcf Mon Sep 17 00:00:00 2001 From: gary rong Date: Wed, 23 Sep 2020 17:44:09 +0800 Subject: [PATCH] trie: extend range proof (#21250) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * trie: support non-existent right proof * trie: improve test * trie: minor linter fix Co-authored-by: Péter Szilágyi # Conflicts: # trie/proof.go # trie/proof_test.go --- to-merge.txt | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/to-merge.txt b/to-merge.txt index 8ffa90532..0c8497565 100644 --- a/to-merge.txt +++ b/to-merge.txt @@ -72,16 +72,4 @@ Date: Wed Sep 23 17:44:09 2020 +0800 Co-authored-by: Péter Szilágyi -commit 0921f8a74f1c050792453fc241eef67d7400d94c -Author: Marius van der Wijden -Date: Wed Sep 23 10:29:48 2020 +0200 - - internal/ethapi: add optional parameter blockNrOrHash to estimateGas (#21545) - - This allows users to estimate gas on top of arbitrary blocks as well as pending and latest. - Tracing on pending is useful for most users as it takes into account the current txpool while - tracing on latest might be useful for users that have little to know knowledge of the current - transactions in the network. - - If blockNrOrHash is not specified, estimateGas defaults to pending