refactor(sc): split contract CommitBatch and UpdateState calls

- Refactored CommitBatch and UpdateState methods:
  - CommitBatch now called in the aggregator service just before creating proof tasks. Transaction creation is skipped if a batch with the same ID has already been submitted.
  - UpdateState is still called in the proposer service after it mentions there is a new state to be proposed.
  - UpdateState now retrieves the CommitBatch transaction for the specified batch ID from L1 and extracts blob data.
  - Instead of returning etherium transaction methods wait for transaction for being included into block.

- Improved error handling and configuration:
  - Proposer now handles `ErrBatchAlreadyFinalized` by refreshing the last proved state root from L1 if local tasks state is out of sync.
  - Introduced a dummy structure mode for the EthClient when the DisableL1 config option is set, which logs calls without returning errors.

- Optimized contract and client interactions:
  - Shared the contract wrapper between Aggregator and Proposer to streamline interactions.
  - Encapsulated retry logic within the EthClient, which now acts as a wrapper around go-ethereum/ethclient.

- Extended testing and utilities:
  - Migrated contract mocker to the testaide package for broader reuse in tests.
  - Added new tests for both the proposer and the wrapper to ensure robustness.

Author: x-mass

nil/cmd/sync_committee/main.go

@@ -4,14 +4,12 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"time"
 
 	"github.com/NilFoundation/nil/nil/common/check"
 	"github.com/NilFoundation/nil/nil/common/logging"
 	"github.com/NilFoundation/nil/nil/internal/db"
 	"github.com/NilFoundation/nil/nil/internal/profiling"
 	"github.com/NilFoundation/nil/nil/services/synccommittee/core"
-	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/spf13/cobra"
 )
 
@@ -71,29 +69,29 @@ func addFlags(cmd *cobra.Command, cfg *cmdConfig) {
 		"sync_committee.db",
 		"path to database")
 	cmd.Flags().StringVar(
-		&cfg.ProposerParams.Endpoint,
+		&cfg.ContractWrapperConfig.Endpoint,
 		"l1-endpoint",
-		cfg.ProposerParams.Endpoint,
+		cfg.ContractWrapperConfig.Endpoint,
 		"L1 endpoint")
 	cmd.Flags().StringVar(
-		&cfg.ProposerParams.PrivateKey,
+		&cfg.ContractWrapperConfig.PrivateKeyHex,
 		"l1-private-key",
-		cfg.ProposerParams.PrivateKey,
+		cfg.ContractWrapperConfig.PrivateKeyHex,
 		"L1 account private key")
 	cmd.Flags().StringVar(
-		&cfg.ProposerParams.ContractAddress,
+		&cfg.ContractWrapperConfig.ContractAddressHex,
 		"l1-contract-address",
-		cfg.ProposerParams.ContractAddress,
+		cfg.ContractWrapperConfig.ContractAddressHex,
 		"L1 update state contract address")
 	cmd.Flags().DurationVar(
-		&cfg.ProposerParams.EthClientTimeout,
+		&cfg.ContractWrapperConfig.RequestsTimeout,
 		"l1-client-timeout",
-		cfg.ProposerParams.EthClientTimeout,
+		cfg.ContractWrapperConfig.RequestsTimeout,
 		"L1 client timeout")
 	cmd.Flags().BoolVar(
-		&cfg.ProposerParams.DisableL1,
+		&cfg.ContractWrapperConfig.DisableL1,
 		"disable-l1",
-		cfg.ProposerParams.DisableL1,
+		cfg.ContractWrapperConfig.DisableL1,
 		"Disable send trancations to L1")
 	logLevel := cmd.Flags().String(
 		"log-level",
@@ -117,12 +115,7 @@ func run(cfg *cmdConfig) error {
 	}
 	defer database.Close()
 
-	ethClient, err := connectToEthClient(cfg.ProposerParams.Endpoint, cfg.ProposerParams.EthClientTimeout)
-	if err != nil {
-		return err
-	}
-
-	service, err := core.New(cfg.Config, database, ethClient)
+	service, err := core.New(cfg.Config, database)
 	if err != nil {
 		return fmt.Errorf("can't create sync committee service: %w", err)
 	}
@@ -142,13 +135,3 @@ func openDB(dbPath string) (db.DB, error) {
 	}
 	return badger, nil
 }
-
-func connectToEthClient(url string, timeout time.Duration) (*ethclient.Client, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-	ethClient, err := ethclient.DialContext(ctx, url)
-	if err != nil {
-		return nil, fmt.Errorf("connecting to ETH RPC node: %w", err)
-	}
-	return ethClient, nil
-}

nil/services/synccommittee/core/aggregator.go

@@ -17,6 +17,7 @@ import (
 	v1 "github.com/NilFoundation/nil/nil/services/synccommittee/core/batches/encode/v1"
 	"github.com/NilFoundation/nil/nil/services/synccommittee/core/reset"
 	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/metrics"
+	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/rollupcontract"
 	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/srv"
 	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/storage"
 	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/types"
@@ -72,6 +73,7 @@ func NewAggregator(
 	blockStorage AggregatorBlockStorage,
 	taskStorage AggregatorTaskStorage,
 	resetter *reset.StateResetter,
+	rollupContractWrapper rollupcontract.Wrapper,
 	clock clockwork.Clock,
 	logger logging.Logger,
 	metrics AggregatorMetrics,
@@ -84,7 +86,7 @@ func NewAggregator(
 		batchCommitter: batches.NewBatchCommitter(
 			v1.NewEncoder(logger),
 			blob.NewBuilder(),
-			nil, // TODO
+			rollupContractWrapper,
 			logger,
 			batches.DefaultCommitOptions(),
 		),

nil/services/synccommittee/core/aggregator_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/NilFoundation/nil/nil/services/rpc/jsonrpc"
 	"github.com/NilFoundation/nil/nil/services/synccommittee/core/reset"
 	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/metrics"
+	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/rollupcontract"
 	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/storage"
 	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/testaide"
 	scTypes "github.com/NilFoundation/nil/nil/services/synccommittee/internal/types"
@@ -67,11 +68,18 @@ func (s *AggregatorTestSuite) newTestAggregator(
 	stateResetter := reset.NewStateResetter(logger, s.blockStorage)
 	clock := clockwork.NewRealClock()
 
+	contractWrapperConfig := rollupcontract.WrapperConfig{
+		DisableL1: true,
+	}
+	contractWrapper, err := rollupcontract.NewWrapper(s.ctx, contractWrapperConfig, logger)
+	s.Require().NoError(err)
+
 	return NewAggregator(
 		s.rpcClientMock,
 		blockStorage,
 		s.taskStorage,
 		stateResetter,
+		contractWrapper,
 		clock,
 		logger,
 		s.metrics,

nil/services/synccommittee/core/batches/commiter.go

@@ -3,11 +3,13 @@ package batches
 import (
 	"bytes"
 	"context"
+	"errors"
+	"fmt"
 	"io"
 
 	"github.com/NilFoundation/nil/nil/common/logging"
+	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/rollupcontract"
 	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/types"
-	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto/kzg4844"
 )
 
@@ -24,7 +26,7 @@ type blobBuilder interface {
 }
 
 type ethCommitter interface {
-	CommitBatch(ctx context.Context, blobs []kzg4844.Blob, batchIndex string) (*ethtypes.Transaction, error)
+	CommitBatch(ctx context.Context, blobs []kzg4844.Blob, batchIndex string) error
 }
 
 type batchCommitter struct {
@@ -72,10 +74,15 @@ func (bc *batchCommitter) Commit(ctx context.Context, batch *types.PrunedBatch)
 	if err != nil {
 		return err
 	}
-	bc.logger.Debug().Int("batch_blob_count", len(blobs)).Msg("packed batch blobs")
 
-	// TODO add ethCommiter.CommitBatch() call
-	bc.logger.Info().Int("blob_count", len(blobs)).Msg("committed batch")
+	if err := bc.ethCommitter.CommitBatch(ctx, blobs, batch.BatchId.String()); err != nil {
+		if errors.Is(err, rollupcontract.ErrBatchAlreadyCommitted) {
+			bc.logger.Warn().Msg("batch is already committed, skipping CommitBatch tx")
+			return nil
+		} else {
+			return fmt.Errorf("failed to CommitBatch: %w", err)
+		}
+	}
 
 	return nil
 }

nil/services/synccommittee/core/config.go

@@ -2,6 +2,7 @@ package core
 
 import (
 	"github.com/NilFoundation/nil/nil/internal/telemetry"
+	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/rollupcontract"
 )
 
 const (
@@ -12,7 +13,8 @@ type Config struct {
 	RpcEndpoint             string
 	TaskListenerRpcEndpoint string
 	AggregatorConfig        AggregatorConfig
-	ProposerParams          ProposerParams
+	ProposerParams          ProposerConfig
+	ContractWrapperConfig   rollupcontract.WrapperConfig
 	Telemetry               *telemetry.Config
 }
 
@@ -21,7 +23,8 @@ func NewDefaultConfig() *Config {
 		RpcEndpoint:             "tcp://127.0.0.1:8529",
 		TaskListenerRpcEndpoint: DefaultTaskRpcEndpoint,
 		AggregatorConfig:        NewDefaultAggregatorConfig(),
-		ProposerParams:          NewDefaultProposerParams(),
+		ProposerParams:          NewDefaultProposerConfig(),
+		ContractWrapperConfig:   rollupcontract.NewDefaultWrapperConfig(),
 		Telemetry: &telemetry.Config{
 			ServiceName: "sync_committee",
 		},