mico/idle_moloch
1
1
Fork 2
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/boss-mechanic

Browse Source
This commit is contained in:
mic0 2024-10-30 11:18:46 +01:00
commit 64832617cc
Signed by: mico
GPG Key ID: A3F8023524CF1C8D
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/providers/PlayerProvider.tsx
View File

@ -108,7 +108,7 @@ const PlayerProvider = ({ children }: { children: ReactNode }) => {
abi, abi,
address: contractAddress, address: contractAddress,
functionName: 'register_eth', functionName: 'register_eth',
value: parseEther("0.0005"), value: parseEther("0.00005"),
}, { }, {
onSuccess: (hash) => { onSuccess: (hash) => {
setHashAndCallback([hash, resetHashAndCallback]) setHashAndCallback([hash, resetHashAndCallback])
@ -119,7 +119,7 @@ const PlayerProvider = ({ children }: { children: ReactNode }) => {
abi, abi,
address: daoTokenAddress, address: daoTokenAddress,
functionName: 'approve', functionName: 'approve',
args: [contractAddress, parseEther("500")], args: [contractAddress, parseEther("50")],
}, { }, {
onSuccess: (hash) => { onSuccess: (hash) => {
setHashAndCallback([ setHashAndCallback([

5
src/RaidGeld.sol
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;
@ -143,8 +143,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