Skip to content

Commit 6277d66

Browse files
curryxbocurryxbo
authored
Merge branch 'main' into ignoreVerifyBlob
2 parents cc4b6de + 415ca28 commit 6277d66

File tree

131 files changed

+2430
-516
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+2430
-516
lines changed

‎.github/workflows/contracts.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- name: Install Go
4848
uses: actions/setup-go@v5
4949
with:
50-
go-version: 1.22.x
50+
go-version: 1.24.x
5151
- name: Install Foundry
5252
uses: foundry-rs/foundry-toolchain@v1
5353
with:

‎.github/workflows/deployer.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install Go
2929
uses: actions/setup-go@v5
3030
with:
31-
go-version: 1.22.x
31+
go-version: 1.24.x
3232
- name: Lint
3333
run: |
3434
rm -rf $HOME/.cache/golangci-lint
@@ -40,6 +40,6 @@ jobs:
4040
- name: Install Go
4141
uses: actions/setup-go@v5
4242
with:
43-
go-version: 1.22.x
43+
go-version: 1.24.x
4444
- name: Run tests
4545
run: make test

‎.github/workflows/node.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install Go
2929
uses: actions/setup-go@v5
3030
with:
31-
go-version: 1.22.x
31+
go-version: 1.24.x
3232
- name: Lint
3333
run: |
3434
rm -rf $HOME/.cache/golangci-lint
@@ -40,7 +40,7 @@ jobs:
4040
- name: Install Go
4141
uses: actions/setup-go@v5
4242
with:
43-
go-version: 1.22.x
43+
go-version: 1.24.x
4444
- name: Run build
4545
run: make build
4646
- name: Run tests

‎.github/workflows/oracle.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Install Go
2929
uses: actions/setup-go@v5
3030
with:
31-
go-version: 1.22.x
31+
go-version: 1.24.x
3232
- name: Lint
3333
run: |
3434
rm -rf $HOME/.cache/golangci-lint
@@ -40,7 +40,7 @@ jobs:
4040
- name: Install Go
4141
uses: actions/setup-go@v5
4242
with:
43-
go-version: 1.22.x
43+
go-version: 1.24.x
4444
- name: Run build
4545
run: make build
4646
- name: Run tests

‎.github/workflows/tx-submitter.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install Go
3030
uses: actions/setup-go@v5
3131
with:
32-
go-version: 1.22.x
32+
go-version: 1.24.x
3333
- name: Lint
3434
run: |
3535
rm -rf $HOME/.cache/golangci-lint
@@ -41,7 +41,7 @@ jobs:
4141
- name: Install Go
4242
uses: actions/setup-go@v5
4343
with:
44-
go-version: 1.22.x
44+
go-version: 1.24.x
4545
- name: Run build
4646
run: make build
4747
- name: Run tests

‎.gitmodules‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[submodule "go-ethereum"]
22
path = go-ethereum
33
url = https://github.com/morph-l2/go-ethereum.git
4-
branch = release/2.0.x

‎Dockerfile.l2-node‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build Stage
2-
FROM ghcr.io/morph-l2/go-ubuntu-builder:go-1.22-ubuntu as builder
2+
FROM ghcr.io/morph-l2/go-ubuntu-builder:go-1.24-ubuntu as builder
33

44
# Set working directory and copy necessary files
55
COPY . /morph
@@ -9,7 +9,7 @@ WORKDIR /morph/node
99
RUN make build
1010

1111
# Final Stage
12-
FROM ghcr.io/morph-l2/go-ubuntu-builder:go-1.22-ubuntu
12+
FROM ghcr.io/morph-l2/go-ubuntu-builder:go-1.24-ubuntu
1313

1414
# Update and install dependencies, then clean up unnecessary files
1515
RUN apt-get -qq update \

‎Makefile‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
################## update dependencies ####################
2-
3-
ETHEREUM_TARGET_VERSION := morph-v2.0.7
2+
ETHEREUM_SUBMODULE_COMMIT_OR_TAG := morph-v2.0.8
3+
ETHEREUM_TARGET_VERSION := morph-v2.0.8
44
TENDERMINT_TARGET_VERSION := v0.3.2
55

66
ETHEREUM_MODULE_NAME := github.com/morph-l2/go-ethereum
@@ -39,7 +39,13 @@ update:
3939

4040
submodules:
4141
git submodule update --init
42-
git submodule update --remote
42+
@if [ -d "go-ethereum" ]; then \
43+
echo "Updating go-ethereum submodule to tag $(ETHEREUM_SUBMODULE_COMMIT_OR_TAG)..."; \
44+
cd go-ethereum && \
45+
git fetch --tags && \
46+
git checkout $(ETHEREUM_SUBMODULE_COMMIT_OR_TAG) && \
47+
cd ..; \
48+
fi
4349
.PHONY: submodules
4450

4551
################## bindings ####################
@@ -58,12 +64,13 @@ lint-sol:
5864
.PHONY: lint-sol
5965

6066
lint-go:
67+
go work sync
6168
make -C bindings lint
6269
make -C contracts lint-go
6370
make -C node lint
6471
make -C ops/l2-genesis lint
6572
make -C ops/tools lint
66-
make -C oracle lint
73+
## make -C oracle lint
6774
make -C tx-submitter lint
6875
.PHONY: lint-go
6976

@@ -120,7 +127,7 @@ go-rust-alpine-builder:
120127
go-ubuntu-builder:
121128
@if [ -z "$(shell docker images -q morph/go-ubuntu-builder 2> /dev/null)" ]; then \
122129
echo "Docker image morph/go-ubuntu-builder does not exist. Building..."; \
123-
cd ops/docker/intermediate && docker build -t morph/go-ubuntu-builder:go-1.22-ubuntu . -f go-ubuntu-builder.Dockerfile; \
130+
cd ops/docker/intermediate && docker build -t morph/go-ubuntu-builder:go-1.24-ubuntu . -f go-ubuntu-builder.Dockerfile; \
124131
else \
125132
echo "Docker image morph/go-ubuntu-builder already exists."; \
126133
fi
@@ -140,7 +147,7 @@ devnet-down:
140147
cd ops/docker && docker compose -f docker-compose-4nodes.yml down
141148
.PHONY: devnet-down
142149

143-
devnet-clean-build: devnet-down
150+
devnet-clean-build: devnet-down devnet-l1-clean
144151
docker volume ls --filter name=docker-* --format='{{.Name}}' | xargs -r docker volume rm
145152
rm -rf ops/l2-genesis/.devnet
146153
rm -rf ops/docker/.devnet
@@ -156,6 +163,10 @@ devnet-clean: devnet-clean-build
156163
devnet-l1:
157164
python3 ops/devnet-morph/main.py --polyrepo-dir=. --only-l1
158165

166+
devnet-l1-clean:
167+
@cd ops/docker && ./layer1/scripts/clean.sh
168+
.PHONY: devnet-l1-clean
169+
159170
devnet-logs:
160171
@(cd ops/docker && docker-compose logs -f)
161172
.PHONY: devnet-logs

‎bindings/ast/canonicalize.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func CanonicalizeASTIDs(in *solc.StorageLayout) *solc.StorageLayout {
4949
}
5050

5151
replaceAstID := matches[0][2]
52-
newType := strings.Replace(oldType, replaceAstID, strconv.Itoa(int(lastId)), 1)
52+
newType := strings.Replace(oldType, replaceAstID, strconv.FormatUint(uint64(lastId), 10), 1)
5353
typeRemappings[oldType] = newType
5454
lastId++
5555
}

‎bindings/go.mod‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
module morph-l2/bindings
22

3-
go 1.22
3+
go 1.24.0
44

55
replace github.com/tendermint/tendermint => github.com/morph-l2/tendermint v0.3.2
66

7-
require github.com/morph-l2/go-ethereum v1.10.14-0.20251020031512-67087dd3ad49
7+
require github.com/morph-l2/go-ethereum v1.10.14-0.20251031091135-78b17f183b84
88

99
require (
1010
github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
11-
github.com/bits-and-blooms/bitset v1.7.0 // indirect
11+
github.com/bits-and-blooms/bitset v1.20.0 // indirect
1212
github.com/btcsuite/btcd/btcec/v2 v2.2.1 // indirect
13-
github.com/consensys/bavard v0.1.13 // indirect
14-
github.com/consensys/gnark-crypto v0.12.1 // indirect
15-
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
13+
github.com/consensys/bavard v0.1.27 // indirect
14+
github.com/consensys/gnark-crypto v0.16.0 // indirect
15+
github.com/crate-crypto/go-eth-kzg v1.4.0 // indirect
1616
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1717
github.com/deckarep/golang-set v1.8.0 // indirect
1818
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
1919
github.com/edsrzf/mmap-go v1.1.0 // indirect
20-
github.com/ethereum/c-kzg-4844/bindings/go v0.0.0-20230126171313-363c7d7593b4 // indirect
20+
github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect
21+
github.com/ethereum/go-ethereum v1.10.26 // indirect
2122
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
2223
github.com/go-ole/go-ole v1.3.0 // indirect
2324
github.com/go-stack/stack v1.8.1 // indirect
@@ -35,16 +36,15 @@ require (
3536
github.com/scroll-tech/zktrie v0.8.4 // indirect
3637
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
3738
github.com/status-im/keycard-go v0.3.2 // indirect
38-
github.com/stretchr/testify v1.9.0 // indirect
39-
github.com/supranational/blst v0.3.11 // indirect
39+
github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe // indirect
4040
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
4141
github.com/tklauser/go-sysconf v0.3.13 // indirect
4242
github.com/tklauser/numcpus v0.7.0 // indirect
4343
github.com/yusufpapurcu/wmi v1.2.3 // indirect
44-
golang.org/x/crypto v0.23.0 // indirect
44+
golang.org/x/crypto v0.35.0 // indirect
4545
golang.org/x/net v0.25.0 // indirect
46-
golang.org/x/sync v0.7.0 // indirect
47-
golang.org/x/sys v0.20.0 // indirect
46+
golang.org/x/sync v0.11.0 // indirect
47+
golang.org/x/sys v0.30.0 // indirect
4848
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
4949
rsc.io/tmplfunc v0.0.3 // indirect
5050
)

0 commit comments

Comments
 (0)