Complete migration from Gelato VRF to Chainlink VRF v2.5

- Replace all Gelato VRF dependencies with Chainlink VRF v2.5
- Update contracts to use VRFConsumerBaseV2Plus and native payment model
- Remove Solmate dependencies in favor of Solady for gas optimization
- Update all test files to use VRFCoordinatorV2_5Mock with proper event parsing
- Fix VRF requestId extraction from RandomWordsRequested event data field
- Remove all legacy Gelato VRF testing patterns and dead code
- Update CI/CD workflows and documentation for new dependencies
- Maintain full test coverage with 288/288 tests passing

Technical changes:
- VRF subscription model with native ETH funding
- Proper requestId extraction from event logs using abi.decode
- Consistent _fulfillVRFRequest helper pattern across all tests
- Updated deployment scripts for VRF v2.5 parameters
- Complete removal of Gelato and Solmate library references

Author: webmodularity

.github/workflows/test.yml

@@ -21,10 +21,10 @@ jobs:
         run: |
           forge install --no-git \
             foundry-rs/forge-std@1eea5ba \
-            transmissions11/solmate@c93f771 \
-            gelatodigital/vrf-contracts@fdb85db \
             bokkypoobah/BokkyPooBahsDateTimeLibrary@1dc26f9 \
-            vectorized/solady@v0.0.123
+            vectorized/solady@v0.0.123 \
+            smartcontractkit/chainlink@v2.17.0 \
+            OpenZeppelin/openzeppelin-contracts@v4.9.6
 
       - name: Run Forge fmt
         run: forge fmt --check

CLAUDE.md

@@ -40,7 +40,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 - Implement role-based access control patterns for fine-grained permissions.
 - Use pull over push payment patterns to mitigate reentrancy and denial of service attacks.
 - Implement rate limiting for sensitive functions to prevent abuse.
-- Use Solmate's SafeTransferLib for interacting with ERC20 tokens.
+- Use Solady's SafeTransferLib for interacting with ERC20 tokens.
 - Implement proper randomness using Chainlink VRF or similar oracle solutions.
 - Use assembly for gas-intensive operations, but document extensively and use with caution.
   - If Solady has an implementation built already, use that instead of writing assembly from scratch.
@@ -80,7 +80,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 
 ## Project Overview
 
-Heavy Helms is a Solidity-based on-chain game featuring combat mechanics, NFT skins, and multiple game modes. The project uses Foundry for development and testing. Gauntlet tournaments use blockhash-based randomness for security and gas efficiency, while other modes may use Gelato VRF.
+Heavy Helms is a Solidity-based on-chain game featuring combat mechanics, NFT skins, and multiple game modes. The project uses Foundry for development and testing. Gauntlet tournaments use blockhash-based randomness for security and gas efficiency, while other modes use Chainlink VRF.
 
 ## Key Commands
 
@@ -178,8 +178,8 @@ forge snapshot    # Create gas snapshots for tests
 
 1. **Randomness Systems**: 
    - **GauntletGame**: Uses blockhash-based commit-reveal for security and gas efficiency
-   - **Other Games**: Use Gelato VRF for on-chain randomness  
-   - Mock system available for testing (`GelatoVRFAutoMock.sol`)
+   - **Other Games**: Use Chainlink VRF for on-chain randomness  
+   - Mock system available for testing (Chainlink VRF v2.5 mocks)
 
 2. **Fighter ID Ranges**:
    - Default Players: 1-2000 (game owned)
@@ -392,14 +392,13 @@ All tests inherit from `TestBase.sol` which provides:
 
 1. **Environment Setup**:
    ```bash
-   forge install --no-git foundry-rs/forge-std@1eea5ba transmissions11/solmate@c93f771 gelatodigital/vrf-contracts@fdb85db
+   forge install --no-git foundry-rs/forge-std@1eea5ba bokkypoobah/BokkyPooBahsDateTimeLibrary@1dc26f9 vectorized/solady@v0.0.123 smartcontractkit/chainlink@v2.17.0 OpenZeppelin/openzeppelin-contracts@v4.9.6
    ```
 
 2. **Configuration** (`.env` file):
    ```
    RPC_URL=<YOUR RPC URL>
    PK=<YOUR PRIVATE KEY>
-   GELATO_VRF_OPERATOR=<VRF OPERATOR>
    ```
 
 3. **Deployment Order**:
@@ -422,7 +421,7 @@ All tests inherit from `TestBase.sol` which provides:
 ## Important Notes
 
 - **Via IR**: Enabled in foundry.toml for optimization
-- **Solmate**: Primary dependency for gas-optimized contracts
+- **Solady**: Primary dependency for gas-optimized contracts
 - **Testing**: Extensive test coverage expected, use `-vv` for debugging
 - **Gas Optimization**: Critical due to on-chain game nature
 
@@ -505,7 +504,7 @@ All tests inherit from `TestBase.sol` which provides:
 
 ## Dependencies Management
 
-- Use Solmate (transmissions11/solmate) as a primary source of gas-optimized dependencies.
+- Use Solady (vectorized/solady) as a primary source of gas-optimized dependencies.
 - Use Solady (vectorized/solady) for even more aggressive gas optimization when needed.
 - Ensure that any libraries used are installed with forge, and remappings are set.
 - Place remappings in `foundry.toml` instead of a `remappings.txt` file.
@@ -691,7 +690,7 @@ externalCall();
 
 **VRF/Randomness Patterns:**
 - GauntletGame: Blockhash-based commit-reveal
-- Other Games: Gelato VRF
+- Other Games: Chainlink VRF
 - Clear phase management for multi-step processes
 
 **Registry Pattern:**

README.md

@@ -29,7 +29,6 @@
 ```
 RPC_URL=<YOUR RPC URL> // Optional - will use forked chain for entropy during testing
 PK=<YOUR PRIVATE KEY> // Only needed for deployment + scripts
-GELATO_VRF_OPERATOR=<YOUR GELATO VRF OPERATOR> // Only needed for deployment
 ```
 
 ## Usage Scripts
@@ -64,7 +63,7 @@ cd auto_battler_game_contracts
 2. Install dependencies:
 
 ```bash
-forge install --no-git foundry-rs/forge-std@1eea5ba transmissions11/solmate@c93f771 gelatodigital/vrf-contracts@fdb85db bokkypoobah/BokkyPooBahsDateTimeLibrary@1dc26f9 vectorized/solady@v0.0.123
+forge install --no-git foundry-rs/forge-std@1eea5ba bokkypoobah/BokkyPooBahsDateTimeLibrary@1dc26f9 vectorized/solady@v0.0.123 smartcontractkit/chainlink@v2.17.0 OpenZeppelin/openzeppelin-contracts@v4.9.6
 ```
 
 3. Deploy GameEngine contract _(add --broadcast to send tx)_
@@ -145,7 +144,7 @@ forge script script/deploy/PracticeGameDeploy.s.sol --sig "run(address,address,a
 13. Deploy DuelGame _(add --broadcast to send tx)_
 
 ```bash
-forge script script/deploy/DuelGameDeploy.s.sol --sig "run(address,address)" <GAME_ENGINE_ADDRESS> <PLAYER_CONTRACT_ADDRESS>
+forge script script/deploy/DuelGameDeploy.s.sol --sig "run(address,address,address,address,uint256,bytes32)" <GAME_ENGINE_ADDRESS> <PLAYER_CONTRACT_ADDRESS> <PLAYER_TICKETS_ADDRESS> <VRF_COORDINATOR> <SUBSCRIPTION_ID> <KEY_HASH>
 ```
 
 14. Deploy GauntletGame _(add --broadcast to send tx)_
@@ -154,10 +153,13 @@ forge script script/deploy/DuelGameDeploy.s.sol --sig "run(address,address)" <GA
 forge script script/deploy/GauntletGameDeploy.s.sol --sig "run(address,address,address)" <GAME_ENGINE_ADDRESS> <PLAYER_CONTRACT_ADDRESS> <DEFAULT_PLAYER_CONTRACT_ADDRESS>
 ```
 
-15. Setup VRF
+15. Setup Chainlink VRF
 
 ```bash
-Use Gelato dashboard to add VRF tasks for Player + Duel Game + Gauntlet Game contracts
+# 1. Create a Chainlink VRF subscription on your target network
+# 2. Fund the subscription with LINK tokens or native currency
+# 3. Add the deployed Player contract as a consumer to your subscription
+# 4. Note the VRF Coordinator address, subscription ID, and key hash for deployments
 ```
 
 ## Architecture Changes - Contract Size Optimization

foundry.toml

@@ -12,8 +12,6 @@ libs = ["lib"]
 # Remappings
 remappings = [
       "forge-std/=lib/forge-std/src/",
-      "solmate/=lib/solmate/",
-      "vrf-contracts/=lib/vrf-contracts/",
       "BokkyPooBahsDateTimeLibrary/=lib/BokkyPooBahsDateTimeLibrary/contracts/",
       "solady/=lib/solady/src/",
       "@chainlink/contracts/=lib/chainlink-evm/contracts/",

script/deploy/DuelGameDeploy.s.sol

@@ -38,14 +38,8 @@ contract DuelGameDeployScript is Script {
         vm.startBroadcast(deployerPrivateKey);
 
         // Deploy DuelGame
-        DuelGame duelGame = new DuelGame(
-            gameEngineAddr,
-            playerAddr,
-            vrfCoordinator,
-            subscriptionId,
-            keyHash,
-            playerTicketsAddr
-        );
+        DuelGame duelGame =
+            new DuelGame(gameEngineAddr, playerAddr, vrfCoordinator, subscriptionId, keyHash, playerTicketsAddr);
 
         // Whitelist DuelGame in Player contract
         Player playerContract = Player(playerAddr);

script/game/player/CreatePlayer.s.sol

@@ -30,7 +30,7 @@ contract CreatePlayerScript is Script {
         // Request player creation with 0.001 ETH fee
         uint256 requestId = player.requestCreatePlayer{value: 0.001 ether}(isFemale);
         console2.log("Player creation requested with ID:", requestId);
-        console2.log("Waiting for VRF fulfillment by Gelato operator...");
+        console2.log("Waiting for VRF fulfillment by Chainlink oracle...");
         vm.stopBroadcast();
     }
 }

src/fighters/DefaultPlayer.sol

@@ -10,7 +10,7 @@ pragma solidity ^0.8.13;
 //==============================================================//
 //                          IMPORTS                             //
 //==============================================================//
-import "solmate/src/auth/Owned.sol";
+import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol";
 import "./Fighter.sol";
 import "../interfaces/fighters/IPlayer.sol";
 import "../interfaces/fighters/IDefaultPlayer.sol";
@@ -41,7 +41,7 @@ error InvalidDefaultPlayerSkinType(uint32 skinIndex);
 /// @title Default Player Contract for Heavy Helms
 /// @notice Manages default player characters for the game
 /// @dev Default players are pre-created game characters (IDs 1-2000)
-contract DefaultPlayer is IDefaultPlayer, Owned, Fighter {
+contract DefaultPlayer is IDefaultPlayer, ConfirmedOwner, Fighter {
     //==============================================================//
     //                    STATE VARIABLES                           //
     //==============================================================//
@@ -99,7 +99,7 @@ contract DefaultPlayer is IDefaultPlayer, Owned, Fighter {
     /// @param nameRegistryAddress Address of the name registry contract
     /// @dev Reverts with BadZeroAddress if any address is zero
     constructor(address skinRegistryAddress, address nameRegistryAddress)
-        Owned(msg.sender)
+        ConfirmedOwner(msg.sender)
         Fighter(skinRegistryAddress)
     {
         if (nameRegistryAddress == address(0)) {

src/fighters/Monster.sol

@@ -12,7 +12,7 @@ pragma solidity ^0.8.13;
 //==============================================================//
 import "../interfaces/fighters/IMonster.sol";
 import "../interfaces/fighters/registries/names/IMonsterNameRegistry.sol";
-import "solmate/src/auth/Owned.sol";
+import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol";
 import "./Fighter.sol";
 
 //==============================================================//
@@ -34,7 +34,7 @@ error BadZeroAddress();
 /// @title Monster Contract for Heavy Helms
 /// @notice Manages monster characters for the game
 /// @dev Monsters are system-controlled characters (IDs 2001-10000)
-contract Monster is IMonster, Owned, Fighter {
+contract Monster is IMonster, ConfirmedOwner, Fighter {
     //==============================================================//
     //                    STATE VARIABLES                           //
     //==============================================================//
@@ -111,7 +111,7 @@ contract Monster is IMonster, Owned, Fighter {
     /// @param nameRegistryAddress Address of the name registry contract
     /// @dev Reverts with BadZeroAddress if name registry address is zero
     constructor(address skinRegistryAddress, address nameRegistryAddress)
-        Owned(msg.sender)
+        ConfirmedOwner(msg.sender)
         Fighter(skinRegistryAddress)
     {
         if (nameRegistryAddress == address(0)) {

src/fighters/Player.sol

@@ -11,7 +11,8 @@ pragma solidity ^0.8.13;
 //                          IMPORTS                             //
 //==============================================================//
 // External imports
-import "solmate/src/utils/SafeTransferLib.sol";
+import {SafeTransferLib} from "solady/utils/SafeTransferLib.sol";
+import {ERC20} from "solady/tokens/ERC20.sol";
 import {VRFConsumerBaseV2Plus} from "@chainlink/contracts/src/v0.8/vrf/dev/VRFConsumerBaseV2Plus.sol";
 import {VRFV2PlusClient} from "@chainlink/contracts/src/v0.8/vrf/dev/libraries/VRFV2PlusClient.sol";
 // Internal imports
@@ -1069,7 +1070,7 @@ contract Player is IPlayer, VRFConsumerBaseV2Plus, Fighter {
     /// @param token The address of the ERC20 token to recover
     /// @param amount The amount of tokens to recover
     function recoverERC20(address token, uint256 amount) external onlyOwner {
-        SafeTransferLib.safeTransfer(ERC20(token), owner(), amount);
+        SafeTransferLib.safeTransfer(token, owner(), amount);
     }
 
     /// @notice Emergency function to clear pending VRF requests for an address

src/fighters/registries/names/MonsterNameRegistry.sol

@@ -11,7 +11,7 @@ pragma solidity ^0.8.13;
 //                          IMPORTS                             //
 //==============================================================//
 import "../../../interfaces/fighters/registries/names/IMonsterNameRegistry.sol";
-import "solmate/src/auth/Owned.sol";
+import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol";
 
 //==============================================================//
 //                       CUSTOM ERRORS                          //
@@ -32,7 +32,7 @@ error InvalidNameLength();
 /// @title Monster Name Registry for Heavy Helms
 /// @notice Manages monster name collections for the game
 /// @dev Stores names for monsters with index 0 reserved for nameless monsters
-contract MonsterNameRegistry is IMonsterNameRegistry, Owned {
+contract MonsterNameRegistry is IMonsterNameRegistry, ConfirmedOwner {
     //==============================================================//
     //                    STATE VARIABLES                           //
     //==============================================================//
@@ -78,7 +78,7 @@ contract MonsterNameRegistry is IMonsterNameRegistry, Owned {
     //==============================================================//
     /// @notice Initializes the Monster Name Registry
     /// @dev Creates an empty name at index 0 for nameless monsters
-    constructor() Owned(msg.sender) {
+    constructor() ConfirmedOwner(msg.sender) {
         // Add empty name at index 0 for "nameless" monsters
         monsterNames.push("");
     }