revert mock changes, more dev in db functions

agglayer · Jan 20, 2025 · 30bc8ca · 30bc8ca
1 parent c870c92
commit 30bc8ca
Show file tree

Hide file tree

Showing 40 changed files with 99 additions and 82 deletions.
diff --git a/agglayer/mock_agglayer_client.go b/agglayer/mock_agglayer_client.go
diff --git a/aggoracle/mocks/mock_ethtxmanager.go b/aggoracle/mocks/mock_ethtxmanager.go
diff --git a/aggoracle/mocks/mock_l2germanager.go b/aggoracle/mocks/mock_l2germanager.go
diff --git a/aggsender/db/aggsender_db_storage.go b/aggsender/db/aggsender_db_storage.go
@@ -37,7 +37,7 @@ type AggSenderStorage interface {
 	// Add auth-proof in DB
 	AddAuthProof(ctx context.Context, authProof types.AuthProof) error
 	// Get auth-proof by identifier
-	GetAuthProof(identifier string) (*types.AuthProof, error)
+	GetAuthProof(start_block uint64) (*types.AuthProof, error)
 	// Validate auth-proof
 	ValidateProof(req *types.ProofRequest) (bool, error)
 }
@@ -87,23 +87,23 @@ func (a *AggSenderSQLStorage) AddAuthProof(ctx context.Context, authProof types.
 		}
 	}()
 
-	if _, err = tx.Exec(`INSERT INTO auth_proof (identifier, proof) VALUES ($1, $2);`,
-		authProof.Identifier, authProof.Proof); err != nil {
+	if _, err = tx.Exec(`INSERT INTO auth_proof (start_block, end_block, proof) VALUES ($1, $2, $3);`,
+		authProof.StartBlock, authProof.EndBlock, authProof.Proof); err != nil {
 		return fmt.Errorf("error inserting auth proof: %w", err)
 	}
 	if err = tx.Commit(); err != nil {
 		return err
 	}
 
-	a.logger.Debugf("inserted auth proof - Identifier: %s", authProof.Identifier)
+	a.logger.Debugf("inserted auth proof - start block: %d", authProof.StartBlock, "end block: %d", authProof.EndBlock)
 
 	return nil
 }
 
-func (a *AggSenderSQLStorage) GetAuthProof(identifier string) (*types.AuthProof, error) {
+func (a *AggSenderSQLStorage) GetAuthProof(end_block uint64) (*types.AuthProof, error) {
 	var authProof types.AuthProof
 	if err := meddler.QueryRow(a.db, &authProof,
-		"SELECT * FROM auth_proof WHERE identifier = $1;", identifier); err != nil {
+		"SELECT * FROM auth_proof WHERE start_block = $1;", end_block); err != nil {
 		// Fix this
 		return nil, getSelectQueryError(0, err)
 	}

diff --git a/aggsender/db/aggsender_db_storage_test.go b/aggsender/db/aggsender_db_storage_test.go
@@ -445,7 +445,8 @@ func TestValidateProof(t *testing.T) {
 
 	t.Run("ValidateProof", func(t *testing.T) {
 		mockProofRequest := &types.ProofRequest{
-			Identifier: "identifier",
+			StartBlock: 0,
+			EndBlock:   1,
 			Proof:      "proof",
 		}
 		valid, err := storage.ValidateProof(mockProofRequest)

diff --git a/aggsender/db/migrations/0002.sql b/aggsender/db/migrations/0002.sql
@@ -3,7 +3,10 @@ DROP TABLE IF EXISTS auth_proof;
 
 -- +migrate Up
 CREATE TABLE auth_proof (
-    indentifier    VARCHAR,
+    start_block    INTEGER NOT NULL,
+    end_block      INTEGER NOT NULL,
     proof          VARCHAR,
-    PRIMARY KEY (indentifier)
+    created_at     INTEGER NOT NULL,
+    updated_at     INTEGER NOT NULL,
+    PRIMARY KEY (start_block, end_block)
 );
diff --git a/aggsender/grpc/handler.go b/aggsender/grpc/handler.go
@@ -24,7 +24,8 @@ func (s *server) ReceiveAuthProof(ctx context.Context, req *types.ProofRequest)
 	log.Printf("Proof is valid")
 	err = s.aggsenderStorage.AddAuthProof(context.Background(), types.AuthProof{
 		Proof:      req.Proof,
-		Identifier: req.Identifier,
+		StartBlock: req.StartBlock,
+		EndBlock:   req.EndBlock,
 	})
 	if err != nil {
 		log.Printf("Error adding proof: %v", err)

diff --git a/aggsender/mocks/mock_agg_sender_client.go b/aggsender/mocks/mock_agg_sender_client.go
diff --git a/aggsender/mocks/mock_agg_sender_server.go b/aggsender/mocks/mock_agg_sender_server.go
diff --git a/aggsender/mocks/mock_agg_sender_storage.go b/aggsender/mocks/mock_agg_sender_storage.go
diff --git a/aggsender/mocks/mock_aggsender_interface.go b/aggsender/mocks/mock_aggsender_interface.go
diff --git a/aggsender/mocks/mock_aggsender_storer.go b/aggsender/mocks/mock_aggsender_storer.go
diff --git a/aggsender/mocks/mock_block_notifier.go b/aggsender/mocks/mock_block_notifier.go
diff --git a/aggsender/mocks/mock_epoch_notifier.go b/aggsender/mocks/mock_epoch_notifier.go
diff --git a/aggsender/mocks/mock_eth_client.go b/aggsender/mocks/mock_eth_client.go
diff --git a/aggsender/mocks/mock_generic_subscriber.go b/aggsender/mocks/mock_generic_subscriber.go
diff --git a/aggsender/mocks/mock_l1_info_tree_syncer.go b/aggsender/mocks/mock_l1_info_tree_syncer.go
diff --git a/aggsender/mocks/mock_l2_bridge_syncer.go b/aggsender/mocks/mock_l2_bridge_syncer.go
diff --git a/aggsender/mocks/mock_logger.go b/aggsender/mocks/mock_logger.go
diff --git a/aggsender/mocks/mock_unsafe_agg_sender_server.go b/aggsender/mocks/mock_unsafe_agg_sender_server.go
diff --git a/aggsender/proto/aggsender.proto b/aggsender/proto/aggsender.proto
@@ -5,8 +5,9 @@ package types;
 option go_package = "github.com/agglayer/aggkit/aggsender/types";
 
 message ProofRequest {
-  string identifier = 1;
-  string proof = 2;
+  uint64 start_block = 1;
+  uint64 end_block = 2;
+  string proof = 3;
 }
 
 message ProofResponse {

diff --git a/aggsender/types/aggsender.pb.go b/aggsender/types/aggsender.pb.go
diff --git a/aggsender/types/types.go b/aggsender/types/types.go
@@ -56,7 +56,8 @@ type Logger interface {
 }
 
 type AuthProof struct {
-	Identifier string
+	StartBlock uint64
+	EndBlock   uint64
 	Proof      string
 }
 

diff --git a/bridgesync/mocks/mock_eth_clienter.go b/bridgesync/mocks/mock_eth_clienter.go
diff --git a/bridgesync/mocks/mock_reorg_detector.go b/bridgesync/mocks/mock_reorg_detector.go
diff --git a/l1infotreesync/mocks/mock_eth_clienter.go b/l1infotreesync/mocks/mock_eth_clienter.go
diff --git a/l1infotreesync/mocks/mock_reorg_detector.go b/l1infotreesync/mocks/mock_reorg_detector.go
diff --git a/reorgdetector/mock_eth_client.go b/reorgdetector/mock_eth_client.go
diff --git a/rpc/mocks/mock_bridge_client_interface.go b/rpc/mocks/mock_bridge_client_interface.go
diff --git a/rpc/mocks/mock_bridger.go b/rpc/mocks/mock_bridger.go
diff --git a/rpc/mocks/mock_claim_sponsorer.go b/rpc/mocks/mock_claim_sponsorer.go
diff --git a/rpc/mocks/mock_client_factory_interface.go b/rpc/mocks/mock_client_factory_interface.go
diff --git a/rpc/mocks/mock_client_interface.go b/rpc/mocks/mock_client_interface.go
diff --git a/rpc/mocks/mock_l1_info_treer.go b/rpc/mocks/mock_l1_info_treer.go