use upstream interface

gildlab · Sep 19, 2024 · 7b94145 · 7b94145
1 parent 53f1377
commit 7b94145
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 15 deletions.
diff --git a/contracts/concrete/oracle/FtsoCurrentPriceUsdOracle.sol b/contracts/concrete/oracle/FtsoCurrentPriceUsdOracle.sol
@@ -2,7 +2,7 @@
 pragma solidity =0.8.25;
 
 import {IPriceOracleV1} from "../../interface/IPriceOracleV1.sol";
-import {LibFtsoCurrentPriceUsd} from "rain.flare/src/lib/price/LibFtsoCurrentPriceUsd.sol";
+import {LibFtsoCurrentPriceUsd} from "rain.flare/lib/price/LibFtsoCurrentPriceUsd.sol";
 import {LibIntOrAString, IntOrAString} from "rain.intorastring/lib/LibIntOrAString.sol";
 
 struct FtsoCurrentPriceUsdOracleConfig {

diff --git a/contracts/concrete/oracle/SceptreStakedFlrOracle.sol b/contracts/concrete/oracle/SceptreStakedFlrOracle.sol
@@ -2,7 +2,7 @@
 pragma solidity =0.8.25;
 
 import {IPriceOracleV1} from "../../interface/IPriceOracleV1.sol";
-import {IStakedFlr} from "../../interface/sceptre/IStakedFlr.sol";
+import {IStakedFlr} from "rain.flare/interface/IStakedFlr.sol";
 
 contract SceptreStakedFlrOracle is IPriceOracleV1 {
     IStakedFlr public immutable iStakedFlr;

diff --git a/contracts/interface/sceptre/IStakedFlr.sol b/contracts/interface/sceptre/IStakedFlr.sol
diff --git a/foundry.toml b/foundry.toml
@@ -17,4 +17,5 @@ remappings = [
     "rain.factory/=lib/rain.factory/src/",
     "rain.intorastring/=lib/rain.interpreter/lib/rain.intorastring/src/",
     "forge-std/=lib/rain.interpreter/lib/forge-std/src/",
+    "rain.flare/=lib/rain.flare/src/",
 ]
diff --git a/lib/rain.flare b/lib/rain.flare
diff --git a/script/Deploy.sol b/script/Deploy.sol
@@ -20,7 +20,7 @@ import {
 import {Receipt as ReceiptContract} from "contracts/concrete/receipt/Receipt.sol";
 import {SceptreStakedFlrOracle} from "contracts/concrete/oracle/SceptreStakedFlrOracle.sol";
 import {TwoPriceOracle, TwoPriceOracleConfig} from "contracts/concrete/oracle/TwoPriceOracle.sol";
-import {IStakedFlr} from "contracts/interface/sceptre/IStakedFlr.sol";
+import {IStakedFlr} from "rain.flare/interface/IStakedFlr.sol";
 
 bytes32 constant DEPLOYMENT_SUITE_IMPLEMENTATIONS = keccak256("implementations");
 bytes32 constant DEPLOYMENT_SUITE_OWNABLE_ORACLE_VAULT = keccak256("ownable-oracle-vault");