Skip to content

Commit c52e64f

Browse files
committed
Merge branch 'main' into update-chaos-examples
2 parents 688e319 + fc215b2 commit c52e64f

File tree

39 files changed

+54
-124
lines changed

39 files changed

+54
-124
lines changed

.github/workflows/framework-golden-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
- name: Set up Go
8585
uses: actions/setup-go@v5
8686
with:
87-
go-version: stable
87+
go-version: '1.24.0'
8888
- name: Cache Go modules
8989
uses: actions/cache@v4
9090
with:

.github/workflows/framework.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Set up Go
3939
uses: actions/setup-go@v5
4040
with:
41-
go-version: stable
41+
go-version: '1.24.0'
4242
- name: Cache Go modules
4343
uses: actions/cache@v4
4444
with:

.github/workflows/lint.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set up Go
3030
uses: actions/setup-go@v5
3131
with:
32-
go-version: stable
32+
go-version: '1.24.0'
3333
- name: Install gomods
3434
run: go install github.com/jmank88/[email protected]
3535
- name: Check out code
@@ -78,6 +78,10 @@ jobs:
7878
path: ./tools/workflowresultparser/
7979
- name: parrot
8080
path: ./parrot/
81+
- name: wasp
82+
path: ./wasp/
83+
- name: seth
84+
path: ./seth/
8185
steps:
8286
- name: Check out Code
8387
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
@@ -88,7 +92,7 @@ jobs:
8892
use-go-cache: true
8993
go-cache-dep-path: ${{ matrix.project.path }}go.sum
9094
- name: golangci-lint ${{ needs.tools.outputs.golangci-lint-version }}
91-
uses: golangci/golangci-lint-action@818ec4d51a1feacefc42ff1b3ec25d4962690f39 # v6.4.1
95+
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
9296
with:
9397
version: v${{ needs.tools.outputs.golangci-lint-version }}
9498
args: --out-format checkstyle:golangci-lint-report.xml

.github/workflows/parrot-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Set up Go
4040
uses: actions/setup-go@v5
4141
with:
42-
go-version: stable
42+
go-version: '1.24.0'
4343
cache-dependency-path: ./parrot/go.mod
4444
- name: Goreleaser Release
4545
uses: goreleaser/goreleaser-action@v6

.github/workflows/rc-breaking-changes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Go
2020
uses: actions/setup-go@v5
2121
with:
22-
go-version: 1.23
22+
go-version: '1.24.0'
2323
- name: Install gorelease tool
2424
run: |
2525
go install golang.org/x/exp/cmd/gorelease@latest

.github/workflows/release-go-module.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- name: Set up Go
7070
uses: actions/setup-go@v5
7171
with:
72-
go-version: 1.23
72+
go-version: '1.24.0'
7373
- name: Install gorelease tool
7474
run: |
7575
go install golang.org/x/exp/cmd/gorelease@latest

.github/workflows/seth-lint.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/wasp-lint.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ golang 1.23.4
22
nodejs 18.20.3
33
k3d 5.6.3
44
act 0.2.52
5-
golangci-lint 1.64.5
5+
golangci-lint 1.64.2
66
actionlint 1.6.26
77
shellcheck 0.9.0
88
helm 3.15.2

framework/clclient/client.go

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@ import (
55
"crypto/rand"
66
"crypto/tls"
77
"fmt"
8-
"github.com/ethereum/go-ethereum/accounts/keystore"
9-
"github.com/ethereum/go-ethereum/crypto"
10-
"github.com/pkg/errors"
11-
"github.com/smartcontractkit/chainlink-testing-framework/framework"
12-
"github.com/smartcontractkit/chainlink-testing-framework/framework/components/clnode"
138
"math/big"
149
"net/http"
1510
"os"
1611
"strings"
1712
"sync"
1813
"time"
1914

15+
"github.com/ethereum/go-ethereum/accounts/keystore"
16+
"github.com/ethereum/go-ethereum/crypto"
17+
"github.com/pkg/errors"
18+
"github.com/smartcontractkit/chainlink-testing-framework/framework"
19+
"github.com/smartcontractkit/chainlink-testing-framework/framework/components/clnode"
20+
2021
"github.com/ethereum/go-ethereum/common"
2122
"github.com/go-resty/resty/v2"
2223
"github.com/rs/zerolog/log"
@@ -1239,19 +1240,21 @@ func (c *ChainlinkClient) GetForwarders() (*Forwarders, *http.Response, error) {
12391240
return response, resp.RawResponse, err
12401241
}
12411242

1242-
func NewETHKey(password string) ([]byte, error) {
1243+
func NewETHKey(password string) ([]byte, common.Address, error) {
12431244
privateKey, err := ecdsa.GenerateKey(crypto.S256(), rand.Reader)
1245+
var address common.Address
12441246
if err != nil {
1245-
return nil, errors.Wrap(err, "failed to generate private key")
1247+
return nil, address, errors.Wrap(err, "failed to generate private key")
12461248
}
1249+
address = crypto.PubkeyToAddress(privateKey.PublicKey)
12471250
jsonKey, err := keystore.EncryptKey(&keystore.Key{
12481251
PrivateKey: privateKey,
1249-
Address: crypto.PubkeyToAddress(privateKey.PublicKey),
1252+
Address: address,
12501253
}, password, keystore.StandardScryptN, keystore.StandardScryptP)
12511254
if err != nil {
1252-
return nil, errors.Wrap(err, "failed to encrypt the keystore")
1255+
return nil, address, errors.Wrap(err, "failed to encrypt the keystore")
12531256
}
1254-
return jsonKey, nil
1257+
return jsonKey, address, nil
12551258
}
12561259

12571260
// ImportEVMKey imports EVM key to the node (encrypted go-ethereum JSON wallet format)

0 commit comments

Comments
 (0)