Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

## V4 (rain.vats 0.1.6)

### Dependencies

- **OpenZeppelin bumped 5.6.1 → 5.7.0 (`@openzeppelin-contracts` +
`@openzeppelin-contracts-upgradeable`).** The only production bytecode this
moves is `StoxWrappedTokenVault`: 5.7.0's `ERC4626Upgradeable` swaps its
private `_tryGetAssetDecimals` for the shared `SafeERC20.tryGetDecimals`
helper, so the candidate pointers regenerate with a new Zoltu address and
codehash. Every other contract compiles byte-identical — in particular the
governance timelock: the frozen `TIMELOCK_CREATION_CODE` /
`TIMELOCK_RUNTIME_CODEHASH` pins are reproduced exactly by the 5.7.0
dependency (`testTimelockPinsMatchCompiledDependency` passes unchanged), so
the three live deployments remain fully described. rain-vats 0.1.6 still
imports `@openzeppelin-contracts-5.6.1/` prefixes internally; the two
`remappings.txt` bridge lines point those at the 5.7.0 install so exactly one
OZ copy compiles (re-apply if soldeer regenerates the file) until rain-vats
republishes against 5.7.0.

### StoxReceiptVault

- **Fix (audit H01): keep OZ's `_totalSupply` in step with rebased balances.**
Expand Down Expand Up @@ -93,11 +110,11 @@
reading as "copy everything".
- **The canonical config table is allowed to run ahead of Base.** A row is
authored when a ticker is chosen and Base is pinned when it is deployed, so
the config table leads in that window; only the rows Base carries are read,
so the excess is inert. The genuine error is a config table SHORTER than
Base — a deployed Base row with no name/symbol to deploy under — which
reverts `TokenTableTooShort(configsLength, baseLength)`. Row-for-row key
drift between the two tables still reverts `TokenTableMisaligned`.
the config table leads in that window; only the rows Base carries are read, so
the excess is inert. The genuine error is a config table SHORTER than Base — a
deployed Base row with no name/symbol to deploy under — which reverts
`TokenTableTooShort(configsLength, baseLength)`. Row-for-row key drift between
the two tables still reverts `TokenTableMisaligned`.
- **Three checks the gap-fill scripts had dropped are back, matching
`20260706-deploy-tokens-ethereum`.** Each deployed vault is now read back
before the loop moves on — `AuthoriserNotWired` if it is not routed to the
Expand Down
14 changes: 12 additions & 2 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,24 @@ generates them into `remappings.txt`, which is the live list. Key packages:
- `rain-factory-0.1.1/` → clonable factory pattern (ICloneableV2)
- `rain-deploy-0.1.4/` → Zoltu deterministic deployment
- `rain-sol-codegen-0.1.0/` → pointer file generation
- `@openzeppelin-contracts-upgradeable-5.6.1/` → ERC4626, ERC20, beacon proxies
- `@openzeppelin-contracts-upgradeable-5.7.0/` → ERC4626, ERC20, beacon proxies
- `rain-math-float-0.1.1/` → Rain Float decimal arithmetic (used by the
corporate-actions rebase path for stock split multipliers)

The one `remappings` entry in `foundry.toml` is unrelated to the above: it
bridges the unversioned `@openzeppelin/contracts/` prefix that a third-party
dependency's own source hard-codes.

`remappings.txt` additionally carries two **version-bridge** lines pointing the
old `@openzeppelin-contracts-5.6.1/` and
`@openzeppelin-contracts-upgradeable-5.6.1/` prefixes at the 5.7.0 install.
These exist because `rain-vats-0.1.6` still imports the 5.6.1 prefixes in its
own source; they can be dropped once rain-vats republishes against 5.7.0.
`forge soldeer install` rewrites `remappings.txt` ("Updated remappings") but was
observed to PRESERVE these hand-added lines rather than drop them, so a soldeer
run does not by itself break rain-vats' transitive imports. Re-check that if
soldeer's remapping-merge behaviour ever changes: losing them breaks the build.

### Breaking dependency bumps

Two dependency bumps are **breaking** for the corporate-actions stack and cannot
Expand Down Expand Up @@ -260,7 +270,7 @@ Both are Soldeer packages pinned at an exact semver version in `foundry.toml`'s
`[dependencies]`, so `forge update` — the git-submodule command — does nothing
here. `forge soldeer update` is what moves them, and because the version is part
of the import prefix, a bump also changes every
`@openzeppelin-contracts-upgradeable-5.6.1/` and `rain-math-float-0.1.1/` import
`@openzeppelin-contracts-upgradeable-5.7.0/` and `rain-math-float-0.1.1/` import
across `src/`, `test/` and `script/`. Soldeer regenerates `remappings.txt`; it
does not rewrite those imports, so they are updated by hand in the same commit.
Bumping without the follow-up verification steps above is NOT safe on this
Expand Down
6 changes: 3 additions & 3 deletions foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ remappings = [
# prefixes; bridge to its actual install location so transitive
# resolution works. Tracked upstream:
# - OpenZeppelin/openzeppelin-contracts-upgradeable#232
"@openzeppelin/contracts/=dependencies/@openzeppelin-contracts-5.6.1/",
"@openzeppelin/contracts/=dependencies/@openzeppelin-contracts-5.7.0/",
]

[dependencies]
forge-std = "1.16.1"
"@openzeppelin-contracts" = "5.6.1"
"@openzeppelin-contracts-upgradeable" = "5.6.1"
"@openzeppelin-contracts" = "5.7.0"
"@openzeppelin-contracts-upgradeable" = "5.7.0"
"rain-deploy" = "0.1.4"
"rain-extrospection" = "0.1.1"
"rain-factory" = "0.1.1"
Expand Down
6 changes: 4 additions & 2 deletions remappings.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@openzeppelin-contracts-5.6.1/=dependencies/@openzeppelin-contracts-5.6.1/
@openzeppelin-contracts-upgradeable-5.6.1/=dependencies/@openzeppelin-contracts-upgradeable-5.6.1/
@openzeppelin-contracts-5.6.1/=dependencies/@openzeppelin-contracts-5.7.0/
@openzeppelin-contracts-5.7.0/=dependencies/@openzeppelin-contracts-5.7.0/
@openzeppelin-contracts-upgradeable-5.6.1/=dependencies/@openzeppelin-contracts-upgradeable-5.7.0/
@openzeppelin-contracts-upgradeable-5.7.0/=dependencies/@openzeppelin-contracts-upgradeable-5.7.0/
forge-std-1.16.1/=dependencies/forge-std-1.16.1/
rain-deploy-0.1.4/=dependencies/rain-deploy-0.1.4/
rain-extrospection-0.1.1/=dependencies/rain-extrospection-0.1.1/
Expand Down
2 changes: 1 addition & 1 deletion script/20260619-deploy-v4-authoriser-clone.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol";
import {IAccessControl} from "@openzeppelin-contracts-5.7.0/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";
import {LibCloneFactoryDeploy} from "rain-factory-0.1.1/src/lib/LibCloneFactoryDeploy.sol";
Expand Down
4 changes: 2 additions & 2 deletions script/20260623-upgrade-receipt-vaults-to-v4.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ 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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol";
import {IBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/IBeacon.sol";
import {IAccessControl} from "@openzeppelin-contracts-5.7.0/access/IAccessControl.sol";
import {IBeacon} from "@openzeppelin-contracts-5.7.0/proxy/beacon/IBeacon.sol";
import {IAuthorizableV1} from "rain-vats-0.1.6/src/interface/IAuthorizableV1.sol";
import {IAuthorizeV1} from "rain-vats-0.1.6/src/interface/IAuthorizeV1.sol";
import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol";
Expand Down
2 changes: 1 addition & 1 deletion script/20260706-deploy-tokens-ethereum.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import {ReceiptVaultConfigV2} from "rain-vats-0.1.6/src/abstract/ReceiptVault.sol";
import {IReceiptVaultV3} from "rain-vats-0.1.6/src/interface/IReceiptVaultV3.sol";
import {IAuthorizeV1} from "rain-vats-0.1.6/src/interface/IAuthorizeV1.sol";
import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol";
import {Ownable} from "@openzeppelin-contracts-5.7.0/access/Ownable.sol";

import {LibBeaconInvariants} from "../src/lib/LibBeaconInvariants.sol";
import {IStoxUnifiedDeployerV1} from "../src/interface/IStoxUnifiedDeployerV1.sol";
Expand Down
2 changes: 1 addition & 1 deletion script/20260716-migrate-beacon-owners-ethereum.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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 {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol";
import {Ownable} from "@openzeppelin-contracts-5.7.0/access/Ownable.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";
Expand Down
2 changes: 1 addition & 1 deletion script/20260722-migrate-beacon-owners-hyperevm.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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 {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol";
import {Ownable} from "@openzeppelin-contracts-5.7.0/access/Ownable.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";
Expand Down
2 changes: 1 addition & 1 deletion script/20260722-swap-remaining-vault-authorisers.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol";
import {IAccessControl} from "@openzeppelin-contracts-5.7.0/access/IAccessControl.sol";
import {IAuthorizableV1} from "rain-vats-0.1.6/src/interface/IAuthorizableV1.sol";
import {IAuthorizeV1} from "rain-vats-0.1.6/src/interface/IAuthorizeV1.sol";
import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol";
Expand Down
2 changes: 1 addition & 1 deletion script/20260722-swap-rklb-authoriser.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol";
import {IAccessControl} from "@openzeppelin-contracts-5.7.0/access/IAccessControl.sol";
import {IAuthorizableV1} from "rain-vats-0.1.6/src/interface/IAuthorizableV1.sol";
import {IAuthorizeV1} from "rain-vats-0.1.6/src/interface/IAuthorizeV1.sol";
import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol";
Expand Down
2 changes: 1 addition & 1 deletion script/20260723-provision-additional-service-signer.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol";
import {IAccessControl} from "@openzeppelin-contracts-5.7.0/access/IAccessControl.sol";
import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol";
import {LibAuthoriserInvariants, RoleGrant} from "../src/lib/LibAuthoriserInvariants.sol";
import {LibProdDeployV4} from "../src/generated/LibProdDeployV4.sol";
Expand Down
2 changes: 1 addition & 1 deletion script/20260729-deploy-governance-timelock.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol";
import {IAccessControl} from "@openzeppelin-contracts-5.7.0/access/IAccessControl.sol";
import {LibRainDeploy} from "rain-deploy-0.1.4/src/lib/LibRainDeploy.sol";

import {LibSafeInvariants} from "../src/lib/LibSafeInvariants.sol";
Expand Down
8 changes: 4 additions & 4 deletions script/20260729-migrate-governance-to-timelock.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ 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 {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 {IAccessControl} from "@openzeppelin-contracts-5.7.0/access/IAccessControl.sol";
import {Ownable} from "@openzeppelin-contracts-5.7.0/access/Ownable.sol";
import {TimelockController} from "@openzeppelin-contracts-5.7.0/governance/TimelockController.sol";

import {IBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/IBeacon.sol";
import {IBeacon} from "@openzeppelin-contracts-5.7.0/proxy/beacon/IBeacon.sol";

import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol";
import {LibAuthoriserInvariants, RoleGrant} from "../src/lib/LibAuthoriserInvariants.sol";
Expand Down
2 changes: 1 addition & 1 deletion script/20260807-deploy-missing-tokens.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
import {ReceiptVaultConfigV2} from "rain-vats-0.1.6/src/abstract/ReceiptVault.sol";
import {IReceiptVaultV3} from "rain-vats-0.1.6/src/interface/IReceiptVaultV3.sol";
import {IAuthorizeV1} from "rain-vats-0.1.6/src/interface/IAuthorizeV1.sol";
import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol";
import {Ownable} from "@openzeppelin-contracts-5.7.0/access/Ownable.sol";
import {LibBeaconInvariants} from "../src/lib/LibBeaconInvariants.sol";
import {IStoxUnifiedDeployerV1} from "../src/interface/IStoxUnifiedDeployerV1.sol";
import {LibSafeInvariants} from "../src/lib/LibSafeInvariants.sol";
Expand Down
2 changes: 1 addition & 1 deletion script/20260810-revoke-fireblocks-service-signer.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol";
import {IAccessControl} from "@openzeppelin-contracts-5.7.0/access/IAccessControl.sol";
import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol";
import {LibAuthoriserInvariants, RoleGrant} from "../src/lib/LibAuthoriserInvariants.sol";
import {LibProdDeployV4} from "../src/generated/LibProdDeployV4.sol";
Expand Down
2 changes: 1 addition & 1 deletion script/MigrateBeaconOwners.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol";
import {Ownable} from "@openzeppelin-contracts-5.7.0/access/Ownable.sol";
import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol";
import {LibProdDeployV1} from "../src/lib/LibProdDeployV1.sol";
import {LibSafeInvariants} from "../src/lib/LibSafeInvariants.sol";
Expand Down
16 changes: 8 additions & 8 deletions soldeer.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[[dependencies]]
name = "@openzeppelin-contracts"
version = "5.6.1"
url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/5_6_1_15-03-2026_09:19:50_contracts.zip"
checksum = "a3b6bc661be858c7c27f60a1708cbebe8c71034b4cc1e9fe270d0a05b069352f"
integrity = "bce03af7ada1eee21a7fff393f238bcd7cd75a022a4db55ffb6b0dbb32433d35"
version = "5.7.0"
url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts/5_7_0_29-07-2026_19:34:46_contracts.zip"
checksum = "fe08a24bc34334b2976c6ad69a0d74bdfa63de8a5c8528579060f25a11fb5cd5"
integrity = "3e13bc4d96bdef6e35f6b1e0dc0e455843a958edc597750dff20ca50295b767d"

[[dependencies]]
name = "@openzeppelin-contracts-upgradeable"
version = "5.6.1"
url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts-upgradeable/5_6_1_15-03-2026_09:19:56_contracts-upgradeable.zip"
checksum = "f6257dbc993c2499fe08fdc93f66e12459fe3458ee62ce716b92e1d95ee0b504"
integrity = "2f539b6241258fc3c127c97225b3cb1b5e9225e422d2c1cb233c52a6f5c29002"
version = "5.7.0"
url = "https://soldeer-revisions.s3.amazonaws.com/@openzeppelin-contracts-upgradeable/5_7_0_29-07-2026_19:34:58_contracts-upgradeable.zip"
checksum = "fba3ad8586bf64281bab2aecd2cf0eb31227ccc5976f962d400e8cc5898da413"
integrity = "1a08068b2fe262d4f6ae80e0be44965480b1a532d40722c80634d8963337743d"

[[dependencies]]
name = "forge-std"
Expand Down
20 changes: 10 additions & 10 deletions src/concrete/ST0xOrchestrator.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
// SPDX-FileCopyrightText: Copyright (c) 2026 S01 Issuer GmbH
pragma solidity =0.8.25;

import {AccessControlUpgradeable} from "@openzeppelin-contracts-upgradeable-5.6.1/access/AccessControlUpgradeable.sol";
import {EIP712Upgradeable} from "@openzeppelin-contracts-upgradeable-5.6.1/utils/cryptography/EIP712Upgradeable.sol";
import {Initializable} from "@openzeppelin-contracts-upgradeable-5.6.1/proxy/utils/Initializable.sol";
import {ReentrancyGuardTransient} from "@openzeppelin-contracts-5.6.1/utils/ReentrancyGuardTransient.sol";
import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol";
import {IERC1155} from "@openzeppelin-contracts-5.6.1/token/ERC1155/IERC1155.sol";
import {IERC1155Receiver} from "@openzeppelin-contracts-5.6.1/token/ERC1155/IERC1155Receiver.sol";
import {IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/IERC165.sol";
import {SignatureChecker} from "@openzeppelin-contracts-5.6.1/utils/cryptography/SignatureChecker.sol";
import {AccessControlUpgradeable} from "@openzeppelin-contracts-upgradeable-5.7.0/access/AccessControlUpgradeable.sol";
import {EIP712Upgradeable} from "@openzeppelin-contracts-upgradeable-5.7.0/utils/cryptography/EIP712Upgradeable.sol";
import {Initializable} from "@openzeppelin-contracts-upgradeable-5.7.0/proxy/utils/Initializable.sol";
import {ReentrancyGuardTransient} from "@openzeppelin-contracts-5.7.0/utils/ReentrancyGuardTransient.sol";
import {IERC20} from "@openzeppelin-contracts-5.7.0/token/ERC20/IERC20.sol";
import {SafeERC20} from "@openzeppelin-contracts-5.7.0/token/ERC20/utils/SafeERC20.sol";
import {IERC1155} from "@openzeppelin-contracts-5.7.0/token/ERC1155/IERC1155.sol";
import {IERC1155Receiver} from "@openzeppelin-contracts-5.7.0/token/ERC1155/IERC1155Receiver.sol";
import {IERC165} from "@openzeppelin-contracts-5.7.0/utils/introspection/IERC165.sol";
import {SignatureChecker} from "@openzeppelin-contracts-5.7.0/utils/cryptography/SignatureChecker.sol";

import {OffchainAssetReceiptVault} from "rain-vats-0.1.6/src/concrete/vault/OffchainAssetReceiptVault.sol";
import {IReceiptV3} from "rain-vats-0.1.6/src/interface/IReceiptV3.sol";
Expand Down
4 changes: 2 additions & 2 deletions src/concrete/StoxReceipt.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
pragma solidity =0.8.25;

import {Receipt} from "rain-vats-0.1.6/src/concrete/receipt/Receipt.sol";
import {ERC1155Upgradeable} from "@openzeppelin-contracts-upgradeable-5.6.1/token/ERC1155/ERC1155Upgradeable.sol";
import {IERC1155} from "@openzeppelin-contracts-5.6.1/token/ERC1155/IERC1155.sol";
import {ERC1155Upgradeable} from "@openzeppelin-contracts-upgradeable-5.7.0/token/ERC1155/ERC1155Upgradeable.sol";
import {IERC1155} from "@openzeppelin-contracts-5.7.0/token/ERC1155/IERC1155.sol";
import {ICorporateActionsV1} from "../interface/ICorporateActionsV1.sol";
import {LibCorporateActionReceipt} from "../lib/LibCorporateActionReceipt.sol";
import {LibERC1155Storage} from "../lib/LibERC1155Storage.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/concrete/StoxReceiptVault.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pragma solidity =0.8.25;

import {OffchainAssetReceiptVault} from "rain-vats-0.1.6/src/concrete/vault/OffchainAssetReceiptVault.sol";
import {IAuthorizeV1} from "rain-vats-0.1.6/src/interface/IAuthorizeV1.sol";
import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol";
import {IAccessControl} from "@openzeppelin-contracts-5.7.0/access/IAccessControl.sol";
import {LibCorporateAction, SCHEDULE_CORPORATE_ACTION, CANCEL_CORPORATE_ACTION} from "../lib/LibCorporateAction.sol";
import {LibRebase} from "../lib/LibRebase.sol";
import {LibTotalSupply} from "../lib/LibTotalSupply.sol";
Expand Down
6 changes: 3 additions & 3 deletions src/concrete/StoxWrappedTokenVault.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ pragma solidity =0.8.25;

import {
ERC4626Upgradeable
} from "@openzeppelin-contracts-upgradeable-5.6.1/token/ERC20/extensions/ERC4626Upgradeable.sol";
import {ERC20Upgradeable} from "@openzeppelin-contracts-upgradeable-5.6.1/token/ERC20/ERC20Upgradeable.sol";
} from "@openzeppelin-contracts-upgradeable-5.7.0/token/ERC20/extensions/ERC4626Upgradeable.sol";
import {ERC20Upgradeable} from "@openzeppelin-contracts-upgradeable-5.7.0/token/ERC20/ERC20Upgradeable.sol";
import {ICLONEABLE_V2_SUCCESS, ICloneableV2} from "rain-factory-0.1.1/src/interface/ICloneableV2.sol";
import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
import {IERC20Metadata} from "@openzeppelin-contracts-5.7.0/token/ERC20/extensions/IERC20Metadata.sol";

/// @dev Error raised when a zero address is provided for the vault asset.
error ZeroAsset();
Expand Down
2 changes: 1 addition & 1 deletion src/concrete/StoxWrappedTokenVaultBeacon.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
pragma solidity =0.8.25;

import {UpgradeableBeacon} from "@openzeppelin-contracts-5.6.1/proxy/beacon/UpgradeableBeacon.sol";
import {UpgradeableBeacon} from "@openzeppelin-contracts-5.7.0/proxy/beacon/UpgradeableBeacon.sol";
import {LibProdDeployCurrent} from "../generated/LibProdDeployCurrent.sol";

/// @title StoxWrappedTokenVaultBeacon
Expand Down
Loading
Loading