Skip to content
This repository has been archived by the owner on Jun 2, 2021. It is now read-only.

fix: Update matching history #7

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix: Update matching history #7

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53ec416
feat: update inject proxy, add burn function
pancake-swap Feb 12, 2021
b9a6113
fix: match 1 number
pancake-swap Feb 12, 2021
2f7b87f
delete deadaddress
pancake-swap Feb 12, 2021
58f10cf
fix accidentally delete
pancake-swap Feb 12, 2021
38252cf
fix
pancake-swap Feb 12, 2021
d9b58f6
fix index
pancake-swap Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions contracts/Lottery.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ contract Lottery is LotteryOwnable, Initializable {
using SafeMath for uint8;
using SafeERC20 for IERC20;

uint8 constant keyLengthForEachBuy = 11;
uint8 constant keyLengthForEachBuy = 15;
// Allocation for first/sencond/third reward
uint8[4] public allocation;
// The TOKEN to buy lottery
Expand Down Expand Up @@ -301,10 +301,15 @@ contract Lottery is LotteryOwnable, Initializable {
result[9] = 1*256*256*256 + tempNumber[1]*256*256 + 3*256 + tempNumber[3];
result[10] = 2*256*256*256 + tempNumber[2]*256*256 + 3*256 + tempNumber[3];

result[11] = 0*256 + tempNumber[0];
result[12] = 1*256 + tempNumber[1];
result[13] = 2*256 + tempNumber[2];
result[14] = 3*256 + tempNumber[3];

return result;
}

function calculateMatchingRewardAmount() internal view returns (uint256[4] memory) {
function calculateMatchingRewardAmount() internal view returns (uint256[5] memory) {
uint64[keyLengthForEachBuy] memory numberIndexKey = generateNumberIndexKey(winningNumbers);

uint256 totalAmout1 = userBuyAmountSum[issueIndex][numberIndexKey[0]];
Expand All @@ -325,7 +330,14 @@ contract Lottery is LotteryOwnable, Initializable {

uint256 totalAmout3 = sumForTotalAmout3.add(totalAmout1.mul(6)).sub(sumForTotalAmout2.mul(3));

return [totalAmount, totalAmout1, totalAmout2, totalAmout3];
uint256 sumForTotalAmout4 = userBuyAmountSum[issueIndex][numberIndexKey[11]];
sumForTotalAmout4 = sumForTotalAmout4.add(userBuyAmountSum[issueIndex][numberIndexKey[12]]);
sumForTotalAmout4 = sumForTotalAmout4.add(userBuyAmountSum[issueIndex][numberIndexKey[13]]);
sumForTotalAmout4 = sumForTotalAmout4.add(userBuyAmountSum[issueIndex][numberIndexKey[14]]);

uint256 totalAmout4 = sumForTotalAmout4.add(sumForTotalAmout2.mul(3)).sub(totalAmout1.mul(4)).sub(sumForTotalAmout3.mul(2));

return [totalAmount, totalAmout1, totalAmout2, totalAmout3, totalAmout4];
}

function getMatchingRewardAmount(uint256 _issueIndex, uint256 _matchingNumber) public view returns (uint256) {
Expand Down