Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/arm_deb_packager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go
uses: actions/setup-go@master
uses: actions/setup-go@v5
with:
go-version: 1.23.x
go-version: 1.24.x
# Variables
- name: Adding TAG to ENV
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/arm_rpm_packager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go
uses: actions/setup-go@master
uses: actions/setup-go@v5
with:
go-version: 1.23.x
go-version: 1.24.x
- name: Adding TAG to ENV
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV

Expand Down
44 changes: 0 additions & 44 deletions .github/workflows/codeql.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.23.x
go-version: 1.24.x

- name: Checkout code
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- uses: actions/setup-go@v5
with:
go-version: 1.23.x
go-version: 1.24.x

- name: Build cdk docker image
run: make build-docker
Expand All @@ -32,7 +32,7 @@ jobs:

test-e2e:
runs-on: ubuntu-latest
timeout-minutes: 30
timeout-minutes: 60
needs: build-cdk-image
strategy:
fail-fast: false
Expand All @@ -51,7 +51,7 @@ jobs:
with:
repository: 0xPolygon/kurtosis-cdk
path: kurtosis-cdk
ref: v0.3.3
ref: c3caebc409c7f69354ae012f15cac76f3edf8503

- name: Install Kurtosis CDK tools
uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-resequence.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
with:
repository: 0xPolygon/kurtosis-cdk
path: kurtosis-cdk
ref: v0.2.31
ref: c3caebc409c7f69354ae012f15cac76f3edf8503

- name: Install Kurtosis CDK tools
uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.23.7]
go-version: [1.24.2]
goarch: ["amd64"]
runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/x86_deb_packager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go
uses: actions/setup-go@master
uses: actions/setup-go@v5
with:
go-version: 1.23.x
go-version: 1.24.x
# Variables
- name: Adding TAG to ENV
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/x86_rpm_packager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
with:
fetch-depth: 0
- name: Set up Go
uses: actions/setup-go@master
uses: actions/setup-go@v5
with:
go-version: 1.23.x
go-version: 1.24.x
- name: Adding TAG to ENV
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# CONTAINER FOR BUILDING BINARY
FROM --platform=${BUILDPLATFORM} golang:1.23.7 AS build
FROM --platform=${BUILDPLATFORM} golang:1.24.2 AS build

WORKDIR $GOPATH/src/github.com/0xPolygon/cdk

Expand Down
10 changes: 9 additions & 1 deletion aggregator/aggregator.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ 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/rpc"
"github.com/0xPolygon/cdk/state"
"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
Expand All @@ -31,13 +32,14 @@ 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"
"google.golang.org/grpc/codes"
grpchealth "google.golang.org/grpc/health/grpc_health_v1"
"google.golang.org/grpc/peer"
"google.golang.org/grpc/status"
)

const (
Expand Down Expand Up @@ -1605,6 +1607,12 @@ func (hc *healthChecker) Check(
}, nil
}

func (hc *healthChecker) List(
ctx context.Context, req *grpchealth.HealthListRequest,
) (*grpchealth.HealthListResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method List not implemented")
}

// Watch returns the current status of the server for stream gRPC health requests,
// for now if the server is up and able to respond we will always return SERVING.
func (hc *healthChecker) Watch(req *grpchealth.HealthCheckRequest, server grpchealth.Health_WatchServer) error {
Expand Down
1 change: 1 addition & 0 deletions cmd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ func runL1InfoTreeSyncerIfNeeded(
cfg.L1InfoTreeSync.MaxRetryAttemptsAfterError,
l1infotreesync.FlagNone,
aggkitetherman.FinalizedBlock,
true,
)
if err != nil {
log.Fatal(err)
Expand Down
2 changes: 1 addition & 1 deletion dataavailability/datacommittee/datacommittee.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"sort"
"strings"

"github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygondatacommittee"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/banana/polygondatacommittee"
"github.com/0xPolygon/cdk-data-availability/client"
daTypes "github.com/0xPolygon/cdk-data-availability/types"
"github.com/0xPolygon/cdk/etherman"
Expand Down
2 changes: 1 addition & 1 deletion dataavailability/datacommittee/datacommittee_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"math/big"
"testing"

"github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygondatacommittee"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/banana/polygondatacommittee"
"github.com/0xPolygon/cdk/test/contracts/erc1967proxy"
"github.com/0xPolygon/cdk/test/helpers"
"github.com/agglayer/aggkit/log"
Expand Down
2 changes: 1 addition & 1 deletion etherman/contracts/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package contracts_test
import (
"testing"

"github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonzkevmglobalexitrootv2"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/banana/polygonzkevmglobalexitrootv2"
"github.com/0xPolygon/cdk/etherman/contracts"
"github.com/ethereum/go-ethereum/common"
"github.com/stretchr/testify/require"
Expand Down
6 changes: 3 additions & 3 deletions etherman/contracts/contracts_banana.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package contracts

import (
"github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonrollupmanager"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonvalidiumetrog"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonzkevmglobalexitrootv2"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/banana/polygonrollupmanager"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/banana/polygonvalidiumetrog"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/banana/polygonzkevmglobalexitrootv2"
"github.com/0xPolygon/cdk/etherman/config"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
)
Expand Down
6 changes: 3 additions & 3 deletions etherman/contracts/contracts_elderberry.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package contracts

import (
"github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonrollupmanager"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonvalidiumetrog"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonzkevmglobalexitrootv2"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/elderberry/polygonrollupmanager"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/elderberry/polygonvalidiumetrog"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/elderberry/polygonzkevmglobalexitrootv2"
"github.com/0xPolygon/cdk/etherman/config"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
)
Expand Down
2 changes: 1 addition & 1 deletion etherman/etherman.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"path/filepath"
"time"

"github.com/0xPolygon/cdk-contracts-tooling/contracts/l2-sovereign-chain/idataavailabilityprotocol"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/pp/l2-sovereign-chain/idataavailabilityprotocol"
cdkcommon "github.com/0xPolygon/cdk/common"
"github.com/0xPolygon/cdk/etherman/config"
"github.com/0xPolygon/cdk/etherman/contracts"
Expand Down
2 changes: 1 addition & 1 deletion etherman/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"
"time"

"github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonvalidiumetrog"
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/elderberry/polygonvalidiumetrog"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
Loading
Loading