chore: rollback deltas to core/service.go

dot/core/service.go

@@ -217,15 +217,14 @@ func (s *Service) handleBlock(block *types.Block, state *rtstorage.TrieState) er
 		return ErrNilBlockHandlerParameter
 	}
 
-	// store updates state trie nodes in database
-	// err := s.storageState.StoreTrie(state, &block.Header)
-	// if err != nil {
-	// 	logger.Warnf("failed to store state trie for imported block %s: %s",
-	// 		block.Header.Hash(), err)
-	// 	return err
-	// }
-
-	var err error
+	//store updates state trie nodes in database
+	err := s.storageState.StoreTrie(state, &block.Header)
+	if err != nil {
+		logger.Warnf("failed to store state trie for imported block %s: %s",
+			block.Header.Hash(), err)
+		return err
+	}
+
 	// store block in database
 	if err = s.blockState.AddBlock(block); err != nil {
 		if errors.Is(err, blocktree.ErrParentNotFound) && block.Header.Number != 0 {

dot/state/storage.go

@@ -92,7 +92,7 @@ func (s *StorageState) TrieState(root *common.Hash) (*rtstorage.TrieState, error
 	if root == nil {
 		sr, err := s.blockState.BestBlockStateRoot()
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("while getting best block state root: %w", err)
 		}
 		root = &sr
 	}
@@ -102,7 +102,7 @@ func (s *StorageState) TrieState(root *common.Hash) (*rtstorage.TrieState, error
 		var err error
 		t, err = s.LoadFromDB(*root)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("while loading from database: %w", err)
 		}
 
 		s.tries.softSet(*root, t)

lib/runtime/wazero/imports.go

@@ -2273,24 +2273,18 @@ func ext_storage_root_version_2(ctx context.Context, m api.Module, version uint3
 	}
 	storage := rtCtx.Storage
 
-	fmt.Printf("ext_storage_root_version_2 with pre parsed: %v\n", version)
-
 	stateVersion, err := trie.ParseVersion(version)
 	if err != nil {
 		logger.Errorf("failed parsing state version: %s", err)
 		return mustWrite(m, rtCtx.Allocator, emptyByteVectorEncoded)
 	}
 
-	fmt.Printf("ext_storage_root_version_2 with pos parsed: %s\n", stateVersion.String())
-
 	root, err := storage.Root(stateVersion.MaxInlineValue())
 	if err != nil {
 		logger.Errorf("failed to get storage root: %s", err)
 		panic(err)
 	}
 
-	fmt.Printf("root v1 hash is: %s\n", root.String())
-
 	rootSpan, err := write(m, rtCtx.Allocator, root[:])
 	if err != nil {
 		logger.Errorf("failed to allocate: %s", err)

lib/runtime/wazero/instance.go

@@ -100,6 +100,7 @@ func NewInstanceFromTrie(t *trie.Trie, cfg Config) (*Instance, error) {
 
 // NewInstance instantiates a runtime from raw wasm bytecode
 func NewInstance(code []byte, cfg Config) (instance *Instance, err error) {
+	logger.Info("instantiating a runtime!")
 	logger.Patch(log.SetLevel(cfg.LogLvl), log.SetCallerFunc(true))
 
 	ctx := context.Background()
@@ -434,6 +435,7 @@ func NewInstance(code []byte, cfg Config) (instance *Instance, err error) {
 		codeHash: cfg.CodeHash,
 	}
 
+	instance.version()
 	return instance, nil
 }
 
@@ -515,7 +517,6 @@ func (in *Instance) version() error { //skipcq: RVV-B0001
 	fmt.Println("state version", version.StateVersion)
 
 	in.Context.Version = &version
-
 	return nil
 }
 

lib/trie/database.go

@@ -27,7 +27,6 @@ func (t *Trie) Load(db db.DBGetter, rootHash common.Hash) error {
 		return nil
 	}
 	rootHashBytes := rootHash.ToBytes()
-
 	encodedNode, err := db.Get(rootHashBytes)
 	if err != nil {
 		return fmt.Errorf("failed to find root key %s: %w", rootHash, err)