From ae943953ae5b1e0f68972b32594633dfe4915b63 Mon Sep 17 00:00:00 2001 From: baku-ccron Date: Mon, 7 Sep 2026 13:38:20 +0000 Subject: [PATCH 1/3] Bump rainlang 0.1.2 -> 0.2.1 and the dep chain pinning it rainlang 0.2.0 is the library half after the split (rainlang#552); the concretes and deploy pins left it, so tests bind the package's source-built harness: OpTest deploys the test concretes. recursive_deps=false means vendored dep src resolves through this repo's remappings, so the bump carries the chain the package spells: - rainlang 0.1.2 -> 0.2.1 - rain-interpreter-interface 0.1.0 (orphaned name) -> rainlang-interface 0.2.8, the successor package, with imports re-pointed - rain-solmem 0.1.3 -> 0.1.28 - rain-extrospection 0.1.0 -> 0.1.14 - rain-math-binary 0.1.1 -> 0.1.4 - rain-deploy 0.1.2 -> 0.1.7 - rain-sol-codegen 0.1.0 -> 0.1.36 and forge-std 1.16.1 -> 1.16.2, the versions rainlang 0.2.1 spells; no remappings rain-sol-codegen 0.1.36 refuses a generated file it did not name, so the pointers file follows its convention: PythWords.pointers.sol -> PythWordsPointers.sol. Regenerated to a fixed point; the PythWords bytecode, hash and Zoltu address are unchanged. Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_01QyCCzi9WZPhuXcU1hwr2bq --- .pre-commit-config.yaml | 1 + foundry.toml | 20 +++--- remappings.txt | 16 ++--- script/Build.sol | 10 +-- script/BuildAuthoringMeta.sol | 2 +- script/Deploy.sol | 2 +- soldeer.lock | 70 +++++++++---------- src/abstract/PythExtern.sol | 4 +- src/abstract/PythSubParser.sol | 10 +-- src/concrete/PythWords.sol | 2 +- ...rds.pointers.sol => PythWordsPointers.sol} | 7 +- src/lib/op/LibOpPythPrice.sol | 2 +- src/lib/parse/LibPythSubParser.sol | 2 +- test/src/concrete/PythWords.pythPrice.t.sol | 2 +- test/src/lib/op/LibOpPythPrice.t.sol | 2 +- test/src/lib/pyth/LibPyth.constants.t.sol | 2 +- .../pyth/LibPyth.getPriceFeedContract.t.sol | 2 +- .../src/lib/pyth/LibPyth.getPriceFeedId.t.sol | 2 +- .../pyth/LibPyth.getPriceNoOlderThan.t.sol | 2 +- 19 files changed, 78 insertions(+), 82 deletions(-) create mode 120000 .pre-commit-config.yaml rename src/generated/{PythWords.pointers.sol => PythWordsPointers.sol} (89%) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 120000 index 0000000..e2b5926 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1 @@ +/nix/store/srmh53drw74yz5hpvrjlx3fxmvxkwfp9-pre-commit-config.json \ No newline at end of file diff --git a/foundry.toml b/foundry.toml index b8ba16a..b0872bd 100644 --- a/foundry.toml +++ b/foundry.toml @@ -9,8 +9,8 @@ solc = "0.8.25" fs_permissions = [ - { access = "read-write", path = "src/generated" }, - { access = "read-write", path = "meta" }, + { access = "read-write", path = "src/generated" }, + { access = "read-write", path = "meta" }, ] evm_version = "cancun" @@ -22,22 +22,22 @@ bytecode_hash = "none" cbor_metadata = false [dependencies] -forge-std = "1.16.1" +"rainlang-interface" = "0.2.8" +"forge-std" = "1.16.2" "@openzeppelin-contracts" = "5.6.1" "@pythnetwork-pyth-sdk-solidity" = "4.3.1" -rainlang = "0.1.2" -"rain-interpreter-interface" = "0.1.0" +"rainlang" = "0.2.1" "rain-metadata" = "0.1.0" -"rain-sol-codegen" = "0.1.0" +"rain-sol-codegen" = "0.1.36" "rain-math-float" = "0.1.1" "rain-lib-typecast" = "0.1.0" -"rain-deploy" = "0.1.2" -"rain-extrospection" = "0.1.0" +"rain-deploy" = "0.1.7" +"rain-extrospection" = "0.1.14" "rain-intorastring" = "0.1.0" "rain-lib-hash" = "0.1.0" "rain-lib-memkv" = "0.1.0" -"rain-math-binary" = "0.1.1" -"rain-solmem" = "0.1.3" +"rain-math-binary" = "0.1.4" +"rain-solmem" = "0.1.28" "rain-string" = "0.2.0" "rain-tofu-erc20-decimals" = "0.1.1" diff --git a/remappings.txt b/remappings.txt index 7edb6f1..e7561e8 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,18 +1,18 @@ @openzeppelin-contracts-5.6.1/=dependencies/@openzeppelin-contracts-5.6.1/ @pythnetwork-pyth-sdk-solidity-4.3.1/=dependencies/@pythnetwork-pyth-sdk-solidity-4.3.1/ -forge-std-1.16.1/=dependencies/forge-std-1.16.1/ -rain-deploy-0.1.2/=dependencies/rain-deploy-0.1.2/ -rain-extrospection-0.1.0/=dependencies/rain-extrospection-0.1.0/ -rain-interpreter-interface-0.1.0/=dependencies/rain-interpreter-interface-0.1.0/ +forge-std-1.16.2/=dependencies/forge-std-1.16.2/ +rain-deploy-0.1.7/=dependencies/rain-deploy-0.1.7/ +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-math-binary-0.1.1/=dependencies/rain-math-binary-0.1.1/ +rain-math-binary-0.1.4/=dependencies/rain-math-binary-0.1.4/ rain-math-float-0.1.1/=dependencies/rain-math-float-0.1.1/ rain-metadata-0.1.0/=dependencies/rain-metadata-0.1.0/ -rain-sol-codegen-0.1.0/=dependencies/rain-sol-codegen-0.1.0/ -rain-solmem-0.1.3/=dependencies/rain-solmem-0.1.3/ +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/ rain-tofu-erc20-decimals-0.1.1/=dependencies/rain-tofu-erc20-decimals-0.1.1/ -rainlang-0.1.2/=dependencies/rainlang-0.1.2/ +rainlang-0.2.1/=dependencies/rainlang-0.2.1/ +rainlang-interface-0.2.8/=dependencies/rainlang-interface-0.2.8/ diff --git a/script/Build.sol b/script/Build.sol index ce8c3eb..26fe00b 100644 --- a/script/Build.sol +++ b/script/Build.sol @@ -2,11 +2,11 @@ // 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 {PythWords} from "src/concrete/PythWords.sol"; -import {LibFs} from "rain-sol-codegen-0.1.0/src/lib/LibFs.sol"; -import {LibCodeGen} from "rain-sol-codegen-0.1.0/src/lib/LibCodeGen.sol"; -import {LibGenParseMeta} from "rain-interpreter-interface-0.1.0/src/lib/codegen/LibGenParseMeta.sol"; +import {LibFs} from "rain-sol-codegen-0.1.36/src/lib/LibFs.sol"; +import {LibCodeGen} from "rain-sol-codegen-0.1.36/src/lib/LibCodeGen.sol"; +import {LibGenParseMeta} from "rainlang-interface-0.2.8/src/lib/codegen/LibGenParseMeta.sol"; import {LibPythSubParser} from "src/lib/parse/LibPythSubParser.sol"; import {PARSE_META_BUILD_DEPTH} from "src/abstract/PythSubParser.sol"; @@ -19,7 +19,7 @@ contract Build is Script { LibFs.buildFileForContract( vm, address(pythWords), - name, + "PythWordsPointers", string.concat( LibCodeGen.describedByMetaHashConstantString(vm, name), LibGenParseMeta.parseMetaConstantString(vm, LibPythSubParser.authoringMetaV2(), PARSE_META_BUILD_DEPTH), diff --git a/script/BuildAuthoringMeta.sol b/script/BuildAuthoringMeta.sol index 046511c..77874ec 100644 --- a/script/BuildAuthoringMeta.sol +++ b/script/BuildAuthoringMeta.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 {LibPythSubParser} from "src/lib/parse/LibPythSubParser.sol"; /// @title Pyth subparser Authoring Meta diff --git a/script/Deploy.sol b/script/Deploy.sol index 08b3194..20499d2 100644 --- a/script/Deploy.sol +++ b/script/Deploy.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 {PythWords} from "../src/concrete/PythWords.sol"; import {IMetaBoardV1_2} from "rain-metadata-0.1.0/src/interface/unstable/IMetaBoardV1_2.sol"; import {LibDescribedByMeta} from "rain-metadata-0.1.0/src/lib/LibDescribedByMeta.sol"; diff --git a/soldeer.lock b/soldeer.lock index 6108e49..1a3ec84 100644 --- a/soldeer.lock +++ b/soldeer.lock @@ -14,31 +14,24 @@ integrity = "0f2a99b64bc29a7925eb7026a5ef764e220c6c70ae9f3f2fbf11c2447c899cb5" [[dependencies]] name = "forge-std" -version = "1.16.1" -url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_16_1_08-05-2026_08:51:16_forge-std-1.16.zip" -checksum = "839b61832925c7152c7b6dffbfa4998d9e606211179bd8f604733124e8a7cb57" -integrity = "60e55d10150354ca4a1e2985c5456c834b92b82ef85ab0e1d92a7786cddbd219" +version = "1.16.2" +url = "https://soldeer-revisions.s3.amazonaws.com/forge-std/1_16_2_03-07-2026_07:37:45_forge-std-1.16.zip" +checksum = "405dccc9d60d753f6abc412b4adf0359f4390f65dbadbbb277a12b4946ed8969" +integrity = "5fb4325b60d7d4194bd0481e2f94398cf1d9c6561dd12a66fb2748ef4a68205f" [[dependencies]] name = "rain-deploy" -version = "0.1.2" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-deploy/0_1_2_09-05-2026_19:49:20_rain.zip" -checksum = "94d3daf2f9f90062d2e676077c2b4ccd2bdd66201665a2209e98016e155f619a" -integrity = "10bff708d9e5d8b77655b8a8fc0c755cef8e3fc876cc3ff100425d27b08294a0" +version = "0.1.7" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-deploy/0_1_7_19-08-2026_05:57:12_rain.zip" +checksum = "d0e868184ad16fc6abb704bb1dddab57ebf2beb042529690e030568f5c81a9b3" +integrity = "e51da6f2b3a0f427a0aac5d7714bed2027f5cf0f39b31f0692e9623ceeaa47f2" [[dependencies]] name = "rain-extrospection" -version = "0.1.0" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-extrospection/0_1_0_11-05-2026_12:26:12_rain.zip" -checksum = "97297c3f1d623c63f5996b4266a4c26f895a1ca17ab271a619af601f8950521d" -integrity = "30f7e23c71b24267d2db46085049aec5baaa693825ff8bc8fd72bd685da479ad" - -[[dependencies]] -name = "rain-interpreter-interface" -version = "0.1.0" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-interpreter-interface/0_1_0_12-05-2026_18:43:02_rain.interpreter.zip" -checksum = "887c4d5f1a87713c49f015b3fcdb295defbb495b126d15f9850c0ce72ef79639" -integrity = "c1b89f8a7ad02507ceb051b6c0f2750f6abe1ba99ffdfe1c9ac93905db90e75d" +version = "0.1.14" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-extrospection/0_1_14_06-09-2026_09:00:43_rain.zip" +checksum = "a9f34937f66c48c8cd15a700ccebc56c25b6a8af32f0b8757fcfa92be8bbfb56" +integrity = "4fda4ce47b006de0619aba0591a00cece86454a5867643d99412bc57790cdce0" [[dependencies]] name = "rain-intorastring" @@ -70,10 +63,10 @@ integrity = "092781f87fd9227c4c95aafde59300c503d6a9a355beaeb5c5732fe6e36676d6" [[dependencies]] name = "rain-math-binary" -version = "0.1.1" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-math-binary/0_1_1_09-05-2026_19:49:57_rain.math.zip" -checksum = "6f966e4f5f59103b62de2004005db508824622495b893a646d0e2a35511f0093" -integrity = "4cfaa11c0e48ac46824a10fec2184863d114f09c171544b721d782386708dca7" +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" @@ -91,17 +84,17 @@ integrity = "f17f10aa50e9e2b254c689c83f41b3cabab81c95bad06424b9b3e9c92d02e577" [[dependencies]] name = "rain-sol-codegen" -version = "0.1.0" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-sol-codegen/0_1_0_09-05-2026_20:30:25_rain.sol.zip" -checksum = "6b5abd394c5db86ac64214262b7a5115158f480b2fbd74442672dfe52bb67310" -integrity = "e22748ce2ba7eca3ce71e23b2271d1c0f370b989507e784b0a4850a7a9e52157" +version = "0.1.36" +url = "https://soldeer-revisions.s3.amazonaws.com/rain-sol-codegen/0_1_36_18-08-2026_09:20:33_rain.sol.zip" +checksum = "b5d101d46941a95fee441224e101004139814ae9afa2793138874bd7e93991ff" +integrity = "164e2655ac8b66bcf52c799421706d3dfaab987addaaeadd74574e70fd2eb6ed" [[dependencies]] name = "rain-solmem" -version = "0.1.3" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-solmem/0_1_3_09-05-2026_19:49:33_rain.zip" -checksum = "1d405bb81f7c9e56d1717de0d60da918d2fc2fa4db083efd2abe9906378d019f" -integrity = "e879d2743f9d884f647b9dd489889a83f2cea5f76eb69409a113e1baa69d3643" +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 = "rain-string" @@ -119,7 +112,14 @@ integrity = "9e1fccf893dd0d90aeb445c78f9eee3904bc50287ff1da30b954508f18412cd2" [[dependencies]] name = "rainlang" -version = "0.1.2" -url = "https://soldeer-revisions.s3.amazonaws.com/rainlang/0_1_2_14-05-2026_19:37:46_rainlang.zip" -checksum = "87f4056d17bc103d6ca8d1881fe64c67d74d36f67ec1d858d071e3f77a449845" -integrity = "8c93188eddb2df33bc3c0e4f529f5de8476e813803bbaadc59500f6d37baebce" +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" +version = "0.2.8" +url = "https://soldeer-revisions.s3.amazonaws.com/rainlang-interface/0_2_8_06-09-2026_08:58:04_rainlang.zip" +checksum = "aae7d5721cdd21240f5dca7b1d6a861101431ead94db6def6a134932b54e7947" +integrity = "508259e321ecc0ad9b0ff1a8b0ac1e66a8858e599ce7328e06b6a4e7d3ae8889" diff --git a/src/abstract/PythExtern.sol b/src/abstract/PythExtern.sol index dcad4ca..e792911 100644 --- a/src/abstract/PythExtern.sol +++ b/src/abstract/PythExtern.sol @@ -2,10 +2,10 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.25; -import {BaseRainlangExtern, OperandV2, StackItem} from "rainlang-0.1.2/src/abstract/BaseRainlangExtern.sol"; +import {BaseRainlangExtern, OperandV2, StackItem} from "rainlang-0.2.1/src/abstract/BaseRainlangExtern.sol"; import {LibOpPythPrice} from "../lib/op/LibOpPythPrice.sol"; import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; -import {OPCODE_FUNCTION_POINTERS, INTEGRITY_FUNCTION_POINTERS} from "../generated/PythWords.pointers.sol"; +import {OPCODE_FUNCTION_POINTERS, INTEGRITY_FUNCTION_POINTERS} from "../generated/PythWordsPointers.sol"; uint256 constant OPCODE_PYTH_PRICE = 0; diff --git a/src/abstract/PythSubParser.sol b/src/abstract/PythSubParser.sol index 9adc262..3549907 100644 --- a/src/abstract/PythSubParser.sol +++ b/src/abstract/PythSubParser.sol @@ -3,17 +3,17 @@ pragma solidity ^0.8.25; import {OPCODE_PYTH_PRICE} from "./PythExtern.sol"; -import {OperandV2, BaseRainlangSubParser} from "rainlang-0.1.2/src/abstract/BaseRainlangSubParser.sol"; -import {LibParseOperand} from "rainlang-0.1.2/src/lib/parse/LibParseOperand.sol"; +import {OperandV2, BaseRainlangSubParser} from "rainlang-0.2.1/src/abstract/BaseRainlangSubParser.sol"; +import {LibParseOperand} from "rainlang-0.2.1/src/lib/parse/LibParseOperand.sol"; import {SUB_PARSER_WORD_PARSERS_LENGTH, SUB_PARSER_WORD_PYTH_PRICE} from "../lib/parse/LibPythSubParser.sol"; import {LibConvert} from "rain-lib-typecast-0.1.0/src/LibConvert.sol"; -import {LibSubParse} from "rainlang-0.1.2/src/lib/parse/LibSubParse.sol"; -import {IInterpreterExternV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterExternV4.sol"; +import {LibSubParse} from "rainlang-0.2.1/src/lib/parse/LibSubParse.sol"; +import {IInterpreterExternV4} from "rainlang-interface-0.2.8/src/interface/IInterpreterExternV4.sol"; import { OPERAND_HANDLER_FUNCTION_POINTERS as SUB_PARSER_OPERAND_HANDLERS, PARSE_META as SUB_PARSER_PARSE_META, SUB_PARSER_WORD_PARSERS -} from "../generated/PythWords.pointers.sol"; +} from "../generated/PythWordsPointers.sol"; uint8 constant PARSE_META_BUILD_DEPTH = 1; diff --git a/src/concrete/PythWords.sol b/src/concrete/PythWords.sol index 3fcf41e..522ffb6 100644 --- a/src/concrete/PythWords.sol +++ b/src/concrete/PythWords.sol @@ -5,7 +5,7 @@ pragma solidity =0.8.25; import {PythExtern, BaseRainlangExtern} from "../abstract/PythExtern.sol"; import {PythSubParser, BaseRainlangSubParser} from "../abstract/PythSubParser.sol"; import {IDescribedByMetaV1} from "rain-metadata-0.1.0/src/interface/IDescribedByMetaV1.sol"; -import {DESCRIBED_BY_META_HASH} from "../generated/PythWords.pointers.sol"; +import {DESCRIBED_BY_META_HASH} from "../generated/PythWordsPointers.sol"; contract PythWords is PythExtern, PythSubParser { /// @inheritdoc IDescribedByMetaV1 diff --git a/src/generated/PythWords.pointers.sol b/src/generated/PythWordsPointers.sol similarity index 89% rename from src/generated/PythWords.pointers.sol rename to src/generated/PythWordsPointers.sol index 888d0f9..f5763ad 100644 --- a/src/generated/PythWords.pointers.sol +++ b/src/generated/PythWordsPointers.sol @@ -2,12 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.25; -// THIS FILE IS AUTOGENERATED BY ./script/BuildPointers.sol - -// This file is committed to the repository because there is a circular -// dependency between the contract and its pointers file. The contract -// needs the pointers file to exist so that it can compile, and the pointers -// file needs the contract to exist so that it can be compiled. +// THIS FILE IS AUTOGENERATED BY THE BUILD SCRIPT. DO NOT EDIT BY HAND. /// @dev Hash of the known bytecode. bytes32 constant BYTECODE_HASH = bytes32(0x9ed8289331be7ecb97ebe6886b5dd0beb8f61a96d807dcf0f99d8b1c0096b710); diff --git a/src/lib/op/LibOpPythPrice.sol b/src/lib/op/LibOpPythPrice.sol index 9fe048b..c4bcd70 100644 --- a/src/lib/op/LibOpPythPrice.sol +++ b/src/lib/op/LibOpPythPrice.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.25; -import {OperandV2, StackItem} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol"; +import {OperandV2, StackItem} from "rainlang-interface-0.2.8/src/interface/IInterpreterV4.sol"; import {LibIntOrAString, IntOrAString} from "rain-intorastring-0.1.0/src/lib/LibIntOrAString.sol"; import {LibPyth} from "../pyth/LibPyth.sol"; import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; diff --git a/src/lib/parse/LibPythSubParser.sol b/src/lib/parse/LibPythSubParser.sol index a3dc5d2..a129291 100644 --- a/src/lib/parse/LibPythSubParser.sol +++ b/src/lib/parse/LibPythSubParser.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.25; -import {AuthoringMetaV2} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IParserV1.sol"; +import {AuthoringMetaV2} from "rainlang-interface-0.2.8/src/interface/deprecated/v1/IParserV1.sol"; uint256 constant SUB_PARSER_WORD_PYTH_PRICE = 0; diff --git a/test/src/concrete/PythWords.pythPrice.t.sol b/test/src/concrete/PythWords.pythPrice.t.sol index 2150c3f..52a083c 100644 --- a/test/src/concrete/PythWords.pythPrice.t.sol +++ b/test/src/concrete/PythWords.pythPrice.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {OpTest, StackItem} from "rainlang-0.1.2/test/abstract/OpTest.sol"; +import {OpTest, StackItem} from "rainlang-0.2.1/test/abstract/OpTest.sol"; import {PythWords} from "src/concrete/PythWords.sol"; import {FORK_RPC_URL_ARBITRUM, FORK_BLOCK_ARBITRUM} from "test/lib/LibFork.sol"; import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol"; diff --git a/test/src/lib/op/LibOpPythPrice.t.sol b/test/src/lib/op/LibOpPythPrice.t.sol index bbc68fb..bba4af8 100644 --- a/test/src/lib/op/LibOpPythPrice.t.sol +++ b/test/src/lib/op/LibOpPythPrice.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 {LibOpPythPrice, OperandV2, StackItem} from "src/lib/op/LibOpPythPrice.sol"; import {LibIntOrAString, IntOrAString} from "rain-intorastring-0.1.0/src/lib/LibIntOrAString.sol"; import {FORK_RPC_URL_ARBITRUM, FORK_BLOCK_ARBITRUM} from "test/lib/LibFork.sol"; diff --git a/test/src/lib/pyth/LibPyth.constants.t.sol b/test/src/lib/pyth/LibPyth.constants.t.sol index 2c6a80f..024baa2 100644 --- a/test/src/lib/pyth/LibPyth.constants.t.sol +++ b/test/src/lib/pyth/LibPyth.constants.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 {LibIntOrAString, IntOrAString} from "rain-intorastring-0.1.0/src/lib/LibIntOrAString.sol"; import {LibPyth} from "src/lib/pyth/LibPyth.sol"; diff --git a/test/src/lib/pyth/LibPyth.getPriceFeedContract.t.sol b/test/src/lib/pyth/LibPyth.getPriceFeedContract.t.sol index e6da697..78a82d7 100644 --- a/test/src/lib/pyth/LibPyth.getPriceFeedContract.t.sol +++ b/test/src/lib/pyth/LibPyth.getPriceFeedContract.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 {LibPyth, UnsupportedChainId} from "src/lib/pyth/LibPyth.sol"; contract LibPythGetPriceFeedContractTest is Test { diff --git a/test/src/lib/pyth/LibPyth.getPriceFeedId.t.sol b/test/src/lib/pyth/LibPyth.getPriceFeedId.t.sol index 289e829..2a1fe55 100644 --- a/test/src/lib/pyth/LibPyth.getPriceFeedId.t.sol +++ b/test/src/lib/pyth/LibPyth.getPriceFeedId.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 {LibPyth, UnsupportedFeedSymbol} from "src/lib/pyth/LibPyth.sol"; import {IntOrAString, LibIntOrAString} from "rain-intorastring-0.1.0/src/lib/LibIntOrAString.sol"; diff --git a/test/src/lib/pyth/LibPyth.getPriceNoOlderThan.t.sol b/test/src/lib/pyth/LibPyth.getPriceNoOlderThan.t.sol index 4a8afbc..71f1345 100644 --- a/test/src/lib/pyth/LibPyth.getPriceNoOlderThan.t.sol +++ b/test/src/lib/pyth/LibPyth.getPriceNoOlderThan.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.25; -import {Test, console2} from "forge-std-1.16.1/src/Test.sol"; +import {Test, console2} from "forge-std-1.16.2/src/Test.sol"; import {LibPyth} from "src/lib/pyth/LibPyth.sol"; import { FORK_RPC_URL_ARBITRUM, From 4fab051f05eda17827a420e6b64c378ac375c622 Mon Sep 17 00:00:00 2001 From: baku-ccron Date: Mon, 7 Sep 2026 13:40:01 +0000 Subject: [PATCH 2/3] Untrack the dev shell's generated .pre-commit-config.yaml git-hooks.nix writes it on shell entry and rainix-copy-artifacts regenerates it, so a committed copy is always stale; ignored like the other rain repos. Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_01QyCCzi9WZPhuXcU1hwr2bq --- .gitignore | 1 + .pre-commit-config.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 .pre-commit-config.yaml diff --git a/.gitignore b/.gitignore index 6bd586f..a1c3a60 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ out cache node_modules dependencies +.pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 120000 index e2b5926..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1 +0,0 @@ -/nix/store/srmh53drw74yz5hpvrjlx3fxmvxkwfp9-pre-commit-config.json \ No newline at end of file From be37fe1c21f5638d6d0886ff4146e5ef5b698de5 Mon Sep 17 00:00:00 2001 From: baku-ccron Date: Mon, 7 Sep 2026 13:48:01 +0000 Subject: [PATCH 3/3] Update flake inputs: the 2024 rain.cli pin fetches crates that now 403 nix flake update moves rain.cli to its 2026-06-02 revision (and its rainix to 2026-06-01), the pins rain.dia carries. The 2024 pin's Rust crate tarballs no longer download, which broke both the dev shell and rainix-copy-artifacts' currency check. Regenerated with the new CLI: meta and pointers are byte-identical. Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_01QyCCzi9WZPhuXcU1hwr2bq --- flake.lock | 365 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 247 insertions(+), 118 deletions(-) diff --git a/flake.lock b/flake.lock index 78eae1c..5ffa168 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,37 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -23,11 +55,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -41,11 +73,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -74,11 +106,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -91,24 +123,6 @@ "inputs": { "systems": "systems_5" }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "inputs": { - "systems": "systems_6" - }, "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", @@ -123,7 +137,7 @@ "type": "github" } }, - "flake-utils_8": { + "flake-utils_7": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -138,9 +152,9 @@ "type": "github" } }, - "flake-utils_9": { + "flake-utils_8": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -162,31 +176,30 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1714727549, - "narHash": "sha256-CWXRTxxcgMfQubJugpeg3yVWIfm70MYTtgaKWKgD60U=", + "lastModified": 1778486972, + "narHash": "sha256-iuy/TbK9AbghEld2VSFuxyAF30LkOGUUdtrvixLfE7M=", "owner": "shazow", "repo": "foundry.nix", - "rev": "47cf189ec395eda4b3e0623179d1075c8027ca97", + "rev": "db117ae95a77b9ead24137c3ccb28896ae4fa4ec", "type": "github" }, "original": { "owner": "shazow", - "ref": "monthly", "repo": "foundry.nix", "type": "github" } }, "foundry_2": { "inputs": { - "flake-utils": "flake-utils_8", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1758705030, - "narHash": "sha256-zYM8PiEXANNrtjfyGUc7w37/D/kCynp0cQS+wCQ77GI=", + "lastModified": 1778486972, + "narHash": "sha256-iuy/TbK9AbghEld2VSFuxyAF30LkOGUUdtrvixLfE7M=", "owner": "shazow", "repo": "foundry.nix", - "rev": "b59a55014050110170023e3e1c277c1d4a2f055b", + "rev": "db117ae95a77b9ead24137c3ccb28896ae4fa4ec", "type": "github" }, "original": { @@ -195,6 +208,91 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1778507602, + "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "git-hooks-nix_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "gitignore": "gitignore_2", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "lastModified": 1778507602, + "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "rain", + "rainix", + "git-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { + "inputs": { + "nixpkgs": [ + "rainix", + "git-hooks-nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1666753130, @@ -209,13 +307,45 @@ "type": "indirect" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1777641297, + "narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1714764285, - "narHash": "sha256-oeevp27kMeDjKdxaTyXyS14TLjJrpJhXp7UVEUdYqYs=", + "lastModified": 1770073757, + "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "47472570b1e607482890801aeaf29bfb749884f6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1778656924, + "narHash": "sha256-lKVrom9wOmpC3i7m+uBoGaBdW0PfH3QbLRG1XmuC6YA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d121ce778b2609ae9e749a711295ffca013a82c4", + "rev": "4ba039de0909446943c07e2b42bd2f0f4507072e", "type": "github" }, "original": { @@ -224,13 +354,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1706487304, - "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "90f456026d284c22b3e3497be980b2e47d0b28ac", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -240,13 +370,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1708564076, - "narHash": "sha256-KKkqoxlgx9n3nwST7O2kM8tliDOijiSSNaWuSkiozdQ=", + "lastModified": 1777641297, + "narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "98b00b6947a9214381112bdb6f89c25498db4959", + "rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0", "type": "github" }, "original": { @@ -256,7 +386,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1666753130, "narHash": "sha256-Wff1dGPFSneXJLI2c0kkdWTgxnQ416KE6X4KnFkgPYQ=", @@ -270,44 +400,44 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1758711836, - "narHash": "sha256-uBqPg7wNX2v6YUdTswH7wWU8wqb60cFZx0tHaWTGF30=", - "owner": "nixos", + "lastModified": 1770073757, + "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "46f97b78e825ae762c0224e3983c47687436a498", + "rev": "47472570b1e607482890801aeaf29bfb749884f6", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", - "owner": "NixOS", + "lastModified": 1778656924, + "narHash": "sha256-lKVrom9wOmpC3i7m+uBoGaBdW0PfH3QbLRG1XmuC6YA=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", + "rev": "4ba039de0909446943c07e2b42bd2f0f4507072e", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { - "lastModified": 1748662220, - "narHash": "sha256-7gGa49iB9nCnFk4h/g9zwjlQAyjtpgcFkODjcOQS0Es=", + "lastModified": 1744536153, + "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59138c7667b7970d205d6a05a8bfa2d78caa3643", + "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", "type": "github" }, "original": { @@ -323,11 +453,11 @@ "rainix": "rainix" }, "locked": { - "lastModified": 1714768001, - "narHash": "sha256-Vv5FZx6AFaHsJWQl5bsuhLbY8NWGeD0JHbAdceVZMqo=", + "lastModified": 1780414163, + "narHash": "sha256-b2INClNtYE2lupIGVFP2M3UEXMrk0GZk1rA6sZqMlrI=", "owner": "rainlanguage", "repo": "rain.cli", - "rev": "dc7ffe3b905ca57e92be6f294426f32fcf8005eb", + "rev": "24814702413a577987850634f55fde1f7788777c", "type": "github" }, "original": { @@ -340,16 +470,17 @@ "inputs": { "flake-utils": "flake-utils_3", "foundry": "foundry", - "nixpkgs": "nixpkgs_2", + "git-hooks-nix": "git-hooks-nix", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay", "solc": "solc" }, "locked": { - "lastModified": 1714764843, - "narHash": "sha256-7ae0pHvjlInc1V3QxjW5iNhXAYerO1/fhLgzQnPNPjE=", + "lastModified": 1780287289, + "narHash": "sha256-eZ74zj6VwotSmT1kXImwA2yX0el0pZthcgNjg7j/AyQ=", "owner": "rainlanguage", "repo": "rainix", - "rev": "f3bdb28f353f8cba28b2bba86f79c362dd65ee53", + "rev": "f22d4dcaca61717e33eac65e7b09b9a82f604c1f", "type": "github" }, "original": { @@ -360,18 +491,19 @@ }, "rainix_2": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "foundry": "foundry_2", - "nixpkgs": "nixpkgs_6", + "git-hooks-nix": "git-hooks-nix_2", + "nixpkgs": "nixpkgs_8", "rust-overlay": "rust-overlay_2", "solc": "solc_2" }, "locked": { - "lastModified": 1758730752, - "narHash": "sha256-ZQ1INSsEWYgb1NdC5zo6nu1ObLzOCDI+wjiZ4222fQ8=", + "lastModified": 1788424456, + "narHash": "sha256-qsR/sPGQxSpr9n95Ac+QwuVrs0jnHfrTyX6REKYv00E=", "owner": "rainprotocol", "repo": "rainix", - "rev": "cc7c9bbbd9b817aa3a6a5c994262e14fb0bc920c", + "rev": "a3ce07667219a5d86ddb2175fdae871402b39a2b", "type": "github" }, "original": { @@ -389,15 +521,14 @@ }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1714702555, - "narHash": "sha256-/NoUbE5S5xpK1FU3nlHhQ/tL126+JcisXdzy3Ng4pDU=", + "lastModified": 1778642276, + "narHash": "sha256-bhk4lawR4ZnFhPtamB5WkCyvfgyZmsEUbWfT/3FRxFY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f0e3ef7b7fbed78e12e5100851175d28af4b7c6", + "rev": "77265d2dc1e61b2abfd3b1d6609dbb66fe75e0a5", "type": "github" }, "original": { @@ -408,14 +539,14 @@ }, "rust-overlay_2": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1758681214, - "narHash": "sha256-8cW731vev6kfr58cILO2ZsjHwaPhm88dQ8Q6nTSjP9I=", + "lastModified": 1778642276, + "narHash": "sha256-bhk4lawR4ZnFhPtamB5WkCyvfgyZmsEUbWfT/3FRxFY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b12ed88d8d33d4f3cbc842bf29fad93bb1437299", + "rev": "77265d2dc1e61b2abfd3b1d6609dbb66fe75e0a5", "type": "github" }, "original": { @@ -426,15 +557,16 @@ }, "solc": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_5", + "solc-macos-amd64-list-json": "solc-macos-amd64-list-json" }, "locked": { - "lastModified": 1711538161, - "narHash": "sha256-rETVdEIQ2PyEcNgzXXFSiYAYl0koCeGDIWp9XYBTxoQ=", + "lastModified": 1777817996, + "narHash": "sha256-iI71iUhD7THLibl3w1JcQEhHmTwZMxChi70RTe33BAo=", "owner": "hellwolf", "repo": "solc.nix", - "rev": "a995838545a7383a0b37776e969743b1346d5479", + "rev": "e3cf898cb804d5c0e5474b378a300fe8942e67d6", "type": "github" }, "original": { @@ -446,27 +578,39 @@ "solc-macos-amd64-list-json": { "flake": false, "locked": { - "narHash": "sha256-AvITkfpNYgCypXuLJyqco0li+unVw39BAfdOZvd/SPE=", + "narHash": "sha256-zzwwHA2qPotv7yp8mK7+y9BZhm7ytuFeCJVvKBBdBn4=", + "type": "file", + "url": "https://github.com/argotorg/solc-bin/raw/902dfaf/macosx-amd64/list.json" + }, + "original": { + "type": "file", + "url": "https://github.com/argotorg/solc-bin/raw/902dfaf/macosx-amd64/list.json" + } + }, + "solc-macos-amd64-list-json_2": { + "flake": false, + "locked": { + "narHash": "sha256-zzwwHA2qPotv7yp8mK7+y9BZhm7ytuFeCJVvKBBdBn4=", "type": "file", - "url": "https://github.com/argotorg/solc-bin/raw/26fc3fd/macosx-amd64/list.json" + "url": "https://github.com/argotorg/solc-bin/raw/902dfaf/macosx-amd64/list.json" }, "original": { "type": "file", - "url": "https://github.com/argotorg/solc-bin/raw/26fc3fd/macosx-amd64/list.json" + "url": "https://github.com/argotorg/solc-bin/raw/902dfaf/macosx-amd64/list.json" } }, "solc_2": { "inputs": { - "flake-utils": "flake-utils_9", - "nixpkgs": "nixpkgs_8", - "solc-macos-amd64-list-json": "solc-macos-amd64-list-json" + "flake-utils": "flake-utils_8", + "nixpkgs": "nixpkgs_10", + "solc-macos-amd64-list-json": "solc-macos-amd64-list-json_2" }, "locked": { - "lastModified": 1756368702, - "narHash": "sha256-cqEHv7uCV0LibmQphyiXZ1+jYtGjMNb9Pae4tfcAcF8=", + "lastModified": 1777817996, + "narHash": "sha256-iI71iUhD7THLibl3w1JcQEhHmTwZMxChi70RTe33BAo=", "owner": "hellwolf", "repo": "solc.nix", - "rev": "d83e90df2fa8359a690f6baabf76099432193c3f", + "rev": "e3cf898cb804d5c0e5474b378a300fe8942e67d6", "type": "github" }, "original": { @@ -564,21 +708,6 @@ "repo": "default", "type": "github" } - }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root",