.gitmodules

@@ -4,6 +4,3 @@
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "lib/Baal"]
-	path = lib/Baal
-	url = https://github.com/HausDAO/Baal

lib/Baal

@@ -1 +0,0 @@
-Subproject commit ee3d5ab910399c2b70e70aee2eb3c874047313ed

lib/v3-core

@@ -1 +0,0 @@
-Subproject commit e3589b192d0be27e100cd0daaf6c97204fdb1899

lib/v3-periphery

@@ -1 +0,0 @@
-Subproject commit 80f26c86c57b8a5e4b913f42844d4c8bd274d058

script/RaidGeld.s.sol

@@ -12,7 +12,7 @@ contract RaidGeldScript is Script, Constants {
 
     function run() public {
         vm.startBroadcast();
-        raidgeld = new RaidGeld(DAO_TOKEN, POOL, BAAL);
+        raidgeld = new RaidGeld(DAO_TOKEN, POOL);
         vm.stopBroadcast();
     }
 }

src/Constants.sol

@@ -5,7 +5,6 @@ contract Constants {
     //base addresses
     address public constant DAO_TOKEN = 0x11dC980faf34A1D082Ae8A6a883db3A950a3c6E8;
     address public constant POOL = 0x27004f6d0c1bB7979367D32Ba9d6DF6d61A18926;
-    address public constant BAAL = 0x4d5A5B4a679b10038e1677C84Cb675d10d29fFFD;
     address public constant WETH = 0x4200000000000000000000000000000000000006;
     address public constant SWAP_ROUTER = 0x2626664c2603336E57B271c5C0b26F421741e481;
 }

src/RaidGeld.sol

@@ -3,7 +3,6 @@ pragma solidity ^0.8.13;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
-import {IBaal} from "lib/Baal/contracts/interfaces/IBaal.sol";
 
 import {RaidGeldUtils} from "../src/RaidGeldUtils.sol";
 import {Army, Player, Raider, Boss} from "../src/RaidGeldStructs.sol";
@@ -14,7 +13,6 @@ contract RaidGeld is ERC20, Ownable, Constants {
     uint256 public constant BUY_IN_AMOUNT = 0.00005 ether;
     uint256 public BUY_IN_DAO_TOKEN_AMOUNT;
     uint256 public constant INITIAL_GELD = 50 * MANTISSA;
-    uint256 public constant SACRIFICE_SHARE = 1e3; // 10%
     mapping(address => Player) private players;
     mapping(address => Army) private armies;
     mapping(address => Boss) private bosses;
@@ -23,7 +21,6 @@ contract RaidGeld is ERC20, Ownable, Constants {
     IWETH public immutable weth = IWETH(WETH);
     // RGCVII token
     ERC20 public daoToken;
-    IBaal public baal;
     // RGCVII pool
     address public pool;
     // Uniswap
@@ -65,10 +62,9 @@ contract RaidGeld is ERC20, Ownable, Constants {
         _;
     }
 
-    constructor(address _daoToken, address _pool, address _baal) ERC20("Raid Geld", "GELD") Ownable(msg.sender) {
+    constructor(address _daoToken, address _pool) ERC20("Raid Geld", "GELD") Ownable(msg.sender) {
         daoToken = ERC20(_daoToken);
         pool = _pool;
-        baal = IBaal(_baal);
         BUY_IN_DAO_TOKEN_AMOUNT = 500 * 10 ** daoToken.decimals();
     }
 
@@ -125,8 +121,7 @@ contract RaidGeld is ERC20, Ownable, Constants {
             amountOutMinimum: 0,
             sqrtPriceLimitX96: 0
         });
-        uint256 daoTokenAmount = router.exactInputSingle(params);
-        performSacrifice(daoTokenAmount);
+        router.exactInputSingle(params);
         start_game(msg.sender);
     }
 
@@ -137,14 +132,8 @@ contract RaidGeld is ERC20, Ownable, Constants {
         require(
             daoToken.transferFrom(msg.sender, address(this), BUY_IN_DAO_TOKEN_AMOUNT), "Failed to transfer DAO tokens"
         );
-        performSacrifice(BUY_IN_DAO_TOKEN_AMOUNT);
         start_game(msg.sender);
     }
-    function performSacrifice(uint256 _baseAmount) private {
-        uint256 amount = _baseAmount * SACRIFICE_SHARE / MANTISSA;
-        address[] memory tokens = new address[](0);
-        baal.ragequit(address(this), amount, 0, tokens);
-    }
 
     // Override for default number of decimals
     function decimals() public view virtual override returns (uint8) {

test/RaidGeld.t.sol

@@ -36,7 +36,7 @@ contract raid_geldTest is Test, Constants {
         vm.deal(owner, 10 ether);
         fundAccount(player1);
         vm.prank(owner);
-        raid_geld = new RaidGeld(DAO_TOKEN, POOL, BAAL);
+        raid_geld = new RaidGeld(DAO_TOKEN, POOL);
         raid_geld.weth().deposit{value: 5 ether}();
     }
 
@@ -116,10 +116,8 @@ contract raid_geldTest is Test, Constants {
         assertEq(raid_geld.balanceOf(player1), raid_geld.INITIAL_GELD());
 
         // Verify the contract dao token balance is updated
-        uint256 expectedDaoBalance = initialBalance + raid_geld.BUY_IN_DAO_TOKEN_AMOUNT() -
-            raid_geld.BUY_IN_DAO_TOKEN_AMOUNT() * raid_geld.SACRIFICE_SHARE() / raid_geld.MANTISSA();
         assertEq(
-            raid_geld.daoToken().balanceOf(address(raid_geld)), expectedDaoBalance
+            raid_geld.daoToken().balanceOf(address(raid_geld)), initialBalance + raid_geld.BUY_IN_DAO_TOKEN_AMOUNT()
         );
 
         // Verify player is set initially