diff --git a/server/flags.go b/server/flags.go index 13a63ecb..e7d00e01 100644 --- a/server/flags.go +++ b/server/flags.go @@ -21,9 +21,7 @@ func AddFlags(cmd *cobra.Command) { cmd.Flags().Bool(config.FlagLight, def.Node.Light, "run light client") cmd.Flags().Duration(config.FlagBlockTime, def.Node.BlockTime.Duration, "block time (for aggregator mode)") cmd.Flags().String(config.FlagTrustedHash, def.Node.TrustedHash, "initial trusted hash to start the header exchange service") - cmd.Flags().Bool(config.FlagLazyAggregator, def.Node.LazyAggregator, "produce blocks only when transactions are available or after lazy block time") cmd.Flags().Uint64(config.FlagMaxPendingBlocks, def.Node.MaxPendingBlocks, "maximum blocks pending DA confirmation before pausing block production (0 for no limit)") - cmd.Flags().Duration(config.FlagLazyBlockTime, def.Node.LazyBlockTime.Duration, "maximum interval between blocks in lazy aggregation mode") // Data Availability configuration flags cmd.Flags().String(config.FlagDAAddress, def.DA.Address, "DA address (host:port)") diff --git a/server/start.go b/server/start.go index 6f69bfb4..dc81f9cc 100644 --- a/server/start.go +++ b/server/start.go @@ -33,8 +33,7 @@ import ( "google.golang.org/grpc/credentials/insecure" "github.com/rollkit/rollkit/core/sequencer" - rollkitda "github.com/rollkit/rollkit/da" - "github.com/rollkit/rollkit/da/proxy/jsonrpc" + "github.com/rollkit/rollkit/da/jsonrpc" "github.com/rollkit/rollkit/node" "github.com/rollkit/rollkit/pkg/config" "github.com/rollkit/rollkit/pkg/genesis" @@ -46,7 +45,7 @@ import ( "github.com/rollkit/go-execution-abci/pkg/adapter" "github.com/rollkit/go-execution-abci/pkg/rpc" rpcjson "github.com/rollkit/go-execution-abci/pkg/rpc/json" - provider "github.com/rollkit/go-execution-abci/pkg/rpc/provider" + "github.com/rollkit/go-execution-abci/pkg/rpc/provider" execsigner "github.com/rollkit/go-execution-abci/pkg/signer" ) @@ -397,20 +396,17 @@ func startNode( ) // create the DA client - daClient, err := jsonrpc.NewClient(ctx, logger, rollkitcfg.DA.Address, rollkitcfg.DA.AuthToken) + daClient, err := jsonrpc.NewClient(ctx, logger, rollkitcfg.DA.Address, rollkitcfg.DA.AuthToken, rollkitcfg.DA.Namespace) if err != nil { return nil, nil, nil, cleanupFn, fmt.Errorf("failed to create DA client: %w", err) } - // TODO(@facu): gas price and gas multiplier should be set by the node operator - rollkitda := rollkitda.NewDAClient(&daClient.DA, 1, 1, []byte(cmtGenDoc.ChainID), []byte{}, logger) - rolllkitNode, err = node.NewNode( ctxWithCancel, rollkitcfg, executor, sequencer.NewDummySequencer(), - rollkitda, + &daClient.DA, signer, *nodeKey, p2pClient,