Merge pull request #43 from smartcontractkit/update-contracts-1-4-0

thodges-gh · web-flow · commit fd4ab9df89f1 · 2025-05-12T10:55:06.000-05:00
Update to use chainlink-evm with 1.4.0 contracts
diff --git 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
diff --git a/lib/chainlink-evm b/lib/chainlink-evm
@@ -0,0 +1 @@
+Subproject commit df6a094dcee6bbde43dc51a416c4bb244c12588c
diff --git 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/
+@chainlink/=lib/chainlink-evm/
+forge-std/=lib/forge-std/src/
diff --git 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";
 
 /**
