upgreadeble contracts name

Author: melonges

AGENTS.md

@@ -1,7 +1,7 @@
 # Repository Guidelines
 
 ## Project Structure & Module Organization
-- `src/` Solidity contracts (e.g., `LemonJet.sol`, `Vault.sol`); interfaces live in `src/interfaces/`.
+- `src/` Solidity contracts (e.g., `LemonJetUpgradeable.sol`, `VaultUpgradeable.sol`); interfaces live in `src/interfaces/`.
 - `test/` Foundry tests (`*.t.sol`) and `test/mocks/` for mock contracts.
 - `script/` Foundry scripts (`*.s.sol`) with helpers in `script/utils/`.
 - `broadcast/` deployment artifacts per script/chain, `out/` build outputs, `cache/` local build cache.
@@ -18,7 +18,7 @@
 ## Coding Style & Naming Conventions
 - Solidity version is 0.8.28 (`foundry.toml`); keep `pragma solidity ^0.8.28`.
 - Use 4-space indentation and let `forge fmt` normalize spacing/imports.
-- Contracts and files use PascalCase (`LemonJet.sol`), functions use camelCase.
+- Contracts and files use PascalCase (`LemonJetUpgradeable.sol`), functions use camelCase.
 - Tests are `*.t.sol` with `*Test` contracts; revert cases often use `test_RevertWhen_...`.
 
 ## Testing Guidelines

foundry.toml

@@ -5,7 +5,7 @@ libs = ["lib"]
 optimizer = true
 optimizer_runs = 20_000
 solc_version = "0.8.28"
-gas_reports = ["LemonJet"]
+gas_reports = ["LemonJetUpgradeable"]
 ffi = true
 ast = true
 build_info = true

script/LemonJet.s.sol

@@ -4,7 +4,7 @@ pragma solidity ^0.8.13;
 import {Script} from "forge-std/Script.sol";
 import {console2} from "forge-std/console2.sol";
 import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";
-import {LemonJet} from "../src/LemonJet.sol";
+import {LemonJetUpgradeable} from "../src/LemonJetUpgradeable.sol";
 import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 
 contract LemonJetDeployScript is Script {
@@ -16,15 +16,16 @@ contract LemonJetDeployScript is Script {
 
         vm.startBroadcast(deployerPrivateKey);
 
-        // Deploy a UUPS proxy with the LemonJet implementation
+        // Deploy a UUPS proxy with the LemonJetUpgradeable implementation
         address proxy = Upgrades.deployUUPSProxy(
-            "LemonJet.sol",
+            "LemonJetUpgradeable.sol:LemonJetUpgradeable",
             abi.encodeCall(
-                LemonJet.initialize, (vrfWrapper, reserveFund, IERC20(vaultToken), "LemonJet Vault", "LJUSDC")
+                LemonJetUpgradeable.initialize,
+                (vrfWrapper, reserveFund, IERC20(vaultToken), "LemonJet Vault", "LJUSDC")
             )
         );
 
-        console2.log("LemonJet UUPS proxy deployed at:", proxy);
+        console2.log("LemonJetUpgradeable UUPS proxy deployed at:", proxy);
 
         vm.stopBroadcast();
     }

script/Play.s.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.28;
 
 import {Script} from "forge-std/Script.sol";
 import {console2} from "forge-std/console2.sol";
-import {LemonJet} from "../src/LemonJet.sol";
+import {LemonJetUpgradeable} from "../src/LemonJetUpgradeable.sol";
 import {LemonJetToken} from "../test/mocks/LemonJetToken.sol";
 
 contract PlayLemonJetScript is Script {
@@ -14,7 +14,7 @@ contract PlayLemonJetScript is Script {
         //
         // (bool success,) = ljtGame.call{value: 1000000000000000, gas: 500000}(
         //     abi.encodeWithSelector(
-        //         LemonJet.play.selector, 111111, 200, address(0xBa0d95449B5E901CFb938fa6b6601281cEf679a4)
+        //         LemonJetUpgradeable.play.selector, 111111, 200, address(0xBa0d95449B5E901CFb938fa6b6601281cEf679a4)
         //     )
         // );
         // require(success, "Failed to send Ether");

src/LemonJet.sol src/LemonJetUpgradeable.solsrc/LemonJet.sol renamed to src/LemonJetUpgradeable.sol

@@ -6,15 +6,15 @@ import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import {VRFV2PlusWrapperConsumerBaseUpgradeable} from "./VRFV2PlusWrapperConsumerBase.sol";
 import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";
 import {ILemonJet} from "./interfaces/ILemonJet.sol";
-import {Vault} from "./Vault.sol";
+import {VaultUpgradeable} from "./VaultUpgradeable.sol";
 import {Referral} from "./Referral.sol";
 import {OwnableUpgradeable} from "openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
 import {UUPSUpgradeable} from "openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol";
 
-contract LemonJet is
+contract LemonJetUpgradeable is
     ILemonJet,
     Referral,
-    Vault,
+    VaultUpgradeable,
     VRFV2PlusWrapperConsumerBaseUpgradeable,
     OwnableUpgradeable,
     UUPSUpgradeable
@@ -54,7 +54,7 @@ contract LemonJet is
         string memory _symbol
     ) public initializer {
         VRFV2PlusWrapperConsumerBaseUpgradeable.initialize(wrapperAddress);
-        Vault.initialize(_asset, _reserveFund, _name, _symbol);
+        VaultUpgradeable.initialize(_asset, _reserveFund, _name, _symbol);
         __Ownable_init(msg.sender);
     }
 
@@ -127,7 +127,7 @@ contract LemonJet is
         // check if a player has won
         if (randomNumber <= gameThreshold) {
             /**
-             * @dev See {Vault-_payoutWin}.
+             * @dev See {VaultUpgradeable-_payoutWin}.
              */
             _payoutWin(player, payout);
         } else {

src/Vault.sol src/VaultUpgradeable.solsrc/Vault.sol renamed to src/VaultUpgradeable.sol

@@ -7,7 +7,7 @@ import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import {SafeERC20} from "openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IERC4626} from "openzeppelin-contracts/contracts/interfaces/IERC4626.sol";
 
-contract Vault is IVault, ERC4626FeesUpgradeable {
+contract VaultUpgradeable is IVault, ERC4626FeesUpgradeable {
     uint256 private constant _reserveFundFeeBasisPoints = 10; // 0.1%
     address public reserveFund;
 

test/LemonJet.t.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.28;
 
 import {Test} from "forge-std/Test.sol";
-import {LemonJet} from "../src/LemonJet.sol";
+import {LemonJetUpgradeable} from "../src/LemonJetUpgradeable.sol";
 import {HelperContract} from "./HelperContract.sol";
 import {UnsafeUpgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";
 import {ILemonJet} from "../src/interfaces/ILemonJet.sol";
@@ -19,7 +19,7 @@ contract LemonJetTest is Test, HelperContract {
     address constant newReferralAddress = address(6);
     ERC20Mock ljtToken;
     ERC20Mock usdcToken;
-    LemonJet ljtGame;
+    LemonJetUpgradeable ljtGame;
 
     MockLinkToken private s_linkToken;
 
@@ -31,18 +31,18 @@ contract LemonJetTest is Test, HelperContract {
         ljtToken = new ERC20Mock();
 
         // Deploy implementation directly for coverage testing
-        address implementation = address(new LemonJet());
+        address implementation = address(new LemonJetUpgradeable());
 
         // Deploy UUPS proxy using UnsafeUpgrades (recommended for coverage tests)
         address proxy = UnsafeUpgrades.deployUUPSProxy(
             implementation,
             abi.encodeCall(
-                LemonJet.initialize,
+                LemonJetUpgradeable.initialize,
                 (address(s_wrapper), reserveFund, IERC20(address(ljtToken)), "Vault LemonJet", "VLJT")
             )
         );
 
-        ljtGame = LemonJet(proxy);
+        ljtGame = LemonJetUpgradeable(proxy);
 
         ljtToken.mint(address(ljtGame), 500 ether);
         ljtToken.mint(player, 500 ether);

test/Vault.t.sol

@@ -4,15 +4,15 @@ pragma solidity ^0.8.28;
 import {Test} from "forge-std/Test.sol";
 import {console2} from "forge-std/console2.sol";
 import {ERC20Mock} from "openzeppelin-contracts/contracts/mocks/token/ERC20Mock.sol";
-import {Vault} from "../src/Vault.sol";
+import {VaultUpgradeable} from "../src/VaultUpgradeable.sol";
 import {VaultHarness} from "./mocks/VaultHarness.sol";
 import {HelperContract} from "./HelperContract.sol";
 import {UnsafeUpgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";
 import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 
 contract VaultTest is Test, HelperContract {
     ERC20Mock asset;
-    Vault vault;
+    VaultUpgradeable vault;
 
     function setUp() public {
         asset = new ERC20Mock();
@@ -26,7 +26,7 @@ contract VaultTest is Test, HelperContract {
             abi.encodeCall(VaultHarness.initialize, (IERC20(address(asset)), reserveFund, "LemonJet Vault", "VLJT"))
         );
 
-        vault = Vault(proxy);
+        vault = VaultUpgradeable(proxy);
 
         asset.mint(player, 10 ether);
         vm.startPrank(player);

test/mocks/VaultHarness.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.8.28;
 
-import {Vault} from "../../src/Vault.sol";
+import {VaultUpgradeable} from "../../src/VaultUpgradeable.sol";
 import {IERC20} from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 
-/// @dev Test harness for Vault that provides an initializer entry point
-contract VaultHarness is Vault {
+/// @dev Test harness for VaultUpgradeable that provides an initializer entry point
+contract VaultHarness is VaultUpgradeable {
     function initialize(IERC20 _asset, address _reserveFund, string memory _name, string memory _symbol)
         public
         override