Minor move: VaultDetails to VaultRegistry (#755)

lemunozm · web-flow · commit acebd82c4656 · 2025-10-20T15:04:14.000+02:00
* minor struct move

* fix imports
diff --git a/env/spell/003_base_0x21dbc1add7a52e47652e4a74dec4f28a77086bbd.sol b/env/spell/003_base_0x21dbc1add7a52e47652e4a74dec4f28a77086bbd.sol
@@ -13,7 +13,8 @@ import {ISpokeGatewayHandler} from "../../src/core/interfaces/IGatewayHandlers.s
 import {IBalanceSheetGatewayHandler} from "../../src/core/interfaces/IGatewayHandlers.sol";
 
 import {IBalanceSheet} from "../../src/core/spoke/interfaces/IBalanceSheet.sol";
-import {ISpoke, VaultDetails} from "../../src/core/spoke/interfaces/ISpoke.sol";
+import {ISpoke} from "../../src/core/spoke/interfaces/ISpoke.sol";
+import {VaultDetails} from "../../src/core/spoke/interfaces/IVaultRegistry.sol";
 
 import {BaseVault} from "../../src/vaults/BaseVaults.sol";
 import {IBaseVault} from "../../src/vaults/interfaces/IBaseVault.sol";
diff --git a/env/spell/003_bnb-smart-chain_0x086046cc2193f0184e03c8b1419a06f1f989e75a.sol b/env/spell/003_bnb-smart-chain_0x086046cc2193f0184e03c8b1419a06f1f989e75a.sol
@@ -13,7 +13,8 @@ import {ISpokeGatewayHandler} from "../../src/core/interfaces/IGatewayHandlers.s
 import {IBalanceSheetGatewayHandler} from "../../src/core/interfaces/IGatewayHandlers.sol";
 
 import {IBalanceSheet} from "../../src/core/spoke/interfaces/IBalanceSheet.sol";
-import {ISpoke, VaultDetails} from "../../src/core/spoke/interfaces/ISpoke.sol";
+import {ISpoke} from "../../src/core/spoke/interfaces/ISpoke.sol";
+import {VaultDetails} from "../../src/core/spoke/interfaces/IVaultRegistry.sol";
 
 import {BaseVault} from "../../src/vaults/BaseVaults.sol";
 import {IBaseVault} from "../../src/vaults/interfaces/IBaseVault.sol";
diff --git a/env/spell/003_ethereum_0x21dbc1add7a52e47652e4a74dec4f28a77086bbd.sol b/env/spell/003_ethereum_0x21dbc1add7a52e47652e4a74dec4f28a77086bbd.sol
@@ -13,7 +13,8 @@ import {ISpokeGatewayHandler} from "../../src/core/interfaces/IGatewayHandlers.s
 import {IBalanceSheetGatewayHandler} from "../../src/core/interfaces/IGatewayHandlers.sol";
 
 import {IBalanceSheet} from "../../src/core/spoke/interfaces/IBalanceSheet.sol";
-import {ISpoke, VaultDetails} from "../../src/core/spoke/interfaces/ISpoke.sol";
+import {ISpoke} from "../../src/core/spoke/interfaces/ISpoke.sol";
+import {VaultDetails} from "../../src/core/spoke/interfaces/IVaultRegistry.sol";
 
 import {BaseVault} from "../../src/vaults/BaseVaults.sol";
 import {IBaseVault} from "../../src/vaults/interfaces/IBaseVault.sol";
diff --git a/env/spell/004_avalanche_0x37271f54911a22156b39ab08e9f9738cc9bf55e4.sol b/env/spell/004_avalanche_0x37271f54911a22156b39ab08e9f9738cc9bf55e4.sol
@@ -94,7 +94,7 @@ import {VaultUpdateKind} from "../../src/core/messaging/libraries/MessageLib.sol
 import {ISpokeGatewayHandler} from "../../src/core/interfaces/IGatewayHandlers.sol";
 
 import {IVault} from "../../src/core/spoke/interfaces/IVault.sol";
-import {VaultDetails} from "../../src/core/spoke/interfaces/ISpoke.sol";
+import {VaultDetails} from "../../src/core/spoke/interfaces/IVaultRegistry.sol";
 
 import {IBaseVault} from "../../src/vaults/interfaces/IBaseVault.sol";
 
diff --git a/env/spell/004_base_0x37271f54911a22156b39ab08e9f9738cc9bf55e4.sol b/env/spell/004_base_0x37271f54911a22156b39ab08e9f9738cc9bf55e4.sol
@@ -94,7 +94,7 @@ import {VaultUpdateKind} from "../../src/core/messaging/libraries/MessageLib.sol
 import {ISpokeGatewayHandler} from "../../src/core/interfaces/IGatewayHandlers.sol";
 
 import {IVault} from "../../src/core/spoke/interfaces/IVault.sol";
-import {VaultDetails} from "../../src/core/spoke/interfaces/ISpoke.sol";
+import {VaultDetails} from "../../src/core/spoke/interfaces/IVaultRegistry.sol";
 
 import {IBaseVault} from "../../src/vaults/interfaces/IBaseVault.sol";
 
diff --git a/env/spell/004_ethereum_0x37271f54911a22156b39ab08e9f9738cc9bf55e4.sol b/env/spell/004_ethereum_0x37271f54911a22156b39ab08e9f9738cc9bf55e4.sol
@@ -94,7 +94,7 @@ import {VaultUpdateKind} from "../../src/core/messaging/libraries/MessageLib.sol
 import {ISpokeGatewayHandler} from "../../src/core/interfaces/IGatewayHandlers.sol";
 
 import {IVault} from "../../src/core/spoke/interfaces/IVault.sol";
-import {VaultDetails} from "../../src/core/spoke/interfaces/ISpoke.sol";
+import {VaultDetails} from "../../src/core/spoke/interfaces/IVaultRegistry.sol";
 
 import {IBaseVault} from "../../src/vaults/interfaces/IBaseVault.sol";
 
diff --git a/src/core/messaging/libraries/MessageLib.sol b/src/core/messaging/libraries/MessageLib.sol
@@ -642,7 +642,7 @@ library MessageLib {
         bytes16 scId;
         uint128 assetId;
         bytes32 vaultOrFactory;
-        uint8 kind;
+        uint8 kind; // VaultUpdateKind
     }
 
     function deserializeUpdateVault(bytes memory data) internal pure returns (UpdateVault memory) {
diff --git a/src/core/spoke/VaultRegistry.sol b/src/core/spoke/VaultRegistry.sol
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.28;
 
+import {ISpoke} from "./interfaces/ISpoke.sol";
 import {IShareToken} from "./interfaces/IShareToken.sol";
 import {IVault, VaultKind} from "./interfaces/IVault.sol";
-import {VaultDetails, ISpoke} from "./interfaces/ISpoke.sol";
-import {IVaultRegistry} from "./interfaces/IVaultRegistry.sol";
 import {IVaultFactory} from "./factories/interfaces/IVaultFactory.sol";
+import {VaultDetails, IVaultRegistry} from "./interfaces/IVaultRegistry.sol";
 
 import {Auth} from "../../misc/Auth.sol";
 import {Recoverable} from "../../misc/Recoverable.sol";
diff --git a/src/core/spoke/interfaces/ISpoke.sol b/src/core/spoke/interfaces/ISpoke.sol
@@ -26,17 +26,6 @@ struct ShareClassDetails {
     Price pricePoolPerShare;
 }
 
-struct VaultDetails {
-    /// @dev AssetId of the asset
-    AssetId assetId;
-    /// @dev Address of the asset
-    address asset;
-    /// @dev TokenId of the asset - zero if asset is ERC20, non-zero if asset is ERC6909
-    uint256 tokenId;
-    /// @dev Whether the vault is linked to a share class atm
-    bool isLinked;
-}
-
 struct AssetIdKey {
     /// @dev The address of the asset
     address asset;
diff --git a/src/core/spoke/interfaces/IVaultRegistry.sol b/src/core/spoke/interfaces/IVaultRegistry.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity >=0.5.0;
 
-import {VaultDetails} from "./ISpoke.sol";
 import {IVault, VaultKind} from "./IVault.sol";
 
 import {PoolId} from "../../types/PoolId.sol";
@@ -10,6 +9,17 @@ import {ShareClassId} from "../../types/ShareClassId.sol";
 import {IRequestManager} from "../../interfaces/IRequestManager.sol";
 import {IVaultFactory} from "../factories/interfaces/IVaultFactory.sol";
 
+struct VaultDetails {
+    /// @dev AssetId of the asset
+    AssetId assetId;
+    /// @dev Address of the asset
+    address asset;
+    /// @dev TokenId of the asset - zero if asset is ERC20, non-zero if asset is ERC6909
+    uint256 tokenId;
+    /// @dev Whether the vault is linked to a share class atm
+    bool isLinked;
+}
+
 interface IVaultRegistry {
     //----------------------------------------------------------------------------------------------
     // Events
diff --git a/src/vaults/AsyncRequestManager.sol b/src/vaults/AsyncRequestManager.sol
@@ -22,17 +22,17 @@ import {BytesLib} from "../misc/libraries/BytesLib.sol";
 
 import {PoolId} from "../core/types/PoolId.sol";
 import {AssetId} from "../core/types/AssetId.sol";
+import {ISpoke} from "../core/spoke/interfaces/ISpoke.sol";
 import {IVault} from "../core/spoke/interfaces/IVault.sol";
 import {PricingLib} from "../core/libraries/PricingLib.sol";
 import {ShareClassId} from "../core/types/ShareClassId.sol";
 import {IPoolEscrow} from "../core/spoke/interfaces/IPoolEscrow.sol";
 import {IShareToken} from "../core/spoke/interfaces/IShareToken.sol";
 import {IRequestManager} from "../core/interfaces/IRequestManager.sol";
 import {IBalanceSheet} from "../core/spoke/interfaces/IBalanceSheet.sol";
-import {ISpoke, VaultDetails} from "../core/spoke/interfaces/ISpoke.sol";
 import {ESCROW_HOOK_ID} from "../core/spoke/interfaces/ITransferHook.sol";
-import {IVaultRegistry} from "../core/spoke/interfaces/IVaultRegistry.sol";
 import {ITrustedContractUpdate} from "../core/utils/interfaces/IContractUpdate.sol";
+import {VaultDetails, IVaultRegistry} from "../core/spoke/interfaces/IVaultRegistry.sol";
 
 /// @title  Async Request Manager
 /// @notice This is the main contract vaults interact with for
diff --git a/src/vaults/SyncManager.sol b/src/vaults/SyncManager.sol
@@ -15,13 +15,13 @@ import {BytesLib} from "../misc/libraries/BytesLib.sol";
 
 import {PoolId} from "../core/types/PoolId.sol";
 import {AssetId} from "../core/types/AssetId.sol";
+import {ISpoke} from "../core/spoke/interfaces/ISpoke.sol";
 import {PricingLib} from "../core/libraries/PricingLib.sol";
 import {ShareClassId} from "../core/types/ShareClassId.sol";
 import {IShareToken} from "../core/spoke/interfaces/IShareToken.sol";
 import {IBalanceSheet} from "../core/spoke/interfaces/IBalanceSheet.sol";
-import {ISpoke, VaultDetails} from "../core/spoke/interfaces/ISpoke.sol";
-import {IVaultRegistry} from "../core/spoke/interfaces/IVaultRegistry.sol";
 import {ITrustedContractUpdate} from "../core/utils/interfaces/IContractUpdate.sol";
+import {VaultDetails, IVaultRegistry} from "../core/spoke/interfaces/IVaultRegistry.sol";
 
 /// @title  Sync Manager
 /// @notice This is the main contract for synchronous ERC-4626 deposits.
diff --git a/src/vaults/VaultRouter.sol b/src/vaults/VaultRouter.sol
@@ -15,11 +15,11 @@ import {IERC20, IERC20Permit} from "../misc/interfaces/IERC20.sol";
 import {SafeTransferLib} from "../misc/libraries/SafeTransferLib.sol";
 
 import {PoolId} from "../core/types/PoolId.sol";
+import {ISpoke} from "../core/spoke/interfaces/ISpoke.sol";
 import {ShareClassId} from "../core/types/ShareClassId.sol";
 import {IGateway} from "../core/messaging/interfaces/IGateway.sol";
 import {BatchedMulticall} from "../core/utils/BatchedMulticall.sol";
-import {ISpoke, VaultDetails} from "../core/spoke/interfaces/ISpoke.sol";
-import {IVaultRegistry} from "../core/spoke/interfaces/IVaultRegistry.sol";
+import {VaultDetails, IVaultRegistry} from "../core/spoke/interfaces/IVaultRegistry.sol";
 
 /// @title  VaultRouter
 /// @notice This is a helper contract, designed to be the entrypoint for EOAs.
diff --git a/test/core/spoke/integration/Spoke.t.sol b/test/core/spoke/integration/Spoke.t.sol
@@ -11,8 +11,8 @@ import {AssetId} from "../../../../src/core/types/AssetId.sol";
 import {ShareToken} from "../../../../src/core/spoke/ShareToken.sol";
 import {IVault} from "../../../../src/core/spoke/interfaces/IVault.sol";
 import {ShareClassId} from "../../../../src/core/types/ShareClassId.sol";
-import {VaultDetails} from "../../../../src/core/spoke/interfaces/ISpoke.sol";
 import {MessageLib} from "../../../../src/core/messaging/libraries/MessageLib.sol";
+import {VaultDetails} from "../../../../src/core/spoke/interfaces/IVaultRegistry.sol";
 
 import {UpdateRestrictionMessageLib} from "../../../../src/hooks/libraries/UpdateRestrictionMessageLib.sol";
 
diff --git a/test/core/spoke/mocks/MockCentrifugeChain.sol b/test/core/spoke/mocks/MockCentrifugeChain.sol
@@ -7,8 +7,8 @@ import {CastLib} from "../../../../src/misc/libraries/CastLib.sol";
 import {Spoke} from "../../../../src/core/spoke/Spoke.sol";
 import {PoolId} from "../../../../src/core/types/PoolId.sol";
 import {VaultRegistry} from "../../../../src/core/spoke/VaultRegistry.sol";
-import {VaultDetails} from "../../../../src/core/spoke/interfaces/ISpoke.sol";
 import {IAdapter} from "../../../../src/core/messaging/interfaces/IAdapter.sol";
+import {VaultDetails} from "../../../../src/core/spoke/interfaces/IVaultRegistry.sol";
 import {MessageLib, VaultUpdateKind} from "../../../../src/core/messaging/libraries/MessageLib.sol";
 
 import {UpdateRestrictionMessageLib} from "../../../../src/hooks/libraries/UpdateRestrictionMessageLib.sol";
diff --git a/test/vaults/integration/SyncDeposit.t.sol b/test/vaults/integration/SyncDeposit.t.sol
@@ -15,9 +15,9 @@ import {PoolId} from "../../../src/core/types/PoolId.sol";
 import {AssetId} from "../../../src/core/types/AssetId.sol";
 import {IVault} from "../../../src/core/spoke/interfaces/IVault.sol";
 import {ShareClassId} from "../../../src/core/types/ShareClassId.sol";
-import {VaultDetails} from "../../../src/core/spoke/interfaces/ISpoke.sol";
 import {MessageLib} from "../../../src/core/messaging/libraries/MessageLib.sol";
 import {IBalanceSheet} from "../../../src/core/spoke/interfaces/IBalanceSheet.sol";
+import {VaultDetails} from "../../../src/core/spoke/interfaces/IVaultRegistry.sol";
 
 import {IBaseVault} from "../../../src/vaults/interfaces/IBaseVault.sol";
 import {SyncDepositVault} from "../../../src/vaults/SyncDepositVault.sol";
diff --git a/test/vaults/unit/AsyncRequestManager.t.sol b/test/vaults/unit/AsyncRequestManager.t.sol
@@ -9,6 +9,7 @@ import {IERC7575} from "../../../src/misc/interfaces/IERC7575.sol";
 import {IERC20Metadata} from "../../../src/misc/interfaces/IERC20.sol";
 
 import {PoolId} from "../../../src/core/types/PoolId.sol";
+import {ISpoke} from "../../../src/core/spoke/interfaces/ISpoke.sol";
 import {IVault} from "../../../src/core/spoke/interfaces/IVault.sol";
 import {PricingLib} from "../../../src/core/libraries/PricingLib.sol";
 import {ShareClassId} from "../../../src/core/types/ShareClassId.sol";
@@ -17,8 +18,7 @@ import {IGateway} from "../../../src/core/messaging/interfaces/IGateway.sol";
 import {IPoolEscrow} from "../../../src/core/spoke/interfaces/IPoolEscrow.sol";
 import {IShareToken} from "../../../src/core/spoke/interfaces/IShareToken.sol";
 import {IBalanceSheet} from "../../../src/core/spoke/interfaces/IBalanceSheet.sol";
-import {ISpoke, VaultDetails} from "../../../src/core/spoke/interfaces/ISpoke.sol";
-import {IVaultRegistry} from "../../../src/core/spoke/interfaces/IVaultRegistry.sol";
+import {VaultDetails, IVaultRegistry} from "../../../src/core/spoke/interfaces/IVaultRegistry.sol";
 
 import {IBaseVault} from "../../../src/vaults/interfaces/IBaseVault.sol";
 import {IAsyncVault} from "../../../src/vaults/interfaces/IAsyncVault.sol";
diff --git a/test/vaults/unit/SyncManager.t.sol b/test/vaults/unit/SyncManager.t.sol
@@ -7,11 +7,11 @@ import {IERC20Metadata} from "../../../src/misc/interfaces/IERC20.sol";
 
 import {PoolId} from "../../../src/core/types/PoolId.sol";
 import {AssetId} from "../../../src/core/types/AssetId.sol";
+import {ISpoke} from "../../../src/core/spoke/interfaces/ISpoke.sol";
 import {ShareClassId} from "../../../src/core/types/ShareClassId.sol";
 import {IShareToken} from "../../../src/core/spoke/interfaces/IShareToken.sol";
 import {IBalanceSheet} from "../../../src/core/spoke/interfaces/IBalanceSheet.sol";
-import {ISpoke, VaultDetails} from "../../../src/core/spoke/interfaces/ISpoke.sol";
-import {IVaultRegistry} from "../../../src/core/spoke/interfaces/IVaultRegistry.sol";
+import {VaultDetails, IVaultRegistry} from "../../../src/core/spoke/interfaces/IVaultRegistry.sol";
 
 import {SyncManager} from "../../../src/vaults/SyncManager.sol";
 import {IBaseVault} from "../../../src/vaults/interfaces/IBaseVault.sol";

Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,7 @@ library MessageLib {`
`642`	`642`	`bytes16 scId;`
`643`	`643`	`uint128 assetId;`
`644`	`644`	`bytes32 vaultOrFactory;`
`645`		`- uint8 kind;`
	`645`	`+ uint8 kind; // VaultUpdateKind`
`646`	`646`	`}`
`647`	`647`
`648`	`648`	`function deserializeUpdateVault(bytes memory data) internal pure returns (UpdateVault memory) {`