Skip to content

Commit fbc249a

Browse files
noslavnoslav
committed
resolve conflicts and rebase block specimen producer patch v2.3.0 onto master geth-v1.16.7
Signed-off-by: Pranay Valson <[email protected]>
1 parent b9f3a3d commit fbc249a

Some content is hidden

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

51 files changed

+2420
-76
lines changed

‎.github/workflows/build-test.yml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: build-test
2+
3+
on:
4+
push:
5+
branches:
6+
- "main"
7+
pull_request:
8+
branches:
9+
- "main"
10+
- "develop"
11+
12+
jobs:
13+
audit:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Cancel Previous Runs
17+
uses: styfle/[email protected]
18+
with:
19+
access_token: ${{ secrets.GITHUB_TOKEN }}
20+
- uses: actions/checkout@v2
21+
22+
- name: Set up Go
23+
uses: actions/setup-go@v2
24+
with:
25+
go-version: 1.24.0
26+
27+
- name: Checkout code
28+
uses: actions/checkout@v2
29+
30+
- name: Verify dependencies
31+
run: go mod verify
32+
33+
- name: Build all
34+
run: make all
35+
36+
- name: Run tests
37+
run: go test -short ./...
38+
39+
- name: Upload coverage to Codecov
40+
run: bash <(curl -s https://codecov.io/bash) -t ${{ secrets.CODECOV_TOKEN }}
41+
42+
- name: Clean
43+
run: make clean

‎.github/workflows/docker-image.yml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: docker-image-ci
2+
3+
on:
4+
push:
5+
branches:
6+
- "main"
7+
pull_request:
8+
branches:
9+
- "main"
10+
- "develop"
11+
12+
jobs:
13+
push-image:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Cancel Previous Runs
17+
uses: styfle/[email protected]
18+
with:
19+
access_token: ${{ secrets.GITHUB_TOKEN }}
20+
- name: Login to GitHub Container Registry
21+
if: ${{ !env.ACT }}
22+
uses: docker/login-action@v1
23+
with:
24+
registry: ghcr.io
25+
username: ${{ secrets.CR_USER }}
26+
password: ${{ secrets.CR_PAT }}
27+
28+
- uses: actions/checkout@v2
29+
- name: Build & Publish the Docker image
30+
if: ${{ !env.ACT }}
31+
run: |
32+
docker build . --file Dockerfile --tag ghcr.io/covalenthq/bsp-geth:latest
33+
docker push ghcr.io/covalenthq/bsp-geth:latest
34+
35+
# - name: Start containers
36+
# run: docker-compose -f "docker-compose.yml" up --build --remove-orphans --force-recreate --exit-code-from agent
37+
38+
# - name: Check running bsp-geth
39+
# run: docker inspect bsp-geth
40+
41+
# - name: Check running containers
42+
# run: docker ps
43+
44+
# - name: Stop containers
45+
# if: always()
46+
# run: docker-compose -f "docker-compose.yml" down

‎.github/workflows/gcr-image.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: gcr-image
2+
3+
on:
4+
push:
5+
branches:
6+
- "main"
7+
pull_request:
8+
branches:
9+
- "main"
10+
- "develop"
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Cancel Previous Runs
17+
uses: styfle/[email protected]
18+
with:
19+
access_token: ${{ secrets.GITHUB_TOKEN }}
20+
- name: Login to GCR
21+
uses: docker/login-action@v2
22+
with:
23+
registry: us-docker.pkg.dev
24+
username: _json_key
25+
password: ${{ secrets.GCR_JSON_KEY }}
26+
27+
- uses: actions/checkout@v2
28+
# - uses: satackey/[email protected]
29+
- name: Build & Publish the Docker image
30+
run: |
31+
docker buildx create --name builder --use --platform=linux/amd64 && docker buildx build --platform=linux/amd64 . -t us-docker.pkg.dev/covalent-project/network/bsp-geth:latest --push

‎.github/workflows/go.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ jobs:
1616
with:
1717
submodules: false
1818

19-
# Cache build tools to avoid downloading them each time
20-
- uses: actions/cache@v4
21-
with:
22-
path: build/cache
23-
key: ${{ runner.os }}-build-tools-cache-${{ hashFiles('build/checksums.txt') }}
19+
# Cache build tools to avoid downloading them each time
20+
- uses: actions/cache@v4
21+
with:
22+
path: build/cache
23+
key: ${{ runner.os }}-build-tools-cache-${{ hashFiles('build/checksums.txt') }}
2424

2525
- name: Set up Go
2626
uses: actions/setup-go@v5
2727
with:
2828
go-version: 1.25
2929
cache: false
3030

31-
- name: Run linters
32-
run: |
33-
go run build/ci.go lint
34-
go run build/ci.go check_generate
35-
go run build/ci.go check_baddeps
31+
- name: Run linters
32+
run: |
33+
go run build/ci.go lint
34+
go run build/ci.go check_generate
35+
go run build/ci.go check_baddeps
3636
3737
keeper:
3838
name: Keeper Builds
@@ -90,7 +90,7 @@ jobs:
9090
submodules: true
9191

9292
- name: Set up Go
93-
uses: actions/setup-go@v5
93+
uses: actions/setup-go@v2
9494
with:
9595
go-version: ${{ matrix.go }}
9696
cache: false

‎.github/workflows/golangci-lint.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: golangci-lint
2+
3+
on:
4+
push:
5+
branches:
6+
- "main"
7+
pull_request:
8+
branches:
9+
- "main"
10+
- "develop"
11+
permissions:
12+
contents: read
13+
# Optional: allow read access to pull request. Use with `only-new-issues` option.
14+
# pull-requests: read
15+
jobs:
16+
golangci-build:
17+
name: Build
18+
runs-on: ubuntu-latest
19+
steps:
20+
- uses: actions/checkout@v3
21+
- uses: actions/setup-go@v3
22+
- name: Set up Go 1.24.0
23+
uses: actions/setup-go@v3
24+
with:
25+
go-version: 1.24.0
26+
id: go
27+
- run: go version
28+
29+
- name: Lint
30+
run: |
31+
# curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.51.2
32+
# ./bin/golangci-lint run
33+
34+
# Optional: working directory, useful for monorepos
35+
# working-directory: somedir
36+
37+
# Optional: golangci-lint command line arguments.
38+
# args: --issues-exit-code=0
39+
40+
# Optional: show only new issues if it's a pull request. The default value is `false`.
41+
# only-new-issues: true
42+
43+
# Optional: if set to true then the action will use pre-installed Go.
44+
# skip-go-installation: true
45+
46+
# Optional: if set to true then the action don't cache or restore ~/go/pkg.
47+
# skip-pkg-cache: true
48+
49+
# Optional: if set to true then the action don't cache or restore ~/.cache/go-build.
50+
# skip-build-cache: true

‎.github/workflows/hadolint.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: dockerfile-lint
2+
3+
on:
4+
push:
5+
branches:
6+
- "main"
7+
pull_request:
8+
branches:
9+
- "main"
10+
- "develop"
11+
12+
jobs:
13+
linter:
14+
name: lint-dockerfile
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v2
18+
- name: lint dockerfile
19+
uses: brpaz/hadolint-action@master
20+
with:
21+
dockerfile: "Dockerfile"

‎.github/workflows/tag-release.yaml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: tag-release
2+
3+
on:
4+
push:
5+
tags:
6+
- "v*.*.*"
7+
8+
jobs:
9+
tagged-release:
10+
name: Tagged Release
11+
runs-on: "ubuntu-latest"
12+
13+
steps:
14+
- name: Login to GCR
15+
uses: docker/login-action@v2
16+
with:
17+
registry: us-docker.pkg.dev
18+
username: _json_key
19+
password: ${{ secrets.GCR_JSON_KEY }}
20+
21+
- uses: actions/checkout@v2
22+
23+
# - uses: satackey/[email protected]
24+
25+
- name: Set env
26+
run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
27+
28+
- name: Build & Publish the Docker image
29+
run: |
30+
docker buildx create --name builder --use --platform=linux/amd64 && docker buildx build --platform=linux/amd64 . -t us-docker.pkg.dev/covalent-project/network/bsp-geth:stable -t us-docker.pkg.dev/covalent-project/network/bsp-geth:"${{ env.TAG }}" --push
31+
32+
- uses: "marvinpinto/action-automatic-releases@latest"
33+
with:
34+
repo_token: "${{ secrets.GITHUB_TOKEN }}"
35+
draft: false
36+
prerelease: false
37+
files: |
38+
*.zip
39+
*.tar.gz

‎.github/workflows/validate_pr.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@ on:
77
jobs:
88
validate-pr:
99
runs-on: ubuntu-latest
10+
if: false
1011
steps:
1112
- name: Check PR Title Format
1213
uses: actions/github-script@v7
1314
with:
1415
script: |
1516
const prTitle = context.payload.pull_request.title;
1617
const titleRegex = /^([\w\s,{}/.]+): .+/;
17-
18+
1819
if (!titleRegex.test(prTitle)) {
1920
core.setFailed(`PR title "${prTitle}" does not match required format: directory, ...: description`);
2021
return;
2122
}
22-
23+
2324
console.log('✅ PR title format is valid');

‎.gitignore‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,23 @@ profile.cov
4242
# VS Code
4343
.vscode
4444

45+
# dashboard
46+
/dashboard/assets/flow-typed
47+
/dashboard/assets/node_modules
48+
/dashboard/assets/stats.json
49+
/dashboard/assets/bundle.js
50+
/dashboard/assets/bundle.js.map
51+
/dashboard/assets/package-lock.json
52+
53+
**/yarn-error.log
54+
55+
data/
56+
ganache_data/
57+
.env
58+
scripts/
59+
logs/
60+
coverage.out
61+
coverage.txt
4562
tests/spec-tests/
4663

4764
# binaries
@@ -57,3 +74,5 @@ cmd/geth/geth
5774
cmd/rlpdump/rlpdump
5875
cmd/workload/workload
5976
cmd/keeper/keeper
77+
bin/
78+
out/

‎.hadolint.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
ignored:
2+
- DL3018
3+
- DL3016
4+
- DL3059

0 commit comments

Comments
 (0)