feat: remove syncers and import the aggkit (#256)

* feat: remove `aggoracle` component (#251) * remove aggoracle component * improve Rust build perf and cleanup * handle error when unmarashaling versions.json * feat: remove `aggsender` component (#252) * remove aggsender component * fix: remove build-tools * feat: mockery generate (#255) * mockery generate * Update .mockery.yaml Co-authored-by: Stefan Negovanović <93934272+Stefan-Ethernal@users.noreply.github.com> * review comments * review comment --------- Co-authored-by: Stefan Negovanović <93934272+Stefan-Ethernal@users.noreply.github.com> * wip * feat: fix BuildVersions during cargo build (#258) * fix DAC imports * remove unused code * chore: remove empty docker-compose.yml * fix build.rs * remove hex package * remove log package * remove db package * go mod tidy and fix in the proof * chore: remove redundant file * feat: remove bridge service (feat. claim sponsor, bridgesync, reorg detector l2 and corresponding config params) * chore: format and fix docs * chore: move bats e2e tests from fep folder * fix: path for batch_verification_monitor script --------- Co-authored-by: Stefan Negovanović <93934272+Stefan-Ethernal@users.noreply.github.com> Co-authored-by: Arpit Temani <temaniarpit27@gmail.com> Co-authored-by: Toni Ramírez <58293609+ToniRamirezM@users.noreply.github.com> Co-authored-by: Stefan Negovanović <stefan@ethernal.tech>
0xPolygon · Feb 18, 2025 · bad184a · bad184a
1 parent f7ed61b
commit bad184a
Show file tree

Hide file tree

Showing 210 changed files with 194 additions and 21,702 deletions.
diff --git a/.mockery.yaml b/.mockery.yaml
@@ -39,49 +39,11 @@ packages:
       AggregatorService_ChannelServer:
         config:
           mockname: ChannelMock
-  github.com/0xPolygon/cdk/bridgesync:
-    config:
-      dir: "{{ .InterfaceDir }}/mocks"
-    interfaces:
-      ReorgDetector:
-      EthClienter:
   github.com/0xPolygon/cdk/dataavailability:
     config:
       dir: "{{ .InterfaceDir }}/mocks_da"
       all: true
       outpkg: "mocks_da"
-  github.com/0xPolygon/cdk/db:
-    config:
-      dir: "{{ .InterfaceDir }}/../aggregator/mocks"
-      mockname: "{{ .InterfaceName }}Mock"
-    interfaces:
-      Txer:
-  github.com/0xPolygon/cdk/l1infotreesync:
-    config:
-      dir: "{{ .InterfaceDir }}/mocks"
-    interfaces:
-      EthClienter:
-  github.com/0xPolygon/cdk/reorgdetector:
-    config:
-      dir: "{{ .InterfaceDir }}"
-      outpkg: "{{ .PackageName }}"
-      mockname: "{{ .InterfaceName }}Mock"
-    interfaces:
-      EthClient:
-  github.com/0xPolygon/cdk/rpc/client:
-    config:
-    interfaces:
-      BridgeClientInterface:
-      ClientInterface:
-      ClientFactoryInterface:
-  github.com/0xPolygon/cdk/rpc:
-    config:
-      dir: "{{ .InterfaceDir }}/mocks"
-    interfaces:
-      Bridger:
-      LastGERer:
-      L1InfoTreer:
-      ClaimSponsorer:
   github.com/0xPolygon/cdk/sequencesender:
     config:
       dir: "{{ .InterfaceDir }}/mocks"
@@ -111,28 +73,3 @@ packages:
           - dir: "{{ .InterfaceDir }}/mocks_txbuilder"
             outpkg: "mocks_txbuilder"
             mockname: "{{ .InterfaceName | camelcase | firstUpper }}"
-  github.com/0xPolygon/cdk/sync:
-    config:
-      dir: "{{ .InterfaceDir }}"
-      outpkg: "{{ .PackageName }}"
-      mockname: "{{ .InterfaceName }}Mock"
-      inpackage: true
-    interfaces:
-      ReorgDetector:
-        configs:
-          - dir: "{{ .InterfaceDir }}/../l1infotreesync/mocks"
-            outpkg: "mocks"
-            mockname: "{{ .InterfaceName }}Mock"
-            inpackage: false
-          - dir: "{{ .InterfaceDir }}"
-            outpkg: "{{ .PackageName }}"
-            mockname: "{{ .InterfaceName }}Mock"
-      processorInterface:
-        config:
-          mockname: "ProcessorMock"
-      evmDownloaderFull:
-        config:
-          mockname: "EVMDownloaderMock"
-      EthClienter:
-        config:
-          mockname: "L2Mock"
diff --git a/Makefile b/Makefile
@@ -36,12 +36,12 @@ check-docker:
 check-docker-compose:
 	@which docker-compose > /dev/null || (echo "Error: docker-compose is not installed" && exit 1)
 
-# Check for Protoc
+# Check for protoc
 .PHONY: check-protoc
 check-protoc:
-	@which protoc > /dev/null || (echo "Error: Protoc is not installed" && exit 1)
+	@which protoc > /dev/null || (echo "Error: protoc is not installed" && exit 1)
 
-# Check for Curl
+# Check for curl
 .PHONY: check-curl
 check-curl:
 	@which curl > /dev/null || (echo "Error: curl is not installed" && exit 1)

diff --git a/agglayer/mock_agglayer_client_interface.go b/agglayer/mock_agglayer_client_interface.go
diff --git a/aggregator/aggregator.go b/aggregator/aggregator.go
@@ -22,8 +22,6 @@ import (
 	"github.com/0xPolygon/cdk/aggregator/prover"
 	cdkcommon "github.com/0xPolygon/cdk/common"
 	"github.com/0xPolygon/cdk/config/types"
-	"github.com/0xPolygon/cdk/l1infotree"
-	"github.com/0xPolygon/cdk/log"
 	"github.com/0xPolygon/cdk/rpc"
 	"github.com/0xPolygon/cdk/state"
 	"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
@@ -33,6 +31,8 @@ import (
 	"github.com/0xPolygonHermez/zkevm-synchronizer-l1/state/entities"
 	"github.com/0xPolygonHermez/zkevm-synchronizer-l1/synchronizer"
 	"github.com/0xPolygonHermez/zkevm-synchronizer-l1/synchronizer/l1_check_block"
+	"github.com/agglayer/aggkit/l1infotree"
+	"github.com/agglayer/aggkit/log"
 	"github.com/ethereum/go-ethereum/common"
 	"go.uber.org/zap/zapcore"
 	"google.golang.org/grpc"

diff --git a/aggregator/aggregator_test.go b/aggregator/aggregator_test.go
@@ -21,10 +21,10 @@ import (
 	mocks "github.com/0xPolygon/cdk/aggregator/mocks"
 	"github.com/0xPolygon/cdk/aggregator/prover"
 	"github.com/0xPolygon/cdk/config/types"
-	"github.com/0xPolygon/cdk/log"
 	rpctypes "github.com/0xPolygon/cdk/rpc/types"
 	"github.com/0xPolygon/cdk/state"
 	"github.com/0xPolygonHermez/zkevm-synchronizer-l1/synchronizer"
+	"github.com/agglayer/aggkit/log"
 	"github.com/ethereum/go-ethereum/common"
 	ethTypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"

diff --git a/aggregator/config.go b/aggregator/config.go
@@ -5,9 +5,9 @@ import (
 	"math/big"
 
 	"github.com/0xPolygon/cdk/config/types"
-	"github.com/0xPolygon/cdk/log"
 	"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
 	syncronizerConfig "github.com/0xPolygonHermez/zkevm-synchronizer-l1/config"
+	"github.com/agglayer/aggkit/log"
 )
 
 // SettlementBackend is the type of the settlement backend

diff --git a/aggregator/db/dbstorage/dbstorage.go b/aggregator/db/dbstorage/dbstorage.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"database/sql"
 
-	"github.com/0xPolygon/cdk/db"
+	"github.com/agglayer/aggkit/db"
 )
 
 // DBStorage implements the Storage interface

diff --git a/aggregator/db/dbstorage/proof.go b/aggregator/db/dbstorage/proof.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/0xPolygon/cdk/db"
 	"github.com/0xPolygon/cdk/state"
+	"github.com/agglayer/aggkit/db"
 )
 
 // CheckProofExistsForBatch checks if the batch is already included in any proof
@@ -170,7 +170,7 @@ func (d *DBStorage) GetProofsToAggregate(ctx context.Context, dbTx db.Txer) (*st
 		&createdAt1, &updatedAt1,
 		&proof2.BatchNumber, &proof2.BatchNumberFinal, &proof2.Proof, &proof2.ProofID,
 		&proof2.InputProver, &proof2.Prover, &proof2.ProverID, &generatingSince2,
-		&createdAt1, &updatedAt1,
+		&createdAt2, &updatedAt2,
 	)
 
 	if generatingSince1 != nil {

diff --git a/aggregator/db/dbstorage/sequence.go b/aggregator/db/dbstorage/sequence.go
@@ -3,8 +3,8 @@ package dbstorage
 import (
 	"context"
 
-	"github.com/0xPolygon/cdk/db"
 	"github.com/0xPolygon/cdk/state"
+	"github.com/agglayer/aggkit/db"
 )
 
 // AddSequence stores the sequence information to allow the aggregator verify sequences.

diff --git a/aggregator/db/logger.go b/aggregator/db/logger.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/0xPolygon/cdk/log"
+	"github.com/agglayer/aggkit/log"
 	"github.com/jackc/pgx/v4"
 )
 

diff --git a/aggregator/db/migrations.go b/aggregator/db/migrations.go
@@ -4,8 +4,8 @@ import (
 	"embed"
 	"fmt"
 
-	"github.com/0xPolygon/cdk/db"
-	"github.com/0xPolygon/cdk/log"
+	"github.com/agglayer/aggkit/db"
+	"github.com/agglayer/aggkit/log"
 	migrate "github.com/rubenv/sql-migrate"
 )
 

diff --git a/aggregator/interfaces.go b/aggregator/interfaces.go
@@ -7,11 +7,11 @@ import (
 
 	ethmanTypes "github.com/0xPolygon/cdk/aggregator/ethmantypes"
 	"github.com/0xPolygon/cdk/aggregator/prover"
-	"github.com/0xPolygon/cdk/db"
 	"github.com/0xPolygon/cdk/rpc/types"
 	"github.com/0xPolygon/cdk/state"
 	"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
 	ethtxtypes "github.com/0xPolygon/zkevm-ethtx-manager/types"
+	"github.com/agglayer/aggkit/db"
 	"github.com/ethereum/go-ethereum/common"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto/kzg4844"

diff --git a/aggregator/mocks/mock_eth_tx_manager_client.go b/aggregator/mocks/mock_eth_tx_manager_client.go
diff --git a/aggregator/mocks/mock_etherman.go b/aggregator/mocks/mock_etherman.go
diff --git a/aggregator/mocks/mock_prover_interface.go b/aggregator/mocks/mock_prover_interface.go
diff --git a/aggregator/mocks/mock_rpc_interface.go b/aggregator/mocks/mock_rpc_interface.go
diff --git a/aggregator/mocks/mock_storage_interface.go b/aggregator/mocks/mock_storage_interface.go
diff --git a/aggregator/prover/mocks/mock_aggregator_service_channel_server.go b/aggregator/prover/mocks/mock_aggregator_service_channel_server.go
diff --git a/aggregator/prover/prover.go b/aggregator/prover/prover.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/0xPolygon/cdk/config/types"
-	"github.com/0xPolygon/cdk/log"
+	"github.com/agglayer/aggkit/log"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/iden3/go-iden3-crypto/poseidon"
 )

diff --git a/aggregator/prover/prover_test.go b/aggregator/prover/prover_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/0xPolygon/cdk/aggregator/prover"
 	"github.com/0xPolygon/cdk/aggregator/prover/mocks"
 	"github.com/0xPolygon/cdk/config/types"
-	"github.com/0xPolygon/cdk/log"
+	"github.com/agglayer/aggkit/log"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"