Re-pin rainlang 0.2.1 and drop the version alias remappings

foundry.toml

@@ -48,36 +48,14 @@ fs_permissions = [
   { access = "write", path = "./deployments/latest/RainlangExpressionDeployer" },
 ]
 
-remappings = [
-  # `rain-deploy` 0.1.7, and the `rain-sol-codegen` 0.1.36 it is built on, spell
-  # forge-std as `forge-std-1.16.2/`; the `rainlang` package and several of its
-  # dependencies still spell it `forge-std-1.16.1/`. Soldeer installs ONE
-  # version per package name, so the older prefix is aliased onto the installed
-  # one. Not cosmetic: two forge-std copies in one compilation are two DISTINCT
-  # `Vm` types, and a `vm` handed from one library to another would not type
-  # check.
-  #
-  # These live here rather than in `remappings.txt` because `forge soldeer
-  # install` owns that file and regenerates it from the installed set.
-  "forge-std-1.16.1/=dependencies/forge-std-1.16.2/",
-  # Same, for `rain-sol-codegen`. `rain-deploy` 0.1.7 needs 0.1.36, while
-  # `rainlang` and `rainlang-interface` import the `IParserToolingV1` /
-  # `ISubParserToolingV1` / `IOpcodeToolingV1` / `IIntegrityToolingV1`
-  # interfaces under the `rain-sol-codegen-0.1.0/` prefix. Those four
-  # interfaces are byte-identical between the two versions bar `pure` widening
-  # to `view` on three functions, which an implementation is free to narrow
-  # again, so nothing here moves any contract's bytecode.
-  "rain-sol-codegen-0.1.0/=dependencies/rain-sol-codegen-0.1.36/",
-]
-
 gas_limit = "18446744073709551615"
 
 # `recursive_deps` is off, so every package an import resolves through is
 # declared here, including the ones reached only through `rainlang`'s src.
 [dependencies]
 forge-std = "1.16.2"
 "@openzeppelin-contracts" = "5.6.1"
-rainlang = "0.2.0"
+"rainlang" = "0.2.1"
 "rain-datacontract" = "0.1.9"
 rain-deploy = "0.1.7"
 "rain-extrospection" = "0.1.14"

script/Build.sol

@@ -5,17 +5,17 @@ pragma solidity =0.8.25;
 import {BuildScript} from "rain-deploy-0.1.7/src/abstract/BuildScript.sol";
 import {LibRainDeploySnapshot} from "rain-deploy-0.1.7/src/lib/LibRainDeploySnapshot.sol";
 import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol";
-import {LibCodeGen} from "rain-sol-codegen-0.1.0/src/lib/LibCodeGen.sol";
-import {LibFs} from "rain-sol-codegen-0.1.0/src/lib/LibFs.sol";
+import {LibCodeGen} from "rain-sol-codegen-0.1.36/src/lib/LibCodeGen.sol";
+import {LibFs} from "rain-sol-codegen-0.1.36/src/lib/LibFs.sol";
 import {LibGenParseMeta} from "rainlang-interface-0.2.8/src/lib/codegen/LibGenParseMeta.sol";
 import {DeployCandidate} from "../src/abstract/RainDeploySuitesBase.sol";
 import {RainlangDeploySuites} from "../src/abstract/RainlangDeploySuites.sol";
 import {RainlangParser} from "../src/concrete/RainlangParser.sol";
-import {PARSE_META_BUILD_DEPTH} from "rainlang-0.2.0/src/abstract/BaseRainlangParser.sol";
+import {PARSE_META_BUILD_DEPTH} from "rainlang-0.2.1/src/abstract/BaseRainlangParser.sol";
 import {RainlangStore} from "../src/concrete/RainlangStore.sol";
 import {RainlangInterpreter} from "../src/concrete/RainlangInterpreter.sol";
 import {RainlangExpressionDeployer} from "../src/concrete/RainlangExpressionDeployer.sol";
-import {LibAllStandardOps} from "rainlang-0.2.0/src/lib/op/LibAllStandardOps.sol";
+import {LibAllStandardOps} from "rainlang-0.2.1/src/lib/op/LibAllStandardOps.sol";
 
 /// One contract's generated snapshot and the released-suites lib emitted from
 /// its record.

script/BuildAuthoringMeta.sol

@@ -2,8 +2,8 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Script} from "forge-std-1.16.1/src/Script.sol";
-import {LibAllStandardOps} from "rainlang-0.2.0/src/lib/op/LibAllStandardOps.sol";
+import {Script} from "forge-std-1.16.2/src/Script.sol";
+import {LibAllStandardOps} from "rainlang-0.2.1/src/lib/op/LibAllStandardOps.sol";
 
 /// @title BuildAuthoringMeta
 /// @notice Forge script that writes raw ABI-encoded AuthoringMeta bytes to

script/CopyArtifacts.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Script} from "forge-std-1.16.1/src/Script.sol";
+import {Script} from "forge-std-1.16.2/src/Script.sol";
 import {LibCopyArtifacts} from "./lib/LibCopyArtifacts.sol";
 
 contract CopyArtifacts is Script {

script/lib/LibCopyArtifacts.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity ^0.8.25;
 
-import {Vm} from "forge-std-1.16.1/src/Vm.sol";
+import {Vm} from "forge-std-1.16.2/src/Vm.sol";
 
 /// @notice Shared logic between `script/CopyArtifacts.sol` (writes the
 /// committed ABI). The `git-clean` CI job runs that writer then

soldeer.lock

@@ -112,10 +112,10 @@ integrity = "9e1fccf893dd0d90aeb445c78f9eee3904bc50287ff1da30b954508f18412cd2"
 
 [[dependencies]]
 name = "rainlang"
-version = "0.2.0"
-url = "https://soldeer-revisions.s3.amazonaws.com/rainlang/0_2_0_07-09-2026_11:46:49_rainlang.zip"
-checksum = "6e00777552715cb1b50d9667b6043c7708ee3157bd1e8acc1f8ee767d228edd7"
-integrity = "f17f1abf9a4e43a090da0d4c7df7dca2af8b55ca93775bffea896e01ddfb18d1"
+version = "0.2.1"
+url = "https://soldeer-revisions.s3.amazonaws.com/rainlang/0_2_1_07-09-2026_13:31:04_rainlang.zip"
+checksum = "4230c46a1908e17626f0f2617882ad671e0b706714f8e829e79da9b209ec60ba"
+integrity = "5eba79d0a1c898102de60ca53f31ec12df18e92f5d1cbb28884a469c5c13b020"
 
 [[dependencies]]
 name = "rainlang-interface"

src/concrete/Rainlang.sol

@@ -3,10 +3,10 @@
 pragma solidity =0.8.25;
 
 import {LibInterpreterDeploy} from "../lib/deploy/LibInterpreterDeploy.sol";
-import {BaseRainlang} from "rainlang-0.2.0/src/abstract/BaseRainlang.sol";
+import {BaseRainlang} from "rainlang-0.2.1/src/abstract/BaseRainlang.sol";
 // Referenced by NatSpec only.
 //forge-lint: disable-next-line(unused-import)
-import {IRainlang} from "rainlang-0.2.0/src/interface/IRainlang.sol";
+import {IRainlang} from "rainlang-0.2.1/src/interface/IRainlang.sol";
 
 /// @title Rainlang
 /// @notice `BaseRainlang` bound to the deterministic Zoltu deploy addresses of

src/concrete/RainlangExpressionDeployer.sol

@@ -2,8 +2,8 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {BaseRainlangExpressionDeployer} from "rainlang-0.2.0/src/abstract/BaseRainlangExpressionDeployer.sol";
-import {BaseRainlangParser} from "rainlang-0.2.0/src/abstract/BaseRainlangParser.sol";
+import {BaseRainlangExpressionDeployer} from "rainlang-0.2.1/src/abstract/BaseRainlangExpressionDeployer.sol";
+import {BaseRainlangParser} from "rainlang-0.2.1/src/abstract/BaseRainlangParser.sol";
 import {INTEGRITY_FUNCTION_POINTERS, DESCRIBED_BY_META_HASH} from "../generated/RainlangExpressionDeployerPointers.sol";
 import {LibInterpreterDeploy} from "../lib/deploy/LibInterpreterDeploy.sol";
 // Referenced by NatSpec only.

src/concrete/RainlangInterpreter.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {BaseRainlangInterpreter} from "rainlang-0.2.0/src/abstract/BaseRainlangInterpreter.sol";
+import {BaseRainlangInterpreter} from "rainlang-0.2.1/src/abstract/BaseRainlangInterpreter.sol";
 import {
 
     // Exported for convenience.

src/concrete/RainlangParser.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {BaseRainlangParser} from "rainlang-0.2.0/src/abstract/BaseRainlangParser.sol";
+import {BaseRainlangParser} from "rainlang-0.2.1/src/abstract/BaseRainlangParser.sol";
 import {
     LITERAL_PARSER_FUNCTION_POINTERS,
 

src/concrete/RainlangStore.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {BaseRainlangStore} from "rainlang-0.2.0/src/abstract/BaseRainlangStore.sol";
+import {BaseRainlangStore} from "rainlang-0.2.1/src/abstract/BaseRainlangStore.sol";
 
 // Exported for convenience.
 //forge-lint: disable-next-line(unused-import)

src/lib/deploy/LibInterpreterDeploy.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity ^0.8.25;
 
-import {Vm} from "forge-std-1.16.1/src/Vm.sol";
+import {Vm} from "forge-std-1.16.2/src/Vm.sol";
 
 import {
     BYTECODE_HASH as PARSER_HASH,

test/abstract/OpTest.sol

@@ -2,14 +2,14 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {OpTest as BaseOpTest} from "rainlang-0.2.0/test/abstract/OpTest.sol";
+import {OpTest as BaseOpTest} from "rainlang-0.2.1/test/abstract/OpTest.sol";
 import {
     RainlangExpressionDeployerDeploymentTest as BaseRainlangExpressionDeployerDeploymentTest
-} from "rainlang-0.2.0/test/abstract/RainlangExpressionDeployerDeploymentTest.sol";
-import {BaseRainlangStore} from "rainlang-0.2.0/src/abstract/BaseRainlangStore.sol";
-import {BaseRainlangParser} from "rainlang-0.2.0/src/abstract/BaseRainlangParser.sol";
-import {BaseRainlangInterpreter} from "rainlang-0.2.0/src/abstract/BaseRainlangInterpreter.sol";
-import {BaseRainlangExpressionDeployer} from "rainlang-0.2.0/src/abstract/BaseRainlangExpressionDeployer.sol";
+} from "rainlang-0.2.1/test/abstract/RainlangExpressionDeployerDeploymentTest.sol";
+import {BaseRainlangStore} from "rainlang-0.2.1/src/abstract/BaseRainlangStore.sol";
+import {BaseRainlangParser} from "rainlang-0.2.1/src/abstract/BaseRainlangParser.sol";
+import {BaseRainlangInterpreter} from "rainlang-0.2.1/src/abstract/BaseRainlangInterpreter.sol";
+import {BaseRainlangExpressionDeployer} from "rainlang-0.2.1/src/abstract/BaseRainlangExpressionDeployer.sol";
 import {RainlangExpressionDeployerDeploymentTest} from "./RainlangExpressionDeployerDeploymentTest.sol";
 
 /// @title OpTest

test/abstract/RainlangExpressionDeployerDeploymentTest.sol

@@ -4,11 +4,11 @@ pragma solidity =0.8.25;
 
 import {
     RainlangExpressionDeployerDeploymentTest as BaseRainlangExpressionDeployerDeploymentTest
-} from "rainlang-0.2.0/test/abstract/RainlangExpressionDeployerDeploymentTest.sol";
-import {BaseRainlangStore} from "rainlang-0.2.0/src/abstract/BaseRainlangStore.sol";
-import {BaseRainlangParser} from "rainlang-0.2.0/src/abstract/BaseRainlangParser.sol";
-import {BaseRainlangInterpreter} from "rainlang-0.2.0/src/abstract/BaseRainlangInterpreter.sol";
-import {BaseRainlangExpressionDeployer} from "rainlang-0.2.0/src/abstract/BaseRainlangExpressionDeployer.sol";
+} from "rainlang-0.2.1/test/abstract/RainlangExpressionDeployerDeploymentTest.sol";
+import {BaseRainlangStore} from "rainlang-0.2.1/src/abstract/BaseRainlangStore.sol";
+import {BaseRainlangParser} from "rainlang-0.2.1/src/abstract/BaseRainlangParser.sol";
+import {BaseRainlangInterpreter} from "rainlang-0.2.1/src/abstract/BaseRainlangInterpreter.sol";
+import {BaseRainlangExpressionDeployer} from "rainlang-0.2.1/src/abstract/BaseRainlangExpressionDeployer.sol";
 import {LibInterpreterDeploy} from "../../src/lib/deploy/LibInterpreterDeploy.sol";
 
 /// @title RainlangExpressionDeployerDeploymentTest

test/src/abstract/RainlangDeploySuites.t.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std-1.16.1/src/Test.sol";
+import {Test} from "forge-std-1.16.2/src/Test.sol";
 import {DeployCandidate} from "../../../src/abstract/RainDeploySuitesBase.sol";
 import {RainlangDeploySuites} from "../../../src/abstract/RainlangDeploySuites.sol";
 import {LibDecimalFloatDeploy} from "rain-math-float-0.1.1/src/lib/deploy/LibDecimalFloatDeploy.sol";

test/src/concrete/Rainlang.t.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std-1.16.1/src/Test.sol";
+import {Test} from "forge-std-1.16.2/src/Test.sol";
 import {Rainlang} from "../../../src/concrete/Rainlang.sol";
 import {LibInterpreterDeploy} from "../../../src/lib/deploy/LibInterpreterDeploy.sol";
 

test/src/concrete/RainlangExpressionDeployer.deployCheck.t.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std-1.16.1/src/Test.sol";
+import {Test} from "forge-std-1.16.2/src/Test.sol";
 
 import {RainlangExpressionDeployer} from "../../../src/concrete/RainlangExpressionDeployer.sol";
 import {RainlangStore} from "../../../src/concrete/RainlangStore.sol";

test/src/concrete/RainlangExpressionDeployer.describedByMetaV1.t.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std-1.16.1/src/Test.sol";
+import {Test} from "forge-std-1.16.2/src/Test.sol";
 import {RainlangExpressionDeployer} from "../../../src/concrete/RainlangExpressionDeployer.sol";
 import {RainlangInterpreter} from "../../../src/concrete/RainlangInterpreter.sol";
 import {RainlangStore} from "../../../src/concrete/RainlangStore.sol";

test/src/concrete/RainlangExpressionDeployer.meta.t.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std-1.16.1/src/Test.sol";
+import {Test} from "forge-std-1.16.2/src/Test.sol";
 import {RainlangExpressionDeployer, DESCRIBED_BY_META_HASH} from "../../../src/concrete/RainlangExpressionDeployer.sol";
 
 contract RainlangExpressionDeployerMetaTest is Test {

test/src/concrete/RainlangExpressionDeployer.pointers.t.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std-1.16.1/src/Test.sol";
+import {Test} from "forge-std-1.16.2/src/Test.sol";
 import {
     RainlangExpressionDeployer,
     INTEGRITY_FUNCTION_POINTERS

test/src/concrete/RainlangInterpreter.extrospect.t.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std-1.16.1/src/Test.sol";
+import {Test} from "forge-std-1.16.2/src/Test.sol";
 import {RainlangInterpreter} from "../../../src/concrete/RainlangInterpreter.sol";
 import {LibExtrospectBytecode} from "rain-extrospection-0.1.14/src/lib/LibExtrospectBytecode.sol";
 import {INTERPRETER_DISALLOWED_OPS} from "rain-extrospection-0.1.14/src/lib/EVMOpcodes.sol";

test/src/concrete/RainlangInterpreter.pointers.t.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std-1.16.1/src/Test.sol";
+import {Test} from "forge-std-1.16.2/src/Test.sol";
 import {RainlangInterpreter, OPCODE_FUNCTION_POINTERS} from "../../../src/concrete/RainlangInterpreter.sol";
 
 contract RainlangInterpreterPointersTest is Test {

test/src/concrete/RainlangParser.pointers.t.sol

@@ -2,15 +2,15 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std-1.16.1/src/Test.sol";
+import {Test} from "forge-std-1.16.2/src/Test.sol";
 import {RainlangParser} from "../../../src/concrete/RainlangParser.sol";
-import {PARSE_META_BUILD_DEPTH} from "rainlang-0.2.0/src/abstract/BaseRainlangParser.sol";
+import {PARSE_META_BUILD_DEPTH} from "rainlang-0.2.1/src/abstract/BaseRainlangParser.sol";
 import {
     OPERAND_HANDLER_FUNCTION_POINTERS,
     LITERAL_PARSER_FUNCTION_POINTERS,
     PARSE_META
 } from "../../../src/generated/RainlangParserPointers.sol";
-import {LibAllStandardOps, AuthoringMetaV2} from "rainlang-0.2.0/src/lib/op/LibAllStandardOps.sol";
+import {LibAllStandardOps, AuthoringMetaV2} from "rainlang-0.2.1/src/lib/op/LibAllStandardOps.sol";
 import {LibGenParseMeta} from "rainlang-interface-0.2.8/src/lib/codegen/LibGenParseMeta.sol";
 
 contract RainlangParserPointersTest is Test {

test/src/lib/deploy/LibInterpreterDeploy.t.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std-1.16.1/src/Test.sol";
+import {Test} from "forge-std-1.16.2/src/Test.sol";
 import {LibInterpreterDeploy} from "../../../../src/lib/deploy/LibInterpreterDeploy.sol";
 import {RainlangParser} from "../../../../src/concrete/RainlangParser.sol";
 import {RainlangStore} from "../../../../src/concrete/RainlangStore.sol";

test/src/script/Build.t.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Test} from "forge-std-1.16.1/src/Test.sol";
+import {Test} from "forge-std-1.16.2/src/Test.sol";
 import {GeneratedContract} from "../../../script/Build.sol";
 import {DeployCandidate} from "../../../src/abstract/RainDeploySuitesBase.sol";
 import {BuildHarness} from "../concrete/BuildHarness.sol";