diff --git a/.gitignore b/.gitignore index 5ae68ab..d556131 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ out .fixes .env .pre-commit-config.yaml +*.zip diff --git a/foundry.toml b/foundry.toml index ab72efc..5ac7418 100644 --- a/foundry.toml +++ b/foundry.toml @@ -23,11 +23,6 @@ cbor_metadata = false evm_version = "cancun" -remappings = [ - "rain.interpreter.interface/=dependencies/rain-interpreter-interface-0.1.0/src/", - "rain.math.float/=dependencies/rain-math-float-0.1.1/src/", -] - [dependencies] forge-std = "1.16.1" rain-interpreter-interface = "0.1.0" diff --git a/src/interface/IRaindexV6.sol b/src/interface/IRaindexV6.sol index 9209f8c..29c215b 100644 --- a/src/interface/IRaindexV6.sol +++ b/src/interface/IRaindexV6.sol @@ -15,7 +15,7 @@ import { //forge-lint: disable-next-line(unused-import) IInterpreterStoreV3 -} from "rain.interpreter.interface/interface/IInterpreterCallerV4.sol"; +} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterCallerV4.sol"; /// Import unmodified structures from older versions of the Raindex interface. import { @@ -31,7 +31,7 @@ import { QuoteV2 } from "./deprecated/v5/IOrderBookV5.sol"; -import {Float} from "rain.math.float/lib/LibDecimalFloat.sol"; +import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; /// Config for a list of orders to take sequentially as part of a `takeOrders` /// call. diff --git a/src/interface/deprecated/v1/IOrderBookV1.sol b/src/interface/deprecated/v1/IOrderBookV1.sol index d86efb1..823aa70 100644 --- a/src/interface/deprecated/v1/IOrderBookV1.sol +++ b/src/interface/deprecated/v1/IOrderBookV1.sol @@ -4,14 +4,16 @@ pragma solidity ^0.8.18; import {IERC3156FlashLender} from "../../ierc3156/IERC3156FlashLender.sol"; //forge-lint: disable-next-line(unused-import) -import {LibEvaluable} from "rain.interpreter.interface/lib/caller/LibEvaluable.sol"; +import {LibEvaluable} from "rain-interpreter-interface-0.1.0/src/lib/caller/LibEvaluable.sol"; import { EvaluableConfig, Evaluable, SignedContext, IInterpreterCallerV1 -} from "rain.interpreter.interface/interface/deprecated/v1/IInterpreterCallerV1.sol"; -import {IExpressionDeployerV3} from "rain.interpreter.interface/interface/deprecated/v1/IExpressionDeployerV3.sol"; +} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV1.sol"; +import { + IExpressionDeployerV3 +} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IExpressionDeployerV3.sol"; /// Configuration for a deposit. All deposits are processed by and for /// `msg.sender` so the vaults are unambiguous here. diff --git a/src/interface/deprecated/v2/IOrderBookV2.sol b/src/interface/deprecated/v2/IOrderBookV2.sol index cdd246a..e3da5c7 100644 --- a/src/interface/deprecated/v2/IOrderBookV2.sol +++ b/src/interface/deprecated/v2/IOrderBookV2.sol @@ -3,12 +3,17 @@ pragma solidity ^0.8.18; import {IERC3156FlashLender} from "../../ierc3156/IERC3156FlashLender.sol"; -import {EvaluableConfig, Evaluable} from "rain.interpreter.interface/interface/deprecated/v1/IInterpreterCallerV1.sol"; +import { + EvaluableConfig, + Evaluable +} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV1.sol"; import { SignedContextV1, IInterpreterCallerV2 -} from "rain.interpreter.interface/interface/deprecated/v1/IInterpreterCallerV2.sol"; -import {IExpressionDeployerV2} from "rain.interpreter.interface/interface/deprecated/v1/IExpressionDeployerV2.sol"; +} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; +import { + IExpressionDeployerV2 +} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IExpressionDeployerV2.sol"; /// Configuration for a deposit. All deposits are processed by and for /// `msg.sender` so the vaults are unambiguous here. diff --git a/src/interface/deprecated/v3/IOrderBookV3.sol b/src/interface/deprecated/v3/IOrderBookV3.sol index 56e4d06..999da67 100644 --- a/src/interface/deprecated/v3/IOrderBookV3.sol +++ b/src/interface/deprecated/v3/IOrderBookV3.sol @@ -8,8 +8,10 @@ import { EvaluableConfigV3, IInterpreterCallerV2, SignedContextV1 -} from "rain.interpreter.interface/interface/deprecated/v1/IInterpreterCallerV2.sol"; -import {IExpressionDeployerV3} from "rain.interpreter.interface/interface/deprecated/v1/IExpressionDeployerV3.sol"; +} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; +import { + IExpressionDeployerV3 +} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IExpressionDeployerV3.sol"; /// Import unmodified structures from older versions of `IOrderBook`. import {IO, ClearConfig, ClearStateChange} from "../v2/IOrderBookV2.sol"; diff --git a/src/interface/deprecated/v4/IOrderBookV4.sol b/src/interface/deprecated/v4/IOrderBookV4.sol index d8b13c0..c12f2cc 100644 --- a/src/interface/deprecated/v4/IOrderBookV4.sol +++ b/src/interface/deprecated/v4/IOrderBookV4.sol @@ -13,7 +13,7 @@ import { //forge-lint: disable-next-line(unused-import) IInterpreterStoreV2 -} from "rain.interpreter.interface/interface/deprecated/v2/IInterpreterCallerV3.sol"; +} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v2/IInterpreterCallerV3.sol"; /// Import unmodified structures from older versions of `IOrderBook`. import {ClearStateChange, ClearConfig, IO} from "../v3/IOrderBookV3.sol"; diff --git a/src/interface/deprecated/v5/IOrderBookV5.sol b/src/interface/deprecated/v5/IOrderBookV5.sol index bc8fd3f..699884a 100644 --- a/src/interface/deprecated/v5/IOrderBookV5.sol +++ b/src/interface/deprecated/v5/IOrderBookV5.sol @@ -13,14 +13,14 @@ import { //forge-lint: disable-next-line(unused-import) IInterpreterStoreV3 -} from "rain.interpreter.interface/interface/IInterpreterCallerV4.sol"; +} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterCallerV4.sol"; /// Import unmodified structures from older versions of `IOrderBook`. //forge-lint: disable-start(unused-import) import {NoOrders, ZeroMaximumInput} from "../v4/IOrderBookV4.sol"; //forge-lint: disable-end(unused-import) -import {Float} from "rain.math.float/lib/LibDecimalFloat.sol"; +import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; /// Summary of the vault state changes due to clearing an order. NOT the state /// changes sent to the interpreter store, these are the LOCAL CHANGES in vault