From 9b943f3e0be92373f8c3d04245b1cc474645d56b Mon Sep 17 00:00:00 2001 From: Ho Date: Thu, 1 Jun 2023 17:00:37 +0800 Subject: [PATCH] fix: add missing term when merging two deletion proofs (#353) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: merge emptyTermPaths * bump version --------- Co-authored-by: Péter Garamvölgyi --- params/version.go | 2 +- trie/zktrie_deletionproof.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/params/version.go b/params/version.go index 2d6b309590..adaaf1b52c 100644 --- a/params/version.go +++ b/params/version.go @@ -24,7 +24,7 @@ import ( const ( VersionMajor = 4 // Major version component of the current release VersionMinor = 0 // Minor version component of the current release - VersionPatch = 1 // Patch version component of the current release + VersionPatch = 2 // Patch version component of the current release VersionMeta = "sepolia" // Version metadata to append to the version string ) diff --git a/trie/zktrie_deletionproof.go b/trie/zktrie_deletionproof.go index 8547c1eda4..e350e5063b 100644 --- a/trie/zktrie_deletionproof.go +++ b/trie/zktrie_deletionproof.go @@ -58,6 +58,10 @@ func (t *ProofTracer) Merge(another *ProofTracer) *ProofTracer { t.rawPaths[k] = v } + for k, v := range another.emptyTermPaths { + t.emptyTermPaths[k] = v + } + return t }