Skip to content

Commit 1734557

Browse files
fix: transaction type not supported bumping go-ethereum to 1.15.5 (#306)
* chore: bump go-ethereum v1.15.5 * chrore: bump zkevm-synchronizer-l1 to v1.0.7 * fix: set zkevm-ethtx-manager to v0.2.5 * fix: update cdk-data-availability to v0.0.12 --------- Co-authored-by: Rachit Sonthalia <rachitsonthalia02@gmail.com>
1 parent 9cb953a commit 1734557

13 files changed

Lines changed: 154 additions & 128 deletions

File tree

.github/workflows/arm_deb_packager.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set up Go
2727
uses: actions/setup-go@master
2828
with:
29-
go-version: 1.22.x
29+
go-version: 1.23.x
3030
# Variables
3131
- name: Adding TAG to ENV
3232
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV

.github/workflows/arm_rpm_packager.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Go
2626
uses: actions/setup-go@master
2727
with:
28-
go-version: 1.22.x
28+
go-version: 1.23.x
2929
- name: Adding TAG to ENV
3030
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
3131

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
- name: Install Go
1515
uses: actions/setup-go@v5
1616
with:
17-
go-version: 1.21.x
17+
go-version: 1.23.x
1818
- name: Checkout code
1919
uses: actions/checkout@v4
2020
- name: golangci-lint
2121
uses: golangci/golangci-lint-action@v6
2222
with:
23-
version: v1.61
23+
version: v1.64
2424
args: --timeout=30m

.github/workflows/test-e2e-multi_pp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
go-version: [ 1.22.x ]
14+
go-version: [ 1.23.x ]
1515
goarch: [ "amd64" ]
1616
e2e-group:
1717
- "fork12-pessimistic"

.github/workflows/test-e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
- uses: actions/setup-go@v5
1818
with:
19-
go-version: 1.22.x
19+
go-version: 1.23.x
2020

2121
- name: Build cdk docker image
2222
run: make build-docker

.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.22.4]
17+
go-version: [1.23.x]
1818
goarch: ["amd64"]
1919
runs-on: ubuntu-latest
2020
steps:

.github/workflows/x86_deb_packager.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Set up Go
2626
uses: actions/setup-go@master
2727
with:
28-
go-version: 1.22.x
28+
go-version: 1.23.x
2929
# Variables
3030
- name: Adding TAG to ENV
3131
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV

.github/workflows/x86_rpm_packager.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Set up Go
2525
uses: actions/setup-go@master
2626
with:
27-
go-version: 1.22.x
27+
go-version: 1.23.x
2828
- name: Adding TAG to ENV
2929
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
3030

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.22.4 AS build
2+
FROM --platform=${BUILDPLATFORM} golang:1.23.7 AS build
33

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

bridgesync/e2e_test.go

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,11 @@ func TestBridgeEventE2E(t *testing.T) {
6464
bn, err := setup.L1Environment.SimBackend.Client().BlockNumber(ctx)
6565
require.NoError(t, err)
6666
helpers.Reorg(t, setup.L1Environment.SimBackend, uint64(blocksToReorg))
67+
helpers.CommitBlocks(t, setup.L1Environment.SimBackend, blocksToReorg+1, blockTime)
6768
// Clean expected bridges
6869
lastValidBlock := bn - uint64(blocksToReorg)
69-
reorgEffective := false
70-
for i := len(expectedBridges) - 1; i >= 0; i-- {
71-
if expectedBridges[i].BlockNum > lastValidBlock {
72-
log.Debugf("removing expectedBridge with depositCount %d due to reorg", expectedBridges[i].DepositCount)
73-
lastDepositCount = expectedBridges[i].DepositCount
74-
expectedBridges = expectedBridges[0:i]
75-
reorgEffective = true
76-
bridgesSent--
77-
}
78-
}
70+
reorgEffective := true
71+
log.Debugf("lastValidBlock: %d", lastValidBlock)
7972
if reorgEffective {
8073
reorgs++
8174
log.Debug("reorgs: ", reorgs)

0 commit comments

Comments
 (0)