dao-inegration #2

Merged
mico merged 22 commits from dao-inegration into main 2024-10-29 23:32:14 +00:00
Showing only changes of commit 81170fd8ec - Show all commits

View File

@ -10,7 +10,7 @@ import "../src/Constants.sol";
contract RaidGeld is ERC20, Ownable, Constants { contract RaidGeld is ERC20, Ownable, Constants {
uint256 public constant MANTISSA = 1e4; uint256 public constant MANTISSA = 1e4;
uint256 public constant BUY_IN_AMOUNT = 0.0005 ether; uint256 public constant BUY_IN_AMOUNT = 0.00005 ether;
uint256 public immutable BUY_IN_DAO_TOKEN_AMOUNT; uint256 public immutable BUY_IN_DAO_TOKEN_AMOUNT;
uint256 public constant INITIAL_GELD = 500 * MANTISSA; uint256 public constant INITIAL_GELD = 500 * MANTISSA;
mapping(address => Player) private players; mapping(address => Player) private players;
@ -118,8 +118,7 @@ contract RaidGeld is ERC20, Ownable, Constants {
// Allows the owner to withdraw DAO tokens // Allows the owner to withdraw DAO tokens
function withdraw() external onlyOwner { function withdraw() external onlyOwner {
uint256 amount = daoToken.balanceOf(address(this)); uint256 amount = daoToken.balanceOf(address(this));
daoToken.approve(address(this), amount); daoToken.transfer(owner(), amount);
daoToken.transferFrom(address(this), owner(), amount);
} }
// Manual minting for itchy fingers // Manual minting for itchy fingers