Merge branch 'develop' into chore/remove-legacy-secrets-support

.github/workflows/automation-ondemand-tests.yml

@@ -140,8 +140,8 @@ jobs:
             command: -run ^TestAutomationReorg$ ./reorg
           - name: upgrade
             suite: smoke
-            nodes: 1
-            os: ubuntu-latest
+            nodes: 3
+            os: ubuntu20.04-8cores-32GB
             pyroscope_env: ci-automation-on-demand-upgrade
             network: SIMULATED
             command: -run ^TestAutomationNodeUpgrade$ ./smoke
@@ -160,10 +160,12 @@ jobs:
             echo "image=${{ env.CHAINLINK_IMAGE }}" >>$GITHUB_OUTPUT
             echo "version=${{ github.sha }}" >>$GITHUB_OUTPUT
             echo "upgrade_version=${{ github.sha }}" >>$GITHUB_OUTPUT
+            echo "upgrade_image=${{ env.CHAINLINK_IMAGE }}" >>$GITHUB_OUTPUT
           else
             echo "image=${{ inputs.chainlinkImage }}" >>$GITHUB_OUTPUT
             echo "version=${{ inputs.chainlinkVersion }}" >>$GITHUB_OUTPUT
             echo "upgrade_version=${{ inputs.chainlinkVersion }}" >>$GITHUB_OUTPUT
+            echo "upgrade_image=${{ inputs.chainlinkImage }}" >>$GITHUB_OUTPUT
           fi
           if [[ "${{ matrix.tests.name }}" == "upgrade" ]]; then
             echo "image=${{ inputs.chainlinkImageUpdate }}" >>$GITHUB_OUTPUT
@@ -177,10 +179,10 @@ jobs:
           PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
           SELECTED_NETWORKS: ${{ matrix.tests.network }}
           TEST_SUITE: ${{ matrix.tests.suite }}
-          TEST_UPGRADE_VERSION: ${{ steps.determine-build.outputs.upgrade_version }}
-          TEST_UPGRADE_IMAGE: ${{ env.CHAINLINK_IMAGE }}
+          UPGRADE_VERSION: ${{ steps.determine-build.outputs.upgrade_version }}
+          UPGRADE_IMAGE: ${{ steps.determine-build.outputs.upgrade_image }}
         with:
-          test_command_to_run: make test_need_operator_assets && cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=${{ matrix.tests.nodes }} ${{ matrix.tests.command }} 2>&1 | tee /tmp/gotest.log | gotestfmt
+          test_command_to_run: make test_need_operator_assets && cd ./integration-tests && go test -timeout 60m -count=1 -json -test.parallel=${{ matrix.tests.nodes }} ${{ matrix.tests.command }} 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
           cl_repo: ${{ steps.determine-build.outputs.image }}
           cl_image_tag: ${{ steps.determine-build.outputs.version }}

.github/workflows/solidity-foundry.yml

@@ -30,6 +30,7 @@ jobs:
 
   tests:
     strategy:
+      fail-fast: false
       matrix:
         product: [vrf, automation, llo-feeds, functions, shared]
     needs: [changes]
@@ -54,7 +55,7 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
         with:
           # Has to match the `make foundry` version.
-          version: nightly-ca67d15f4abd46394b324c50e21e66f306a1162d
+          version: nightly-e0722a10b45859892ec3b998df958a9edc77c202
 
       - name: Run Forge build
         run: |

contracts/.solhintignore

@@ -1,13 +1,12 @@
-# 368 warnings
+# 351 warnings
 #./src/v0.8/automation
-# 302 warnings
+# 60 warnings
 #./src/v0.8/dev
 # 91 warnings
 #./src/v0.8/functions
 # 91 warnings
 #./src/v0.8/l2ep/dev
-# 116 warnings
-#./src/v0.8/vrf
+
 
 # Temp ignore the following files as they contain issues.
 ./src/v0.8/ChainlinkClient.sol

contracts/CHANGELOG.md

@@ -2,7 +2,8 @@
 
 ## Unreleased
 
-...
+- Moved `VRFCoordinatorV2Mock.sol` to src/v0.8/vrf/mocks
+- Moved `VRFCoordinatorMock.sol` to src/v0.8/vrf/mocks
 
 ## 0.8.0 - 2023-10-04
 

contracts/GNUmakefile

@@ -38,7 +38,7 @@ mockery: $(mockery) ## Install mockery.
 
 .PHONY: foundry
 foundry: ## Install foundry.
-	foundryup --version nightly-ca67d15f4abd46394b324c50e21e66f306a1162d
+	foundryup --version nightly-e0722a10b45859892ec3b998df958a9edc77c202
 
 .PHONY: foundry-refresh
 foundry-refresh: foundry

contracts/gas-snapshots/functions.gas-snapshot

@@ -95,9 +95,9 @@ FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfNotAll
 FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfNotSubscriptionOwner() (gas: 89316)
 FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfPaused() (gas: 20191)
 FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_RevertIfPendingRequests() (gas: 193222)
-FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessForfeitAllBalanceAsDeposit() (gas: 113352)
-FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessForfeitSomeBalanceAsDeposit() (gas: 124604)
-FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessRecieveDeposit() (gas: 310090)
+FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessForfeitAllBalanceAsDeposit() (gas: 114636)
+FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessForfeitSomeBalanceAsDeposit() (gas: 125891)
+FunctionsSubscriptions_CancelSubscription:test_CancelSubscription_SuccessRecieveDeposit() (gas: 311988)
 FunctionsSubscriptions_Constructor:test_Constructor_Success() (gas: 7654)
 FunctionsSubscriptions_CreateSubscriptionWithConsumer:test_CreateSubscriptionWithConsumer_RevertIfNotAllowedSender() (gas: 28637)
 FunctionsSubscriptions_CreateSubscriptionWithConsumer:test_CreateSubscriptionWithConsumer_RevertIfPaused() (gas: 17948)
@@ -106,8 +106,8 @@ FunctionsSubscriptions_GetConsumer:test_GetConsumer_Success() (gas: 16225)
 FunctionsSubscriptions_GetFlags:test_GetFlags_Success() (gas: 40858)
 FunctionsSubscriptions_GetSubscription:test_GetSubscription_Success() (gas: 30959)
 FunctionsSubscriptions_GetSubscriptionCount:test_GetSubscriptionCount_Success() (gas: 12967)
-FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_RevertIfEndIsAfterLastSubscription() (gas: 14949)
-FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_RevertIfStartIsAfterEnd() (gas: 11863)
+FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_RevertIfEndIsAfterLastSubscription() (gas: 16523)
+FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_RevertIfStartIsAfterEnd() (gas: 13436)
 FunctionsSubscriptions_GetSubscriptionsInRange:test_GetSubscriptionsInRange_Success() (gas: 59568)
 FunctionsSubscriptions_GetTotalBalance:test_GetTotalBalance_Success() (gas: 15032)
 FunctionsSubscriptions_OnTokenTransfer:test_OnTokenTransfer_RevertIfCallerIsNoCalldata() (gas: 27594)
@@ -124,7 +124,7 @@ FunctionsSubscriptions_OracleWithdraw:test_OracleWithdraw_SuccessSetsBalanceToZe
 FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_RevertIfNoSubscription() (gas: 12818)
 FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_RevertIfNotOwner() (gas: 15549)
 FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_Success() (gas: 54867)
-FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_SuccessDeletesSubscription() (gas: 48362)
+FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_SuccessDeletesSubscription() (gas: 49624)
 FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_SuccessSubOwnerRefunded() (gas: 50896)
 FunctionsSubscriptions_OwnerCancelSubscription:test_OwnerCancelSubscription_SuccessWhenRequestInFlight() (gas: 163867)
 FunctionsSubscriptions_OwnerWithdraw:test_OwnerWithdraw_RevertIfAmountMoreThanBalance() (gas: 17924)

contracts/gas-snapshots/llo-feeds.gas-snapshot

@@ -20,7 +20,7 @@ FeeManagerProcessFeeTest:test_discountIsNoLongerAppliedAfterRemoving() (gas: 459
 FeeManagerProcessFeeTest:test_discountIsNotAppliedForInvalidTokenAddress() (gas: 17546)
 FeeManagerProcessFeeTest:test_discountIsNotAppliedToOtherFeeds() (gas: 54241)
 FeeManagerProcessFeeTest:test_discountIsReturnedForLink() (gas: 49252)
-FeeManagerProcessFeeTest:test_emptyQuoteRevertsWithError() (gas: 11286)
+FeeManagerProcessFeeTest:test_emptyQuoteRevertsWithError() (gas: 12152)
 FeeManagerProcessFeeTest:test_eventIsEmittedAfterSurchargeIsSet() (gas: 41348)
 FeeManagerProcessFeeTest:test_eventIsEmittedIfNotEnoughLink() (gas: 172711)
 FeeManagerProcessFeeTest:test_eventIsEmittedUponWithdraw() (gas: 68984)
@@ -87,7 +87,7 @@ FeeManagerProcessFeeTest:test_surchargeIsAppliedForNativeFeeWithDiscount() (gas:
 FeeManagerProcessFeeTest:test_surchargeIsNoLongerAppliedAfterRemoving() (gas: 46503)
 FeeManagerProcessFeeTest:test_surchargeIsNotAppliedForLinkFee() (gas: 49585)
 FeeManagerProcessFeeTest:test_surchargeIsNotAppliedWith100PercentDiscount() (gas: 77890)
-FeeManagerProcessFeeTest:test_testRevertIfReportHasExpired() (gas: 14042)
+FeeManagerProcessFeeTest:test_testRevertIfReportHasExpired() (gas: 14908)
 RewardManagerClaimTest:test_claimAllRecipients() (gas: 275763)
 RewardManagerClaimTest:test_claimMultipleRecipients() (gas: 153306)
 RewardManagerClaimTest:test_claimRewardsWithDuplicatePoolIdsDoesNotPayoutTwice() (gas: 328345)
@@ -123,7 +123,7 @@ RewardManagerRecipientClaimMultiplePoolsTest:test_claimSingleUniqueRecipient() (
 RewardManagerRecipientClaimMultiplePoolsTest:test_claimUnevenAmountRoundsDown() (gas: 576289)
 RewardManagerRecipientClaimMultiplePoolsTest:test_claimUnregisteredRecipient() (gas: 63555)
 RewardManagerRecipientClaimMultiplePoolsTest:test_getAvailableRewardsCursorAndTotalPoolsEqual() (gas: 10202)
-RewardManagerRecipientClaimMultiplePoolsTest:test_getAvailableRewardsCursorCannotBeGreaterThanTotalPools() (gas: 11107)
+RewardManagerRecipientClaimMultiplePoolsTest:test_getAvailableRewardsCursorCannotBeGreaterThanTotalPools() (gas: 12680)
 RewardManagerRecipientClaimMultiplePoolsTest:test_getAvailableRewardsCursorSingleResult() (gas: 19606)
 RewardManagerRecipientClaimMultiplePoolsTest:test_getRewardsAvailableToRecipientInBothPools() (gas: 29052)
 RewardManagerRecipientClaimMultiplePoolsTest:test_getRewardsAvailableToRecipientInBothPoolsWhereAlreadyClaimed() (gas: 147218)
@@ -181,11 +181,11 @@ VerifierBulkVerifyBillingReport:test_verifyWithBulkNativeUnwrappedReturnsChange(
 VerifierConstructorTest:test_revertsIfInitializedWithEmptyVerifierProxy() (gas: 59967)
 VerifierConstructorTest:test_setsTheCorrectProperties() (gas: 1815769)
 VerifierDeactivateFeedWithVerifyTest:test_currentReportAllowsVerification() (gas: 192062)
-VerifierDeactivateFeedWithVerifyTest:test_currentReportFailsVerification() (gas: 111727)
+VerifierDeactivateFeedWithVerifyTest:test_currentReportFailsVerification() (gas: 113377)
 VerifierDeactivateFeedWithVerifyTest:test_previousReportAllowsVerification() (gas: 99613)
-VerifierDeactivateFeedWithVerifyTest:test_previousReportFailsVerification() (gas: 68305)
+VerifierDeactivateFeedWithVerifyTest:test_previousReportFailsVerification() (gas: 69932)
 VerifierProxyAccessControlledVerificationTest:test_proxiesToTheVerifierIfHasAccess() (gas: 205796)
-VerifierProxyAccessControlledVerificationTest:test_revertsIfNoAccess() (gas: 110688)
+VerifierProxyAccessControlledVerificationTest:test_revertsIfNoAccess() (gas: 112334)
 VerifierProxyConstructorTest:test_correctlySetsTheCorrectAccessControllerInterface() (gas: 1482522)
 VerifierProxyConstructorTest:test_correctlySetsTheOwner() (gas: 1462646)
 VerifierProxyConstructorTest:test_correctlySetsVersion() (gas: 6873)
@@ -207,7 +207,7 @@ VerifierProxyUnsetVerifierTest:test_revertsIfNotAdmin() (gas: 14965)
 VerifierProxyUnsetVerifierWithPreviouslySetVerifierTest:test_correctlyUnsetsVerifier() (gas: 12720)
 VerifierProxyUnsetVerifierWithPreviouslySetVerifierTest:test_emitsAnEventAfterUnsettingVerifier() (gas: 17965)
 VerifierProxyVerifyTest:test_proxiesToTheCorrectVerifier() (gas: 201609)
-VerifierProxyVerifyTest:test_revertsIfNoVerifierConfigured() (gas: 115615)
+VerifierProxyVerifyTest:test_revertsIfNoVerifierConfigured() (gas: 117256)
 VerifierSetConfigFromSourceMultipleDigestsTest:test_correctlySetsConfigWhenDigestsAreRemoved() (gas: 538896)
 VerifierSetConfigFromSourceMultipleDigestsTest:test_correctlyUpdatesDigestsOnMultipleVerifiersInTheProxy() (gas: 964726)
 VerifierSetConfigFromSourceMultipleDigestsTest:test_correctlyUpdatesTheDigestInTheProxy() (gas: 520480)
@@ -230,17 +230,17 @@ VerifierTestBillingReport:test_verifyWithNativeUnwrapped() (gas: 317892)
 VerifierTestBillingReport:test_verifyWithNativeUnwrappedReturnsChange() (gas: 324958)
 VerifierVerifyMultipleConfigDigestTest:test_canVerifyNewerReportsWithNewerConfigs() (gas: 131228)
 VerifierVerifyMultipleConfigDigestTest:test_canVerifyOlderReportsWithOlderConfigs() (gas: 187132)
-VerifierVerifyMultipleConfigDigestTest:test_revertsIfAReportIsVerifiedWithAnExistingButIncorrectDigest() (gas: 86566)
-VerifierVerifyMultipleConfigDigestTest:test_revertsIfVerifyingWithAnUnsetDigest() (gas: 126411)
+VerifierVerifyMultipleConfigDigestTest:test_revertsIfAReportIsVerifiedWithAnExistingButIncorrectDigest() (gas: 88205)
+VerifierVerifyMultipleConfigDigestTest:test_revertsIfVerifyingWithAnUnsetDigest() (gas: 128062)
 VerifierVerifySingleConfigDigestTest:test_emitsAnEventIfReportVerified() (gas: 186945)
 VerifierVerifySingleConfigDigestTest:test_returnsThePriceAndBlockNumIfReportVerified() (gas: 187114)
-VerifierVerifySingleConfigDigestTest:test_revertsIfConfigDigestNotSet() (gas: 114479)
-VerifierVerifySingleConfigDigestTest:test_revertsIfDuplicateSignersHaveSigned() (gas: 180665)
-VerifierVerifySingleConfigDigestTest:test_revertsIfMismatchedSignatureLength() (gas: 51479)
-VerifierVerifySingleConfigDigestTest:test_revertsIfReportHasUnconfiguredFeedID() (gas: 102318)
-VerifierVerifySingleConfigDigestTest:test_revertsIfVerifiedByNonProxy() (gas: 99348)
-VerifierVerifySingleConfigDigestTest:test_revertsIfVerifiedWithIncorrectAddresses() (gas: 182416)
-VerifierVerifySingleConfigDigestTest:test_revertsIfWrongNumberOfSigners() (gas: 108382)
+VerifierVerifySingleConfigDigestTest:test_revertsIfConfigDigestNotSet() (gas: 116130)
+VerifierVerifySingleConfigDigestTest:test_revertsIfDuplicateSignersHaveSigned() (gas: 182315)
+VerifierVerifySingleConfigDigestTest:test_revertsIfMismatchedSignatureLength() (gas: 53037)
+VerifierVerifySingleConfigDigestTest:test_revertsIfReportHasUnconfiguredFeedID() (gas: 103976)
+VerifierVerifySingleConfigDigestTest:test_revertsIfVerifiedByNonProxy() (gas: 100992)
+VerifierVerifySingleConfigDigestTest:test_revertsIfVerifiedWithIncorrectAddresses() (gas: 184066)
+VerifierVerifySingleConfigDigestTest:test_revertsIfWrongNumberOfSigners() (gas: 110031)
 VerifierVerifySingleConfigDigestTest:test_setsTheCorrectEpoch() (gas: 194270)
 Verifier_accessControlledVerify:testVerifyWithAccessControl_gas() (gas: 212066)
 Verifier_bulkVerifyWithFee:testBulkVerifyProxyWithLinkFeeSuccess_gas() (gas: 519368)

contracts/scripts/native_solc_compile_all_automation

@@ -39,9 +39,6 @@ compileContract automation/UpkeepTranscoder.sol
 compileContract automation/mocks/MockAggregatorProxy.sol
 compileContract automation/testhelpers/LogUpkeepCounter.sol
 
-# Keepers x VRF v2
-compileContract KeepersVRFConsumer.sol
-
 compileContract automation/mocks/KeeperRegistrar1_2Mock.sol
 compileContract automation/mocks/KeeperRegistryCheckUpkeepGasUsageWrapper1_2Mock.sol
 

contracts/scripts/native_solc_compile_all_vrf

@@ -36,7 +36,7 @@ compileContract vrf/VRFRequestIDBase.sol
 compileContract vrf/VRFConsumerBase.sol
 compileContract vrf/testhelpers/VRFConsumer.sol
 compileContract vrf/testhelpers/VRFRequestIDBaseTestHelper.sol
-compileContract mocks/VRFCoordinatorMock.sol
+compileContract vrf/mocks/VRFCoordinatorMock.sol
 
 # VRF V2
 compileContract vrf/VRFConsumerBaseV2.sol
@@ -52,34 +52,35 @@ compileContract vrf/BatchBlockhashStore.sol
 compileContract vrf/BatchVRFCoordinatorV2.sol
 compileContract vrf/testhelpers/VRFCoordinatorV2TestHelper.sol
 compileContractAltOpts vrf/VRFCoordinatorV2.sol 10000
-compileContract mocks/VRFCoordinatorV2Mock.sol
+compileContract vrf/mocks/VRFCoordinatorV2Mock.sol
 compileContract vrf/VRFOwner.sol
-compileContract dev/VRFSubscriptionBalanceMonitor.sol
+compileContract vrf/dev/VRFSubscriptionBalanceMonitor.sol
+compileContract vrf/KeepersVRFConsumer.sol
 
 # VRF V2Plus
-compileContract dev/interfaces/IVRFCoordinatorV2PlusInternal.sol
-compileContract dev/vrf/testhelpers/VRFV2PlusConsumerExample.sol
-compileContractAltOpts dev/vrf/VRFCoordinatorV2_5.sol 50
-compileContract dev/vrf/BatchVRFCoordinatorV2Plus.sol
-compileContract dev/vrf/VRFV2PlusWrapper.sol
-compileContract dev/vrf/testhelpers/VRFConsumerV2PlusUpgradeableExample.sol
-compileContract dev/vrf/testhelpers/VRFMaliciousConsumerV2Plus.sol
-compileContract dev/vrf/testhelpers/VRFV2PlusExternalSubOwnerExample.sol
-compileContract dev/vrf/testhelpers/VRFV2PlusSingleConsumerExample.sol
-compileContract dev/vrf/testhelpers/VRFV2PlusWrapperConsumerExample.sol
-compileContract dev/vrf/testhelpers/VRFV2PlusRevertingExample.sol
-compileContract dev/vrf/testhelpers/VRFConsumerV2PlusUpgradeableExample.sol
-compileContract dev/vrf/testhelpers/VRFV2PlusMaliciousMigrator.sol
-compileContract dev/vrf/libraries/VRFV2PlusClient.sol
-compileContract dev/vrf/testhelpers/VRFCoordinatorV2Plus_V2Example.sol
-compileContract dev/vrf/TrustedBlockhashStore.sol
-compileContract dev/vrf/testhelpers/VRFV2PlusLoadTestWithMetrics.sol
-compileContractAltOpts dev/vrf/testhelpers/VRFCoordinatorV2PlusUpgradedVersion.sol 5
-compileContract dev/vrf/testhelpers/VRFV2PlusWrapperLoadTestConsumer.sol
+compileContract vrf/dev/interfaces/IVRFCoordinatorV2PlusInternal.sol
+compileContract vrf/dev/testhelpers/VRFV2PlusConsumerExample.sol
+compileContractAltOpts vrf/dev/VRFCoordinatorV2_5.sol 50
+compileContract vrf/dev/BatchVRFCoordinatorV2Plus.sol
+compileContract vrf/dev/VRFV2PlusWrapper.sol
+compileContract vrf/dev/testhelpers/VRFConsumerV2PlusUpgradeableExample.sol
+compileContract vrf/dev/testhelpers/VRFMaliciousConsumerV2Plus.sol
+compileContract vrf/dev/testhelpers/VRFV2PlusExternalSubOwnerExample.sol
+compileContract vrf/dev/testhelpers/VRFV2PlusSingleConsumerExample.sol
+compileContract vrf/dev/testhelpers/VRFV2PlusWrapperConsumerExample.sol
+compileContract vrf/dev/testhelpers/VRFV2PlusRevertingExample.sol
+compileContract vrf/dev/testhelpers/VRFConsumerV2PlusUpgradeableExample.sol
+compileContract vrf/dev/testhelpers/VRFV2PlusMaliciousMigrator.sol
+compileContract vrf/dev/libraries/VRFV2PlusClient.sol
+compileContract vrf/dev/testhelpers/VRFCoordinatorV2Plus_V2Example.sol
+compileContract vrf/dev/TrustedBlockhashStore.sol
+compileContract vrf/dev/testhelpers/VRFV2PlusLoadTestWithMetrics.sol
+compileContractAltOpts vrf/dev/testhelpers/VRFCoordinatorV2PlusUpgradedVersion.sol 5
+compileContract vrf/dev/testhelpers/VRFV2PlusWrapperLoadTestConsumer.sol
 
 # VRF V2 Wrapper
 compileContract vrf/VRFV2Wrapper.sol
-compileContract interfaces/VRFV2WrapperInterface.sol
+compileContract vrf/interfaces/VRFV2WrapperInterface.sol
 compileContract vrf/VRFV2WrapperConsumerBase.sol
 compileContract vrf/testhelpers/VRFV2WrapperConsumerExample.sol
 
@@ -91,3 +92,8 @@ compileContract vrf/testhelpers/VRFLoadTestOwnerlessConsumer.sol
 compileContract vrf/testhelpers/VRFLoadTestExternalSubOwner.sol
 compileContract vrf/testhelpers/VRFV2LoadTestWithMetrics.sol
 compileContract vrf/testhelpers/VRFV2OwnerTestConsumer.sol
+
+# Helper contracts
+compileContract vrf/interfaces/IAuthorizedReceiver.sol
+compileContract vrf/interfaces/VRFCoordinatorV2Interface.sol
+compileContract vrf/interfaces/VRFV2WrapperInterface.sol