From 4d1ebbf603e7cdd0ef11f53cfb187d5464535382 Mon Sep 17 00:00:00 2001 From: Karim <98668332+khadni@users.noreply.github.com> Date: Mon, 26 Feb 2024 09:01:30 +0100 Subject: [PATCH] Update imports to named imports --- public/samples/APIRequests/APIConsumer.sol | 5 +++-- public/samples/APIRequests/APIConsumerForwarder.sol | 5 +++-- public/samples/APIRequests/ATestnetConsumer.sol | 5 +++-- public/samples/APIRequests/FetchFromArray.sol | 5 +++-- public/samples/APIRequests/GenericBigWord.sol | 5 +++-- public/samples/APIRequests/GetGasPrice.sol | 5 +++-- public/samples/APIRequests/MultiWordConsumer.sol | 5 +++-- public/samples/Automation/AutomationCounter.sol | 2 +- public/samples/Automation/BalancerOffChain.sol | 2 +- public/samples/Automation/BalancerOnChain.sol | 2 +- public/samples/Automation/CounterwForwarder.sol | 4 ++-- public/samples/Automation/tutorials/EthBalanceMonitor.sol | 6 +++--- .../tutorials/VRFSubscriptionBalanceMonitor.sol | 8 ++++---- public/samples/DataFeeds/DataConsumerV3.sol | 2 +- .../samples/DataFeeds/DataConsumerWithSequencerCheck.sol | 2 +- public/samples/DataFeeds/HistoricalDataConsumer.sol | 2 +- public/samples/DataFeeds/NFTFloorPriceConsumerV3.sol | 2 +- public/samples/DataFeeds/PriceConverter.sol | 2 +- public/samples/DataFeeds/ReserveConsumerV3.sol | 2 +- public/samples/FeedRegistry/PriceConsumer.sol | 4 ++-- public/samples/VRF/RandomNumberConsumer.sol | 2 +- public/samples/VRF/VRFD20.sol | 4 ++-- public/samples/VRF/VRFv2Consumer.sol | 6 +++--- public/samples/VRF/VRFv2DirectFundingConsumer.sol | 5 +++-- public/samples/VRF/VRFv2MultiplePaths.sol | 4 ++-- public/samples/VRF/VRFv2SubscriptionManager.sol | 6 +++--- .../VRF/mock/RandomNumberDirectFundingConsumerV2.sol | 4 ++-- public/samples/VRF/mock/VRFv2Consumer.sol | 4 ++-- .../samples/events/avasummit/VRFv2SubscriptionManager.sol | 6 +++--- 29 files changed, 62 insertions(+), 54 deletions(-) diff --git a/public/samples/APIRequests/APIConsumer.sol b/public/samples/APIRequests/APIConsumer.sol index 4e02c71f7e2..70d975a5eaf 100644 --- a/public/samples/APIRequests/APIConsumer.sol +++ b/public/samples/APIRequests/APIConsumer.sol @@ -1,8 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; -import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {Chainlink, ChainlinkClient} from "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; +import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {LinkTokenInterface} from "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; /** * Request testnet LINK and ETH here: https://faucets.chain.link/ diff --git a/public/samples/APIRequests/APIConsumerForwarder.sol b/public/samples/APIRequests/APIConsumerForwarder.sol index 57e6e6a37de..8b5da34927f 100644 --- a/public/samples/APIRequests/APIConsumerForwarder.sol +++ b/public/samples/APIRequests/APIConsumerForwarder.sol @@ -1,8 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; -import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {Chainlink, ChainlinkClient} from "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; +import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {LinkTokenInterface} from "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; /** * THIS IS AN EXAMPLE CONTRACT THAT USES UN-AUDITED CODE. diff --git a/public/samples/APIRequests/ATestnetConsumer.sol b/public/samples/APIRequests/ATestnetConsumer.sol index 946b6441857..72af2d1c596 100644 --- a/public/samples/APIRequests/ATestnetConsumer.sol +++ b/public/samples/APIRequests/ATestnetConsumer.sol @@ -1,8 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; -import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {Chainlink, ChainlinkClient} from "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; +import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {LinkTokenInterface} from "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; /** * THIS IS AN EXAMPLE CONTRACT THAT USES UN-AUDITED CODE. diff --git a/public/samples/APIRequests/FetchFromArray.sol b/public/samples/APIRequests/FetchFromArray.sol index d9224eecebf..3b2e1a65719 100644 --- a/public/samples/APIRequests/FetchFromArray.sol +++ b/public/samples/APIRequests/FetchFromArray.sol @@ -1,8 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; -import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {Chainlink, ChainlinkClient} from "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; +import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {LinkTokenInterface} from "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; /** * Request testnet LINK and ETH here: https://faucets.chain.link/ diff --git a/public/samples/APIRequests/GenericBigWord.sol b/public/samples/APIRequests/GenericBigWord.sol index 604c9e4b7fc..20ad9bcab70 100644 --- a/public/samples/APIRequests/GenericBigWord.sol +++ b/public/samples/APIRequests/GenericBigWord.sol @@ -1,8 +1,9 @@ //SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; -import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {Chainlink, ChainlinkClient} from "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; +import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {LinkTokenInterface} from "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; /** * Request testnet LINK and ETH here: https://faucets.chain.link/ diff --git a/public/samples/APIRequests/GetGasPrice.sol b/public/samples/APIRequests/GetGasPrice.sol index 029e923c745..5f36d676291 100644 --- a/public/samples/APIRequests/GetGasPrice.sol +++ b/public/samples/APIRequests/GetGasPrice.sol @@ -1,8 +1,9 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; -import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {Chainlink, ChainlinkClient} from "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; +import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {LinkTokenInterface} from "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; /** * Request testnet LINK and ETH here: https://faucets.chain.link/ diff --git a/public/samples/APIRequests/MultiWordConsumer.sol b/public/samples/APIRequests/MultiWordConsumer.sol index 93fcb86c890..25cca65f540 100644 --- a/public/samples/APIRequests/MultiWordConsumer.sol +++ b/public/samples/APIRequests/MultiWordConsumer.sol @@ -1,8 +1,9 @@ //SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; -import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {Chainlink, ChainlinkClient} from "@chainlink/contracts/src/v0.8/ChainlinkClient.sol"; +import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {LinkTokenInterface} from "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; /** * Request testnet LINK and ETH here: https://faucets.chain.link/ diff --git a/public/samples/Automation/AutomationCounter.sol b/public/samples/Automation/AutomationCounter.sol index 1bb9deed3ef..ea2b4630cae 100644 --- a/public/samples/Automation/AutomationCounter.sol +++ b/public/samples/Automation/AutomationCounter.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.7; // AutomationCompatible.sol imports the functions from both ./AutomationBase.sol and // ./interfaces/AutomationCompatibleInterface.sol -import "@chainlink/contracts/src/v0.8/automation/AutomationCompatible.sol"; +import {AutomationCompatibleInterface} from "@chainlink/contracts/src/v0.8/automation/AutomationCompatible.sol"; /** * @dev Example contract, use the Forwarder as needed for additional security. diff --git a/public/samples/Automation/BalancerOffChain.sol b/public/samples/Automation/BalancerOffChain.sol index 5d31bd24cbe..39896772fb4 100644 --- a/public/samples/Automation/BalancerOffChain.sol +++ b/public/samples/Automation/BalancerOffChain.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/automation/interfaces/AutomationCompatibleInterface.sol"; +import {AutomationCompatibleInterface} from "@chainlink/contracts/src/v0.8/automation/interfaces/AutomationCompatibleInterface.sol"; /** * @dev Example contract which perform most of the computation in `checkUpkeep` diff --git a/public/samples/Automation/BalancerOnChain.sol b/public/samples/Automation/BalancerOnChain.sol index 38c90c95f8c..ddb2af26a2a 100644 --- a/public/samples/Automation/BalancerOnChain.sol +++ b/public/samples/Automation/BalancerOnChain.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/automation/interfaces/AutomationCompatibleInterface.sol"; +import {AutomationCompatibleInterface} from "@chainlink/contracts/src/v0.8/automation/interfaces/AutomationCompatibleInterface.sol"; /** * @dev Example contract which perform all the computation in `performUpkeep` diff --git a/public/samples/Automation/CounterwForwarder.sol b/public/samples/Automation/CounterwForwarder.sol index c5740031326..d057832cd95 100644 --- a/public/samples/Automation/CounterwForwarder.sol +++ b/public/samples/Automation/CounterwForwarder.sol @@ -13,8 +13,8 @@ pragma solidity ^0.8.7; * DO NOT USE THIS CODE IN PRODUCTION. */ -import "@chainlink/contracts/src/v0.8/automation/interfaces/AutomationCompatibleInterface.sol"; -import "@openzeppelin/contracts/access/Ownable.sol"; +import {AutomationCompatibleInterface} from "@chainlink/contracts/src/v0.8/automation/interfaces/AutomationCompatibleInterface.sol"; +import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; contract CounterwForwarder is AutomationCompatibleInterface, Ownable { uint256 public counter; // counter counts the number of upkeeps performed diff --git a/public/samples/Automation/tutorials/EthBalanceMonitor.sol b/public/samples/Automation/tutorials/EthBalanceMonitor.sol index 0f50a5d4d4f..79a463acce8 100644 --- a/public/samples/Automation/tutorials/EthBalanceMonitor.sol +++ b/public/samples/Automation/tutorials/EthBalanceMonitor.sol @@ -2,9 +2,9 @@ pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; -import "@chainlink/contracts/src/v0.8/automation/interfaces/AutomationCompatibleInterface.sol"; -import "@openzeppelin/contracts/security/Pausable.sol"; +import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {AutomationCompatibleInterface} from "@chainlink/contracts/src/v0.8/automation/interfaces/AutomationCompatibleInterface.sol"; +import {Pausable} from "@openzeppelin/contracts/security/Pausable.sol"; /** * @title The EthBalanceMonitor contract diff --git a/public/samples/Automation/tutorials/VRFSubscriptionBalanceMonitor.sol b/public/samples/Automation/tutorials/VRFSubscriptionBalanceMonitor.sol index 52b1bc2c543..ce2903a1591 100644 --- a/public/samples/Automation/tutorials/VRFSubscriptionBalanceMonitor.sol +++ b/public/samples/Automation/tutorials/VRFSubscriptionBalanceMonitor.sol @@ -2,11 +2,11 @@ pragma solidity 0.8.6; -import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; import "@chainlink/contracts/src/v0.8/automation/interfaces/KeeperCompatibleInterface.sol"; -import "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; -import "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; -import "@openzeppelin/contracts/security/Pausable.sol"; +import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {VRFCoordinatorV2Interface} from "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; +import {LinkTokenInterface} from "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; +import {Pausable} from "@openzeppelin/contracts/security/Pausable.sol"; /** * @title The VRFSubscriptionBalanceMonitor contract. diff --git a/public/samples/DataFeeds/DataConsumerV3.sol b/public/samples/DataFeeds/DataConsumerV3.sol index a37f357680e..d8aaf4d2cf5 100644 --- a/public/samples/DataFeeds/DataConsumerV3.sol +++ b/public/samples/DataFeeds/DataConsumerV3.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; +import {AggregatorV3Interface} from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; /** * THIS IS AN EXAMPLE CONTRACT THAT USES HARDCODED diff --git a/public/samples/DataFeeds/DataConsumerWithSequencerCheck.sol b/public/samples/DataFeeds/DataConsumerWithSequencerCheck.sol index 0aa9c49f16e..06c6c1a4718 100644 --- a/public/samples/DataFeeds/DataConsumerWithSequencerCheck.sol +++ b/public/samples/DataFeeds/DataConsumerWithSequencerCheck.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV2V3Interface.sol"; +import {AggregatorV2V3Interface} from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV2V3Interface.sol"; /** * THIS IS AN EXAMPLE CONTRACT THAT USES HARDCODED VALUES FOR CLARITY. diff --git a/public/samples/DataFeeds/HistoricalDataConsumer.sol b/public/samples/DataFeeds/HistoricalDataConsumer.sol index 25840362375..4d52a867a58 100644 --- a/public/samples/DataFeeds/HistoricalDataConsumer.sol +++ b/public/samples/DataFeeds/HistoricalDataConsumer.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; +import {AggregatorV3Interface} from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; /** * THIS IS AN EXAMPLE CONTRACT THAT USES HARDCODED VALUES FOR CLARITY. diff --git a/public/samples/DataFeeds/NFTFloorPriceConsumerV3.sol b/public/samples/DataFeeds/NFTFloorPriceConsumerV3.sol index 29230065a24..46de920ef6a 100644 --- a/public/samples/DataFeeds/NFTFloorPriceConsumerV3.sol +++ b/public/samples/DataFeeds/NFTFloorPriceConsumerV3.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; +import {AggregatorV3Interface} from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; contract NFTFloorPriceConsumerV3 { AggregatorV3Interface internal nftFloorPriceFeed; diff --git a/public/samples/DataFeeds/PriceConverter.sol b/public/samples/DataFeeds/PriceConverter.sol index 8f6934869c6..cc86b9f4dc2 100644 --- a/public/samples/DataFeeds/PriceConverter.sol +++ b/public/samples/DataFeeds/PriceConverter.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; +import {AggregatorV3Interface} from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; /** * Network: Sepolia diff --git a/public/samples/DataFeeds/ReserveConsumerV3.sol b/public/samples/DataFeeds/ReserveConsumerV3.sol index 43e63e605b4..01e03f63cdd 100644 --- a/public/samples/DataFeeds/ReserveConsumerV3.sol +++ b/public/samples/DataFeeds/ReserveConsumerV3.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; +import {AggregatorV3Interface} from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; contract ReserveConsumerV3 { AggregatorV3Interface internal reserveFeed; diff --git a/public/samples/FeedRegistry/PriceConsumer.sol b/public/samples/FeedRegistry/PriceConsumer.sol index b9b24e18902..ff1fb56db3e 100644 --- a/public/samples/FeedRegistry/PriceConsumer.sol +++ b/public/samples/FeedRegistry/PriceConsumer.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/interfaces/FeedRegistryInterface.sol"; -import "@chainlink/contracts/src/v0.8/Denominations.sol"; +import {FeedRegistryInterface} from "@chainlink/contracts/src/v0.8/interfaces/FeedRegistryInterface.sol"; +import {Denominations} from "@chainlink/contracts/src/v0.8/Denominations.sol"; /** * THIS IS AN EXAMPLE CONTRACT THAT USES HARDCODED VALUES FOR CLARITY. diff --git a/public/samples/VRF/RandomNumberConsumer.sol b/public/samples/VRF/RandomNumberConsumer.sol index eaebf9adfb4..4598e72458c 100644 --- a/public/samples/VRF/RandomNumberConsumer.sol +++ b/public/samples/VRF/RandomNumberConsumer.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBase.sol"; +import {VRFConsumerBase} from "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBase.sol"; /** * THIS IS AN EXAMPLE CONTRACT THAT USES HARDCODED VALUES FOR CLARITY. diff --git a/public/samples/VRF/VRFD20.sol b/public/samples/VRF/VRFD20.sol index 0aa5681246a..0f00841bf6e 100644 --- a/public/samples/VRF/VRFD20.sol +++ b/public/samples/VRF/VRFD20.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; -import "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol"; +import {VRFCoordinatorV2Interface} from "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; +import {VRFConsumerBaseV2} from "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol"; /** * @notice A Chainlink VRF consumer which uses randomness to mimic the rolling diff --git a/public/samples/VRF/VRFv2Consumer.sol b/public/samples/VRF/VRFv2Consumer.sol index cb2d2559b98..e039d902ce5 100644 --- a/public/samples/VRF/VRFv2Consumer.sol +++ b/public/samples/VRF/VRFv2Consumer.sol @@ -2,9 +2,9 @@ // An example of a consumer contract that relies on a subscription for funding. pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; -import "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol"; -import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {VRFCoordinatorV2Interface} from "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; +import {VRFConsumerBaseV2} from "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol"; +import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; /** * Request testnet LINK and ETH here: https://faucets.chain.link/ diff --git a/public/samples/VRF/VRFv2DirectFundingConsumer.sol b/public/samples/VRF/VRFv2DirectFundingConsumer.sol index b77aa6ce1cb..41be9a814c3 100644 --- a/public/samples/VRF/VRFv2DirectFundingConsumer.sol +++ b/public/samples/VRF/VRFv2DirectFundingConsumer.sol @@ -2,8 +2,9 @@ // An example of a consumer contract that directly pays for each request. pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; -import "@chainlink/contracts/src/v0.8/vrf/VRFV2WrapperConsumerBase.sol"; +import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {VRFV2WrapperConsumerBase} from "@chainlink/contracts/src/v0.8/vrf/VRFV2WrapperConsumerBase.sol"; +import {LinkTokenInterface} from "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; /** * Request testnet LINK and ETH here: https://faucets.chain.link/ diff --git a/public/samples/VRF/VRFv2MultiplePaths.sol b/public/samples/VRF/VRFv2MultiplePaths.sol index 9294df546a9..54bf0b4d3db 100644 --- a/public/samples/VRF/VRFv2MultiplePaths.sol +++ b/public/samples/VRF/VRFv2MultiplePaths.sol @@ -3,8 +3,8 @@ // It shows how to setup multiple execution paths for handling a response. pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; -import "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol"; +import {VRFCoordinatorV2Interface} from "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; +import {VRFConsumerBaseV2} from "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol"; /** * THIS IS AN EXAMPLE CONTRACT THAT USES HARDCODED VALUES FOR CLARITY. diff --git a/public/samples/VRF/VRFv2SubscriptionManager.sol b/public/samples/VRF/VRFv2SubscriptionManager.sol index 52534ae01f5..1763abdd6c4 100644 --- a/public/samples/VRF/VRFv2SubscriptionManager.sol +++ b/public/samples/VRF/VRFv2SubscriptionManager.sol @@ -2,9 +2,9 @@ // An example of a consumer contract that also owns and manages the subscription pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; -import "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; -import "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol"; +import {LinkTokenInterface} from "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; +import {VRFCoordinatorV2Interface} from "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; +import {VRFConsumerBaseV2} from "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol"; /** * Request testnet LINK and ETH here: https://faucets.chain.link/ diff --git a/public/samples/VRF/mock/RandomNumberDirectFundingConsumerV2.sol b/public/samples/VRF/mock/RandomNumberDirectFundingConsumerV2.sol index e6f6743486e..b97d1db4b11 100644 --- a/public/samples/VRF/mock/RandomNumberDirectFundingConsumerV2.sol +++ b/public/samples/VRF/mock/RandomNumberDirectFundingConsumerV2.sol @@ -2,8 +2,8 @@ // An example of a consumer contract that directly pays for each request. pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; -import "@chainlink/contracts/src/v0.8/vrf/VRFV2WrapperConsumerBase.sol"; +import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol"; +import {VRFV2WrapperConsumerBase} from "@chainlink/contracts/src/v0.8/vrf/VRFV2WrapperConsumerBase.sol"; /** * THIS IS AN EXAMPLE CONTRACT THAT USES HARDCODED VALUES FOR CLARITY. diff --git a/public/samples/VRF/mock/VRFv2Consumer.sol b/public/samples/VRF/mock/VRFv2Consumer.sol index c099202ac7f..a27e13ef229 100644 --- a/public/samples/VRF/mock/VRFv2Consumer.sol +++ b/public/samples/VRF/mock/VRFv2Consumer.sol @@ -2,8 +2,8 @@ // An example of a consumer contract that relies on a subscription for funding. pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; -import "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol"; +import {VRFCoordinatorV2Interface} from "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; +import {VRFConsumerBaseV2} from "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol"; /** * THIS IS AN EXAMPLE CONTRACT THAT USES HARDCODED VALUES FOR CLARITY. diff --git a/public/samples/events/avasummit/VRFv2SubscriptionManager.sol b/public/samples/events/avasummit/VRFv2SubscriptionManager.sol index d054241c3e7..74d198d25c4 100644 --- a/public/samples/events/avasummit/VRFv2SubscriptionManager.sol +++ b/public/samples/events/avasummit/VRFv2SubscriptionManager.sol @@ -2,9 +2,9 @@ pragma solidity ^0.8.7; -import "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; -import "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; -import "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol"; +import {LinkTokenInterface} from "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; +import {VRFCoordinatorV2Interface} from "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol"; +import {VRFConsumerBaseV2} from "@chainlink/contracts/src/v0.8/vrf/VRFConsumerBaseV2.sol"; /** * An example of a consumer contract that also owns and manages the subscription