updating deps

rainlanguage · Oct 15, 2024 · 9948072 · 9948072
1 parent c4ccef0
commit 9948072
Show file tree

Hide file tree

Showing 9 changed files with 477 additions and 27 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "lib/rain.math.fixedpoint"]
 	path = lib/rain.math.fixedpoint
 	url = https://github.com/rainprotocol/rain.math.fixedpoint
+[submodule "lib/chainlink"]
+	path = lib/chainlink
+	url = https://github.com/smartcontractkit/chainlink
diff --git a/LICENSE b/LICENSE
@@ -0,0 +1 @@
+LICENSES/LicenseRef-DCL-1.0.txt
diff --git a/LICENSES/LicenseRef-DCL-1.0.txt b/LICENSES/LicenseRef-DCL-1.0.txt
diff --git a/flake.lock b/flake.lock
diff --git a/lib/chainlink b/lib/chainlink
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/src/interface/AggregatorV3Interface.sol b/src/interface/AggregatorV3Interface.sol
diff --git a/src/lib/LibChainlink.sol b/src/lib/LibChainlink.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.18;
 
 import {LibFixedPointDecimalScale} from "rain.math.fixedpoint/lib/LibFixedPointDecimalScale.sol";
-import {AggregatorV3Interface} from "../interface/AggregatorV3Interface.sol";
+import {AggregatorV3Interface} from "chainlink/contracts/src/v0.8/shared/interfaces/AggregatorV3Interface.sol";
 
 /// Thrown if a price is zero or negative as this is probably not anticipated or
 /// useful for most users of a price feed. Of course there are use cases where

diff --git a/test/lib/LibChainlink.price.t.sol b/test/lib/LibChainlink.price.t.sol
@@ -5,7 +5,7 @@ import {Test} from "forge-std/Test.sol";
 import {LibWillOverflow} from "rain.math.fixedpoint/lib/LibWillOverflow.sol";
 
 import {LibChainlink} from "src/lib/LibChainlink.sol";
-import {AggregatorV3Interface} from "src/interface/AggregatorV3Interface.sol";
+import {AggregatorV3Interface} from "chainlink/contracts/src/v0.8/shared/interfaces/AggregatorV3Interface.sol";
 
 /// @title LibChainlinkPriceTest
 /// Test that the `price` function matches the `roundDataToPrice` function.
@@ -31,7 +31,7 @@ contract LibChainlinkPriceTest is Test {
         vm.etch(feed, hex"00");
 
         answer = bound(answer, 1, type(int256).max);
-        vm.assume(updatedAt <= block.timestamp);
+        updatedAt = bound(updatedAt, 0, block.timestamp);
         staleAfter = bound(staleAfter, block.timestamp - updatedAt, type(uint256).max);
         vm.assume(!LibWillOverflow.scale18WillOverflow(uint256(answer), decimals, scalingFlags));
         uint256 price =
+1 −0		.gitattributes
+6 −12		.github/workflows/ci.yml
+3 −1		.github/workflows/sync.yml
+0 −3		.gitmodules
+2 −2		README.md
+3 −3		foundry.toml
+0 −1		lib/ds-test
+1 −1		package.json
+635 −0		scripts/vm.py
+1 −1		src/Script.sol
+518 −225		src/StdAssertions.sol
+46 −12		src/StdChains.sol
+17 −5		src/StdCheats.sol
+33 −3		src/StdInvariant.sol
+129 −25		src/StdJson.sol
+241 −99		src/StdStorage.sol
+283 −0		src/StdToml.sol
+61 −33		src/StdUtils.sol
+4 −5		src/Test.sol
+1,875 −421		src/Vm.sol
+635 −608		src/console.sol
+1 −1,555		src/console2.sol
+2 −2		src/interfaces/IERC4626.sol
+234 −0		src/mocks/MockERC20.sol
+231 −0		src/mocks/MockERC721.sol
+693 −4		src/safeconsole.sol
+44 −898		test/StdAssertions.t.sol
+55 −42		test/StdChains.t.sol
+67 −51		test/StdCheats.t.sol
+15 −13		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+14 −24		test/StdMath.t.sol
+224 −46		test/StdStorage.t.sol
+5 −5		test/StdStyle.t.sol
+49 −0		test/StdToml.t.sol
+31 −31		test/StdUtils.t.sol
+18 −0		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol