changed public to external in the initializer to help with upgradability

Author: KoxyG

contracts/XXXToken.sol

@@ -53,7 +53,7 @@ contract XXXToken is Initializable,
      * @dev Initializes the contract replacing the constructor for upgradeable contracts
      * Sets up roles and configures token parameters
      */
-    function initialize() public initializer {
+    function initialize() external initializer {
         // Initialize ERC20 with name and symbol
         __ERC20_init("XXX", "XXX");
 

contracts/XXXTokenVault.sol

@@ -79,7 +79,7 @@ contract TokenVault is Initializable,
      * @dev Initializes the contract replacing the constructor for upgradeable contracts
      * @param _ttnToken Address of the XXXToken contract
      */
-    function initialize(address _ttnToken) public initializer {
+    function initialize(address _ttnToken) external initializer {
          if (_ttnToken == address(0)) revert ZeroAddress("token");
         __AccessControl_init();
         __UUPSUpgradeable_init();

contracts/XXXVestingManager.sol

@@ -112,7 +112,7 @@ contract VestingManager is Initializable,
      * @param _ttnToken Address of the XXXToken contract
      * @param _tokenVault Address of the TokenVault contract
      */
-    function initialize(address _ttnToken, address _tokenVault) public initializer {
+    function initialize(address _ttnToken, address _tokenVault) external initializer {
        if (_ttnToken == address(0)) revert ZeroAddress("token");
        if (_tokenVault == address(0)) revert ZeroAddress("vault");
         __AccessControl_init();

contracts/upgrades/XXXTokenV2.sol

@@ -24,12 +24,22 @@ contract XXXTokenV2 is XXXToken {
     /// @notice The version number of this contract implementation
     uint256 public version;
 
+    
+
     /**
-     * @dev Initializes the V2 contract with a version number.
-     * This function is called after the upgrade to set up the new state variables.
-     * The reinitializer modifier ensures this can only be called once after the upgrade.
+     * @dev Initializes V2 functionality
+     * This is called during the upgrade process
+     * @custom:oz-upgrades-validate-as-initializer
      */
-    function initializeV2() public reinitializer(2) {
+    function initializeV2() external reinitializer(2) {
+        // Initialize parent contracts
+        __ERC20_init("XXX Token", "XXX");
+        __ERC20Capped_init(1000000000 * 10**18); // 1 billion tokens
+        __Ownable_init(msg.sender);
+        __AccessControl_init();
+        __Pausable_init();
+        __UUPSUpgradeable_init();
+        
         version = 2;
     }
 } 

contracts/upgrades/XXXTokenVaultV2.sol

@@ -10,18 +10,34 @@
 pragma solidity ^0.8.24;
 
 import "../XXXTokenVault.sol";
+import "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
 
 contract XXXTokenVaultV2 is TokenVault {
     // Version tracking for upgrade testing
     uint256 public version;
     // Additional counter for V2 allocations
     uint256 public totalAllocatedV2;
+
+
+    
 
     /**
      * @dev Initializes V2 functionality
      * This is called during the upgrade process
+     * @custom:oz-upgrades-validate-as-initializer
      */
-    function initializeV2() public reinitializer(2) {
+    function initializeV2() external reinitializer(2) {
+        // Initialize parent contracts
+        __ReentrancyGuard_init();
+        __AccessControl_init();
+        __Pausable_init();
+        __UUPSUpgradeable_init();
+
+        
+        
         version = 2;
     }
 

contracts/upgrades/XXXVestingManagerV2.sol

@@ -10,6 +10,11 @@
 pragma solidity ^0.8.24;
 
 import "../XXXVestingManager.sol";
+import "@openzeppelin/contracts-upgradeable/utils/ReentrancyGuardUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";
+
 
 contract XXXVestingManagerV2 is VestingManager {
     // Version tracking for upgrade testing
@@ -20,8 +25,16 @@ contract XXXVestingManagerV2 is VestingManager {
     /**
      * @dev Initializes V2 functionality
      * This is called during the upgrade process
+     * @custom:oz-upgrades-validate-as-initializer
      */
-    function initializeV2() public reinitializer(2) {
+    function initializeV2() external reinitializer(2) {
+        // Initialize parent contracts
+        __ReentrancyGuard_init();
+        __AccessControl_init();
+        __Pausable_init();
+        __UUPSUpgradeable_init();
+        
+        // Set version to 2
         version = 2;
     }