cindylouwho/ImmortalClanVue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bigint umpdate

Browse Source
This commit is contained in:
EmberSpirit
2023-10-17 18:06:25 +02:00
parent d761adef18
commit d25ef5ad63
20 changed files with 214 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.vue
+8
View File
@@ -33,8 +33,14 @@ watch(showPanel, (newValue, oldValue) => {
console.log("document.body", document.body);
if (newValue) {
document.body.classList.add("sideoutpanel-open");
if (isMobile) {
document.body.classList.add("mobile");
}
} else {
document.body.classList.remove("sideoutpanel-open");
if (isMobile) {
document.body.classList.remove("mobile");
}
}
});
@@ -78,6 +84,7 @@ onMounted(async () => {
cycleStore.activeCycle = cycleStore.currentCycle;
}
console.log("cycleStore.activeCycle", cycleStore.activeCycle);
await cycleStore.fillCycle(cycleStore.activeCycle);
});
</script>
@@ -95,6 +102,7 @@ onMounted(async () => {
<div class="footer">
<div class="footer-inner">
<div class="footer-headline">Join Bloodline</div>
<div class="footer-social-links">
<div class="social-bloodline-badge">
<div class="social-bloodline-badge-icon">
src/components/BloodChart.vue
+4 -1
View File
@@ -72,7 +72,7 @@
</div>
<div class="blood-chart-element-footer">
<div class="blood-chart-amount">
{{ formatNumber(coin.amountInBLD) }}
{{ formatNumber(coin.amountInBLD / 10n ** tokenStore.memeToken.decimals) }}
</div>
<div>$BLOOD</div>
</div>
@@ -99,6 +99,8 @@ import { getPercentage, compactNumber, formatNumber } from "@/helper/helper.js";
import { useCycleStore } from "@/stores/cycles";
import { useMemeburnerStore } from "@/stores/memeburner";
import { useTokenStore } from "@/stores/tokens";
import { Swiper, SwiperSlide } from "swiper/vue";
// Import Swiper styles
@@ -107,6 +109,7 @@ import "swiper/css/navigation";
import "swiper/css/pagination";
const cycleStore = useCycleStore();
const tokenStore = useTokenStore();
const props = defineProps({
data: Object,
src/components/BloodSplash.vue
+9 -9
View File
@@ -244,24 +244,24 @@ function Blood3() {
<style lang="sass">
.blood-svg
width: 40vmax
position: absolute
top: 50%
left: 50%
transform: translate(-50%,-50%)
pointer-events: none
position: fixed
top: 50%
left: 50%
transform: translate(-50%,-50%)
pointer-events: none
width: 100%
.blood-svg
opacity: 0
.blood-splash-2
width: 70vmax
width: 100%
.blood-splash-3
width: 60vmax
width: 100%
p
src/components/ClaimComponent.vue
+14 -8
View File
@@ -4,7 +4,7 @@
<template v-slot:body>
<token-name-price
:name="tokenStore.getToken(walletStore.memeToken?.contractAddress)?.name"
:price="walletStore.memeToken?.unclaimedRewards"
:price="walletStore.memeToken?.unclaimedRewards / 10n ** tokenStore.memeToken.decimals"
></token-name-price>
<token-logo img="/assets/img/token/bloodline.png" :alt="'bloodline logo'"></token-logo>
</template>
@@ -28,7 +28,7 @@
@close="stakeMenu = false"
:amount="walletStore.memeToken?.unclaimedRewards"
:stake="stake"
v-if="stakeMenu"
v-if="stakeMenu && walletStore.memeToken?.unclaimedRewards"
>
<template v-slot:body>
<div class="btn btn-immortal stake-button" disabled v-if="stateClaimComp === 0">
@@ -55,8 +55,13 @@
</div>
</template>
<template v-slot:message-end>
<div class="input-balance">
Balance: {{ formatNumber(walletStore.memeToken?.unclaimedRewards) }}
<div class="input-balance" v-if="walletStore.memeToken?.unclaimedRewards">
Balance:
{{
formatNumber(
walletStore.memeToken?.unclaimedRewards / 10n ** tokenStore.memeToken.decimals
)
}}
</div>
</template>
</stake-menu>
@@ -127,9 +132,10 @@ function openStake() {
async function stakeAndClaimAllCycles() {
try {
const unclaimedRewards = walletStore.memeToken?.unclaimedRewards;
const unclaimedRewards = walletStore.memeToken?.unclaimedRewards / 10n ** tokenStore.memeToken.decimals;
stateClaim.value = 2;
const coefficient = (10000 * tokenNumber.value) / unclaimedRewards;
console.log("unclaimedRewards", unclaimedRewards);
const coefficient = BigInt(10000 * tokenNumber.value) / unclaimedRewards;
var hash = await rewardLockerStore.stakeAndClaimAllCycles(coefficient);
stateClaim.value = 3;
const data = await waitForTransaction({
@@ -144,7 +150,7 @@ async function stakeAndClaimAllCycles() {
//
console.log("rewardData", rewardData);
//ClaimedReward (address staker, uint256 reward)
const outputClaim = Number(rewardData.topics[2]) / Math.pow(10, tokenStore.memeToken.decimals);
const outputClaim = BigInt(rewardData.topics[2]) / 10n ** tokenStore.memeToken.decimals;
showSuccessToast(
formatNumber(outputClaim),
"Success!",
@@ -175,7 +181,7 @@ async function claimAll() {
//
console.log("rewardData", rewardData);
//ClaimedReward (address staker, uint256 reward)
const outputClaim = Number(rewardData.topics[2]) / Math.pow(10, tokenStore.memeToken.decimals);
const outputClaim = rewardData.topics[2] / 10n ** tokenStore.memeToken.decimals;
showSuccessToast(
formatNumber(outputClaim),
"Success!",
src/components/ConnectWallet.vue
+1 -2
View File
@@ -51,7 +51,7 @@
<div class="connected-token" v-for="token in walletStore.token">
<token-name-price
:name="tokenStore.getToken(token.contractAddress).name"
:price="token.balanceOf"
:price="token.balanceOf / 10n ** tokenStore.getToken(token.contractAddress).decimals"
></token-name-price>
<div class="connected-token-button">
<div class="bloodline-badge grey" @click="badgeClick(token)">
@@ -117,7 +117,6 @@ function isMetaMaskInstalled(connector) {
//we could also show buy, if there is no pepe
function badgeClick(token) {
var tokenData = tokenStore.getToken(token.contractAddress);
tokenStore.activeToken = tokenData;
if (tokenStore.memeToken.contractAddress === token.contractAddress) {
//buy
window.open(
src/components/SacrificeToken.vue
+24 -21
View File
@@ -1,7 +1,6 @@
<template>
<div class="sacrifice-wrapper card card--glow">
<div class="sacrifice-headline">Select Sacrifice</div>
<button @click="splashBlood++">splash</button>
<div class="sacrifice-headline">Select Sacrifice {{ splashBlood }}</div>
<div class="sacrifice-select-tokens">
<div class="sacrifice-tokens">
<div
@@ -26,20 +25,14 @@
</div>
</div>
<div class="sacrifice-from-to-wrapper" v-if="activeToken.contractAddress">
<div
:class="{
'sacrifice-from-wrapper': true,
'bloodline-border': true,
'bloodline-border--variant1': true,
purple: true,
}"
>
<div class="sacrifice-from-wrapper bloodline-border bloodline-border--variant1 purple">
<token-input
:modelValue="sacrificeStore.sacrificeNumber"
:modelValue="sacrificeStore.sacrificeNumber / 10n ** activeToken.decimals"
@input="
($event) => {
sacrificeStore.sacrificeNumber = $event.target.value;
processChange($event.target.value);
const value = BigInt($event.target.value) * 10n ** 18n;
sacrificeStore.sacrificeNumber = value;
processChange(value);
}
"
:max="activeWalletToken?.balanceOf"
@@ -66,7 +59,7 @@
<template v-slot:message-end v-if="activeWalletToken?.balanceOf">
<div class="input-balance tiny-text">
Balance:
{{ activeWalletToken?.balanceOf }}
{{ BigInt(activeWalletToken?.balanceOf) / 10n ** activeToken.decimals }}
</div>
<div class="input-max tiny-text" @click="addMaxTokens">Max</div>
</template>
@@ -232,7 +225,7 @@ const stateComputed = computed(() => {
if (
sacrificeStore.sacrificeNumber === null ||
sacrificeStore.sacrificeNumber === "" ||
sacrificeStore.sacrificeNumber === 0
sacrificeStore.sacrificeNumber === 0n
) {
returnState = 0;
} else if (sacrificeStore.sacrificeState === 2) {
@@ -275,6 +268,7 @@ onBeforeUnmount(() => {
async function approveToken(amount) {
try {
console.log("amount", amount);
sacrificeStore.sacrificeState = 2;
const hash = await tokenStore.approveToken(amount);
sacrificeStore.sacrificeState = 3;
@@ -295,11 +289,11 @@ async function approveToken(amount) {
async function addTokens(value) {
if (!walletStore.connected || sacrificeStore.sacrificeNumber < activeWalletToken.value?.balanceOf) {
sacrificeStore.sacrificeNumber = Number(sacrificeStore.sacrificeNumber) + Number(value);
sacrificeStore.sacrificeNumber = BigInt(sacrificeStore.sacrificeNumber) + value;
} else {
sacrificeStore.sacrificeNumber = Number(sacrificeStore.sacrificeNumber) - Number(value);
if (sacrificeStore.sacrificeNumber < 0) {
sacrificeStore.sacrificeNumber = 0;
sacrificeStore.sacrificeNumber = sacrificeStore.sacrificeNumber - value;
if (sacrificeStore.sacrificeNumber < 0n) {
sacrificeStore.sacrificeNumber = 0n;
}
}
@@ -330,7 +324,9 @@ function showApprovedToast(value, header, subheader, info) {
},
// Listen and react to events using callbacks. In this case we listen for
// the "click" event emitted when clicking the toast button
listeners: {},
listeners: {
sacrificed: showSplash,
},
};
// Render the toast and its contents
@@ -345,9 +341,16 @@ function showApprovedToast(value, header, subheader, info) {
});
}
function showSplash() {
splashBlood.value++;
}
//call function in the store and remove icon,
async function sacrificeToken() {
await sacrificeStore.sacrificeToken(sacrificeStore.sacrificeNumber, activeToken.value);
var result = await sacrificeStore.sacrificeToken(sacrificeStore.sacrificeNumber, activeToken.value);
if (result) {
showSplash();
}
toast.dismiss(approveToast.value);
}
src/components/StakeComponentV1.vue
+9 -5
View File
@@ -31,8 +31,9 @@
<div class="connected-stake-body">
<slot name="body">
<token-name-price
v-if="walletStore.memeToken?.staked"
:name="tokenStore.getToken(walletStore.memeToken?.contractAddress)?.name"
:price="formatNumber(walletStore.memeToken?.staked)"
:price="formatNumber(walletStore.memeToken?.staked / 10n ** tokenStore.memeToken.decimals)"
></token-name-price>
<token-logo img="/assets/img/token/bloodline.png" :alt="'bloodline-token'"></token-logo>
<token-name-price class="stake-reward" name="Extra Reward" price="+25%"></token-name-price>
@@ -103,7 +104,9 @@
</div>
</template>
<template v-slot:message-end>
<div class="input-balance">Balance: {{ walletStore.memeToken?.balanceOf }}</div>
<div class="input-balance">
Balance: {{ walletStore.memeToken?.balanceOf / 10n ** tokenStore.memeToken.decimals }}
</div>
</template>
</stake-menu>
<div class="unstake-menu" v-else-if="stakeMenu & unstakeMenu">
@@ -222,7 +225,7 @@ async function orderUnstake() {
});
console.log("rewardData", rewardData);
const outputClaim = Number(rewardData.topics[2]) / Math.pow(10, tokenStore.memeToken.decimals);
const outputClaim = Number(rewardData.topics[2]) / 10n ** tokenStore.memeToken.decimals;
showSuccessToast(
formatNumber(outputClaim),
"Success!",
@@ -239,6 +242,7 @@ async function orderUnstake() {
async function stakeToken() {
try {
console.log("stakeToken");
state.value = 2;
const hash = await rewardLockerStore.stakeBloodline(tokenNumber.value);
state.value = 3;
@@ -253,9 +257,9 @@ async function stakeToken() {
//
console.log("rewardData", rewardData);
const outputClaim = Number(rewardData.topics[3]) / Math.pow(10, tokenStore.memeToken.decimals);
const outputClaim = BigInt(rewardData.topics[3]) / 10n ** tokenStore.memeToken.decimals;
console.log("data", data);
state.value = 4;
state.value = 0;
await walletStore.loadWalletData();
showSuccessToast(
formatNumber(outputClaim),
src/components/StakeMenu.vue
+13 -9
View File
@@ -2,10 +2,10 @@
<div class="stake-menu">
<token-input :modelValue="props.modelValue" @input="emit('update:modelValue', Number($event.target.value))">
<template v-slot:message>
<div class="stake-adder-step bloodline-badge grey" @click="addTokensPercent(25)">25%</div>
<div class="stake-adder-step bloodline-badge grey" @click="addTokensPercent(50)">50%</div>
<div class="stake-adder-step bloodline-badge grey" @click="addTokensPercent(75)">75%</div>
<div class="stake-adder-step bloodline-badge grey" @click="addTokensPercent(100)">100%</div>
<div class="stake-adder-step bloodline-badge grey" @click="addTokensPercent(25n)">25%</div>
<div class="stake-adder-step bloodline-badge grey" @click="addTokensPercent(50n)">50%</div>
<div class="stake-adder-step bloodline-badge grey" @click="addTokensPercent(75n)">75%</div>
<div class="stake-adder-step bloodline-badge grey" @click="addTokensPercent(100n)">100%</div>
</template>
<template v-slot:message-end>
<slot name="message-end"> </slot>
@@ -47,15 +47,18 @@ const emit = defineEmits(["close", "update:modelValue"]);
async function addTokensPercent(value) {
console.log("value", value);
console.log(walletStore.memeToken.balanceOf);
console.log("props.amount", props.amount);
console.log(walletStore.memeToken.balanceOf / 10n ** tokenStore.memeToken.decimals);
let amount;
if (props.amount !== undefined || props.amount !== null) {
amount = (props.amount * value) / 100;
console.log("props.amount", props.amount);
amount = ((props.amount / 10n ** tokenStore.memeToken.decimals) * value) / 100n;
} else if (props.stake) {
amount = (walletStore.memeToken.balanceOf * value) / 100;
amount = ((walletStore.memeToken.balanceOf / 10n ** tokenStore.memeToken.decimals) * value) / 100n;
} else {
amount = (walletStore.memeToken.staked * value) / 100;
amount = ((walletStore.memeToken.staked / 10n ** tokenStore.memeToken.decimals) * value) / 100n;
}
console.log("amount", amount);
emit("update:modelValue", Number(amount));
}
@@ -78,11 +81,12 @@ async function unstakeBloodline() {
async function stakeBloodline() {
try {
console.log("stakeBloodline");
const fromAddress = walletStore.address;
const spender = rewardLockerStore.config.contractAddress;
const deadline = Date.now() + 20 * 60;
const decimals = tokenStore.getToken(walletStore.memeToken.contractAddress).decimals;
const value = (tokenNumber.value * Math.pow(10, decimals)).toString();
const value = BigInt(tokenNumber.value) * 10n ** decimals;
const nonce = await tokenStore.memeToken.contract.read.nonces([fromAddress]);
const { types, message, domain, primaryType } = createPermitObject(
fromAddress,
src/components/TokenClaim.vue
+12 -7
View File
@@ -21,22 +21,25 @@
</div> -->
<div class="rewards-list">
<rewards-wrapper
v-if="getCurrentCycleData?.rewards_sacrifice !== undefined"
title="Sacrafice Reward"
coin="$BLOOD"
:amount="formatNumber(getCurrentCycleData?.rewards_sacrifice)"
:amount="formatNumber(getCurrentCycleData?.rewards_sacrifice / 10n ** tokenStore.memeToken.decimals)"
image="/assets/img/vampir.png"
/>
<rewards-wrapper
v-if="getCurrentCycleData?.rewards_staking !== undefined"
title="Staking Bonus"
coin="$BLOOD"
:amount="formatNumber(getCurrentCycleData?.rewards_staking)"
:amount="formatNumber(getCurrentCycleData?.rewards_staking / 10n ** tokenStore.memeToken.decimals)"
info="max: 312m"
image="/assets/img/vampir.png"
/>
<rewards-wrapper
v-if="getCurrentCycleData?.rewards_clan !== undefined"
title="Clan Bonus"
coin="$BLOOD"
:amount="formatNumber(getCurrentCycleData?.rewards_clan)"
:amount="formatNumber(getCurrentCycleData?.rewards_clan / 10n ** tokenStore.memeToken.decimals)"
image="/assets/img/vampir.png"
/>
</div>
@@ -44,8 +47,9 @@
<div class="rewards-total-headline sub-header">Total Reward</div>
<div class="rewards-total-inner bloodline-border bloodline-border--variant1">
<token-name-price
v-if="getCurrentCycleData?.rewards_total !== undefined"
name="$BLOOD"
:price="formatNumber(getCurrentCycleData?.rewards_total)"
:price="formatNumber(getCurrentCycleData?.rewards_total / 10n ** tokenStore.memeToken.decimals)"
></token-name-price>
<token-logo img="/assets/img/vampir.png" :alt="'vampire'"></token-logo>
</div>
@@ -171,8 +175,9 @@ async function stakeAndClaim() {
});
//
console.log("rewardData", rewardData);
const outputClaim = Number(rewardData?.topics[2]) / Math.pow(10, tokenStore.memeToken.decimals);
const outputStaked = Number(stakeData?.topics[3]) / Math.pow(10, tokenStore.memeToken.decimals);
console.log("stakeData", stakeData);
const outputClaim = Number(rewardData?.topics[2]) / 10 ** tokenStore.memeToken.decimals;
const outputStaked = Number(stakeData?.topics[3]) / 10 ** tokenStore.memeToken.decimals;
showSuccessToast(
formatNumber(outputClaim + outputStaked),
"Success!",
@@ -220,7 +225,7 @@ async function claimRewards() {
//
console.log("rewardData", rewardData);
const outputClaim = Number(rewardData.topics[2]) / Math.pow(10, tokenStore.memeToken.decimals);
const outputClaim = BigInt(rewardData.topics[2]) / 10n ** tokenStore.memeToken.decimals;
showSuccessToast(
formatNumber(outputClaim),
"Success!",
src/components/TokenInput.vue
+3 -1
View File
@@ -62,10 +62,12 @@ const emit = defineEmits(["update:modelValue"]);
.stake-adder-step
padding: 4px 16px
color: var(--black)
font-size: 14px
font-size: 12px
border-width: 1px
border-color: transparent
border-style: solid
@media (min-width: 992px)
font-size: 14px
&:hover,&:active, &:focus
background-color: var(--grey-light)
cursor: pointer
src/components/toasts/ApprovedToast.vue
+15 -3
View File
@@ -17,13 +17,15 @@
</template>
<script setup>
import LoadingComponent from "@/components/LoadingComponent.vue";
import { getCurrentInstance, computed, watch } from "vue";
import { getCurrentInstance, computed, watch, inject } from "vue";
import { useTokenStore } from "@/stores/tokens";
import { useSacrificeStore } from "@/stores/sacrifice";
import CardComponent from "@/components/CardComponent.vue";
import { useToast } from "vue-toastification";
const emit = defineEmits(["sacrificed"]);
const props = defineProps({
value: String,
header: String,
@@ -37,6 +39,8 @@ const sacrificeStore = useSacrificeStore();
const instance = getCurrentInstance();
const id = instance.attrs["toast-id"];
const splashBlood = inject("splashBlood");
function closeToast() {
toast.dismiss(id);
}
@@ -64,8 +68,16 @@ const stateComputed = computed(() => {
});
async function sacrificeClick() {
await sacrificeStore.sacrificeToken(sacrificeStore.sacrificeNumber, tokenStore.activeToken);
closeToast();
try {
var result = await sacrificeStore.sacrificeToken(sacrificeStore.sacrificeNumber, tokenStore.activeToken);
if (result) {
emit("sacrificed");
}
} catch (error) {
console.error("error", error);
} finally {
closeToast();
}
}
</script>
<style lang="sass">
src/main.js
+2 -1
View File
@@ -193,7 +193,8 @@ try {
await tokenStore.initV2();
await rewardLockerStore.init();
await walletStore.loadWalletData();
await cycleStore.fillCycle(cycleStore.currentCycle);
// console.log("cycleStore.currentCycle", cycleStore.currentCycle);
// await cycleStore.fillCycle(cycleStore.currentCycle);
await uniswapStore.init();
} else {
walletStore.address = null;
src/stores/cycles.js
+33 -34
View File
@@ -62,7 +62,6 @@ export const useCycleStore = defineStore("cycles", {
//todo check if needed, or use fillcycle
async updateCurrentCycle(sacrificedToken) {
console.log("updateCurrentCycle");
const tokenStore = useTokenStore();
const memeBurnerStore = useMemeburnerStore();
var data = await memeBurnerStore.getSacrificedCycle(this.currentCycle);
console.log("this.currentCycle", this.currentCycle);
@@ -71,10 +70,8 @@ export const useCycleStore = defineStore("cycles", {
var tokenIndex = this.cycles[this.currentCycle].token.findIndex(
(tokenData) => tokenData.contractAddress === sacrificedToken
);
console.log("tokenIndex", tokenIndex);
const token = tokenStore.getToken(sacrificedToken);
this.cycles[this.currentCycle].token[tokenIndex].amount =
Number(data[tokenIndex].result[1]) / Math.pow(10, token.decimals);
data[tokenIndex].result[1];
}
},
@@ -83,7 +80,7 @@ export const useCycleStore = defineStore("cycles", {
* you can use the refillcycle to overwrite information, because if you claim or stake the values will change
*/
async fillCycle(cycleNumber, refillCycle = false) {
console.log("fillCycle");
console.log("fillCycle", cycleNumber);
const memeBurnerStore = useMemeburnerStore();
const tokenStore = useTokenStore();
const walletStore = useWalletStoreV2();
@@ -100,14 +97,18 @@ export const useCycleStore = defineStore("cycles", {
rewardData = await rewardLockerStore.getRewardsForAllToken(cycleNumber);
}
console.log("hier");
//getTotalSacrificeRewardsForToken multicall for all tokens
const tokenTotalSacrificed = await rewardLockerStore.getTotalSacrificeRewardsForAllToken(cycleNumber);
console.log("hier1");
var goal = await memeBurnerStore.getGoal(cycleNumber);
console.log("hier123");
var tokenArray = [];
var rewards_clan = 0;
var rewards_sacrifice = 0;
var rewards_staking = 0;
var rewards_clan = 0n;
var rewards_sacrifice = 0n;
var rewards_staking = 0n;
console.log("hier123");
for (let index = 0; index < data.length; index++) {
var tokenData = {};
const token = tokenStore.token[index];
@@ -117,47 +118,45 @@ export const useCycleStore = defineStore("cycles", {
token.contractAddress
);
console.log("coefficent", coefficent);
tokenData.name = token.name;
tokenData.contractAddress = token.contractAddress;
tokenData.vamplogo = token.vamp.logo;
tokenData.vampwinner = token.vamp.winner;
tokenData.vampwinner2 = token.vamp.winner2;
tokenData.vampname = token.vamp.name;
tokenData.amount = Number(data[index].result[1]) / Math.pow(10, token.decimals);
tokenData.amountInBLD = Number(tokenTotalSacrificed[index].result) / Math.pow(10, token.decimals);
tokenData.amount = data[index].result[1]
tokenData.amountInBLD = tokenTotalSacrificed[index].result
if (walletStore.connected) {
//if user is connected fill user specific data for the token
const sacrificeClanReward = Number(rewardData[index].result[1]);
let clanwin = 0;
const sacrificeClanReward = rewardData[index].result[1];
let clanwin = 0n;
if (cycleNumber !== this.currentCycle) {
clanwin = (Number(coefficent) / 10000 - 1) * sacrificeClanReward;
clanwin = (coefficent / 10000n - 1n) * sacrificeClanReward;
console.log("clanwin", clanwin);
}
const sacrificeRewards = Number(sacrificeClanReward);
const sacrificeRewards = sacrificeClanReward;
tokenData.rewards_ges = Number(
rewardData[index].result[1] / BigInt(Math.pow(10, token.decimals)) +
rewardData[index].result[0] / BigInt(Math.pow(10, token.decimals))
);
tokenData.rewards_ges =
rewardData[index].result[1] +
rewardData[index].result[0]
tokenData.rewards_clan = clanwin / Math.pow(10, token.decimals);
tokenData.rewards_clan = clanwin
tokenData.rewards_staking = Number(
rewardData[index].result[0] / BigInt(Math.pow(10, token.decimals))
);
tokenData.rewards_sacrifice = sacrificeRewards / Math.pow(10, token.decimals);
tokenData.rewards_staking = rewardData[index].result[0]
tokenData.rewards_sacrifice = sacrificeRewards
console.log("rewards_clan", rewards_clan);
console.log("tokenData.rewards_clan", tokenData.rewards_clan);
console.log("tokenData.rewards_sacrifice", tokenData.rewards_sacrifice);
rewards_clan = rewards_clan + tokenData.rewards_clan;
rewards_sacrifice = rewards_sacrifice + tokenData.rewards_sacrifice;
rewards_staking = rewards_staking + tokenData.rewards_staking;
}
tokenArray.push(tokenData);
}
const goalDecimal = Number(goal[0]) / Math.pow(10, tokenStore.memeToken.decimals);
const goalDecimal = goal[0]
const winner = tokenArray.find((token) => token.amount === goalDecimal);
const goalInBLD = await memeBurnerStore.getGoalInBLOOD(cycleNumber);
//replace vamplogo cause it will automatically change the token for the cycle view (new design)
@@ -165,13 +164,13 @@ export const useCycleStore = defineStore("cycles", {
winner.vamplogo = winner.vampwinner;
}
this.cycles[cycleNumber] = {
goal: Number(goal[0]) / Math.pow(10, tokenStore.memeToken.decimals),
goalInBLD: Number(goalInBLD / BigInt(Math.pow(10, tokenStore.memeToken.decimals))),
expirationTimestamp: Number(goal[2]),
rewards_clan: Number(rewards_clan),
rewards_staking: Number(rewards_staking),
rewards_sacrifice: Number(rewards_sacrifice),
rewards_total: Number(rewards_clan) + Number(rewards_sacrifice) + Number(rewards_staking),
goal: goal[0],
goalInBLD: goalInBLD,
expirationTimestamp: goal[2],
rewards_clan: rewards_clan,
rewards_staking: rewards_staking,
rewards_sacrifice: rewards_sacrifice,
rewards_total: rewards_clan + rewards_sacrifice + rewards_staking,
token: tokenArray,
connected: walletStore.connected,
winner: winner,
src/stores/memeburner.js
+5 -6
View File
@@ -40,7 +40,8 @@ export const useMemeburnerStore = defineStore("memeburner", {
async getCurrentCycle() {
return await this.contract.read.currentCycle();
},
async getGoal(cycleNumber) {
async getGoal(cycleNumber) {
console.log("hier123", cycleNumber);
return await this.contract.read.cycles([cycleNumber]);
},
//returns participated, amount achieved
@@ -79,11 +80,10 @@ export const useMemeburnerStore = defineStore("memeburner", {
return;
}
this.loading = true;
const amountDecimal = BigInt(amount * Math.pow(10, tokenStore.activeToken.decimals));
var hash = await this.contract.write.sacrificeMeme([
tokenStore.activeToken.contractAddress,
amountDecimal.toString(),
0
amount,
0,
]);
return hash;
} catch (error) {
@@ -96,10 +96,9 @@ export const useMemeburnerStore = defineStore("memeburner", {
async sacrificeMemeAndBuyBLOOD(amount) {
const tokenStore = useTokenStore();
const amountDecimal = BigInt(amount * Math.pow(10, tokenStore.activeToken.decimals));
var hash = await this.contract.write.sacrificeMemeAndBuyBLOOD([
tokenStore.activeToken.contractAddress,
amountDecimal.toString(),
amount,
0,
]);
return hash;
src/stores/rewardlocker.js
+5 -6
View File
@@ -50,9 +50,9 @@ export const useRewardLockerStore = defineStore("rewardlocker", {
functionName: "getRewards",
args: [walletStore.address, cycleNumber, token.contractAddress],
});
}
}
const data = await multicall({
contracts,
contracts,
});
return data;
},
@@ -132,7 +132,7 @@ export const useRewardLockerStore = defineStore("rewardlocker", {
const spender = this.config.contractAddress;
const deadline = Date.now() + 20 * 60;
const decimals = tokenStore.getToken(walletStore.memeToken.contractAddress).decimals;
const value = BigInt(tokenNumber * Math.pow(10, decimals));
const value = BigInt(tokenNumber) * 10n ** decimals;
const nonce = await tokenStore.memeToken.contract.read.nonces([fromAddress]);
console.log("nonce", nonce);
const { types, message, domain, primaryType } = createPermitObject(
@@ -166,13 +166,12 @@ export const useRewardLockerStore = defineStore("rewardlocker", {
return hash;
},
async stakeAndClaimAllCycles(stakeCoefficient) {
console.log("stakeAndClaimAllCycles");
console.log("stakeAndClaimAllCycles", stakeCoefficient);
const tokenStore = useTokenStore();
const cycleStore = useCycleStore();
const cycles = await cycleStore.getFinshedCycleNumbers();
const addresses = tokenStore.sacrificeToken.map((obj) => obj.contractAddress);
var stakeCoefficientInt = Math.round(stakeCoefficient);
const hash = await this.contract.write.stakeAndClaim([stakeCoefficientInt, cycles, addresses]);
const hash = await this.contract.write.stakeAndClaim([stakeCoefficient, cycles, addresses]);
return hash;
},
},
src/stores/sacrifice.js
+31 -29
View File
@@ -13,13 +13,14 @@ import { formatNumber } from "@/helper/helper.js";
export const useSacrificeStore = defineStore("sacrifice", {
state: () => ({
sacrificeNumber: null,
sacrificeNumber: 0n,
sacrificeState: 0,
}),
getters: {},
actions: {
async sacrificeToken(amount, token) {
console.log("sacrificeToken", {amount, token});
console.log("sacrificeToken", { amount, token });
const memeburnerStore = useMemeburnerStore();
const walletStore = useWalletStoreV2();
const tokenStore = useTokenStore();
@@ -60,22 +61,24 @@ export const useSacrificeStore = defineStore("sacrifice", {
);
});
console.log("rewardData", rewardData);
//output
const outputSacrifice = rewardData.reduce((x, y) => {
return x + Number(y.data) / Math.pow(10, token.decimals);
}, 0);
return x + BigInt(y.data) / 10n ** token.decimals;
}, 0n);
console.log("outputSacrifice", outputSacrifice);
// const outputSacrifice = Number(rewardData.data) / Math.pow(10, token.decimals);
token.allowance = await tokenStore.allowance();
this.sacrificeState = 4;
this.sacrificeState = 4;
showSuccessToast(
formatNumber(outputSacrifice),
"Success!",
"You turned your meme into:",
"You can claim once the current cycle is finished and your clan bonus was calculated."
);
await walletStore.loadWalletData();
);
await walletStore.loadWalletData();
console.log("cycleStore.currentCycle", cycleStore.currentCycle);
await cycleStore.fillCycle(cycleStore.currentCycle, true);
return;
return true;
} catch (error) {
//we should show the user an issue
throw new Error(error);
@@ -92,22 +95,22 @@ export const useSacrificeStore = defineStore("sacrifice", {
let output = 0;
try {
if (!value || isNaN(value)) {
try {
if (!value) {
this.sacrificeState = 0;
return output;
}
const rewardsForResult = await memeburnerStore.getRewardFor(
BigInt(value * Math.pow(10, token.decimals))
);
const rewardsForResultNumber = rewardsForResult.reduce((x, y) => {
return x + Number(y) / Math.pow(10, token.decimals);
}, 0);
var quoteRewards = await uniswapStore.quoteExactInputSingle(value * Math.pow(10, token.decimals));
let variant = "sacrifice";
const rewardsForResult = await memeburnerStore.getRewardFor(value);
console.log("rewardsForResult", rewardsForResult);
const rewardsForResultNumber = rewardsForResult.reduce((x, y) => {
return x + y
}, 0n);
var quoteRewards = await uniswapStore.quoteExactInputSingle(value);
let variant = "sacrifice";
if (quoteRewards.result) {
const quoteRewardsNumber = Number(quoteRewards.amount) / Math.pow(10, token.decimals);
if (quoteRewardsNumber * 0.995 > rewardsForResultNumber) {
const quoteRewardsNumber = quoteRewards.amount;
if ((quoteRewardsNumber * 995n) / 1000n > rewardsForResultNumber) {
variant = "buy";
console.log("use Buy-function", {
quoteRewardsNumber: quoteRewardsNumber,
@@ -128,8 +131,6 @@ export const useSacrificeStore = defineStore("sacrifice", {
output = rewardsForResultNumber;
}
console.log("variant", variant);
const amountDecimal = BigInt(value * Math.pow(10, token.decimals));
console.log("amountDecimal", amountDecimal);
if (!walletStore.connected || (walletStore.connected && token.allowance < value)) {
/**
* case 1
@@ -164,8 +165,8 @@ export const useSacrificeStore = defineStore("sacrifice", {
args: [token.contractAddress, amountDecimal.toString(), 0],
account: walletStore.address,
});
const amountBuyNumber = Number(amountBuy) / Math.pow(10, token.decimals);
const amountSacrificeNumber = Number(amountSacrifice) / Math.pow(10, token.decimals);
const amountBuyNumber = amountBuy
const amountSacrificeNumber = amountSacrifice
if (amountBuyNumber * 0.995 > amountSacrificeNumber) {
variant = "buy";
@@ -182,11 +183,12 @@ export const useSacrificeStore = defineStore("sacrifice", {
if (output > 0 && walletStore.connected) {
const stakingReward = await rewardLockerStore.getStakeRewardForSacrificeReward(
token.contractAddress,
output * Math.pow(10, token.decimals)
output
);
stakingRewardsNumber = (Number(stakingReward) / Math.pow(10, token.decimals)).toFixed(2);
}
return { output: output, variant: variant, staking: stakingRewardsNumber };
stakingRewardsNumber = stakingReward / 10n ** token.decimals
}
const outputNumber = output / 10n ** BigInt(token.decimals);
return { output: outputNumber, variant: variant, staking: stakingRewardsNumber };
} catch (error) {
console.error("getRewardsFor", error);
}
src/stores/tokens.js
+15 -17
View File
@@ -30,15 +30,15 @@ export const useTokenStore = defineStore("token", {
contractAddress: Meme1Json.contractAddress,
addSteps: [
{
amount: 10000000,
amount: 10000000000000000000000000n,
name: "10m",
},
{
amount: 100000000,
amount: 100000000000000000000000000n,
name: "100m",
},
{
amount: 1000000000,
amount: 1000000000000000000000000000n,
name: "1b",
},
],
@@ -57,17 +57,17 @@ export const useTokenStore = defineStore("token", {
contractAddress: Meme2Json.contractAddress,
addSteps: [
{
amount: 1000000,
name: "1m",
},
{
amount: 10000000,
amount: 1000000000000000000000000n,
name: "10m",
},
{
amount: 100000000,
amount: 10000000000000000000000000n,
name: "100m",
},
{
amount: 100000000000000000000000000n,
name: "1b",
},
],
},
{
@@ -84,15 +84,15 @@ export const useTokenStore = defineStore("token", {
contractAddress: Meme3Json.contractAddress,
addSteps: [
{
amount: 10000000,
amount: 10000000000000000000000000n,
name: "10m",
},
{
amount: 100000000,
amount: 100000000000000000000000000n,
name: "100m",
},
{
amount: 1000000000,
amount: 1000000000000000000000000000n,
name: "1b",
},
],
@@ -166,8 +166,8 @@ export const useTokenStore = defineStore("token", {
contracts.push({ ...token.contract, functionName: "totalSupply" });
const data = await multicall({
contracts,
});
token.decimals = data[0].result;
});
token.decimals = BigInt(data[0].result);
token.name = data[1].result;
token.symbol = data[2].result;
token.totalSupply = data[3].result;
@@ -184,9 +184,7 @@ export const useTokenStore = defineStore("token", {
walletStore.address,
memeBurnerStore.config.contractAddress,
]);
const decimals = this.activeToken.decimals;
allowance = BigInt(allowance / BigInt(Math.pow(10, decimals)));
console.log("allowance", allowance);
return allowance;
},
@@ -197,7 +195,7 @@ export const useTokenStore = defineStore("token", {
const memeBurnerStore = useMemeburnerStore();
var approveHash = await this.activeToken.contract.write.approve([
memeBurnerStore.config.contractAddress,
amount * Math.pow(10, this.activeToken.decimals),
amount,
]);
console.log("approveHash", approveHash);
src/stores/uniswap.js
+2 -1
View File
@@ -57,7 +57,8 @@ export const useUniswapStore = defineStore("uniswap", {
this.poolData.fee,
amountEthBase[0],
0, //sqrtPriceLimitX96
]);
]);
console.log("quotedAmountOut", quotedAmountOut);
return {result: true, amount: quotedAmountOut};
} catch (error) {
return { result: false, amount: null };
src/stores/walletV2.js
+3 -5
View File
@@ -101,10 +101,9 @@ export const useWalletStoreV2 = defineStore("walletV2", {
});
for (let index = 0; index < tokenStore.token.length; index++) {
const token = tokenStore.token[index];
const balanceOfDecimal = data[index].result / BigInt(Math.pow(10, token.decimals));
this.token.push({
contractAddress: token.contractAddress,
balanceOf: Number(balanceOfDecimal),
balanceOf: data[index].result
});
}
},
@@ -118,11 +117,10 @@ export const useWalletStoreV2 = defineStore("walletV2", {
await this.getTokenBalances();
//MemeToken Staked
const tokenStore = useTokenStore();
const staked = await rewardlockerStore.getStaked(this.address);
this.memeToken.staked = Number(staked) / Math.pow(10, tokenStore.memeToken.decimals);
this.memeToken.staked = await rewardlockerStore.getStaked(this.address);
const unclaimedRewardsArray = await rewardlockerStore.getTotalRewards(this.address);
const unclaimedRewards = unclaimedRewardsArray[0] + unclaimedRewardsArray[1];
this.memeToken.unclaimedRewards = Number(unclaimedRewards) / Math.pow(10, tokenStore.memeToken.decimals)
this.memeToken.unclaimedRewards = unclaimedRewards
}
},
src/views/CycleView.vue
+6 -1
View File
@@ -27,7 +27,9 @@
>
<template v-if="difference > 0">
<div class="round-finish-info-key">Sacrifice Goal:</div>
<div class="round-finish-info-value">{{ cycleStore.getCurrentCycleData?.goalInBLD }} $BDL</div>
<div class="round-finish-info-value">
{{ cycleStore.getCurrentCycleData?.goalInBLD / 10n ** tokenStore.memeToken.decimals }} $BDL
</div>
<div class="round-finish-info-key">Time left:</div>
<div class="round-finish-info-value">{{ days }} {{ hours }} {{ minutes }}</div>
</template>
@@ -88,6 +90,8 @@ import { inject, ref, onMounted, onBeforeUnmount } from "vue";
import BloodChart from "@/components/BloodChart.vue";
import TokenClaim from "@/components/TokenClaim.vue";
import { useTokenStore } from "@/stores/tokens";
import { useMemeburnerStore } from "@/stores/memeburner";
import LoadingComponent from "@/components/LoadingComponent.vue";
@@ -95,6 +99,7 @@ import { useCycleStore } from "@/stores/cycles";
import { useRewardLockerStore } from "@/stores/rewardlocker";
const cycleStore = useCycleStore();
const tokenStore = useTokenStore();
const days = ref(null);
const hours = ref(null);