Skip to content

Commit 935b649

Browse files
committed
Merge branch 'main' into jihwan/pgdn-monitor-fix
2 parents 77ce6b9 + 2aaa905 commit 935b649

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ concurrency:
1212

1313
env:
1414
GO_VERSION: "1.22" # https://go.dev/dl/
15-
STRINGER_VERSION: "0.26.0" # https://pkg.go.dev/golang.org/x/tools/cmd/stringer?tab=versions
15+
STRINGER_VERSION: "0.27.0" # https://pkg.go.dev/golang.org/x/tools/cmd/stringer?tab=versions
1616
# Protoc dependencies.
17-
PROTOC_VERSION: "28.2" # https://github.com/protocolbuffers/protobuf/releases
18-
PROTOC_GEN_GO_VERSION: "1.35.1" # https://pkg.go.dev/google.golang.org/protobuf/cmd/protoc-gen-go?tab=versions
17+
PROTOC_VERSION: "28.3" # https://github.com/protocolbuffers/protobuf/releases
18+
PROTOC_GEN_GO_VERSION: "1.35.2" # https://pkg.go.dev/google.golang.org/protobuf/cmd/protoc-gen-go?tab=versions
1919
PROTOC_GEN_GO_GRPC_VERSION: "1.5.1" # https://pkg.go.dev/google.golang.org/grpc/cmd/protoc-gen-go-grpc?tab=versions
2020
ARCH: "linux-x86_64"
2121

@@ -61,6 +61,7 @@ jobs:
6161
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v${{ env.PROTOC_GEN_GO_GRPC_VERSION }}
6262
protoc-gen-go --version
6363
protoc-gen-go-grpc --version
64+
6465
# Dependencies to generate go bindings.
6566
- name: Install abigen
6667
run: |
@@ -88,6 +89,7 @@ jobs:
8889
run: |
8990
if [[ -n $(git status --porcelain) ]]; then
9091
echo "❌ Error: Generated files are not up to date. Please run \`make gen\`."
92+
echo "🚨 If \`make gen\` doesn't update the contract bytecodes and/or go bindings and this job is still failing, please take a look at the ethereum and foundry versions. We don't pin the versions of these packages in CI so this job may complain after an update of the packages!"
9193
git status --porcelain
9294
git diff
9395
exit 1

contracts/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ build: ## Build the smart contracts
1212

1313
##@ Gen go bindings
1414

15+
.PHONY: gen-go-bindings
16+
gen-go-bindings: build gen-funder-go-bindings gen-tester-go-bindings gen-tokens-go-bindings ## Generate go bindings.
17+
1518
.PHONY: gen-funder-go-bindings
1619
gen-funder-go-bindings: ## Generatego go bindings for the funder contract.
1720
cat ./out/Funder.sol/Funder.json | jq -r '.abi' > ../bindings/funder/Funder.abi
@@ -55,7 +58,3 @@ gen-ulxly-go-bindings:
5558
cat ./out/PolygonZkEVMBridge.sol/PolygonZkEVMBridge.json | jq -r '.bytecode.object' > ../bindings/ulxly/PolygonZkEVMBridge.bin
5659
abigen --abi ../bindings/ulxly/PolygonZkEVMBridge.abi --bin ../bindings/ulxly/PolygonZkEVMBridge.bin --pkg ulxly --type legacy --out ../bindings/ulxly/PolygonZkEVMBridge.go
5760
@echo "✅ ulxly/PolygonZkEVMBridge.go generated"
58-
59-
60-
.PHONY: gen-go-bindings
61-
gen-go-bindings: build gen-funder-go-bindings gen-tester-go-bindings gen-tokens-go-bindings ## Generate go bindings.

proto/gen/pb/block.pb.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

proto/gen/pb/transaction.pb.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)