feat(deploy): deterministic-clone toolchain + deterministic V4 authoriser deploy capability (#292 step 1)

foundry.toml

@@ -54,13 +54,13 @@ forge-std = "1.16.1"
 "@openzeppelin-contracts-upgradeable" = "5.6.1"
 "rain-deploy" = "0.1.4"
 "rain-extrospection" = "0.1.1"
-"rain-factory" = "0.1.1"
+"rain-factory" = "0.1.5"
 "rain-math-fixedpoint" = "0.2.0"
 "rain-math-float" = "0.1.1"
 "rain-sol-codegen" = "0.1.0"
 "rain-solmem" = "0.1.3"
 "rain-tofu-erc20-decimals" = "0.1.1"
-"rain-vats" = "0.1.6"
+"rain-vats" = "0.1.7"
 "rain-verify-interface" = "0.1.0"
 
 [soldeer]

remappings.txt

@@ -3,11 +3,11 @@
 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/
-rain-factory-0.1.1/=dependencies/rain-factory-0.1.1/
+rain-factory-0.1.5/=dependencies/rain-factory-0.1.5/
 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.0/=dependencies/rain-sol-codegen-0.1.0/
 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/
+rain-vats-0.1.7/=dependencies/rain-vats-0.1.7/
 rain-verify-interface-0.1.0/=dependencies/rain-verify-interface-0.1.0/

script/20260619-deploy-v4-authoriser-clone.s.sol

@@ -6,11 +6,11 @@ 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 {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";
+import {ICloneableFactoryV2} from "rain-factory-0.1.5/src/interface/ICloneableFactoryV2.sol";
+import {LibNonceCloneFactory} from "../src/lib/LibNonceCloneFactory.sol";
 import {
     OffchainAssetReceiptVaultAuthorizerV1Config
-} from "rain-vats-0.1.6/src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol";
+} from "rain-vats-0.1.7/src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol";
 
 import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol";
 import {LibAuthoriserInvariants, RoleGrant} from "../src/lib/LibAuthoriserInvariants.sol";
@@ -28,7 +28,7 @@ error V4ImplNotDeployed(address impl);
 /// value in `LibProdDeployV4`. Impl has been replaced with different code.
 error V4ImplCodehashMismatch(address impl, bytes32 expected, bytes32 actual);
 
-/// @notice The canonical `CloneFactory` from `rain-factory-0.1.1` is not
+/// @notice The nonce-based `CloneFactory` pinned in `LibNonceCloneFactory` is not
 /// deployed at its pinned address. Zoltu deploy is missing on this network.
 error CloneFactoryNotDeployed(address factory);
 
@@ -186,7 +186,7 @@ contract DeployV4AuthoriserClone is Script {
         // Pre-flight: the canonical `CloneFactory` is deployed with the
         // pinned codehash. A missing/replaced factory would either
         // revert or hand back a clone under attacker-supplied bytecode.
-        address factoryAddr = LibCloneFactoryDeploy.CLONE_FACTORY_DEPLOYED_ADDRESS;
+        address factoryAddr = LibNonceCloneFactory.CLONE_FACTORY_DEPLOYED_ADDRESS;
         assertCloneFactoryDeployed(factoryAddr);
 
         // Pre-flight: the clone pin is not already hydrated. If it is,
@@ -342,7 +342,7 @@ contract DeployV4AuthoriserClone is Script {
     function assertCloneFactoryDeployed(address factory) internal view {
         if (factory.code.length == 0) revert CloneFactoryNotDeployed(factory);
         bytes32 actual = factory.codehash;
-        bytes32 expected = LibCloneFactoryDeploy.CLONE_FACTORY_DEPLOYED_CODEHASH;
+        bytes32 expected = LibNonceCloneFactory.CLONE_FACTORY_DEPLOYED_CODEHASH;
         if (actual != expected) revert CloneFactoryCodehashMismatch(factory, expected, actual);
     }
 

script/20260623-upgrade-receipt-vaults-to-v4.s.sol

@@ -7,8 +7,8 @@ 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 {IAuthorizableV1} from "rain-vats-0.1.6/src/interface/IAuthorizableV1.sol";
-import {IAuthorizeV1} from "rain-vats-0.1.6/src/interface/IAuthorizeV1.sol";
+import {IAuthorizableV1} from "rain-vats-0.1.7/src/interface/IAuthorizableV1.sol";
+import {IAuthorizeV1} from "rain-vats-0.1.7/src/interface/IAuthorizeV1.sol";
 import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol";
 import {LibAuthoriserInvariants, RoleGrant} from "../src/lib/LibAuthoriserInvariants.sol";
 import {LibProdDeployV1} from "../src/lib/LibProdDeployV1.sol";
@@ -33,9 +33,10 @@ error V4ImplementationNotDeployed(address implementation);
 /// @param actual The codehash observed on-chain.
 error V4CodehashMismatch(address implementation, bytes32 expected, bytes32 actual);
 
-/// @notice The V4 authoriser clone constant in `LibAuthoriserInvariants` is still
-/// the `address(0)` placeholder. The clone must be deployed (and its address
-/// dropped into the lib) before the upgrade can be authored.
+/// @notice The V4 authoriser clone pin
+/// (`LibProdDeployV4.STOX_PROD_AUTHORISER_V4_CLONE`) is `address(0)`. It is
+/// computed up-front by `BuildPointers`, so a zero here means the pin failed to
+/// generate.
 error V4AuthoriserCloneNotPinned();
 
 /// @notice The V4 authoriser clone address is pinned but has no runtime code.
@@ -178,7 +179,7 @@ contract UpgradeReceiptVaultsToV4 is Script {
     }
 
     /// @notice The V4 authoriser clone that every production receipt vault is
-    /// rewired onto. Placeholder until the clone is deployed.
+    /// rewired onto. Pinned deterministically up-front (see `BuildPointers`).
     address internal constant V4_AUTHORISER_CLONE = LibProdDeployV4.STOX_PROD_AUTHORISER_V4_CLONE;
 
     /// @notice Human-readable name embedded in the emitted Tx Builder JSON's

script/20260706-deploy-tokens-ethereum.s.sol

@@ -7,10 +7,10 @@ import {console2} from "forge-std-1.16.1/src/console2.sol";
 import {Vm} from "forge-std-1.16.1/src/Vm.sol";
 import {
     OffchainAssetReceiptVaultConfigV2
-} from "rain-vats-0.1.6/src/concrete/deploy/OffchainAssetReceiptVaultBeaconSetDeployer.sol";
-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";
+} from "rain-vats-0.1.7/src/concrete/deploy/OffchainAssetReceiptVaultBeaconSetDeployer.sol";
+import {ReceiptVaultConfigV2} from "rain-vats-0.1.7/src/abstract/ReceiptVault.sol";
+import {IReceiptVaultV3} from "rain-vats-0.1.7/src/interface/IReceiptVaultV3.sol";
+import {IAuthorizeV1} from "rain-vats-0.1.7/src/interface/IAuthorizeV1.sol";
 import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol";
 
 import {LibBeaconInvariants} from "../src/lib/LibBeaconInvariants.sol";

script/20260722-deploy-missing-tokens-ethereum.s.sol

@@ -7,10 +7,10 @@ import {console2} from "forge-std-1.16.1/src/console2.sol";
 import {Vm} from "forge-std-1.16.1/src/Vm.sol";
 import {
     OffchainAssetReceiptVaultConfigV2
-} from "rain-vats-0.1.6/src/concrete/deploy/OffchainAssetReceiptVaultBeaconSetDeployer.sol";
-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";
+} from "rain-vats-0.1.7/src/concrete/deploy/OffchainAssetReceiptVaultBeaconSetDeployer.sol";
+import {ReceiptVaultConfigV2} from "rain-vats-0.1.7/src/abstract/ReceiptVault.sol";
+import {IReceiptVaultV3} from "rain-vats-0.1.7/src/interface/IReceiptVaultV3.sol";
+import {IAuthorizeV1} from "rain-vats-0.1.7/src/interface/IAuthorizeV1.sol";
 import {Ownable} from "@openzeppelin-contracts-5.6.1/access/Ownable.sol";
 import {LibBeaconInvariants} from "../src/lib/LibBeaconInvariants.sol";
 import {IStoxUnifiedDeployerV1} from "../src/interface/IStoxUnifiedDeployerV1.sol";

script/20260722-swap-remaining-vault-authorisers.s.sol

@@ -6,8 +6,8 @@ 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 {IAuthorizableV1} from "rain-vats-0.1.6/src/interface/IAuthorizableV1.sol";
-import {IAuthorizeV1} from "rain-vats-0.1.6/src/interface/IAuthorizeV1.sol";
+import {IAuthorizableV1} from "rain-vats-0.1.7/src/interface/IAuthorizableV1.sol";
+import {IAuthorizeV1} from "rain-vats-0.1.7/src/interface/IAuthorizeV1.sol";
 import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol";
 import {LibAuthoriserInvariants, RoleGrant} from "../src/lib/LibAuthoriserInvariants.sol";
 import {LibProdDeployV4} from "../src/generated/LibProdDeployV4.sol";

script/20260722-swap-rklb-authoriser.s.sol

@@ -6,8 +6,8 @@ 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 {IAuthorizableV1} from "rain-vats-0.1.6/src/interface/IAuthorizableV1.sol";
-import {IAuthorizeV1} from "rain-vats-0.1.6/src/interface/IAuthorizeV1.sol";
+import {IAuthorizableV1} from "rain-vats-0.1.7/src/interface/IAuthorizableV1.sol";
+import {IAuthorizeV1} from "rain-vats-0.1.7/src/interface/IAuthorizeV1.sol";
 import {IGnosisSafe} from "../src/interface/IGnosisSafe.sol";
 import {LibAuthoriserInvariants, RoleGrant} from "../src/lib/LibAuthoriserInvariants.sol";
 import {LibProdDeployV4} from "../src/generated/LibProdDeployV4.sol";

soldeer.lock

@@ -35,10 +35,10 @@ integrity = "aa7366cac7d9c7610350a49b8126c667d83812a974539e79ccd38a5577cd626b"
 
 [[dependencies]]
 name = "rain-factory"
-version = "0.1.1"
-url = "https://soldeer-revisions.s3.amazonaws.com/rain-factory/0_1_1_20-05-2026_13:02:17_rain.zip"
-checksum = "6b02e2b87983e196bc88cb8fb802a2720b252783429567864cd13336167c369d"
-integrity = "be6a3343d0ea247d8b495b584cd21c3bf64f0a1396ca21aaa8ce31715df29842"
+version = "0.1.5"
+url = "https://soldeer-revisions.s3.amazonaws.com/rain-factory/0_1_5_12-07-2026_14:01:52_rain.zip"
+checksum = "31f5ac857d16b8dad27eec11218a338ce13721114b0514b05e500b14edf8ce80"
+integrity = "6e6eb9dc5174068e39d6ac80981210723088dde56c9cb0925ffe657ba3154cbc"
 
 [[dependencies]]
 name = "rain-math-fixedpoint"
@@ -77,10 +77,10 @@ integrity = "9e1fccf893dd0d90aeb445c78f9eee3904bc50287ff1da30b954508f18412cd2"
 
 [[dependencies]]
 name = "rain-vats"
-version = "0.1.6"
-url = "https://soldeer-revisions.s3.amazonaws.com/rain-vats/0_1_6_01-06-2026_04:00:43_rain.zip"
-checksum = "0072a9b57a18e59a82edaebc8e6c4e9271decc1156b08e96c57a1a6744dd8934"
-integrity = "c2d9eeee64ad1274ee92623eeddfa4af7d0344df1976684154fc2b25794c23e3"
+version = "0.1.7"
+url = "https://soldeer-revisions.s3.amazonaws.com/rain-vats/0_1_7_12-07-2026_16:32:50_rain.zip"
+checksum = "05a99d527c172e2231936248f868902063bf598bb376d22750e9db2cd7a1a678"
+integrity = "c58bcd75b69558d32b9a11ac830707c9b4a427f6e518b80e3cec5e255765b6e7"
 
 [[dependencies]]
 name = "rain-verify-interface"

src/concrete/ST0xOrchestrator.sol

@@ -13,9 +13,9 @@ import {IERC1155Receiver} from "@openzeppelin-contracts-5.6.1/token/ERC1155/IERC
 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 {OffchainAssetReceiptVault} from "rain-vats-0.1.6/src/concrete/vault/OffchainAssetReceiptVault.sol";
-import {IReceiptV3} from "rain-vats-0.1.6/src/interface/IReceiptV3.sol";
-import {ReceiptVault} from "rain-vats-0.1.6/src/abstract/ReceiptVault.sol";
+import {OffchainAssetReceiptVault} from "rain-vats-0.1.7/src/concrete/vault/OffchainAssetReceiptVault.sol";
+import {IReceiptV3} from "rain-vats-0.1.7/src/interface/IReceiptV3.sol";
+import {ReceiptVault} from "rain-vats-0.1.7/src/abstract/ReceiptVault.sol";
 
 import {LibProdDeployCurrent} from "../generated/LibProdDeployCurrent.sol";
 import {IMintRecipient} from "../interface/IMintRecipient.sol";

src/concrete/StoxCorporateActionsFacet.sol

@@ -17,8 +17,8 @@ import {
 } from "../lib/LibCorporateActionNode.sol";
 import {LibStockSplit} from "../lib/LibStockSplit.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
-import {IAuthorizeV1} from "rain-vats-0.1.6/src/interface/IAuthorizeV1.sol";
-import {OffchainAssetReceiptVault} from "rain-vats-0.1.6/src/concrete/vault/OffchainAssetReceiptVault.sol";
+import {IAuthorizeV1} from "rain-vats-0.1.7/src/interface/IAuthorizeV1.sol";
+import {OffchainAssetReceiptVault} from "rain-vats-0.1.7/src/concrete/vault/OffchainAssetReceiptVault.sol";
 
 /// @title StoxCorporateActionsFacet
 /// @notice Diamond facet implementing the corporate action linked list.

src/concrete/StoxReceipt.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {Receipt} from "rain-vats-0.1.6/src/concrete/receipt/Receipt.sol";
+import {Receipt} from "rain-vats-0.1.7/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 {ICorporateActionsV1} from "../interface/ICorporateActionsV1.sol";

src/concrete/StoxReceiptVault.sol

@@ -2,8 +2,8 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 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 {OffchainAssetReceiptVault} from "rain-vats-0.1.7/src/concrete/vault/OffchainAssetReceiptVault.sol";
+import {IAuthorizeV1} from "rain-vats-0.1.7/src/interface/IAuthorizeV1.sol";
 import {IAccessControl} from "@openzeppelin-contracts-5.6.1/access/IAccessControl.sol";
 import {LibCorporateAction, SCHEDULE_CORPORATE_ACTION, CANCEL_CORPORATE_ACTION} from "../lib/LibCorporateAction.sol";
 import {LibRebase} from "../lib/LibRebase.sol";

src/concrete/StoxWrappedTokenVault.sol

@@ -6,7 +6,7 @@ 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";
-import {ICLONEABLE_V2_SUCCESS, ICloneableV2} from "rain-factory-0.1.1/src/interface/ICloneableV2.sol";
+import {ICLONEABLE_V2_SUCCESS, ICloneableV2} from "rain-factory-0.1.5/src/interface/ICloneableV2.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 
 /// @dev Error raised when a zero address is provided for the vault asset.

src/concrete/authorize/StoxOffchainAssetReceiptVaultAuthorizerV1.sol

@@ -5,8 +5,8 @@ pragma solidity =0.8.25;
 import {
     OffchainAssetReceiptVaultAuthorizerV1,
     OffchainAssetReceiptVaultAuthorizerV1Config
-} from "rain-vats-0.1.6/src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol";
-import {ICLONEABLE_V2_SUCCESS} from "rain-factory-0.1.1/src/interface/ICloneableV2.sol";
+} from "rain-vats-0.1.7/src/concrete/authorize/OffchainAssetReceiptVaultAuthorizerV1.sol";
+import {ICLONEABLE_V2_SUCCESS} from "rain-factory-0.1.5/src/interface/ICloneableV2.sol";
 import {SCHEDULE_CORPORATE_ACTION, CANCEL_CORPORATE_ACTION} from "../../lib/LibCorporateAction.sol";
 
 /// @dev Role admin for SCHEDULE_CORPORATE_ACTION.

src/concrete/authorize/StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol

@@ -4,7 +4,7 @@ pragma solidity =0.8.25;
 
 import {
     OffchainAssetReceiptVaultPaymentMintAuthorizerV1
-} from "rain-vats-0.1.6/src/concrete/authorize/OffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol";
+} from "rain-vats-0.1.7/src/concrete/authorize/OffchainAssetReceiptVaultPaymentMintAuthorizerV1.sol";
 
 /// @title StoxOffchainAssetReceiptVaultPaymentMintAuthorizerV1
 /// @notice An OffchainAssetReceiptVaultPaymentMintAuthorizerV1 specialized for

src/concrete/deploy/StoxOffchainAssetReceiptVaultBeaconSetDeployer.sol

@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {
     OffchainAssetReceiptVaultBeaconSetDeployer,
     OffchainAssetReceiptVaultBeaconSetDeployerConfig
-} from "rain-vats-0.1.6/src/concrete/deploy/OffchainAssetReceiptVaultBeaconSetDeployer.sol";
+} from "rain-vats-0.1.7/src/concrete/deploy/OffchainAssetReceiptVaultBeaconSetDeployer.sol";
 import {LibProdDeployCurrent} from "../../generated/LibProdDeployCurrent.sol";
 
 /// @title StoxOffchainAssetReceiptVaultBeaconSetDeployer

src/concrete/deploy/StoxUnifiedDeployer.sol

@@ -6,7 +6,7 @@ import {
     OffchainAssetReceiptVaultBeaconSetDeployer,
     OffchainAssetReceiptVaultConfigV2,
     OffchainAssetReceiptVault
-} from "rain-vats-0.1.6/src/concrete/deploy/OffchainAssetReceiptVaultBeaconSetDeployer.sol";
+} from "rain-vats-0.1.7/src/concrete/deploy/OffchainAssetReceiptVaultBeaconSetDeployer.sol";
 import {ERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/ERC165.sol";
 import {StoxWrappedTokenVaultBeaconSetDeployer} from "./StoxWrappedTokenVaultBeaconSetDeployer.sol";
 import {LibProdDeployCurrent} from "../../generated/LibProdDeployCurrent.sol";

src/concrete/deploy/StoxWrappedTokenVaultBeaconSetDeployer.sol

@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {BeaconProxy} from "@openzeppelin-contracts-5.6.1/proxy/beacon/BeaconProxy.sol";
 import {ERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/ERC165.sol";
 import {StoxWrappedTokenVault} from "../StoxWrappedTokenVault.sol";
-import {ICLONEABLE_V2_SUCCESS} from "rain-factory-0.1.1/src/interface/ICloneableV2.sol";
+import {ICLONEABLE_V2_SUCCESS} from "rain-factory-0.1.5/src/interface/ICloneableV2.sol";
 import {LibProdDeployCurrent} from "../../generated/LibProdDeployCurrent.sol";
 import {IStoxWrappedTokenVaultBeaconSetDeployerV1} from "../../interface/IStoxWrappedTokenVaultBeaconSetDeployerV1.sol";
 

src/interface/IStoxUnifiedDeployerV1.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity ^0.8.25;
 
-import {OffchainAssetReceiptVaultConfigV2} from "rain-vats-0.1.6/src/concrete/vault/OffchainAssetReceiptVault.sol";
+import {OffchainAssetReceiptVaultConfigV2} from "rain-vats-0.1.7/src/concrete/vault/OffchainAssetReceiptVault.sol";
 
 /// @title IStoxUnifiedDeployerV1
 /// @notice V1 interface for the StoxUnifiedDeployer.

src/lib/LibNonceCloneFactory.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: LicenseRef-DCL-1.0
+// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
+pragma solidity ^0.8.25;
+
+/// @title LibNonceCloneFactory
+/// @notice Pins for the nonce-based `CloneFactory` (rain-factory 0.1.1) that
+/// every live V4 authoriser clone was deployed through. rain-factory 0.1.5's
+/// `LibCloneFactoryDeploy` pins the deterministic-only factory, which exposes
+/// no `clone(address,bytes)` — the clone-deploy script must keep targeting the
+/// nonce-based factory these pins describe.
+library LibNonceCloneFactory {
+    /// The address of the nonce-based `CloneFactory` when deployed with the
+    /// rain standard zoltu deployer.
+    address constant CLONE_FACTORY_DEPLOYED_ADDRESS = address(0x444acC29d63fa643E8adCC35FD9aa6DE111dCb39);
+
+    /// The code hash of the nonce-based `CloneFactory` when deployed with the
+    /// rain standard zoltu deployer. This can be used to verify that the
+    /// deployed contract has the expected bytecode, which provides stronger
+    /// guarantees than just checking the address.
+    bytes32 constant CLONE_FACTORY_DEPLOYED_CODEHASH =
+        bytes32(0xf21b813c7075a1621285df3a8369d0652c31ea80cb807be1aaadafeecd134475);
+}