From 2d6812f9c44ab41163f71b8fea664d1d6e6144a3 Mon Sep 17 00:00:00 2001 From: Thomas Hodges Date: Mon, 12 May 2025 07:52:25 -0500 Subject: [PATCH] Update to use chainlink-evm with 1.4.0 contracts --- .gitmodules | 6 +++--- lib/chainlink-brownie-contracts | 1 - lib/chainlink-evm | 1 + remappings.txt | 4 ++-- test/mocks/MockOracle.sol | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) delete mode 160000 lib/chainlink-brownie-contracts create mode 160000 lib/chainlink-evm diff --git a/.gitmodules b/.gitmodules index 0369204..274f71a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "lib/chainlink-brownie-contracts"] - path = lib/chainlink-brownie-contracts - url = https://github.com/smartcontractkit/chainlink-brownie-contracts [submodule "lib/solmate"] path = lib/solmate url = https://github.com/transmissions11/solmate @@ -11,3 +8,6 @@ path = lib/foundry-chainlink-toolkit url = https://github.com/smartcontractkit/foundry-chainlink-toolkit branch = feature/integration-automation +[submodule "lib/chainlink-evm"] + path = lib/chainlink-evm + url = https://github.com/smartcontractkit/chainlink-evm diff --git a/lib/chainlink-brownie-contracts b/lib/chainlink-brownie-contracts deleted file mode 160000 index 6e324d8..0000000 --- a/lib/chainlink-brownie-contracts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6e324d8ad9fbb5519186ad9f1eaf99704de4c915 diff --git a/lib/chainlink-evm b/lib/chainlink-evm new file mode 160000 index 0000000..df6a094 --- /dev/null +++ b/lib/chainlink-evm @@ -0,0 +1 @@ +Subproject commit df6a094dcee6bbde43dc51a416c4bb244c12588c diff --git a/remappings.txt b/remappings.txt index c8dffc5..1627a9e 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,5 +1,5 @@ @solmate=lib/solmate/src/ @std=lib/forge-std/src/ @clones=lib/clones-with-immutable-args/src/ -@chainlink/=lib/chainlink-brownie-contracts/ -forge-std/=lib/forge-std/src/ \ No newline at end of file +@chainlink/=lib/chainlink-evm/ +forge-std/=lib/forge-std/src/ diff --git a/test/mocks/MockOracle.sol b/test/mocks/MockOracle.sol index 743d0ae..78a5d36 100644 --- a/test/mocks/MockOracle.sol +++ b/test/mocks/MockOracle.sol @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.0; -import "@chainlink/contracts/src/v0.8/interfaces/ChainlinkRequestInterface.sol"; +import "@chainlink/contracts/src/v0.8/operatorforwarder/interfaces/ChainlinkRequestInterface.sol"; import "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol"; /**