diff --git a/foundry.toml b/foundry.toml index 541c5b258..fed42579a 100644 --- a/foundry.toml +++ b/foundry.toml @@ -48,10 +48,10 @@ rain-deploy = "0.1.7" "rain-intorastring" = "0.1.0" "rain-lib-hash" = "0.1.0" "rain-lib-memkv" = "0.1.0" -"rain-lib-typecast" = "0.1.0" +"rain-lib-typecast" = "0.1.4" "rain-math-binary" = "0.1.4" "rain-math-float" = "0.2.1" -"rain-metadata" = "0.1.0" +"rain-metadata" = "0.1.7" rain-sol-codegen = "0.1.36" "rain-solmem" = "0.1.28" "rain-string" = "0.2.0" diff --git a/remappings.txt b/remappings.txt index 8a049fbe4..428aa303d 100644 --- a/remappings.txt +++ b/remappings.txt @@ -6,11 +6,11 @@ rain-extrospection-0.1.14/=dependencies/rain-extrospection-0.1.14/ rain-intorastring-0.1.0/=dependencies/rain-intorastring-0.1.0/ rain-lib-hash-0.1.0/=dependencies/rain-lib-hash-0.1.0/ rain-lib-memkv-0.1.0/=dependencies/rain-lib-memkv-0.1.0/ -rain-lib-typecast-0.1.0/=dependencies/rain-lib-typecast-0.1.0/ +rain-lib-typecast-0.1.4/=dependencies/rain-lib-typecast-0.1.4/ rain-math-binary-0.1.4/=dependencies/rain-math-binary-0.1.4/ rain-math-float-0.2.1/=dependencies/rain-math-float-0.2.1/ rain-math-float-deploy-0.1.2/=dependencies/rain-math-float-deploy-0.1.2/ -rain-metadata-0.1.0/=dependencies/rain-metadata-0.1.0/ +rain-metadata-0.1.7/=dependencies/rain-metadata-0.1.7/ rain-sol-codegen-0.1.36/=dependencies/rain-sol-codegen-0.1.36/ rain-solmem-0.1.28/=dependencies/rain-solmem-0.1.28/ rain-string-0.2.0/=dependencies/rain-string-0.2.0/ diff --git a/soldeer.lock b/soldeer.lock index e7da6cb13..372967630 100644 --- a/soldeer.lock +++ b/soldeer.lock @@ -56,10 +56,10 @@ integrity = "f2a63c0466c50cbfb3b3545094890c74dd1116b55fcb738bb631471252cee5b8" [[dependencies]] name = "rain-lib-typecast" -version = "0.1.0" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-lib-typecast/0_1_0_12-05-2026_16:31:39_rain.lib.zip" -checksum = "5c0419501e4c763ef161a3489934af192219f994cb2c9187699bc4dee0b4e2bb" -integrity = "092781f87fd9227c4c95aafde59300c503d6a9a355beaeb5c5732fe6e36676d6" +version = "0.1.4" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-lib-typecast/0_1_4_21-08-2026_15:46:41_rain.lib.zip" +checksum = "ce1339c0a06de699508247dc882c5aaf715ab4ae67d53336ae72ae88810f5540" +integrity = "eeb92ffe224186151d210137324a69e6154947bf987c18ea8b3233174291ce5c" [[dependencies]] name = "rain-math-binary" @@ -84,10 +84,10 @@ integrity = "0b67be7c1454da7b0560262fdd1aee7b41f2077c7ebbb8c4e96abc6920376363" [[dependencies]] name = "rain-metadata" -version = "0.1.0" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-metadata/0_1_0_12-05-2026_20:20:51_rain.zip" -checksum = "801d2b97b393d346c19a2f4f454d0279ba8f7d0f81fa3eb4fe8609da7291203d" -integrity = "f17f10aa50e9e2b254c689c83f41b3cabab81c95bad06424b9b3e9c92d02e577" +version = "0.1.7" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-metadata/0_1_7_21-08-2026_20:06:55_rain.zip" +checksum = "6d5709e3f5f926ad6c260820b423b370d9c1f3fe0ef9d5e0b7d5cca19ed8e85e" +integrity = "176af355c734ef954434b1fc60907b42bda8b55d5cf540eefb87b574f8148b80" [[dependencies]] name = "rain-sol-codegen" diff --git a/src/abstract/BaseRainlangExpressionDeployer.sol b/src/abstract/BaseRainlangExpressionDeployer.sol index c4ead8559..4e91b02a1 100644 --- a/src/abstract/BaseRainlangExpressionDeployer.sol +++ b/src/abstract/BaseRainlangExpressionDeployer.sol @@ -7,7 +7,7 @@ import {Pointer} from "rain-solmem-0.1.28/src/lib/LibPointer.sol"; import {IParserV2} from "rainlang-interface-0.2.8/src/interface/IParserV2.sol"; import {IParserPragmaV1, PragmaV1} from "rainlang-interface-0.2.8/src/interface/IParserPragmaV1.sol"; -import {IDescribedByMetaV1} from "rain-metadata-0.1.0/src/interface/IDescribedByMetaV1.sol"; +import {IDescribedByMetaV1} from "rain-metadata-0.1.7/src/interface/IDescribedByMetaV1.sol"; import {LibIntegrityCheck} from "../lib/integrity/LibIntegrityCheck.sol"; import {LibInterpreterStateDataContract} from "../lib/state/LibInterpreterStateDataContract.sol"; diff --git a/src/abstract/BaseRainlangSubParser.sol b/src/abstract/BaseRainlangSubParser.sol index ace330711..2e03712ad 100644 --- a/src/abstract/BaseRainlangSubParser.sol +++ b/src/abstract/BaseRainlangSubParser.sol @@ -13,7 +13,7 @@ import {CMASK_RHS_WORD_TAIL} from "rain-string-0.2.0/src/lib/parse/LibParseCMask import {LibParse, OperandV2} from "../lib/parse/LibParse.sol"; import {LibParseMeta} from "rainlang-interface-0.2.8/src/lib/parse/LibParseMeta.sol"; import {LibParseOperand} from "../lib/parse/LibParseOperand.sol"; -import {IDescribedByMetaV1} from "rain-metadata-0.1.0/src/interface/IDescribedByMetaV1.sol"; +import {IDescribedByMetaV1} from "rain-metadata-0.1.7/src/interface/IDescribedByMetaV1.sol"; import {IParserToolingV1} from "rain-sol-codegen-0.1.36/src/interface/IParserToolingV1.sol"; import {ISubParserToolingV1} from "rain-sol-codegen-0.1.36/src/interface/ISubParserToolingV1.sol"; import {SubParserIndexOutOfBounds} from "../error/ErrSubParse.sol"; diff --git a/src/concrete/extern/RainlangReferenceExtern.sol b/src/concrete/extern/RainlangReferenceExtern.sol index 6ae609c7b..07e6c1733 100644 --- a/src/concrete/extern/RainlangReferenceExtern.sol +++ b/src/concrete/extern/RainlangReferenceExtern.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; +import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol"; import {BadDynamicLength} from "../../error/ErrOpList.sol"; import {BaseRainlangExtern, OperandV2} from "../../abstract/BaseRainlangExtern.sol"; import { @@ -37,7 +37,7 @@ import { OPCODE_FUNCTION_POINTERS } from "../../generated/RainlangReferenceExternPointers.sol"; import {LibDecimalFloat, Float} from "rain-math-float-0.2.1/src/lib/LibDecimalFloat.sol"; -import {IDescribedByMetaV1} from "rain-metadata-0.1.0/src/interface/IDescribedByMetaV1.sol"; +import {IDescribedByMetaV1} from "rain-metadata-0.1.7/src/interface/IDescribedByMetaV1.sol"; /// @dev The number of subparser functions available to the parser. This is NOT /// 1:1 with the number of opcodes provided by the extern component of this diff --git a/src/lib/op/LibAllStandardOps.sol b/src/lib/op/LibAllStandardOps.sol index 6e11f8b27..ee214834c 100644 --- a/src/lib/op/LibAllStandardOps.sol +++ b/src/lib/op/LibAllStandardOps.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.25; import {BadDynamicLength} from "../../error/ErrOpList.sol"; -import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; +import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol"; import {Pointer} from "rain-solmem-0.1.28/src/lib/LibPointer.sol"; import {OperandV2} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; import {AuthoringMetaV2} from "rainlang-interface-0.2.8/src/interface/IParserV2.sol"; diff --git a/test/concrete/TestRainlangExpressionDeployer.sol b/test/concrete/TestRainlangExpressionDeployer.sol index 2534d7a76..80a074a3b 100644 --- a/test/concrete/TestRainlangExpressionDeployer.sol +++ b/test/concrete/TestRainlangExpressionDeployer.sol @@ -8,7 +8,7 @@ import {LibAllStandardOps} from "../../src/lib/op/LibAllStandardOps.sol"; import {TEST_PARSER_ADDRESS} from "../lib/deploy/LibTestInterpreterDeploy.sol"; // Referenced by NatSpec only. //forge-lint: disable-next-line(unused-import) -import {IDescribedByMetaV1} from "rain-metadata-0.1.0/src/interface/IDescribedByMetaV1.sol"; +import {IDescribedByMetaV1} from "rain-metadata-0.1.7/src/interface/IDescribedByMetaV1.sol"; /// @dev Stands in for the meta hash a deployed expression deployer describes /// itself by; the test concrete has no meta. diff --git a/test/lib/integrity/LibIntegrityFnPointers.sol b/test/lib/integrity/LibIntegrityFnPointers.sol index e49343f62..ebebb6447 100644 --- a/test/lib/integrity/LibIntegrityFnPointers.sol +++ b/test/lib/integrity/LibIntegrityFnPointers.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.19; -import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; +import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol"; library LibIntegrityFnPointers { /// Generates fake IO function pointers as the index of each word, as a diff --git a/test/lib/parse/LibMetaFixture.sol b/test/lib/parse/LibMetaFixture.sol index 09610492a..3bf8664b3 100644 --- a/test/lib/parse/LibMetaFixture.sol +++ b/test/lib/parse/LibMetaFixture.sol @@ -5,7 +5,7 @@ pragma solidity ^0.8.18; import {AuthoringMetaV2} from "rainlang-interface-0.2.8/src/interface/IParserV2.sol"; import {OperandV2, LibParseOperand} from "../../../src/lib/parse/LibParseOperand.sol"; import {LibParseState, ParseState} from "../../../src/lib/parse/LibParseState.sol"; -import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; +import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol"; import {LibAllStandardOps} from "../../../src/lib/op/LibAllStandardOps.sol"; import {LibGenParseMeta} from "rainlang-interface-0.2.8/src/lib/codegen/LibGenParseMeta.sol"; diff --git a/test/src/abstract/BaseRainlangSubParser.ierc165.t.sol b/test/src/abstract/BaseRainlangSubParser.ierc165.t.sol index 65bef1589..96a47d649 100644 --- a/test/src/abstract/BaseRainlangSubParser.ierc165.t.sol +++ b/test/src/abstract/BaseRainlangSubParser.ierc165.t.sol @@ -5,7 +5,7 @@ pragma solidity =0.8.25; import {Test} from "forge-std-1.16.2/src/Test.sol"; import {IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/IERC165.sol"; import {ISubParserV4} from "rainlang-interface-0.2.8/src/interface/ISubParserV4.sol"; -import {IDescribedByMetaV1} from "rain-metadata-0.1.0/src/interface/IDescribedByMetaV1.sol"; +import {IDescribedByMetaV1} from "rain-metadata-0.1.7/src/interface/IDescribedByMetaV1.sol"; import {IParserToolingV1} from "rain-sol-codegen-0.1.36/src/interface/IParserToolingV1.sol"; import {ISubParserToolingV1} from "rain-sol-codegen-0.1.36/src/interface/ISubParserToolingV1.sol"; import {ChildRainlangSubParser} from "./ChildRainlangSubParser.sol"; diff --git a/test/src/abstract/EmptyWordParsersSubParser.sol b/test/src/abstract/EmptyWordParsersSubParser.sol index 9da2b8dba..6b08782c5 100644 --- a/test/src/abstract/EmptyWordParsersSubParser.sol +++ b/test/src/abstract/EmptyWordParsersSubParser.sol @@ -5,7 +5,7 @@ pragma solidity =0.8.25; import {BaseRainlangSubParser, AuthoringMetaV2} from "../../../src/abstract/BaseRainlangSubParser.sol"; import {LibGenParseMeta} from "rainlang-interface-0.2.8/src/lib/codegen/LibGenParseMeta.sol"; import {LibParseOperand} from "../../../src/lib/parse/LibParseOperand.sol"; -import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; +import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol"; import {OperandV2} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; /// @dev Sub parser with 1 word in meta but zero word parser pointers. diff --git a/test/src/abstract/HappyPathLiteralSubParser.sol b/test/src/abstract/HappyPathLiteralSubParser.sol index f82d6dafa..2654ac3e7 100644 --- a/test/src/abstract/HappyPathLiteralSubParser.sol +++ b/test/src/abstract/HappyPathLiteralSubParser.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {BaseRainlangSubParser} from "../../../src/abstract/BaseRainlangSubParser.sol"; -import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; +import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol"; /// @dev Simple literal parser that returns the dispatch value unchanged. function echoLiteralParser(bytes32 dispatchValue, uint256, uint256) pure returns (bytes32) { diff --git a/test/src/abstract/MismatchedWordSubParser.sol b/test/src/abstract/MismatchedWordSubParser.sol index 37dfb6161..bbfbe1b43 100644 --- a/test/src/abstract/MismatchedWordSubParser.sol +++ b/test/src/abstract/MismatchedWordSubParser.sol @@ -5,7 +5,7 @@ pragma solidity =0.8.25; import {BaseRainlangSubParser, AuthoringMetaV2} from "../../../src/abstract/BaseRainlangSubParser.sol"; import {LibGenParseMeta} from "rainlang-interface-0.2.8/src/lib/codegen/LibGenParseMeta.sol"; import {LibParseOperand} from "../../../src/lib/parse/LibParseOperand.sol"; -import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; +import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol"; import {OperandV2} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; /// @dev Sub parser with 2 words in meta but only 1 word parser pointer. diff --git a/test/src/concrete/RainlangExpressionDeployer.ierc165.t.sol b/test/src/concrete/RainlangExpressionDeployer.ierc165.t.sol index 17203438e..681b22103 100644 --- a/test/src/concrete/RainlangExpressionDeployer.ierc165.t.sol +++ b/test/src/concrete/RainlangExpressionDeployer.ierc165.t.sol @@ -8,7 +8,7 @@ import {IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/IERC165 import {TestRainlangExpressionDeployer} from "test/concrete/TestRainlangExpressionDeployer.sol"; import {IParserPragmaV1} from "rainlang-interface-0.2.8/src/interface/IParserPragmaV1.sol"; import {IParserV2} from "rainlang-interface-0.2.8/src/interface/IParserV2.sol"; -import {IDescribedByMetaV1} from "rain-metadata-0.1.0/src/interface/IDescribedByMetaV1.sol"; +import {IDescribedByMetaV1} from "rain-metadata-0.1.7/src/interface/IDescribedByMetaV1.sol"; import {IIntegrityToolingV1} from "rain-sol-codegen-0.1.36/src/interface/IIntegrityToolingV1.sol"; contract RainlangExpressionDeployerIERC165Test is Test { diff --git a/test/src/concrete/RainlangReferenceExtern.ierc165.t.sol b/test/src/concrete/RainlangReferenceExtern.ierc165.t.sol index f79ba3a00..4854d4017 100644 --- a/test/src/concrete/RainlangReferenceExtern.ierc165.t.sol +++ b/test/src/concrete/RainlangReferenceExtern.ierc165.t.sol @@ -8,7 +8,7 @@ import {IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/IERC165 import {IInterpreterExternV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterExternV4.sol"; import {ISubParserV4} from "rainlang-interface-0.2.8/src/interface/ISubParserV4.sol"; import {RainlangReferenceExtern} from "../../../src/concrete/extern/RainlangReferenceExtern.sol"; -import {IDescribedByMetaV1} from "rain-metadata-0.1.0/src/interface/IDescribedByMetaV1.sol"; +import {IDescribedByMetaV1} from "rain-metadata-0.1.7/src/interface/IDescribedByMetaV1.sol"; import {ISubParserToolingV1} from "rain-sol-codegen-0.1.36/src/interface/ISubParserToolingV1.sol"; import {IParserToolingV1} from "rain-sol-codegen-0.1.36/src/interface/IParserToolingV1.sol"; import {IIntegrityToolingV1} from "rain-sol-codegen-0.1.36/src/interface/IIntegrityToolingV1.sol"; diff --git a/test/src/lib/integrity/IntegrityHighwater.sol b/test/src/lib/integrity/IntegrityHighwater.sol index 3e26fe094..3487717e6 100644 --- a/test/src/lib/integrity/IntegrityHighwater.sol +++ b/test/src/lib/integrity/IntegrityHighwater.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {LibIntegrityCheck, IntegrityCheckState} from "../../../../src/lib/integrity/LibIntegrityCheck.sol"; -import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; +import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol"; import {OperandV2} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; /// @dev Contract with 2 opcodes for testing StackUnderflowHighwater. diff --git a/test/src/lib/integrity/IntegritySingleOp.sol b/test/src/lib/integrity/IntegritySingleOp.sol index b9e2264a2..49cccb1e7 100644 --- a/test/src/lib/integrity/IntegritySingleOp.sol +++ b/test/src/lib/integrity/IntegritySingleOp.sol @@ -3,7 +3,7 @@ pragma solidity =0.8.25; import {LibIntegrityCheck, IntegrityCheckState} from "../../../../src/lib/integrity/LibIntegrityCheck.sol"; -import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; +import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol"; import {OperandV2} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; /// @dev Contract whose integrity function pointers are valid for its own diff --git a/test/src/lib/parse/LibParse.namedLHS.t.sol b/test/src/lib/parse/LibParse.namedLHS.t.sol index 57b17851e..b6644641f 100644 --- a/test/src/lib/parse/LibParse.namedLHS.t.sol +++ b/test/src/lib/parse/LibParse.namedLHS.t.sol @@ -10,7 +10,7 @@ import {LibBytecode} from "rainlang-interface-0.2.8/src/lib/bytecode/LibBytecode import {LibMetaFixture} from "test/lib/parse/LibMetaFixture.sol"; import {LibParseState, ParseState} from "../../../../src/lib/parse/LibParseState.sol"; import {OperandV2, LibParseOperand} from "../../../../src/lib/parse/LibParseOperand.sol"; -import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; +import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol"; import {LibAllStandardOps} from "../../../../src/lib/op/LibAllStandardOps.sol"; import {LibParseError} from "../../../../src/lib/parse/LibParseError.sol"; import {LibGenParseMeta} from "rainlang-interface-0.2.8/src/lib/codegen/LibGenParseMeta.sol"; diff --git a/test/src/lib/parse/LibParse.singleRHSNamed.gas.t.sol b/test/src/lib/parse/LibParse.singleRHSNamed.gas.t.sol index 92640db67..d76274b93 100644 --- a/test/src/lib/parse/LibParse.singleRHSNamed.gas.t.sol +++ b/test/src/lib/parse/LibParse.singleRHSNamed.gas.t.sol @@ -7,7 +7,7 @@ import {AuthoringMetaV2} from "rainlang-interface-0.2.8/src/interface/IParserV2. import {LibParse} from "../../../../src/lib/parse/LibParse.sol"; import {OperandV2, LibParseOperand} from "../../../../src/lib/parse/LibParseOperand.sol"; import {LibParseState, ParseState} from "../../../../src/lib/parse/LibParseState.sol"; -import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; +import {LibConvert} from "rain-lib-typecast-0.1.4/src/LibConvert.sol"; import {LibAllStandardOps} from "../../../../src/lib/op/LibAllStandardOps.sol"; import {LibGenParseMeta} from "rainlang-interface-0.2.8/src/lib/codegen/LibGenParseMeta.sol";