Upgradable warp routes

solidity/contracts/token/HypERC20.sol

@@ -26,11 +26,15 @@ contract HypERC20 is ERC20Upgradeable, TokenRouter {
     function initialize(
         uint256 _totalSupply,
         string memory _name,
-        string memory _symbol
+        string memory _symbol,
+        address _hook,
+        address _interchainSecurityModule,
+        address _owner
     ) external initializer {
         // Initialize ERC20 metadata
         __ERC20_init(_name, _symbol);
         _mint(msg.sender, _totalSupply);
+        _MailboxClient_initialize(_hook, _interchainSecurityModule, _owner);
     }
 
     function decimals() public view override returns (uint8) {

solidity/contracts/token/HypERC20Collateral.sol

@@ -25,6 +25,14 @@ contract HypERC20Collateral is TokenRouter {
         wrappedToken = IERC20(erc20);
     }
 
+    function initialize(
+        address _hook,
+        address _interchainSecurityModule,
+        address _owner
+    ) public virtual initializer {
+        _MailboxClient_initialize(_hook, _interchainSecurityModule, _owner);
+    }
+
     function balanceOf(
         address _account
     ) external view override returns (uint256) {

solidity/contracts/token/HypERC20CollateralVaultDeposit.sol

@@ -21,8 +21,16 @@
         address _mailbox
     ) HypERC20Collateral(_vault.asset(), _mailbox) {
         vault = _vault;
+    }
+
+    function initialize(
+        address _hook,
+        address _interchainSecurityModule,
+        address _owner
+    ) public override initializer {
         wrappedToken.approve(address(vault), type(uint256).max);
+        _MailboxClient_initialize(_hook, _interchainSecurityModule, _owner);
     }
 
     /**
      * @dev Transfers `_amount` of `wrappedToken` from `msg.sender` to this contract, and deposit into vault

solidity/contracts/token/HypERC721.sol

@@ -23,7 +23,10 @@ contract HypERC721 is ERC721EnumerableUpgradeable, TokenRouter {
     function initialize(
         uint256 _mintAmount,
         string memory _name,
-        string memory _symbol
+        string memory _symbol,
+        address _hook,
+        address _interchainSecurityModule,
+        address _owner
     ) external initializer {
         address owner = msg.sender;
         _transferOwnership(owner);
@@ -32,6 +35,7 @@ contract HypERC721 is ERC721EnumerableUpgradeable, TokenRouter {
         for (uint256 i = 0; i < _mintAmount; i++) {
             _safeMint(owner, i);
         }
+        _MailboxClient_initialize(_hook, _interchainSecurityModule, _owner);
     }
 
     function balanceOf(

solidity/contracts/token/HypERC721Collateral.sol

@@ -21,6 +21,14 @@ contract HypERC721Collateral is TokenRouter {
         wrappedToken = IERC721(erc721);
     }
 
+    function initialize(
+        address _hook,
+        address _interchainSecurityModule,
+        address _owner
+    ) public virtual initializer {
+        _MailboxClient_initialize(_hook, _interchainSecurityModule, _owner);
+    }
+
     function ownerOf(uint256 _tokenId) external view returns (address) {
         return IERC721(wrappedToken).ownerOf(_tokenId);
     }

solidity/contracts/token/HypNative.sol

@@ -20,6 +20,14 @@ contract HypNative is TokenRouter {
 
     constructor(address _mailbox) TokenRouter(_mailbox) {}
 
+    function initialize(
+        address _hook,
+        address _interchainSecurityModule,
+        address _owner
+    ) public initializer {
+        _MailboxClient_initialize(_hook, _interchainSecurityModule, _owner);
+    }
+
     /**
      * @inheritdoc TokenRouter
      * @dev uses (`msg.value` - `_amount`) as interchain gas payment and `msg.sender` as refund address.

solidity/test/token/HypERC20.t.sol

@@ -14,6 +14,7 @@ pragma solidity ^0.8.13;
 @@@@@@@@@       @@@@@@@@*/
 
 import "forge-std/Test.sol";
+import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 
 import {TypeCasts} from "../../contracts/libs/TypeCasts.sol";
 import {TestMailbox} from "../../contracts/test/TestMailbox.sol";
@@ -40,6 +41,7 @@ abstract contract HypTokenTest is Test {
     string internal constant SYMBOL = "HYP";
     address internal constant ALICE = address(0x1);
     address internal constant BOB = address(0x2);
+    address internal constant PROXY_ADMIN = address(0x37);
 
     ERC20Test internal primaryToken;
     TokenRouter internal localToken;
@@ -73,8 +75,24 @@ abstract contract HypTokenTest is Test {
 
         REQUIRED_VALUE = noopHook.quoteDispatch("", "");
 
-        remoteToken = new HypERC20(DECIMALS, address(remoteMailbox));
-        remoteToken.initialize(TOTAL_SUPPLY, NAME, SYMBOL);
+        HypERC20 implementation = new HypERC20(
+            DECIMALS,
+            address(remoteMailbox)
+        );
+        TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(
+            address(implementation),
+            PROXY_ADMIN,
+            abi.encodeWithSelector(
+                HypERC20.initialize.selector,
+                TOTAL_SUPPLY,
+                NAME,
+                SYMBOL,
+                address(noopHook),
+                address(igp),
+                address(this)
+            )
+        );
+        remoteToken = HypERC20(address(proxy));
         remoteToken.enrollRemoteRouter(
             ORIGIN,
             address(localToken).addressToBytes32()
@@ -188,10 +206,22 @@ contract HypERC20Test is HypTokenTest {
     function setUp() public override {
         super.setUp();
 
-        localToken = new HypERC20(DECIMALS, address(localMailbox));
-        erc20Token = HypERC20(address(localToken));
-
-        erc20Token.initialize(TOTAL_SUPPLY, NAME, SYMBOL);
+        HypERC20 implementation = new HypERC20(DECIMALS, address(localMailbox));
+        TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(
+            address(implementation),
+            PROXY_ADMIN,
+            abi.encodeWithSelector(
+                HypERC20.initialize.selector,
+                TOTAL_SUPPLY,
+                NAME,
+                SYMBOL,
+                address(address(noopHook)),
+                address(igp),
+                address(this)
+            )
+        );
+        localToken = HypERC20(address(proxy));
+        erc20Token = HypERC20(address(proxy));
 
         erc20Token.enrollRemoteRouter(
             DESTINATION,
@@ -204,7 +234,14 @@ contract HypERC20Test is HypTokenTest {
 
     function testInitialize_revert_ifAlreadyInitialized() public {
         vm.expectRevert("Initializable: contract is already initialized");
-        erc20Token.initialize(TOTAL_SUPPLY, NAME, SYMBOL);
+        erc20Token.initialize(
+            TOTAL_SUPPLY,
+            NAME,
+            SYMBOL,
+            address(address(noopHook)),
+            address(igp),
+            BOB
+        );
     }
 
     function testTotalSupply() public {

solidity/test/token/HypERC20CollateralVaultDeposit.t.sol

@@ -14,6 +14,8 @@ pragma solidity ^0.8.13;
 @@@@@@@@@       @@@@@@@@*/
 
 import "forge-std/Test.sol";
+import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+
 import {ERC4626Test} from "../../contracts/test/ERC4626/ERC4626Test.sol";
 import {TypeCasts} from "../../contracts/libs/TypeCasts.sol";
 import {HypTokenTest} from "./HypERC20.t.sol";
@@ -31,10 +33,21 @@ contract HypERC20CollateralVaultDepositTest is HypTokenTest {
         super.setUp();
         vault = new ERC4626Test(address(primaryToken), "Regular Vault", "RV");
 
-        localToken = new HypERC20CollateralVaultDeposit(
-            vault,
-            address(localMailbox)
+        HypERC20CollateralVaultDeposit implementation = new HypERC20CollateralVaultDeposit(
+                vault,
+                address(localMailbox)
+            );
+        TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(
+            address(implementation),
+            PROXY_ADMIN,
+            abi.encodeWithSelector(
+                HypERC20CollateralVaultDeposit.initialize.selector,
+                address(address(noopHook)),
+                address(igp),
+                address(this)
+            )
         );
+        localToken = HypERC20CollateralVaultDeposit(address(proxy));
         erc20CollateralVaultDeposit = HypERC20CollateralVaultDeposit(
             address(localToken)
         );