fix: rebase

agglayer · Feb 4, 2025 · 072e01d · 072e01d
1 parent 96448ec
commit 072e01d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/aggsender/aggsender_test.go b/aggsender/aggsender_test.go
@@ -60,7 +60,7 @@ func TestConfigString(t *testing.T) {
 		"BridgeMetadataAsHash: false\n" +
 		"DryRun: false\n" +
 		"EnableRPC: false\n" +
-		"AggchainProofClientURL: \n" +
+		"AggchainProofURL: \n" +
 		"Mode: PP\n"
 
 	require.Equal(t, expected, config.String())

diff --git a/aggsender/config.go b/aggsender/config.go
@@ -65,6 +65,6 @@ func (c Config) String() string {
 		"BridgeMetadataAsHash: " + fmt.Sprintf("%t", c.BridgeMetadataAsHash) + "\n" +
 		"DryRun: " + fmt.Sprintf("%t", c.DryRun) + "\n" +
 		"EnableRPC: " + fmt.Sprintf("%t", c.EnableRPC) + "\n" +
-		"AggchainProofClientURL: " + c.AggchainProofClientURL + "\n" +
+		"AggchainProofURL: " + c.AggchainProofURL + "\n" +
 		"Mode: " + c.Mode + "\n"
 }
diff --git a/aggsender/flow_aggchain_prover.go b/aggsender/flow_aggchain_prover.go
@@ -8,6 +8,7 @@ import (
 	"github.com/agglayer/aggkit/aggsender/db"
 	"github.com/agglayer/aggkit/aggsender/grpc"
 	"github.com/agglayer/aggkit/aggsender/types"
+	"github.com/ethereum/go-ethereum/common"
 )
 
 // aggchainProverFlow is a struct that holds the logic for the AggchainProver prover type flow
@@ -69,7 +70,7 @@ func (a *aggchainProverFlow) GetCertificateBuildParams(ctx context.Context) (*ty
 
 		if proof == "" {
 			aggchainProof, err := a.aggchainProofClient.GenerateAggchainProof(lastSentCertificateInfo.FromBlock,
-				lastSentCertificateInfo.ToBlock)
+				lastSentCertificateInfo.ToBlock, common.Hash{})
 			if err != nil {
 				return nil, fmt.Errorf("aggchainProverFlow - error fetching aggchain proof for block range %d : %d : %w",
 					lastSentCertificateInfo.FromBlock, lastSentCertificateInfo.ToBlock, err)
@@ -115,7 +116,7 @@ func (a *aggchainProverFlow) GetCertificateBuildParams(ctx context.Context) (*ty
 		return nil, err
 	}
 
-	aggchainProof, err := a.aggchainProofClient.GenerateAggchainProof(buildParams.FromBlock, buildParams.ToBlock)
+	aggchainProof, err := a.aggchainProofClient.GenerateAggchainProof(buildParams.FromBlock, buildParams.ToBlock, common.Hash{})
 	if err != nil {
 		return nil, fmt.Errorf("aggchainProverFlow - error fetching aggchain proof for block range %d : %d : %w",
 			buildParams.FromBlock, buildParams.ToBlock, err)

diff --git a/aggsender/flow_aggchain_prover_test.go b/aggsender/flow_aggchain_prover_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/agglayer/aggkit/aggsender/types"
 	"github.com/agglayer/aggkit/bridgesync"
 	"github.com/agglayer/aggkit/log"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 )
 
@@ -60,7 +61,7 @@ func Test_AggchainProverFlow_GetCertificateBuildParams(t *testing.T) {
 				}, nil)
 				mockL2Syncer.On("GetBridgesPublished", ctx, uint64(1), uint64(10)).Return([]bridgesync.Bridge{{}}, nil)
 				mockL2Syncer.On("GetClaims", ctx, uint64(1), uint64(10)).Return([]bridgesync.Claim{{}}, nil)
-				mockClient.On("GenerateAggchainProof", uint64(1), uint64(10)).Return(&types.AggchainProof{
+				mockClient.On("GenerateAggchainProof", uint64(1), uint64(10), common.Hash{}).Return(&types.AggchainProof{
 					Proof: "some-proof", StartBlock: 1, EndBlock: 10}, nil)
 			},
 			expectedParams: &types.CertificateBuildParams{
@@ -91,7 +92,7 @@ func Test_AggchainProverFlow_GetCertificateBuildParams(t *testing.T) {
 					{BlockNum: 5}, {BlockNum: 10}}, nil)
 				mockL2Syncer.On("GetClaims", ctx, uint64(1), uint64(10)).Return([]bridgesync.Claim{
 					{BlockNum: 6}, {BlockNum: 9}}, nil)
-				mockClient.On("GenerateAggchainProof", uint64(1), uint64(10)).Return(&types.AggchainProof{
+				mockClient.On("GenerateAggchainProof", uint64(1), uint64(10), common.Hash{}).Return(&types.AggchainProof{
 					Proof: "some-proof", StartBlock: 1, EndBlock: 8}, nil)
 			},
 			expectedParams: &types.CertificateBuildParams{
@@ -146,7 +147,7 @@ func Test_AggchainProverFlow_GetCertificateBuildParams(t *testing.T) {
 				mockL2Syncer.On("GetLastProcessedBlock", ctx).Return(uint64(10), nil)
 				mockL2Syncer.On("GetBridgesPublished", ctx, uint64(1), uint64(10)).Return([]bridgesync.Bridge{{}}, nil)
 				mockL2Syncer.On("GetClaims", ctx, uint64(1), uint64(10)).Return([]bridgesync.Claim{{}}, nil)
-				mockClient.On("GenerateAggchainProof", uint64(1), uint64(10)).Return(nil, errors.New("some error"))
+				mockClient.On("GenerateAggchainProof", uint64(1), uint64(10), common.Hash{}).Return(nil, errors.New("some error"))
 			},
 			expectedError: "error fetching aggchain proof for block range 1 : 10 : some error",
 		},
@@ -159,7 +160,7 @@ func Test_AggchainProverFlow_GetCertificateBuildParams(t *testing.T) {
 				mockL2Syncer.On("GetLastProcessedBlock", ctx).Return(uint64(10), nil)
 				mockL2Syncer.On("GetBridgesPublished", ctx, uint64(6), uint64(10)).Return([]bridgesync.Bridge{{}}, nil)
 				mockL2Syncer.On("GetClaims", ctx, uint64(6), uint64(10)).Return([]bridgesync.Claim{{}}, nil)
-				mockClient.On("GenerateAggchainProof", uint64(6), uint64(10)).Return(&types.AggchainProof{
+				mockClient.On("GenerateAggchainProof", uint64(6), uint64(10), common.Hash{}).Return(&types.AggchainProof{
 					Proof: "some-proof", StartBlock: 6, EndBlock: 10}, nil)
 			},
 			expectedParams: &types.CertificateBuildParams{
@@ -184,7 +185,7 @@ func Test_AggchainProverFlow_GetCertificateBuildParams(t *testing.T) {
 					{BlockNum: 6}, {BlockNum: 10}}, nil)
 				mockL2Syncer.On("GetClaims", ctx, uint64(6), uint64(10)).Return([]bridgesync.Claim{
 					{BlockNum: 8}, {BlockNum: 9}}, nil)
-				mockClient.On("GenerateAggchainProof", uint64(6), uint64(10)).Return(&types.AggchainProof{
+				mockClient.On("GenerateAggchainProof", uint64(6), uint64(10), common.Hash{}).Return(&types.AggchainProof{
 					Proof: "some-proof", StartBlock: 6, EndBlock: 8}, nil)
 			},
 			expectedParams: &types.CertificateBuildParams{