From 296113a68d1fb62484f6f4d55920a253d3fa39ae Mon Sep 17 00:00:00 2001
From: yellow <8539006+yellowBirdy@users.noreply.github.com>
Date: Sat, 9 Nov 2024 22:07:38 +0100
Subject: [PATCH] reg names

---
 app/contract_address.ts              | 3 ++-
 app/src/providers/PlayerProvider.tsx | 4 ++--
 src/RaidGeld.sol                     | 4 ++--
 test/RaidGeld.t.sol                  | 5 +++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/contract_address.ts b/app/contract_address.ts
index 620cb43..7cc6d02 100644
--- a/app/contract_address.ts
+++ b/app/contract_address.ts
@@ -1,7 +1,8 @@
 import { Address } from "viem"
 
 const contracts: Record<string, Address> = {
-  contractAddress: "0xbd06B0878888bf4c6895704fa603a5ADf7e65c66",
+  // contractAddress: "0xbd06B0878888bf4c6895704fa603a5ADf7e65c66",
+  contractAddress: "0x4593ed9CbE6003e687e5e77368534bb04b162503",
   daoTokenAddress: "0x11dC980faf34A1D082Ae8A6a883db3A950a3c6E8"
 }
 
diff --git a/app/src/providers/PlayerProvider.tsx b/app/src/providers/PlayerProvider.tsx
index da27fb7..bbbe0e7 100644
--- a/app/src/providers/PlayerProvider.tsx
+++ b/app/src/providers/PlayerProvider.tsx
@@ -176,7 +176,7 @@ const PlayerProvider = ({ children }: { children: ReactNode }) => {
           {
             abi,
             address: contractAddress,
-            functionName: "register_eth",
+            functionName: "registerEth",
             value: parseEther("0.00045"),
           },
           {
@@ -203,7 +203,7 @@ const PlayerProvider = ({ children }: { children: ReactNode }) => {
                     {
                       abi,
                       address: contractAddress,
-                      functionName: "register_dao",
+                      functionName: "registerDaoToken",
                     },
                     {
                       onSuccess: (hash) => {
diff --git a/src/RaidGeld.sol b/src/RaidGeld.sol
index 778ae62..0e473f6 100644
--- a/src/RaidGeld.sol
+++ b/src/RaidGeld.sol
@@ -160,7 +160,7 @@ contract RaidGeld is ERC20, Ownable, Constants {
     }
 
     // New player want to register with ETH
-    function register_eth() external payable newPlay {
+    function registerEth() external payable newPlay {
         require(msg.value == BUY_IN_AMOUNT, "Incorrect buy in amount");
         weth.deposit{value: BUY_IN_AMOUNT}();
         weth.approve(address(router), BUY_IN_AMOUNT);
@@ -179,7 +179,7 @@ contract RaidGeld is ERC20, Ownable, Constants {
     }
 
     // New player wants to register with dao
-    function register_dao() external payable newPlay {
+    function registerDaoToken() external payable newPlay {
         //@notice this is not safe for arbitrary tokens, which may not follow the interface eg. USDT
         //@notice but should be fine for the DAO token
         require(
diff --git a/test/RaidGeld.t.sol b/test/RaidGeld.t.sol
index 8f30f76..dba733c 100644
--- a/test/RaidGeld.t.sol
+++ b/test/RaidGeld.t.sol
@@ -44,16 +44,17 @@ contract raid_geldTest is Test, Constants {
 
     function fundAccount(address _acc) private {
         vm.deal(_acc, 10 ether);
+        console.log("dao token", DAO_TOKEN);
         stdstore.target(DAO_TOKEN).sig("balanceOf(address)").with_key(_acc).checked_write(1000 ether);
     }
 
     function registerPlayer() private {
-        raid_geld.register_eth{value: raid_geld.BUY_IN_AMOUNT()}();
+        raid_geld.registerEth{value: raid_geld.BUY_IN_AMOUNT()}();
     }
 
     function registerPlayerWithDaoToken() private {
         raid_geld.daoToken().approve(address(raid_geld), raid_geld.BUY_IN_DAO_TOKEN_AMOUNT());
-        raid_geld.register_dao();
+        raid_geld.registerDaoToken();
     }
 
     function test_00_no_fallback() public {