Skip to content
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

Jump to bottom

Use preimages in conversion #44

Merged
merged 1 commit into from
Jun 14, 2022
Merged

Use preimages in conversion #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions cmd/geth/converkle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/state/snapshot"
"github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/log"
"github.com/ethereum/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/trie"
Expand Down Expand Up @@ -138,13 +139,17 @@ type slotHash struct {
hash common.Hash
}

func iterateSlots(slotCh chan *slotHash, storageIt snapshot.StorageIterator) {
func iterateSlots(slotCh chan *slotHash, storageIt snapshot.StorageIterator, chaindb ethdb.Database) {
defer storageIt.Release()
for storageIt.Next() {
var slot [32]byte
slotNum := rawdb.ReadPreimage(chaindb, storageIt.Hash())
if len(slotNum) == 0 {
panic(fmt.Sprintf("no preimage for %x", storageIt.Hash().Bytes()))
}
copy(slot[:], storageIt.Slot())
slotCh <- &slotHash{
hash: storageIt.Hash(),
hash: common.BytesToHash(slotNum),
slot: slot[:],
}
}
Expand Down Expand Up @@ -231,6 +236,10 @@ func convertToVerkle(ctx *cli.Context) error {
if !bytes.Equal(acc.CodeHash, emptyCode) {
code = rawdb.ReadCode(chaindb, common.BytesToHash(acc.CodeHash))
}
addr := rawdb.ReadPreimage(chaindb, accIt.Hash())
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're not actually making any use of addr, are you?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're not actually making any use of addr, are you?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indeed, and yet it's still slow 🤣

if len(addr) == 0 {
panic(fmt.Sprintf("no preimage for %x", accIt.Hash().Bytes()))
}
accountCh <- &accHash{
account: acc,
hash: accIt.Hash(),
Expand Down Expand Up @@ -265,7 +274,7 @@ func convertToVerkle(ctx *cli.Context) error {
// TODO these aren't properly stopped in case of errors / aborts
// TODO instead of firing up a new goroutine each time, just pass
// the iterator to a persistent routine (which also handles aborts properly)
go iterateSlots(slotCh, storageIt)
go iterateSlots(slotCh, storageIt, chaindb)
}

// Store the basic account data
Expand Down