Merge pull request #640 from NilFoundation/split-rollup-contract-methods

refactor(sc): split contract CommitBatch and UpdateState calls

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,17 +115,14 @@ func run(cfg *cmdConfig) error {
 	}
 	defer database.Close()
 
-	ethClient, err := connectToEthClient(cfg.ProposerParams.Endpoint, cfg.ProposerParams.EthClientTimeout)
-	if err != nil {
-		return err
-	}
+	ctx := context.Background()
 
-	service, err := core.New(cfg.Config, database, ethClient)
+	service, err := core.New(ctx, cfg.Config, database)
 	if err != nil {
 		return fmt.Errorf("can't create sync committee service: %w", err)
 	}
 
-	err = service.Run(context.Background())
+	err = service.Run(ctx)
 	if err != nil {
 		return fmt.Errorf("service exited with error: %w", err)
 	}
@@ -142,13 +137,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

@@ -1,6 +1,7 @@
 package core
 
 import (
+	"bytes"
 	"context"
 	"errors"
 	"fmt"
@@ -10,14 +11,16 @@ import (
 	"github.com/NilFoundation/nil/nil/common/concurrent"
 	"github.com/NilFoundation/nil/nil/common/logging"
 	coreTypes "github.com/NilFoundation/nil/nil/internal/types"
-	"github.com/NilFoundation/nil/nil/services/synccommittee/core/batches"
 	"github.com/NilFoundation/nil/nil/services/synccommittee/core/batches/blob"
+	"github.com/NilFoundation/nil/nil/services/synccommittee/core/batches/encode"
 	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"
+	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/jonboulle/clockwork"
 )
 
@@ -41,11 +44,13 @@ type AggregatorBlockStorage interface {
 
 type AggregatorConfig struct {
 	RpcPollingInterval time.Duration
+	MaxBlobsInTx       uint
 }
 
 func NewAggregatorConfig(rpcPollingInterval time.Duration) AggregatorConfig {
 	return AggregatorConfig{
 		RpcPollingInterval: rpcPollingInterval,
+		MaxBlobsInTx:       6,
 	}
 }
 
@@ -58,10 +63,13 @@ type aggregator struct {
 	blockStorage    AggregatorBlockStorage
 	taskStorage     AggregatorTaskStorage
 	subgraphFetcher *subgraphFetcher
-	batchCommitter  batches.BatchCommitter
+	batchEncoder    encode.BatchEncoder
+	blobBuilder     blob.Builder
+	rollupContract  rollupcontract.Wrapper
 	resetter        *reset.StateResetter
 	clock           clockwork.Clock
 	metrics         AggregatorMetrics
+	config          AggregatorConfig
 	workerAction    *concurrent.Suspendable
 	logger          logging.Logger
 }
@@ -71,6 +79,7 @@ func NewAggregator(
 	blockStorage AggregatorBlockStorage,
 	taskStorage AggregatorTaskStorage,
 	resetter *reset.StateResetter,
+	rollupContractWrapper rollupcontract.Wrapper,
 	clock clockwork.Clock,
 	logger logging.Logger,
 	metrics AggregatorMetrics,
@@ -81,16 +90,13 @@ func NewAggregator(
 		blockStorage:    blockStorage,
 		taskStorage:     taskStorage,
 		subgraphFetcher: newSubgraphFetcher(rpcClient, logger),
-		batchCommitter: batches.NewBatchCommitter(
-			v1.NewEncoder(logger),
-			blob.NewBuilder(),
-			nil, // TODO
-			logger,
-			batches.DefaultCommitOptions(),
-		),
-		resetter: resetter,
-		clock:    clock,
-		metrics:  metrics,
+		batchEncoder:    v1.NewEncoder(logger),
+		blobBuilder:     blob.NewBuilder(),
+		rollupContract:  rollupContractWrapper,
+		resetter:        resetter,
+		clock:           clock,
+		metrics:         metrics,
+		config:          config,
 	}
 
 	agg.workerAction = concurrent.NewSuspendable(agg.runIteration, config.RpcPollingInterval)
@@ -357,13 +363,18 @@ func (agg *aggregator) handleBlockBatch(ctx context.Context, batch *types.BlockB
 		return err
 	}
 
+	sidecar, dataProofs, err := agg.prepareForBatchCommit(ctx, batch)
+	if err != nil {
+		return err
+	}
+	batch.SetDataProofs(dataProofs)
+
 	if err := agg.blockStorage.SetBlockBatch(ctx, batch); err != nil {
 		return fmt.Errorf("error storing block batch, latestMainHash=%s: %w", batch.LatestMainBlock().Hash, err)
 	}
 
-	prunedBatch := types.NewPrunedBatch(batch)
-	if err := agg.batchCommitter.Commit(ctx, prunedBatch); err != nil {
-		return err
+	if err := agg.rollupContract.CommitBatch(ctx, sidecar, batch.Id.String()); err != nil {
+		return fmt.Errorf("error committing batch, latestMainHash=%s: %w", batch.LatestMainBlock().Hash, err)
 	}
 
 	if err := agg.createProofTasks(ctx, batch); err != nil {
@@ -392,3 +403,20 @@ func (agg *aggregator) createProofTasks(ctx context.Context, batch *types.BlockB
 
 	return nil
 }
+
+func (agg *aggregator) prepareForBatchCommit(
+	ctx context.Context, batch *types.BlockBatch,
+) (*ethtypes.BlobTxSidecar, types.DataProofs, error) {
+	var binTransactions bytes.Buffer
+	if err := agg.batchEncoder.Encode(types.NewPrunedBatch(batch), &binTransactions); err != nil {
+		return nil, nil, err
+	}
+	agg.logger.Debug().Int("compressed_batch_len", binTransactions.Len()).Msg("encoded transaction")
+
+	blobs, err := agg.blobBuilder.MakeBlobs(&binTransactions, agg.config.MaxBlobsInTx)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return agg.rollupContract.PrepareBlobs(ctx, blobs)
+}

nil/services/synccommittee/core/aggregator_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/NilFoundation/nil/nil/internal/db"
 	"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"
@@ -63,11 +64,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/blob/builder.go

@@ -12,13 +12,19 @@ import (
 
 const blobSize = len(kzg4844.Blob{})
 
-type builder struct{}
+type Builder interface {
+	MakeBlobs(in io.Reader, limit uint) ([]kzg4844.Blob, error)
+}
+
+type builderImpl struct{}
+
+var _ Builder = (*builderImpl)(nil)
 
-func NewBuilder() *builder {
-	return &builder{}
+func NewBuilder() *builderImpl {
+	return &builderImpl{}
 }
 
-func (bb *builder) MakeBlobs(rd io.Reader, blobLimit int) ([]kzg4844.Blob, error) {
+func (bb *builderImpl) MakeBlobs(rd io.Reader, blobLimit uint) ([]kzg4844.Blob, error) {
 	const blobSize = len(kzg4844.Blob{})
 
 	var blobs []kzg4844.Blob
@@ -39,7 +45,7 @@ func (bb *builder) MakeBlobs(rd io.Reader, blobLimit int) ([]kzg4844.Blob, error
 	}
 
 	align := 0
-	for i := 0; !eof && i < blobLimit; i++ {
+	for i := uint(0); !eof && i < blobLimit; i++ {
 		blobBuf.Reset()
 
 		blobWriter := bitio.NewWriter(&blobBuf)
@@ -94,7 +100,7 @@ func (bb *builder) MakeBlobs(rd io.Reader, blobLimit int) ([]kzg4844.Blob, error
 	if !eof {
 		return nil, fmt.Errorf(
 			"provided batch does not fit into %d blobs (%d bytes) [written = %d bits] [align = %d bits]",
-			blobLimit, blobSize*blobLimit, writtenBits, align)
+			blobLimit, uint(blobSize)*blobLimit, writtenBits, align)
 	}
 	return blobs, nil
 }

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

@@ -0,0 +1,11 @@
+package encode
+
+import (
+	"io"
+
+	"github.com/NilFoundation/nil/nil/services/synccommittee/internal/types"
+)
+
+type BatchEncoder interface {
+	Encode(in *types.PrunedBatch, out io.Writer) error
+}

nil/services/synccommittee/core/batches/encode/interface.go

@@ -21,6 +21,8 @@ type batchEncoder struct {
 	logger     logging.Logger
 }
 
+var _ encode.BatchEncoder = (*batchEncoder)(nil)
+
 func NewEncoder(logger logging.Logger) *batchEncoder {
 	return &batchEncoder{
 		compressor: NewZstdCompressor(logger),