Merge pull request #12476 from smartcontractkit/release-2.9.1-vrf-202…

…40318-contract-changes Release 2.9.1 vrf 20240318 contract changes
smartcontractkit · Mar 18, 2024 · 09bb6fa · 09bb6fa
2 parents 63b5e02 + 990aa9a
commit 09bb6fa
Show file tree

Hide file tree

Showing 131 changed files with 11,696 additions and 5,161 deletions.
diff --git a/.changeset/gorgeous-crabs-repeat.md b/.changeset/gorgeous-crabs-repeat.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Soft delete consumer nonce in VRF coordinator v2.5
diff --git a/.changeset/nasty-humans-promise.md b/.changeset/nasty-humans-promise.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+add pending request counter for vrf v2.5 coordinator
diff --git a/.changeset/pretty-fishes-jam.md b/.changeset/pretty-fishes-jam.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+VRF V2+ Coordinator msg.data len validation
diff --git a/.changeset/sixty-turtles-rest.md b/.changeset/sixty-turtles-rest.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Add rebalancer support for feeds manager ocr2 plugins
diff --git a/.changeset/tasty-buckets-relate.md b/.changeset/tasty-buckets-relate.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Validation for premium limits added to VRFCoordinatorV2_5 contract
diff --git a/.changeset/wild-walls-suffer.md b/.changeset/wild-walls-suffer.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Validate if flat fee configs are configured correctly
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -450,11 +450,11 @@ jobs:
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf-evm-simulated
           - name: vrfv2
-            nodes: 3
+            nodes: 4
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2-evm-simulated
           - name: vrfv2plus
-            nodes: 3
+            nodes: 4
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2plus-evm-simulated
           - name: forwarder_ocr

diff --git a/.github/workflows/on-demand-vrfv2-performance-test.yml b/.github/workflows/on-demand-vrfv2-performance-test.yml
@@ -10,6 +10,7 @@ on:
         description: Performance Test Type of test to run
         type: choice
         options:
+          - "Smoke"
           - "Soak"
           - "Load"
           - "Stress"

diff --git a/.github/workflows/on-demand-vrfv2plus-performance-test.yml b/.github/workflows/on-demand-vrfv2plus-performance-test.yml
@@ -10,6 +10,7 @@ on:
         description: Performance Test Type of test to run
         type: choice
         options:
+          - "Smoke"
           - "Soak"
           - "Load"
           - "Stress"

diff --git a/common/client/mock_rpc_test.go b/common/client/mock_rpc_test.go
diff --git a/common/client/multi_node.go b/common/client/multi_node.go
@@ -453,6 +453,17 @@ func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OP
 	return n.RPC().CallContract(ctx, attempt, blockNumber)
 }
 
+func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD, RPC_CLIENT]) PendingCallContract(
+	ctx context.Context,
+	attempt interface{},
+) (rpcErr []byte, extractErr error) {
+	n, err := c.selectNode()
+	if err != nil {
+		return rpcErr, err
+	}
+	return n.RPC().PendingCallContract(ctx, attempt)
+}
+
 // ChainID makes a direct RPC call. In most cases it should be better to use the configured chain id instead by
 // calling ConfiguredChainID.
 func (c *multiNode[CHAIN_ID, SEQ, ADDR, BLOCK_HASH, TX, TX_HASH, EVENT, EVENT_OPS, TX_RECEIPT, FEE, HEAD, RPC_CLIENT]) ChainID(ctx context.Context) (id CHAIN_ID, err error) {

diff --git a/common/client/types.go b/common/client/types.go
@@ -124,6 +124,10 @@ type clientAPI[
 		msg interface{},
 		blockNumber *big.Int,
 	) (rpcErr []byte, extractErr error)
+	PendingCallContract(
+		ctx context.Context,
+		msg interface{},
+	) (rpcErr []byte, extractErr error)
 	CallContext(ctx context.Context, result interface{}, method string, args ...interface{}) error
 	CodeAt(ctx context.Context, account ADDR, blockNumber *big.Int) ([]byte, error)
 }

diff --git a/common/txmgr/types/tx.go b/common/txmgr/types/tx.go
@@ -146,6 +146,10 @@ type TxMeta[ADDR types.Hashable, TX_HASH types.Hashable] struct {
 	// Used for keepers
 	UpkeepID *string `json:"UpkeepID,omitempty"`
 
+	// Used for VRF to know if the txn is a ForceFulfilment txn
+	ForceFulfilled          *bool   `json:"ForceFulfilled,omitempty"`
+	ForceFulfillmentAttempt *uint64 `json:"ForceFulfillmentAttempt,omitempty"`
+
 	// Used only for forwarded txs, tracks the original destination address.
 	// When this is set, it indicates tx is forwarded through To address.
 	FwdrDestAddress *ADDR `json:"ForwarderDestAddress,omitempty"`

diff --git a/contracts/foundry.toml b/contracts/foundry.toml
@@ -28,6 +28,16 @@ src = 'src/v0.8/vrf'
 test = 'test/v0.8/foundry/vrf' # skips tests for no VRF foundry tests
 solc_version = '0.8.6'
 
+[profile.vrfv2plus_coordinator]
+optimizer_runs = 50
+src = 'src/v0.8/vrf'
+solc_version = '0.8.6'
+
+[profile.vrfv2plus]
+optimizer_runs = 1_000_000
+src = 'src/v0.8/vrf'
+solc_version = '0.8.6'
+
 [profile.automation]
 optimizer_runs = 10000
 src = 'src/v0.8/automation'