Parallel decryptions

.gitignore

@@ -1,6 +1,5 @@
 */node_modules/*
 precompiles/cache/*
-precompiles/types/*
 precompiles/artifacts/*
 solgen/**/*.js
 build/

Dockerfile

@@ -1,4 +1,4 @@
-ARG BRANCH=latest
+ARG BRANCH=v0.0.0-alpha.10
 ARG DOCKER_NAME=ghcr.io/fhenixprotocol/nitro/fhenix-node-builder:$BRANCH
 
 FROM rust:1.74-slim-bullseye as warp-drive-builder
@@ -77,8 +77,6 @@ RUN ./gen.sh
 
 WORKDIR /workspace
 
-COPY nitro-overrides/precompiles/FheOps.go precompiles/FheOps.go
-
 RUN go mod tidy
 
 RUN CGO_ENABLED=0 go install -ldflags "-s -w -extldflags '-static'" github.com/go-delve/delve/cmd/dlv@latest

cmd/main.go

@@ -105,14 +105,14 @@ func initFheos() (*precompiles.TxParams, error) {
 	}
 
 	tp := precompiles.TxParams{
-		false,
-		false,
-		true,
-		nil,
-		common.HexToAddress("0x0000000000000000000000000000000000000000"),
-		vm.GetHashFunc(nil),
-		nil,
-	}
+		Commit:          false,
+		GasEstimation:   false,
+		EthCall:         true,
+		CiphertextDb:    nil,
+		ContractAddress: common.HexToAddress("0x0000000000000000000000000000000000000000"),
+		GetBlockHash:    vm.GetHashFunc(nil),
+		BlockNumber:     nil,
+		ParallelTxHooks: nil}
 
 	return &tp, err
 }

go.sum

@@ -108,8 +108,8 @@ github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0U
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
 github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
-github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw=
-github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc=
+github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4=
+github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
 github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU=

hooks/hooks.go

@@ -2,6 +2,7 @@ package hooks
 
 import (
 	"encoding/hex"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/log"
@@ -153,6 +154,10 @@ func (h FheOSHooksImpl) EvmCallEnd(evmSuccess bool) {
 			log.Info("Deleted ciphertext", "hash", hex.EncodeToString(hash[:]))
 		}
 	}
+
+	if fheos.State != nil {
+		fheos.State.RandomCounter = 0
+	}
 }
 
 func shouldIgnoreContract(caller common.Address, addr common.Address) bool {

nitro-overrides/cmd/staterecovery/staterecovery.go

@@ -0,0 +1,96 @@
+package staterecovery
+
+import (
+	"fmt"
+	"time"
+
+	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/vm"
+	"github.com/ethereum/go-ethereum/ethdb"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/ethereum/go-ethereum/triedb"
+	"github.com/ethereum/go-ethereum/triedb/hashdb"
+)
+
+func RecreateMissingStates(chainDb ethdb.Database, bc *core.BlockChain, cacheConfig *core.CacheConfig, startBlock uint64) error {
+	start := time.Now()
+	currentHeader := bc.CurrentBlock()
+	if currentHeader == nil {
+		return fmt.Errorf("current header is nil")
+	}
+	target := currentHeader.Number.Uint64()
+	current := startBlock
+	genesis := bc.Config().ArbitrumChainParams.GenesisBlockNum
+	if current < genesis+1 {
+		current = genesis + 1
+		log.Warn("recreate-missing-states-from before genesis+1, starting from genesis+1", "configured", startBlock, "override", current)
+	}
+	previousBlock := bc.GetBlockByNumber(current - 1)
+	if previousBlock == nil {
+		return fmt.Errorf("start block parent is missing, parent block number: %d", current-1)
+	}
+
+	if cacheConfig.StateScheme == rawdb.PathScheme {
+		return fmt.Errorf("recreating missing states, which is supposed to only run in archive mode, is not supported with path scheme")
+	}
+
+	hashConfig := *hashdb.Defaults
+	hashConfig.CleanCacheSize = cacheConfig.TrieCleanLimit * 1024 * 1024
+	trieConfig := &triedb.Config{
+		Preimages: false,
+		HashDB:    &hashConfig,
+	}
+
+	database := state.NewDatabaseWithConfig(chainDb, trieConfig)
+	defer database.TrieDB().Close()
+	previousState, err := state.New(previousBlock.Root(), database, nil)
+	if err != nil {
+		return fmt.Errorf("state of start block parent is missing: %w", err)
+	}
+	// we don't need to reference states with `trie.Database.Reference` here, because:
+	// * either the state nodes will be read from disk and then cached in cleans cache
+	// * or they will be recreated, saved to disk and then also cached in cleans cache
+	logged := time.Unix(0, 0)
+	recreated := 0
+	for {
+		currentBlock := bc.GetBlockByNumber(current)
+		if currentBlock == nil {
+			break
+		}
+		if time.Since(logged) > 1*time.Minute {
+			// #nosec G115
+			log.Info("Recreating missing states", "block", current, "target", target, "remaining", int64(target)-int64(current), "elapsed", time.Since(start), "recreated", recreated)
+			logged = time.Now()
+		}
+		currentState, err := state.New(currentBlock.Root(), database, nil)
+		if err != nil {
+			_, _, _, err := bc.Processor().Process(currentBlock, previousState, vm.Config{})
+			if err != nil {
+				return fmt.Errorf("processing block %d failed: %w", current, err)
+			}
+			root, err := previousState.Commit(current, bc.Config().IsEIP158(currentBlock.Number()))
+			if err != nil {
+				return fmt.Errorf("StateDB commit failed, number %d root %v: %w", current, currentBlock.Root(), err)
+			}
+			if root.Cmp(currentBlock.Root()) != 0 {
+				return fmt.Errorf("reached different state root after processing block %d, have %v, want %v", current, root, currentBlock.Root())
+			}
+			// commit to disk
+			err = database.TrieDB().Commit(root, false)
+			if err != nil {
+				return fmt.Errorf("TrieDB commit failed, number %d root %v: %w", current, root, err)
+			}
+			currentState, err = state.New(currentBlock.Root(), database, nil)
+			if err != nil {
+				return fmt.Errorf("state reset after block %d failed: %w", current, err)
+			}
+			recreated++
+		}
+		current++
+		previousState = currentState
+	}
+	log.Info("Finished recreating missing states", "elapsed", time.Since(start), "recreated", recreated)
+	return nil
+}