Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ out
.fixes
.env
.pre-commit-config.yaml
*.zip
5 changes: 0 additions & 5 deletions foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/interface/IRaindexV6.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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.
Expand Down
8 changes: 5 additions & 3 deletions src/interface/deprecated/v1/IOrderBookV1.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
11 changes: 8 additions & 3 deletions src/interface/deprecated/v2/IOrderBookV2.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 4 additions & 2 deletions src/interface/deprecated/v3/IOrderBookV3.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/interface/deprecated/v4/IOrderBookV4.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions src/interface/deprecated/v5/IOrderBookV5.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading