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

Compare commits

base: cindylouwho/ImmortalClanVue:1b799b88254e79e8713231b42ae19b75ba51515c
Branches Tags
cindylouwho/ImmortalClanVue:master cindylouwho/ImmortalClanVue:development cindylouwho/ImmortalClanVue:fix/review1
..
compare: cindylouwho/ImmortalClanVue:development
Branches Tags
cindylouwho/ImmortalClanVue:development cindylouwho/ImmortalClanVue:fix/review1 cindylouwho/ImmortalClanVue:master
4 Commits
1b799b8825 .. development
Author SHA1 Message Date
EmberSpirit 7d1e7dcbf5 contract update 2023-10-24 06:31:01 +02:00
EmberSpirit cc3fb88d1e replace static 18n 2023-10-23 22:09:42 +02:00
EmberSpirit fcf6133a47 contract update 2023-10-23 22:00:09 +02:00
EmberSpirit 32db2d291c update bloodchart compact number 2023-10-23 21:58:54 +02:00
10 changed files with 2451 additions and 2403 deletions
Expand all files Collapse all files
src/assets/contracts/Bloodline.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"contractName": "Bloodline", "contractName": "Bloodline",
"contractAddress": "0x51bF3df58D123e8EA43fb2189f18027FD36a08Af", "contractAddress": "0x16351Cd1f3F1eb010758ff9FCf7013f48B0f5495",
"abi": [ "abi": [
{ {
"inputs": [ "inputs": [
src/assets/contracts/LiquidityOwner.json
+97 -1
View File
@@ -1,6 +1,6 @@
{ {
"contractName": "LiquidityOwner", "contractName": "LiquidityOwner",
"contractAddress": "0xF8bc4Ce13263DD4e12070e3192be50310eF7C95a", "contractAddress": "0x460f41499B6dA662ce289b57ba62A75FBd753b5c",
"abi": [ "abi": [
{ {
"inputs": [ "inputs": [
@@ -132,6 +132,35 @@
"stateMutability": "pure", "stateMutability": "pure",
"type": "function" "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": [ "inputs": [
{ {
@@ -169,6 +198,54 @@
"stateMutability": "view", "stateMutability": "view",
"type": "function" "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": [ "inputs": [
{ {
@@ -211,6 +288,25 @@
"stateMutability": "view", "stateMutability": "view",
"type": "function" "type": "function"
}, },
{
"inputs": [
{
"internalType": "uint256",
"name": "",
"type": "uint256"
}
],
"name": "cycleTicks",
"outputs": [
{
"internalType": "int24",
"name": "",
"type": "int24"
}
],
"stateMutability": "view",
"type": "function"
},
{ {
"inputs": [], "inputs": [],
"name": "memeAltar", "name": "memeAltar",
src/assets/contracts/MemeAltar.json
+46 -106
View File
@@ -1,6 +1,6 @@
{ {
"contractName": "MemeAltar", "contractName": "MemeAltar",
"contractAddress": "0xE4F42F3f8B0E57b1054D457fe3b49a1A10B1aCEa", "contractAddress": "0xAa72C9dB8332c28b4ebcC36D927e967EFC98D78C",
"abi": [ "abi": [
{ {
"inputs": [ "inputs": [
@@ -53,6 +53,11 @@
"name": "CycleCompletedRegistrationFailed", "name": "CycleCompletedRegistrationFailed",
"type": "error" "type": "error"
}, },
{
"inputs": [],
"name": "GoalCannotBeZero",
"type": "error"
},
{ {
"inputs": [], "inputs": [],
"name": "InsufficientOutputAmount", "name": "InsufficientOutputAmount",
@@ -215,42 +220,16 @@
"anonymous": false, "anonymous": false,
"inputs": [ "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", "name": "NewBM",
@@ -309,41 +288,14 @@
{ {
"inputs": [ "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", "name": "adjustBM",
@@ -410,12 +362,12 @@
}, },
{ {
"inputs": [], "inputs": [],
"name": "bloodline", "name": "b",
"outputs": [ "outputs": [
{ {
"internalType": "contract Bloodline", "internalType": "uint64",
"name": "", "name": "",
"type": "address" "type": "uint64"
} }
], ],
"stateMutability": "view", "stateMutability": "view",
@@ -423,37 +375,12 @@
}, },
{ {
"inputs": [], "inputs": [],
"name": "bm", "name": "bloodline",
"outputs": [ "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", "stateMutability": "view",
@@ -662,9 +589,9 @@
"name": "issuancePrice", "name": "issuancePrice",
"outputs": [ "outputs": [
{ {
"internalType": "uint256", "internalType": "uint128",
"name": "", "name": "",
"type": "uint256" "type": "uint128"
} }
], ],
"stateMutability": "view", "stateMutability": "view",
@@ -683,6 +610,19 @@
"stateMutability": "view", "stateMutability": "view",
"type": "function" "type": "function"
}, },
{
"inputs": [],
"name": "m",
"outputs": [
{
"internalType": "uint64",
"name": "",
"type": "uint64"
}
],
"stateMutability": "view",
"type": "function"
},
{ {
"inputs": [ "inputs": [
{ {
src/assets/contracts/RewardLocker.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"contractName": "RewardLocker", "contractName": "RewardLocker",
"contractAddress": "0x2952253374973DE0ffbFe35269Ca13FaF28B935F", "contractAddress": "0x8b15b2CB5b019472C31aEf487BF700037c321F85",
"abi": [ "abi": [
{ {
"inputs": [ "inputs": [
src/assets/contracts/UniswapPool.json
+1 -1
View File
File diff suppressed because one or more lines are too long
src/components/BloodChart.vue
+8 -3
View File
@@ -72,8 +72,13 @@
</div> </div>
</div> </div>
<div class="blood-chart-element-footer"> <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>
<div>$BLOOD</div> <div>$BLOOD</div>
</div> </div>
@@ -96,7 +101,7 @@
<script setup> <script setup>
import { computed, ref, inject, onMounted } from "vue"; 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 { useCycleStore } from "@/stores/cycles";
import { useMemeburnerStore } from "@/stores/memeburner"; import { useMemeburnerStore } from "@/stores/memeburner";
src/components/ConnectWallet.vue
+1 -1
View File
@@ -36,7 +36,7 @@
<div class="connected-header-avatar"> <div class="connected-header-avatar">
<img :src="getblocky(walletStore.address)" alt="avatar" /> <img :src="getblocky(walletStore.address)" alt="avatar" />
</div> </div>
<div class="connected-header-address"> <div class="connected-header-address" :title="walletStore.address">
{{ getAddressShortName(walletStore.address) }} {{ getAddressShortName(walletStore.address) }}
</div> </div>
<div class="connected-header-logout" @click="disconnectWallet"> <div class="connected-header-logout" @click="disconnectWallet">
src/components/SacrificeToken.vue
+1 -1
View File
@@ -30,7 +30,7 @@
:modelValue="sacrificeStore.sacrificeNumber / 10n ** activeToken.decimals" :modelValue="sacrificeStore.sacrificeNumber / 10n ** activeToken.decimals"
@input=" @input="
($event) => { ($event) => {
const value = BigInt($event.target.value) * 10n ** 18n; const value = BigInt($event.target.value) * 10n ** activeToken.decimals;
sacrificeStore.sacrificeNumber = value; sacrificeStore.sacrificeNumber = value;
processChange(value); processChange(value);
} }
src/helper/helper.js
+7
View File
@@ -3,6 +3,13 @@ export function getPercentage(amount, goal) {
return ((Number(amount) / Number(goal)) * 100).toFixed(2); 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) { export function formatNumber(nominator, denominator) {
let number = formatBigIntDivision(nominator, denominator); let number = formatBigIntDivision(nominator, denominator);
yarn.lock
+2288 -2288
View File
File diff suppressed because it is too large Load Diff