diff --git a/CLAUDE.md b/CLAUDE.md index a1299ed..5050d2e 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -72,12 +72,9 @@ move. Soldeer packages, declared in `[dependencies]` in `foundry.toml` and locked in `soldeer.lock` (run `forge soldeer update` after changing them). Import paths -carry the package version (e.g. `rainlang-interface-0.2.3/src/...`). Direct -deps: `rainlang-interface` (Rainlang interpreter interfaces and caller libs) and -`rain-math-float` (Float). Soldeer resolution is flat, so `[dependencies]` also -declares everything `rainlang-interface`'s own src imports -(`@openzeppelin-contracts`, `rain-lib-hash`, `rain-math-binary`, -`rain-sol-codegen`, `rain-solmem`). +carry the package version (e.g. `rainlang-0.2.27/src/...`). Direct deps: +`rainlang` (Rainlang interpreter interfaces and caller libs, under +`src/interface/` and `src/lib/caller/`) and `rain-math-float` (Float). ## Conventions diff --git a/foundry.toml b/foundry.toml index 4720288..3bd3b89 100644 --- a/foundry.toml +++ b/foundry.toml @@ -29,13 +29,8 @@ evm_version = "cancun" [dependencies] forge-std = "1.17.0" -"rainlang-interface" = "0.2.14" +rainlang = "0.2.27" rain-math-float = "0.3.10" -"@openzeppelin-contracts" = "5.7.0" -rain-lib-hash = "0.1.27" -rain-math-binary = "0.1.4" -rain-sol-codegen = "0.1.39" -"rain-solmem" = "0.1.28" [soldeer] recursive_deps = false diff --git a/remappings.txt b/remappings.txt index 6612fa5..b653154 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,8 +1,3 @@ -@openzeppelin-contracts-5.7.0/=dependencies/@openzeppelin-contracts-5.7.0/ forge-std-1.17.0/=dependencies/forge-std-1.17.0/ -rain-lib-hash-0.1.27/=dependencies/rain-lib-hash-0.1.27/ -rain-math-binary-0.1.4/=dependencies/rain-math-binary-0.1.4/ rain-math-float-0.3.10/=dependencies/rain-math-float-0.3.10/ -rain-sol-codegen-0.1.39/=dependencies/rain-sol-codegen-0.1.39/ -rain-solmem-0.1.28/=dependencies/rain-solmem-0.1.28/ -rainlang-interface-0.2.14/=dependencies/rainlang-interface-0.2.14/ +rainlang-0.2.27/=dependencies/rainlang-0.2.27/ diff --git a/soldeer.lock b/soldeer.lock index cd5988a..00cc640 100644 --- a/soldeer.lock +++ b/soldeer.lock @@ -1,10 +1,3 @@ -[[dependencies]] -name = "@openzeppelin-contracts" -version = "5.7.0" -url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/5_7_0_29-07-2026_19:34:46_contracts.zip" -checksum = "fe08a24bc34334b2976c6ad69a0d74bdfa63de8a5c8528579060f25a11fb5cd5" -integrity = "3e13bc4d96bdef6e35f6b1e0dc0e455843a958edc597750dff20ca50295b767d" - [[dependencies]] name = "forge-std" version = "1.17.0" @@ -12,20 +5,6 @@ url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_17_0_01-10-2026_10 checksum = "a77ad38d5fbef0ec10d1f4d191698e5fbaa2bffbee5d1aced91a39da5e9b908c" integrity = "fa706c8a7caf3426c90f75e6aafa3224b0a6c899b490800cf6944e4ec42f9344" -[[dependencies]] -name = "rain-lib-hash" -version = "0.1.27" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-lib-hash/0_1_27_16-09-2026_11:52:52_rain.lib.zip" -checksum = "7a25602d78180e82ac330d1f1b44609589e8efa42d7a3553f926445dbda64256" -integrity = "ba9fc2ff053bf801fc1b05e5b192fe5b8ade545c408f33874f473bfc39d2d3f0" - -[[dependencies]] -name = "rain-math-binary" -version = "0.1.4" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-math-binary/0_1_4_17-08-2026_05:22:01_rain.math.zip" -checksum = "1787eb0bc883c4922deb5e547ecaf0bd0f9a31e99c51f3b11744c3324eb592f6" -integrity = "857d22060d058ec173e88448c2d44f0cb884b2381669d0dbe1d3bebb168715ea" - [[dependencies]] name = "rain-math-float" version = "0.3.10" @@ -34,22 +13,8 @@ checksum = "81e6c67cc0e2c573784f1c03e70db1ea9537e8161065ded0aaf90bc11b6b6150" integrity = "f1509e5fa3a4182b625f4650fb368fe605f76ffcaeaa6fbbf1159346b69f2809" [[dependencies]] -name = "rain-sol-codegen" -version = "0.1.39" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-sol-codegen/0_1_39_01-10-2026_22:33:18_rain.sol.zip" -checksum = "356774c9461a4486196d4c7c59f6e6e7099aa567eff4c40bb21ebc5f752f9389" -integrity = "29de970d9b88ec2eac8a4914a04f76736862b96936aba8b5d61d99189064bbd4" - -[[dependencies]] -name = "rain-solmem" -version = "0.1.28" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-solmem/0_1_28_03-09-2026_07:34:16_rain.zip" -checksum = "3dafbef001edb181683a43c3c295e3f88e2ffcedd751e986562e71e29560c9f0" -integrity = "e7508cd81a998a67118a0fca314d504dc62850d6b535d29c824f696f214e4b23" - -[[dependencies]] -name = "rainlang-interface" -version = "0.2.14" -url = "https://soldeer-revisions.s3.amazonaws.com/rainlang-interface/0_2_14_26-10-2026_13:25:43_rainlang.zip" -checksum = "854b90ada2a8756d1c3292fa1272c5630fc0ebf48955bf18f60db9d48e4f210e" -integrity = "d3c5c2983c62b09c3dda643150a3a2a8533c0526fa530b1ded91be69ac64bda5" +name = "rainlang" +version = "0.2.27" +url = "https://soldeer-revisions.s3.amazonaws.com/rainlang/0_2_27_26-10-2026_20:17:13_rainlang.zip" +checksum = "68fa485bb0587607372755e32e5feba9d017e5100f499aba348c60b9d294d16b" +integrity = "0f54fd4d675e3e0e5c209c6b75dc37e11b9e4a0a90affea0c0391cb4e4b8dc0e" diff --git a/src/interface/IRaindexV7.sol b/src/interface/IRaindexV7.sol index 8a4ecc9..61a01dd 100644 --- a/src/interface/IRaindexV7.sol +++ b/src/interface/IRaindexV7.sol @@ -13,7 +13,7 @@ import { //forge-lint: disable-next-line(unused-import) IInterpreterStoreV3 -} from "rainlang-interface-0.2.14/src/interface/IInterpreterCallerV5.sol"; +} from "rainlang-0.2.27/src/interface/IInterpreterCallerV5.sol"; import { ClearStateChangeV2, diff --git a/src/interface/deprecated/v1/IOrderBookV1.sol b/src/interface/deprecated/v1/IOrderBookV1.sol index af4333f..19e76dc 100644 --- a/src/interface/deprecated/v1/IOrderBookV1.sol +++ b/src/interface/deprecated/v1/IOrderBookV1.sol @@ -4,14 +4,14 @@ pragma solidity ^0.8.18; import {IERC3156FlashLender} from "../../ierc3156/IERC3156FlashLender.sol"; //forge-lint: disable-next-line(unused-import) -import {LibEvaluable} from "rainlang-interface-0.2.14/src/lib/caller/LibEvaluable.sol"; +import {LibEvaluable} from "rainlang-0.2.27/src/lib/caller/LibEvaluable.sol"; import { EvaluableConfig, Evaluable, SignedContext, IInterpreterCallerV1 -} from "rainlang-interface-0.2.14/src/interface/deprecated/v1/IInterpreterCallerV1.sol"; -import {IExpressionDeployerV3} from "rainlang-interface-0.2.14/src/interface/deprecated/v1/IExpressionDeployerV3.sol"; +} from "rainlang-0.2.27/src/interface/deprecated/v1/IInterpreterCallerV1.sol"; +import {IExpressionDeployerV3} from "rainlang-0.2.27/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 d358c34..0b2c1f5 100644 --- a/src/interface/deprecated/v2/IOrderBookV2.sol +++ b/src/interface/deprecated/v2/IOrderBookV2.sol @@ -3,15 +3,12 @@ pragma solidity ^0.8.18; import {IERC3156FlashLender} from "../../ierc3156/IERC3156FlashLender.sol"; -import { - EvaluableConfig, - Evaluable -} from "rainlang-interface-0.2.14/src/interface/deprecated/v1/IInterpreterCallerV1.sol"; +import {EvaluableConfig, Evaluable} from "rainlang-0.2.27/src/interface/deprecated/v1/IInterpreterCallerV1.sol"; import { SignedContextV1, IInterpreterCallerV2 -} from "rainlang-interface-0.2.14/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; -import {IExpressionDeployerV2} from "rainlang-interface-0.2.14/src/interface/deprecated/v1/IExpressionDeployerV2.sol"; +} from "rainlang-0.2.27/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; +import {IExpressionDeployerV2} from "rainlang-0.2.27/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 5943653..4a26ac1 100644 --- a/src/interface/deprecated/v3/IOrderBookV3.sol +++ b/src/interface/deprecated/v3/IOrderBookV3.sol @@ -8,8 +8,8 @@ import { EvaluableConfigV3, IInterpreterCallerV2, SignedContextV1 -} from "rainlang-interface-0.2.14/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; -import {IExpressionDeployerV3} from "rainlang-interface-0.2.14/src/interface/deprecated/v1/IExpressionDeployerV3.sol"; +} from "rainlang-0.2.27/src/interface/deprecated/v1/IInterpreterCallerV2.sol"; +import {IExpressionDeployerV3} from "rainlang-0.2.27/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 0b15d9d..3ca110e 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 "rainlang-interface-0.2.14/src/interface/deprecated/v2/IInterpreterCallerV3.sol"; +} from "rainlang-0.2.27/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 0fb14a2..d990050 100644 --- a/src/interface/deprecated/v5/IOrderBookV5.sol +++ b/src/interface/deprecated/v5/IOrderBookV5.sol @@ -13,7 +13,7 @@ import { //forge-lint: disable-next-line(unused-import) IInterpreterStoreV3 -} from "rainlang-interface-0.2.14/src/interface/deprecated/v3/IInterpreterCallerV4.sol"; +} from "rainlang-0.2.27/src/interface/deprecated/v3/IInterpreterCallerV4.sol"; /// Import unmodified structures from older versions of `IOrderBook`. //forge-lint: disable-start(unused-import) diff --git a/src/interface/deprecated/v6/IRaindexV6.sol b/src/interface/deprecated/v6/IRaindexV6.sol index 2ff6cc0..5a8b667 100644 --- a/src/interface/deprecated/v6/IRaindexV6.sol +++ b/src/interface/deprecated/v6/IRaindexV6.sol @@ -15,7 +15,7 @@ import { //forge-lint: disable-next-line(unused-import) IInterpreterStoreV3 -} from "rainlang-interface-0.2.14/src/interface/deprecated/v3/IInterpreterCallerV4.sol"; +} from "rainlang-0.2.27/src/interface/deprecated/v3/IInterpreterCallerV4.sol"; import { ClearStateChangeV2,