From ee0da1e9e1fa4be92623693dfe0a276db8ed15f6 Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Tue, 29 Sep 2020 17:38:13 +0200 Subject: [PATCH] trie: use stacktrie for Derivesha operation (#21407) core/types: use stacktrie for derivesha trie: add stacktrie file trie: fix linter core/types: use stacktrie for derivesha rebased: adapt stacktrie to the newer version of DeriveSha Co-authored-by: Martin Holst Swende More linter fixes review feedback: no key offset for nodes converted to hashes trie: use EncodeRLP for full nodes core/types: insert txs in order in derivesha trie: tests for derivesha with stacktrie trie: make stacktrie use pooled hashers trie: make stacktrie reuse tmp slice space trie: minor polishes on stacktrie trie/stacktrie: less rlp dancing core/types: explain the contorsions in DeriveSha ci: fix goimport errors trie: clear mem on subtrie hashing squashme: linter fix stracktrie: use pooling, less allocs (#3) trie: in-place hex prefix, reduce allocs and add rawNode.EncodeRLP Reintroduce the `[]node` method, add the missing `EncodeRLP` implementation for `rawNode` and calculate the hex prefix in place. Co-authored-by: Martin Holst Swende Co-authored-by: Martin Holst Swende # Conflicts: # core/block_validator.go # core/types/derive_sha.go # eth/downloader/queue.go # eth/handler.go # turbo/trie/database.go # turbo/trie/encoding.go # turbo/trie/encoding_test.go # turbo/trie/stacktrie.go # turbo/trie/stacktrie_test.go --- to-merge.txt | 59 ---------------------------------------------------- 1 file changed, 59 deletions(-) diff --git a/to-merge.txt b/to-merge.txt index 1a5589c8d07..55d50b4b135 100644 --- a/to-merge.txt +++ b/to-merge.txt @@ -433,63 +433,4 @@ Date: Tue Sep 29 17:40:08 2020 +0200 * signer/core: minor change to validationmessages of typed data -commit 6c8310ebb40d260811580d188e0a815ba314ff9d -Author: Guillaume Ballet -Date: Tue Sep 29 17:38:13 2020 +0200 - - trie: use stacktrie for Derivesha operation (#21407) - - core/types: use stacktrie for derivesha - - trie: add stacktrie file - - trie: fix linter - - core/types: use stacktrie for derivesha - - rebased: adapt stacktrie to the newer version of DeriveSha - - Co-authored-by: Martin Holst Swende - - More linter fixes - - review feedback: no key offset for nodes converted to hashes - - trie: use EncodeRLP for full nodes - - core/types: insert txs in order in derivesha - - trie: tests for derivesha with stacktrie - - trie: make stacktrie use pooled hashers - - trie: make stacktrie reuse tmp slice space - - trie: minor polishes on stacktrie - - trie/stacktrie: less rlp dancing - - core/types: explain the contorsions in DeriveSha - - ci: fix goimport errors - - trie: clear mem on subtrie hashing - - squashme: linter fix - - stracktrie: use pooling, less allocs (#3) - - trie: in-place hex prefix, reduce allocs and add rawNode.EncodeRLP - - Reintroduce the `[]node` method, add the missing `EncodeRLP` implementation for `rawNode` and calculate the hex prefix in place. - - Co-authored-by: Martin Holst Swende - - Co-authored-by: Martin Holst Swende - -commit 4ee11b072e8b3ebaa025354bb346e2ea9cc3b27c -Author: mr_franklin -Date: Tue Sep 29 17:31:14 2020 +0800 - - cmd/bootnode,internal/debug: fix some comments (#21623)