update slideoutpanel, open errors tokeninit

This commit is contained in:
EmberSpirit
2023-08-05 12:03:19 +02:00
parent 6c4933a6a8
commit ceac2a1083
26 changed files with 10440 additions and 16822 deletions
+1
View File
@@ -8,6 +8,7 @@
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
<script src="/src/assets/js/blockies.min.js"></script>
<script type="module" src="/src/main.js"></script> <script type="module" src="/src/main.js"></script>
</body> </body>
</html> </html>
+10067 -14207
View File
File diff suppressed because it is too large Load Diff
+33 -34
View File
@@ -1,36 +1,35 @@
{ {
"name": "vue-ethereum2", "name": "vue-ethereum2",
"version": "0.0.0", "version": "0.0.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"build": "vite build", "build": "vite build",
"preview": "vite preview", "preview": "vite preview",
"lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore" "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.4.0", "@fortawesome/fontawesome-svg-core": "^6.4.0",
"@fortawesome/free-brands-svg-icons": "^6.4.0", "@fortawesome/free-brands-svg-icons": "^6.4.0",
"@fortawesome/free-solid-svg-icons": "^6.4.0", "@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/vue-fontawesome": "^3.0.3", "@fortawesome/vue-fontawesome": "^3.0.3",
"@wagmi/core": "^1.3.8", "@wagmi/core": "^1.3.8",
"abi-decoder": "^2.4.0", "abi-decoder": "^2.4.0",
"ethers": "^6.6.3", "blockies": "^0.0.2",
"pinia": "^2.0.36", "pinia": "^2.0.36",
"pinia-plugin-persistedstate": "^3.1.0", "pinia-plugin-persistedstate": "^3.1.0",
"sass": "^1.62.1", "sass": "^1.62.1",
"swiper": "^9.4.1", "swiper": "^9.4.1",
"viem": "^1.4.1", "viem": "^1.4.1",
"vue": "^3.3.2", "vue": "^3.3.2",
"vue-router": "^4.2.0", "vue-router": "^4.2.0"
"web3": "^v1.9.0" },
}, "devDependencies": {
"devDependencies": { "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@esbuild-plugins/node-globals-polyfill": "^0.2.3", "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
"@esbuild-plugins/node-modules-polyfill": "^0.2.2", "@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue": "^4.2.3", "eslint": "^8.39.0",
"eslint": "^8.39.0", "eslint-plugin-vue": "^9.11.0",
"eslint-plugin-vue": "^9.11.0", "vite": "^4.3.5"
"vite": "^4.3.5" }
}
} }
+14 -17
View File
@@ -1,4 +1,3 @@
B
<script setup> <script setup>
import { onMounted, onUnmounted, provide, ref } from "vue"; import { onMounted, onUnmounted, provide, ref } from "vue";
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
@@ -9,7 +8,6 @@ import { useTokenStore } from "@/stores/tokens";
import { useContractStore } from "@/stores/contracts"; import { useContractStore } from "@/stores/contracts";
import { useMemeburnerStore } from "@/stores/memeburner"; import { useMemeburnerStore } from "@/stores/memeburner";
import { useRewardLockerStore } from "@/stores/rewardlocker"; import { useRewardLockerStore } from "@/stores/rewardlocker";
import { useMultiCallStore } from "@/stores/multicall";
import { useRoundsStore } from "@/stores/rounds"; import { useRoundsStore } from "@/stores/rounds";
import SlideoutPanel from "./components/SlideoutPanel.vue"; import SlideoutPanel from "./components/SlideoutPanel.vue";
@@ -30,7 +28,6 @@ const tokenStore = useTokenStore();
const contractStore = useContractStore(); const contractStore = useContractStore();
const memeBurnerStore = useMemeburnerStore(); const memeBurnerStore = useMemeburnerStore();
const rewardLockerStore = useRewardLockerStore(); const rewardLockerStore = useRewardLockerStore();
const multiCallStore = useMultiCallStore();
const roundsStore = useRoundsStore(); const roundsStore = useRoundsStore();
const walletStore = useWalletStoreV2(); const walletStore = useWalletStoreV2();
const { memeBurner, token } = storeToRefs(tokenStore); const { memeBurner, token } = storeToRefs(tokenStore);
@@ -123,6 +120,16 @@ onMounted(async () => {
console.log("network123", network); console.log("network123", network);
if (network.chain) { if (network.chain) {
walletStore.chain = network.chain; walletStore.chain = network.chain;
clientClientEvent.value = watchWalletClient(
{
chainId: network.chain.id,
},
(walletClient) => {
walletStore.walletClient = walletClient;
console.log("wc123", walletClient);
}
);
} }
}); });
@@ -139,26 +146,16 @@ onMounted(async () => {
} }
); );
clientClientEvent.value = watchWalletClient(
{
chainId: network.chain.id,
},
(walletClient) => {
walletStore.walletClient = walletClient;
console.log("wc123", walletClient);
}
);
await tokenStore.initV2(); await tokenStore.initV2();
await memeBurnerStore.init(); await memeBurnerStore.init();
await rewardLockerStore.init(); await rewardLockerStore.init();
await memeBurnerStore.init(); await memeBurnerStore.init();
//init //init
roundsStore.currentRound = parseInt(await memeBurnerStore.getCurrentRound()); // roundsStore.currentRound = parseInt(await memeBurnerStore.getCurrentRound());
console.log("roundsStore.currentRound", roundsStore.currentRound); // console.log("roundsStore.currentRound", roundsStore.currentRound);
roundsStore.activeRound = roundsStore.currentRound; // roundsStore.activeRound = roundsStore.currentRound;
await roundsStore.fillRound(roundsStore.activeRound); // await roundsStore.fillRound(roundsStore.activeRound);
}); });
</script> </script>
-444
View File
@@ -1,444 +0,0 @@
{
"contractName": "Multicall3",
"contractAddress": "0xcA11bde05977b3631167028862bE2a173976CA11",
"abi": [
{
"inputs": [
{
"components": [
{
"internalType": "address",
"name": "target",
"type": "address"
},
{
"internalType": "bytes",
"name": "callData",
"type": "bytes"
}
],
"internalType": "struct Multicall3.Call[]",
"name": "calls",
"type": "tuple[]"
}
],
"name": "aggregate",
"outputs": [
{
"internalType": "uint256",
"name": "blockNumber",
"type": "uint256"
},
{
"internalType": "bytes[]",
"name": "returnData",
"type": "bytes[]"
}
],
"stateMutability": "payable",
"type": "function"
},
{
"inputs": [
{
"components": [
{
"internalType": "address",
"name": "target",
"type": "address"
},
{
"internalType": "bool",
"name": "allowFailure",
"type": "bool"
},
{
"internalType": "bytes",
"name": "callData",
"type": "bytes"
}
],
"internalType": "struct Multicall3.Call3[]",
"name": "calls",
"type": "tuple[]"
}
],
"name": "aggregate3",
"outputs": [
{
"components": [
{
"internalType": "bool",
"name": "success",
"type": "bool"
},
{
"internalType": "bytes",
"name": "returnData",
"type": "bytes"
}
],
"internalType": "struct Multicall3.Result[]",
"name": "returnData",
"type": "tuple[]"
}
],
"stateMutability": "payable",
"type": "function"
},
{
"inputs": [
{
"components": [
{
"internalType": "address",
"name": "target",
"type": "address"
},
{
"internalType": "bool",
"name": "allowFailure",
"type": "bool"
},
{
"internalType": "uint256",
"name": "value",
"type": "uint256"
},
{
"internalType": "bytes",
"name": "callData",
"type": "bytes"
}
],
"internalType": "struct Multicall3.Call3Value[]",
"name": "calls",
"type": "tuple[]"
}
],
"name": "aggregate3Value",
"outputs": [
{
"components": [
{
"internalType": "bool",
"name": "success",
"type": "bool"
},
{
"internalType": "bytes",
"name": "returnData",
"type": "bytes"
}
],
"internalType": "struct Multicall3.Result[]",
"name": "returnData",
"type": "tuple[]"
}
],
"stateMutability": "payable",
"type": "function"
},
{
"inputs": [
{
"components": [
{
"internalType": "address",
"name": "target",
"type": "address"
},
{
"internalType": "bytes",
"name": "callData",
"type": "bytes"
}
],
"internalType": "struct Multicall3.Call[]",
"name": "calls",
"type": "tuple[]"
}
],
"name": "blockAndAggregate",
"outputs": [
{
"internalType": "uint256",
"name": "blockNumber",
"type": "uint256"
},
{
"internalType": "bytes32",
"name": "blockHash",
"type": "bytes32"
},
{
"components": [
{
"internalType": "bool",
"name": "success",
"type": "bool"
},
{
"internalType": "bytes",
"name": "returnData",
"type": "bytes"
}
],
"internalType": "struct Multicall3.Result[]",
"name": "returnData",
"type": "tuple[]"
}
],
"stateMutability": "payable",
"type": "function"
},
{
"inputs": [],
"name": "getBasefee",
"outputs": [
{
"internalType": "uint256",
"name": "basefee",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "uint256",
"name": "blockNumber",
"type": "uint256"
}
],
"name": "getBlockHash",
"outputs": [
{
"internalType": "bytes32",
"name": "blockHash",
"type": "bytes32"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "getBlockNumber",
"outputs": [
{
"internalType": "uint256",
"name": "blockNumber",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "getChainId",
"outputs": [
{
"internalType": "uint256",
"name": "chainid",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "getCurrentBlockCoinbase",
"outputs": [
{
"internalType": "address",
"name": "coinbase",
"type": "address"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "getCurrentBlockDifficulty",
"outputs": [
{
"internalType": "uint256",
"name": "difficulty",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "getCurrentBlockGasLimit",
"outputs": [
{
"internalType": "uint256",
"name": "gaslimit",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "getCurrentBlockTimestamp",
"outputs": [
{
"internalType": "uint256",
"name": "timestamp",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "address",
"name": "addr",
"type": "address"
}
],
"name": "getEthBalance",
"outputs": [
{
"internalType": "uint256",
"name": "balance",
"type": "uint256"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [],
"name": "getLastBlockHash",
"outputs": [
{
"internalType": "bytes32",
"name": "blockHash",
"type": "bytes32"
}
],
"stateMutability": "view",
"type": "function"
},
{
"inputs": [
{
"internalType": "bool",
"name": "requireSuccess",
"type": "bool"
},
{
"components": [
{
"internalType": "address",
"name": "target",
"type": "address"
},
{
"internalType": "bytes",
"name": "callData",
"type": "bytes"
}
],
"internalType": "struct Multicall3.Call[]",
"name": "calls",
"type": "tuple[]"
}
],
"name": "tryAggregate",
"outputs": [
{
"components": [
{
"internalType": "bool",
"name": "success",
"type": "bool"
},
{
"internalType": "bytes",
"name": "returnData",
"type": "bytes"
}
],
"internalType": "struct Multicall3.Result[]",
"name": "returnData",
"type": "tuple[]"
}
],
"stateMutability": "payable",
"type": "function"
},
{
"inputs": [
{
"internalType": "bool",
"name": "requireSuccess",
"type": "bool"
},
{
"components": [
{
"internalType": "address",
"name": "target",
"type": "address"
},
{
"internalType": "bytes",
"name": "callData",
"type": "bytes"
}
],
"internalType": "struct Multicall3.Call[]",
"name": "calls",
"type": "tuple[]"
}
],
"name": "tryBlockAndAggregate",
"outputs": [
{
"internalType": "uint256",
"name": "blockNumber",
"type": "uint256"
},
{
"internalType": "bytes32",
"name": "blockHash",
"type": "bytes32"
},
{
"components": [
{
"internalType": "bool",
"name": "success",
"type": "bool"
},
{
"internalType": "bytes",
"name": "returnData",
"type": "bytes"
}
],
"internalType": "struct Multicall3.Result[]",
"name": "returnData",
"type": "tuple[]"
}
],
"stateMutability": "payable",
"type": "function"
}
]
}
+1
View File
@@ -0,0 +1 @@
!function(){function e(e){for(var o=0;o<c.length;o++)c[o]=0;for(var o=0;o<e.length;o++)c[o%4]=(c[o%4]<<5)-c[o%4]+e.charCodeAt(o)}function o(){var e=c[0]^c[0]<<11;return c[0]=c[1],c[1]=c[2],c[2]=c[3],c[3]=c[3]^c[3]>>19^e^e>>8,(c[3]>>>0)/(1<<31>>>0)}function r(){var e=Math.floor(360*o()),r=60*o()+40+"%",t=25*(o()+o()+o()+o())+"%",l="hsl("+e+","+r+","+t+")";return l}function t(e){for(var r=e,t=e,l=Math.ceil(r/2),n=r-l,a=[],c=0;t>c;c++){for(var i=[],f=0;l>f;f++)i[f]=Math.floor(2.3*o());var s=i.slice(0,n);s.reverse(),i=i.concat(s);for(var h=0;h<i.length;h++)a.push(i[h])}return a}function l(o){var t={};return t.seed=o.seed||Math.floor(Math.random()*Math.pow(10,16)).toString(16),e(t.seed),t.size=o.size||8,t.scale=o.scale||4,t.color=o.color||r(),t.bgcolor=o.bgcolor||r(),t.spotcolor=o.spotcolor||r(),t}function n(e,o){var r=t(e.size),l=Math.sqrt(r.length);o.width=o.height=e.size*e.scale;var n=o.getContext("2d");n.fillStyle=e.bgcolor,n.fillRect(0,0,o.width,o.height),n.fillStyle=e.color;for(var a=0;a<r.length;a++)if(r[a]){var c=Math.floor(a/l),i=a%l;n.fillStyle=1==r[a]?e.color:e.spotcolor,n.fillRect(i*e.scale,c*e.scale,e.scale,e.scale)}return o}function a(e){var e=l(e||{}),o=document.createElement("canvas");return n(e,o),o}var c=new Array(4),i={create:a,render:n};"undefined"!=typeof module&&(module.exports=i),"undefined"!=typeof window&&(window.blockies=i)}();
+2
View File
@@ -16,6 +16,8 @@
border: 4px solid #000 border: 4px solid #000
&.purple &.purple
border-color: var(--purple) border-color: var(--purple)
&.white
border-color: var(--white)
.bloodline-badge .bloodline-badge
padding: 8px 16px 8px 16px padding: 8px 16px 8px 16px
+1
View File
@@ -29,6 +29,7 @@ $button-background-color: $black
--tertiary: #{$tertiary} --tertiary: #{$tertiary}
--tertiary-light: #{$tertiary-light} --tertiary-light: #{$tertiary-light}
--tertiary-dark: #{$tertiary-dark} --tertiary-dark: #{$tertiary-dark}
--white: #{#F9F9FA}
--grey: #{$grey} --grey: #{$grey}
--grey2: #{$grey2} --grey2: #{$grey2}
--purple: #{$purple} --purple: #{$purple}
+93 -54
View File
@@ -1,35 +1,69 @@
<template> <template>
<h3>Connect Wallet</h3> <div class="connect-wallet-headline">Connect Wallet</div>
<div class="connectors-wrapper" v-if="!walletStore.connected"> <div class="connectors-wrapper" v-if="!walletStore.connected">
<div class="connectors-element" v-for="connector in walletStore.config?.connectors" @click="connectWallet(connector)"> <div
<div class="connector-icon"> class="connectors-element"
<img :src="`/assets/img/connectors/${connector.id}.svg`" :alt="`${connector.name} Logo`"> v-for="connector in walletStore.config?.connectors"
</div> @click="connectWallet(connector)"
<div class="connector-name">{{ connector.name }}</div> >
</div> <div class="connector-icon">
</div> <img :src="`/assets/img/connectors/${connector.id}.svg`" :alt="`${connector.name} Logo`" />
<div class="btn btn-immortal" v-else @click="disconnectWallet">disconnect</div> </div>
<div>Connected: {{ walletStore.connected }}</div> <div class="connector-name">{{ connector.name }}</div>
</div>
</div>
<div v-else>
<div class="connected-header">
<div class="connected-header-avatar">
<img :src="getblocky(walletStore.address)" alt="avatar" />
</div>
<div class="connected-header-address">
{{ getAddressShortName(walletStore.address) }}
</div>
<div class="connected-header-logout">
<font-awesome-icon :icon="['fas', 'fa-arrow-right-from-bracket']" />
</div>
</div>
<div class="connected-tokens-headline">Your Tokens</div>
<div class="connected-tokens">
^
<div class="connected-token" v-for="token in tokenStore.token">
<token-name-price :name="token.name" price="31,310"></token-name-price>
<div class="connected-token-button"></div>
<div class="connected-token-logo"></div>
</div>
</div>
<div class="connected-stake bloodline-border white">
<div class="connected-stake-headline">Staked</div>
<div>$BLD 1,0000</div>
<div class="connected-stake-buttons">
<div class="btn btn-immortal">Stake</div>
<div class="btn btn-immortal">Unstake</div>
</div>
</div>
<div class="btn btn-immortal" @click="disconnectWallet">disconnect</div>
</div>
<div>
Are you coming from Binance, Poloniex, Kucoin or any other CEX?<br />
<br />
You don't have a wallet yet?<br /><br />
Follow these instructions first.
</div>
</template> </template>
<script setup> <script setup>
import { ref, toRaw, onMounted, onUnmounted, getCurrentInstance } from "vue"; import { ref, toRaw, onMounted, onUnmounted, getCurrentInstance } from "vue";
import { useWalletStoreV2 } from "@/stores/walletV2"; import { useWalletStoreV2 } from "@/stores/walletV2";
import { useTokenStore } from "@/stores/tokens";
import Meme1Json from "@/assets/contracts/Meme1.json"; import Meme1Json from "@/assets/contracts/Meme1.json";
import TokenNamePrice from "./TokenNamePrice.vue";
import { getAddressShortName, getblocky } from "@/helper/helper.js";
import { import { disconnect } from "@wagmi/core";
createConfig,
configureChains,
mainnet,
getAccount,
getContract,
connect,
disconnect,
InjectedConnector,
watchAccount,
} from "@wagmi/core";
const walletStore = useWalletStoreV2(); const walletStore = useWalletStoreV2();
const tokenStore = useTokenStore();
const goerliKey = import.meta.env.VITE_GOERLI_KEY; const goerliKey = import.meta.env.VITE_GOERLI_KEY;
@@ -39,37 +73,6 @@ const accountSub = ref(null);
const instance = getCurrentInstance(); const instance = getCurrentInstance();
// config.value = createConfig({
// autoConnect: true,
// connectors: [
// new CoinbaseWalletConnector({
// chains,
// options: {
// appName: "wagmi demo",
// },
// }),
// new MetaMaskConnector({ chains }),
// new WalletConnectConnector({
// chains,
// options: {
// projectId: projectId,
// showQrModal: true,
// metadata: {
// name: "Bloodline-App",
// description: "TODO Bloodline Description",
// url: "https://gitea.loseyourip.com/",
// icons: [
// "https://gitea.loseyourip.com/assets/img/vampir.png",
// ],
// },
// },
// }),
// ],
// publicClient,
// webSocketPublicClient,
// });
// console.log("config", config);
async function disconnectWallet() { async function disconnectWallet() {
console.log("disconnectWallet"); console.log("disconnectWallet");
try { try {
@@ -88,11 +91,18 @@ async function connectWallet(connector) {
} }
</script> </script>
<style lang="sass"> <style lang="sass">
.connect-wallet-headline
font-family: Inter
font-size: 18px
font-style: normal
font-weight: 400
line-height: normal
.connectors-wrapper .connectors-wrapper
display: flex display: flex
flex-direction: column flex-direction: column
gap: 8px
margin: 24px 0
.connectors-element .connectors-element
display: flex display: flex
padding: 12px padding: 12px
@@ -109,4 +119,33 @@ async function connectWallet(connector) {
.connector-name .connector-name
padding: 0 8px padding: 0 8px
align-self: center align-self: center
.connected-header
margin-bottom: 24px
display: flex
gap: 16px
align-items: center
.connected-header-avatar
img
border-radius: 8px
.connected-header-logout
margin-left: auto
svg
font-size: 25px
.connected-tokens-headline
font-size: 18px
// .connected-tokens
// .connected-token
.connected-stake
// .connected-stake-headline
.connected-stake-buttons
display: flex
text-align: center
gap: 16px
div
flex: 1 1 50%
font-size: 18px
</style> </style>
+24 -8
View File
@@ -2,6 +2,8 @@
import { storeToRefs } from "pinia"; import { storeToRefs } from "pinia";
import { ref, onMounted, onBeforeUnmount, inject } from "vue"; import { ref, onMounted, onBeforeUnmount, inject } from "vue";
import { useWalletStoreV2 } from "@/stores/walletV2"; import { useWalletStoreV2 } from "@/stores/walletV2";
import { getblocky } from "@/helper/helper.js";
const emit = defineEmits(["showPanel"]); const emit = defineEmits(["showPanel"]);
const walletStore = useWalletStoreV2(); const walletStore = useWalletStoreV2();
@@ -13,8 +15,7 @@ const showNavbar = ref(true);
const lastScrollPosition = ref(0); const lastScrollPosition = ref(0);
function onScroll() { function onScroll() {
const currentScrollPosition = const currentScrollPosition = window.pageYOffset || document.documentElement.scrollTop;
window.pageYOffset || document.documentElement.scrollTop;
if (currentScrollPosition < 0) { if (currentScrollPosition < 0) {
return; return;
} }
@@ -67,10 +68,13 @@ onBeforeUnmount(() => {
<div v-if="!isMobile"> <div v-if="!isMobile">
<!-- <div v-if="!connected" class="btn btn-immortal" @click="walletStore.connectWallet">connect</div> --> <!-- <div v-if="!connected" class="btn btn-immortal" @click="walletStore.connectWallet">connect</div> -->
<div v-if="!address" class="btn btn-immortal" @click="showPanel = true">connect</div> <div v-if="!address" class="btn btn-immortal" @click="showPanel = true">connect</div>
<span v-else @click="showPanel = true"> {{ address }}</span> <span v-else @click="showPanel = true"> test</span>
</div> </div>
<div v-else class="hamburger-menu" @click="showPanel = true"> <div v-else @click="showPanel = true">
<font-awesome-icon :icon="['fas', 'bars']" /> <div class="login-icon" v-if="!address">
<font-awesome-icon :icon="['fas', 'fa-arrow-right-to-bracket']" />
</div>
<div v-else><img :src="getblocky(address)" alt="avatar" /></div>
</div> </div>
</div> </div>
</div> </div>
@@ -133,7 +137,19 @@ header
.navbar-end .navbar-end
display: flex display: flex
margin-left: auto margin-left: auto
.hamburger-menu .login-icon
color: var(--purple) color: var(--white)
font-size: 42px background-color: var(--purple)
padding: 8px
font-size: 25px
border-radius: 8px
width: 44px
height: 44px
display: flex
justify-content: center
align-items: center
img
width: 32px
height: 32px
border-radius: 8px
</style> </style>
+11 -13
View File
@@ -1,12 +1,11 @@
<template> <template>
<div class="slideout-overlay" :class="{'open': props.modelValue}" @click="showPanel = false"> <div class="slideout-overlay" :class="{ open: props.modelValue }" @click="showPanel = false">
<div :class="{'slideout-wrapper': true, 'open': props.modelValue}" > <div :class="{ 'slideout-wrapper': true, open: props.modelValue }">
<div class="slideout-panel" @click="testClick">
<div class="slideout-panel" @click="testClick"> <slot></slot>
<slot></slot> </div>
</div> </div>
</div> </div>
</div>
</template> </template>
<script setup> <script setup>
@@ -28,7 +27,6 @@ function testClick(e) {
<style lang="sass"> <style lang="sass">
.slideout-overlay .slideout-overlay
background-color: rgba(0,0,0,.5)
z-index: 100 z-index: 100
&.open &.open
height: 100% height: 100%
@@ -39,13 +37,13 @@ function testClick(e) {
height: 100vh height: 100vh
position: fixed position: fixed
display: flex display: flex
border: 1px solid rgba(152, 161, 192, 0.24) background-color: var(--midnight-black, #0F0F0F)
box-shadow: rgba(0, 0, 0, 0.24) 12px 16px 24px, rgba(0, 0, 0, 0.24) 12px 8px 12px, rgba(0, 0, 0, 0.32) 4px 4px 8px border-radius: 16px
background-color: #2D2D2D
transition: margin-bottom 250ms ease 0s transition: margin-bottom 250ms ease 0s
width: 100% width: 100%
margin-bottom: -100vh margin-bottom: -100vh
bottom: 0 bottom: 0
overflow: auto
@media (min-width: 992px) @media (min-width: 992px)
margin-right: -300px margin-right: -300px
transition: margin-right 250ms ease 0s transition: margin-right 250ms ease 0s
@@ -59,7 +57,7 @@ function testClick(e) {
.slideout-panel .slideout-panel
width: 100% width: 100%
height: 100% height: 100%
padding: 24px padding: 24px 24px 16px 24px
@media (min-width: 992px) @media (min-width: 992px)
width: 300px width: 300px
.slideout-icon .slideout-icon
+6 -13
View File
@@ -18,12 +18,7 @@
/> />
</div> </div>
<div class="rewards-list" v-else> <div class="rewards-list" v-else>
<rewards-wrapper <rewards-wrapper title="Total Sacrafice Reward" coin="$BLOOD" amount="0" image="/assets/img/vampir.png" />
title="Total Sacrafice Reward"
coin="$BLOOD"
amount="0"
image="/assets/img/vampir.png"
/>
<rewards-wrapper <rewards-wrapper
title="Total Stake Reward" title="Total Stake Reward"
coin="$BLOOD" coin="$BLOOD"
@@ -41,11 +36,10 @@
</div> </div>
<div v-else class="btn btn-immortal btn--disabled">Nothing to claim</div> <div v-else class="btn btn-immortal btn--disabled">Nothing to claim</div>
</div> </div>
<div class="stake-buttons"> <div class="stake-buttons">
<div class="btn btn-immortal">Stake</div> <div class="btn btn-immortal">Stake</div>
<div class="btn btn-immortal">Unstake</div> <div class="btn btn-immortal">Unstake</div>
</div>
</div>
</div> </div>
</template> </template>
@@ -54,17 +48,16 @@ import { storeToRefs } from "pinia";
import RewardsWrapper from "@/components/RewardsWrapper.vue"; import RewardsWrapper from "@/components/RewardsWrapper.vue";
import { inject, ref, onMounted } from "vue"; import { inject, ref, onMounted } from "vue";
import { useRewardLockerStore } from "@/stores/rewardlocker"; import { useRewardLockerStore } from "@/stores/rewardlocker";
import { useWalletStore } from "@/stores/wallet"; import { useWalletStoreV2 } from "@/stores/walletV2";
import { useRoundsStore } from "@/stores/rounds"; import { useRoundsStore } from "@/stores/rounds";
const clanRewards = ref(0); const clanRewards = ref(0);
const rewards = ref(0); const rewards = ref(0);
const isMobile = inject("isMobile"); const isMobile = inject("isMobile");
const rewardLockerStore = useRewardLockerStore(); const rewardLockerStore = useRewardLockerStore();
const walletStore = useWalletStore(); const walletStore = useWalletStoreV2();
const roundStore = useRoundsStore(); const roundStore = useRoundsStore();
const { address } = storeToRefs(walletStore); const { address } = storeToRefs(walletStore);
const { activeRound, currentRound, getCurrentRoundData } = const { activeRound, currentRound, getCurrentRoundData } = storeToRefs(roundStore);
storeToRefs(roundStore);
onMounted(async () => {}); onMounted(async () => {});
+23
View File
@@ -0,0 +1,23 @@
<template>
<div class="token-price-wrapper">
<div class="token-name">{{ props.name }}</div>
<div class="token-price">{{ props.price }}</div>
</div>
</template>
<script setup>
const props = defineProps({
name: String,
price: Number,
});
</script>
<style lang="sass">
.token-price-wrapper
.token-name
font-size: 14px
margin-bottom: 4px
.token-price
font-size: 24px
letter-spacing: 4.32px
</style>
+19
View File
@@ -17,3 +17,22 @@ export function compactNumber(number) {
maximumFractionDigits: 2, maximumFractionDigits: 2,
}).format(parseInt(number)); }).format(parseInt(number));
} }
export function getAddressShortName(address) {
// const address = "0x66422602B2f4885c57EE794174f98d9E4DDBBBC6";
const addressBegin = address.substring(0, 6);
const addressEnd = address.substring(address.length - 4, address.length)
return addressBegin + "..." + addressEnd;
}
export function getblocky(address) {
var blockiesData = blockies
.create({
seed: address.toLowerCase(),
size: 8,
scale: 4,
})
.toDataURL();
return blockiesData;
}
+4 -3
View File
@@ -14,10 +14,9 @@ import { library } from '@fortawesome/fontawesome-svg-core'
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome' import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
/* import specific icons */ /* import specific icons */
import { faArrowDown, faSpinner ,faPlus, faCaretLeft, faCaretRight, faBars, faAnglesRight } from "@fortawesome/free-solid-svg-icons"; import { faArrowDown, faSpinner ,faPlus, faCaretLeft, faCaretRight, faBars, faAnglesRight, faArrowRightToBracket, faArrowRightFromBracket } from "@fortawesome/free-solid-svg-icons";
import { faDiscord, faTwitter, faTelegram } from "@fortawesome/free-brands-svg-icons"; import { faDiscord, faTwitter, faTelegram } from "@fortawesome/free-brands-svg-icons";
/* add icons to the library */ /* add icons to the library */
library.add( library.add(
faArrowDown, faArrowDown,
@@ -29,7 +28,9 @@ library.add(
faCaretLeft, faCaretLeft,
faCaretRight, faCaretRight,
faBars, faBars,
faAnglesRight faAnglesRight,
faArrowRightToBracket,
faArrowRightFromBracket
); );
const app = createApp(App) const app = createApp(App)
-19
View File
@@ -1,8 +1,6 @@
import { defineStore } from "pinia"; import { defineStore } from "pinia";
import MemeBurnerJson from "@/assets/contracts/MemeBurner.json"; import MemeBurnerJson from "@/assets/contracts/MemeBurner.json";
import { useTokenStore } from "./tokens"; import { useTokenStore } from "./tokens";
import { useMultiCallStore } from "./multicall";
import { useWalletStore } from "./wallet";
import { useWalletStoreV2 } from "./walletV2"; import { useWalletStoreV2 } from "./walletV2";
import { useRoundsStore } from "@/stores/rounds"; import { useRoundsStore } from "@/stores/rounds";
@@ -22,28 +20,12 @@ export const useMemeburnerStore = defineStore("memeburner", {
const walletStore = useWalletStoreV2(); const walletStore = useWalletStoreV2();
// const roundsStore = useRoundsStore(); // const roundsStore = useRoundsStore();
console.log("walletStore.walletClient", walletStore.walletClient); console.log("walletStore.walletClient", walletStore.walletClient);
// this.contract = new walletStore.web3.eth.Contract(this.config.abi, this.config.contractAddress);
this.contract = getContract({ this.contract = getContract({
address: this.config.contractAddress, address: this.config.contractAddress,
abi: this.config.abi, abi: this.config.abi,
walletClient: walletStore.walletClient || walletStore.publicClient, walletClient: walletStore.walletClient || walletStore.publicClient,
}); });
console.log("this.contract", this.contract); console.log("this.contract", this.contract);
// 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 getRewardFor(amount) { async getRewardFor(amount) {
const tokenStore = useTokenStore(); const tokenStore = useTokenStore();
@@ -87,7 +69,6 @@ export const useMemeburnerStore = defineStore("memeburner", {
return data; return data;
}, },
async sacrificeMeme(amount) { async sacrificeMeme(amount) {
const walletStore = useWalletStore();
const tokenStore = useTokenStore(); const tokenStore = useTokenStore();
try { try {
if (!amount || amount == 0) { if (!amount || amount == 0) {
-49
View File
@@ -1,49 +0,0 @@
import { defineStore } from "pinia";
import MulticallJson from "@/assets/contracts/Multicall.json";
import { useWalletStore } from "./wallet";
export const useMultiCallStore = defineStore("multicall", {
state: () => ({
config: MulticallJson,
contract: null,
}),
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();
return {
target: call._parent._address,
callData,
};
});
const { returnData } = await this.contract.methods.aggregate(callRequests).call(parameters);
return returnData.map((hex, index) => {
const types = calls[index]._method.outputs.map((o) =>
o.internalType !== o.type && o.internalType !== undefined ? o : o.type
);
const walletStore = useWalletStore();
let result = walletStore.web3.eth.abi.decodeParameters(types, hex);
delete result.__length__;
result = Object.values(result);
return result.length === 1 ? result[0] : result;
});
}
}
}
);
+1 -4
View File
@@ -1,10 +1,7 @@
import { defineStore } from "pinia"; import { defineStore } from "pinia";
import RewardLockerJson from "@/assets/contracts/RewardLocker.json"; import RewardLockerJson from "@/assets/contracts/RewardLocker.json";
import { useTokenStore } from "./tokens"; import { useTokenStore } from "./tokens";
import { useMultiCallStore } from "./multicall";
import { useWalletStore } from "./wallet";
import { useWalletStoreV2 } from "./walletV2"; import { useWalletStoreV2 } from "./walletV2";
import { ethers } from "ethers";
import { multicall, getContract } from "@wagmi/core"; import { multicall, getContract } from "@wagmi/core";
@@ -24,7 +21,6 @@ export const useRewardLockerStore = defineStore("rewardlocker", {
abi: this.config.abi, abi: this.config.abi,
walletClient: walletStore.walletClient || walletStore.publicClient, walletClient: walletStore.walletClient || walletStore.publicClient,
}); });
// this.contract = new walletStore.web3.eth.Contract(this.config.abi, this.config.contractAddress);
}, },
/* /*
* @param {*} walletAddress * @param {*} walletAddress
@@ -62,6 +58,7 @@ export const useRewardLockerStore = defineStore("rewardlocker", {
return await this.contract.read.lastCompletedRound(); return await this.contract.read.lastCompletedRound();
}, },
async claim(round) { async claim(round) {
console.log("claim");
const walletStore = useWalletStoreV2(); const walletStore = useWalletStoreV2();
// return await this.contract.methods.claim(round).call(); // return await this.contract.methods.claim(round).call();
console.log(this.contract.methods.claim(round)); console.log(this.contract.methods.claim(round));
-1
View File
@@ -2,7 +2,6 @@ import { defineStore } from "pinia";
import { useMemeburnerStore } from "./memeburner"; import { useMemeburnerStore } from "./memeburner";
import { useTokenStore } from "./tokens"; import { useTokenStore } from "./tokens";
import { useRewardLockerStore } from "./rewardlocker"; import { useRewardLockerStore } from "./rewardlocker";
import { useWalletStore } from "./wallet";
import { useWalletStoreV2 } from "./walletV2"; import { useWalletStoreV2 } from "./walletV2";
+26 -38
View File
@@ -1,10 +1,7 @@
import { defineStore } from "pinia"; import { defineStore } from "pinia";
import { markRaw } from "vue"; import { markRaw } from "vue";
import Web3 from "web3";
import { useWalletStore } from "./wallet";
import { useWalletStoreV2 } from "./walletV2"; import { useWalletStoreV2 } from "./walletV2";
import { useContractStore } from "./contracts"; import { useContractStore } from "./contracts";
import { ethers } from "ethers";
import { useMemeburnerStore } from "./memeburner"; import { useMemeburnerStore } from "./memeburner";
import Meme1Json from "@/assets/contracts/Meme1.json"; import Meme1Json from "@/assets/contracts/Meme1.json";
import Meme2Json from "@/assets/contracts/Meme2.json"; import Meme2Json from "@/assets/contracts/Meme2.json";
@@ -74,45 +71,47 @@ export const useTokenStore = defineStore("token", {
const contracts = []; const contracts = [];
const walletStore = useWalletStoreV2(); const walletStore = useWalletStoreV2();
for (let index = 0; index < this.token.length; index++) { for (let index = 0; index < this.token.length; index++) {
const token = this.token[index]; const token = this.token[index];
token.contract = getContract({ console.log("token123abc", token);
var test = getContract({
address: token.contractAddress, address: token.contractAddress,
abi: token.abi, abi: token.abi,
walletClient: walletStore.walletClient || walletStore.publicClient, // walletClient: walletStore.publicClient,
}); });
console.log("test", test);
console.log("token.contract", token.contract); console.log("token.contract", token.contract);
contracts.push({...token.contract, functionName: "decimals"}) var decimals = await test.read.decimals();
console.log("decimals", decimals);
token.contract = test;
// contracts.push({...token.contract, functionName: "decimals"})
} }
//MemeToken init //MemeToken init
this.memeToken.contract = getContract({ // this.memeToken.contract = getContract({
address: this.memeToken.config.contractAddress, // address: this.memeToken.config.contractAddress,
abi: this.memeToken.config.abi, // abi: this.memeToken.config.abi,
PublicClient: walletStore.publicClient, // walletClient: walletStore.walletClient || walletStore.publicClient,
WalletClient: walletStore.walletClient, // });
}); // contracts.push({ ...this.memeToken.contract, functionName: "decimals" });
contracts.push({ ...this.memeToken.contract, functionName: "decimals" });
const data = await multicall({ // const data = await multicall({
contracts, // contracts,
}); // });
//multicall decimal // //multicall decimal
for (let index = 0; index < this.token.length; index++) { // for (let index = 0; index < this.token.length; index++) {
const token = this.token[index]; // const token = this.token[index];
token.decimals = data[index].result // token.decimals = data[index].result
} // }
this.memeToken.decimals = data[this.token.length].result; // this.memeToken.decimals = data[this.token.length].result;
}, },
async changeActiveToken(token) { async changeActiveToken(token) {
console.log("changeActiveToken"); console.log("changeActiveToken");
this.activeToken = token; this.activeToken = token;
// const web3 = new Web3(window.ethereum);
// this.contract = new web3.eth.Contract(token.abi, token.contractAddress);
const walletStore = useWalletStoreV2(); const walletStore = useWalletStoreV2();
if (walletStore.connected) { if (walletStore.connected) {
//TODO, wenn connected, dann all diese Daten laden? //TODO, wenn connected, dann all diese Daten laden?
@@ -143,20 +142,17 @@ export const useTokenStore = defineStore("token", {
async approveToken(amount) { async approveToken(amount) {
try { try {
this.loading = true; this.loading = true;
const walletStore = useWalletStore();
const memeBurnerStore = useMemeburnerStore(); const memeBurnerStore = useMemeburnerStore();
// var approve = await this.contract.methods // var approve = await this.contract.methods
// .approve(memeBurnerStore.config.contractAddress, amount) // .approve(memeBurnerStore.config.contractAddress, amount)
// .send({ from: walletStore.address}); // .send({ from: walletStore.address});
console.log("approve");
var approveHash = await this.activeToken.contract.write.approve([ var approveHash = await this.activeToken.contract.write.approve([
memeBurnerStore.config.contractAddress, memeBurnerStore.config.contractAddress,
amount, amount,
]); ]);
console.log("approveHash", approvehash); console.log("approveHash", approvehash);
//todo parameter value übergeben in eth web3.utils.toHex(web3.utils.toWei(amount, 'ether'))
// .send({ from: walletStore.address, value: 0.5 });
// this.activeToken.allowance = await this.allowance();
const data = await waitForTransaction({ const data = await waitForTransaction({
hash: approveHash, hash: approveHash,
}); });
@@ -167,16 +163,8 @@ export const useTokenStore = defineStore("token", {
this.loading = false; this.loading = false;
} }
}, },
getTokenContract(token) {
console.log("token", token);
const contractAddress = token.contractAddress;
const activeToken = this.token.find((obj) => obj.contractAddress === contractAddress);
const web3 = new Web3(window.ethereum);
const contract = new web3.eth.Contract(activeToken.abi, contractAddress);
return contract;
},
async nonces(userAddress) { async nonces(userAddress) {
return this.memeToken.contract.methods.nonces(userAddress).call(); return this.memeToken.contract.read.nonces([userAddress])
} }
}, },
}); });
-119
View File
@@ -1,119 +0,0 @@
import { defineStore } from "pinia";
import { markRaw } from "vue";
import { useTokenStore } from "./tokens";
import Web3 from "web3";
export const useWalletStore = defineStore("wallet", {
state: () => ({
count: 0,
alchemy: null,
connected: false,
address: null,
web3: null,
provider: null
}),
getters: {
},
actions: {
async init() {
console.log("wallet init");
await this.isConnected();
const goerliKey = import.meta.env.VITE_GOERLI_KEY;
if (this.connected) {
const web3 = new Web3(window.ethereum);
this.web3 = markRaw(web3);
console.log("hierabc");
window.ethereum.on("accountsChanged", async (data) => {
console.log("accountsChanged", data);
console.log("data", data);
if (data.length > 0) {
this.address = data[0]
this.connected = true;
} else {
this.address = null;
this.connected = false;
}
});
// 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}`)
);
},
// connectWalletV2(connector) {
// this.address = data[0];
// },
connectWallet() {
window.ethereum
.request({ method: "eth_requestAccounts" })
.then((data) => {
console.log("data", data);
this.address = data[0];
this.connected = true;
this.init();
})
.catch((error) => {
if (error.code === 4001) {
// EIP-1193 userRejectedRequest error
console.log("Please connect to MetaMask.");
} else {
console.error(error);
}
});
// }
},
async getTokenBalance(token) {
const tokenStore = useTokenStore();
const contract = tokenStore.getTokenContract(token);
const result = await contract.methods.balanceOf(this.address).call();
return result;
},
async isConnected() {
try {
this.loading = true;
if (!window.ethereum) {
console.warn("Metamask not installed"),
this.connected = false;
return;
}
const accounts = await window.ethereum.request({ method: "eth_accounts" });
if (accounts.length) {
this.connected = true;
this.address = accounts[0];
console.log(`You're connected to: ${accounts[0]}`);
// const web3 = new Web3(window.ethereum);
// const tokenStore = useTokenStore();
// console.log("tokenStore.activeToken", tokenStore.activeToken);
// if (tokenStore.activeToken.contractAddress) {
// tokenStore.activeToken.balance = await this.getTokenBalance(
// tokenStore.activeToken
// );
// tokenStore.activeToken.allowance = await tokenStore.allowance();
// }
// tokenStore.memeBurner.contract = new web3.eth.Contract(
// tokenStore.memeBurner.config.abi,
// tokenStore.memeBurner.config.contractAddress
// );
} else {
console.log("Metamask is not connected");
this.connected = false;
}
} catch (error) {
console.log("error", error);
} finally {
this.loading = false;
return this.connected
}
}
},
persist: true,
});
+15 -43
View File
@@ -5,7 +5,6 @@ import { useTokenStore } from "./tokens";
import { import {
createConfig, createConfig,
configureChains, configureChains,
mainnet,
getAccount, getAccount,
getContract, getContract,
connect, connect,
@@ -13,13 +12,14 @@ import {
InjectedConnector, InjectedConnector,
watchAccount, watchAccount,
getWalletClient, getWalletClient,
fetchBalance
} from "@wagmi/core"; } from "@wagmi/core";
import { WalletConnectConnector } from "@wagmi/core/connectors/walletConnect"; import { WalletConnectConnector } from "@wagmi/core/connectors/walletConnect";
import { MetaMaskConnector } from "@wagmi/core/connectors/metaMask"; import { MetaMaskConnector } from "@wagmi/core/connectors/metaMask";
import { CoinbaseWalletConnector } from "@wagmi/core/connectors/coinbaseWallet"; import { CoinbaseWalletConnector } from "@wagmi/core/connectors/coinbaseWallet";
import { goerli } from "@wagmi/core/chains"; import { goerli, mainnet } from "@wagmi/core/chains";
import { publicProvider } from "@wagmi/core/providers/public"; import { publicProvider } from "@wagmi/core/providers/public";
import { alchemyProvider } from "@wagmi/core/providers/alchemy"; import { alchemyProvider } from "@wagmi/core/providers/alchemy";
@@ -30,7 +30,6 @@ export const useWalletStoreV2 = defineStore("walletV2", {
alchemy: null, alchemy: null,
connected: false, connected: false,
address: null, address: null,
web3: null,
provider: null, provider: null,
client: null, client: null,
publicClient: null, publicClient: null,
@@ -47,7 +46,7 @@ export const useWalletStoreV2 = defineStore("walletV2", {
const projectId = "d8e5ecb0353c02e21d4c0867d4473ac5"; const projectId = "d8e5ecb0353c02e21d4c0867d4473ac5";
const { chains, publicClient, webSocketPublicClient } = configureChains( const { chains, publicClient, webSocketPublicClient } = configureChains(
[goerli], [goerli, mainnet],
[alchemyProvider({ apiKey: goerliKey }), publicProvider()] [alchemyProvider({ apiKey: goerliKey }), publicProvider()]
); );
@@ -84,39 +83,8 @@ export const useWalletStoreV2 = defineStore("walletV2", {
console.log("this.config", this.config); console.log("this.config", this.config);
const walletClient = await getWalletClient(); const walletClient = await getWalletClient();
console.log("walletClient", walletClient); console.log("walletClient", walletClient);
// await this.isConnected();
// const goerliKey = import.meta.env.VITE_GOERLI_KEY;
// if (this.connected) {
// const web3 = new Web3(window.ethereum);
// this.web3 = markRaw(web3);
// console.log("hierabc");
// window.ethereum.on("accountsChanged", async (data) => {
// console.log("accountsChanged", data);
// console.log("data", data);
// if (data.length > 0) {
// this.address = data[0];
// this.connected = true;
// } else {
// this.address = null;
// this.connected = false;
// }
// });
// // 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}`)
// );
}, },
// connectWalletV2(connector) {
// this.address = data[0];
// },
async connectWallet(connector) { async connectWallet(connector) {
console.log("connector.name", connector.name); console.log("connector.name", connector.name);
// if (!account.isConnected) { // if (!account.isConnected) {
@@ -124,16 +92,20 @@ export const useWalletStoreV2 = defineStore("walletV2", {
chainId: goerli.id, chainId: goerli.id,
connector: connector, connector: connector,
}); });
console.log("connection", connection);
// this.address = connection.account; // this.address = connection.account;
}, },
async getTokenBalance(token) { async getTokenBalance(token) {
// const tokenStore = useTokenStore(); console.log("token", token);
// const contract = tokenStore.getTokenContract(token); console.log("address", this.address);
// const result = await contract.methods.balanceOf(this.address).call(); // const result = await token.contract.read.balanceOf([this.address]);
console.log("this.address", this.address); // return result;
const result = await token.contract.read.balanceOf([this.address]); },
return result;
}, async getTokenBalances() {
//todo
}
// async isConnected() { // async isConnected() {
// try { // try {
// this.loading = true; // this.loading = true;
+1 -4
View File
@@ -4,7 +4,6 @@ import { storeToRefs } from "pinia";
import SacrificeToken from "@/components/SacrificeToken.vue"; import SacrificeToken from "@/components/SacrificeToken.vue";
import BloodChart from "@/components/BloodChart.vue"; import BloodChart from "@/components/BloodChart.vue";
import TokenClaim from "@/components/TokenClaim.vue"; import TokenClaim from "@/components/TokenClaim.vue";
// import Web3 from "web3";
// import { useWalletStore } from "@/stores/wallet"; // import { useWalletStore } from "@/stores/wallet";
import { useTokenStore } from "@/stores/tokens"; import { useTokenStore } from "@/stores/tokens";
import { useRoundsStore } from "@/stores/rounds"; import { useRoundsStore } from "@/stores/rounds";
@@ -49,9 +48,7 @@ onBeforeUnmount(() => {
}); });
function timeBetweenDates() { function timeBetweenDates() {
const dateEntered = new Date( const dateEntered = new Date(Number(getCurrentRoundData.value?.expirationTimestamp) * 1000);
Number(getCurrentRoundData.value?.expirationTimestamp) * 1000
);
if (dateEntered) { if (dateEntered) {
var now = new Date(); var now = new Date();
+56 -81
View File
@@ -7,20 +7,27 @@
<button @click="tokenStore.approveToken(MemeBurnerJson, 10)">wallet approve</button> <button @click="tokenStore.approveToken(MemeBurnerJson, 10)">wallet approve</button>
<button @click="stake">stake</button> <button @click="stake">stake</button>
<button @click="">unstake</button> <button @click="">unstake</button>
<button @click="fetchBalance">fetchBalance</button>
</div> </div>
</template> </template>
<script setup> <script setup>
import { onMounted, ref } from "vue"; import { onMounted, ref } from "vue";
import Web3 from "web3";
import Meme1Json from "@/assets/contracts/Meme1.json"; import Meme1Json from "@/assets/contracts/Meme1.json";
import Meme2Json from "@/assets/contracts/Meme2.json"; import Meme2Json from "@/assets/contracts/Meme2.json";
import MemeBurnerJson from "@/assets/contracts/MemeBurner.json"; import MemeBurnerJson from "@/assets/contracts/MemeBurner.json";
import MemeTokenJson from "@/assets/contracts/MemeToken.json"; import MemeTokenJson from "@/assets/contracts/MemeToken.json";
import RewardLockerJson from "@/assets/contracts/RewardLocker.json"; import RewardLockerJson from "@/assets/contracts/RewardLocker.json";
import { useTokenStore } from "@/stores/tokens"; import { useTokenStore } from "@/stores/tokens";
import { useWalletStoreV2 } from "@/stores/walletV2";
import { useRewardLockerStore } from "@/stores/rewardlocker";
import { useMemeburnerStore } from "@/stores/memeburner";
import { signTypedData } from "@wagmi/core";
const tokenStore = useTokenStore(); const tokenStore = useTokenStore();
const walletV2Store = useWalletStoreV2();
const rewardLockerStore = useRewardLockerStore();
const memeBurnerStore = useMemeburnerStore();
console.log("Meme1Json", Meme1Json); console.log("Meme1Json", Meme1Json);
console.log("Meme2Json", Meme2Json); console.log("Meme2Json", Meme2Json);
@@ -28,11 +35,6 @@ console.log("MemeBurnerJson", MemeBurnerJson);
console.log("MemeTokenJson", MemeTokenJson); console.log("MemeTokenJson", MemeTokenJson);
console.log("RewardLockerJson", RewardLockerJson); console.log("RewardLockerJson", RewardLockerJson);
// let web3 = new Web3(
// "https://eth-goerli.g.alchemy.com/v2/0-W9tOm6v_QP1PfRV8RuBCpWr-qoEbkN"
// );
// console.log("balanceOf", balanceOf);
const web3 = ref(null);
const contractMeme2 = ref(null); const contractMeme2 = ref(null);
const contractMeme1 = ref(null); const contractMeme1 = ref(null);
const contractBurner = ref(null); const contractBurner = ref(null);
@@ -40,55 +42,23 @@ const contractBloodline = ref(null);
const rewardlocker = ref(null); const rewardlocker = ref(null);
onMounted(async () => { onMounted(async () => {
web3.value = new Web3(window.ethereum); // web3.value = new Web3(window.ethereum);
// const contract = new web3.value.eth.Contract(Meme1Json.abi, Meme1Json.contractAddress); // // const contract = new web3.value.eth.Contract(Meme1Json.abi, Meme1Json.contractAddress);
console.log("web3", web3.value); // console.log("web3", web3.value);
const accounts = await web3.value.eth.getAccounts(); // const accounts = await web3.value.eth.getAccounts();
console.log("accounts", accounts); // console.log("accounts", accounts);
web3.value.eth.Contract.defaultAccount = accounts[0]; // web3.value.eth.Contract.defaultAccount = accounts[0];
// rewardlocker.value = new web3.value.eth.Contract(
contractMeme1.value = new web3.value.eth.Contract( // RewardLockerJson.abi,
Meme1Json.abi, // RewardLockerJson.contractAddress
Meme1Json.contractAddress // );
);
contractMeme2.value = new web3.value.eth.Contract(
Meme2Json.abi,
Meme2Json.contractAddress
);
contractBloodline.value = new web3.value.eth.Contract(
MemeTokenJson.abi,
MemeTokenJson.contractAddress
);
contractBurner.value = new web3.value.eth.Contract(
MemeBurnerJson.abi,
MemeBurnerJson.contractAddress
);
rewardlocker.value = new web3.value.eth.Contract(
RewardLockerJson.abi,
RewardLockerJson.contractAddress
);
}); });
async function approveMeme1() {
var approve = await contractMeme1.value.methods
.approve(MemeBurnerJson.contractAddress, 10)
.send({ from: web3.value.eth.Contract.defaultAccount });
console.log("approve", approve);
}
// async function approveMeme2() {
// var approve = await contractMeme1.value.methods.approve(web3.value.eth.Contract.defaultAccount, 10).send({ from: web3.value.eth.Contract.defaultAccount })
// console.log("approve", approve);
// }
// change this value to make yourself rich quick // change this value to make yourself rich quick
async function mintToken() { async function mintToken() {
try { try {
var mint = await contractMeme1.value.methods var mint = await tokenStore.token[0].contract.write.mint(["100000000000000000000000"]);
.mint("100000000000000000000000") // .send({ from: web3.value.eth.Contract.defaultAccount });
.send({ from: web3.value.eth.Contract.defaultAccount });
console.log("mint", mint); console.log("mint", mint);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
@@ -101,9 +71,8 @@ async function mintToken() {
async function mintToken2() { async function mintToken2() {
try { try {
var mint = await contractMeme2.value.methods var mint = await tokenStore.token[0].contract.write.mint(["100000000000000000000"]);
.mint("100000000000000000000") // .send({ from: web3.value.eth.Contract.defaultAccount });
.send({ from: web3.value.eth.Contract.defaultAccount });
console.log("mint", mint); console.log("mint", mint);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
@@ -114,14 +83,15 @@ async function mintToken2() {
// console.log("totalSupply", totalSupply); // console.log("totalSupply", totalSupply);
} }
async function fetchBalance() {
var result = await walletV2Store.fetchBalance();
console.log("result", result);
}
// 100 Meme will be sacrificed // 100 Meme will be sacrificed
async function sacrificeMeme() { async function sacrificeMeme() {
const allowance = await contractMeme1.value.methods const allowance = await contractMeme1.value.methods
.allowance( .allowance(web3.value.eth.Contract.defaultAccount, MemeBurnerJson.contractAddress)
web3.value.eth.Contract.defaultAccount,
MemeBurnerJson.contractAddress
)
.call(); .call();
console.log("allowance", allowance); console.log("allowance", allowance);
var reward = await contractBurner.value.methods var reward = await contractBurner.value.methods
@@ -139,37 +109,46 @@ async function stake() {
const spender = "0x7C3D5a19878d550D0c6c2b0BFC884ef410F6e440"; const spender = "0x7C3D5a19878d550D0c6c2b0BFC884ef410F6e440";
console.log("deadline", deadline); console.log("deadline", deadline);
var nonceTest = await contractBloodline.value.methods var nonceTest = await contractBloodline.value.methods.nonces(fromAddress).call();
.nonces(fromAddress)
.call();
console.log("type", typeof nonceTest); console.log("type", typeof nonceTest);
console.log("nonceTest", nonceTest); console.log("nonceTest", nonceTest);
const value = (1 * Math.pow(10, 18)).toString(); const value = (1 * Math.pow(10, 18)).toString();
console.log("value", value); console.log("value", value);
const messageData = createPermitMessageData( const messageData = createPermitMessageData(fromAddress, spender, nonceTest, deadline, value);
fromAddress,
spender,
nonceTest,
deadline,
value
);
console.log("messageData", messageData); console.log("messageData", messageData);
console.log("messageData.message", messageData.message);
console.log("messageData.domain", messageData.domain);
console.log("messageData.primaryType", messageData.primaryType);
// const sig = await signData(fromAddress, messageData.typedData); // const sig = await signData(fromAddress, messageData.typedData);
const signature = await signTyped(fromAddress, messageData.typedData); // const signature = await signTyped(fromAddress, messageData.typedData);
const typedData = JSON.parse(messageData.typedData);
console.log("typedData", typedData);
const signature = await signTypedData({
domain: messageData.domain,
message: messageData.message,
primaryType: messageData.primaryType,
types: typedData.types,
});
// console.log("sig", sig); // console.log("sig", sig);
console.log("signature", signature); console.log("signature", signature);
const split = splitSig(signature); const split = splitSig(signature);
console.log("split", split); console.log("split", split);
var resultStake = await rewardlocker.value.methods // var resultStake = await rewardlocker.value.methods
.stakeToBeSecured(value, deadline, split.v, split.r, split.s) // .stakeToBeSecured(value, deadline, split.v, split.r, split.s)
.send({ from: fromAddress }); // .send({ from: fromAddress });
console.log("rewardLockerStore.contract", rewardLockerStore.contract);
var resultStake = await rewardLockerStore.contract.write.stakeToBeSecured([
value,
deadline,
split.v,
split.r,
split.s,
]);
console.log("resultStake", resultStake); console.log("resultStake", resultStake);
var allowance = await contractBloodline.value.methods var allowance = await tokenStore.memeToken.contract.read.allowance([fromAddress, spender]);
.allowance(fromAddress, spender)
.call();
console.log("allowance", allowance); console.log("allowance", allowance);
// return Object.assign({}, sig, messageData.message); // return Object.assign({}, sig, messageData.message);
} }
@@ -215,13 +194,7 @@ const signData = async function (fromAddress, typeData) {
return { v, r, s }; return { v, r, s };
}; };
const createPermitMessageData = function ( const createPermitMessageData = function (fromAddress, spender, nonce, deadline, value) {
fromAddress,
spender,
nonce,
deadline,
value
) {
const message = { const message = {
owner: fromAddress, owner: fromAddress,
spender: spender, spender: spender,
@@ -276,6 +249,8 @@ const createPermitMessageData = function (
return { return {
typedData, typedData,
message, message,
domain: JSON.parse(typedData).domain,
primaryType: JSON.parse(typedData).primaryType,
}; };
}; };
// console.log("balanceOf", contract.mint(10)); // console.log("balanceOf", contract.mint(10));
+11 -16
View File
@@ -1,16 +1,16 @@
<template> <template>
<div> <div>
<div v-if="!fromAddress" @click="showConnectors = true">Connect</div> <div v-if="!fromAddress" @click="showConnectors = true">Connect</div>
<div v-if="showConnectors"> <div v-if="showConnectors">
<div v-for="connector in config.connectors" @click="connectWallet(connector)"> <div v-for="connector in config.connectors" @click="connectWallet(connector)">
{{ connector.name}} {{ connector.name }}
</div> </div>
</div> </div>
<div v-if="fromAddress" @click="disconnectWallet">Disconnect</div> <div v-if="fromAddress" @click="disconnectWallet">Disconnect</div>
</div> </div>
</template> </template>
<script setup > <script setup>
import { ref, toRaw, onMounted, onUnmounted } from "vue"; import { ref, toRaw, onMounted, onUnmounted } from "vue";
import Meme1Json from "@/assets/contracts/Meme1.json"; import Meme1Json from "@/assets/contracts/Meme1.json";
import { useWalletStore } from "@/stores/wallet"; import { useWalletStore } from "@/stores/wallet";
@@ -21,14 +21,11 @@ const showConnectors = ref(false);
import { import {
createConfig, createConfig,
configureChains, configureChains,
mainnet,
getAccount, getAccount,
getContract,
connect, connect,
disconnect, disconnect,
InjectedConnector, InjectedConnector,
getWalletClient, getWalletClient,
watchAccount,
} from "@wagmi/core"; } from "@wagmi/core";
import { WalletConnectConnector } from "@wagmi/core/connectors/walletConnect"; import { WalletConnectConnector } from "@wagmi/core/connectors/walletConnect";
@@ -77,9 +74,7 @@ config.value = createConfig({
name: "Bloodline-App", name: "Bloodline-App",
description: "TODO Bloodline Description", description: "TODO Bloodline Description",
url: "https://gitea.loseyourip.com/", url: "https://gitea.loseyourip.com/",
icons: [ icons: ["https://gitea.loseyourip.com/assets/img/vampir.png"],
"https://gitea.loseyourip.com/assets/img/vampir.png",
],
}, },
}, },
}), }),
+28 -1652
View File
File diff suppressed because it is too large Load Diff