add back caches for code and code length; implement code and codelength methods

This commit is contained in:
i-norden 2023-02-27 16:17:24 -06:00
parent 99b6f60eb7
commit 23baf50803

View File

@ -1,13 +1,34 @@
package ipld_eth_statedb
import (
"context"
"errors"
"fmt"
"github.com/VictoriaMetrics/fastcache"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/statediff/indexer/ipld"
"github.com/ethereum/go-ethereum/trie"
lru "github.com/hashicorp/golang-lru"
"github.com/jackc/pgx/pgxpool"
)
const (
// Number of codehash->size associations to keep.
codeSizeCacheSize = 100000
// Cache size granted for caching clean code.
codeCacheSize = 64 * 1024 * 1024
)
var (
// not found error
errNotFound = errors.New("not found")
)
type Database interface {
ContractCode(addrHash common.Hash, codeHash common.Hash) ([]byte, error)
ContractCodeSize(addrHash common.Hash, codeHash common.Hash) (int, error)
@ -16,29 +37,69 @@ type Database interface {
CopyTrie(trie state.Trie) state.Trie
}
type StateDatabase struct {
db pgxpool.Pool
type stateDatabase struct {
pgdb pgxpool.Pool
trieDB *trie.Database
ethDB ethdb.Database
codeSizeCache *lru.Cache
codeCache *fastcache.Cache
}
func (sd *StateDatabase) ContractCode(addrHash common.Hash, codeHash common.Hash) ([]byte, error) {
panic("implement me")
func NewStateDatabase(pgdb pgxpool.Pool, ethdb ethdb.Database, config *trie.Config) (*stateDatabase, error) {
csc, _ := lru.New(codeSizeCacheSize)
return &stateDatabase{
pgdb: pgdb,
trieDB: trie.NewDatabaseWithConfig(ethdb, config),
codeSizeCache: csc,
codeCache: fastcache.New(codeCacheSize),
}, nil
}
func (sd *StateDatabase) ContractCodeSize(addrHash common.Hash, codeHash common.Hash) (int, error) {
panic("implement me")
func (sd *stateDatabase) ContractCode(_, codeHash common.Hash) ([]byte, error) {
if code := sd.codeCache.Get(nil, codeHash.Bytes()); len(code) > 0 {
return code, nil
}
cid := ipld.Keccak256ToCid(ipld.RawBinary, codeHash.Bytes())
code := make([]byte, 0)
if err := sd.pgdb.QueryRow(context.Background(), GetContractCodePgStr, cid).Scan(&code); err != nil {
return nil, errNotFound
}
if len(code) > 0 {
sd.codeCache.Set(codeHash.Bytes(), code)
sd.codeSizeCache.Add(codeHash, len(code))
return code, nil
}
return nil, errNotFound
}
func (sd *StateDatabase) OpenTrie(root common.Hash) (state.Trie, error) {
return trie.NewStateTrie(common.Hash{}, root, sd.trieDB), nil
func (sd *stateDatabase) ContractCodeSize(_, codeHash common.Hash) (int, error) {
if cached, ok := sd.codeSizeCache.Get(codeHash); ok {
return cached.(int), nil
}
code, err := sd.ContractCode(common.Hash{}, codeHash)
return len(code), err
}
func (sd *StateDatabase) OpenStorageTrie(addrHash common.Hash, root common.Hash) (state.Trie, error) {
panic("replace my usage")
func (sd *stateDatabase) OpenTrie(root common.Hash) (state.Trie, error) {
tr, err := trie.NewStateTrie(common.Hash{}, root, sd.trieDB)
if err != nil {
return nil, err
}
return tr, nil
}
func (sd *StateDatabase) CopyTrie(trie state.Trie) state.Trie {
panic("replace my usage")
func (sd *stateDatabase) OpenStorageTrie(addrHash common.Hash, root common.Hash) (state.Trie, error) {
tr, err := trie.NewStateTrie(addrHash, root, sd.trieDB)
if err != nil {
return nil, err
}
return tr, nil
}
func (sd *stateDatabase) CopyTrie(t state.Trie) state.Trie {
switch t := t.(type) {
case *trie.StateTrie:
return t.Copy()
default:
panic(fmt.Errorf("unknown trie type %T", t))
}
}