update deps and fix fallback preimages

Author: Ferret-san

cmd/celestiadaserver.go

@@ -12,13 +12,15 @@ import (
 
 	flag "github.com/spf13/pflag"
 
-	"github.com/ethereum/go-ethereum/log"
+	gethlog "github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/metrics"
 	"github.com/ethereum/go-ethereum/metrics/exp"
 
 	"github.com/offchainlabs/nitro/cmd/genericconf"
 	"github.com/offchainlabs/nitro/cmd/util/confighelpers"
+	"github.com/offchainlabs/nitro/daprovider/daclient"
 	"github.com/offchainlabs/nitro/util/headerreader"
+	"github.com/offchainlabs/nitro/util/rpcclient"
 
 	das "github.com/celestiaorg/nitro-das-celestia/daserver"
 	"github.com/celestiaorg/nitro-das-celestia/daserver/types"
@@ -33,7 +35,9 @@ type CelestiaDAServerConfig struct {
 
 	CelestiaDa das.DAConfig `koanf:"celestia"`
 
-	DasClientConfig das.ClientConfig `koanf:"das"`
+	DasClientConfig daclient.ClientConfig `koanf:"das"`
+
+	FallbackEnabled bool `koanf:"fallback-enabled"`
 
 	LogLevel string `koanf:"log-level"`
 	LogType  string `koanf:"log-type"`
@@ -50,18 +54,19 @@ var DefaultCelestiaDAServerConfig = CelestiaDAServerConfig{
 	RPCPort:            9876,
 	RPCServerTimeouts:  genericconf.HTTPServerTimeoutConfigDefault,
 	RPCServerBodyLimit: genericconf.HTTPServerBodyLimitDefault,
+	FallbackEnabled:    true,
 	LogLevel:           "INFO",
 	LogType:            "plaintext",
 	Metrics:            false,
 	MetricsServer:      genericconf.MetricsServerConfigDefault,
 	PProf:              false,
 	PprofCfg:           genericconf.PProfDefault,
-	DasClientConfig:    das.DefaultConfig,
+	DasClientConfig:    daclient.DefaultClientConfig,
 }
 
 func main() {
 	if err := startup(); err != nil {
-		log.Error("Error running CelestiaDAServer", "err", err)
+		gethlog.Error("Error running CelestiaDAServer", "err", err)
 	}
 }
 
@@ -87,9 +92,11 @@ func parseDAServer(args []string) (*CelestiaDAServerConfig, error) {
 	f.String("log-level", DefaultCelestiaDAServerConfig.LogLevel, "log level, valid values are CRIT, ERROR, WARN, INFO, DEBUG, TRACE")
 	f.String("log-type", DefaultCelestiaDAServerConfig.LogType, "log type (plaintext or json)")
 
+	f.Bool("fallback-enabled", DefaultCelestiaDAServerConfig.FallbackEnabled, "enable fallbacks to arbitrum anytrust")
+
 	das.CelestiaDAConfigAddOptions("celestia", f)
 
-	das.ClientConfigAddOptions("das", f)
+	daclient.ClientConfigAddOptions("das", f)
 
 	k, err := confighelpers.BeginCommonParse(f, args)
 	if err != nil {
@@ -123,7 +130,7 @@ func (c *L1ReaderCloser) String() string {
 func startMetrics(cfg *CelestiaDAServerConfig) error {
 	mAddr := fmt.Sprintf("%v:%v", cfg.MetricsServer.Addr, cfg.MetricsServer.Port)
 	pAddr := fmt.Sprintf("%v:%v", cfg.PprofCfg.Addr, cfg.PprofCfg.Port)
-	if cfg.Metrics && !metrics.Enabled {
+	if cfg.Metrics && cfg.PProf && mAddr == pAddr {
 		return fmt.Errorf("metrics must be enabled via command line by adding --metrics, json config has no effect")
 	}
 	if cfg.Metrics && cfg.PProf && mAddr == pAddr {
@@ -160,9 +167,9 @@ func startup() error {
 		flag.Usage()
 		return fmt.Errorf("error parsing log type when creating handler: %w", err)
 	}
-	glogger := log.NewGlogHandler(handler)
+	glogger := gethlog.NewGlogHandler(handler)
 	glogger.Verbosity(logLevel)
-	log.SetDefault(log.NewLogger(glogger))
+	gethlog.SetDefault(gethlog.NewLogger(glogger))
 
 	if err := startMetrics(serverConfig); err != nil {
 		return err
@@ -184,8 +191,9 @@ func startup() error {
 		celestiaReader = celestiaDA
 		celestiaWriter = celestiaDA
 
-		if serverConfig.DasClientConfig.EnableFallback {
-			client, err := das.NewClient(serverConfig.DasClientConfig)
+		if serverConfig.FallbackEnabled {
+			clientConfig := serverConfig.DasClientConfig.RPC
+			client, err := daclient.NewClient(ctx, func() *rpcclient.ClientConfig { return &clientConfig })
 			if err != nil {
 				panic(fmt.Sprintf("Failed to create client: %v", err))
 			}

daserver/bridgegen/bridgegen.go

@@ -0,0 +1,33 @@
+module github.com/offchainlabs/nitro/solgen/go/bridgegen
+
+go 1.23.0
+
+require github.com/ethereum/go-ethereum v1.15.6
+
+require (
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/StackExchange/wmi v1.2.1 // indirect
+	github.com/bits-and-blooms/bitset v1.17.0 // indirect
+	github.com/consensys/bavard v0.1.22 // indirect
+	github.com/consensys/gnark-crypto v0.14.0 // indirect
+	github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
+	github.com/crate-crypto/go-kzg-4844 v1.1.0 // indirect
+	github.com/deckarep/golang-set/v2 v2.6.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
+	github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
+	github.com/ethereum/go-verkle v0.2.2 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/holiman/uint256 v1.3.2 // indirect
+	github.com/mmcloughlin/addchain v0.4.0 // indirect
+	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
+	github.com/supranational/blst v0.3.14 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
+	golang.org/x/crypto v0.35.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	rsc.io/tmplfunc v0.0.3 // indirect
+)