Support multiple keys with AvailableSethKeyNum

smartcontractkit · May 15, 2024 · ef712a0 · ef712a0
1 parent d7ada9b
commit ef712a0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/integration-tests/docker/test_env/test_env_builder.go b/integration-tests/docker/test_env/test_env_builder.go
@@ -420,7 +420,7 @@ func (b *CLTestEnvBuilder) Build() (*CLClusterTestEnv, error) {
 			}
 
 			if b.hasSeth {
-				seth, err := actions_seth.GetChainClientWithConfigFunction(b.testConfig, networkConfig, actions_seth.OneEphemeralKeysLiveTestnetAutoFixFn)
+				seth, err := actions_seth.GetChainClient(b.testConfig, networkConfig)
 				if err != nil {
 					return nil, err
 				}

diff --git a/integration-tests/load/vrfv2/gun.go b/integration-tests/load/vrfv2/gun.go
@@ -10,10 +10,9 @@ import (
 	vrfcommon "github.com/smartcontractkit/chainlink/integration-tests/actions/vrf/common"
 	"github.com/smartcontractkit/chainlink/integration-tests/actions/vrf/vrfv2"
 	vrfv2_config "github.com/smartcontractkit/chainlink/integration-tests/testconfig/vrfv2"
+	"github.com/smartcontractkit/chainlink/integration-tests/utils"
 )
 
-const RootKeyNum = 0
-
 type BHSTestGun struct {
 	contracts  *vrfcommon.VRFContracts
 	subIDs     []uint64
@@ -54,7 +53,7 @@ func (m *BHSTestGun) Call(_ *wasp.Generator) *wasp.Response {
 		*m.testConfig.General.NumberOfWords,
 		*m.testConfig.General.RandomnessRequestCountPerRequest,
 		*m.testConfig.General.RandomnessRequestCountPerRequestDeviation,
-		RootKeyNum,
+		utils.AvailableSethKeyNum(m.sethClient),
 	)
 	//todo - might need to store randRequestBlockNumber and blockhash to verify that it was stored in BHS contract at the end of the test
 	if err != nil {
@@ -111,7 +110,7 @@ func (m *SingleHashGun) Call(_ *wasp.Generator) *wasp.Response {
 		randomnessRequestCountPerRequest,
 		*vrfv2Config.RandomnessRequestCountPerRequestDeviation,
 		vrfv2Config.RandomWordsFulfilledEventTimeout.Duration,
-		RootKeyNum,
+		utils.AvailableSethKeyNum(m.sethClient),
 	)
 	if err != nil {
 		return &wasp.Response{Error: err.Error(), Failed: true}

diff --git a/integration-tests/load/vrfv2plus/gun.go b/integration-tests/load/vrfv2plus/gun.go
@@ -12,10 +12,9 @@ import (
 	vrfcommon "github.com/smartcontractkit/chainlink/integration-tests/actions/vrf/common"
 	"github.com/smartcontractkit/chainlink/integration-tests/actions/vrf/vrfv2plus"
 	vrfv2plus_config "github.com/smartcontractkit/chainlink/integration-tests/testconfig/vrfv2plus"
+	"github.com/smartcontractkit/chainlink/integration-tests/utils"
 )
 
-const RootKeyNum = 0
-
 type BHSTestGun struct {
 	contracts  *vrfcommon.VRFContracts
 	keyHash    [32]byte
@@ -60,7 +59,7 @@ func (m *BHSTestGun) Call(_ *wasp.Generator) *wasp.Response {
 		billingType,
 		vrfv2PlusConfig,
 		m.logger,
-		RootKeyNum,
+		utils.AvailableSethKeyNum(m.sethClient),
 	)
 	//todo - might need to store randRequestBlockNumber and blockhash to verify that it was stored in BHS contract at the end of the test
 	if err != nil {
@@ -119,7 +118,7 @@ func (m *SingleHashGun) Call(_ *wasp.Generator) *wasp.Response {
 		billingType,
 		vrfv2PlusConfig,
 		m.logger,
-		RootKeyNum,
+		utils.AvailableSethKeyNum(m.sethClient),
 	)
 	if err != nil {
 		return &wasp.Response{Error: err.Error(), Failed: true}

diff --git a/integration-tests/utils/seth.go b/integration-tests/utils/seth.go
@@ -132,3 +132,15 @@ func ValidateSethNetworkConfig(cfg *seth.Network) error {
 
 	return nil
 }
+
+const RootKeyNum = 0
+
+// AvailableSethKeyNum returns the available Seth address index
+// If there are multiple addresses, it will return any synced key
+// Otherwise it will return the root key
+func AvailableSethKeyNum(client *seth.Client) int {
+	if len(client.Addresses) > 1 {
+		return client.AnySyncedKey()
+	}
+	return RootKeyNum
+}