fix config name

okx · Oct 18, 2023 · 6d6f13c · 6d6f13c
1 parent ea4769a
commit 6d6f13c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/config/default.go b/config/default.go
@@ -119,6 +119,7 @@ LastBatchVirtualizationTimeMaxWaitPeriod = "5s"
 MaxTxSizeForL1 = 1000
 L2Coinbase = "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266"
 PrivateKey = {Path = "/pk/sequencer.keystore", Password = "testonly"}
+UseValidium = true
 
 [Aggregator]
 Host = "0.0.0.0"

diff --git a/etherman/datacommittee.go b/etherman/datacommittee.go
@@ -62,7 +62,3 @@ func (etherMan *Client) GetCurrentDataCommitteeMembers() ([]DataCommitteeMember,
 	}
 	return members, nil
 }
-
-func (etherMan *Client) GetConfigUseValidium() bool {
-	return etherMan.UseValidium
-}
diff --git a/etherman/etherman.go b/etherman/etherman.go
@@ -129,8 +129,6 @@ type L1Config struct {
 	GlobalExitRootManagerAddr common.Address `json:"polygonZkEVMGlobalExitRootAddress"`
 	// Address of the data availability committee contract
 	DataCommitteeAddr common.Address `json:"dataCommitteeContract"`
-
-	UseValidium bool `mapstructure:"useValidium"`
 }
 
 type externalGasProviders struct {
@@ -145,7 +143,6 @@ type Client struct {
 	GlobalExitRootManager *polygonzkevmglobalexitroot.Polygonzkevmglobalexitroot
 	Matic                 *matic.Matic
 	DataCommittee         *datacommittee.Datacommittee
-	UseValidium           bool
 	SCAddresses           []common.Address
 
 	GasProviders externalGasProviders
@@ -203,7 +200,6 @@ func NewClient(cfg Config, l1Config L1Config) (*Client, error) {
 		Matic:                 matic,
 		GlobalExitRootManager: globalExitRoot,
 		DataCommittee:         dataCommittee,
-		UseValidium:           l1Config.UseValidium,
 		SCAddresses:           scAddresses,
 		GasProviders: externalGasProviders{
 			MultiGasProvider: cfg.MultiGasProvider,
@@ -562,7 +558,7 @@ func (etherMan *Client) sequenceBatches(opts bind.TransactOpts, sequences []ethm
 
 	var tx *types.Transaction
 	var err error
-	if etherMan.UseValidium && len(committeeSignaturesAndAddrs) > 0 {
+	if len(committeeSignaturesAndAddrs) > 0 {
 		for _, seq := range sequences {
 			batch := polygonzkevm.PolygonZkEVMBatchData{
 				TransactionsHash:   crypto.Keccak256Hash(seq.BatchL2Data),

diff --git a/etherman/etherman_test.go b/etherman/etherman_test.go
@@ -166,13 +166,13 @@ func TestSequencedBatchesEvent(t *testing.T) {
 		GlobalExitRoot:     ger,
 		Timestamp:          currentBlock.Time(),
 		MinForcedTimestamp: uint64(blocks[2].ForcedBatches[0].ForcedAt.Unix()),
-		Transactions:       crypto.Keccak256Hash(common.Hex2Bytes(rawTxs)),
+		TransactionsHash:   crypto.Keccak256Hash(common.Hex2Bytes(rawTxs)),
 	})
 	sequences = append(sequences, polygonzkevm.PolygonZkEVMBatchData{
 		GlobalExitRoot:     ger,
 		Timestamp:          currentBlock.Time() + 1,
 		MinForcedTimestamp: 0,
-		Transactions:       crypto.Keccak256Hash(common.Hex2Bytes(rawTxs)),
+		TransactionsHash:   crypto.Keccak256Hash(common.Hex2Bytes(rawTxs)),
 	})
 	_, err = etherman.ZkEVM.SequenceBatches(auth, sequences, auth.From, []byte{})
 	require.NoError(t, err)
@@ -213,7 +213,7 @@ func TestVerifyBatchEvent(t *testing.T) {
 		GlobalExitRoot:     common.Hash{},
 		Timestamp:          initBlock.Time(),
 		MinForcedTimestamp: 0,
-		Transactions:       crypto.Keccak256Hash(common.Hex2Bytes(rawTxs)),
+		TransactionsHash:   crypto.Keccak256Hash(common.Hex2Bytes(rawTxs)),
 	}
 	_, err = etherman.ZkEVM.SequenceBatches(auth, []polygonzkevm.PolygonZkEVMBatchData{tx}, auth.From, []byte{})
 	require.NoError(t, err)
@@ -327,7 +327,7 @@ func TestSendSequences(t *testing.T) {
 		Timestamp:      int64(currentBlock.Time() - 1),
 		BatchL2Data:    batchL2Data,
 	}
-	tx, err := etherman.sequenceBatches(*auth, []ethmanTypes.Sequence{sequence}, auth.From)
+	tx, err := etherman.sequenceBatches(*auth, []ethmanTypes.Sequence{sequence}, auth.From, nil)
 	require.NoError(t, err)
 	log.Debug("TX: ", tx.Hash())
 	ethBackend.Commit()

diff --git a/sequencesender/config.go b/sequencesender/config.go
@@ -31,4 +31,7 @@ type Config struct {
 	PrivateKey types.KeystoreFileConfig `mapstructure:"PrivateKey"`
 	// Batch number where there is a forkid change (fork upgrade)
 	ForkUpgradeBatchNumber uint64
+
+	// UseValidium is a flag to enable/disable the use of validium
+	UseValidium bool `mapstructure:"UseValidium"`
 }
diff --git a/sequencesender/interfaces.go b/sequencesender/interfaces.go
@@ -24,7 +24,6 @@ type etherman interface {
 	GetLatestBlockTimestamp(ctx context.Context) (uint64, error)
 	GetLatestBatchNumber() (uint64, error)
 	GetCurrentDataCommittee() (*theEtherman.DataCommittee, error)
-	GetConfigUseValidium() bool
 }
 
 // stateInterface gathers the methods required to interact with the state.

diff --git a/sequencesender/sequencesender.go b/sequencesender/sequencesender.go
@@ -118,6 +118,10 @@ func (s *SequenceSender) tryToSendSequence(ctx context.Context, ticker *time.Tic
 		waitTick(ctx, ticker)
 		return
 	}
+	if !s.isValidium() {
+		signaturesAndAddrs = nil
+	}
+
 	to, data, err := s.etherman.BuildSequenceBatchesTxData(s.cfg.SenderAddress, sequences, s.cfg.L2Coinbase, signaturesAndAddrs)
 	if err != nil {
 		log.Error("error estimating new sequenceBatches to add to eth tx manager: ", err)
@@ -323,7 +327,7 @@ func isDataForEthTxTooBig(err error) bool {
 }
 
 func (s *SequenceSender) isValidium() bool {
-	if !s.etherman.GetConfigUseValidium() {
+	if !s.cfg.UseValidium {
 		return false
 	}