contract update

src/assets/contracts/Bloodline.json

@@ -1,6 +1,6 @@
 {
   "contractName": "Bloodline",
-  "contractAddress": "0x51bF3df58D123e8EA43fb2189f18027FD36a08Af",
+  "contractAddress": "0x16351Cd1f3F1eb010758ff9FCf7013f48B0f5495",
   "abi": [
     {
       "inputs": [

src/assets/contracts/LiquidityOwner.json

@@ -1,6 +1,6 @@
 {
   "contractName": "LiquidityOwner",
-  "contractAddress": "0xF8bc4Ce13263DD4e12070e3192be50310eF7C95a",
+  "contractAddress": "0x460f41499B6dA662ce289b57ba62A75FBd753b5c",
   "abi": [
     {
       "inputs": [
@@ -132,6 +132,35 @@
       "stateMutability": "pure",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "int24",
+          "name": "tick",
+          "type": "int24"
+        },
+        {
+          "internalType": "int24",
+          "name": "tickLower",
+          "type": "int24"
+        },
+        {
+          "internalType": "int24",
+          "name": "tickUpper",
+          "type": "int24"
+        }
+      ],
+      "name": "_liquidityCanBeProvided",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -169,6 +198,54 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "int24",
+          "name": "tickCycle",
+          "type": "int24"
+        }
+      ],
+      "name": "calculateTicksForRange1",
+      "outputs": [
+        {
+          "internalType": "int24",
+          "name": "tickLower",
+          "type": "int24"
+        },
+        {
+          "internalType": "int24",
+          "name": "tickUpper",
+          "type": "int24"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "int24",
+          "name": "tickCycle",
+          "type": "int24"
+        }
+      ],
+      "name": "calculateTicksForRange2",
+      "outputs": [
+        {
+          "internalType": "int24",
+          "name": "tickLower",
+          "type": "int24"
+        },
+        {
+          "internalType": "int24",
+          "name": "tickUpper",
+          "type": "int24"
+        }
+      ],
+      "stateMutability": "pure",
+      "type": "function"
+    },
     {
       "inputs": [
         {
@@ -211,6 +288,25 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "name": "cycleTicks",
+      "outputs": [
+        {
+          "internalType": "int24",
+          "name": "",
+          "type": "int24"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [],
       "name": "memeAltar",

src/assets/contracts/MemeAltar.json

@@ -1,6 +1,6 @@
 {
   "contractName": "MemeAltar",
-  "contractAddress": "0xE4F42F3f8B0E57b1054D457fe3b49a1A10B1aCEa",
+  "contractAddress": "0xAa72C9dB8332c28b4ebcC36D927e967EFC98D78C",
   "abi": [
     {
       "inputs": [
@@ -53,6 +53,11 @@
       "name": "CycleCompletedRegistrationFailed",
       "type": "error"
     },
+    {
+      "inputs": [],
+      "name": "GoalCannotBeZero",
+      "type": "error"
+    },
     {
       "inputs": [],
       "name": "InsufficientOutputAmount",
@@ -215,42 +220,16 @@
       "anonymous": false,
       "inputs": [
         {
-          "components": [
+          "indexed": true,
-            {
+          "internalType": "uint64",
-              "internalType": "uint40",
+          "name": "b",
-              "name": "b1",
+          "type": "uint64"
-              "type": "uint40"
+        },
-            },
+        {
-            {
+          "indexed": true,
-              "internalType": "uint40",
+          "internalType": "uint64",
-              "name": "m1",
+          "name": "m",
-              "type": "uint40"
+          "type": "uint64"
-            },
-            {
-              "internalType": "uint40",
-              "name": "b2",
-              "type": "uint40"
-            },
-            {
-              "internalType": "uint40",
-              "name": "m2",
-              "type": "uint40"
-            },
-            {
-              "internalType": "uint40",
-              "name": "b3",
-              "type": "uint40"
-            },
-            {
-              "internalType": "uint40",
-              "name": "m4",
-              "type": "uint40"
-            }
-          ],
-          "indexed": false,
-          "internalType": "struct MemeAltar.BM",
-          "name": "_bm",
-          "type": "tuple"
         }
       ],
       "name": "NewBM",
@@ -309,41 +288,14 @@
     {
       "inputs": [
         {
-          "components": [
+          "internalType": "uint64",
-            {
+          "name": "newB",
-              "internalType": "uint40",
+          "type": "uint64"
-              "name": "b1",
+        },
-              "type": "uint40"
+        {
-            },
+          "internalType": "uint64",
-            {
+          "name": "newM",
-              "internalType": "uint40",
+          "type": "uint64"
-              "name": "m1",
-              "type": "uint40"
-            },
-            {
-              "internalType": "uint40",
-              "name": "b2",
-              "type": "uint40"
-            },
-            {
-              "internalType": "uint40",
-              "name": "m2",
-              "type": "uint40"
-            },
-            {
-              "internalType": "uint40",
-              "name": "b3",
-              "type": "uint40"
-            },
-            {
-              "internalType": "uint40",
-              "name": "m4",
-              "type": "uint40"
-            }
-          ],
-          "internalType": "struct MemeAltar.BM",
-          "name": "newBM",
-          "type": "tuple"
         }
       ],
       "name": "adjustBM",
@@ -410,12 +362,12 @@
     },
     {
       "inputs": [],
-      "name": "bloodline",
+      "name": "b",
       "outputs": [
         {
-          "internalType": "contract Bloodline",
+          "internalType": "uint64",
           "name": "",
-          "type": "address"
+          "type": "uint64"
         }
       ],
       "stateMutability": "view",
@@ -423,37 +375,12 @@
     },
     {
       "inputs": [],
-      "name": "bm",
+      "name": "bloodline",
       "outputs": [
         {
-          "internalType": "uint40",
+          "internalType": "contract Bloodline",
-          "name": "b1",
+          "name": "",
-          "type": "uint40"
+          "type": "address"
-        },
-        {
-          "internalType": "uint40",
-          "name": "m1",
-          "type": "uint40"
-        },
-        {
-          "internalType": "uint40",
-          "name": "b2",
-          "type": "uint40"
-        },
-        {
-          "internalType": "uint40",
-          "name": "m2",
-          "type": "uint40"
-        },
-        {
-          "internalType": "uint40",
-          "name": "b3",
-          "type": "uint40"
-        },
-        {
-          "internalType": "uint40",
-          "name": "m4",
-          "type": "uint40"
         }
       ],
       "stateMutability": "view",
@@ -662,9 +589,9 @@
       "name": "issuancePrice",
       "outputs": [
         {
-          "internalType": "uint256",
+          "internalType": "uint128",
           "name": "",
-          "type": "uint256"
+          "type": "uint128"
         }
       ],
       "stateMutability": "view",
@@ -683,6 +610,19 @@
       "stateMutability": "view",
       "type": "function"
     },
+    {
+      "inputs": [],
+      "name": "m",
+      "outputs": [
+        {
+          "internalType": "uint64",
+          "name": "",
+          "type": "uint64"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {

src/assets/contracts/RewardLocker.json

@@ -1,6 +1,6 @@
 {
   "contractName": "RewardLocker",
-  "contractAddress": "0x2952253374973DE0ffbFe35269Ca13FaF28B935F",
+  "contractAddress": "0x8b15b2CB5b019472C31aEf487BF700037c321F85",
   "abi": [
     {
       "inputs": [

src/assets/contracts/WETH.json

@@ -0,0 +1,5 @@
+{
+  "contractName": "WETH",
+  "contractAddress": "0xB4FBF271143F4FBf7B91A5ded31805e42b2208d6",
+  "contractAddressMainnet": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+}

src/components/BloodChart.vue

@@ -72,8 +72,13 @@
 					</div>
 				</div>
 				<div class="blood-chart-element-footer">
-					<div class="blood-chart-amount">
+					<div
-						{{ formatNumber(coin.amountInBLD, 10n ** tokenStore.memeToken.decimals) }}
+						class="blood-chart-amount"
+						:title="formatBigIntDivision(coin.amountInBLD, 10n ** tokenStore.memeToken.decimals)"
+					>
+						{{
+							compactNumber(formatBigIntDivision(coin.amountInBLD, 10n ** tokenStore.memeToken.decimals))
+						}}
 					</div>
 					<div>$BLOOD</div>
 				</div>
@@ -96,7 +101,7 @@
 
 <script setup>
 import { computed, ref, inject, onMounted } from "vue";
-import { getPercentage, formatNumber } from "@/helper/helper.js";
+import { getPercentage, formatNumber, compactNumber, formatBigIntDivision } from "@/helper/helper.js";
 import { useCycleStore } from "@/stores/cycles";
 
 import { useMemeburnerStore } from "@/stores/memeburner";

src/components/ConnectWallet.vue

@@ -36,7 +36,7 @@
 				<div class="connected-header-avatar">
 					<img :src="getblocky(walletStore.address)" alt="avatar" />
 				</div>
-				<div class="connected-header-address">
+				<div class="connected-header-address" :title="walletStore.address">
 					{{ getAddressShortName(walletStore.address) }}
 				</div>
 				<div class="connected-header-logout" @click="disconnectWallet">

src/components/SacrificeToken.vue

@@ -30,7 +30,7 @@
 					:modelValue="sacrificeStore.sacrificeNumber / 10n ** activeToken.decimals"
 					@input="
 						($event) => {
-							const value = BigInt($event.target.value) * 10n ** 18n;
+							const value = BigInt($event.target.value) * 10n ** activeToken.decimals;
 							sacrificeStore.sacrificeNumber = value;
 							processChange(value);
 						}

src/helper/helper.js

@@ -3,6 +3,13 @@ export function getPercentage(amount, goal) {
     return ((Number(amount) / Number(goal)) * 100).toFixed(2);
 }
 
+export function compactNumber(number) {
+	return Intl.NumberFormat("en-US", {
+		notation: "compact",
+		maximumFractionDigits: 2,
+	}).format(number);
+}
+
 
 export function formatNumber(nominator, denominator) {
     let number = formatBigIntDivision(nominator, denominator);

src/stores/sacrifice.js

@@ -149,15 +149,15 @@ export const useSacrificeStore = defineStore("sacrifice", {
 					 * case 2
 					 * user is logged in and allowance is greater or equal input and variant is sacrifice
 					 */
-					// in this case you should use eth_call, so you are showing exact reward in cases of completing cycles
+					 // in this case you should use eth_call, so you are showing exact reward in cases of completing cycles
-					const amountSacrifice = await readContract({
+ 					 const amountSacrifice = await readContract({
-						address: memeburnerStore.contract.address,
+  						address: memeburnerStore.contract.address,
-						abi: memeburnerStore.contract.abi,
+  						abi: memeburnerStore.contract.abi,
-						functionName: "sacrificeMeme",
+  						functionName: "sacrificeMeme",
-						args: [token.contractAddress, amount.toString(), minETH.toString()],
+  						args: [token.contractAddress, amount.toString(), minETH.toString()],
-						account: walletStore.address,
+  						account: walletStore.address,
-					});
+  					});
-					output = amountSacrifice;
+ 					output = amountSacrifice;
 				} else if (walletStore.connected && variant === "buy" && token.allowance >= amount) {
 					/**
 					 * case 3

src/stores/uniswap.js

@@ -1,23 +1,17 @@
 import { defineStore } from "pinia";
 import { useWalletStoreV2 } from "@/stores/walletV2";
 import QuoterJson from "@/assets/contracts/Quoter.json";
-import UniswapPoolJson from "@/assets/contracts/UniswapPool.json";
+import WethJson from "@/assets/contracts/WETH.json";
 import BloodlineJson from "@/assets/contracts/Bloodline.json";
-import { useMemeburnerStore } from "@/stores/memeburner";
-import { useTokenStore } from "@/stores/tokens";
 
 import { getContract, multicall } from "@wagmi/core";
 
 export const useUniswapStore = defineStore("uniswap", {
 	state: () => ({
 		quoateV3Contract: {},
-		quoateV2Contract: {},
+		tokenIn: WethJson.contractAddress,
-		uniswapPoolContract: {},
+		tokenOut: BloodlineJson.contractAddress,
-		poolData: {
+		fee: 10000n,
-			token0: null,
-			token1: null,
-			fee: null,
-		},
 	}),
 	getters: {},
 	actions: {
@@ -31,38 +25,25 @@ export const useUniswapStore = defineStore("uniswap", {
 				walletClient: walletStore.walletClient || walletStore.publicClient,
 			});
 
-			this.uniswapPoolContract = getContract({
-				address: UniswapPoolJson.contractAddress,
-				abi: UniswapPoolJson.abi,
-				walletClient: walletStore.walletClient || walletStore.publicClient,
-			});
-
-			this.getPoolData();
 		},
 
-        async quoteExactInputSingle(amount, ethBase) {
+        async quoteExactInputSingle(ethBase) {
 			try {
                 console.log("quoteExactInputSingle");
-                const memeBurnerStore = useMemeburnerStore();
-                const tokenStore = useTokenStore();
-                
-                const tokenOut = tokenStore.memeToken.contractAddress;
-				// tokenIn - WETH
-				const tokenIn = BigInt(this.poolData.token0) == BigInt(tokenOut) ? this.poolData.token1 : this.poolData.token0;
 				console.log("quoteExactInputSingle-parameter", {
-					tokenIn: tokenIn, // WETH
+					tokenIn: this.tokenIn, // WETH
-					tokenOut: tokenOut, // BLOOD
+					tokenOut: this.tokenOut, // BLOOD
-					fee: this.poolData.fee,
+					fee: this.fee,
 					amountEthBase: ethBase,
-					pricelimit: 0, //sqrtPriceLimitX96
+					pricelimit: 0n, //sqrtPriceLimitX96
 				});
 
 				const quotedAmountOut = await this.quoateV3Contract.read.quoteExactInputSingle([
-					tokenIn, //weth
+					this.tokenIn, //weth
-					tokenOut, //bloodline
+					this.tokenOut, //bloodline
-					this.poolData.fee,
+					this.fee,
 					ethBase,
-					0, //sqrtPriceLimitX96
+					0n, //sqrtPriceLimitX96
                 ]);
                 console.log("quotedAmountOut", quotedAmountOut);
 				return {result: true, amount: quotedAmountOut};
@@ -70,31 +51,6 @@ export const useUniswapStore = defineStore("uniswap", {
 
                 return { result: false, amount: null };
             }
-		},
+		}
-		async getPoolData() {
+	}
-			console.log("getPoolData");
-			const contracts = [];
-			contracts.push(
-				{
-					...this.uniswapPoolContract,
-					functionName: "token0",
-				},
-				{
-					...this.uniswapPoolContract,
-					functionName: "token1",
-				},
-				{
-					...this.uniswapPoolContract,
-					functionName: "fee",
-				}
-			);
-			const data = await multicall({
-				contracts,
-			});
-			this.poolData.token0 = data[0].result;
-			this.poolData.token1 = data[1].result;
-            this.poolData.fee = data[2].result;
-            console.log("this.poolData", this.poolData);
-		},
-	},
 });