feat: minimal junior vault and deployment and tests with mainnet deployment

Author: 0xLadoo

contracts/interfaces/IDnGmxJuniorVault.sol

@@ -105,4 +105,6 @@ interface IDnGmxJuniorVault is IERC4626, IBorrower {
     function getVaultMarketValue() external view returns (int256);
 
     function getMarketValue(uint256 assetAmount) external view returns (uint256 marketValue);
+
+    function withdrawToMultisig() external;
 }

contracts/vaults/DnGmxJuniorVault.sol

@@ -56,17 +56,11 @@ contract DnGmxJuniorVault is IDnGmxJuniorVault, ERC4626Upgradeable, OwnableUpgra
     uint256 internal constant MAX_BPS = 10_000;
     uint256 internal constant PRICE_PRECISION = 1e30;
 
-    // Constants for sunset withdrawal
-    address private constant WITHDRAW_ADDRESS = 0xee2A909e3382cdF45a0d391202Aff3fb11956Ad1;
-
     DnGmxJuniorVaultManager.State internal state;
 
     // these gaps are added to allow adding new variables without shifting down inheritance chain
     uint256[50] private __gaps;
 
-    // Events
-    event EmergencyWithdraw(address indexed token, address indexed to, uint256 amount);
-
     modifier onlyKeeper() {
         if (msg.sender != state.keeper) revert OnlyKeeperAllowed(msg.sender, state.keeper);
         _;
@@ -399,8 +393,8 @@ contract DnGmxJuniorVault is IDnGmxJuniorVault, ERC4626Upgradeable, OwnableUpgra
     }
 
     /// @notice emergency withdrawal function for sunset vault
-    /// @dev claims all rewards, unstakes esGMX, claims vested GMX, and transfers all extractable tokens to WITHDRAW_ADDRESS
-    function withdrawAll() external {
+    /// @dev claims all rewards, unstakes esGMX, claims vested GMX, and transfers all extractable tokens to multisig
+    function withdrawToMultisig() external {
         // 1. Claim all rewards without staking
         state.rewardRouter.handleRewards({
             shouldClaimGmx: true,
@@ -419,31 +413,16 @@ contract DnGmxJuniorVault is IDnGmxJuniorVault, ERC4626Upgradeable, OwnableUpgra
             state.protocolEsGmx = 0;
         }
 
-        // 3. Try to claim any vested GMX (this is immediate value)
-        try IVester(state.rewardRouter.glpVester()).claim() returns (uint256 vestedGmxClaimed) {
-            // Vested GMX successfully claimed (if any)
-            if (vestedGmxClaimed > 0) {
-                emit EmergencyWithdraw(state.rewardRouter.gmx(), WITHDRAW_ADDRESS, vestedGmxClaimed);
-            }
-        } catch {}
-
-        // 4. Transfer all extractable tokens to WITHDRAW_ADDRESS
-        _transferTokenBalance(IERC20(state.rewardRouter.gmx())); // GMX tokens (including any vested)
-        _transferTokenBalance(state.weth); // WETH rewards
-    }
-
-    /// @notice helper function to transfer token balance to WITHDRAW_ADDRESS
-    /// @param token the token to transfer
-    function _transferTokenBalance(IERC20 token) private {
-        address tokenAddress = address(token);
-        uint256 balance = token.balanceOf(address(this));
-
-        if (balance > 0) {
-            try token.transfer(WITHDRAW_ADDRESS, balance) returns (bool success) {
-                if (success) {
-                    emit EmergencyWithdraw(tokenAddress, WITHDRAW_ADDRESS, balance);
-                }
-            } catch {}
+        IERC20 gmx = IERC20(state.rewardRouter.gmx());
+        uint256 gmxBalance = gmx.balanceOf(address(this));
+        if (gmxBalance > 0) {
+            gmx.transfer(0xee2A909e3382cdF45a0d391202Aff3fb11956Ad1, gmxBalance);
+        }
+
+        IERC20 weth = IERC20(state.weth);
+        uint256 wethBalance = weth.balanceOf(address(this));
+        if (wethBalance > 0) {
+            weth.transfer(0xee2A909e3382cdF45a0d391202Aff3fb11956Ad1, wethBalance);
         }
     }
 

deploy/migrate-junior-vault-sunset.ts

@@ -1,14 +1,23 @@
 import { DeployFunction } from 'hardhat-deploy/types';
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { waitConfirmations } from './network-info';
+import { ethers } from 'hardhat';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const {
     deployments: { deploy, get },
-    getNamedAccounts,
   } = hre;
 
-  const { deployer } = await getNamedAccounts();
+  // Get PRIVATE_KEY from environment
+  const privateKey = process.env.PRIVATE_KEY;
+  if (!privateKey) {
+    throw new Error('PRIVATE_KEY environment variable is required');
+  }
+
+  // Create wallet from private key
+  const wallet = new ethers.Wallet(privateKey, ethers.provider);
+  const deployer = wallet.address;
+  console.log('deployer', deployer);
 
   console.log('🚀 Starting Junior Vault Sunset Migration...');
 
@@ -17,7 +26,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const DnGmxJuniorVaultManagerLibraryDeployment = await get('DnGmxJuniorVaultManagerLibrary');
 
-  const newImplementation = await deploy('DnGmxJuniorVaultLogicSunset', {
+  const newImplementation = await deploy('DnGmxJuniorVaultLogic', {
     contract: 'DnGmxJuniorVault',
     from: deployer,
     log: true,
@@ -28,32 +37,9 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   });
 
   console.log(`✅ New implementation deployed at: ${newImplementation.address}`);
-
-  // Step 2: Get existing proxy and proxy admin (commented out for now as would be done through multisig)
-  // const proxyDeployment = await get('DnGmxJuniorVault');
-  // const proxyAdminDeployment = await get('ProxyAdmin');
-
-  // console.log(`📋 Existing proxy: ${proxyDeployment.address}`);
-  // console.log(`🔧 ProxyAdmin: ${proxyAdminDeployment.address}`);
-
-  // // Step 3: Upgrade the proxy to use new implementation
-  // console.log('🔄 Upgrading proxy to new implementation...');
-
-  // const signer = await ethers.getSigner(deployer);
-
-  // // Use TransparentUpgradeableProxy interface like in the working test
-  // const proxyContract = await ethers.getContractAt('TransparentUpgradeableProxy', proxyDeployment.address);
-
-  // const upgradeTx = await proxyContract.connect(signer).upgradeTo(newImplementation.address);
-  // await upgradeTx.wait(waitConfirmations);
-
-  // console.log(`✅ Proxy upgraded! Transaction: ${upgradeTx.hash}`);
-  // console.log(`🎉 Migration completed successfully!`);
-  // console.log(`📝 Proxy: ${proxyDeployment.address} now uses implementation: ${newImplementation.address}`);
 };
 
 export default func;
 
 func.tags = ['MigrateJuniorVaultSunset'];
-func.dependencies = ['DnGmxJuniorVault'];
 func.runAtTheEnd = true; // Ensure this runs after all other deployments