From fa0922cb018a680c7884752cdec1e4f6739ebab8 Mon Sep 17 00:00:00 2001 From: baku-ccron Date: Sat, 22 Aug 2026 21:31:44 +0000 Subject: [PATCH 1/3] Bump rain-sol-codegen to 0.1.36, rain-deploy to 0.1.7, forge-std to 1.16.2 Coherent forward pin set: forge-std 1.16.2 + rain-deploy 0.1.7 + rain-sol-codegen 0.1.36. Import-prefix rewrites across ~105 files, BuildPointers.sol migrated to the 0.1.36 buildFileForTaggedContract API with a pointerFile() helper so frozen 0_1_1/ keeps .pointers.sol while new cuts carry .sol. The 12 candidate files are git mv'd X.pointers.sol -> X.sol (required before regeneration: the 0.1.36 orphan check reverts on .pointers.sol siblings) and regenerated. Pin values did not move: codegen is script-side only. All 12 renamed candidates differ from their pre-bump artifacts only in comment header lines; BYTECODE_HASH, DEPLOYED_ADDRESS and CREATION_CODE are byte-identical, so the next release deploys the same bytecode. Co-Authored-By: Claude Fable 5 --- foundry.toml | 6 +-- remappings.txt | 6 +-- .../20260619-deploy-v4-authoriser-clone.s.sol | 4 +- ...0260623-upgrade-receipt-vaults-to-v4.s.sol | 4 +- script/20260706-deploy-tokens-ethereum.s.sol | 6 +-- ...60716-migrate-beacon-owners-ethereum.s.sol | 4 +- ...60722-migrate-beacon-owners-hyperevm.s.sol | 4 +- ...722-swap-remaining-vault-authorisers.s.sol | 4 +- script/20260722-swap-rklb-authoriser.s.sol | 4 +- ...-provision-additional-service-signer.s.sol | 4 +- .../20260729-deploy-governance-timelock.s.sol | 6 +-- ...60729-migrate-governance-to-timelock.s.sol | 4 +- script/20260807-deploy-missing-tokens.s.sol | 6 +-- ...810-revoke-fireblocks-service-signer.s.sol | 4 +- ...20260813-execute-timelock-operations.s.sol | 4 +- .../20260813-timelock-rehearsal-cancel.s.sol | 4 +- ...20260813-timelock-rehearsal-schedule.s.sol | 4 +- script/BuildPointers.sol | 43 ++++++++++++------- script/DeployProdV4_0_1_1.sol | 4 +- script/MigrateBeaconOwners.s.sol | 4 +- script/MigrateMultisigThreshold.s.sol | 4 +- soldeer.lock | 24 +++++------ src/generated/LibProdDeployV4.sol | 24 +++++------ ...ator.pointers.sol => ST0xOrchestrator.sol} | 7 +-- ... => ST0xOrchestratorBeaconSetDeployer.sol} | 7 +-- ...ters.sol => StoxCorporateActionsFacet.sol} | 7 +-- ...OffchainAssetReceiptVaultAuthorizerV1.sol} | 7 +-- ...ainAssetReceiptVaultBeaconSetDeployer.sol} | 7 +-- ...etReceiptVaultPaymentMintAuthorizerV1.sol} | 7 +-- ...oxReceipt.pointers.sol => StoxReceipt.sol} | 7 +-- ...ault.pointers.sol => StoxReceiptVault.sol} | 7 +-- ...r.pointers.sol => StoxUnifiedDeployer.sol} | 7 +-- ...pointers.sol => StoxWrappedTokenVault.sol} | 7 +-- ...rs.sol => StoxWrappedTokenVaultBeacon.sol} | 7 +-- ...toxWrappedTokenVaultBeaconSetDeployer.sol} | 7 +-- src/lib/LibSafeOps.sol | 2 +- src/lib/LibStoxDeployNetworks.sol | 13 +++--- src/lib/LibTimelockInvariants.sol | 2 +- test/lib/LibTestDeploy.sol | 4 +- test/lib/LibTestProd.sol | 4 +- test/lib/LibTestTofu.sol | 4 +- .../20260619-deploy-v4-authoriser-clone.t.sol | 6 +-- ...0260623-upgrade-receipt-vaults-to-v4.t.sol | 4 +- .../20260706-deploy-tokens-ethereum.t.sol | 2 +- ...ision-additional-service-signer.prod.t.sol | 4 +- ...-provision-additional-service-signer.t.sol | 2 +- .../20260729-deploy-governance-timelock.t.sol | 4 +- ...60729-migrate-governance-to-timelock.t.sol | 4 +- .../20260807-deploy-missing-tokens.t.sol | 4 +- ...evoke-fireblocks-service-signer.prod.t.sol | 4 +- ...810-revoke-fireblocks-service-signer.t.sol | 2 +- test/script/20260813-timelock-rehearsal.t.sol | 4 +- test/script/DeployMissingTokensHarness.sol | 2 +- .../script/MigrateMultisigThresholdTest.t.sol | 4 +- test/src/concrete/ST0xOrchestrator.t.sol | 2 +- ...teActionsFacet.authorizerIntegration.t.sol | 2 +- .../concrete/StoxCorporateActionsFacet.t.sol | 2 +- .../concrete/StoxCorporateActionsHandler.sol | 2 +- .../StoxCorporateActionsInvariant.t.sol | 2 +- test/src/concrete/StoxReceipt.t.sol | 2 +- .../StoxReceiptRebaseIntegrationTest.t.sol | 2 +- .../StoxReceiptVault.rawTotalSupply.t.sol | 2 +- .../StoxReceiptVault.setAuthorizerGuard.t.sol | 2 +- test/src/concrete/StoxReceiptVault.t.sol | 2 +- .../StoxReceiptVaultFallbackRouting.t.sol | 2 +- ...ReceiptVaultMigrationIntegrationTest.t.sol | 2 +- test/src/concrete/StoxWrappedTokenVault.t.sol | 4 +- .../StoxWrappedTokenVaultBeacon.t.sol | 4 +- .../StoxWrappedTokenVaultV1.prod.base.t.sol | 2 +- .../concrete/StoxWrappedTokenVaultV2.t.sol | 2 +- ...iptVaultAuthorizerV1.initializeGuard.t.sol | 2 +- ...ffchainAssetReceiptVaultAuthorizerV1.t.sol | 2 +- ...thorizerV1.corporateActionPairingGap.t.sol | 2 +- ...tReceiptVaultPaymentMintAuthorizerV1.t.sol | 2 +- .../deploy/BeaconOwnerMigrationPin.t.sol | 4 +- .../deploy/EthereumBeaconOwnership.t.sol | 2 +- .../deploy/EthereumTokenOwnerSafeParity.t.sol | 2 +- .../deploy/GovernanceTimelockMigration.t.sol | 4 +- .../deploy/HyperEvmBeaconOwnership.t.sol | 2 +- .../deploy/HyperEvmTokenOwnerSafeParity.t.sol | 2 +- .../ST0xOrchestratorBeaconSetDeployer.t.sol | 2 +- .../deploy/StoxCrossChainParity.t.sol | 4 +- test/src/concrete/deploy/StoxProdV2.t.sol | 4 +- test/src/concrete/deploy/StoxProdV4.t.sol | 4 +- .../concrete/deploy/StoxProdV4PostSwap.t.sol | 4 +- .../deploy/StoxUnifiedDeployer.ierc165.t.sol | 2 +- ...fiedDeployer.newTokenAndWrapperVault.t.sol | 2 +- .../StoxUnifiedDeployer.prod.base.t.sol | 2 +- .../concrete/deploy/StoxUnifiedDeployer.t.sol | 2 +- ...dTokenVaultBeaconSetDeployer.ierc165.t.sol | 2 +- ...oxWrappedTokenVaultBeaconSetDeployer.t.sol | 4 +- .../OrchestratorIntegrationTest.sol | 4 +- .../upgrade/V3UpgradeShadowFork.t.sol | 4 +- test/src/lib/LibAuthoriserInvariants.t.sol | 4 +- test/src/lib/LibBeaconInvariants.t.sol | 4 +- test/src/lib/LibConstantsStructure.t.sol | 2 +- test/src/lib/LibCorporateActionNode.t.sol | 2 +- test/src/lib/LibERC1155Storage.t.sol | 2 +- test/src/lib/LibERC20Storage.t.sol | 2 +- test/src/lib/LibInvariants.t.sol | 4 +- test/src/lib/LibMigrationInvariant.t.sol | 2 +- test/src/lib/LibProdBeaconsBase.t.sol | 4 +- test/src/lib/LibProdDeployV1.t.sol | 2 +- test/src/lib/LibProdDeployV1V2.t.sol | 2 +- test/src/lib/LibProdDeployV2.t.sol | 4 +- test/src/lib/LibProdDeployV4.t.sol | 4 +- test/src/lib/LibProdTokenConfig.t.sol | 4 +- test/src/lib/LibRebase.t.sol | 2 +- test/src/lib/LibRebaseMath.t.sol | 2 +- test/src/lib/LibReceiptRebase.t.sol | 2 +- test/src/lib/LibSafeInvariants.t.sol | 4 +- test/src/lib/LibSafeOps.t.sol | 4 +- test/src/lib/LibStockSplit.t.sol | 2 +- test/src/lib/LibStockSplitLifecycleTest.t.sol | 2 +- test/src/lib/LibStockSplitResolveTest.t.sol | 2 +- ...LibStockSplitValidation6DecimalsTest.t.sol | 2 +- ...StockSplitValidationFuzzDecimalsTest.t.sol | 2 +- test/src/lib/LibStoxDeployNetworks.t.sol | 2 +- test/src/lib/LibTimelockInvariants.t.sol | 4 +- .../lib/LibTokenInvariants.addresses.t.sol | 2 +- test/src/lib/LibTokenInvariants.t.sol | 4 +- test/src/lib/LibTotalSupply.t.sol | 2 +- test/src/lib/StorageSlotDistinctness.t.sol | 2 +- 123 files changed, 237 insertions(+), 285 deletions(-) rename src/generated/candidate/{ST0xOrchestrator.pointers.sol => ST0xOrchestrator.sol} (99%) rename src/generated/candidate/{ST0xOrchestratorBeaconSetDeployer.pointers.sol => ST0xOrchestratorBeaconSetDeployer.sol} (97%) rename src/generated/candidate/{StoxCorporateActionsFacet.pointers.sol => StoxCorporateActionsFacet.sol} (99%) rename src/generated/candidate/{StoxOffchainAssetReceiptVaultAuthorizerV1.pointers.sol => StoxOffchainAssetReceiptVaultAuthorizerV1.sol} (98%) rename src/generated/candidate/{StoxOffchainAssetReceiptVaultBeaconSetDeployer.pointers.sol => StoxOffchainAssetReceiptVaultBeaconSetDeployer.sol} (98%) rename src/generated/candidate/{StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.pointers.sol => StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol} (99%) rename src/generated/candidate/{StoxReceipt.pointers.sol => StoxReceipt.sol} (99%) rename src/generated/candidate/{StoxReceiptVault.pointers.sol => StoxReceiptVault.sol} (99%) rename src/generated/candidate/{StoxUnifiedDeployer.pointers.sol => StoxUnifiedDeployer.sol} (95%) rename src/generated/candidate/{StoxWrappedTokenVault.pointers.sol => StoxWrappedTokenVault.sol} (98%) rename src/generated/candidate/{StoxWrappedTokenVaultBeacon.pointers.sol => StoxWrappedTokenVaultBeacon.sol} (92%) rename src/generated/candidate/{StoxWrappedTokenVaultBeaconSetDeployer.pointers.sol => StoxWrappedTokenVaultBeaconSetDeployer.sol} (96%) diff --git a/foundry.toml b/foundry.toml index 5bc30843..f26da93f 100644 --- a/foundry.toml +++ b/foundry.toml @@ -57,15 +57,15 @@ remappings = [ ] [dependencies] -forge-std = "1.16.1" +forge-std = "1.16.2" "@openzeppelin-contracts" = "5.6.1" "@openzeppelin-contracts-upgradeable" = "5.6.1" -"rain-deploy" = "0.1.4" +"rain-deploy" = "0.1.7" "rain-extrospection" = "0.1.1" "rain-factory" = "0.1.1" "rain-math-fixedpoint" = "0.2.0" "rain-math-float" = "0.1.1" -"rain-sol-codegen" = "0.1.3" +"rain-sol-codegen" = "0.1.36" "rain-solmem" = "0.1.3" "rain-tofu-erc20-decimals" = "0.1.1" "rain-vats" = "0.1.6" diff --git a/remappings.txt b/remappings.txt index 707382f5..e2f7a4dc 100644 --- a/remappings.txt +++ b/remappings.txt @@ -1,12 +1,12 @@ @openzeppelin-contracts-5.6.1/=dependencies/@openzeppelin-contracts-5.6.1/ @openzeppelin-contracts-upgradeable-5.6.1/=dependencies/@openzeppelin-contracts-upgradeable-5.6.1/ -forge-std-1.16.1/=dependencies/forge-std-1.16.1/ -rain-deploy-0.1.4/=dependencies/rain-deploy-0.1.4/ +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.1/=dependencies/rain-extrospection-0.1.1/ rain-factory-0.1.1/=dependencies/rain-factory-0.1.1/ rain-math-fixedpoint-0.2.0/=dependencies/rain-math-fixedpoint-0.2.0/ rain-math-float-0.1.1/=dependencies/rain-math-float-0.1.1/ -rain-sol-codegen-0.1.3/=dependencies/rain-sol-codegen-0.1.3/ +rain-sol-codegen-0.1.36/=dependencies/rain-sol-codegen-0.1.36/ rain-solmem-0.1.3/=dependencies/rain-solmem-0.1.3/ rain-tofu-erc20-decimals-0.1.1/=dependencies/rain-tofu-erc20-decimals-0.1.1/ rain-vats-0.1.6/=dependencies/rain-vats-0.1.6/ diff --git a/script/20260619-deploy-v4-authoriser-clone.s.sol b/script/20260619-deploy-v4-authoriser-clone.s.sol index 53f4cb88..3670972b 100644 --- a/script/20260619-deploy-v4-authoriser-clone.s.sol +++ b/script/20260619-deploy-v4-authoriser-clone.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import {ERC1167_PREFIX, ERC1167_SUFFIX} from "rain-extrospection-0.1.1/src/lib/LibExtrospectERC1167Proxy.sol"; import {ICloneableFactoryV2} from "rain-factory-0.1.1/src/interface/ICloneableFactoryV2.sol"; diff --git a/script/20260623-upgrade-receipt-vaults-to-v4.s.sol b/script/20260623-upgrade-receipt-vaults-to-v4.s.sol index 865838aa..68207815 100644 --- a/script/20260623-upgrade-receipt-vaults-to-v4.s.sol +++ b/script/20260623-upgrade-receipt-vaults-to-v4.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import {IBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/IBeacon.sol"; diff --git a/script/20260706-deploy-tokens-ethereum.s.sol b/script/20260706-deploy-tokens-ethereum.s.sol index 06bf47ee..e6e99cea 100644 --- a/script/20260706-deploy-tokens-ethereum.s.sol +++ b/script/20260706-deploy-tokens-ethereum.s.sol @@ -2,9 +2,9 @@ // 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 {console2} from "forge-std-1.16.1/src/console2.sol"; -import {Vm} from "forge-std-1.16.1/src/Vm.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; +import {Vm} from "forge-std-1.16.2/src/Vm.sol"; import { OffchainAssetReceiptVaultConfigV2 } from "rain-vats-0.1.6/src/concrete/deploy/OffchainAssetReceiptVaultBeaconSetDeployer.sol"; diff --git a/script/20260716-migrate-beacon-owners-ethereum.s.sol b/script/20260716-migrate-beacon-owners-ethereum.s.sol index 1b08b943..a2ece84f 100644 --- a/script/20260716-migrate-beacon-owners-ethereum.s.sol +++ b/script/20260716-migrate-beacon-owners-ethereum.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol"; import {LibProdBeacons0_1_1} from "../src/lib/LibProdBeacons0_1_1.sol"; import {LibProdDeployV1} from "../src/lib/LibProdDeployV1.sol"; diff --git a/script/20260722-migrate-beacon-owners-hyperevm.s.sol b/script/20260722-migrate-beacon-owners-hyperevm.s.sol index 70ba9146..a373b1d7 100644 --- a/script/20260722-migrate-beacon-owners-hyperevm.s.sol +++ b/script/20260722-migrate-beacon-owners-hyperevm.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol"; import {LibProdBeacons0_1_1} from "../src/lib/LibProdBeacons0_1_1.sol"; import {LibProdDeployV1} from "../src/lib/LibProdDeployV1.sol"; diff --git a/script/20260722-swap-remaining-vault-authorisers.s.sol b/script/20260722-swap-remaining-vault-authorisers.s.sol index 456087b3..625af313 100644 --- a/script/20260722-swap-remaining-vault-authorisers.s.sol +++ b/script/20260722-swap-remaining-vault-authorisers.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import {IAuthorizableV1} from "rain-vats-0.1.6/src/interface/IAuthorizableV1.sol"; diff --git a/script/20260722-swap-rklb-authoriser.s.sol b/script/20260722-swap-rklb-authoriser.s.sol index 9393d26e..b6f7225c 100644 --- a/script/20260722-swap-rklb-authoriser.s.sol +++ b/script/20260722-swap-rklb-authoriser.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import {IAuthorizableV1} from "rain-vats-0.1.6/src/interface/IAuthorizableV1.sol"; diff --git a/script/20260723-provision-additional-service-signer.s.sol b/script/20260723-provision-additional-service-signer.s.sol index 872ba7b9..76612efc 100644 --- a/script/20260723-provision-additional-service-signer.s.sol +++ b/script/20260723-provision-additional-service-signer.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol"; diff --git a/script/20260729-deploy-governance-timelock.s.sol b/script/20260729-deploy-governance-timelock.s.sol index 6b51f951..8a4e818e 100644 --- a/script/20260729-deploy-governance-timelock.s.sol +++ b/script/20260729-deploy-governance-timelock.s.sol @@ -2,10 +2,10 @@ // 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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibSafeInvariants} from "../src/lib/LibSafeInvariants.sol"; import {LibStoxDeployNetworks} from "../src/lib/LibStoxDeployNetworks.sol"; diff --git a/script/20260729-migrate-governance-to-timelock.s.sol b/script/20260729-migrate-governance-to-timelock.s.sol index a5b701a6..e59ad16c 100644 --- a/script/20260729-migrate-governance-to-timelock.s.sol +++ b/script/20260729-migrate-governance-to-timelock.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol"; import {TimelockController} from "@openzeppelin-contracts-5.6.1/governance/TimelockController.sol"; diff --git a/script/20260807-deploy-missing-tokens.s.sol b/script/20260807-deploy-missing-tokens.s.sol index 1df6ea73..40e5e292 100644 --- a/script/20260807-deploy-missing-tokens.s.sol +++ b/script/20260807-deploy-missing-tokens.s.sol @@ -2,9 +2,9 @@ // 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 {console2} from "forge-std-1.16.1/src/console2.sol"; -import {Vm} from "forge-std-1.16.1/src/Vm.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; +import {Vm} from "forge-std-1.16.2/src/Vm.sol"; import { OffchainAssetReceiptVaultConfigV2 } from "rain-vats-0.1.6/src/concrete/deploy/OffchainAssetReceiptVaultBeaconSetDeployer.sol"; diff --git a/script/20260810-revoke-fireblocks-service-signer.s.sol b/script/20260810-revoke-fireblocks-service-signer.s.sol index 910c991c..a92e1a15 100644 --- a/script/20260810-revoke-fireblocks-service-signer.s.sol +++ b/script/20260810-revoke-fireblocks-service-signer.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol"; diff --git a/script/20260813-execute-timelock-operations.s.sol b/script/20260813-execute-timelock-operations.s.sol index 025879ee..d76e8000 100644 --- a/script/20260813-execute-timelock-operations.s.sol +++ b/script/20260813-execute-timelock-operations.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import {TimelockController} from "@openzeppelin-contracts-5.6.1/governance/TimelockController.sol"; diff --git a/script/20260813-timelock-rehearsal-cancel.s.sol b/script/20260813-timelock-rehearsal-cancel.s.sol index 0efb7cea..52f27106 100644 --- a/script/20260813-timelock-rehearsal-cancel.s.sol +++ b/script/20260813-timelock-rehearsal-cancel.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {TimelockController} from "@openzeppelin-contracts-5.6.1/governance/TimelockController.sol"; import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol"; diff --git a/script/20260813-timelock-rehearsal-schedule.s.sol b/script/20260813-timelock-rehearsal-schedule.s.sol index 129dc469..4d1dbb5a 100644 --- a/script/20260813-timelock-rehearsal-schedule.s.sol +++ b/script/20260813-timelock-rehearsal-schedule.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {TimelockController} from "@openzeppelin-contracts-5.6.1/governance/TimelockController.sol"; import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol"; diff --git a/script/BuildPointers.sol b/script/BuildPointers.sol index 26d26882..a7c39c2b 100644 --- a/script/BuildPointers.sol +++ b/script/BuildPointers.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 {VmSafe} from "forge-std-1.16.1/src/Vm.sol"; -import {LibCodeGen} from "rain-sol-codegen-0.1.3/src/lib/LibCodeGen.sol"; -import {LibFs} from "rain-sol-codegen-0.1.3/src/lib/LibFs.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {VmSafe} from "forge-std-1.16.2/src/Vm.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 {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {StoxReceipt} from "../src/concrete/StoxReceipt.sol"; import {StoxReceiptVault} from "../src/concrete/StoxReceiptVault.sol"; import {StoxCorporateActionsFacet} from "../src/concrete/StoxCorporateActionsFacet.sol"; @@ -65,10 +65,11 @@ contract BuildPointers is Script { function buildContractPointers(string memory name, bytes memory creationCode) internal { address deployed = LibRainDeploy.deployZoltu(creationCode); - LibFs.buildFileForContract( + LibFs.buildFileForTaggedContract( vm, deployed, - string.concat(deployTag(), "/", name), + deployTag(), + name, string.concat( LibCodeGen.addressConstantString( vm, @@ -90,9 +91,7 @@ contract BuildPointers is Script { LibRainDeploy.etchZoltuFactory(vm); // Regenerate the rolling `candidate/` snapshot from current source. - // `vm.writeFile` won't create the dir, so ensure it exists first. - vm.createDir(string.concat("src/generated/", deployTag()), true); - + // `LibFs.buildFileForTaggedContract` creates the tag dir as needed. buildContractPointers("StoxCorporateActionsFacet", type(StoxCorporateActionsFacet).creationCode); buildContractPointers("StoxReceipt", type(StoxReceipt).creationCode); buildContractPointers("StoxReceiptVault", type(StoxReceiptVault).creationCode); @@ -131,7 +130,7 @@ contract BuildPointers is Script { // Deploy-lib generation. // // Regenerates `src/generated/LibProdDeployV4.sol` (one versioned constant - // set per release tag, each aliasing that tag's frozen `*.pointers.sol` + // set per release tag, each aliasing that tag's frozen pointer-file // exports) and `src/generated/LibProdDeployCurrent.sol` (unversioned // aliases of the current `deployTag()`), from the per-tag snapshots on // disk. Emitted line-by-line via `vm.writeLine` so no single string grows @@ -149,7 +148,7 @@ contract BuildPointers is Script { // REUSE-IgnoreEnd - /// @notice Pointer filenames (without `.pointers.sol`) in a fixed order. + /// @notice Pointer contract names in a fixed order. function contractNames() internal pure returns (string[12] memory names) { names[0] = "StoxReceipt"; names[1] = "StoxReceiptVault"; @@ -264,8 +263,20 @@ contract BuildPointers is Script { } } + /// @notice The pointer file name for `(tag, name)`. rain-sol-codegen + /// 0.1.36's `LibFs` writes `.sol`, so that is the name wherever it + /// exists on disk; snapshots frozen before this repo adopted that scheme + /// keep the `.pointers.sol` name they were cut with, forever. + function pointerFile(string memory tag, string memory name) internal returns (string memory) { + string memory plain = string.concat(name, ".sol"); + if (vm.exists(string.concat("src/generated/", tag, "/", plain))) { + return plain; + } + return string.concat(name, ".pointers.sol"); + } + function pointerExists(string memory tag, string memory name) internal returns (bool) { - return vm.exists(string.concat("src/generated/", tag, "/", name, ".pointers.sol")); + return vm.exists(string.concat("src/generated/", tag, "/", pointerFile(tag, name))); } function writeGeneratedHeader(string memory path) internal { @@ -277,7 +288,7 @@ contract BuildPointers is Script { vm.writeLine(path, "// GENERATED by script/BuildPointers.sol. Do not edit."); } - function v4ImportLine(string memory name, string memory base, string memory tag) + function v4ImportLine(string memory fileName, string memory base, string memory tag) internal pure returns (string memory) @@ -288,7 +299,7 @@ contract BuildPointers is Script { string memory mid = string.concat( "_CODEHASH_", suffix, "_GEN, CREATION_CODE as ", base, "_CREATION_", suffix, "_GEN, RUNTIME_CODE as ", base ); - string memory tail = string.concat("_RUNTIME_", suffix, '_GEN} from "./', tag, "/", name, '.pointers.sol";'); + string memory tail = string.concat("_RUNTIME_", suffix, '_GEN} from "./', tag, "/", fileName, '";'); return string.concat(head, mid, tail); } @@ -324,7 +335,7 @@ contract BuildPointers is Script { for (uint256 t = 0; t < tags.length; t++) { for (uint256 c = 0; c < 12; c++) { if (pointerExists(tags[t], names[c])) { - vm.writeLine(GEN_V4_PATH, v4ImportLine(names[c], bases[c], tags[t])); + vm.writeLine(GEN_V4_PATH, v4ImportLine(pointerFile(tags[t], names[c]), bases[c], tags[t])); } } } diff --git a/script/DeployProdV4_0_1_1.sol b/script/DeployProdV4_0_1_1.sol index 9338d998..3b7e8dc1 100644 --- a/script/DeployProdV4_0_1_1.sol +++ b/script/DeployProdV4_0_1_1.sol @@ -2,9 +2,9 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Script, console2} from "forge-std-1.16.1/src/Script.sol"; +import {Script, console2} from "forge-std-1.16.2/src/Script.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibProdDeployV4} from "../src/generated/LibProdDeployV4.sol"; import {LibStoxDeployNetworks} from "../src/lib/LibStoxDeployNetworks.sol"; diff --git a/script/MigrateBeaconOwners.s.sol b/script/MigrateBeaconOwners.s.sol index 3478ad05..c41a5c28 100644 --- a/script/MigrateBeaconOwners.s.sol +++ b/script/MigrateBeaconOwners.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol"; import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol"; diff --git a/script/MigrateMultisigThreshold.s.sol b/script/MigrateMultisigThreshold.s.sol index 46f43e02..0b2d9f38 100644 --- a/script/MigrateMultisigThreshold.s.sol +++ b/script/MigrateMultisigThreshold.s.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 {console2} from "forge-std-1.16.1/src/console2.sol"; +import {Script} from "forge-std-1.16.2/src/Script.sol"; +import {console2} from "forge-std-1.16.2/src/console2.sol"; import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol"; import {LibSafeInvariants} from "../src/lib/LibSafeInvariants.sol"; diff --git a/soldeer.lock b/soldeer.lock index f5a17f15..c8debdb8 100644 --- a/soldeer.lock +++ b/soldeer.lock @@ -14,17 +14,17 @@ integrity = "2f539b6241258fc3c127c97225b3cb1b5e9225e422d2c1cb233c52a6f5c29002" [[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.4" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-deploy/0_1_4_29-06-2026_12:21:08_rain.zip" -checksum = "9b31431aec1f2fa6b7ea54e237f231449aeb38a98058d5b4042702857920646e" -integrity = "b02bcfad421df925d73e2bb86e57565d267d80924b07530350bdf3020e6850fb" +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" @@ -56,10 +56,10 @@ integrity = "dccdd4406a37db6af690872b805084a7dbe5211c57961a61ef083a7912ddbdc9" [[dependencies]] name = "rain-sol-codegen" -version = "0.1.3" -url = "https://soldeer-revisions.s3.amazonaws.com/rain-sol-codegen/0_1_3_15-07-2026_08:55:10_rain.sol.zip" -checksum = "e9b8fa2e32ad2c5e2ea6c4f32a909c4d8969b207a486fdbe9d542f14b4125143" -integrity = "f78a6eee689ce93859736cb7d3b149802168e400688512b8865cf625e0bf3534" +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" diff --git a/src/generated/LibProdDeployV4.sol b/src/generated/LibProdDeployV4.sol index 5a8a97bf..1744bc84 100644 --- a/src/generated/LibProdDeployV4.sol +++ b/src/generated/LibProdDeployV4.sol @@ -68,73 +68,73 @@ import { BYTECODE_HASH as STOX_RECEIPT_CODEHASH_CANDIDATE_GEN, CREATION_CODE as STOX_RECEIPT_CREATION_CANDIDATE_GEN, RUNTIME_CODE as STOX_RECEIPT_RUNTIME_CANDIDATE_GEN -} from "./candidate/StoxReceipt.pointers.sol"; +} from "./candidate/StoxReceipt.sol"; import { DEPLOYED_ADDRESS as STOX_RECEIPT_VAULT_ADDRESS_CANDIDATE_GEN, BYTECODE_HASH as STOX_RECEIPT_VAULT_CODEHASH_CANDIDATE_GEN, CREATION_CODE as STOX_RECEIPT_VAULT_CREATION_CANDIDATE_GEN, RUNTIME_CODE as STOX_RECEIPT_VAULT_RUNTIME_CANDIDATE_GEN -} from "./candidate/StoxReceiptVault.pointers.sol"; +} from "./candidate/StoxReceiptVault.sol"; import { DEPLOYED_ADDRESS as STOX_WRAPPED_TOKEN_VAULT_ADDRESS_CANDIDATE_GEN, BYTECODE_HASH as STOX_WRAPPED_TOKEN_VAULT_CODEHASH_CANDIDATE_GEN, CREATION_CODE as STOX_WRAPPED_TOKEN_VAULT_CREATION_CANDIDATE_GEN, RUNTIME_CODE as STOX_WRAPPED_TOKEN_VAULT_RUNTIME_CANDIDATE_GEN -} from "./candidate/StoxWrappedTokenVault.pointers.sol"; +} from "./candidate/StoxWrappedTokenVault.sol"; import { DEPLOYED_ADDRESS as STOX_UNIFIED_DEPLOYER_ADDRESS_CANDIDATE_GEN, BYTECODE_HASH as STOX_UNIFIED_DEPLOYER_CODEHASH_CANDIDATE_GEN, CREATION_CODE as STOX_UNIFIED_DEPLOYER_CREATION_CANDIDATE_GEN, RUNTIME_CODE as STOX_UNIFIED_DEPLOYER_RUNTIME_CANDIDATE_GEN -} from "./candidate/StoxUnifiedDeployer.pointers.sol"; +} from "./candidate/StoxUnifiedDeployer.sol"; import { DEPLOYED_ADDRESS as STOX_WRAPPED_TOKEN_VAULT_BEACON_ADDRESS_CANDIDATE_GEN, BYTECODE_HASH as STOX_WRAPPED_TOKEN_VAULT_BEACON_CODEHASH_CANDIDATE_GEN, CREATION_CODE as STOX_WRAPPED_TOKEN_VAULT_BEACON_CREATION_CANDIDATE_GEN, RUNTIME_CODE as STOX_WRAPPED_TOKEN_VAULT_BEACON_RUNTIME_CANDIDATE_GEN -} from "./candidate/StoxWrappedTokenVaultBeacon.pointers.sol"; +} from "./candidate/StoxWrappedTokenVaultBeacon.sol"; import { DEPLOYED_ADDRESS as STOX_WRAPPED_TOKEN_VAULT_BEACON_SET_DEPLOYER_ADDRESS_CANDIDATE_GEN, BYTECODE_HASH as STOX_WRAPPED_TOKEN_VAULT_BEACON_SET_DEPLOYER_CODEHASH_CANDIDATE_GEN, CREATION_CODE as STOX_WRAPPED_TOKEN_VAULT_BEACON_SET_DEPLOYER_CREATION_CANDIDATE_GEN, RUNTIME_CODE as STOX_WRAPPED_TOKEN_VAULT_BEACON_SET_DEPLOYER_RUNTIME_CANDIDATE_GEN -} from "./candidate/StoxWrappedTokenVaultBeaconSetDeployer.pointers.sol"; +} from "./candidate/StoxWrappedTokenVaultBeaconSetDeployer.sol"; import { DEPLOYED_ADDRESS as STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_BEACON_SET_DEPLOYER_ADDRESS_CANDIDATE_GEN, BYTECODE_HASH as STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_BEACON_SET_DEPLOYER_CODEHASH_CANDIDATE_GEN, CREATION_CODE as STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_BEACON_SET_DEPLOYER_CREATION_CANDIDATE_GEN, RUNTIME_CODE as STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_BEACON_SET_DEPLOYER_RUNTIME_CANDIDATE_GEN -} from "./candidate/StoxOffchainAssetReceiptVaultBeaconSetDeployer.pointers.sol"; +} from "./candidate/StoxOffchainAssetReceiptVaultBeaconSetDeployer.sol"; import { DEPLOYED_ADDRESS as STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_ADDRESS_CANDIDATE_GEN, BYTECODE_HASH as STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_CODEHASH_CANDIDATE_GEN, CREATION_CODE as STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_CREATION_CANDIDATE_GEN, RUNTIME_CODE as STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_RUNTIME_CANDIDATE_GEN -} from "./candidate/StoxOffchainAssetReceiptVaultAuthorizerV1.pointers.sol"; +} from "./candidate/StoxOffchainAssetReceiptVaultAuthorizerV1.sol"; import { DEPLOYED_ADDRESS as STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_PAYMENT_MINT_AUTHORIZER_V1_ADDRESS_CANDIDATE_GEN, BYTECODE_HASH as STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_PAYMENT_MINT_AUTHORIZER_V1_CODEHASH_CANDIDATE_GEN, CREATION_CODE as STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_PAYMENT_MINT_AUTHORIZER_V1_CREATION_CANDIDATE_GEN, RUNTIME_CODE as STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_PAYMENT_MINT_AUTHORIZER_V1_RUNTIME_CANDIDATE_GEN -} from "./candidate/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.pointers.sol"; +} from "./candidate/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol"; import { DEPLOYED_ADDRESS as STOX_CORPORATE_ACTIONS_FACET_ADDRESS_CANDIDATE_GEN, BYTECODE_HASH as STOX_CORPORATE_ACTIONS_FACET_CODEHASH_CANDIDATE_GEN, CREATION_CODE as STOX_CORPORATE_ACTIONS_FACET_CREATION_CANDIDATE_GEN, RUNTIME_CODE as STOX_CORPORATE_ACTIONS_FACET_RUNTIME_CANDIDATE_GEN -} from "./candidate/StoxCorporateActionsFacet.pointers.sol"; +} from "./candidate/StoxCorporateActionsFacet.sol"; import { DEPLOYED_ADDRESS as ST0X_ORCHESTRATOR_ADDRESS_CANDIDATE_GEN, BYTECODE_HASH as ST0X_ORCHESTRATOR_CODEHASH_CANDIDATE_GEN, CREATION_CODE as ST0X_ORCHESTRATOR_CREATION_CANDIDATE_GEN, RUNTIME_CODE as ST0X_ORCHESTRATOR_RUNTIME_CANDIDATE_GEN -} from "./candidate/ST0xOrchestrator.pointers.sol"; +} from "./candidate/ST0xOrchestrator.sol"; import { DEPLOYED_ADDRESS as ST0X_ORCHESTRATOR_BEACON_SET_DEPLOYER_ADDRESS_CANDIDATE_GEN, BYTECODE_HASH as ST0X_ORCHESTRATOR_BEACON_SET_DEPLOYER_CODEHASH_CANDIDATE_GEN, CREATION_CODE as ST0X_ORCHESTRATOR_BEACON_SET_DEPLOYER_CREATION_CANDIDATE_GEN, RUNTIME_CODE as ST0X_ORCHESTRATOR_BEACON_SET_DEPLOYER_RUNTIME_CANDIDATE_GEN -} from "./candidate/ST0xOrchestratorBeaconSetDeployer.pointers.sol"; +} from "./candidate/ST0xOrchestratorBeaconSetDeployer.sol"; library LibProdDeployV4 { address constant BEACON_INITIAL_OWNER = address(0x8E4bdeec7CEB9570D440676345dA1dCe10329f5b); diff --git a/src/generated/candidate/ST0xOrchestrator.pointers.sol b/src/generated/candidate/ST0xOrchestrator.sol similarity index 99% rename from src/generated/candidate/ST0xOrchestrator.pointers.sol rename to src/generated/candidate/ST0xOrchestrator.sol index d08da09e..7c3f2988 100644 --- a/src/generated/candidate/ST0xOrchestrator.pointers.sol +++ b/src/generated/candidate/ST0xOrchestrator.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(0xbc2cc8eba1d10bc3b91a61fca8cdca9c18487e5fd99262f07d9703959ae4747c); diff --git a/src/generated/candidate/ST0xOrchestratorBeaconSetDeployer.pointers.sol b/src/generated/candidate/ST0xOrchestratorBeaconSetDeployer.sol similarity index 97% rename from src/generated/candidate/ST0xOrchestratorBeaconSetDeployer.pointers.sol rename to src/generated/candidate/ST0xOrchestratorBeaconSetDeployer.sol index 64ce415e..d7f74dad 100644 --- a/src/generated/candidate/ST0xOrchestratorBeaconSetDeployer.pointers.sol +++ b/src/generated/candidate/ST0xOrchestratorBeaconSetDeployer.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(0x779b9e3b829a16736d5d29c81e925395da9ff76d7d94c3618d48bdf1bc438a60); diff --git a/src/generated/candidate/StoxCorporateActionsFacet.pointers.sol b/src/generated/candidate/StoxCorporateActionsFacet.sol similarity index 99% rename from src/generated/candidate/StoxCorporateActionsFacet.pointers.sol rename to src/generated/candidate/StoxCorporateActionsFacet.sol index 49171b4a..4d2a2e2a 100644 --- a/src/generated/candidate/StoxCorporateActionsFacet.pointers.sol +++ b/src/generated/candidate/StoxCorporateActionsFacet.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(0x870162e771dac7e0dfe7226bad633055130d1e28128bcfb8afe7fee1097eb055); diff --git a/src/generated/candidate/StoxOffchainAssetReceiptVaultAuthorizerV1.pointers.sol b/src/generated/candidate/StoxOffchainAssetReceiptVaultAuthorizerV1.sol similarity index 98% rename from src/generated/candidate/StoxOffchainAssetReceiptVaultAuthorizerV1.pointers.sol rename to src/generated/candidate/StoxOffchainAssetReceiptVaultAuthorizerV1.sol index f186136e..d1b0d8ba 100644 --- a/src/generated/candidate/StoxOffchainAssetReceiptVaultAuthorizerV1.pointers.sol +++ b/src/generated/candidate/StoxOffchainAssetReceiptVaultAuthorizerV1.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(0x919c35e875f349116c85041fdbaa9218cd417cc458c9448747947d8497a712a0); diff --git a/src/generated/candidate/StoxOffchainAssetReceiptVaultBeaconSetDeployer.pointers.sol b/src/generated/candidate/StoxOffchainAssetReceiptVaultBeaconSetDeployer.sol similarity index 98% rename from src/generated/candidate/StoxOffchainAssetReceiptVaultBeaconSetDeployer.pointers.sol rename to src/generated/candidate/StoxOffchainAssetReceiptVaultBeaconSetDeployer.sol index beb01ba4..c39792cc 100644 --- a/src/generated/candidate/StoxOffchainAssetReceiptVaultBeaconSetDeployer.pointers.sol +++ b/src/generated/candidate/StoxOffchainAssetReceiptVaultBeaconSetDeployer.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(0x6b2699420a64c92fc4f8a027a5769d0a27291e4489eaeb0e185cb660bf49d42f); diff --git a/src/generated/candidate/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.pointers.sol b/src/generated/candidate/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol similarity index 99% rename from src/generated/candidate/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.pointers.sol rename to src/generated/candidate/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol index 70aaa555..08c1ee5e 100644 --- a/src/generated/candidate/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.pointers.sol +++ b/src/generated/candidate/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.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(0xcec4a4eeef4c556bcc097009183fccb9a8dbcf04adbe8aef6e4d3de799ef2cd6); diff --git a/src/generated/candidate/StoxReceipt.pointers.sol b/src/generated/candidate/StoxReceipt.sol similarity index 99% rename from src/generated/candidate/StoxReceipt.pointers.sol rename to src/generated/candidate/StoxReceipt.sol index 0c73b09e..96a9e2cd 100644 --- a/src/generated/candidate/StoxReceipt.pointers.sol +++ b/src/generated/candidate/StoxReceipt.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(0xba9e672e00e89c68294ae67b2d99a80f7509a6b10da809bf84b5c2e578579862); diff --git a/src/generated/candidate/StoxReceiptVault.pointers.sol b/src/generated/candidate/StoxReceiptVault.sol similarity index 99% rename from src/generated/candidate/StoxReceiptVault.pointers.sol rename to src/generated/candidate/StoxReceiptVault.sol index 429e3ab4..42ca3d85 100644 --- a/src/generated/candidate/StoxReceiptVault.pointers.sol +++ b/src/generated/candidate/StoxReceiptVault.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(0x81f5b328841117c2b0a4759cc87e76cf2abab03b4a461d9082c1c147cd8705a6); diff --git a/src/generated/candidate/StoxUnifiedDeployer.pointers.sol b/src/generated/candidate/StoxUnifiedDeployer.sol similarity index 95% rename from src/generated/candidate/StoxUnifiedDeployer.pointers.sol rename to src/generated/candidate/StoxUnifiedDeployer.sol index 61f4edc1..699675db 100644 --- a/src/generated/candidate/StoxUnifiedDeployer.pointers.sol +++ b/src/generated/candidate/StoxUnifiedDeployer.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(0x06734b6141e3a532330865d49f77f822c289983d9242636aef6e35e7d8e8195e); diff --git a/src/generated/candidate/StoxWrappedTokenVault.pointers.sol b/src/generated/candidate/StoxWrappedTokenVault.sol similarity index 98% rename from src/generated/candidate/StoxWrappedTokenVault.pointers.sol rename to src/generated/candidate/StoxWrappedTokenVault.sol index 7e5ea120..420694a7 100644 --- a/src/generated/candidate/StoxWrappedTokenVault.pointers.sol +++ b/src/generated/candidate/StoxWrappedTokenVault.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(0x46286068eab6f0e0919f54b2f3145630553f33e14b0b6f4b23510355bbc14083); diff --git a/src/generated/candidate/StoxWrappedTokenVaultBeacon.pointers.sol b/src/generated/candidate/StoxWrappedTokenVaultBeacon.sol similarity index 92% rename from src/generated/candidate/StoxWrappedTokenVaultBeacon.pointers.sol rename to src/generated/candidate/StoxWrappedTokenVaultBeacon.sol index d142710b..82c721e8 100644 --- a/src/generated/candidate/StoxWrappedTokenVaultBeacon.pointers.sol +++ b/src/generated/candidate/StoxWrappedTokenVaultBeacon.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(0x448cd06335de9e79ecdc51aa7c6647926860a1976f407de6f79f363b85ccaf2b); diff --git a/src/generated/candidate/StoxWrappedTokenVaultBeaconSetDeployer.pointers.sol b/src/generated/candidate/StoxWrappedTokenVaultBeaconSetDeployer.sol similarity index 96% rename from src/generated/candidate/StoxWrappedTokenVaultBeaconSetDeployer.pointers.sol rename to src/generated/candidate/StoxWrappedTokenVaultBeaconSetDeployer.sol index cdaac3cd..b94bedbc 100644 --- a/src/generated/candidate/StoxWrappedTokenVaultBeaconSetDeployer.pointers.sol +++ b/src/generated/candidate/StoxWrappedTokenVaultBeaconSetDeployer.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(0xffecb06d78a58f60f50c7f90da14c5fe983f5612e2a5deb02446e33766fea7a3); diff --git a/src/lib/LibSafeOps.sol b/src/lib/LibSafeOps.sol index 9cfea1e5..8867e942 100644 --- a/src/lib/LibSafeOps.sol +++ b/src/lib/LibSafeOps.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 {IGnosisSafe} from "../interface/IGnosisSafe.sol"; import {IBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/IBeacon.sol"; diff --git a/src/lib/LibStoxDeployNetworks.sol b/src/lib/LibStoxDeployNetworks.sol index d4dadb16..5c5ae9fa 100644 --- a/src/lib/LibStoxDeployNetworks.sol +++ b/src/lib/LibStoxDeployNetworks.sol @@ -3,18 +3,19 @@ pragma solidity ^0.8.25; /// @title LibStoxDeployNetworks -/// @notice The ST0x-specific deploy network-name constants that -/// `rain-deploy`'s `LibRainDeploy` does not provide. Each matches its +/// @notice ST0x-local deploy network-name constants. Declared when +/// `rain-deploy` 0.1.4's `LibRainDeploy` had no `ETHEREUM`/`HYPEREVM`; 0.1.7 +/// provides identical constants, and these stay so the audited deploy script +/// keeps its import surface unchanged. Each matches its /// `[rpc_endpoints]` alias in `foundry.toml`, the same convention as every /// `LibRainDeploy` network constant. Consumed by the audited deploy script /// `script/DeployProdV4_0_1_1.sol` and the cross-chain fork tests. library LibStoxDeployNetworks { /// @notice Ethereum mainnet network name, matching the `[rpc_endpoints]` /// alias in `foundry.toml` (resolved from `ETHEREUM_RPC_URL`). - /// @dev Declared here because `rain-deploy-0.1.4`'s `LibRainDeploy` has no - /// `ETHEREUM` constant. The Zoltu factory is deployed on Ethereum mainnet at - /// the canonical `LibRainDeploy.ZOLTU_FACTORY` address, so deterministic - /// deploys work unchanged. + /// @dev The Zoltu factory is deployed on Ethereum mainnet at the canonical + /// `LibRainDeploy.ZOLTU_FACTORY` address, so deterministic deploys work + /// unchanged. string internal constant ETHEREUM = "ethereum"; /// @notice HyperEVM mainnet network name, matching the `[rpc_endpoints]` diff --git a/src/lib/LibTimelockInvariants.sol b/src/lib/LibTimelockInvariants.sol index fd258218..f35b03d5 100644 --- a/src/lib/LibTimelockInvariants.sol +++ b/src/lib/LibTimelockInvariants.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.25; import {TimelockController} from "@openzeppelin-contracts-5.6.1/governance/TimelockController.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibSafeInvariants} from "./LibSafeInvariants.sol"; /// @notice No ST0x governance timelock address is pinned for the active diff --git a/test/lib/LibTestDeploy.sol b/test/lib/LibTestDeploy.sol index eaa62926..866d0fae 100644 --- a/test/lib/LibTestDeploy.sol +++ b/test/lib/LibTestDeploy.sol @@ -2,8 +2,8 @@ // 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 {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {Vm} from "forge-std-1.16.2/src/Vm.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibProdDeployV4} from "../../src/generated/LibProdDeployV4.sol"; import {StoxReceipt} from "../../src/concrete/StoxReceipt.sol"; import {StoxReceiptVault} from "../../src/concrete/StoxReceiptVault.sol"; diff --git a/test/lib/LibTestProd.sol b/test/lib/LibTestProd.sol index 533089e9..ea9bceef 100644 --- a/test/lib/LibTestProd.sol +++ b/test/lib/LibTestProd.sol @@ -2,8 +2,8 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity ^0.8.25; -import {Vm} from "forge-std-1.16.1/src/StdCheats.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {Vm} from "forge-std-1.16.2/src/StdCheats.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; uint256 constant PROD_TEST_BLOCK_NUMBER_BASE = 47842154; diff --git a/test/lib/LibTestTofu.sol b/test/lib/LibTestTofu.sol index e323dc42..9cfe9133 100644 --- a/test/lib/LibTestTofu.sol +++ b/test/lib/LibTestTofu.sol @@ -2,8 +2,8 @@ // 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 {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {Vm} from "forge-std-1.16.2/src/Vm.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol"; /// @title LibTestTofu diff --git a/test/script/20260619-deploy-v4-authoriser-clone.t.sol b/test/script/20260619-deploy-v4-authoriser-clone.t.sol index ebc9f3ab..4bb9c150 100644 --- a/test/script/20260619-deploy-v4-authoriser-clone.t.sol +++ b/test/script/20260619-deploy-v4-authoriser-clone.t.sol @@ -2,10 +2,10 @@ // 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 {VmSafe} from "forge-std-1.16.1/src/Vm.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; +import {VmSafe} from "forge-std-1.16.2/src/Vm.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibCloneFactoryDeploy} from "rain-factory-0.1.1/src/lib/LibCloneFactoryDeploy.sol"; import {ERC1167_PREFIX, ERC1167_SUFFIX} from "rain-extrospection-0.1.1/src/lib/LibExtrospectERC1167Proxy.sol"; diff --git a/test/script/20260623-upgrade-receipt-vaults-to-v4.t.sol b/test/script/20260623-upgrade-receipt-vaults-to-v4.t.sol index e0baa774..e390e4c6 100644 --- a/test/script/20260623-upgrade-receipt-vaults-to-v4.t.sol +++ b/test/script/20260623-upgrade-receipt-vaults-to-v4.t.sol @@ -2,8 +2,8 @@ // 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 {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol"; import {IAuthorizableV1} from "rain-vats-0.1.6/src/interface/IAuthorizableV1.sol"; diff --git a/test/script/20260706-deploy-tokens-ethereum.t.sol b/test/script/20260706-deploy-tokens-ethereum.t.sol index 1e1d93f8..f95480d3 100644 --- a/test/script/20260706-deploy-tokens-ethereum.t.sol +++ b/test/script/20260706-deploy-tokens-ethereum.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 { DeployTokensEthereum, DeployerNotDeployed, diff --git a/test/script/20260723-provision-additional-service-signer.prod.t.sol b/test/script/20260723-provision-additional-service-signer.prod.t.sol index 26d3c4b8..6ca0bae4 100644 --- a/test/script/20260723-provision-additional-service-signer.prod.t.sol +++ b/test/script/20260723-provision-additional-service-signer.prod.t.sol @@ -2,9 +2,9 @@ // 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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import { ProvisionAdditionalServiceSigner, diff --git a/test/script/20260723-provision-additional-service-signer.t.sol b/test/script/20260723-provision-additional-service-signer.t.sol index 6ea03248..5bcacc53 100644 --- a/test/script/20260723-provision-additional-service-signer.t.sol +++ b/test/script/20260723-provision-additional-service-signer.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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import {Clones} from "@openzeppelin-contracts-5.6.1/proxy/Clones.sol"; import {ICLONEABLE_V2_SUCCESS} from "rain-factory-0.1.1/src/interface/ICloneableV2.sol"; diff --git a/test/script/20260729-deploy-governance-timelock.t.sol b/test/script/20260729-deploy-governance-timelock.t.sol index 838568f3..18472353 100644 --- a/test/script/20260729-deploy-governance-timelock.t.sol +++ b/test/script/20260729-deploy-governance-timelock.t.sol @@ -2,8 +2,8 @@ // 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 {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {DeployerHoldsTimelockRole, TimelockNotPinned} from "../../script/20260729-deploy-governance-timelock.s.sol"; import {UnpinnedDeployGovernanceTimelockHarness} from "./UnpinnedDeployGovernanceTimelockHarness.sol"; diff --git a/test/script/20260729-migrate-governance-to-timelock.t.sol b/test/script/20260729-migrate-governance-to-timelock.t.sol index 00f7f953..90fad889 100644 --- a/test/script/20260729-migrate-governance-to-timelock.t.sol +++ b/test/script/20260729-migrate-governance-to-timelock.t.sol @@ -2,13 +2,13 @@ // 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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol"; import {TimelockController} from "@openzeppelin-contracts-5.6.1/governance/TimelockController.sol"; import {IBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/IBeacon.sol"; import {UpgradeableBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/UpgradeableBeacon.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {DeployGovernanceTimelockHarness} from "./DeployGovernanceTimelockHarness.sol"; import { diff --git a/test/script/20260807-deploy-missing-tokens.t.sol b/test/script/20260807-deploy-missing-tokens.t.sol index 0f1c3f53..5ad338d8 100644 --- a/test/script/20260807-deploy-missing-tokens.t.sol +++ b/test/script/20260807-deploy-missing-tokens.t.sol @@ -2,8 +2,8 @@ // 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 {Vm} from "forge-std-1.16.1/src/Vm.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; +import {Vm} from "forge-std-1.16.2/src/Vm.sol"; import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol"; import { AuthoriserNotReady, diff --git a/test/script/20260810-revoke-fireblocks-service-signer.prod.t.sol b/test/script/20260810-revoke-fireblocks-service-signer.prod.t.sol index 6c5ce6a4..b41a8dd4 100644 --- a/test/script/20260810-revoke-fireblocks-service-signer.prod.t.sol +++ b/test/script/20260810-revoke-fireblocks-service-signer.prod.t.sol @@ -2,9 +2,9 @@ // 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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {RevokeFireblocksServiceSigner} from "../../script/20260810-revoke-fireblocks-service-signer.s.sol"; import {RevokeFireblocksServiceSignerRemainderHarness} from "./RevokeFireblocksServiceSignerRemainderHarness.sol"; diff --git a/test/script/20260810-revoke-fireblocks-service-signer.t.sol b/test/script/20260810-revoke-fireblocks-service-signer.t.sol index 7ee09eb0..b8b0eafe 100644 --- a/test/script/20260810-revoke-fireblocks-service-signer.t.sol +++ b/test/script/20260810-revoke-fireblocks-service-signer.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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import {Clones} from "@openzeppelin-contracts-5.6.1/proxy/Clones.sol"; import {ICLONEABLE_V2_SUCCESS} from "rain-factory-0.1.1/src/interface/ICloneableV2.sol"; diff --git a/test/script/20260813-timelock-rehearsal.t.sol b/test/script/20260813-timelock-rehearsal.t.sol index b0c0b27f..632a33ac 100644 --- a/test/script/20260813-timelock-rehearsal.t.sol +++ b/test/script/20260813-timelock-rehearsal.t.sol @@ -2,8 +2,8 @@ // 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 {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import {TimelockController} from "@openzeppelin-contracts-5.6.1/governance/TimelockController.sol"; diff --git a/test/script/DeployMissingTokensHarness.sol b/test/script/DeployMissingTokensHarness.sol index 0ba42bd5..de64fe34 100644 --- a/test/script/DeployMissingTokensHarness.sol +++ b/test/script/DeployMissingTokensHarness.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 {DeployMissingTokens} from "../../script/20260807-deploy-missing-tokens.s.sol"; import {TokenInstance} from "../../src/lib/LibTokenInvariants.sol"; import {TokenConfig} from "../../src/lib/LibProdTokenConfig.sol"; diff --git a/test/script/MigrateMultisigThresholdTest.t.sol b/test/script/MigrateMultisigThresholdTest.t.sol index abb61fd1..b260d1c5 100644 --- a/test/script/MigrateMultisigThresholdTest.t.sol +++ b/test/script/MigrateMultisigThresholdTest.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 { MigrateMultisigThreshold, VerifyMismatch, @@ -14,7 +14,7 @@ import {LibSafeOps, SafeTx} from "../../src/lib/LibSafeOps.sol"; import {LibSafeInvariants, SafeThresholdMismatch} from "../../src/lib/LibSafeInvariants.sol"; import {IOwnable, ReceiptVaultOwnerMismatch} from "../../src/lib/LibTokenInvariants.sol"; import {LibTokenInvariants} from "../../src/lib/LibTokenInvariants.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; /// @title MigrateMultisigThresholdTest /// @notice End-to-end fork tests for the multisig threshold migration diff --git a/test/src/concrete/ST0xOrchestrator.t.sol b/test/src/concrete/ST0xOrchestrator.t.sol index 73159d66..8b0f82e0 100644 --- a/test/src/concrete/ST0xOrchestrator.t.sol +++ b/test/src/concrete/ST0xOrchestrator.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2026 S01 Issuer GmbH 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 {ST0xOrchestrator} from "../../../src/concrete/ST0xOrchestrator.sol"; import {IMintRecipient} from "../../../src/interface/IMintRecipient.sol"; import {IST0xVaultBeaconSet} from "../../../src/interface/IST0xVaultBeaconSet.sol"; diff --git a/test/src/concrete/StoxCorporateActionsFacet.authorizerIntegration.t.sol b/test/src/concrete/StoxCorporateActionsFacet.authorizerIntegration.t.sol index ddcc292e..c8702692 100644 --- a/test/src/concrete/StoxCorporateActionsFacet.authorizerIntegration.t.sol +++ b/test/src/concrete/StoxCorporateActionsFacet.authorizerIntegration.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 {SCHEDULE_CORPORATE_ACTION, CANCEL_CORPORATE_ACTION} from "../../../src/lib/LibCorporateAction.sol"; import { OffchainAssetReceiptVaultAuthorizerV1Config, diff --git a/test/src/concrete/StoxCorporateActionsFacet.t.sol b/test/src/concrete/StoxCorporateActionsFacet.t.sol index f8e70ef5..06f4de81 100644 --- a/test/src/concrete/StoxCorporateActionsFacet.t.sol +++ b/test/src/concrete/StoxCorporateActionsFacet.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test, Vm} from "forge-std-1.16.1/src/Test.sol"; +import {Test, Vm} from "forge-std-1.16.2/src/Test.sol"; import {StoxCorporateActionsFacet} from "../../../src/concrete/StoxCorporateActionsFacet.sol"; import { ICorporateActionsV1, diff --git a/test/src/concrete/StoxCorporateActionsHandler.sol b/test/src/concrete/StoxCorporateActionsHandler.sol index 64f4cad2..3020a782 100644 --- a/test/src/concrete/StoxCorporateActionsHandler.sol +++ b/test/src/concrete/StoxCorporateActionsHandler.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 {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {ACTION_TYPE_STOCK_SPLIT_V1} from "../../../src/interface/ICorporateActionsV1.sol"; import {NODE_NONE} from "../../../src/lib/LibCorporateActionNode.sol"; diff --git a/test/src/concrete/StoxCorporateActionsInvariant.t.sol b/test/src/concrete/StoxCorporateActionsInvariant.t.sol index 7db8c1a4..2d76bdca 100644 --- a/test/src/concrete/StoxCorporateActionsInvariant.t.sol +++ b/test/src/concrete/StoxCorporateActionsInvariant.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 {BALANCE_MIGRATION_TYPES_MASK} from "../../../src/interface/ICorporateActionsV1.sol"; import {CorporateActionNode, CompletionFilter, NODE_NONE} from "../../../src/lib/LibCorporateActionNode.sol"; import {InvariantVault} from "./InvariantVault.sol"; diff --git a/test/src/concrete/StoxReceipt.t.sol b/test/src/concrete/StoxReceipt.t.sol index 942f0e9a..8675b61c 100644 --- a/test/src/concrete/StoxReceipt.t.sol +++ b/test/src/concrete/StoxReceipt.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 {StoxReceipt} from "../../../src/concrete/StoxReceipt.sol"; import {Initializable} from "@openzeppelin-contracts-upgradeable-5.6.1/proxy/utils/Initializable.sol"; diff --git a/test/src/concrete/StoxReceiptRebaseIntegrationTest.t.sol b/test/src/concrete/StoxReceiptRebaseIntegrationTest.t.sol index 629716b8..d4dadbe3 100644 --- a/test/src/concrete/StoxReceiptRebaseIntegrationTest.t.sol +++ b/test/src/concrete/StoxReceiptRebaseIntegrationTest.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test, Vm} from "forge-std-1.16.1/src/Test.sol"; +import {Test, Vm} from "forge-std-1.16.2/src/Test.sol"; import {StoxReceipt} from "../../../src/concrete/StoxReceipt.sol"; import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {ICorporateActionsV1} from "../../../src/interface/ICorporateActionsV1.sol"; diff --git a/test/src/concrete/StoxReceiptVault.rawTotalSupply.t.sol b/test/src/concrete/StoxReceiptVault.rawTotalSupply.t.sol index deabd55e..047dfba8 100644 --- a/test/src/concrete/StoxReceiptVault.rawTotalSupply.t.sol +++ b/test/src/concrete/StoxReceiptVault.rawTotalSupply.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 {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {ACTION_TYPE_STOCK_SPLIT_V1} from "../../../src/interface/ICorporateActionsV1.sol"; import {LibStockSplit} from "../../../src/lib/LibStockSplit.sol"; diff --git a/test/src/concrete/StoxReceiptVault.setAuthorizerGuard.t.sol b/test/src/concrete/StoxReceiptVault.setAuthorizerGuard.t.sol index 8f794a45..601dda25 100644 --- a/test/src/concrete/StoxReceiptVault.setAuthorizerGuard.t.sol +++ b/test/src/concrete/StoxReceiptVault.setAuthorizerGuard.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 {StoxReceiptVault} from "../../../src/concrete/StoxReceiptVault.sol"; import {OwnedStoxReceiptVault} from "./OwnedStoxReceiptVault.sol"; import { diff --git a/test/src/concrete/StoxReceiptVault.t.sol b/test/src/concrete/StoxReceiptVault.t.sol index 94e75253..777cafb3 100644 --- a/test/src/concrete/StoxReceiptVault.t.sol +++ b/test/src/concrete/StoxReceiptVault.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 {StoxReceiptVault} from "../../../src/concrete/StoxReceiptVault.sol"; import {Initializable} from "@openzeppelin-contracts-upgradeable-5.6.1/proxy/utils/Initializable.sol"; diff --git a/test/src/concrete/StoxReceiptVaultFallbackRouting.t.sol b/test/src/concrete/StoxReceiptVaultFallbackRouting.t.sol index d64ac635..1c00a0d2 100644 --- a/test/src/concrete/StoxReceiptVaultFallbackRouting.t.sol +++ b/test/src/concrete/StoxReceiptVaultFallbackRouting.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 {StoxReceiptVault} from "../../../src/concrete/StoxReceiptVault.sol"; import {StoxCorporateActionsFacet} from "../../../src/concrete/StoxCorporateActionsFacet.sol"; import { diff --git a/test/src/concrete/StoxReceiptVaultMigrationIntegrationTest.t.sol b/test/src/concrete/StoxReceiptVaultMigrationIntegrationTest.t.sol index cf0d6eea..478c6923 100644 --- a/test/src/concrete/StoxReceiptVaultMigrationIntegrationTest.t.sol +++ b/test/src/concrete/StoxReceiptVaultMigrationIntegrationTest.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test, Vm} from "forge-std-1.16.1/src/Test.sol"; +import {Test, Vm} from "forge-std-1.16.2/src/Test.sol"; import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {StoxReceiptVault} from "../../../src/concrete/StoxReceiptVault.sol"; import {ERC20Upgradeable} from "@openzeppelin-contracts-upgradeable-5.6.1/token/ERC20/ERC20Upgradeable.sol"; diff --git a/test/src/concrete/StoxWrappedTokenVault.t.sol b/test/src/concrete/StoxWrappedTokenVault.t.sol index 2b0b893f..ffc00740 100644 --- a/test/src/concrete/StoxWrappedTokenVault.t.sol +++ b/test/src/concrete/StoxWrappedTokenVault.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 {StoxWrappedTokenVault, ZeroAsset} from "../../../src/concrete/StoxWrappedTokenVault.sol"; import {ICloneableV2, ICLONEABLE_V2_SUCCESS} from "rain-factory-0.1.1/src/interface/ICloneableV2.sol"; import {BeaconProxy} from "@openzeppelin-contracts-5.6.1/proxy/beacon/BeaconProxy.sol"; @@ -11,7 +11,7 @@ import { ZeroVaultAsset } from "../../../src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.sol"; import {StoxWrappedTokenVaultBeacon} from "../../../src/concrete/StoxWrappedTokenVaultBeacon.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibProdDeployV4} from "../../../src/generated/LibProdDeployV4.sol"; import {LibTestDeploy} from "../../lib/LibTestDeploy.sol"; import {Initializable} from "@openzeppelin-contracts-upgradeable-5.6.1/proxy/utils/Initializable.sol"; diff --git a/test/src/concrete/StoxWrappedTokenVaultBeacon.t.sol b/test/src/concrete/StoxWrappedTokenVaultBeacon.t.sol index 23ce40ea..4bb455ed 100644 --- a/test/src/concrete/StoxWrappedTokenVaultBeacon.t.sol +++ b/test/src/concrete/StoxWrappedTokenVaultBeacon.t.sol @@ -2,8 +2,8 @@ // 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 {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {StoxWrappedTokenVault} from "../../../src/concrete/StoxWrappedTokenVault.sol"; import {StoxWrappedTokenVaultBeacon} from "../../../src/concrete/StoxWrappedTokenVaultBeacon.sol"; import {LibProdDeployV1} from "../../../src/lib/LibProdDeployV1.sol"; diff --git a/test/src/concrete/StoxWrappedTokenVaultV1.prod.base.t.sol b/test/src/concrete/StoxWrappedTokenVaultV1.prod.base.t.sol index bfcc8b91..e61a4153 100644 --- a/test/src/concrete/StoxWrappedTokenVaultV1.prod.base.t.sol +++ b/test/src/concrete/StoxWrappedTokenVaultV1.prod.base.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test, Vm} from "forge-std-1.16.1/src/Test.sol"; +import {Test, Vm} from "forge-std-1.16.2/src/Test.sol"; import {LibProdDeployV1} from "../../../src/lib/LibProdDeployV1.sol"; import {LibTestProd} from "../../lib/LibTestProd.sol"; import {IBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/IBeacon.sol"; diff --git a/test/src/concrete/StoxWrappedTokenVaultV2.t.sol b/test/src/concrete/StoxWrappedTokenVaultV2.t.sol index 09fd92a2..030d66eb 100644 --- a/test/src/concrete/StoxWrappedTokenVaultV2.t.sol +++ b/test/src/concrete/StoxWrappedTokenVaultV2.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test, Vm} from "forge-std-1.16.1/src/Test.sol"; +import {Test, Vm} from "forge-std-1.16.2/src/Test.sol"; import {StoxWrappedTokenVault, ZeroAsset} from "../../../src/concrete/StoxWrappedTokenVault.sol"; import { StoxWrappedTokenVaultBeaconSetDeployer, diff --git a/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultAuthorizerV1.initializeGuard.t.sol b/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultAuthorizerV1.initializeGuard.t.sol index d5fe91d4..2687d006 100644 --- a/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultAuthorizerV1.initializeGuard.t.sol +++ b/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultAuthorizerV1.initializeGuard.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 {Clones} from "@openzeppelin-contracts-5.6.1/proxy/Clones.sol"; import {SCHEDULE_CORPORATE_ACTION, CANCEL_CORPORATE_ACTION} from "../../../../src/lib/LibCorporateAction.sol"; import { diff --git a/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultAuthorizerV1.t.sol b/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultAuthorizerV1.t.sol index beaeb70c..fbb3ea94 100644 --- a/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultAuthorizerV1.t.sol +++ b/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultAuthorizerV1.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 { StoxOffchainAssetReceiptVaultAuthorizerV1 } from "../../../../src/concrete/authorize/StoxOffchainAssetReceiptVaultAuthorizerV1.sol"; diff --git a/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.corporateActionPairingGap.t.sol b/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.corporateActionPairingGap.t.sol index 667c474c..de38abb6 100644 --- a/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.corporateActionPairingGap.t.sol +++ b/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.corporateActionPairingGap.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 { StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1 } from "../../../../src/concrete/authorize/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol"; diff --git a/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.t.sol b/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.t.sol index 4b6ad75c..abc8adcd 100644 --- a/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.t.sol +++ b/test/src/concrete/authorize/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.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 { StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1 } from "../../../../src/concrete/authorize/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol"; diff --git a/test/src/concrete/deploy/BeaconOwnerMigrationPin.t.sol b/test/src/concrete/deploy/BeaconOwnerMigrationPin.t.sol index f07980d2..cfad56f8 100644 --- a/test/src/concrete/deploy/BeaconOwnerMigrationPin.t.sol +++ b/test/src/concrete/deploy/BeaconOwnerMigrationPin.t.sol @@ -2,9 +2,9 @@ // 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 {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibBeaconInvariants} from "../../../../src/lib/LibBeaconInvariants.sol"; import {LibMigrationInvariant} from "../../../../src/lib/LibMigrationInvariant.sol"; import {LibProdDeployV1} from "../../../../src/lib/LibProdDeployV1.sol"; diff --git a/test/src/concrete/deploy/EthereumBeaconOwnership.t.sol b/test/src/concrete/deploy/EthereumBeaconOwnership.t.sol index b78fa48d..f591fd8e 100644 --- a/test/src/concrete/deploy/EthereumBeaconOwnership.t.sol +++ b/test/src/concrete/deploy/EthereumBeaconOwnership.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 {LibProdBeacons0_1_1} from "../../../../src/lib/LibProdBeacons0_1_1.sol"; import {LibProdDeployV1} from "../../../../src/lib/LibProdDeployV1.sol"; import {LibSafeInvariants} from "../../../../src/lib/LibSafeInvariants.sol"; diff --git a/test/src/concrete/deploy/EthereumTokenOwnerSafeParity.t.sol b/test/src/concrete/deploy/EthereumTokenOwnerSafeParity.t.sol index b2fb9cd8..a7eb451f 100644 --- a/test/src/concrete/deploy/EthereumTokenOwnerSafeParity.t.sol +++ b/test/src/concrete/deploy/EthereumTokenOwnerSafeParity.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 {IGnosisSafe} from "../../../../src/interface/IGnosisSafe.sol"; import {LibSafeInvariants} from "../../../../src/lib/LibSafeInvariants.sol"; import {LibStoxDeployNetworks} from "../../../../src/lib/LibStoxDeployNetworks.sol"; diff --git a/test/src/concrete/deploy/GovernanceTimelockMigration.t.sol b/test/src/concrete/deploy/GovernanceTimelockMigration.t.sol index 150d0782..31b9ad89 100644 --- a/test/src/concrete/deploy/GovernanceTimelockMigration.t.sol +++ b/test/src/concrete/deploy/GovernanceTimelockMigration.t.sol @@ -2,9 +2,9 @@ // 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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibAuthoriserInvariants, RoleGrant} from "../../../../src/lib/LibAuthoriserInvariants.sol"; import {LibBeaconInvariants} from "../../../../src/lib/LibBeaconInvariants.sol"; diff --git a/test/src/concrete/deploy/HyperEvmBeaconOwnership.t.sol b/test/src/concrete/deploy/HyperEvmBeaconOwnership.t.sol index 0e5ebf4e..4ccb03ce 100644 --- a/test/src/concrete/deploy/HyperEvmBeaconOwnership.t.sol +++ b/test/src/concrete/deploy/HyperEvmBeaconOwnership.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 {LibProdBeacons0_1_1} from "../../../../src/lib/LibProdBeacons0_1_1.sol"; import {LibSafeInvariants} from "../../../../src/lib/LibSafeInvariants.sol"; import {LibBeaconInvariants} from "../../../../src/lib/LibBeaconInvariants.sol"; diff --git a/test/src/concrete/deploy/HyperEvmTokenOwnerSafeParity.t.sol b/test/src/concrete/deploy/HyperEvmTokenOwnerSafeParity.t.sol index 452dc470..c50c3110 100644 --- a/test/src/concrete/deploy/HyperEvmTokenOwnerSafeParity.t.sol +++ b/test/src/concrete/deploy/HyperEvmTokenOwnerSafeParity.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 {IGnosisSafe} from "../../../../src/interface/IGnosisSafe.sol"; import {LibSafeInvariants} from "../../../../src/lib/LibSafeInvariants.sol"; import {LibStoxDeployNetworks} from "../../../../src/lib/LibStoxDeployNetworks.sol"; diff --git a/test/src/concrete/deploy/ST0xOrchestratorBeaconSetDeployer.t.sol b/test/src/concrete/deploy/ST0xOrchestratorBeaconSetDeployer.t.sol index caa0665f..0450aa84 100644 --- a/test/src/concrete/deploy/ST0xOrchestratorBeaconSetDeployer.t.sol +++ b/test/src/concrete/deploy/ST0xOrchestratorBeaconSetDeployer.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2026 S01 Issuer GmbH pragma solidity =0.8.25; -import {Test, Vm} from "forge-std-1.16.1/src/Test.sol"; +import {Test, Vm} from "forge-std-1.16.2/src/Test.sol"; import {IBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/IBeacon.sol"; import {UpgradeableBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/UpgradeableBeacon.sol"; import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol"; diff --git a/test/src/concrete/deploy/StoxCrossChainParity.t.sol b/test/src/concrete/deploy/StoxCrossChainParity.t.sol index 8148756a..7a5353ce 100644 --- a/test/src/concrete/deploy/StoxCrossChainParity.t.sol +++ b/test/src/concrete/deploy/StoxCrossChainParity.t.sol @@ -2,12 +2,12 @@ // 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 {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; import {IERC4626} from "@openzeppelin-contracts-5.6.1/interfaces/IERC4626.sol"; import {IBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/IBeacon.sol"; import {ERC1967Utils} from "@openzeppelin-contracts-5.6.1/proxy/ERC1967/ERC1967Utils.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {IGnosisSafe} from "../../../../src/interface/IGnosisSafe.sol"; import {IOwnable} from "../../../../src/interface/IOwnable.sol"; import {LibAuthoriserInvariants} from "../../../../src/lib/LibAuthoriserInvariants.sol"; diff --git a/test/src/concrete/deploy/StoxProdV2.t.sol b/test/src/concrete/deploy/StoxProdV2.t.sol index aff4534c..58bfbd9f 100644 --- a/test/src/concrete/deploy/StoxProdV2.t.sol +++ b/test/src/concrete/deploy/StoxProdV2.t.sol @@ -2,13 +2,13 @@ // 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 {LibProdDeployV2} from "../../../../src/lib/LibProdDeployV2.sol"; import {LibProdDeployV2BaseOverrides} from "../../../../src/lib/LibProdDeployV2BaseOverrides.sol"; import {LibSafeInvariants} from "../../../../src/lib/LibSafeInvariants.sol"; import {LibInvariants} from "../../../../src/lib/LibInvariants.sol"; import {IGnosisSafe} from "../../../../src/interface/IGnosisSafe.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {IBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/IBeacon.sol"; import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol"; import { diff --git a/test/src/concrete/deploy/StoxProdV4.t.sol b/test/src/concrete/deploy/StoxProdV4.t.sol index 6700e02e..0b21dcc4 100644 --- a/test/src/concrete/deploy/StoxProdV4.t.sol +++ b/test/src/concrete/deploy/StoxProdV4.t.sol @@ -2,9 +2,9 @@ // 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 {LibProdDeployV4} from "../../../../src/generated/LibProdDeployV4.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibStoxDeployNetworks} from "../../../../src/lib/LibStoxDeployNetworks.sol"; import {LibBeaconInvariants} from "../../../../src/lib/LibBeaconInvariants.sol"; import {IBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/IBeacon.sol"; diff --git a/test/src/concrete/deploy/StoxProdV4PostSwap.t.sol b/test/src/concrete/deploy/StoxProdV4PostSwap.t.sol index 7822b992..f640c161 100644 --- a/test/src/concrete/deploy/StoxProdV4PostSwap.t.sol +++ b/test/src/concrete/deploy/StoxProdV4PostSwap.t.sol @@ -2,12 +2,12 @@ // 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 {LibAuthoriserInvariants} from "../../../../src/lib/LibAuthoriserInvariants.sol"; import {LibMigrationInvariant} from "../../../../src/lib/LibMigrationInvariant.sol"; import {LibProdDeployV4} from "../../../../src/generated/LibProdDeployV4.sol"; import {LibTokenInvariants} from "../../../../src/lib/LibTokenInvariants.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; /// @title StoxProdV4PostSwapTest /// @notice Post-deploy + post-swap integrity pin for V4 on-chain state. diff --git a/test/src/concrete/deploy/StoxUnifiedDeployer.ierc165.t.sol b/test/src/concrete/deploy/StoxUnifiedDeployer.ierc165.t.sol index 39467779..89582c87 100644 --- a/test/src/concrete/deploy/StoxUnifiedDeployer.ierc165.t.sol +++ b/test/src/concrete/deploy/StoxUnifiedDeployer.ierc165.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 {IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/IERC165.sol"; import {StoxUnifiedDeployer} from "../../../../src/concrete/deploy/StoxUnifiedDeployer.sol"; diff --git a/test/src/concrete/deploy/StoxUnifiedDeployer.newTokenAndWrapperVault.t.sol b/test/src/concrete/deploy/StoxUnifiedDeployer.newTokenAndWrapperVault.t.sol index ec7fcad8..d0b4b296 100644 --- a/test/src/concrete/deploy/StoxUnifiedDeployer.newTokenAndWrapperVault.t.sol +++ b/test/src/concrete/deploy/StoxUnifiedDeployer.newTokenAndWrapperVault.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test, Vm} from "forge-std-1.16.1/src/Test.sol"; +import {Test, Vm} from "forge-std-1.16.2/src/Test.sol"; import { OffchainAssetReceiptVaultConfigV2 } from "rain-vats-0.1.6/src/concrete/deploy/OffchainAssetReceiptVaultBeaconSetDeployer.sol"; diff --git a/test/src/concrete/deploy/StoxUnifiedDeployer.prod.base.t.sol b/test/src/concrete/deploy/StoxUnifiedDeployer.prod.base.t.sol index 3bc3e551..3b8e4234 100644 --- a/test/src/concrete/deploy/StoxUnifiedDeployer.prod.base.t.sol +++ b/test/src/concrete/deploy/StoxUnifiedDeployer.prod.base.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test, Vm} from "forge-std-1.16.1/src/Test.sol"; +import {Test, Vm} from "forge-std-1.16.2/src/Test.sol"; import {StoxUnifiedDeployer} from "../../../../src/concrete/deploy/StoxUnifiedDeployer.sol"; import {LibProdDeployV1} from "../../../../src/lib/LibProdDeployV1.sol"; diff --git a/test/src/concrete/deploy/StoxUnifiedDeployer.t.sol b/test/src/concrete/deploy/StoxUnifiedDeployer.t.sol index 5ca83067..49b71e47 100644 --- a/test/src/concrete/deploy/StoxUnifiedDeployer.t.sol +++ b/test/src/concrete/deploy/StoxUnifiedDeployer.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test, Vm} from "forge-std-1.16.1/src/Test.sol"; +import {Test, Vm} from "forge-std-1.16.2/src/Test.sol"; import { OffchainAssetReceiptVaultBeaconSetDeployer, OffchainAssetReceiptVaultConfigV2, diff --git a/test/src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.ierc165.t.sol b/test/src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.ierc165.t.sol index 2e32ef86..4d311738 100644 --- a/test/src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.ierc165.t.sol +++ b/test/src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.ierc165.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 {IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/IERC165.sol"; import { diff --git a/test/src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.t.sol b/test/src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.t.sol index 3319060d..46594ae5 100644 --- a/test/src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.t.sol +++ b/test/src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test, Vm} from "forge-std-1.16.1/src/Test.sol"; +import {Test, Vm} from "forge-std-1.16.2/src/Test.sol"; import { StoxWrappedTokenVaultBeaconSetDeployer, ZeroVaultAsset, @@ -10,7 +10,7 @@ import { } from "../../../../src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.sol"; import {StoxWrappedTokenVault} from "../../../../src/concrete/StoxWrappedTokenVault.sol"; import {StoxWrappedTokenVaultBeacon} from "../../../../src/concrete/StoxWrappedTokenVaultBeacon.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {MockERC20} from "../../../concrete/MockERC20.sol"; import {BadInitializeVault} from "../../../concrete/BadInitializeVault.sol"; import {LibTestDeploy} from "../../../lib/LibTestDeploy.sol"; diff --git a/test/src/concrete/integration/OrchestratorIntegrationTest.sol b/test/src/concrete/integration/OrchestratorIntegrationTest.sol index d7e3faae..e8a8d259 100644 --- a/test/src/concrete/integration/OrchestratorIntegrationTest.sol +++ b/test/src/concrete/integration/OrchestratorIntegrationTest.sol @@ -2,13 +2,13 @@ // SPDX-FileCopyrightText: Copyright (c) 2026 S01 Issuer GmbH 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 {IERC1155} from "@openzeppelin-contracts-5.6.1/token/ERC1155/IERC1155.sol"; import {UpgradeableBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/UpgradeableBeacon.sol"; import {BeaconProxy} from "@openzeppelin-contracts-5.6.1/proxy/beacon/BeaconProxy.sol"; import {CloneFactory} from "rain-factory-0.1.1/src/concrete/CloneFactory.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import { OffchainAssetReceiptVaultConfigV2, diff --git a/test/src/concrete/upgrade/V3UpgradeShadowFork.t.sol b/test/src/concrete/upgrade/V3UpgradeShadowFork.t.sol index 672e4095..8a370456 100644 --- a/test/src/concrete/upgrade/V3UpgradeShadowFork.t.sol +++ b/test/src/concrete/upgrade/V3UpgradeShadowFork.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 {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol"; import {IBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/IBeacon.sol"; import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; @@ -20,7 +20,7 @@ import { VALID_ACTION_TYPES_MASK } from "../../../../src/interface/ICorporateActionsV1.sol"; import {CompletionFilter} from "../../../../src/lib/LibCorporateActionNode.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {IReceiptVaultV3} from "rain-vats-0.1.6/src/interface/IReceiptVaultV3.sol"; import {IReceiptV3} from "rain-vats-0.1.6/src/interface/IReceiptV3.sol"; import {IAuthorizableV1} from "rain-vats-0.1.6/src/interface/IAuthorizableV1.sol"; diff --git a/test/src/lib/LibAuthoriserInvariants.t.sol b/test/src/lib/LibAuthoriserInvariants.t.sol index 7a7d02d1..735a47a8 100644 --- a/test/src/lib/LibAuthoriserInvariants.t.sol +++ b/test/src/lib/LibAuthoriserInvariants.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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; import { LibAuthoriserInvariants, @@ -14,7 +14,7 @@ import { } from "../../../src/lib/LibAuthoriserInvariants.sol"; import {LibProdDeployV4} from "../../../src/generated/LibProdDeployV4.sol"; import {LibAuthoriserInvariantsHarness} from "./LibAuthoriserInvariantsHarness.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; /// @title LibAuthoriserInvariantsTest /// @notice Fork tests pinning the production V4 authoriser clone's state diff --git a/test/src/lib/LibBeaconInvariants.t.sol b/test/src/lib/LibBeaconInvariants.t.sol index b0ef6eda..e1ed41f2 100644 --- a/test/src/lib/LibBeaconInvariants.t.sol +++ b/test/src/lib/LibBeaconInvariants.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 { LibBeaconInvariants, IOwnable, @@ -18,7 +18,7 @@ import {LibProdBeacons0_1_1} from "../../../src/lib/LibProdBeacons0_1_1.sol"; import {LibProdDeployV1} from "../../../src/lib/LibProdDeployV1.sol"; import {LibStoxDeployNetworks} from "../../../src/lib/LibStoxDeployNetworks.sol"; import {LibBeaconInvariantsHarness} from "./LibBeaconInvariantsHarness.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {IBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/IBeacon.sol"; /// @title LibBeaconInvariantsTest diff --git a/test/src/lib/LibConstantsStructure.t.sol b/test/src/lib/LibConstantsStructure.t.sol index 7380f65b..d8eb71cc 100644 --- a/test/src/lib/LibConstantsStructure.t.sol +++ b/test/src/lib/LibConstantsStructure.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 {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import { ACTION_TYPE_INIT_V1, diff --git a/test/src/lib/LibCorporateActionNode.t.sol b/test/src/lib/LibCorporateActionNode.t.sol index b152809f..660bc622 100644 --- a/test/src/lib/LibCorporateActionNode.t.sol +++ b/test/src/lib/LibCorporateActionNode.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 {TraversalHarness} from "./TraversalHarness.sol"; import { ACTION_TYPE_STOCK_SPLIT_V1, diff --git a/test/src/lib/LibERC1155Storage.t.sol b/test/src/lib/LibERC1155Storage.t.sol index ead20951..21a533f8 100644 --- a/test/src/lib/LibERC1155Storage.t.sol +++ b/test/src/lib/LibERC1155Storage.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 {TestERC1155} from "./TestERC1155.sol"; import {ERC1155_STORAGE_LOCATION} from "src/lib/LibERC1155Storage.sol"; diff --git a/test/src/lib/LibERC20Storage.t.sol b/test/src/lib/LibERC20Storage.t.sol index f56103cc..eeafdde7 100644 --- a/test/src/lib/LibERC20Storage.t.sol +++ b/test/src/lib/LibERC20Storage.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 {TestERC20} from "./TestERC20.sol"; /// @dev Regression / drift-detection tests for `LibERC20Storage`. The library diff --git a/test/src/lib/LibInvariants.t.sol b/test/src/lib/LibInvariants.t.sol index 5462e412..31c39a63 100644 --- a/test/src/lib/LibInvariants.t.sol +++ b/test/src/lib/LibInvariants.t.sol @@ -2,8 +2,8 @@ // 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 {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {IGnosisSafe} from "../../../src/interface/IGnosisSafe.sol"; import {LibInvariants} from "../../../src/lib/LibInvariants.sol"; import {LibSafeInvariants} from "../../../src/lib/LibSafeInvariants.sol"; diff --git a/test/src/lib/LibMigrationInvariant.t.sol b/test/src/lib/LibMigrationInvariant.t.sol index eee9f941..487e4103 100644 --- a/test/src/lib/LibMigrationInvariant.t.sol +++ b/test/src/lib/LibMigrationInvariant.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 { LibMigrationInvariant, MigrationStateDrift, diff --git a/test/src/lib/LibProdBeaconsBase.t.sol b/test/src/lib/LibProdBeaconsBase.t.sol index b8c597d7..9dc32d79 100644 --- a/test/src/lib/LibProdBeaconsBase.t.sol +++ b/test/src/lib/LibProdBeaconsBase.t.sol @@ -2,10 +2,10 @@ // 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 {LibProdBeaconsBase} from "../../../src/lib/LibProdBeaconsBase.sol"; import {LibTokenInvariants, TokenInstance} from "../../../src/lib/LibTokenInvariants.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {ERC1967_BEACON_SLOT} from "rain-extrospection-0.1.1/src/lib/LibExtrospectERC1967BeaconProxy.sol"; /// @title LibProdBeaconsBaseTest diff --git a/test/src/lib/LibProdDeployV1.t.sol b/test/src/lib/LibProdDeployV1.t.sol index 343f69b2..a450ed17 100644 --- a/test/src/lib/LibProdDeployV1.t.sol +++ b/test/src/lib/LibProdDeployV1.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 {LibProdDeployV1} from "../../../src/lib/LibProdDeployV1.sol"; /// @title LibProdDeployV1Test diff --git a/test/src/lib/LibProdDeployV1V2.t.sol b/test/src/lib/LibProdDeployV1V2.t.sol index 3d73858c..d7ed4f5d 100644 --- a/test/src/lib/LibProdDeployV1V2.t.sol +++ b/test/src/lib/LibProdDeployV1V2.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 {LibProdDeployV1} from "../../../src/lib/LibProdDeployV1.sol"; import {LibProdDeployV2} from "../../../src/lib/LibProdDeployV2.sol"; diff --git a/test/src/lib/LibProdDeployV2.t.sol b/test/src/lib/LibProdDeployV2.t.sol index 131610da..cd5b6f5f 100644 --- a/test/src/lib/LibProdDeployV2.t.sol +++ b/test/src/lib/LibProdDeployV2.t.sol @@ -2,8 +2,8 @@ // 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 {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibProdDeployV2} from "../../../src/lib/LibProdDeployV2.sol"; /// @title LibProdDeployV2Test diff --git a/test/src/lib/LibProdDeployV4.t.sol b/test/src/lib/LibProdDeployV4.t.sol index 00b564dd..46fe525c 100644 --- a/test/src/lib/LibProdDeployV4.t.sol +++ b/test/src/lib/LibProdDeployV4.t.sol @@ -2,8 +2,8 @@ // 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 {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {Test} from "forge-std-1.16.2/src/Test.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {ERC1167_PREFIX, ERC1167_SUFFIX} from "rain-extrospection-0.1.1/src/lib/LibExtrospectERC1167Proxy.sol"; import {LibProdDeployV4} from "../../../src/generated/LibProdDeployV4.sol"; import {LibProdDeployCurrent} from "../../../src/generated/LibProdDeployCurrent.sol"; diff --git a/test/src/lib/LibProdTokenConfig.t.sol b/test/src/lib/LibProdTokenConfig.t.sol index 57f5c7d0..bc096658 100644 --- a/test/src/lib/LibProdTokenConfig.t.sol +++ b/test/src/lib/LibProdTokenConfig.t.sol @@ -2,9 +2,9 @@ // 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 {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibProdTokenConfig, TokenConfig} from "../../../src/lib/LibProdTokenConfig.sol"; import {LibTokenInvariants, TokenInstance} from "../../../src/lib/LibTokenInvariants.sol"; diff --git a/test/src/lib/LibRebase.t.sol b/test/src/lib/LibRebase.t.sol index 11e5103d..4ea78a37 100644 --- a/test/src/lib/LibRebase.t.sol +++ b/test/src/lib/LibRebase.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 {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {LibRebaseHarness} from "./LibRebaseHarness.sol"; import {ACTION_TYPE_STOCK_SPLIT_V1} from "src/interface/ICorporateActionsV1.sol"; diff --git a/test/src/lib/LibRebaseMath.t.sol b/test/src/lib/LibRebaseMath.t.sol index 400c1417..19425f3f 100644 --- a/test/src/lib/LibRebaseMath.t.sol +++ b/test/src/lib/LibRebaseMath.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 {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {LibRebaseMathHarness} from "./LibRebaseMathHarness.sol"; import {BalanceExceedsInt256Max} from "src/error/ErrRebase.sol"; diff --git a/test/src/lib/LibReceiptRebase.t.sol b/test/src/lib/LibReceiptRebase.t.sol index 2613049a..6fccddc5 100644 --- a/test/src/lib/LibReceiptRebase.t.sol +++ b/test/src/lib/LibReceiptRebase.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 {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {LibReceiptRebase} from "src/lib/LibReceiptRebase.sol"; import {ICorporateActionsV1} from "src/interface/ICorporateActionsV1.sol"; diff --git a/test/src/lib/LibSafeInvariants.t.sol b/test/src/lib/LibSafeInvariants.t.sol index 59f7c26e..7fddd8b6 100644 --- a/test/src/lib/LibSafeInvariants.t.sol +++ b/test/src/lib/LibSafeInvariants.t.sol @@ -2,11 +2,11 @@ // 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 {LibSafeInvariants} from "../../../src/lib/LibSafeInvariants.sol"; import {LibSafeInvariantsHarness} from "./LibSafeInvariantsHarness.sol"; import {IGnosisSafe} from "../../../src/interface/IGnosisSafe.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {LibStoxDeployNetworks} from "../../../src/lib/LibStoxDeployNetworks.sol"; import { SafeProxyCodehashMismatch, diff --git a/test/src/lib/LibSafeOps.t.sol b/test/src/lib/LibSafeOps.t.sol index 3c9226ae..6ad81967 100644 --- a/test/src/lib/LibSafeOps.t.sol +++ b/test/src/lib/LibSafeOps.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 { LibSafeOps, SafeTx, @@ -12,7 +12,7 @@ import { } from "../../../src/lib/LibSafeOps.sol"; import {LibSafeInvariants} from "../../../src/lib/LibSafeInvariants.sol"; import {IGnosisSafe} from "../../../src/interface/IGnosisSafe.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import {CallerRecorder} from "./CallerRecorder.sol"; import {ParseHarness} from "./ParseHarness.sol"; import {EmitHarness} from "./EmitHarness.sol"; diff --git a/test/src/lib/LibStockSplit.t.sol b/test/src/lib/LibStockSplit.t.sol index 7310cee3..ca15b696 100644 --- a/test/src/lib/LibStockSplit.t.sol +++ b/test/src/lib/LibStockSplit.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 {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {STOCK_SPLIT_V1_TYPE_HASH} from "../../../src/lib/LibCorporateAction.sol"; import { diff --git a/test/src/lib/LibStockSplitLifecycleTest.t.sol b/test/src/lib/LibStockSplitLifecycleTest.t.sol index c10adf7e..04d2f414 100644 --- a/test/src/lib/LibStockSplitLifecycleTest.t.sol +++ b/test/src/lib/LibStockSplitLifecycleTest.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 {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {STOCK_SPLIT_V1_TYPE_HASH} from "../../../src/lib/LibCorporateAction.sol"; import {ACTION_TYPE_STOCK_SPLIT_V1} from "../../../src/interface/ICorporateActionsV1.sol"; diff --git a/test/src/lib/LibStockSplitResolveTest.t.sol b/test/src/lib/LibStockSplitResolveTest.t.sol index 24184ab5..270b3fbb 100644 --- a/test/src/lib/LibStockSplitResolveTest.t.sol +++ b/test/src/lib/LibStockSplitResolveTest.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 {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {STOCK_SPLIT_V1_TYPE_HASH} from "../../../src/lib/LibCorporateAction.sol"; import {ACTION_TYPE_STOCK_SPLIT_V1} from "../../../src/interface/ICorporateActionsV1.sol"; diff --git a/test/src/lib/LibStockSplitValidation6DecimalsTest.t.sol b/test/src/lib/LibStockSplitValidation6DecimalsTest.t.sol index ba2fbf6e..9688cd7c 100644 --- a/test/src/lib/LibStockSplitValidation6DecimalsTest.t.sol +++ b/test/src/lib/LibStockSplitValidation6DecimalsTest.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 {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {MultiplierTooSmall, MultiplierTooLarge} from "../../../src/error/ErrStockSplit.sol"; import {LibTestTofu} from "../../lib/LibTestTofu.sol"; diff --git a/test/src/lib/LibStockSplitValidationFuzzDecimalsTest.t.sol b/test/src/lib/LibStockSplitValidationFuzzDecimalsTest.t.sol index d1bc1f46..c6aff89c 100644 --- a/test/src/lib/LibStockSplitValidationFuzzDecimalsTest.t.sol +++ b/test/src/lib/LibStockSplitValidationFuzzDecimalsTest.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 {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {MultiplierTooSmall, MultiplierTooLarge} from "../../../src/error/ErrStockSplit.sol"; import {LibTestTofu} from "../../lib/LibTestTofu.sol"; diff --git a/test/src/lib/LibStoxDeployNetworks.t.sol b/test/src/lib/LibStoxDeployNetworks.t.sol index 3d52fd27..dd06a25e 100644 --- a/test/src/lib/LibStoxDeployNetworks.t.sol +++ b/test/src/lib/LibStoxDeployNetworks.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 {LibStoxDeployNetworks} from "../../../src/lib/LibStoxDeployNetworks.sol"; /// @title LibStoxDeployNetworksTest diff --git a/test/src/lib/LibTimelockInvariants.t.sol b/test/src/lib/LibTimelockInvariants.t.sol index c3babd27..ee95eb6e 100644 --- a/test/src/lib/LibTimelockInvariants.t.sol +++ b/test/src/lib/LibTimelockInvariants.t.sol @@ -2,10 +2,10 @@ // 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 {TimelockController} from "@openzeppelin-contracts-5.6.1/governance/TimelockController.sol"; import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; import { LibTimelockInvariants, UnsupportedChainForGovernanceTimelock, diff --git a/test/src/lib/LibTokenInvariants.addresses.t.sol b/test/src/lib/LibTokenInvariants.addresses.t.sol index b558ddf1..824dfe53 100644 --- a/test/src/lib/LibTokenInvariants.addresses.t.sol +++ b/test/src/lib/LibTokenInvariants.addresses.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 {LibTokenInvariants} from "../../../src/lib/LibTokenInvariants.sol"; import {LibProdDeployV1} from "../../../src/lib/LibProdDeployV1.sol"; import {LibTestProd} from "../../lib/LibTestProd.sol"; diff --git a/test/src/lib/LibTokenInvariants.t.sol b/test/src/lib/LibTokenInvariants.t.sol index f3bb46fc..5ec9d1f8 100644 --- a/test/src/lib/LibTokenInvariants.t.sol +++ b/test/src/lib/LibTokenInvariants.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 {LibProdDeployV4} from "../../../src/generated/LibProdDeployV4.sol"; import { LibTokenInvariants, @@ -12,7 +12,7 @@ import { } from "../../../src/lib/LibTokenInvariants.sol"; import {LibSafeInvariants} from "../../../src/lib/LibSafeInvariants.sol"; import {LibTokenInvariantsHarness} from "./LibTokenInvariantsHarness.sol"; -import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol"; +import {LibRainDeploy} from "rain-deploy-0.1.7/src/lib/LibRainDeploy.sol"; /// @title LibTokenInvariantsTest /// @notice Fork tests for the token-side uniformity invariants: every diff --git a/test/src/lib/LibTotalSupply.t.sol b/test/src/lib/LibTotalSupply.t.sol index 30114ba0..121d8633 100644 --- a/test/src/lib/LibTotalSupply.t.sol +++ b/test/src/lib/LibTotalSupply.t.sol @@ -2,7 +2,7 @@ // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd pragma solidity =0.8.25; -import {Test, stdError} from "forge-std-1.16.1/src/Test.sol"; +import {Test, stdError} from "forge-std-1.16.2/src/Test.sol"; import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol"; import {LibTotalSupplyHarness} from "./LibTotalSupplyHarness.sol"; import {ACTION_TYPE_STOCK_SPLIT_V1} from "src/interface/ICorporateActionsV1.sol"; diff --git a/test/src/lib/StorageSlotDistinctness.t.sol b/test/src/lib/StorageSlotDistinctness.t.sol index cc7e796c..93358325 100644 --- a/test/src/lib/StorageSlotDistinctness.t.sol +++ b/test/src/lib/StorageSlotDistinctness.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 {CORPORATE_ACTION_STORAGE_LOCATION} from "src/lib/LibCorporateAction.sol"; import {CORPORATE_ACTION_RECEIPT_STORAGE_LOCATION} from "src/lib/LibCorporateActionReceipt.sol"; import {ERC20_STORAGE_LOCATION} from "src/lib/LibERC20Storage.sol"; From a22096db09beb0ae28aa80932aa60d323f5149bf Mon Sep 17 00:00:00 2001 From: baku-ccron Date: Thu, 27 Aug 2026 10:56:37 +0000 Subject: [PATCH 2/3] Pin the deployer getCode lookups to their full source path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rain-sol-codegen 0.1.36 writes a tag snapshot to `src/generated//.sol` — 0.1.3 wrote `.pointers.sol` — and its orphan check refuses to leave the old-suffixed file beside the new one, so the bump renames all twelve candidates. Every one of them is now a second source file whose name is the name of the contract's own file. `vm.getCode` selects an artifact by matching the trailing path components of its source, so `X.sol:X` stopped naming one file the moment a second `X.sol` existed, and the three StoxUnifiedDeployer tests died on `multiple matching artifacts found` at the first etch. The full source path names the concrete contract and nothing else. Co-Authored-By: Claude Opus 5 (1M context) --- .../concrete/deploy/StoxUnifiedDeployer.t.sol | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/test/src/concrete/deploy/StoxUnifiedDeployer.t.sol b/test/src/concrete/deploy/StoxUnifiedDeployer.t.sol index 49b71e47..cfb6460e 100644 --- a/test/src/concrete/deploy/StoxUnifiedDeployer.t.sol +++ b/test/src/concrete/deploy/StoxUnifiedDeployer.t.sol @@ -19,6 +19,11 @@ import {ReceiptVaultConfigV2} from "rain-vats-0.1.6/src/abstract/ReceiptVault.so import {MockERC20} from "../../../concrete/MockERC20.sol"; contract StoxUnifiedDeployerTest is Test { + /// `vm.getCode` matches an artifact by the trailing path components of its + /// source, so a bare `X.sol:X` is only unique while no other source file is + /// named `X.sol`. Every contract deployed by `script/BuildPointers.sol` now + /// has exactly such a sibling: rain-sol-codegen writes its snapshot to + /// `src/generated//.sol`. Hence the full source path. function testStoxUnifiedDeployer(address asset, address vault, OffchainAssetReceiptVaultConfigV2 memory config) external { @@ -29,7 +34,7 @@ contract StoxUnifiedDeployerTest is Test { vm.etch( LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_BEACON_SET_DEPLOYER_CANDIDATE, vm.getCode( - "StoxOffchainAssetReceiptVaultBeaconSetDeployer.sol:StoxOffchainAssetReceiptVaultBeaconSetDeployer" + "src/concrete/deploy/StoxOffchainAssetReceiptVaultBeaconSetDeployer.sol:StoxOffchainAssetReceiptVaultBeaconSetDeployer" ) ); vm.mockCall( @@ -42,7 +47,9 @@ contract StoxUnifiedDeployerTest is Test { vm.etch( LibProdDeployV4.STOX_WRAPPED_TOKEN_VAULT_BEACON_SET_DEPLOYER_CANDIDATE, - vm.getCode("StoxWrappedTokenVaultBeaconSetDeployer.sol:StoxWrappedTokenVaultBeaconSetDeployer") + vm.getCode( + "src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.sol:StoxWrappedTokenVaultBeaconSetDeployer" + ) ); vm.mockCall( LibProdDeployV4.STOX_WRAPPED_TOKEN_VAULT_BEACON_SET_DEPLOYER_CANDIDATE, @@ -62,7 +69,7 @@ contract StoxUnifiedDeployerTest is Test { vm.etch( LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_BEACON_SET_DEPLOYER_CANDIDATE, vm.getCode( - "StoxOffchainAssetReceiptVaultBeaconSetDeployer.sol:StoxOffchainAssetReceiptVaultBeaconSetDeployer" + "src/concrete/deploy/StoxOffchainAssetReceiptVaultBeaconSetDeployer.sol:StoxOffchainAssetReceiptVaultBeaconSetDeployer" ) ); vm.mockCallRevert( @@ -88,7 +95,7 @@ contract StoxUnifiedDeployerTest is Test { vm.etch( LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_BEACON_SET_DEPLOYER_CANDIDATE, vm.getCode( - "StoxOffchainAssetReceiptVaultBeaconSetDeployer.sol:StoxOffchainAssetReceiptVaultBeaconSetDeployer" + "src/concrete/deploy/StoxOffchainAssetReceiptVaultBeaconSetDeployer.sol:StoxOffchainAssetReceiptVaultBeaconSetDeployer" ) ); vm.mockCall( @@ -101,7 +108,9 @@ contract StoxUnifiedDeployerTest is Test { vm.etch( LibProdDeployV4.STOX_WRAPPED_TOKEN_VAULT_BEACON_SET_DEPLOYER_CANDIDATE, - vm.getCode("StoxWrappedTokenVaultBeaconSetDeployer.sol:StoxWrappedTokenVaultBeaconSetDeployer") + vm.getCode( + "src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.sol:StoxWrappedTokenVaultBeaconSetDeployer" + ) ); vm.mockCallRevert( LibProdDeployV4.STOX_WRAPPED_TOKEN_VAULT_BEACON_SET_DEPLOYER_CANDIDATE, From 9bc3ed7d0bff81caeb3c64ac4f25c947651d9154 Mon Sep 17 00:00:00 2001 From: baku-ccron Date: Thu, 27 Aug 2026 10:56:37 +0000 Subject: [PATCH 3/3] ci(git-clean): substitute the rainix shell from Cachix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Every rainix shell carries `rainix-static`, a rust build, and crates.io is answering 403 to the runners: `crate-zip-2.4.2.tar.gz` fails all four curl attempts, `rainix-static-0.1.0.drv` fails with it, and the shell never exists — so `Install soldeer dependencies` dies and nothing this lane asserts ever runs. The rainix reusable workflows already substitute from the `rainlanguage` cache via their shared `nix-cachix-setup` preamble, which is why `rainix-sol` built a shell on the same commit that this lane could not. This lane is hand-rolled and had to be told. Same fix as rainlanguage/rain.metadata#298. Co-Authored-By: Claude Opus 5 (1M context) --- .github/workflows/git-clean.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/git-clean.yaml b/.github/workflows/git-clean.yaml index e2b3b541..51f62e35 100644 --- a/.github/workflows/git-clean.yaml +++ b/.github/workflows/git-clean.yaml @@ -12,6 +12,21 @@ jobs: nix_conf: | keep-env-derivations = true keep-outputs = true + # Substitute the rainix shells from Cachix instead of building them. Every + # rainix shell carries `rainix-static`, a rust build, and crates.io is + # answering 403 to the runners, so without this the shell cannot be built + # at all and every step here dies before it runs. The rainix reusable + # workflows get this from their own shared preamble; this lane is + # hand-rolled and has to be told. `continue-on-error` so a Cachix outage + # degrades to a normal build rather than failing the job. + - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15 + continue-on-error: true + with: + name: rainlanguage + authToken: ${{ secrets.CACHIX_AUTH_TOKEN }} + # No store-watching daemon: it checkpoints the nix DB concurrently + # with cache-nix-action and corrupts it. + useDaemon: false - name: Restore and save Nix store uses: nix-community/cache-nix-action@135667ec418502fa5a3598af6fb9eb733888ce6a # v6 with: