Merge branch 'main' of github.com:itssunny322/crypto-bet into main

webexpert979 · Apr 18, 2022 · f80eb1c · f80eb1c
2 parents cf69b01 + 4a71980
commit f80eb1c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/contracts/Bet.sol b/contracts/Bet.sol
@@ -425,6 +425,18 @@ contract Bet is Ownable, ReentrancyGuard {
         int8 _chosenWinner,
         uint256 _amount
     ) public payable notAddress0(msg.sender) nonReentrant {
+        uint blockNum = block.number;
+        (
+            bytes32 id,
+            string memory name,
+            string memory teamAname,
+            string memory teamBname,
+            uint256 date,
+            OracleInterface.EventOutcome outcome,
+            int8 winner
+        ) = getEvent((_eventId));
+        require(blockNum< date,"Too late to bet");
+
         // At least a minimum amout is required to bet
         // require(msg.value >= minimumBet, "Bet amount must be >= minimum bet");
 
@@ -556,6 +568,9 @@ contract Bet is Ownable, ReentrancyGuard {
         userTokenBal[msg.sender].balanceAvailable = userTokenBal[msg.sender]
             .balanceAvailable
             .sub(amount);
+         userTokenBal[msg.sender].balancewithdrawn = userTokenBal[msg.sender]
+            .balancewithdrawn
+            .add(amount);    
         allTokenBalance[tokenAddress] = allTokenBalance[tokenAddress].sub(
             amount
         );

diff --git a/src/components/MatchDetail.js b/src/components/MatchDetail.js
@@ -37,8 +37,9 @@ export default function MatchDetail(props) {
       const realvalB = b / 100;
       setOddB(realvalB);
       const event = await betOracleContract.getEvent(eventId);
-      console.log(event);
+      console.table(event);
       setevent(event);
+
     };
     showbetOdds(id.id);
   }, []);