init functions for the storage

.env

@@ -0,0 +1 @@
+VITE_GOERLI_KEY= "0-W9tOm6v_QP1PfRV8RuBCpWr-qoEbkN"

package.json

@@ -13,15 +13,23 @@
         "@fortawesome/free-brands-svg-icons": "^6.4.0",
         "@fortawesome/free-solid-svg-icons": "^6.4.0",
         "@fortawesome/vue-fontawesome": "^3.0.3",
+        "@walletconnect/ethereum-provider": "^2.9.0",
+        "@walletconnect/modal": "^2.6.0",
+        "@walletconnect/web3-provider": "^1.8.0",
+        "@web3modal/html": "^2.7.0",
+        "abi-decoder": "^2.4.0",
+        "ethers": "^6.6.3",
         "pinia": "^2.0.36",
         "pinia-plugin-persistedstate": "^3.1.0",
         "sass": "^1.62.1",
         "swiper": "^9.4.1",
         "vue": "^3.3.2",
         "vue-router": "^4.2.0",
-        "web3": "^1.7.1"
+        "web3": "^v1.9.0"
     },
     "devDependencies": {
+        "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
+        "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
         "@vitejs/plugin-vue": "^4.2.3",
         "eslint": "^8.39.0",
         "eslint-plugin-vue": "^9.11.0",

src/App.vue

@@ -2,7 +2,6 @@
 import { onMounted, onUnmounted, provide, ref } from "vue";
 import { storeToRefs } from "pinia";
 
-import Web3 from "web3";
 import Navbar from "./components/Navbar.vue";
 import { useWalletStore } from "@/stores/wallet";
 const walletStore = useWalletStore();
@@ -22,7 +21,6 @@ const { memeBurner, token } = storeToRefs(tokenStore);
 const { list } = storeToRefs(contractStore);
 const isMobile = ref(false);
 isMobile.value = isMobileFunc();
-let subscription;
 onUnmounted(() => {
 	window.removeEventListener("resize", handleWindowSizeChange);
 });
@@ -43,105 +41,21 @@ provide("isMobile", isMobile);
 onMounted(async () => {
 	window.addEventListener("resize", handleWindowSizeChange);
 	handleWindowSizeChange();
-	//more or less tests
-	var test = await walletStore.isConnected();
-	console.log("test", test);
-
-	let web3 = new Web3("https://eth-goerli.g.alchemy.com/v2/0-W9tOm6v_QP1PfRV8RuBCpWr-qoEbkN");
-	let web3socket = new Web3(
-		new Web3.providers.WebsocketProvider("wss://eth-goerli.g.alchemy.com/v2/0-W9tOm6v_QP1PfRV8RuBCpWr-qoEbkN")
-	);
-	console.log("web3socket", web3socket);
-
-	//init
-
-	walletStore.web3 = web3;
-	// const contract = new web3.eth.Contract(memeBurner.value.config.abi, memeBurner.value.config.contractAddress);
-	list.value.memeBurnerPublic = new web3.eth.Contract(
-		memeBurner.value.config.abi,
-		memeBurner.value.config.contractAddress
-	);
 
+	// initContracts
+	await walletStore.init();
+	await tokenStore.init();
+	await memeBurnerStore.init();
+	await rewardLockerStore.init();
+	await memeBurnerStore.init();
+	await multiCallStore.init();
 	//Memeburner Contract
 
-	// var testabc = await memeBurnerStore.contract.methods
-	// 	.getSacrificedMeme(1, "0x4435ABC578136e2Eca50b5EFf950F17CAF42485b")
-	// 	.call();
-	// console.log("testabc", testabc);
-
-	// var data = await memeBurnerStore.getSacrificedRound(1);
-	// console.log("data", data);
-	// console.log("blub1", blub1);
-	// console.log("blub2", blub2);
-	// console.log("getSacrificedMeme", getSacrificedMeme1.amountAchieved);
-	// console.log("getGoal", getGoal);
-	// console.log("memeBurnerStore.contract", memeBurnerStore.contract);
-	// console.log("list", list.value);
-	// const rounds = await contract.methods.rounds("0x0e349D42C125acA39ea58024FFC23ED0fE5feE32").call();
-	// console.log("rounds", rounds);
-
-	// var claim = await rewardLockerStore.getTotalRewardsOf("0x60dd9D0e015115b9aEf61bEDCcBE1390CEEfC247", [1]);
-	// console.log("claim", claim);
-
-	// var lastCompletedRound = await rewardLockerStore.lastCompletedRound();
-	// console.log("lastCompletedRound", lastCompletedRound);
-	// var getwards = await rewardLockerStore.getRewards(
-	// 	"0x60dd9D0e015115b9aEf61bEDCcBE1390CEEfC247",
-	// 	1,
-	// 	"0x4435ABC578136e2Eca50b5EFf950F17CAF42485b"
-	// );
-	// console.log("getwards", getwards);
-
-	//contracts
-	rewardLockerStore.contract = new web3.eth.Contract(
-		rewardLockerStore.config.abi,
-		rewardLockerStore.config.contractAddress
-	);
-	memeBurnerStore.contract = new web3.eth.Contract(
-		memeBurnerStore.config.abi,
-		memeBurnerStore.config.contractAddress
-	);
-	tokenStore.memeToken.contract = new web3.eth.Contract(
-		tokenStore.memeToken.config.abi,
-		tokenStore.memeToken.config.contractAddress
-	);
-	const websocketMemeBurner = new web3socket.eth.Contract(
-		memeBurnerStore.config.abi,
-		memeBurnerStore.config.contractAddress
-	);
-	multiCallStore.contract = new web3.eth.Contract(multiCallStore.config.abi, multiCallStore.config.contractAddress);
-
 	//init
 	roundsStore.currentRound = parseInt(await memeBurnerStore.getCurrentRound());
 	console.log("roundsStore.currentRound", roundsStore.currentRound);
 	roundsStore.activeRound = roundsStore.currentRound;
 	await roundsStore.fillRound(roundsStore.activeRound);
-
-	tokenStore.memeToken.decimals = parseInt(await tokenStore.memeToken.contract.methods.decimals().call());
-	for (let index = 0; index < token.value.length; index++) {
-		const _token = token.value[index];
-		_token.contract = new web3.eth.Contract(_token.abi, _token.contractAddress);
-		_token.decimals = parseInt(await _token.contract.methods.decimals().call());
-	}
-
-	console.log("token123", token.value);
-
-	//events
-	// var bleb = roundsStore.rounds[roundsStore.currentRound].find(
-	// 	(obj) => obj.contractAddress === "0x4435ABC578136e2Eca50b5EFf950F17CAF42485b"
-	// );
-	// console.log("roundsStore.rounds[roundsStore.currentRound]", bleb);
-	websocketMemeBurner.events
-		.MemeSacrificed()
-		.on("data", async (event) => {
-			console.log("sacrificedAmount", event.returnValues.sacrificedAmount);
-			console.log("sacrificedToken", event.returnValues.sacrificedToken);
-			await roundsStore.updateCurrentRound(
-				event.returnValues.sacrificedToken,
-				event.returnValues.sacrificedAmount
-			);
-		})
-		.on("error", (error) => console.log("MemeSacrificederror", error));
 });
 </script>
 

src/assets/contracts/LiquidityOwner.json

@@ -1,6 +1,6 @@
 {
   "contractName": "LiquidityOwner",
-  "contractAddress": "0x2Cdea6EA15303b1744F05f62E6921479D31AcBC9",
+  "contractAddress": "0xa162bb56eD85f1BEb6f9AdB1DFFecBa01eA51d50",
   "abi": [
     {
       "inputs": [
@@ -38,6 +38,65 @@
       "stateMutability": "payable",
       "type": "constructor"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "int24",
+          "name": "tickLower",
+          "type": "int24"
+        },
+        {
+          "internalType": "int24",
+          "name": "tickUpper",
+          "type": "int24"
+        }
+      ],
+      "name": "_concatenateTicks",
+      "outputs": [
+        {
+          "internalType": "int48",
+          "name": "",
+          "type": "int48"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "components": [
+            {
+              "internalType": "int24",
+              "name": "tickLower",
+              "type": "int24"
+            },
+            {
+              "internalType": "int24",
+              "name": "tickUpper",
+              "type": "int24"
+            },
+            {
+              "internalType": "uint128",
+              "name": "liquidity",
+              "type": "uint128"
+            },
+            {
+              "internalType": "uint80",
+              "name": "tokenId",
+              "type": "uint80"
+            }
+          ],
+          "internalType": "struct LiquidityOwner.Position",
+          "name": "position",
+          "type": "tuple"
+        }
+      ],
+      "name": "addETHPositionToLinkedList",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -66,6 +125,32 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "int48",
+          "name": "",
+          "type": "int48"
+        }
+      ],
+      "name": "allRangesLinkedList",
+      "outputs": [
+        {
+          "internalType": "int48",
+          "name": "",
+          "type": "int48"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "burn",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "chunk",
@@ -280,11 +365,6 @@
       ],
       "name": "positions",
       "outputs": [
-        {
-          "internalType": "uint128",
-          "name": "liquidity",
-          "type": "uint128"
-        },
         {
           "internalType": "int24",
           "name": "tickLower",
@@ -294,6 +374,16 @@
           "internalType": "int24",
           "name": "tickUpper",
           "type": "int24"
+        },
+        {
+          "internalType": "uint128",
+          "name": "liquidity",
+          "type": "uint128"
+        },
+        {
+          "internalType": "uint80",
+          "name": "tokenId",
+          "type": "uint80"
         }
       ],
       "stateMutability": "view",
@@ -308,7 +398,26 @@
         }
       ],
       "name": "provideLiquidity",
-      "outputs": [],
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "ethSpentOnGas",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "rebalance",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "tokenId",
+          "type": "uint256"
+        }
+      ],
       "stateMutability": "nonpayable",
       "type": "function"
     },
@@ -380,6 +489,13 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "withdrawETH",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "stateMutability": "payable",
       "type": "receive"

src/assets/contracts/MemeBurner.json

@@ -1,6 +1,6 @@
 {
   "contractName": "MemeBurner",
-  "contractAddress": "0x35640264BA900f4AF2b9e3743EA0578eCcF181bE",
+  "contractAddress": "0xf6e6ffAb831eCC42aBDD1c068DC83b89b9CF8386",
   "abi": [
     {
       "inputs": [
@@ -24,6 +24,11 @@
           "name": "_developer",
           "type": "address"
         },
+        {
+          "internalType": "address",
+          "name": "_admin",
+          "type": "address"
+        },
         {
           "internalType": "address",
           "name": "_rewardLocker",
@@ -63,6 +68,11 @@
       "name": "LiquidityOwnerAlreadyInitialized",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "MemeIsNotInAList",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "NothingToSacrifice",
@@ -73,17 +83,6 @@
       "name": "TokenIsNotInSacrificableList",
       "type": "error"
     },
-    {
-      "inputs": [
-        {
-          "internalType": "address",
-          "name": "memeToTransfer",
-          "type": "address"
-        }
-      ],
-      "name": "TokenTransferFailed",
-      "type": "error"
-    },
     {
       "inputs": [
         {
@@ -99,26 +98,44 @@
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
+          "indexed": true,
+          "internalType": "uint256",
+          "name": "roundNumber",
+          "type": "uint256"
+        },
+        {
+          "indexed": true,
           "internalType": "address",
           "name": "meme",
           "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "memeMarket",
+          "type": "address"
         }
       ],
-      "name": "MemeAddedToSacrificeList",
+      "name": "MemeAddedToSacrificableList",
       "type": "event"
     },
     {
       "anonymous": false,
       "inputs": [
         {
-          "indexed": false,
+          "indexed": true,
+          "internalType": "uint256",
+          "name": "roundNumber",
+          "type": "uint256"
+        },
+        {
+          "indexed": true,
           "internalType": "address",
           "name": "meme",
           "type": "address"
         }
       ],
-      "name": "MemeRemovedFromSacrificeList",
+      "name": "MemeRemovedFromSacrificableList",
       "type": "event"
     },
     {
@@ -146,6 +163,32 @@
       "name": "MemeSacrificed",
       "type": "event"
     },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "newAdmin",
+          "type": "address"
+        }
+      ],
+      "name": "NewAdmin",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "uint256",
+          "name": "newDefaultGoal",
+          "type": "uint256"
+        }
+      ],
+      "name": "NewDefaultRoundGoal",
+      "type": "event"
+    },
     {
       "inputs": [
         {
@@ -160,10 +203,48 @@
         }
       ],
       "name": "addMemeToList",
-      "outputs": [],
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "newDefaultGoal",
+          "type": "uint256"
+        }
+      ],
+      "name": "adjustDefaultGoal",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "admin",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "currentRound",
@@ -177,6 +258,38 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "defaultGoal",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "memeToSacrifice",
+          "type": "address"
+        }
+      ],
+      "name": "getAmountToReachGoal",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -303,7 +416,13 @@
         }
       ],
       "name": "removeMemeFromList",
-      "outputs": [],
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
       "stateMutability": "nonpayable",
       "type": "function"
     },
@@ -376,6 +495,25 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "newAdmin",
+          "type": "address"
+        }
+      ],
+      "name": "switchAdmin",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "weth",

src/assets/contracts/MemeToken.json

@@ -1,6 +1,6 @@
 {
   "contractName": "MemeToken",
-  "contractAddress": "0x7D3e23Efa01745709b2123C4D17bcab86cBc55D1",
+  "contractAddress": "0x2052cCA2b50f5F609a450f2C055E53e969E56587",
   "abi": [
     {
       "inputs": [

src/assets/contracts/RewardLocker.json

@@ -1,6 +1,6 @@
 {
   "contractName": "RewardLocker",
-  "contractAddress": "0x061ff0C800aBc1F3C42f696BeB73C70c6929863a",
+  "contractAddress": "0xb2f281CDa06E17Eefc4cf0A485C43a8310012d8B",
   "abi": [
     {
       "inputs": [
@@ -487,6 +487,35 @@
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "user",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "_sacrificedToken",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "reward",
+          "type": "uint256"
+        }
+      ],
+      "name": "registerRewardNextRound",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
     {
       "inputs": [
         {

src/components/BloodChart.vue

@@ -55,6 +55,10 @@
 
 <script setup>
 import { getPercentage, compactNumber } from "@/helper/helper.js";
+import { useMemeburnerStore } from "@/stores/memeburner";
+
+const memeBurnerStore = useMemeburnerStore();
+
 const props = defineProps({
 	data: Array,
 });
@@ -119,7 +123,7 @@ function getImageUrl(url) {
                     font-size: 24px
         .blood-chart-element-body
             background-color: rgba(233, 233, 233, 0.2)
-            flex: 1 1 auto
+            flex: 0 0 500px
             border-radius: 8px 8px 40px 40px
             text-align: left
             .blood-chart-bar-wrapper
@@ -134,7 +138,6 @@ function getImageUrl(url) {
                     .blood-chart-bar-percentage
                         font-size: 14px
                         text-align: center
-                        margin-top: 16px
                     .waves
                         position: absolute
                         top: -10px

src/components/RewardsWrapper.vue

@@ -9,7 +9,7 @@
 		<div class="rewards-sacrifice-wrapper bloodline-border bloodline-border--variant1">
 			<div class="rewards-body">
 				<div class="rewards-coin">$BLOOD</div>
-				<div class="rewards-amount">0</div>
+				<div class="rewards-amount">{{ props.amount }}</div>
 			</div>
 			<img class="bloodline-token" :src="props.image" alt="vampir" />
 		</div>
@@ -20,6 +20,7 @@
 const props = defineProps({
 	title: String,
 	info: String,
+	amount: String,
 	image: String,
 });
 </script>

src/components/SacrificeToken.vue

@@ -70,7 +70,7 @@
 						<div
 							class="btn btn-immortal"
 							v-if="activeToken.allowance > 0 && activeToken.allowance >= tokenNumber"
-							@click="approvalData = tokenStore.sacrificeToken(tokenNumber)"
+							@click="approvalData = memeburnerStore.sacrificeMeme(tokenNumber)"
 						>
 							<font-awesome-icon v-if="loading" icon="spinner" spin />
 							Sacrifce {{ activeToken.name }}
@@ -97,6 +97,7 @@
 import { ref, defineProps, watch, inject } from "vue";
 import { useWalletStore } from "@/stores/wallet";
 import { useTokenStore } from "@/stores/tokens";
+import { useMemeburnerStore } from "@/stores/memeBurner";
 import { storeToRefs } from "pinia";
 import Helper from "@/utils/helper.js";
 const isMobile = inject("isMobile");
@@ -107,6 +108,8 @@ const { contract, connected } = storeToRefs(walletStore);
 const tokenStore = useTokenStore();
 const { activeToken, loading } = storeToRefs(tokenStore);
 
+const memeburnerStore = useMemeburnerStore();
+
 const props = defineProps({
 	data: Array,
 });
@@ -130,16 +133,22 @@ async function getRewardsFor(e) {
 		output.value = 0;
 		return;
 	}
-	console.log("e.target.value * 18", e.target.value * Math.pow(10, 18));
+	console.log("activeToken.value.decimals", activeToken.value.decimals);
-	const rewardsForResult = await tokenStore.getRewardsFor(
+	const rewardsForResult = await memeburnerStore.getRewardsFor(
 		BigInt(e.target.value * Math.pow(10, activeToken.value.decimals))
 	);
+	// var test = await memeburnerStore.getRewardsFor(10000);
+	// console.log("test", test);
+	// const rewardsForResult = await tokenStore.getRewardsFor(10000);
+	console.log("rewardsForResult", rewardsForResult);
+	console.log("tokenStore.memeToken.decimals", tokenStore.memeToken.decimals);
+	console.log("Math.pow(10, tokenStore.memeToken.decimals)", Math.pow(10, tokenStore.memeToken.decimals));
 	output.value = rewardsForResult / Math.pow(10, tokenStore.memeToken.decimals);
 }
 
 async function addTokens(value) {
 	tokenNumber.value = tokenNumber.value + value;
-	output.value = await tokenStore.getRewardsFor(parseInt(tokenNumber.value));
+	output.value = await memeburnerStore.getRewardsFor(parseInt(tokenNumber.value));
 }
 </script>
 

src/components/TokenClaim.vue

@@ -1,11 +1,21 @@
 <template>
 	<div class="claim bloodline-border">
 		<div class="rewards-wrapper" v-if="!isMobile">
-			<rewards-wrapper title="Sacrafice Reward" coin="$BLOOD" amount="0" image="/src/assets/img/vampir.png" />
+			<rewards-wrapper
+				title="Sacrafice Reward"
+				coin="$BLOOD"
+				:amount="getCurrentRoundData?.rewards_sacrifice"
+				image="/src/assets/img/vampir.png"
+			/>
 			<div class="rewards-divider bloodline-devider">
 				<font-awesome-icon icon="fa-solid fa-plus" />
 			</div>
-			<rewards-wrapper title="Clan Reward" coin="$BLOOD" amount="0" image="/src/assets/img/vampir.png" />
+			<rewards-wrapper
+				title="Clan Reward"
+				coin="$BLOOD"
+				:amount="getCurrentRoundData?.rewards_clan"
+				image="/src/assets/img/vampir.png"
+			/>
 		</div>
 		<div class="rewards-list" v-else>
 			<rewards-wrapper
@@ -37,7 +47,7 @@ import { inject, ref, onMounted } from "vue";
 import { useRewardLockerStore } from "@/stores/rewardlocker";
 import { useWalletStore } from "@/stores/wallet";
 import { useRoundsStore } from "@/stores/rounds";
-
+const clanRewards = ref(0);
 const rewards = ref(0);
 const isMobile = inject("isMobile");
 const rewardLockerStore = useRewardLockerStore();
@@ -48,8 +58,11 @@ const { activeRound, getCurrentRoundData } = storeToRefs(roundStore);
 
 onMounted(async () => {});
 
-function claimRewards() {
+async function claimRewards() {
-	//todo
+	console.log("getCurrentRoundData", getCurrentRoundData);
+	console.log("activeRound.value", activeRound.value);
+	var result = await rewardLockerStore.claim([activeRound.value]);
+	console.log("result", result);
 }
 </script>
 

src/stores/memeburner.js

@@ -2,14 +2,48 @@ import { defineStore } from "pinia";
 import MemeBurnerJson from "@/assets/contracts/MemeBurner.json";
 import { useTokenStore } from "./tokens";
 import { useMultiCallStore } from "./multicall";
+import { useWalletStore } from "./wallet";
+import { useRoundsStore } from "@/stores/rounds";
 
 export const useMemeburnerStore = defineStore("memeburner", {
 	state: () => ({
 		config: MemeBurnerJson,
 		contract: null,
+        
 	}),
 	getters: {},
 	actions: {
+		async init() {
+			console.log("-----------init memeburner-------------");
+            const walletStore = useWalletStore();
+            const roundsStore = useRoundsStore();
+            
+            this.contract = new walletStore.web3.eth.Contract(this.config.abi, this.config.contractAddress);
+            
+
+            const websocketMemeBurner = new walletStore.web3socket.eth.Contract(
+				this.config.abi,
+				this.config.contractAddress
+			);
+			websocketMemeBurner.events
+				.MemeSacrificed()
+				.on("data", async (event) => {
+					console.log("sacrificedAmount", event.returnValues.sacrificedAmount);
+					console.log("sacrificedToken", event.returnValues.sacrificedToken);
+					await roundsStore.updateCurrentRound(
+						event.returnValues.sacrificedToken,
+						event.returnValues.sacrificedAmount
+					);
+				})
+				.on("error", (error) => console.log("MemeSacrificederror", error));
+		},
+		async getRewardsFor(amount) {
+			const tokenStore = useTokenStore();
+			var rewards = await this.contract.methods
+				.getRewardFor(tokenStore.activeToken.contractAddress, amount)
+				.call();
+			return rewards;
+		},
 		async getCurrentRound() {
 			return await this.contract.methods.currentRound().call();
 		},
@@ -19,18 +53,49 @@ export const useMemeburnerStore = defineStore("memeburner", {
 		//returns participated, amount achieved
 		async getSacrificedMeme(roundnumber, tokenAddress) {
 			return await this.contract.methods.getSacrificedMeme(roundnumber, tokenAddress).call();
+        },
+        async getAmountToReachGoal(tokenAddress) {
+            return await this.contract.methods.getAmountToReachGoal(tokenAddress).call();
         },
 		async getSacrificedRound(roundnumber) {
 			console.log("getSacrificedRound", roundnumber);
 			const tokenStore = useTokenStore();
 			const calls = [];
+			// const calls1 = [];
 			for (let index = 0; index < tokenStore.token.length; index++) {
 				const token = tokenStore.token[index];
+				console.log("token.contractAddress", token.contractAddress);
+				console.log("roundnumber", roundnumber);
+				var test = await this.getSacrificedMeme(roundnumber, token.contractAddress);
+                console.log("test", test);
                 calls.push(this.contract.methods.getSacrificedMeme(roundnumber, token.contractAddress));
+                // calls1.push(this.contract.methods.getAmountToReachGoal(token.contractAddress));
 			}
+			console.log("this.contract", this.contract);
 			const multicallStore = useMultiCallStore();
 			return await multicallStore.aggregate(calls);
-
+		},
+		async sacrificeMeme(amount) {
+			const walletStore = useWalletStore();
+			const tokenStore = useTokenStore();
+			try {
+				if (!amount || amount == 0) {
+					//todo error
+					console.error("amount is 0 or null or undefined");
+					return;
+				}
+				this.loading = true;
+				const amountDecimal = BigInt(amount * Math.pow(10, tokenStore.activeToken.decimals));
+				var reward = await this.contract.methods
+					.sacrificeMeme(tokenStore.activeToken.contractAddress, amountDecimal)
+					.send({ from: walletStore.address });
+				console.log("reward", reward);
+				tokenStore.activeToken.allowance = await this.allowance();
+			} catch (error) {
+				console.error(error);
+			} finally {
+				this.loading = false;
+			}
 		},
 	},
 });

src/stores/multicall.js

@@ -10,6 +10,15 @@ export const useMultiCallStore = defineStore("multicall", {
     }),
     getters: {},
     actions: {
+        async init() {
+			console.log("-----------init multicall-------------");
+			const walletStore = useWalletStore();
+
+            this.contract = new walletStore.web3.eth.Contract(
+                this.config.abi,
+                this.config.contractAddress
+            );
+        },
         async aggregate(calls, parameters = {}) {
             const callRequests = calls.map((call) => {
 				const callData = call.encodeABI();

src/stores/rewardlocker.js

@@ -3,14 +3,21 @@ import RewardLockerJson from "@/assets/contracts/RewardLocker.json";
 import { useTokenStore } from "./tokens";
 import { useMultiCallStore } from "./multicall";
 import { useWalletStore } from "./wallet";
+import { ethers } from "ethers";
 
 export const useRewardLockerStore = defineStore("rewardlocker", {
 	state: () => ({
 		config: RewardLockerJson,
 		contract: null,
+		ethcontract: null,
 	}),
 	getters: {},
 	actions: {
+		async init() {
+            console.log("-----------init rewardlocker-------------");
+            const walletStore = useWalletStore();
+            this.contract = new walletStore.web3.eth.Contract(this.config.abi, this.config.contractAddress);
+		},
 		/*
 		 * @param {*} walletAddress
 		 * @param {*} roundNumber
@@ -27,16 +34,24 @@ export const useRewardLockerStore = defineStore("rewardlocker", {
 			const calls = [];
 			for (let index = 0; index < tokenStore.token.length; index++) {
                 const token = tokenStore.token[index];
+                var test = this.contract.methods.rewards(walletStore.address, roundNumber, token.contractAddress);
+                console.log("test123", test);
 				calls.push(this.contract.methods.rewards(walletStore.address, roundNumber, token.contractAddress));
 			}
 			const multicallStore = useMultiCallStore();
 			return await multicallStore.aggregate(calls);
 		},
+		async getSacrificedTokenCoefficient(roundNumber, sacrificedToken) {
+			return await this.contract.methods.getSacrificedTokenCoefficient(roundNumber, sacrificedToken).call();
+		},
 		async lastCompletedRound() {
 			return await this.contract.methods.lastCompletedRound().call();
 		},
         async claim(round) {
-			return await this.contract.methods.claim(round).call();
+			const walletStore = useWalletStore();
+			// return await this.contract.methods.claim(round).call();
+            console.log(this.contract.methods.claim(round));
+            return await this.contract.methods.claim(round).send({from: walletStore.address, to: this.contractAddress});
 		},
 		async getTotalRewardsOf(address, rounds) {
 			return await this.contract.methods.getTotalRewardsOf(address, rounds).call();

src/stores/rounds.js

@@ -17,12 +17,17 @@ export const useRoundsStore = defineStore("rounds", {
         }
     },
     actions: {
+        async init() {
+            //fill initial round
+        },
         async updateCurrentRound(sacrificedToken, sacrificedAmount) {
             const tokenStore = useTokenStore();
             const memeBurnerStore = useMemeburnerStore();
             var data = await memeBurnerStore.getSacrificedRound(this.currentRound)
+            console.log("data123", data);
             var tokenIndex = this.rounds[this.currentRound].token.findIndex((tokenData) => tokenData.contractAddress === sacrificedToken);
             this.rounds[this.currentRound].token[tokenIndex].amount = data[tokenIndex][1];
+
         },
         async fillRound() {
             console.log("fillRound");
@@ -35,26 +40,59 @@ export const useRoundsStore = defineStore("rounds", {
             // } else
                 if (!this.rounds[this.activeRound]) {
                     console.log("round not filled --> fill round");
+                    console.log("vor error");
                     var data = await memeBurnerStore.getSacrificedRound(this.activeRound)
                 var rewardData = await rewardLockerStore.getRewardsForAllToken(this.activeRound);
                     var goal = await memeBurnerStore.getGoal(this.activeRound);
-                console.log("data", data);
+                    console.log("goal", goal);
+                    console.log("this.activeRound", this.activeRound);
+                console.log("dataabc", data);
+                console.log("rewardData", rewardData);
+                console.log("pepecoin-rewards", rewardData[0]);
+                
                 var tokenArray = []
+                var rewards_clan = BigInt(0);
+                var rewards_sacrifice = BigInt(0);
                 for (let index = 0; index < data.length; index++) {
                     var tokenData = {};
                     const token = tokenStore.token[index];
+                    console.log("testabcv", token);
+                    console.log("123abc", token.contractAddress);
+                    var testcoef = await rewardLockerStore.getSacrificedTokenCoefficient(this.activeRound, token.contractAddress);
+                    console.log("testcoef",);
+                    console.log(`rewards ${token.name}`, BigInt(rewardData[index]));
+                    console.log(`clanwin multiplier ${token.name}`, (testcoef / 10000));
+                    const clanwin = BigInt((testcoef / 10000 -1) * rewardData[index]);
+                    console.log(`clanwin ${token.name}`, clanwin);
+                    const sacrificeRewards = BigInt(rewardData[index]) - clanwin;
+                    console.log(`sacrifice rewards`, sacrificeRewards);
                     console.log("token", token);
                     tokenData.name = token.name;
                     tokenData.contractAddress = token.contractAddress;
                     tokenData.vamplogo = token.vamp.logo;
                     tokenData.vampname = token.vamp.name;
                     tokenData.amount = data[index][1];
-                    tokenData.rewards = rewardData[index]
+                    tokenData.getAmountToReachGoal= await memeBurnerStore.getAmountToReachGoal(token.contractAddress);
+                    tokenData.rewards_ges = rewardData[index];
+                    if (this.currentRound !== this.activeRound) {
+                        tokenData.rewards_clan = clanwin;
+                        console.log("clanwin", clanwin);
+                        tokenData.rewards_sacrifice = sacrificeRewards;
+                        rewards_clan = rewards_clan + BigInt(clanwin / BigInt(Math.pow(10, token.decimals)));
+                        rewards_sacrifice =
+                            rewards_sacrifice + BigInt(sacrificeRewards / BigInt(Math.pow(10, token.decimals)));;
+                    }
                     tokenArray.push(tokenData);
                 }
+
+                console.log("Math.pow(10, tokenStore.memeToken.decimals)", Math.pow(10, tokenStore.memeToken.decimals));
+                console.log("goal", goal);
                 this.rounds[this.activeRound] = {
-                        goal: goal, token: tokenArray
+                    goal: goal,
-                    }
+                    rewards_clan: rewards_clan,
+                    rewards_sacrifice: rewards_sacrifice,
+                    token: tokenArray,
+                };
             } else {
                 console.log("round already filled");
             }

src/stores/tokens.js

@@ -1,7 +1,10 @@
 import { defineStore } from "pinia";
+import { markRaw } from "vue";
 import Web3 from "web3";
 import { useWalletStore } from "./wallet";
 import { useContractStore } from "./contracts";
+import { ethers } from "ethers";
+import { useMemeburnerStore } from "./memeburner";
 import Meme1Json from "@/assets/contracts/Meme1.json";
 import Meme2Json from "@/assets/contracts/Meme2.json";
 import MemeToken from "@/assets/contracts/MemeToken.json";
@@ -21,6 +24,7 @@ export const useTokenStore = defineStore("token", {
 				backgroundColor: "#4b8501",
 				abi: Meme1Json.abi,
 				contractAddress: Meme1Json.contractAddress,
+                ethcontract: null,
 			},
 			{
 				name: "$SHIB",
@@ -56,16 +60,28 @@ export const useTokenStore = defineStore("token", {
 		memeToken: {
 			config: {
 				abi: MemeToken.abi,
-                contractAddress: MemeToken.contractAddress
+				contractAddress: MemeToken.contractAddress,
-            }
 			},
-		memeBurner: {
-			config: MemeBurnerJson,
-			contract: null,
 		},
 	}),
 	getters: {},
 	actions: {
+		async init() {
+			console.log("-----------init token-------------");
+			const walletStore = useWalletStore();
+			for (let index = 0; index < this.token.length; index++) {
+				const token = this.token[index];
+				token.contract = new walletStore.web3.eth.Contract(token.abi, token.contractAddress);
+				token.decimals = parseInt(await token.contract.methods.decimals().call());
+            }
+            
+            //MemeToken init
+            this.memeToken.contract = new walletStore.web3.eth.Contract(
+                this.memeToken.config.abi,
+                this.memeToken.config.contractAddress
+            );
+            this.memeToken.decimals = parseInt(await this.memeToken.contract.methods.decimals().call());
+		},
 		async changeActiveToken(token) {
 			this.activeToken = token;
 			const web3 = new Web3(window.ethereum);
@@ -77,28 +93,29 @@ export const useTokenStore = defineStore("token", {
 			}
 		},
 		async allowance() {
+			console.log("allowance");
 			const walletStore = useWalletStore();
-			console.log("walletStore.address", walletStore.address);
+			const memeBurnerStore = useMemeburnerStore();
-			const allowance = await this.contract.methods
+			var allowance = await this.contract.methods
-				.allowance(walletStore.address, MemeBurnerJson.contractAddress)
+				.allowance(walletStore.address, memeBurnerStore.config.contractAddress)
 				.call();
-			console.log("allowance", allowance);
 			var decimals = await this.contract.methods.decimals().call();
 			console.log("decimals", decimals);
+			console.log("Math.pow(10, decimals)", Math.pow(10, decimals));
+			allowance = BigInt(allowance / Math.pow(10, decimals));
 			return allowance;
 		},
 		async approveToken(amount) {
 			try {
-				console.log("amount", amount);
 				this.loading = true;
 				const walletStore = useWalletStore();
+				const memeBurnerStore = useMemeburnerStore();
 				var approve = await this.contract.methods
-					.approve(this.memeBurner.config.contractAddress, amount)
+					.approve(memeBurnerStore.config.contractAddress, amount)
 					.send({ from: walletStore.address });
 				//todo parameter value übergeben in eth web3.utils.toHex(web3.utils.toWei(amount, 'ether'))
 
 				// .send({ from: walletStore.address, value: 0.5 });
-				console.log("approve", approve);
 				this.activeToken.allowance = await this.allowance();
 				return approve;
 			} catch (error) {
@@ -107,42 +124,10 @@ export const useTokenStore = defineStore("token", {
 				this.loading = false;
 			}
 		},
-		async sacrificeToken(amount) {
-			try {
-				console.log("amount", amount);
-				if (!amount || amount == 0) {
-					//todo error
-					console.error("amount is 0 or null or undefined");
-					return;
-				}
-				this.loading = true;
-				console.log("this.activeToken.", this.activeToken.contractAddress);
-				const walletStore = useWalletStore();
-				console.log("walletStore.address", walletStore.address);
-				var reward = await this.memeBurner.contract.methods
-					.sacrificeMeme(this.activeToken.contractAddress, amount)
-					.send({ from: walletStore.address });
-				console.log("reward", reward);
-				this.activeToken.allowance = await this.allowance();
-			} catch (error) {
-				console.error(error);
-			} finally {
-				this.loading = false;
-			}
-		},
-		async getRewardsFor(amount) {
-			const contractsStore = useContractStore();
-			var rewards = await contractsStore.list.memeBurnerPublic.methods
-				.getRewardFor(this.activeToken.contractAddress, amount)
-				.call();
-			return rewards;
-		},
 		getTokenContract(token) {
 			console.log("token", token);
 			const contractAddress = token.contractAddress;
-			console.log("contractAddress", contractAddress);
 			const activeToken = this.token.find((obj) => obj.contractAddress === contractAddress);
-			console.log("activeToken", activeToken);
 			const web3 = new Web3(window.ethereum);
 			const contract = new web3.eth.Contract(activeToken.abi, contractAddress);
 			return contract;

src/stores/wallet.js

@@ -1,4 +1,5 @@
 import { defineStore } from "pinia";
+import { markRaw } from "vue";
 import { useTokenStore } from "./tokens";
 import Web3 from "web3";
 export const useWalletStore = defineStore("wallet", {
@@ -7,32 +8,41 @@ export const useWalletStore = defineStore("wallet", {
 		alchemy: null,
 		connected: false,
         address: null,
-        web3: null
+        web3: null,
+        provider: null
 	}),
 	getters: {
 	},
     actions: {
+        async init() {
+			const goerliKey = import.meta.env.VITE_GOERLI_KEY;
+			if (this.connected) {
+				const web3 = new Web3(window.ethereum);
+				this.web3 = markRaw(web3);
+				// provider = new ethers.BrowserProvider(window.ethereum);
+			} else {
+				const url = `https://eth-goerli.g.alchemy.com/v2/${goerliKey}`;
+				this.web3 = new Web3(url);
+				// provider = new ethers.AlchemyProvider("goerli", goerliKey);
+			}
+
+            //Websocket
+			this.web3socket = new Web3(
+				new Web3.providers.WebsocketProvider(`wss://eth-goerli.g.alchemy.com/v2/${goerliKey}`)
+			);
+		},
 		increment() {
 			this.count++;
 		},
 		connectWallet() {
-			console.log("window.ethereum", window.ethereum);
+            const tokenStore = useTokenStore();
 			// if (window.ethereum) {
 			window.ethereum
 				.request({ method: "eth_requestAccounts" })
 				.then((data) => {
                     console.log("data", data);
-                    this.isConnected();
+                    this.address = data[0];
-                    // this.address = data[0];
+                    this.connected = true;
-                    // this.connected = true;
-                    //   const tokenStore = useTokenStore();
-					// 	if (tokenStore.activeToken.address) {
-					// 		//Token selected but not refreshed
-					// 		this.getTokenBalance(tokenStore.activeToken.address).then(
-					// 			(data) => (tokenStore.activeToken.balance = data)
-					// 		);
-					// 	}
-					// console.log("permissions", permissions);
 				})
 				.catch((error) => {
 					if (error.code === 4001) {
@@ -58,19 +68,19 @@ export const useWalletStore = defineStore("wallet", {
                     this.connected = true;
                     this.address = accounts[0];
                     console.log(`You're connected to: ${accounts[0]}`);
-                    const web3 = new Web3(window.ethereum);
+                    // const web3 = new Web3(window.ethereum);
-                    const tokenStore = useTokenStore();
+                    // const tokenStore = useTokenStore();
-                    console.log("tokenStore.activeToken", tokenStore.activeToken);
+                    // console.log("tokenStore.activeToken", tokenStore.activeToken);
-                    if (tokenStore.activeToken.contractAddress) {
+                    // if (tokenStore.activeToken.contractAddress) {
-						tokenStore.activeToken.balance = await this.getTokenBalance(
+					// 	tokenStore.activeToken.balance = await this.getTokenBalance(
-							tokenStore.activeToken
+					// 		tokenStore.activeToken
-						);
+					// 	);
-						tokenStore.activeToken.allowance = await tokenStore.allowance();
+					// 	tokenStore.activeToken.allowance = await tokenStore.allowance();
-					}
+					// }
-					tokenStore.memeBurner.contract = new web3.eth.Contract(
+					// tokenStore.memeBurner.contract = new web3.eth.Contract(
-						tokenStore.memeBurner.config.abi,
+					// 	tokenStore.memeBurner.config.abi,
-						tokenStore.memeBurner.config.contractAddress
+					// 	tokenStore.memeBurner.config.contractAddress
-					);
+					// );
                 } else {
                     console.log("Metamask is not connected");
                     this.connected = false;
@@ -79,6 +89,7 @@ export const useWalletStore = defineStore("wallet", {
                 console.log("error", error);
             } finally {
                 this.loading = false;
+                return this.connected
             }
 
         }

src/views/HomeView.vue

@@ -11,6 +11,7 @@ import { useRoundsStore } from "@/stores/rounds";
 const tokenStore = useTokenStore();
 const roundsStore = useRoundsStore();
 const { token } = storeToRefs(tokenStore);
+const { getCurrentRoundData } = storeToRefs(roundsStore);
 
 const { currentRound, activeRound, rounds } = storeToRefs(roundsStore);
 
@@ -40,6 +41,10 @@ async function nextSlide() {
 	}
 }
 
+onMounted(() => {
+	console.log("getCurrentRoundData", getCurrentRoundData);
+});
+
 // const computedRounds = computed(() => {
 //     if()
 //     return ""
@@ -137,6 +142,9 @@ async function nextSlide() {
 								<div class="cycle-end-text">A cycle ends when only one of these goals is reached.</div>
 								<div class="bloodline-border">
 									<table>
+										{{
+											getCurrentRoundData?.goal
+										}}
 										<tr>
 											<td>Sacrifice:</td>
 											<td class="divider"></td>

vite.config.js

@@ -1,14 +1,31 @@
 import { fileURLToPath, URL } from 'node:url'
 
 import { defineConfig } from 'vite'
+import GlobalsPolyfills from "@esbuild-plugins/node-globals-polyfill";
+import NodeModulesPolyfills from "@esbuild-plugins/node-modules-polyfill";
+
 import vue from '@vitejs/plugin-vue'
 
 // https://vitejs.dev/config/
 export default defineConfig({
     plugins: [vue()],
+    optimizeDeps: {
+    esbuildOptions: {
+      plugins: [
+        NodeModulesPolyfills(),
+        GlobalsPolyfills({
+          process: true,
+          buffer: true,
+        }),
+      ],
+      define: {
+        global: 'globalThis',
+      },
+    },
+  },
 	resolve: {
 		alias: {
-      '@': fileURLToPath(new URL('./src', import.meta.url))
+			"@": fileURLToPath(new URL("./src", import.meta.url)),
-    }
+		},
-  }
+	},
-})
+});