feat: Update contract

.forge-snapshots/CentrifugeRouter_claimDeposit.snap

@@ -1 +1 @@
-92849
+92792

.forge-snapshots/CentrifugeRouter_enable.snap

@@ -1 +1 @@
-60493
+60481

.forge-snapshots/CentrifugeRouter_lockDepositRequest.snap

@@ -1 +1 @@
-84809
+84799

.forge-snapshots/CentrifugeRouter_requestDeposit.snap

@@ -1 +1 @@
-668482
+668908

.forge-snapshots/CentrifugeRouter_requestRedeem.snap

@@ -1 +1 @@
-430781
+431745

.forge-snapshots/CentrifugeRouter_transferTrancheTokens.snap

@@ -1 +1 @@
-631634
+631643

.forge-snapshots/ERC7540Vault_requestDeposit.snap

@@ -1 +1 @@
-668994
+669418

.forge-snapshots/InvestmentManager_fulfillDepositRequest.snap

@@ -1 +1 @@
-348258
+339579

foundry.toml

@@ -7,7 +7,7 @@ solc_version = "0.8.28"
 evm_version = "cancun"
 
 optimizer = true
-optimizer_runs = 500
+optimizer_runs = 90
 verbosity = 3
 
 ffi = true

script/vaults/Deployer.sol

@@ -52,12 +52,16 @@ contract Deployer is Script {
         escrow = new Escrow{salt: salt}(deployer);
         routerEscrow = new Escrow{salt: keccak256(abi.encodePacked(salt, "escrow2"))}(deployer);
         root = new Root{salt: salt}(address(escrow), delay, deployer);
-        vaultFactory = address(new ERC7540VaultFactory(address(root)));
         restrictionManager = address(new RestrictionManager{salt: salt}(address(root), deployer));
         restrictedRedemptions = address(new RestrictedRedemptions{salt: salt}(address(root), address(escrow), deployer));
         trancheFactory = address(new TrancheFactory{salt: salt}(address(root), deployer));
         investmentManager = new InvestmentManager(address(root), address(escrow));
-        poolManager = new PoolManager(address(escrow), vaultFactory, trancheFactory);
+        vaultFactory = address(new ERC7540VaultFactory(address(root), address(investmentManager)));
+
+        address[] memory vaultFactories = new address[](1);
+        vaultFactories[0] = vaultFactory;
+
+        poolManager = new PoolManager(address(escrow), trancheFactory, vaultFactories);
         gasService = new GasService(messageCost, proofCost, gasPrice, tokenPrice);
         gateway = new Gateway(address(root), address(poolManager), address(investmentManager), address(gasService));
         router = new CentrifugeRouter(address(routerEscrow), address(gateway), address(poolManager));
@@ -78,6 +82,7 @@ contract Deployer is Script {
         escrow.rely(address(poolManager));
         IAuth(vaultFactory).rely(address(poolManager));
         IAuth(trancheFactory).rely(address(poolManager));
+        IAuth(investmentManager).rely(address(poolManager));
         IAuth(restrictionManager).rely(address(poolManager));
         IAuth(restrictedRedemptions).rely(address(poolManager));
 
@@ -106,11 +111,9 @@ contract Deployer is Script {
 
         // Rely on others
         routerEscrow.rely(address(router));
-        investmentManager.rely(address(vaultFactory));
     }
 
     function _file() public {
-        poolManager.file("investmentManager", address(investmentManager));
         poolManager.file("gateway", address(gateway));
 
         investmentManager.file("poolManager", address(poolManager));

src/common/libraries/MessageLib.sol

@@ -17,7 +17,7 @@ enum MessageType {
     RecoverTokens,
     // -- Gas messages 7
     UpdateGasPrice,
-    // -- Pool manager messages 8 - 17
+    // -- Pool manager messages 8 - 18
     RegisterAsset,
     NotifyPool,
     NotifyShareClass,
@@ -28,7 +28,8 @@ enum MessageType {
     UpdateShareClassHook,
     TransferShares,
     UpdateRestriction,
-    // -- Investment manager messages 18 - 26
+    UpdateContract,
+    // -- Investment manager messages 19 - 27
     DepositRequest,
     RedeemRequest,
     FulfilledDepositRequest,
@@ -48,6 +49,12 @@ enum UpdateRestrictionType {
     Unfreeze
 }
 
+enum UpdateContractType {
+    /// @dev Placeholder for null update restriction type
+    Invalid,
+    VaultUpdate
+}
+
 enum MessageCategory {
     Invalid,
     Gateway,
@@ -86,6 +93,7 @@ library MessageLib {
         (57 << uint8(MessageType.UpdateShareClassHook) * 8) +
         (73 << uint8(MessageType.TransferShares) * 8) +
         (27 << uint8(MessageType.UpdateRestriction) * 8) +
+        (59 << uint8(MessageType.UpdateContract) * 8) +
         (89 << uint8(MessageType.DepositRequest) * 8) +
         (89 << uint8(MessageType.RedeemRequest) * 8) +
         (105 << uint8(MessageType.FulfilledDepositRequest) * 8) +
@@ -112,6 +120,8 @@ library MessageLib {
 
         if (kind == uint8(MessageType.UpdateRestriction)) {
             length += message.toUint16(length - 2); //payloadLength
+        } else if (kind == uint8(MessageType.UpdateContract)) {
+            length += message.toUint16(length - 2); //payloadLength
         }
     }
 
@@ -124,9 +134,9 @@ library MessageLib {
             return MessageCategory.Root;
         } else if (code == 7) {
             return MessageCategory.Gas;
-        } else if (code >= 8 && code <= 17) {
+        } else if (code >= 8 && code <= 18) {
             return MessageCategory.Pool;
-        } else if (code >= 18 && code <= 26) {
+        } else if (code >= 19 && code <= 27) {
             return MessageCategory.Investment;
         } else {
             return MessageCategory.Other;
@@ -137,6 +147,10 @@ library MessageLib {
         return UpdateRestrictionType(message.toUint8(0));
     }
 
+    function updateContractType(bytes memory message) internal pure returns (UpdateContractType) {
+        return UpdateContractType(message.toUint8(0));
+    }
+
     //---------------------------------------
     //    MessageProof
     //---------------------------------------
@@ -591,6 +605,64 @@ library MessageLib {
         return abi.encodePacked(UpdateRestrictionType.Unfreeze, t.user);
     }
 
+    //---------------------------------------
+    //    UpdateContract
+    //---------------------------------------
+
+    struct UpdateContract {
+        uint64 poolId;
+        bytes16 scId;
+        bytes32 target;
+        bytes payload;
+    }
+
+    function deserializeUpdateContract(bytes memory data) internal pure returns (UpdateContract memory) {
+        require(messageType(data) == MessageType.UpdateContract, UnknownMessageType());
+        uint16 payloadLength = data.toUint16(57);
+        return UpdateContract({
+            poolId: data.toUint64(1),
+            scId: data.toBytes16(9),
+            target: data.toBytes32(25),
+            payload: data.slice(59, payloadLength)
+        });
+    }
+
+    function serialize(UpdateContract memory t) internal pure returns (bytes memory) {
+        return abi.encodePacked(
+            MessageType.UpdateContract, t.poolId, t.scId, t.target, uint16(t.payload.length), t.payload
+        );
+    }
+
+    //---------------------------------------
+    //   UpdateContract.VaultUpdate (submsg)
+    //---------------------------------------
+
+    struct UpdateContractVaultUpdate {
+        address factory;
+        uint128 assetId;
+        bool isLinked;
+        address vault;
+    }
+
+    function deserializeUpdateContractVaultUpdate(bytes memory data)
+        internal
+        pure
+        returns (UpdateContractVaultUpdate memory)
+    {
+        require(updateContractType(data) == UpdateContractType.VaultUpdate, UnknownMessageType());
+
+        return UpdateContractVaultUpdate({
+            factory: data.toAddress(1),
+            assetId: data.toUint128(21),
+            isLinked: data.toBool(37),
+            vault: data.toAddress(38)
+        });
+    }
+
+    function serialize(UpdateContractVaultUpdate memory t) internal pure returns (bytes memory) {
+        return abi.encodePacked(UpdateContractType.VaultUpdate, t.factory, t.assetId, t.isLinked, t.vault);
+    }
+
     //---------------------------------------
     //    DepositRequest
     //---------------------------------------

src/misc/Auth.sol

@@ -22,13 +22,13 @@ abstract contract Auth is IAuth {
     }
 
     /// @inheritdoc IAuth
-    function rely(address user) external auth {
+    function rely(address user) public auth {
         wards[user] = 1;
         emit Rely(user);
     }
 
     /// @inheritdoc IAuth
-    function deny(address user) external auth {
+    function deny(address user) public auth {
         wards[user] = 0;
         emit Deny(user);
     }

src/misc/libraries/BytesLib.sol

@@ -171,4 +171,9 @@ library BytesLib {
 
         return tempBytes16;
     }
+
+    function toBool(bytes memory _bytes, uint256 _start) internal pure returns (bool) {
+        require(_bytes.length > _start, "toBool_outOfBounds");
+        return _bytes[_start] != 0;
+    }
 }