replace isBranch in stackTrie

KimiWu123 · KimiWu123 · commit 63c5ea023d15 · 2024-04-19T14:47:48.000+08:00
diff --git a/geth-utils/gethutil/mpt/witness/prepare_witness.go b/geth-utils/gethutil/mpt/witness/prepare_witness.go
@@ -477,7 +477,7 @@ func GenerateWitness(txIdx uint, key, value []byte, proof *trie.StackProof) []No
 		if mismatchedIdx == -1 {
 			// Add a tx leaf after branch placeholder
 			if lastProofTypeS == trie.LeafNode {
-				leafNode = prepareTxLeafNode(txIdx, proofS[len1-1], proofC[len2-1], k, nil, isBranch(proofS[len1-1]), false, false)
+				leafNode = prepareTxLeafNode(txIdx, proofS[len1-1], proofC[len2-1], k, nil, proofTypeS[len1-1] != trie.BranchNode, false, false)
 			} else {
 				leafNode = prepareTxLeafAndPlaceholderNode(txIdx, proofC[len2-1], k, false)
 			}

Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ func GenerateWitness(txIdx uint, key, value []byte, proof *trie.StackProof) []No`
`477`	`477`	`if mismatchedIdx == -1 {`
`478`	`478`	`// Add a tx leaf after branch placeholder`
`479`	`479`	`if lastProofTypeS == trie.LeafNode {`
`480`		`- leafNode = prepareTxLeafNode(txIdx, proofS[len1-1], proofC[len2-1], k, nil, isBranch(proofS[len1-1]), false, false)`
	`480`	`+ leafNode = prepareTxLeafNode(txIdx, proofS[len1-1], proofC[len2-1], k, nil, proofTypeS[len1-1] != trie.BranchNode, false, false)`
`481`	`481`	`} else {`
`482`	`482`	`leafNode = prepareTxLeafAndPlaceholderNode(txIdx, proofC[len2-1], k, false)`
`483`	`483`	`}`