wip

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"

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"

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

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"
 )
 

aggregator/db/migrations.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/0xPolygon/cdk/db"
-	"github.com/0xPolygon/cdk/log"
+	"github.com/agglayer/aggkit/log"
 	migrate "github.com/rubenv/sql-migrate"
 )
 

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"
 )

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"