VRF-881: fixed toml config for VRF Load tests; VRF-882: add more cust…

core/scripts/common/vrf/jobs/jobs.go

@@ -87,21 +87,22 @@ coordinatorV2Address = "%s"
 waitBlocks = %d
 lookbackBlocks = %d
 blockhashStoreAddress = "%s"
-pollPeriod = "30s"
-runTimeout = "1m0s"
+pollPeriod = "%s"
+runTimeout = "%s"
 evmChainID = "%d"
 fromAddresses = ["%s"]
 `
 	BHSPlusJobFormatted = `type = "blockhashstore"
 schemaVersion = 1
 name = "blockhashstore"
 forwardingAllowed = false
+coordinatorV2Address = "%s"
 coordinatorV2PlusAddress = "%s"
 waitBlocks = %d
 lookbackBlocks = %d
 blockhashStoreAddress = "%s"
-pollPeriod = "30s"
-runTimeout = "1m0s"
+pollPeriod = "%s"
+runTimeout = "%s"
 evmChainID = "%d"
 fromAddresses = ["%s"]
 `

core/scripts/common/vrf/model/model.go

@@ -58,3 +58,11 @@ type CoordinatorJobSpecConfig struct {
 	RequestTimeout                string
 	RevertsPipelineEnabled        bool
 }
+
+type BHSJobSpecConfig struct {
+	RunTimeout     string
+	WaitBlocks     int
+	LookBackBlocks int
+	PollPeriod     string
+	RequestTimeout string
+}

core/scripts/common/vrf/setup-envs/README.md

@@ -44,6 +44,10 @@ go run . \
 --request-timeout="30m0s" \
 --reverts-pipeline-enabled="true" \
 --min-confs=3 \
+--bhs-job-wait-blocks=30 \
+--bhs-job-look-back-blocks=200 \
+--bhs-job-poll-period="1s" \
+--bhs-job-run-timeout="1m" \
 --register-vrf-key-against-address=<vrf key will be registered against this address 
 in order to call oracleWithdraw from this address> \
 --deploy-vrfv2-owner="true" \
@@ -79,7 +83,11 @@ go run . \
 --estimate-gas-multiplier=1.1 \
 --poll-period="5s" \
 --request-timeout="30m0s" \
---min-confs=3 
+--min-confs=3 \
+--bhs-job-wait-blocks=30 \
+--bhs-job-look-back-blocks=200 \
+--bhs-job-poll-period="1s" \
+--bhs-job-run-timeout="1m" 
 ```
 
 Optional parameters - will not be deployed if specified 

core/scripts/common/vrf/setup-envs/main.go

@@ -67,14 +67,18 @@ func main() {
 	bhfCredsFile := flag.String("bhf-creds-file", "", "Creds to authenticate to the node")
 
 	numEthKeys := flag.Int("num-eth-keys", 5, "Number of eth keys to create")
-	maxGasPriceGwei := flag.Int("max-gas-price-gwei", 1e12, "Max gas price gwei of the eth keys")
+	maxGasPriceGwei := flag.Int("max-gas-price-gwei", -1, "Max gas price gwei of the eth keys")
 	numVRFKeys := flag.Int("num-vrf-keys", 1, "Number of vrf keys to create")
 	batchFulfillmentEnabled := flag.Bool("batch-fulfillment-enabled", constants.BatchFulfillmentEnabled, "whether send randomness fulfillments in batches inside one tx from CL node")
 	batchFulfillmentGasMultiplier := flag.Float64("batch-fulfillment-gas-multiplier", 1.1, "")
 	estimateGasMultiplier := flag.Float64("estimate-gas-multiplier", 1.1, "")
 	pollPeriod := flag.String("poll-period", "300ms", "")
 	requestTimeout := flag.String("request-timeout", "30m0s", "")
 	revertsPipelineEnabled := flag.Bool("reverts-pipeline-enabled", true, "")
+	bhsJobWaitBlocks := flag.Int("bhs-job-wait-blocks", 30, "")
+	bhsJobLookBackBlocks := flag.Int("bhs-job-look-back-blocks", 200, "")
+	bhsJobPollPeriod := flag.String("bhs-job-poll-period", "3s", "")
+	bhsJobRunTimeout := flag.String("bhs-job-run-timeout", "1m", "")
 
 	vrfVersion := flag.String("vrf-version", "v2", "VRF version to use")
 	deployContractsAndCreateJobs := flag.Bool("deploy-contracts-and-create-jobs", false, "whether to deploy contracts and create jobs")
@@ -218,6 +222,12 @@ func main() {
 				RevertsPipelineEnabled:        *revertsPipelineEnabled,
 			}
 
+			bhsJobSpecConfig := model.BHSJobSpecConfig{
+				RunTimeout:     *bhsJobRunTimeout,
+				WaitBlocks:     *bhsJobWaitBlocks,
+				LookBackBlocks: *bhsJobLookBackBlocks,
+				PollPeriod:     *bhsJobPollPeriod,
+			}
 			jobSpecs = v2scripts.VRFV2DeployUniverse(
 				e,
 				subscriptionBalanceJuels,
@@ -227,6 +237,7 @@ func main() {
 				nodesMap,
 				*deployVRFOwner,
 				coordinatorJobSpecConfig,
+				bhsJobSpecConfig,
 				*useTestCoordinator,
 			)
 		case "v2plus":
@@ -250,6 +261,13 @@ func main() {
 				RequestTimeout:                *requestTimeout,
 			}
 
+			bhsJobSpecConfig := model.BHSJobSpecConfig{
+				RunTimeout:     *bhsJobRunTimeout,
+				WaitBlocks:     *bhsJobWaitBlocks,
+				LookBackBlocks: *bhsJobLookBackBlocks,
+				PollPeriod:     *bhsJobPollPeriod,
+			}
+
 			jobSpecs = v2plusscripts.VRFV2PlusDeployUniverse(
 				e,
 				subscriptionBalanceJuels,
@@ -260,6 +278,7 @@ func main() {
 				nodesMap,
 				uint64(*maxGasPriceGwei),
 				coordinatorJobSpecConfig,
+				bhsJobSpecConfig,
 			)
 		}
 

core/scripts/vrfv2/testnet/v2scripts/super_scripts.go

@@ -57,6 +57,10 @@ func DeployUniverseViaCLI(e helpers.Environment) {
 	pollPeriod := deployCmd.String("poll-period", "300ms", "")
 	requestTimeout := deployCmd.String("request-timeout", "30m0s", "")
 	revertsPipelineEnabled := deployCmd.Bool("reverts-pipeline-enabled", true, "")
+	bhsJobWaitBlocks := flag.Int("bhs-job-wait-blocks", 30, "")
+	bhsJobLookBackBlocks := flag.Int("bhs-job-look-back-blocks", 200, "")
+	bhsJobPollPeriod := flag.String("bhs-job-poll-period", "3s", "")
+	bhsJobRunTimeout := flag.String("bhs-job-run-timeout", "1m", "")
 
 	deployVRFOwner := deployCmd.Bool("deploy-vrf-owner", true, "whether to deploy VRF owner contracts")
 	useTestCoordinator := deployCmd.Bool("use-test-coordinator", true, "whether to use test coordinator")
@@ -152,6 +156,13 @@ func DeployUniverseViaCLI(e helpers.Environment) {
 		RevertsPipelineEnabled:        *revertsPipelineEnabled,
 	}
 
+	bhsJobSpecConfig := model.BHSJobSpecConfig{
+		RunTimeout:     *bhsJobRunTimeout,
+		WaitBlocks:     *bhsJobWaitBlocks,
+		LookBackBlocks: *bhsJobLookBackBlocks,
+		PollPeriod:     *bhsJobPollPeriod,
+	}
+
 	VRFV2DeployUniverse(
 		e,
 		subscriptionBalanceJuels,
@@ -161,6 +172,7 @@ func DeployUniverseViaCLI(e helpers.Environment) {
 		nodesMap,
 		*deployVRFOwner,
 		coordinatorJobSpecConfig,
+		bhsJobSpecConfig,
 		*useTestCoordinator,
 	)
 
@@ -180,6 +192,7 @@ func VRFV2DeployUniverse(
 	nodesMap map[string]model.Node,
 	deployVRFOwner bool,
 	coordinatorJobSpecConfig model.CoordinatorJobSpecConfig,
+	bhsJobSpecConfig model.BHSJobSpecConfig,
 	useTestCoordinator bool,
 ) model.JobSpecs {
 	var compressedPkHex string
@@ -397,10 +410,12 @@ func VRFV2DeployUniverse(
 	formattedBHSJobSpec := fmt.Sprintf(
 		jobs.BHSJobFormatted,
 		contractAddresses.CoordinatorAddress, //coordinatorAddress
-		30,                                   //waitBlocks
-		200,                                  //lookbackBlocks
+		bhsJobSpecConfig.WaitBlocks,          //waitBlocks
+		bhsJobSpecConfig.LookBackBlocks,      //lookbackBlocks
 		contractAddresses.BhsContractAddress, //bhs address
-		e.ChainID,                            //chain id
+		bhsJobSpecConfig.PollPeriod,
+		bhsJobSpecConfig.RunTimeout,
+		e.ChainID, //chain id
 		strings.Join(util.MapToAddressArr(nodesMap[model.BHSNodeName].SendingKeys), "\",\""), //sending addresses
 	)
 

core/scripts/vrfv2plus/testnet/main.go

@@ -870,7 +870,7 @@ func main() {
 		cbGasLimit := request.Uint("cb-gas-limit", 100_000, "request callback gas limit")
 		nativePaymentEnabled := request.Bool("native-payment-enabled", false, "native payment enabled")
 		numWords := request.Uint("num-words", 1, "num words to request")
-		requests := request.Uint("requests", 10, "number of randomness requests to make per run")
+		requests := request.Uint("requests", 1, "number of randomness requests to make per run")
 		runs := request.Uint("runs", 1, "number of runs to do. total randomness requests will be (requests * runs).")
 		helpers.ParseArgs(request, os.Args[2:], "consumer-address", "sub-id", "key-hash")
 		keyHashBytes := common.HexToHash(*keyHash)

core/scripts/vrfv2plus/testnet/v2plusscripts/super_scripts.go

@@ -486,6 +486,10 @@ func DeployUniverseViaCLI(e helpers.Environment) {
 	estimateGasMultiplier := deployCmd.Float64("estimate-gas-multiplier", 1.1, "")
 	pollPeriod := deployCmd.String("poll-period", "300ms", "")
 	requestTimeout := deployCmd.String("request-timeout", "30m0s", "")
+	bhsJobWaitBlocks := flag.Int("bhs-job-wait-blocks", 30, "")
+	bhsJobLookBackBlocks := flag.Int("bhs-job-look-back-blocks", 200, "")
+	bhsJobPollPeriod := flag.String("bhs-job-poll-period", "3s", "")
+	bhsJobRunTimeout := flag.String("bhs-job-run-timeout", "1m", "")
 
 	// optional flags
 	fallbackWeiPerUnitLinkString := deployCmd.String("fallback-wei-per-unit-link", "6e16", "fallback wei/link ratio")
@@ -562,6 +566,13 @@ func DeployUniverseViaCLI(e helpers.Environment) {
 		RequestTimeout:                *requestTimeout,
 	}
 
+	bhsJobSpecConfig := model.BHSJobSpecConfig{
+		RunTimeout:     *bhsJobRunTimeout,
+		WaitBlocks:     *bhsJobWaitBlocks,
+		LookBackBlocks: *bhsJobLookBackBlocks,
+		PollPeriod:     *bhsJobPollPeriod,
+	}
+
 	VRFV2PlusDeployUniverse(
 		e,
 		subscriptionBalanceJuels,
@@ -572,6 +583,7 @@ func DeployUniverseViaCLI(e helpers.Environment) {
 		nodesMap,
 		uint64(*gasLaneMaxGas),
 		coordinatorJobSpecConfig,
+		bhsJobSpecConfig,
 	)
 
 	vrfPrimaryNode := nodesMap[model.VRFPrimaryNodeName]
@@ -590,6 +602,7 @@ func VRFV2PlusDeployUniverse(e helpers.Environment,
 	nodesMap map[string]model.Node,
 	gasLaneMaxGas uint64,
 	coordinatorJobSpecConfig model.CoordinatorJobSpecConfig,
+	bhsJobSpecConfig model.BHSJobSpecConfig,
 ) model.JobSpecs {
 	var compressedPkHex string
 	var keyHash common.Hash
@@ -764,19 +777,25 @@ func VRFV2PlusDeployUniverse(e helpers.Environment,
 	formattedBHSJobSpec := fmt.Sprintf(
 		jobs.BHSPlusJobFormatted,
 		contractAddresses.CoordinatorAddress, //coordinatorAddress
-		30,                                   //waitBlocks
-		200,                                  //lookbackBlocks
+		contractAddresses.CoordinatorAddress, //coordinatorAddress
+		bhsJobSpecConfig.WaitBlocks,          //waitBlocks
+		bhsJobSpecConfig.LookBackBlocks,      //lookbackBlocks
 		contractAddresses.BhsContractAddress, //bhs address
+		bhsJobSpecConfig.PollPeriod,          //pollPeriod
+		bhsJobSpecConfig.RunTimeout,          //runTimeout
 		e.ChainID,                            //chain id
 		strings.Join(util.MapToAddressArr(nodesMap[model.BHSNodeName].SendingKeys), "\",\""), //sending addresses
 	)
 
 	formattedBHSBackupJobSpec := fmt.Sprintf(
 		jobs.BHSPlusJobFormatted,
 		contractAddresses.CoordinatorAddress, //coordinatorAddress
+		contractAddresses.CoordinatorAddress, //coordinatorAddress
 		100,                                  //waitBlocks
 		200,                                  //lookbackBlocks
 		contractAddresses.BhsContractAddress, //bhs adreess
+		bhsJobSpecConfig.PollPeriod,          //pollPeriod
+		bhsJobSpecConfig.RunTimeout,          //runTimeout
 		e.ChainID,                            //chain id
 		strings.Join(util.MapToAddressArr(nodesMap[model.BHSBackupNodeName].SendingKeys), "\",\""), //sending addresses
 	)
@@ -803,7 +822,7 @@ func VRFV2PlusDeployUniverse(e helpers.Environment,
 		"\nVRF Subscription LINK Balance:", *subscriptionBalanceJuels,
 		"\nVRF Subscription Native Balance:", *subscriptionBalanceNativeWei,
 		"\nPossible VRF Request command: ",
-		fmt.Sprintf("go run . eoa-load-test-request-with-metrics --consumer-address=%s --sub-id=%d --key-hash=%s --request-confirmations %d --requests 1 --runs 1 --cb-gas-limit 1_000_000", consumerAddress, subID, keyHash, coordinatorConfig.MinConfs),
+		fmt.Sprintf("go run . eoa-load-test-request-with-metrics --consumer-address=%s --sub-id=%d --key-hash=%s --request-confirmations %d --native-payment-enabled true --requests 1 --runs 1 --cb-gas-limit 1_000_000", consumerAddress, subID, keyHash, coordinatorConfig.MinConfs),
 		"\nRetrieve Request Status: ",
 		fmt.Sprintf("go run . eoa-load-test-read-metrics --consumer-address=%s", consumerAddress),
 		"\nA node can now be configured to run a VRF job with the below job spec :\n",

integration-tests/actions/vrf/common/actions.go

@@ -12,7 +12,7 @@ import (
 	"github.com/smartcontractkit/chainlink/integration-tests/actions"
 	"github.com/smartcontractkit/chainlink/integration-tests/client"
 	"github.com/smartcontractkit/chainlink/integration-tests/docker/test_env"
-	testconfig "github.com/smartcontractkit/chainlink/integration-tests/testconfig/vrfv2"
+	vrf_common_config "github.com/smartcontractkit/chainlink/integration-tests/testconfig/common/vrf"
 )
 
 func CreateFundAndGetSendingKeys(
@@ -65,7 +65,7 @@ func CreateAndFundSendingKeys(
 
 func SetupBHSNode(
 	env *test_env.CLClusterTestEnv,
-	config *testconfig.General,
+	config *vrf_common_config.General,
 	numberOfTxKeysToCreate int,
 	chainID *big.Int,
 	coordinatorAddress string,

integration-tests/actions/vrf/vrfv2/vrfv2_steps.go

@@ -260,7 +260,7 @@ func SetupVRFV2Environment(
 	l zerolog.Logger,
 ) (*vrfcommon.VRFContracts, []uint64, *vrfcommon.VRFKeyData, map[vrfcommon.VRFNodeType]*vrfcommon.VRFNode, error) {
 	l.Info().Msg("Starting VRFV2 environment setup")
-	vrfv2Config := vrfv2TestConfig.GetVRFv2Config().General
+	configGeneral := vrfv2TestConfig.GetVRFv2Config().General
 
 	vrfContracts, subIDs, err := SetupContracts(
 		env,
@@ -269,7 +269,7 @@ func SetupVRFV2Environment(
 		numberOfConsumers,
 		useVRFOwner,
 		useTestCoordinator,
-		vrfv2Config,
+		configGeneral,
 		numberOfSubToCreate,
 		l,
 	)
@@ -339,7 +339,7 @@ func SetupVRFV2Environment(
 	g := errgroup.Group{}
 	if vrfNode, exists := nodesMap[vrfcommon.VRF]; exists {
 		g.Go(func() error {
-			err := setupVRFNode(vrfContracts, chainID, vrfv2Config, pubKeyCompressed, vrfOwnerConfig, l, vrfNode)
+			err := setupVRFNode(vrfContracts, chainID, configGeneral, pubKeyCompressed, vrfOwnerConfig, l, vrfNode)
 			if err != nil {
 				return err
 			}
@@ -351,7 +351,7 @@ func SetupVRFV2Environment(
 		g.Go(func() error {
 			err := vrfcommon.SetupBHSNode(
 				env,
-				vrfv2TestConfig.GetVRFv2Config().General,
+				configGeneral.General,
 				numberOfTxKeysToCreate,
 				chainID,
 				vrfContracts.CoordinatorV2.Address(),
@@ -1006,7 +1006,7 @@ func LogRandomnessRequestedEvent(
 		Str("Request ID", randomWordsRequestedEvent.RequestId.String()).
 		Uint64("Subscription ID", randomWordsRequestedEvent.SubId).
 		Str("Sender Address", randomWordsRequestedEvent.Sender.String()).
-		Interface("Keyhash", randomWordsRequestedEvent.KeyHash).
+		Str("Keyhash", fmt.Sprintf("0x%x", randomWordsRequestedEvent.KeyHash)).
 		Uint32("Callback Gas Limit", randomWordsRequestedEvent.CallbackGasLimit).
 		Uint32("Number of Words", randomWordsRequestedEvent.NumWords).
 		Uint16("Minimum Request Confirmations", randomWordsRequestedEvent.MinimumRequestConfirmations).