Skip to content

Commit b423092

Browse files
Merge pull request #52 from 0xPolygon/pullupstream/v0.5.0-RC4
Pullupstream/v0.5.0 rc4
2 parents 9711a4d + 916ec91 commit b423092

File tree

452 files changed

+155467
-25719
lines changed

Some content is hidden

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

452 files changed

+155467
-25719
lines changed

.github/workflows/codeql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040

4141
steps:
4242
- name: Checkout repository
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
4444

4545
# Initializes the CodeQL tools for scanning.
4646
- name: Initialize CodeQL

.github/workflows/jsonschema.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3
2323
# https://github.com/actions/checkout#Checkout-pull-request-HEAD-commit-instead-of-merge-commit
2424
# Checkout pull request HEAD commit instead of merge commit
2525
with:

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
go-version: 1.21.x
1919
- name: Checkout code
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3
2121
- name: Lint
2222
run: |
2323
make install-linter

.github/workflows/push-docker-develop.yml

-32
This file was deleted.

.github/workflows/push-docker-tagged.yml

-33
This file was deleted.

.github/workflows/sonarqube.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
sonarqube:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3
1414
with:
1515
# Disabling shallow clone is recommended for improving relevancy of reporting.
1616
fetch-depth: 0

.github/workflows/test-e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
2525

2626
- name: Install Go
2727
uses: actions/setup-go@v3

.github/workflows/test-from-prover.yml

-52
This file was deleted.

.github/workflows/test-full-non-e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout code
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
2323

2424
- name: Install Go
2525
uses: actions/setup-go@v3

.github/workflows/updatedeps.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout code
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
1313

1414
- name: Install Go
1515
uses: actions/setup-go@v3

.golangci.yml

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ linters:
1717
- gofmt
1818
- goimports
1919
- revive
20+
- unconvert
2021

2122
linters-settings:
2223
revive:
@@ -29,3 +30,6 @@ issues:
2930
include:
3031
- EXC0012 # EXC0012 revive: Annoying issue about not having a comment. The rare codebase has such comments
3132
- EXC0014 # EXC0014 revive: Annoying issue about not having a comment. The rare codebase has such comments
33+
exclude-rules:
34+
- path: cmd/policy.go
35+
text: "unused"

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Note that non of this is a hard rule, but suggestions / guidelines. Although eve
3333
- Offer clarification, explain the decisions you made to reach a solution in question.
3434
- Try to respond to every comment.
3535
- If there is growing confusion or debate, ask yourself if the written word is still the best form of communication. Talk (virtually) face-to-face, then mutually consider posting a follow-up to summarize any offline discussion (useful for others who be following along, now or later).
36-
- If concensus is still not reached, involve someone else in the discussion. As a last resource the lead of the project could take the decision
36+
- If consensus is still not reached, involve someone else in the discussion. As a last resource the lead of the project could take the decision
3737

3838
## Links and credits
3939

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN cd /src/db && packr2
1212
RUN cd /src && make build
1313

1414
# CONTAINER FOR RUNNING BINARY
15-
FROM alpine:3.18.0
15+
FROM alpine:3.18.4
1616
COPY --from=build /src/dist/zkevm-node /app/zkevm-node
1717
COPY --from=build /src/config/environments/testnet/node.config.toml /app/example.config.toml
1818
RUN apk update && apk add postgresql15-client

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ venv: $(VENV_PYTHON)
118118
.PHONY: install-config-doc-gen
119119
$(GENERATE_SCHEMA_DOC): $(VENV_PYTHON)
120120
$(PYTHON) -m pip install --upgrade pip
121-
$(PYTHON) -m pip install json-schema-for-humans
121+
$(PYTHON) -m pip install json-schema-for-humans==0.47
122122

123123
.PHONY: config-doc-gen
124124
config-doc-gen: config-doc-node config-doc-custom_network ## Generate config file's json-schema for node and custom_network and documentation

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ For an in-depth understanding of the protocol’s specifications, please refer t
1919

2020
## Run a CDK Validium
2121

22-
> This repo is a fork of the [zkevm-node](https://github.com/0xPolygonHermez/zkevm-node)
22+
> This repo is a fork of the [zkevm-node](https://github.com/0xPolygonHermez/zkevm-node), more information and code diff explained [here](./docs/diff/diff.md)
2323
2424
### Development
2525

0 commit comments

Comments
 (0)