From c15e9e59c2035407d61095bca56838baac7bec35 Mon Sep 17 00:00:00 2001 From: Ilja Pavlovs Date: Thu, 23 May 2024 19:37:33 +0300 Subject: [PATCH] VRF-1106: Add "vrf_job_simulation_block" to default.toml (#13296) --- integration-tests/smoke/vrfv2plus_test.go | 2 ++ integration-tests/testconfig/vrfv2/vrfv2.toml | 1 + .../testconfig/vrfv2plus/vrfv2plus.toml | 35 +++++++++++-------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/integration-tests/smoke/vrfv2plus_test.go b/integration-tests/smoke/vrfv2plus_test.go index 473510d2d0c..d1593373204 100644 --- a/integration-tests/smoke/vrfv2plus_test.go +++ b/integration-tests/smoke/vrfv2plus_test.go @@ -970,6 +970,7 @@ func TestVRFv2PlusMigration(t *testing.T) { BatchFulfillmentGasMultiplier: *configCopy.VRFv2Plus.General.VRFJobBatchFulfillmentGasMultiplier, PollPeriod: configCopy.VRFv2Plus.General.VRFJobPollPeriod.Duration, RequestTimeout: configCopy.VRFv2Plus.General.VRFJobRequestTimeout.Duration, + SimulationBlock: configCopy.VRFv2Plus.General.VRFJobSimulationBlock, } _, err = vrfv2plus.CreateVRFV2PlusJob( @@ -1141,6 +1142,7 @@ func TestVRFv2PlusMigration(t *testing.T) { BatchFulfillmentGasMultiplier: *configCopy.VRFv2Plus.General.VRFJobBatchFulfillmentGasMultiplier, PollPeriod: configCopy.VRFv2Plus.General.VRFJobPollPeriod.Duration, RequestTimeout: configCopy.VRFv2Plus.General.VRFJobRequestTimeout.Duration, + SimulationBlock: configCopy.VRFv2Plus.General.VRFJobSimulationBlock, } _, err = vrfv2plus.CreateVRFV2PlusJob( diff --git a/integration-tests/testconfig/vrfv2/vrfv2.toml b/integration-tests/testconfig/vrfv2/vrfv2.toml index 3b447a082bf..4ff48a3181a 100644 --- a/integration-tests/testconfig/vrfv2/vrfv2.toml +++ b/integration-tests/testconfig/vrfv2/vrfv2.toml @@ -57,6 +57,7 @@ subscription_refunding_amount_link = 5.0 cl_node_max_gas_price_gwei = 10 link_native_feed_response = 1000000000000000000 +#todo - need to have separate minimum_confirmations config for Coordinator, CL Node and Consumer request minimum_confirmations = 3 number_of_words = 3 diff --git a/integration-tests/testconfig/vrfv2plus/vrfv2plus.toml b/integration-tests/testconfig/vrfv2plus/vrfv2plus.toml index 859945bad9a..717a62e997f 100644 --- a/integration-tests/testconfig/vrfv2plus/vrfv2plus.toml +++ b/integration-tests/testconfig/vrfv2plus/vrfv2plus.toml @@ -63,35 +63,40 @@ chainlink_node_funding = 0.5 [VRFv2Plus.General] cancel_subs_after_test_run = true use_existing_env = false -subscription_funding_amount_link = 5.0 -subscription_funding_amount_native=1 - -subscription_refunding_amount_link = 5.0 -subscription_refunding_amount_native = 1 - -cl_node_max_gas_price_gwei = 10 -link_native_feed_response = 1000000000000000000 +#todo - need to have separate minimum_confirmations config for Coordinator, CL Node and Consumer request minimum_confirmations = 3 +# Can be "LINK", "NATIVE" or "LINK_AND_NATIVE" subscription_billing_type = "LINK_AND_NATIVE" +#CL Node config +cl_node_max_gas_price_gwei = 10 +number_of_sending_keys_to_create = 0 + +# Randomness Request Config +number_of_sub_to_create = 1 number_of_words = 3 callback_gas_limit = 1000000 -max_gas_limit_coordinator_config = 2500000 -fallback_wei_per_unit_link = "60000000000000000" -staleness_seconds = 86400 -gas_after_payment_calculation = 33825 -number_of_sub_to_create = 1 -number_of_sending_keys_to_create = 0 +subscription_funding_amount_link = 5.0 +subscription_funding_amount_native=1 +subscription_refunding_amount_link = 5.0 +subscription_refunding_amount_native = 1 randomness_request_count_per_request = 1 randomness_request_count_per_request_deviation = 0 random_words_fulfilled_event_timeout = "2m" wait_for_256_blocks_timeout = "280s" +# Coordinator config +link_native_feed_response = 1000000000000000000 +max_gas_limit_coordinator_config = 2500000 +fallback_wei_per_unit_link = "60000000000000000" +staleness_seconds = 86400 +gas_after_payment_calculation = 33825 fulfillment_flat_fee_native_ppm=0 fulfillment_flat_fee_link_discount_ppm=0 native_premium_percentage=24 link_premium_percentage=20 +# Wrapper config wrapped_gas_overhead = 50000 coordinator_gas_overhead_native = 52000 coordinator_gas_overhead_link = 74000 @@ -109,6 +114,8 @@ vrf_job_batch_fulfillment_enabled = true vrf_job_batch_fulfillment_gas_multiplier = 1.15 vrf_job_poll_period = "1s" vrf_job_request_timeout = "24h" +# should be "latest" if minimum_confirmations>0, "pending" if minimum_confirmations=0 +vrf_job_simulation_block="latest" # BHS Job config bhs_job_wait_blocks = 30