First wait to close all threads. Then release low level iterator. (#47)

db/iterator.go

@@ -82,8 +82,8 @@ func (i *iterator[T]) Value() T {
 
 // Release the iterator and wait until all threads are closed gracefully.
 func (i *iterator[T]) Release() {
-	i.iter.Release()
 	i.wg.Wait()
+	i.iter.Release()
 }
 
 func isNil[T comparable](arg T) bool {

db/substate_db.go

@@ -7,6 +7,7 @@ import (
 	gethrlp "github.com/Fantom-foundation/Substate/geth/rlp"
 	"github.com/Fantom-foundation/Substate/rlp"
 	"github.com/Fantom-foundation/Substate/substate"
+	"github.com/syndtr/goleveldb/leveldb"
 	"github.com/syndtr/goleveldb/leveldb/opt"
 )
 
@@ -42,6 +43,14 @@ func NewSubstateDB(path string, o *opt.Options, wo *opt.WriteOptions, ro *opt.Re
 	return newSubstateDB(path, o, wo, ro)
 }
 
+func MakeDefaultSubstateDb(db *leveldb.DB) SubstateDB {
+	return &substateDB{&codeDB{&baseDB{backend: db}}}
+}
+
+func MakeSubstateDb(db *leveldb.DB, wo *opt.WriteOptions, ro *opt.ReadOptions) SubstateDB {
+	return &substateDB{&codeDB{&baseDB{backend: db, wo: wo, ro: ro}}}
+}
+
 func newSubstateDB(path string, o *opt.Options, wo *opt.WriteOptions, ro *opt.ReadOptions) (*substateDB, error) {
 	base, err := newCodeDB(path, o, wo, ro)
 	if err != nil {

db/substate_iterator.go

@@ -42,7 +42,7 @@ func (i *substateIterator) decode(data rawEntry) (*substate.Substate, error) {
 
 func (i *substateIterator) start(numWorkers int) {
 	// Create channels
-	errCh := make(chan error)
+	errCh := make(chan error, numWorkers)
 	rawDataChs := make([]chan rawEntry, numWorkers)
 	resultChs := make([]chan *substate.Substate, numWorkers)
 
@@ -61,11 +61,7 @@ func (i *substateIterator) start(numWorkers int) {
 			i.wg.Done()
 		}()
 		step := 0
-		for {
-			if !i.iter.Next() {
-				return
-			}
-
+		for i.iter.Next() {
 			key := make([]byte, len(i.iter.Key()))
 			copy(key, i.iter.Key())
 			value := make([]byte, len(i.iter.Value()))

rlp/rlp.go

@@ -28,41 +28,27 @@ type RLP struct {
 func Decode(val []byte, block uint64) (*RLP, error) {
 	var (
 		substateRLP RLP
-		done        bool
 		err         error
 	)
 
-	if IsLondonFork(block) {
-		err = rlp.DecodeBytes(val, &substateRLP)
-		if err != nil {
-			return nil, err
-		} else {
-			return &substateRLP, nil
-		}
+	err = rlp.DecodeBytes(val, &substateRLP)
+	if err == nil {
+		return &substateRLP, nil
 	}
 
-	if IsBerlinFork(block) && !done {
-		var berlin berlinRLP
-		err = rlp.DecodeBytes(val, &berlin)
-		if err != nil {
-			return nil, err
-		} else {
-			return berlin.toLondon(), nil
-		}
+	var berlin berlinRLP
+	err = rlp.DecodeBytes(val, &berlin)
+	if err == nil {
+		return berlin.toLondon(), nil
 	}
 
-	if !done {
-		var legacy legacyRLP
-		err = rlp.DecodeBytes(val, &legacy)
-		if err != nil {
-			return nil, err
-		} else {
-			return legacy.toLondon(), nil
-		}
-
+	var legacy legacyRLP
+	err = rlp.DecodeBytes(val, &legacy)
+	if err == nil {
+		return nil, err
 	}
 
-	return nil, err
+	return legacy.toLondon(), nil
 }
 
 // ToSubstate transforms every attribute of r from RLP to substate.Substate.

rlp/rlp_message.go

@@ -57,7 +57,7 @@ type Message struct {
 func (m Message) ToSubstate(getHashFunc func(codeHash common.Hash) ([]byte, error)) (*substate.Message, error) {
 	sm := &substate.Message{
 		Nonce:      m.Nonce,
-		CheckNonce: m.CheckNonce,
+		CheckNonce: !m.CheckNonce, // todo find out if this is correct
 		GasPrice:   m.GasPrice,
 		Gas:        m.Gas,
 		From:       m.From,