fix: nibbles should come from node.key and should shift key index according to nibbles len in GetProof

Author: KimiWu123

geth-utils/gethutil/mpt/trie/stacktrie.go

@@ -806,6 +806,8 @@ func (st *StackTrie) GetProof(db ethdb.KeyValueReader, key []byte) ([][]byte, []
 		// fmt.Print(" ", k[i], "/", c.nodeType, " | ")
 		proofType = append(proofType, c.nodeType)
 		if c.nodeType == extNode {
+			fmt.Print(c.key, " ")
+			i += len(c.key) - 1
 			nodes = append(nodes, c)
 			c = c.children[0]
 		} else if c.nodeType == branchNode {
@@ -833,6 +835,7 @@ func (st *StackTrie) GetProof(db ethdb.KeyValueReader, key []byte) ([][]byte, []
 				nibbles = append(nibbles, nibble)
 			}
 
+			fmt.Print(" hashed node key:", c.key, " ")
 			// fmt.Println(" c_rlp:", c_rlp)
 			proof = append(proof, c_rlp)
 			branchChild := st.getNodeFromBranchRLP(c_rlp, int(k[i]))
@@ -844,7 +847,7 @@ func (st *StackTrie) GetProof(db ethdb.KeyValueReader, key []byte) ([][]byte, []
 			}
 			c.val = branchChild
 			// if there are children, the node type should be branch
-			proofType[i] = branchNode
+			proofType[len(proofType)-1] = branchNode
 		}
 	}
 
@@ -888,8 +891,8 @@ func (st *StackTrie) GetProof(db ethdb.KeyValueReader, key []byte) ([][]byte, []
 				for i := 0; i < int(numNibbles); i++ {
 					nibble[i] = raw_rlp[i+1] - 16
 				}
-				// fmt.Println(" Ext nibble:", numNibbles, nibble)
-				nibbles = append(nibbles, nibble)
+				// fmt.Println(" Ext nibble:", numNibbles, node.key)
+				nibbles = append(nibbles, node.key)
 			} else {
 				nibbles = append(nibbles, []byte{})
 			}

geth-utils/gethutil/mpt/witness/prepare_witness.go

@@ -383,20 +383,16 @@ func prepareWitnessSpecial(testName string, trieModifications []TrieModification
 //	-[o] [(empty)] -> [LEAF] --> 1
 //	-[o] [LEAF] -> [EXT - BRANCH - LEAF] --> 2
 //	-[o] [EXT - BRANCH] -> [EXT - BRANCH - LEAF]  --> "< 16"
-//	-[M] [EXT - BRANCH] -> [BRANCH - LEAF]  --> 16 (modified ext.)
+//	-[M] [EXT - BRANCH] -> [BRANCH - LEAF]  --> 0 under 16 txs or 16 (modified ext.)
 //	-[o] [BRANCH - BRANCH] -> [BRANCH - BRANCH - LEAF]  --> "< 127"
 //	-[o] [BRANCH - LEAF] -> [BRANCH - BRANCH - LEAF]  --> 129
 //	-[o] [BRANCH] -> [BRANCH - LEAF]  --> 0
-//	-[M] [EXT - BRANCH] -> [BRANCH - LEAF] (modified extension) --> 0 under 16 txs
 //	-[o] [BRANCH - BRANCH - LEAF] -> [BRANCH - BRANCH - EXT - BRANCH - LEAF] --> 129
 //	-[o] [BRANCH - BRANCH - EXT - BRANCH] -> [BRANCH - BRANCH - EXT - BRANCH - LEAF] --> 130
-//	-[H] [BRANCH - BRANCH - EXT - BRANCH - HASHED] -> [BRANCH - BRANCH - BRANCH - LEAF] --> 144 (hashed node)
+//	-[H] [BRANCH - BRANCH - EXT - BRANCH - HASHED] -> [BRANCH - BRANCH - BRANCH - LEAF] --> 144, 512 (hashed node)
 //	-[o] [BRANCH - BRANCH - (...BRANCH)] -> [BRANCH - BRANCH - (...BRANCH) - LEAF] --> 146 ~ 176
-//
-//	-[] [BRANCH - BRANCH - EXT - BRANCH - LEAF] -> [BRANCH - BRANCH - EXT - BRANCH - BRANCH - HASHED] --> 258
-//	-[] [BRANCH - BRANCH - EXT - BRANCH - BRANCH - HASHED] -> [BRANCH - BRANCH - EXT - BRANCH - BRANCH - HASHED] --> 259~
-//	-[] [BRANCH - BRANCH - EXT - BRANCH - BRANCH - BRANCH - HASHED] -> [BRANCH - BRANCH - EXT - BRANCH - LEAF] --> 512
-//	-[] [[BRANCH - BRANCH - EXT - BRANCH - EXT - BRANCH] -> [BRANCH - BRANCH - EXT - BRANCH - EXT - BRANCH - LEAF] --> 514~
+//	-[o] [BRANCH - BRANCH - EXT - (BRANCH..)] -> [BRANCH - BRANCH - EXT - (BRANCH..) - LEAF] --> 258~
+//	-[o] [BRANCH - BRANCH - EXT - BRANCH - EXT - BRANCH] -> [BRANCH - BRANCH - EXT - BRANCH - EXT - BRANCH - LEAF] --> 514~
 func GenerateWitness(txIdx uint, key, value []byte, proof *trie.StackProof) []Node {
 	k := trie.KeybytesToHex(key)
 	k = k[:len(k)-1]