forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-11 06:23:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #167 from fearlessfe/fix-state-storage

Browse source 
fix: state storage err
This commit is contained in:
彭振 2024-09-24 07:55:17 +08:00 committed by GitHub
commit 0dd477dc20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
portalnetwork/state/storage.go
View file

@ -41,11 +41,11 @@ func (s *StateStorage) Put(contentKey []byte, contentId []byte, content []byte)
keyType := contentKey[0] keyType := contentKey[0]
switch keyType { switch keyType {
case AccountTrieNodeType: case AccountTrieNodeType:
return s.putAccountTrieNode(contentKey[1:], content) return s.putAccountTrieNode(contentKey[1:], contentId, content)
case ContractStorageTrieNodeType: case ContractStorageTrieNodeType:
return s.putContractStorageTrieNode(contentKey[1:], content) return s.putContractStorageTrieNode(contentKey[1:], contentId, content)
case ContractByteCodeType: case ContractByteCodeType:
return s.putContractBytecode(contentKey[1:], content) return s.putContractBytecode(contentKey[1:], contentId, content)
} }
return errors.New("unknown content type") return errors.New("unknown content type")
} }
@ -55,7 +55,7 @@ func (s *StateStorage) Radius() *uint256.Int {
return s.store.Radius() return s.store.Radius()
} }
func (s *StateStorage) putAccountTrieNode(contentKey []byte, content []byte) error { func (s *StateStorage) putAccountTrieNode(contentKey []byte, contentId []byte, content []byte) error {
accountKey := &AccountTrieNodeKey{} accountKey := &AccountTrieNodeKey{}
err := accountKey.Deserialize(codec.NewDecodingReader(bytes.NewReader(contentKey), uint64(len(contentKey)))) err := accountKey.Deserialize(codec.NewDecodingReader(bytes.NewReader(contentKey), uint64(len(contentKey))))
if err != nil { if err != nil {
@ -81,7 +81,6 @@ func (s *StateStorage) putAccountTrieNode(contentKey []byte, content []byte) err
if err != nil { if err != nil {
return err return err
} }
contentId := defaultContentIdFunc(contentKey)
err = s.store.Put(contentId, contentId, contentValueBuf.Bytes()) err = s.store.Put(contentId, contentId, contentValueBuf.Bytes())
if err != nil { if err != nil {
s.log.Error("failed to save data after validate", "type", contentKey[0], "key", contentKey[1:], "value", content) s.log.Error("failed to save data after validate", "type", contentKey[0], "key", contentKey[1:], "value", content)
@ -89,7 +88,7 @@ func (s *StateStorage) putAccountTrieNode(contentKey []byte, content []byte) err
return nil return nil
} }
func (s *StateStorage) putContractStorageTrieNode(contentKey []byte, content []byte) error { func (s *StateStorage) putContractStorageTrieNode(contentKey []byte, contentId []byte, content []byte) error {
contractStorageKey := &ContractStorageTrieNodeKey{} contractStorageKey := &ContractStorageTrieNodeKey{}
err := contractStorageKey.Deserialize(codec.NewDecodingReader(bytes.NewReader(contentKey), uint64(len(contentKey)))) err := contractStorageKey.Deserialize(codec.NewDecodingReader(bytes.NewReader(contentKey), uint64(len(contentKey))))
if err != nil { if err != nil {
@ -116,7 +115,6 @@ func (s *StateStorage) putContractStorageTrieNode(contentKey []byte, content []b
if err != nil { if err != nil {
return err return err
} }
contentId := defaultContentIdFunc(contentKey)
err = s.store.Put(contentId, contentId, contentValueBuf.Bytes()) err = s.store.Put(contentId, contentId, contentValueBuf.Bytes())
if err != nil { if err != nil {
s.log.Error("failed to save data after validate", "type", contentKey[0], "key", contentKey[1:], "value", content) s.log.Error("failed to save data after validate", "type", contentKey[0], "key", contentKey[1:], "value", content)
@ -124,7 +122,7 @@ func (s *StateStorage) putContractStorageTrieNode(contentKey []byte, content []b
return nil return nil
} }
func (s *StateStorage) putContractBytecode(contentKey []byte, content []byte) error { func (s *StateStorage) putContractBytecode(contentKey []byte, contentId []byte, content []byte) error {
contractByteCodeKey := &ContractBytecodeKey{} contractByteCodeKey := &ContractBytecodeKey{}
err := contractByteCodeKey.Deserialize(codec.NewDecodingReader(bytes.NewReader(contentKey), uint64(len(contentKey)))) err := contractByteCodeKey.Deserialize(codec.NewDecodingReader(bytes.NewReader(contentKey), uint64(len(contentKey))))
if err != nil { if err != nil {
@ -147,7 +145,6 @@ func (s *StateStorage) putContractBytecode(contentKey []byte, content []byte) er
if err != nil { if err != nil {
return err return err
} }
contentId := defaultContentIdFunc(contentKey)
err = s.store.Put(contentId, contentId, contentValueBuf.Bytes()) err = s.store.Put(contentId, contentId, contentValueBuf.Bytes())
if err != nil { if err != nil {
s.log.Error("failed to save data after validate", "type", contentKey[0], "key", contentKey[1:], "value", content) s.log.Error("failed to save data after validate", "type", contentKey[0], "key", contentKey[1:], "value", content)

4
portalnetwork/state/storage_test.go
View file

@ -17,10 +17,10 @@ func TestStorage(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
for _, tt := range cases { for _, tt := range cases {
contentKey := hexutil.MustDecode(tt.ContentKey) contentKey := hexutil.MustDecode(tt.ContentKey)
contentId := defaultContentIdFunc(contentKey[1:]) contentId := defaultContentIdFunc(contentKey)
err = stateStorage.Put(contentKey, contentId, hexutil.MustDecode(tt.ContentValueOffer)) err = stateStorage.Put(contentKey, contentId, hexutil.MustDecode(tt.ContentValueOffer))
require.NoError(t, err) require.NoError(t, err)
res, err := stateStorage.Get(contentKey[1:], contentId) res, err := stateStorage.Get(contentKey, contentId)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, hexutil.MustDecode(tt.ContentValueRetrieval), res) require.Equal(t, hexutil.MustDecode(tt.ContentValueRetrieval), res)
} }