added aggregator address to prover input (0xPolygonHermez#1109)

* added aggregator address to prover input * fixing lint * fixing lint
sieniven · Aug 31, 2022 · d7ff1cb · d7ff1cb
1 parent e5ebe60
commit d7ff1cb
Show file tree

Hide file tree

Showing 14 changed files with 3,604 additions and 2,051 deletions.
diff --git a/aggregator/aggregator.go b/aggregator/aggregator.go
@@ -198,6 +198,7 @@ func (a *Aggregator) buildInputProver(ctx context.Context, batchToVerify *state.
 			BatchHashData:    batchHashData.String(),
 			BatchNum:         uint32(batchToVerify.BatchNumber),
 			EthTimestamp:     uint64(batchToVerify.Timestamp.Unix()),
+			AggregatorAddr:   a.Ethman.GetPublicAddress().String(),
 		},
 		GlobalExitRoot:    batchToVerify.GlobalExitRoot.String(),
 		BatchL2Data:       hex.EncodeToString(batchToVerify.BatchL2Data),

diff --git a/aggregator/aggregator_internal_test.go b/aggregator/aggregator_internal_test.go
@@ -123,6 +123,8 @@ func TestBuildInputProver(t *testing.T) {
 		GlobalExitRoot: batchToVerify.GlobalExitRoot.String(),
 		BatchL2Data:    hex.EncodeToString(batchL2Data),
 	}
+
+	etherman.On("GetPublicAddress").Return(common.HexToAddress("0x123"))
 	ip, err := a.buildInputProver(ctx, batchToVerify)
 	require.NoError(t, err)
 	require.NotNil(t, ip)
@@ -202,6 +204,7 @@ func TestAggregatorFlow(t *testing.T) {
 		oldLocalExitRoot = common.HexToHash("0x29e885edaf8e4b51e1d2e05f9da28161d2fb4f6b1d53827d9b80a23cf2d7d9f1")
 		newLocalExitRoot = common.HexToHash("0x40a885edaf8e4b51e1d2e05f9da28161d2fb4f6b1d53827d9b80a23cf2d7d9a0")
 		seqAddress       = common.HexToAddress("0x123")
+		aggrAddress      = common.HexToAddress("0x123")
 		verifiedBatch    = &state.VerifiedBatch{BatchNumber: 1}
 		tx               = *types.NewTransaction(1, common.HexToAddress("1"), big.NewInt(1), 0, big.NewInt(1), []byte("bbb"))
 		previousBatch    = &state.Batch{
@@ -227,6 +230,7 @@ func TestAggregatorFlow(t *testing.T) {
 				SequencerAddr:    seqAddress.String(),
 				BatchNum:         uint32(batchToVerify.BatchNumber),
 				EthTimestamp:     uint64(batchToVerify.Timestamp.Unix()),
+				AggregatorAddr:   aggrAddress.String(),
 			},
 			GlobalExitRoot:    batchToVerify.GlobalExitRoot.String(),
 			Db:                map[string]string{},
@@ -259,6 +263,7 @@ func TestAggregatorFlow(t *testing.T) {
 	// isSynced
 	st.On("GetLastVerifiedBatch", mock.Anything, nil).Return(verifiedBatch, nil)
 	etherman.On("GetLatestVerifiedBatchNum").Return(uint64(1), nil)
+	etherman.On("GetPublicAddress").Return(aggrAddress)
 
 	lastVerifiedBatch, err := a.State.GetLastVerifiedBatch(context.Background(), nil)
 	require.NoError(t, err)

diff --git a/aggregator/interfaces.go b/aggregator/interfaces.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/0xPolygonHermez/zkevm-node/proverclient/pb"
 	"github.com/0xPolygonHermez/zkevm-node/state"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/jackc/pgx/v4"
 )
 
@@ -20,6 +21,7 @@ type ethTxManager interface {
 // etherman contains the methods required to interact with ethereum
 type etherman interface {
 	GetLatestVerifiedBatchNum() (uint64, error)
+	GetPublicAddress() common.Address
 }
 
 // aggregatorTxProfitabilityChecker interface for different profitability

diff --git a/aggregator/mocks/mock_etherman.go b/aggregator/mocks/mock_etherman.go
diff --git a/etherman/etherman.go b/etherman/etherman.go
@@ -610,6 +610,11 @@ func (etherMan *Client) GetTrustedSequencerURL() (string, error) {
 	return etherMan.PoE.TrustedSequencerURL(&bind.CallOpts{Pending: false})
 }
 
+// GetPublicAddress returns eth client public address
+func (etherMan *Client) GetPublicAddress() common.Address {
+	return etherMan.auth.From
+}
+
 // VerifyBatch function allows the aggregator send the proof for a batch and consolidate it
 func (etherMan *Client) verifyBatch(opts *bind.TransactOpts, batchNumber uint64, resGetProof *pb.GetProofResponse) (*types.Transaction, error) {
 	publicInputs := resGetProof.Public.PublicInputs