fix: account proof generation and preimage storage (#1090)

* fix: don't pad addresses to be 32 bytes

* fix: proper preimage storage

core/state/statedb.go

@@ -357,13 +357,8 @@ func (s *StateDB) GetState(addr common.Address, hash common.Hash) common.Hash {
 
 // GetProof returns the Merkle proof for a given account.
 func (s *StateDB) GetProof(addr common.Address) ([][]byte, error) {
-	return s.GetProofByHash(common.BytesToHash(addr.Bytes()))
-}
-
-// GetProofByHash returns the Merkle proof for a given account.
-func (s *StateDB) GetProofByHash(addrHash common.Hash) ([][]byte, error) {
 	var proof zkproof.ProofList
-	err := s.trie.Prove(addrHash[:] /*, 0*/, &proof)
+	err := s.trie.Prove(addr.Bytes(), &proof)
 	return proof, err
 }
 

trie/zk_trie.go

@@ -176,7 +176,7 @@ func (mt *ZkTrie) TryUpdate(key []byte, vFlag uint32, vPreimage []Byte32) error
 	mt.lock.Lock()
 	defer mt.lock.Unlock()
 
-	mt.secKeyCache[string(nodeKey.Bytes())] = key
+	mt.secKeyCache[string(nodeKey.Bytes())] = append([]byte{}, key...)
 
 	newRootKey, _, err := mt.addLeaf(newLeafNode, mt.rootKey, 0, path)
 	// sanity check
@@ -293,8 +293,9 @@ func (mt *ZkTrie) commit(nodeHash *Hash, path []byte, nodeSet *trienode.NodeSet,
 
 	if node.Type == NodeTypeLeaf_New {
 		if mt.preimages != nil {
+			nodeKeyBytes := node.NodeKey.Bytes()
 			mt.preimages.insertPreimage(map[common.Hash][]byte{
-				common.BytesToHash(nodeHash.Bytes()): node.NodeKey.Bytes(),
+				common.BytesToHash(nodeKeyBytes): mt.secKeyCache[string(nodeKeyBytes)],
 			})
 		}
 		if collectLeaf {