Skip to content

Commit d772c7d

Browse files
committed
add l1infotree
1 parent 81ce365 commit d772c7d

28 files changed

Lines changed: 869 additions & 187 deletions

.github/workflows/test-unit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
go-version: [1.23.7]
17+
go-version: [1.24.2]
1818
goarch: ["amd64"]
1919
runs-on: ubuntu-latest
2020
steps:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# CONTAINER FOR BUILDING BINARY
2-
FROM --platform=${BUILDPLATFORM} golang:1.23.7 AS build
2+
FROM --platform=${BUILDPLATFORM} golang:1.24.2 AS build
33

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

aggregator/aggregator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"github.com/0xPolygon/cdk/aggregator/prover"
2323
cdkcommon "github.com/0xPolygon/cdk/common"
2424
"github.com/0xPolygon/cdk/config/types"
25+
"github.com/0xPolygon/cdk/l1infotree"
2526
"github.com/0xPolygon/cdk/rpc"
2627
"github.com/0xPolygon/cdk/state"
2728
"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
@@ -31,7 +32,6 @@ import (
3132
"github.com/0xPolygonHermez/zkevm-synchronizer-l1/state/entities"
3233
"github.com/0xPolygonHermez/zkevm-synchronizer-l1/synchronizer"
3334
"github.com/0xPolygonHermez/zkevm-synchronizer-l1/synchronizer/l1_check_block"
34-
"github.com/agglayer/aggkit/l1infotree"
3535
"github.com/agglayer/aggkit/log"
3636
"github.com/ethereum/go-ethereum/common"
3737
"go.uber.org/zap/zapcore"

dataavailability/datacommittee/datacommittee.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sort"
1010
"strings"
1111

12-
"github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygondatacommittee"
12+
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/banana/polygondatacommittee"
1313
"github.com/0xPolygon/cdk-data-availability/client"
1414
daTypes "github.com/0xPolygon/cdk-data-availability/types"
1515
"github.com/0xPolygon/cdk/etherman"

dataavailability/datacommittee/datacommittee_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"math/big"
66
"testing"
77

8-
"github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygondatacommittee"
8+
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/banana/polygondatacommittee"
99
"github.com/0xPolygon/cdk/test/contracts/erc1967proxy"
1010
"github.com/0xPolygon/cdk/test/helpers"
1111
"github.com/agglayer/aggkit/log"

etherman/contracts/base_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package contracts_test
33
import (
44
"testing"
55

6-
"github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonzkevmglobalexitrootv2"
6+
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/banana/polygonzkevmglobalexitrootv2"
77
"github.com/0xPolygon/cdk/etherman/contracts"
88
"github.com/ethereum/go-ethereum/common"
99
"github.com/stretchr/testify/require"

etherman/contracts/contracts_banana.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package contracts
22

33
import (
4-
"github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonrollupmanager"
5-
"github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonvalidiumetrog"
6-
"github.com/0xPolygon/cdk-contracts-tooling/contracts/banana/polygonzkevmglobalexitrootv2"
4+
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/banana/polygonrollupmanager"
5+
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/banana/polygonvalidiumetrog"
6+
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/banana/polygonzkevmglobalexitrootv2"
77
"github.com/0xPolygon/cdk/etherman/config"
88
"github.com/ethereum/go-ethereum/accounts/abi/bind"
99
)

etherman/contracts/contracts_elderberry.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package contracts
22

33
import (
4-
"github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonrollupmanager"
5-
"github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonvalidiumetrog"
6-
"github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonzkevmglobalexitrootv2"
4+
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/elderberry/polygonrollupmanager"
5+
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/elderberry/polygonvalidiumetrog"
6+
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/elderberry/polygonzkevmglobalexitrootv2"
77
"github.com/0xPolygon/cdk/etherman/config"
88
"github.com/ethereum/go-ethereum/accounts/abi/bind"
99
)

etherman/etherman.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"path/filepath"
1111
"time"
1212

13-
"github.com/0xPolygon/cdk-contracts-tooling/contracts/l2-sovereign-chain/idataavailabilityprotocol"
13+
"github.com/0xPolygon/cdk-contracts-tooling/contracts/pp/l2-sovereign-chain/idataavailabilityprotocol"
1414
cdkcommon "github.com/0xPolygon/cdk/common"
1515
"github.com/0xPolygon/cdk/etherman/config"
1616
"github.com/0xPolygon/cdk/etherman/contracts"

etherman/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"reflect"
77
"time"
88

9-
"github.com/0xPolygon/cdk-contracts-tooling/contracts/elderberry/polygonvalidiumetrog"
9+
"github.com/0xPolygon/cdk-contracts-tooling/contracts/fep/elderberry/polygonvalidiumetrog"
1010
"github.com/ethereum/go-ethereum/common"
1111
)
1212

0 commit comments

Comments
 (0)