Skip to content

Commit 83b7b45

Browse files
Merge origin/main into 2026-10-26-raindex-v7
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2 parents 5784bb3 + 5d2b05a commit 83b7b45

88 files changed

Lines changed: 187 additions & 289 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎foundry.toml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ libs = ['dependencies']
2323
# See more config options https://github.com/foundry-rs/foundry/tree/master/config
2424

2525
ffi = true
26+
# script/Build.sol's codegen outgrows the default 2^30 gas limit.
27+
gas_limit = "18446744073709551615"
2628
solc = "0.8.25"
2729
evm_version = "cancun"
2830

@@ -62,6 +64,7 @@ fs_permissions = [
6264
{ access = "read", path = "./.env.example" },
6365
{ access = "read-write", path = "./.staged-config" },
6466
{ access = "read", path = "./script/build.sh" },
67+
{ access = "read", path = ".github/workflows/manual-sol-artifacts.yaml" },
6568
]
6669

6770
remappings = [
@@ -74,7 +77,7 @@ forge-std = "1.17.0"
7477
"@openzeppelin-contracts" = "5.7.0"
7578
# rainlanguage/rain.interpreter was renamed to rainlanguage/rainlang;
7679
# its Soldeer registry name follows.
77-
rainlang = "0.2.19"
80+
rainlang = "0.2.26"
7881
# rainlanguage/rain.interpreter.interface was renamed to
7982
# rainlanguage/rainlang.interface; its Soldeer registry name moved from
8083
# `rain-interpreter-interface` (0.1.x) to `rainlang-interface` (0.2.x).
@@ -95,15 +98,15 @@ rain-solmem = "0.1.28"
9598
rain-math-float = "0.3.10"
9699
rain-math-float-deploy = "0.1.7"
97100
rain-tofu-erc20-decimals = "0.1.4"
98-
rain-tofu-erc20-decimals-deploy = "0.1.3"
99-
rain-deploy = "0.1.22"
101+
rain-tofu-erc20-decimals-deploy = "0.1.4"
102+
rain-deploy = "0.1.25"
100103
rain-factory = "0.2.5"
101104
rain-lib-typecast = "0.1.4"
102105
rain-lib-hash = "0.1.27"
103106
rain-math-binary = "0.1.4"
104107
rain-string = "0.3.9"
105108
rain-lib-memkv = "0.2.0"
106-
rain-extrospection = "0.1.14"
109+
rain-extrospection = "0.1.16"
107110

108111
[soldeer]
109112
recursive_deps = false

‎remappings.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@openzeppelin-contracts-5.7.0/=dependencies/@openzeppelin-contracts-5.7.0/
22
forge-std-1.17.0/=dependencies/forge-std-1.17.0/
3-
rain-deploy-0.1.22/=dependencies/rain-deploy-0.1.22/
4-
rain-extrospection-0.1.14/=dependencies/rain-extrospection-0.1.14/
3+
rain-deploy-0.1.25/=dependencies/rain-deploy-0.1.25/
4+
rain-extrospection-0.1.16/=dependencies/rain-extrospection-0.1.16/
55
rain-factory-0.2.5/=dependencies/rain-factory-0.2.5/
66
rain-intorastring-0.1.4/=dependencies/rain-intorastring-0.1.4/
77
rain-lib-hash-0.1.27/=dependencies/rain-lib-hash-0.1.27/
@@ -16,8 +16,8 @@ rain-sol-codegen-0.1.39/=dependencies/rain-sol-codegen-0.1.39/
1616
rain-solmem-0.1.28/=dependencies/rain-solmem-0.1.28/
1717
rain-string-0.3.9/=dependencies/rain-string-0.3.9/
1818
rain-tofu-erc20-decimals-0.1.4/=dependencies/rain-tofu-erc20-decimals-0.1.4/
19-
rain-tofu-erc20-decimals-deploy-0.1.3/=dependencies/rain-tofu-erc20-decimals-deploy-0.1.3/
19+
rain-tofu-erc20-decimals-deploy-0.1.4/=dependencies/rain-tofu-erc20-decimals-deploy-0.1.4/
2020
raindex-interface-0.1.10/=dependencies/raindex-interface-0.1.10/
21-
rainlang-0.2.19/=dependencies/rainlang-0.2.19/
21+
rainlang-0.2.26/=dependencies/rainlang-0.2.26/
2222
rainlang-interface-0.2.13/=dependencies/rainlang-interface-rainlang-0.2.13/
2323
rainlang-interface-0.2.14/=dependencies/rainlang-interface-0.2.14/

‎script/Build.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity =0.8.25;
44

5-
import {BuildScript} from "rain-deploy-0.1.22/src/abstract/BuildScript.sol";
6-
import {LibRainDeploySnapshot} from "rain-deploy-0.1.22/src/lib/LibRainDeploySnapshot.sol";
7-
import {LibRainDeploy} from "rain-deploy-0.1.22/src/lib/LibRainDeploy.sol";
5+
import {BuildScript} from "rain-deploy-0.1.25/src/abstract/BuildScript.sol";
6+
import {LibRainDeploySnapshot} from "rain-deploy-0.1.25/src/lib/LibRainDeploySnapshot.sol";
7+
import {LibRainDeploy} from "rain-deploy-0.1.25/src/lib/LibRainDeploy.sol";
88
import {LibCodeGen} from "rain-sol-codegen-0.1.39/src/lib/LibCodeGen.sol";
99
import {LibFs} from "rain-sol-codegen-0.1.39/src/lib/LibFs.sol";
1010
import {LibGenParseMeta} from "rainlang-interface-0.2.14/src/lib/codegen/LibGenParseMeta.sol";

‎script/Deploy.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
33
pragma solidity =0.8.25;
44

5-
import {RainDeployBroadcast} from "rain-deploy-0.1.22/src/abstract/RainDeployBroadcast.sol";
5+
import {RainDeployBroadcast} from "rain-deploy-0.1.25/src/abstract/RainDeployBroadcast.sol";
66
import {RaindexDeploySuites} from "../src/abstract/RaindexDeploySuites.sol";
77

88
/// @title Deploy

‎soldeer.lock‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ integrity = "fa706c8a7caf3426c90f75e6aafa3224b0a6c899b490800cf6944e4ec42f9344"
1414

1515
[[dependencies]]
1616
name = "rain-deploy"
17-
version = "0.1.22"
18-
url = "https://soldeer-revisions.s3.amazonaws.com/rain-deploy/0_1_22_22-10-2026_17:04:26_rain.zip"
19-
checksum = "9ac263c7feec92f8ab2df6378e171d5685bea2dacf1f10db80e285bc4026cdd6"
20-
integrity = "600f0cc8d960d39a4084e5d60d5a8b81536c5547c21647fb19e5dcaf727a384a"
17+
version = "0.1.25"
18+
url = "https://soldeer-revisions.s3.amazonaws.com/rain-deploy/0_1_25_26-10-2026_14:55:17_rain.zip"
19+
checksum = "41a75f6637df3853988f03ec279b17a9369b7540e685f92c62fbec2ba0de3dd6"
20+
integrity = "ec1e4747d20fbab6352553db5eb2eb7379f9ae3432c2ccb3529f92813e98f71f"
2121

2222
[[dependencies]]
2323
name = "rain-extrospection"
24-
version = "0.1.14"
25-
url = "https://soldeer-revisions.s3.amazonaws.com/rain-extrospection/0_1_14_06-09-2026_09:00:43_rain.zip"
26-
checksum = "a9f34937f66c48c8cd15a700ccebc56c25b6a8af32f0b8757fcfa92be8bbfb56"
27-
integrity = "4fda4ce47b006de0619aba0591a00cece86454a5867643d99412bc57790cdce0"
24+
version = "0.1.16"
25+
url = "https://soldeer-revisions.s3.amazonaws.com/rain-extrospection/0_1_16_23-10-2026_14:42:55_rain.zip"
26+
checksum = "72cae932354e5bcf740c7115b8aed6edd1b257f46f988df12f977f48adf44df5"
27+
integrity = "dedbb76615c7e68e6666c77ef40f3abb8a284bf5d052e294d1c34cc4e6755d68"
2828

2929
[[dependencies]]
3030
name = "rain-factory"
@@ -126,10 +126,10 @@ integrity = "f10dc50978061fb2a92fb9ba907c2cbe678d24198faabf060f699d36f1e8e4a0"
126126

127127
[[dependencies]]
128128
name = "rain-tofu-erc20-decimals-deploy"
129-
version = "0.1.3"
130-
url = "https://soldeer-revisions.s3.amazonaws.com/rain-tofu-erc20-decimals-deploy/0_1_3_23-10-2026_06:53:49_rain.tofu.erc20-decimals.zip"
131-
checksum = "1dc402f96bb791458d56e9616a6d77c93bce28b6d55d85675205cddb0ddbb313"
132-
integrity = "a2832c32c4a13a592c4c66072be5dca8b956e535467d8ce3cb6c51e9b4d5fc89"
129+
version = "0.1.4"
130+
url = "https://soldeer-revisions.s3.amazonaws.com/rain-tofu-erc20-decimals-deploy/0_1_4_26-10-2026_17:40:04_rain.tofu.erc20-decimals.zip"
131+
checksum = "ead4d2905510830980b693e302e660b7cfceeaafac64751d1a9720a3746d9183"
132+
integrity = "e3794ced48708912ee2174c3381162f4eeccaaf5be74e79b03b7c5dd27edd1ce"
133133

134134
[[dependencies]]
135135
name = "raindex-interface"
@@ -140,10 +140,10 @@ integrity = "835cd538cad10a60b0fb6a36711bc5dbf789e6ae4647f5a16bb8c335d1fb9fca"
140140

141141
[[dependencies]]
142142
name = "rainlang"
143-
version = "0.2.19"
144-
url = "https://soldeer-revisions.s3.amazonaws.com/rainlang/0_2_19_23-10-2026_07:59:49_rainlang.zip"
145-
checksum = "a47afc708792522e50975ba767fe31c38c85cc0d1bef4d1d97f07c9b1928e57f"
146-
integrity = "b7e5e97ea63d89649f5cb4d82f630a22fc6a3cd1b529ce1deda61f7b22a3325a"
143+
version = "0.2.26"
144+
url = "https://soldeer-revisions.s3.amazonaws.com/rainlang/0_2_26_26-10-2026_17:21:45_rainlang.zip"
145+
checksum = "6ba6539234b2bb9a51bbc506934c5b382e781ecc390a3de57065ffb0bef30433"
146+
integrity = "6ff6e2a3d9cf219c96a4f5c287779cff08bce84d927c3b49a980981cfe8b22f4"
147147

148148
[[dependencies]]
149149
name = "rainlang-interface"

‎src/abstract/RainDeploySuitesBase.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ import {
1414
DeployMechanism,
1515
DeploySuite,
1616
RainDeploySuitesBase
17-
} from "rain-deploy-0.1.22/src/abstract/RainDeploySuitesBase.sol";
17+
} from "rain-deploy-0.1.25/src/abstract/RainDeploySuitesBase.sol";

‎src/abstract/RaindexDeploySuites.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {LibReleasedSuites} from "../lib/LibReleasedSuites.sol";
1414
import {
1515
DEPLOYED_ADDRESS as TOFU_DECIMALS_ADDRESS,
1616
RUNTIME_CODE as TOFU_DECIMALS_RUNTIME_CODE
17-
} from "rain-tofu-erc20-decimals-deploy-0.1.3/src/generated/0_1_0/TOFUTokenDecimals.sol";
17+
} from "rain-tofu-erc20-decimals-deploy-0.1.4/src/generated/0_1_0/TOFUTokenDecimals.sol";
1818
import {
1919
CREATION_CODE as RAINDEX_CREATION_CODE_CANDIDATE,
2020
RUNTIME_CODE as RAINDEX_RUNTIME_CODE_CANDIDATE

‎src/concrete/parser/RaindexV6SubParser.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
BaseRainlangSubParser,
88
OperandV2,
99
IParserToolingV1
10-
} from "rainlang-0.2.19/src/abstract/BaseRainlangSubParser.sol";
10+
} from "rainlang-0.2.26/src/abstract/BaseRainlangSubParser.sol";
1111
import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol";
1212
import {LibUint256Matrix} from "rain-solmem-0.1.28/src/lib/LibUint256Matrix.sol";
1313

‎src/concrete/raindex/RaindexV6.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {IERC20Metadata} from "@openzeppelin-contracts-5.7.0/token/ERC20/extensio
1111

1212
import {LibContext} from "rainlang-interface-0.2.14/src/lib/caller/LibContext.sol";
1313
import {LibBytecode} from "rainlang-interface-0.2.14/src/lib/bytecode/LibBytecode.sol";
14-
import {LibInterpreterStateDataContract} from "rainlang-0.2.19/src/lib/state/LibInterpreterStateDataContract.sol";
14+
import {LibInterpreterStateDataContract} from "rainlang-0.2.26/src/lib/state/LibInterpreterStateDataContract.sol";
1515
import {
1616
SourceIndexV2,
1717
StateNamespace,

‎src/generated/0_1_14/GenericPoolRaindexV6ArbOrderTaker.sol‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)