better alias name in config.go and added rollupID to etherman.BuildTr…

…ustedVerifyBatchesTxData
agglayer · Jan 9, 2024 · 19765e7 · 19765e7
1 parent c6b8dc3
commit 19765e7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/config/config.go b/config/config.go
@@ -17,15 +17,15 @@ import (
 	"github.com/spf13/viper"
 	"github.com/urfave/cli/v2"
 
-	beethovenTypes "github.com/0xPolygon/beethoven/rpc/types"
+	rpcTypes "github.com/0xPolygon/beethoven/rpc/types"
 )
 
 const (
 	// FlagCfg flag used for config aka cfg
 	FlagCfg = "cfg"
 )
 
-type FullNodeRPCs map[beethovenTypes.ArgUint64]string
+type FullNodeRPCs map[rpcTypes.ArgUint64]string
 
 // Config represents the full configuration of the data node
 type Config struct {

diff --git a/etherman/etherman.go b/etherman/etherman.go
@@ -50,7 +50,12 @@ func (e *Etherman) GetSequencerAddr(rollupID rpcTypes.ArgUint64) (common.Address
 	return address, nil
 }
 
-func (e *Etherman) BuildTrustedVerifyBatchesTxData(lastVerifiedBatch, newVerifiedBatch uint64, proof tx.ZKP) (data []byte, err error) {
+func (e *Etherman) BuildTrustedVerifyBatchesTxData(
+	lastVerifiedBatch,
+	newVerifiedBatch uint64,
+	proof tx.ZKP,
+	rollupId rpcTypes.ArgUint64,
+) (data []byte, err error) {
 	var newLocalExitRoot [HashLength]byte
 	copy(newLocalExitRoot[:], proof.NewLocalExitRoot.Bytes())
 	var newStateRoot [HashLength]byte
@@ -70,6 +75,7 @@ func (e *Etherman) BuildTrustedVerifyBatchesTxData(lastVerifiedBatch, newVerifie
 
 	return abi.Pack(
 		"verifyBatchesTrustedAggregator",
+		rollupId,
 		pendStateNum,
 		lastVerifiedBatch,
 		newVerifiedBatch,

diff --git a/interop/executor.go b/interop/executor.go
@@ -146,6 +146,7 @@ func (e *Executor) Settle(ctx context.Context, signedTx tx.SignedTx, dbTx pgx.Tx
 		uint64(signedTx.Tx.LastVerifiedBatch),
 		uint64(signedTx.Tx.NewVerifiedBatch),
 		signedTx.Tx.ZKP,
+		signedTx.Tx.RollupID,
 	)
 	if err != nil {
 		return common.Hash{}, fmt.Errorf("failed to build verify ZKP tx: %s", err)

diff --git a/types/interfaces.go b/types/interfaces.go
@@ -10,6 +10,8 @@ import (
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/jackc/pgx/v4"
+
+	rpcTypes "github.com/0xPolygon/beethoven/rpc/types"
 )
 
 type DBInterface interface {
@@ -18,7 +20,7 @@ type DBInterface interface {
 
 type EthermanInterface interface {
 	GetSequencerAddr(rollupID types.ArgUint64) (common.Address, error)
-	BuildTrustedVerifyBatchesTxData(lastVerifiedBatch, newVerifiedBatch uint64, proof tx.ZKP) (data []byte, err error)
+	BuildTrustedVerifyBatchesTxData(lastVerifiedBatch, newVerifiedBatch uint64, proof tx.ZKP, rollupId rpcTypes.ArgUint64) (data []byte, err error)
 	CallContract(ctx context.Context, call ethereum.CallMsg, blockNumber *big.Int) ([]byte, error)
 }