Merge branch 'main' into bump-go-1-24

Author: skudasov

framework/clclient/client.go

@@ -5,18 +5,19 @@ import (
 	"crypto/rand"
 	"crypto/tls"
 	"fmt"
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/pkg/errors"
-	"github.com/smartcontractkit/chainlink-testing-framework/framework"
-	"github.com/smartcontractkit/chainlink-testing-framework/framework/components/clnode"
 	"math/big"
 	"net/http"
 	"os"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/ethereum/go-ethereum/accounts/keystore"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/pkg/errors"
+	"github.com/smartcontractkit/chainlink-testing-framework/framework"
+	"github.com/smartcontractkit/chainlink-testing-framework/framework/components/clnode"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/go-resty/resty/v2"
 	"github.com/rs/zerolog/log"
@@ -1239,19 +1240,21 @@ func (c *ChainlinkClient) GetForwarders() (*Forwarders, *http.Response, error) {
 	return response, resp.RawResponse, err
 }
 
-func NewETHKey(password string) ([]byte, error) {
+func NewETHKey(password string) ([]byte, common.Address, error) {
 	privateKey, err := ecdsa.GenerateKey(crypto.S256(), rand.Reader)
+	var address common.Address
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to generate private key")
+		return nil, address, errors.Wrap(err, "failed to generate private key")
 	}
+	address = crypto.PubkeyToAddress(privateKey.PublicKey)
 	jsonKey, err := keystore.EncryptKey(&keystore.Key{
 		PrivateKey: privateKey,
-		Address:    crypto.PubkeyToAddress(privateKey.PublicKey),
+		Address:    address,
 	}, password, keystore.StandardScryptN, keystore.StandardScryptP)
 	if err != nil {
-		return nil, errors.Wrap(err, "failed to encrypt the keystore")
+		return nil, address, errors.Wrap(err, "failed to encrypt the keystore")
 	}
-	return jsonKey, nil
+	return jsonKey, address, nil
 }
 
 // ImportEVMKey imports EVM key to the node (encrypted go-ethereum JSON wallet format)

framework/examples/myproject/smoke_import_keys_test.go

@@ -35,7 +35,7 @@ func generateP2PKeys(pwd string, n int) ([][]byte, error) {
 func generateEVMKeys(pwd string, n int) ([][]byte, error) {
 	encryptedEVMKeyJSONs := make([][]byte, 0)
 	for i := 0; i < n; i++ {
-		key, err := clclient.NewETHKey(pwd)
+		key, _, err := clclient.NewETHKey(pwd)
 		if err != nil {
 			return nil, err
 		}