Skip to content

Commit efaa6c4

Browse files
committed
POS-2821: GHE fixes
1 parent 4f504fe commit efaa6c4

File tree

11 files changed

+80
-122
lines changed

11 files changed

+80
-122
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
name: build
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020

2121
- name: Install Go
2222
uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.22.x
24+
go-version: 1.23.x
2525

2626
- name: "Build binaries"
2727
run: make build
@@ -30,12 +30,12 @@ jobs:
3030
name: lint
3131
runs-on: ubuntu-latest
3232
steps:
33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3434

3535
- name: Install Go
3636
uses: actions/setup-go@v5
3737
with:
38-
go-version: 1.22.x
38+
go-version: 1.23.x
3939

4040
- name: "Run linter"
4141
run: make lint
@@ -44,12 +44,12 @@ jobs:
4444
name: test
4545
runs-on: ubuntu-latest
4646
steps:
47-
- uses: actions/checkout@v3
47+
- uses: actions/checkout@v4
4848

4949
- name: Install Go
5050
uses: actions/setup-go@v5
5151
with:
52-
go-version: 1.22.x
52+
go-version: 1.23.x
5353

5454
- name: "Run tests"
5555
run: make tests
@@ -67,16 +67,16 @@ jobs:
6767
os: [ ubuntu-20.04 ] # list of os: https://github.com/actions/virtual-environments
6868
runs-on: ${{ matrix.os }}
6969
steps:
70-
- uses: actions/checkout@v3
70+
- uses: actions/checkout@v4
7171
with:
7272
path: heimdall
7373

7474
- uses: actions/setup-go@v5
7575
with:
76-
go-version: 1.22.x
76+
go-version: 1.23.x
7777

7878
- name: Checkout matic-cli
79-
uses: actions/checkout@v3
79+
uses: actions/checkout@v4
8080
with:
8181
repository: maticnetwork/matic-cli
8282
ref: master
@@ -92,7 +92,7 @@ jobs:
9292
sudo apt install python2 jq curl
9393
sudo ln -sf /usr/bin/python2 /usr/bin/python
9494
95-
- uses: actions/setup-node@v3
95+
- uses: actions/setup-node@v4
9696
with:
9797
node-version: '18.19.0'
9898
cache: 'npm'

.github/workflows/codeql.yml

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

2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929

3030
- name: Install Go
3131
uses: actions/setup-go@v5

.github/workflows/govuln.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ jobs:
66
name: Run govuln check and Publish
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
9+
- uses: actions/checkout@v4
1010
- name: Running govulncheck
1111
uses: Templum/[email protected]
1212
continue-on-error: true
1313
env:
1414
DEBUG: "true"
1515
with:
16-
go-version: 1.22
16+
go-version: 1.23
1717
package: ./...
1818
github-token: ${{ secrets.GITHUB_TOKEN }}
1919
fail-on-vuln: true

.github/workflows/packager_deb.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424
- name: Set up Go
25-
uses: actions/setup-go@master
25+
uses: actions/setup-go@v5
2626
with:
27-
go-version: 1.22.x
27+
go-version: 1.23.x
2828
# Variables
2929
- name: Adding TAG to ENV
3030
run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020

2121
- name: Set up Go
22-
uses: actions/setup-go@master
22+
uses: actions/setup-go@v5
2323
with:
24-
go-version: 1.22.x
24+
go-version: 1.23.x
2525

2626
- name: Prepare
2727
id: prepare

.github/workflows/rpm_arm_packager.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ jobs:
2323
with:
2424
fetch-depth: 0
2525
- name: Set up Go
26-
uses: actions/setup-go@master
26+
uses: actions/setup-go@v5
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
- name: Adding TAG1 to ENV
@@ -94,4 +94,4 @@ jobs:
9494
prerelease: true
9595
files: |
9696
packaging/rpm_build/RPMS/aarch64/heimdall-**.rpm
97-
packaging/rpm_build/RPMS/aarch64/heimdall-**.rpm.checksum
97+
packaging/rpm_build/RPMS/aarch64/heimdall-**.rpm.checksum

.github/workflows/rpm_packager.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424
- name: Set up Go
25-
uses: actions/setup-go@master
25+
uses: actions/setup-go@v5
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
- name: Adding TAG1 to ENV
@@ -93,4 +93,4 @@ jobs:
9393
prerelease: true
9494
files: |
9595
packaging/rpm_build/RPMS/x86_64/heimdall-**.rpm
96-
packaging/rpm_build/RPMS/x86_64/heimdall-**.rpm.checksum
96+
packaging/rpm_build/RPMS/x86_64/heimdall-**.rpm.checksum

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
pull-requests: write
1919

2020
steps:
21-
- uses: actions/stale@v5
21+
- uses: actions/stale@v9
2222
with:
2323
repo-token: ${{ secrets.GITHUB_TOKEN }}
2424
stale-issue-message: 'This issue is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 14 days.'

bor/client/grpc/query.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (h *BorGRPCClient) BlockByNumber(ctx context.Context, blockID int64) (*ethT
112112
ParentHash: protoutil.ConvertH256ToHash(res.Block.Header.ParentHash),
113113
Time: res.Block.Header.Time,
114114
}
115-
return ethTypes.NewBlock(&header, nil, nil, nil, nil), nil
115+
return ethTypes.NewBlock(&header, nil, nil, nil), nil
116116
}
117117

118118
func (h *BorGRPCClient) TransactionReceipt(ctx context.Context, txHash common.Hash) (*ethTypes.Receipt, error) {

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/maticnetwork/heimdall
22

3-
go 1.22
3+
go 1.23.2
44

55
require (
66
github.com/RichardKnop/machinery v1.10.6
77
github.com/cbergoon/merkletree v0.2.0
88
github.com/cosmos/cosmos-sdk v0.50.6
9-
github.com/ethereum/go-ethereum v1.14.3
9+
github.com/ethereum/go-ethereum v1.14.13
1010
github.com/go-kit/log v0.2.1
1111
github.com/gogo/protobuf v1.3.2
1212
github.com/golang/mock v1.6.0
@@ -45,11 +45,11 @@ require (
4545
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4646
github.com/consensys/bavard v0.1.13 // indirect
4747
github.com/consensys/gnark-crypto v0.12.1 // indirect
48-
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
48+
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
4949
github.com/deckarep/golang-set/v2 v2.6.0 // indirect
5050
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
5151
github.com/etcd-io/bbolt v1.3.3 // indirect
52-
github.com/ethereum/c-kzg-4844 v0.4.3 // indirect
52+
github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
5353
github.com/felixge/httpsnoop v1.0.4 // indirect
5454
github.com/gammazero/deque v0.2.1 // indirect
5555
github.com/go-kit/kit v0.12.0 // indirect
@@ -106,7 +106,7 @@ require (
106106
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
107107
github.com/btcsuite/btcd/btcec/v2 v2.3.3 // indirect
108108
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
109-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
109+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
110110
github.com/cosmos/go-bip39 v1.0.0 // indirect
111111
github.com/cosmos/ledger-cosmos-go v0.13.0 // indirect
112112
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -175,7 +175,7 @@ replace github.com/tendermint/tm-db => github.com/tendermint/tm-db v0.2.0
175175

176176
replace github.com/cosmos/cosmos-sdk => github.com/maticnetwork/cosmos-sdk v0.38.4
177177

178-
replace github.com/ethereum/go-ethereum => github.com/maticnetwork/bor v1.4.1
178+
replace github.com/ethereum/go-ethereum => github.com/maticnetwork/bor v1.5.5
179179

180180
replace go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.14.0
181181

0 commit comments

Comments
 (0)