Skip to content

refactor: Share Firewood for EVM #4696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StephenButtolph merged 6 commits into from
Dec 16, 2025
Merged

refactor: Share Firewood for EVM #4696

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b6be909
refactor: Move Firewood to evm-shared
alarso16 Dec 12, 2025
5aaa02d
refactor: shared implementation in subnet-evm
alarso16 Dec 12, 2025
708c022
style: unparam fix
alarso16 Dec 15, 2025
9ab772f
style: use first letter as name
alarso16 Dec 15, 2025
b8392ab
style: nit names
alarso16 Dec 16, 2025
5a327b4
style: rename firewoodState to stateAccessor
alarso16 Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion graft/coreth/core/blockchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/internal/version"
"github.com/ava-labs/avalanchego/graft/coreth/params"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/customtypes"
"github.com/ava-labs/avalanchego/graft/coreth/triedb/firewood"
"github.com/ava-labs/avalanchego/graft/coreth/triedb/hashdb"
"github.com/ava-labs/avalanchego/graft/coreth/triedb/pathdb"
"github.com/ava-labs/avalanchego/graft/evm/firewood"
"github.com/ava-labs/avalanchego/vms/evm/acp176"
"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
"github.com/ava-labs/libevm/common"
Expand Down
9 changes: 3 additions & 6 deletions graft/coreth/core/extstate/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/ava-labs/libevm/ethdb"
"github.com/ava-labs/libevm/triedb"

"github.com/ava-labs/avalanchego/graft/coreth/triedb/firewood"
"github.com/ava-labs/avalanchego/graft/evm/firewood"
)

func NewDatabaseWithConfig(db ethdb.Database, config *triedb.Config) state.Database {
Expand All @@ -22,12 +22,9 @@ func NewDatabaseWithNodeDB(db ethdb.Database, triedb *triedb.Database) state.Dat
}

func wrapIfFirewood(db state.Database) state.Database {
fw, ok := db.TrieDB().Backend().(*firewood.Database)
fw, ok := db.TrieDB().Backend().(*firewood.TrieDB)
if !ok {
return db
}
return &firewoodAccessorDB{
Database: db,
fw: fw,
}
return firewood.NewStateWrapper(db, fw)
}
53 changes: 0 additions & 53 deletions graft/coreth/core/extstate/firewood_database.go
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion graft/coreth/core/genesis_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/params/extras"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/upgrade/ap3"
"github.com/ava-labs/avalanchego/graft/coreth/precompile/contracts/warp"
"github.com/ava-labs/avalanchego/graft/coreth/triedb/firewood"
"github.com/ava-labs/avalanchego/graft/coreth/triedb/pathdb"
"github.com/ava-labs/avalanchego/graft/coreth/utils"
"github.com/ava-labs/avalanchego/graft/evm/firewood"
"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/rawdb"
Expand Down
4 changes: 2 additions & 2 deletions graft/coreth/internal/ethapi/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import (
"github.com/ava-labs/avalanchego/graft/coreth/params"
"github.com/ava-labs/avalanchego/graft/coreth/plugin/evm/customtypes"
"github.com/ava-labs/avalanchego/graft/coreth/rpc"
"github.com/ava-labs/avalanchego/graft/coreth/triedb/firewood"
"github.com/ava-labs/avalanchego/graft/evm/firewood"
"github.com/ava-labs/libevm/accounts"
"github.com/ava-labs/libevm/accounts/keystore"
"github.com/ava-labs/libevm/accounts/scwallet"
Expand Down Expand Up @@ -704,7 +704,7 @@ func (s *BlockChainAPI) GetProof(ctx context.Context, address common.Address, st
if statedb == nil || err != nil {
return nil, err
}
if _, ok := statedb.Database().TrieDB().Backend().(*firewood.Database); ok {
if _, ok := statedb.Database().TrieDB().Backend().(*firewood.TrieDB); ok {
return nil, errors.New("firewood database does not yet support getProof")
}
codeHash := statedb.GetCodeHash(address)
Expand Down
2 changes: 1 addition & 1 deletion graft/coreth/tests/state_test_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (

"github.com/ava-labs/avalanchego/graft/coreth/core/extstate"
"github.com/ava-labs/avalanchego/graft/coreth/core/state/snapshot"
"github.com/ava-labs/avalanchego/graft/coreth/triedb/firewood"
"github.com/ava-labs/avalanchego/graft/coreth/triedb/hashdb"
"github.com/ava-labs/avalanchego/graft/coreth/triedb/pathdb"
"github.com/ava-labs/avalanchego/graft/evm/firewood"
"github.com/ava-labs/avalanchego/vms/evm/sync/customrawdb"
"github.com/ava-labs/libevm/common"
"github.com/ava-labs/libevm/core/rawdb"
Expand Down
Loading