From 5c7053c0d995fb20ec36555eaac960edc53644cc Mon Sep 17 00:00:00 2001 From: EmberSpirit Date: Sun, 24 Sep 2023 11:38:12 +0200 Subject: [PATCH] update contracts+ desktop version --- public/assets/img/cycle-icon.png | Bin 0 -> 445 bytes public/assets/img/profile-icon.png | Bin 0 -> 492 bytes public/assets/img/sacrifice-icon.png | Bin 0 -> 428 bytes src/App.vue | 57 +- src/assets/contracts/Bloodline.json | 2 +- src/assets/contracts/LiquidityOwner.json | 74 +- src/assets/contracts/Meme3.json | 368 +++++++ src/assets/contracts/Meme4.json | 368 +++++++ src/assets/contracts/Meme5.json | 368 +++++++ src/assets/contracts/MemeAltar.json | 242 +++-- src/assets/contracts/MemeBurner.json | 736 ------------- .../contracts/{MemeToken.json => Memes.json} | 69 +- src/assets/contracts/RewardLocker.json | 31 +- src/assets/contracts/UniswapPool.json | 2 +- src/assets/contracts/test.json | 992 ------------------ src/assets/sass/buttons.sass | 3 +- src/assets/sass/main.sass | 13 +- src/assets/sass/variables.sass | 8 +- src/components/ClaimComponent.vue | 68 +- src/components/ConnectWallet.vue | 219 ++-- src/components/LoadingComponent.vue | 43 + src/components/Navbar.vue | 262 ++--- src/components/SacrificeToken.vue | 461 ++++---- src/components/SlideoutPanel.vue | 7 +- src/components/StakeComponent.vue | 7 +- src/components/StakeComponentV1.vue | 214 ++-- src/components/StakeMenu.vue | 22 +- src/components/TokenClaim.vue | 6 +- src/components/TokenInput.vue | 25 +- src/components/TokenLogo.vue | 3 + src/components/TokenNamePrice.vue | 7 +- src/components/transitionTest.vue | 88 ++ src/helper/helper.js | 2 +- src/router/index.js | 11 +- src/stores/memeburner.js | 58 +- src/stores/rounds.js | 24 +- src/stores/walletV2.js | 1 - src/views/CycleView.vue | 32 +- src/views/ProfileView.vue | 18 +- src/views/TestView.vue | 2 - 40 files changed, 2327 insertions(+), 2586 deletions(-) create mode 100644 public/assets/img/cycle-icon.png create mode 100644 public/assets/img/profile-icon.png create mode 100644 public/assets/img/sacrifice-icon.png create mode 100644 src/assets/contracts/Meme3.json create mode 100644 src/assets/contracts/Meme4.json create mode 100644 src/assets/contracts/Meme5.json delete mode 100644 src/assets/contracts/MemeBurner.json rename src/assets/contracts/{MemeToken.json => Memes.json} (87%) delete mode 100644 src/assets/contracts/test.json create mode 100644 src/components/LoadingComponent.vue create mode 100644 src/components/transitionTest.vue diff --git a/public/assets/img/cycle-icon.png b/public/assets/img/cycle-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..04776b8057ccda14e1d0450adde56b361b429ffc GIT binary patch literal 445 zcmV;u0Yd(XP)eh4&=@j0V_RfA~;i!b4gv(wBC-U1cO}jepM)CNt)$;<>2&Md+0_X*lLQGq&#&=GdzSwoUOvcb(Qp!bk4UZ9W(VI<|$S!V32F8z~=qavo zLRewl&f&O*hm?uzhR9A}*AS3ripIc$JAk5`(753v+zI?+!DMgiq?<+{vcIQ#FadIh i5uMsKL^RZC{kjJRNBwuE_^`?V0000 -import { onMounted, onUnmounted, provide, ref } from "vue"; +import { onMounted, onUnmounted, provide, ref, watch } from "vue"; import { storeToRefs } from "pinia"; import { useRoute, useRouter } from "vue-router"; @@ -56,6 +56,17 @@ onUnmounted(() => { clientClientEvent.value(); console.log("unsubscribe"); }); + +watch(showPanel, (newValue, oldValue) => { + console.log("document.body", document.body); + console.log("newValue", newValue); + if (newValue) { + document.body.classList.add("sideoutpanel-open"); + } else { + document.body.classList.remove("sideoutpanel-open"); + } +}); + const handleWindowSizeChange = () => { isMobile.value = isMobileFunc(); // your code @@ -139,7 +150,7 @@ onMounted(async () => {
-
+
Success!
You turned your meme into:
@@ -147,7 +158,7 @@ onMounted(async () => {
{{ tokenStore.activeToken.rewards }}
$Blood
-
+
You can claim once the current cycle is finished and your clan bonus was calculated
@@ -179,7 +190,7 @@ onMounted(async () => { -
+
@@ -193,10 +204,6 @@ onMounted(async () => { diff --git a/src/assets/contracts/Bloodline.json b/src/assets/contracts/Bloodline.json index 72f2e5e..e57d493 100644 --- a/src/assets/contracts/Bloodline.json +++ b/src/assets/contracts/Bloodline.json @@ -1,6 +1,6 @@ { "contractName": "Bloodline", - "contractAddress": "0xda743950e70F9483ED1fDccb529c62a73BF80014", + "contractAddress": "0x00E5DAd5dA0FC4Da0baB7f0D99E28C07d8A88ee4", "abi": [ { "inputs": [ diff --git a/src/assets/contracts/LiquidityOwner.json b/src/assets/contracts/LiquidityOwner.json index d2e7366..6f05eba 100644 --- a/src/assets/contracts/LiquidityOwner.json +++ b/src/assets/contracts/LiquidityOwner.json @@ -1,6 +1,6 @@ { "contractName": "LiquidityOwner", - "contractAddress": "0xB6B58b4fD73e6bc4fcA72Fa9d40255D60950ca4B", + "contractAddress": "0x947f05D74ac7dA0Eb0CA88eF9b579D196B178BaE", "abi": [ { "inputs": [ @@ -368,6 +368,42 @@ "stateMutability": "pure", "type": "function" }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "developerFee", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "amountOfETHToPaySender", + "type": "uint256" + } + ], + "name": "payDeveloperFeeAndForGas", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "uniswapPool", + "type": "address" + }, + { + "internalType": "uint256", + "name": "extraAmount", + "type": "uint256" + } + ], + "name": "payWETHToUniswapPool", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -442,41 +478,7 @@ "type": "uint256" } ], - "name": "triggeredByMemeAltar", - "outputs": [ - { - "internalType": "uint256", - "name": "issuancePrice", - "type": "uint256" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "payForGas", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "memeAltarGasPrice", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "consumedGasByMemeAltar", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "collectedEthInRound", - "type": "uint256" - } - ], - "name": "triggeredByMemeAltar", + "name": "triggerRoundCompleted", "outputs": [ { "internalType": "uint256", diff --git a/src/assets/contracts/Meme3.json b/src/assets/contracts/Meme3.json new file mode 100644 index 0000000..317cdd2 --- /dev/null +++ b/src/assets/contracts/Meme3.json @@ -0,0 +1,368 @@ +{ + "contractName": "Meme", + "contractAddress": "0xC99B9d1693b71eF503c86B4cC05f141714176E5b", + "abi": [ + { + "inputs": [ + { + "internalType": "string", + "name": "name", + "type": "string" + }, + { + "internalType": "string", + "name": "symbol", + "type": "string" + }, + { + "internalType": "address", + "name": "_weth", + "type": "address" + }, + { + "internalType": "address", + "name": "_uniV2Factory", + "type": "address" + } + ], + "stateMutability": "payable", + "type": "constructor" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "owner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "spender", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "Approval", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "from", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "Transfer", + "type": "event" + }, + { + "inputs": [], + "name": "DOMAIN_SEPARATOR", + "outputs": [ + { + "internalType": "bytes32", + "name": "", + "type": "bytes32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + }, + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "allowance", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "spender", + "type": "address" + }, + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "approve", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "balanceOf", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "burn", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "decimals", + "outputs": [ + { + "internalType": "uint8", + "name": "", + "type": "uint8" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "mint", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "name", + "outputs": [ + { + "internalType": "string", + "name": "", + "type": "string" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "nonces", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "owner", + "type": "address" + }, + { + "internalType": "address", + "name": "spender", + "type": "address" + }, + { + "internalType": "uint256", + "name": "value", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "deadline", + "type": "uint256" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" + } + ], + "name": "permit", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "symbol", + "outputs": [ + { + "internalType": "string", + "name": "", + "type": "string" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "totalSupply", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "transfer", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "from", + "type": "address" + }, + { + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "transferFrom", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "uniV2Pool", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + } + ] +} \ No newline at end of file diff --git a/src/assets/contracts/Meme4.json b/src/assets/contracts/Meme4.json new file mode 100644 index 0000000..9d0a641 --- /dev/null +++ b/src/assets/contracts/Meme4.json @@ -0,0 +1,368 @@ +{ + "contractName": "Meme", + "contractAddress": "0xBCf48173f0767465Ef22fcDe2e1a099C8A5B4712", + "abi": [ + { + "inputs": [ + { + "internalType": "string", + "name": "name", + "type": "string" + }, + { + "internalType": "string", + "name": "symbol", + "type": "string" + }, + { + "internalType": "address", + "name": "_weth", + "type": "address" + }, + { + "internalType": "address", + "name": "_uniV2Factory", + "type": "address" + } + ], + "stateMutability": "payable", + "type": "constructor" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "owner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "spender", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "Approval", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "from", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "Transfer", + "type": "event" + }, + { + "inputs": [], + "name": "DOMAIN_SEPARATOR", + "outputs": [ + { + "internalType": "bytes32", + "name": "", + "type": "bytes32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + }, + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "allowance", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "spender", + "type": "address" + }, + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "approve", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "balanceOf", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "burn", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "decimals", + "outputs": [ + { + "internalType": "uint8", + "name": "", + "type": "uint8" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "mint", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "name", + "outputs": [ + { + "internalType": "string", + "name": "", + "type": "string" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "nonces", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "owner", + "type": "address" + }, + { + "internalType": "address", + "name": "spender", + "type": "address" + }, + { + "internalType": "uint256", + "name": "value", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "deadline", + "type": "uint256" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" + } + ], + "name": "permit", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "symbol", + "outputs": [ + { + "internalType": "string", + "name": "", + "type": "string" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "totalSupply", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "transfer", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "from", + "type": "address" + }, + { + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "transferFrom", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "uniV2Pool", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + } + ] +} \ No newline at end of file diff --git a/src/assets/contracts/Meme5.json b/src/assets/contracts/Meme5.json new file mode 100644 index 0000000..647599b --- /dev/null +++ b/src/assets/contracts/Meme5.json @@ -0,0 +1,368 @@ +{ + "contractName": "Meme", + "contractAddress": "0xD563C6d061c5fc09eCf94c6Ce30CB400Ce2FD295", + "abi": [ + { + "inputs": [ + { + "internalType": "string", + "name": "name", + "type": "string" + }, + { + "internalType": "string", + "name": "symbol", + "type": "string" + }, + { + "internalType": "address", + "name": "_weth", + "type": "address" + }, + { + "internalType": "address", + "name": "_uniV2Factory", + "type": "address" + } + ], + "stateMutability": "payable", + "type": "constructor" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "owner", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "spender", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "Approval", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "from", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "Transfer", + "type": "event" + }, + { + "inputs": [], + "name": "DOMAIN_SEPARATOR", + "outputs": [ + { + "internalType": "bytes32", + "name": "", + "type": "bytes32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + }, + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "allowance", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "spender", + "type": "address" + }, + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "approve", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "balanceOf", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "burn", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "decimals", + "outputs": [ + { + "internalType": "uint8", + "name": "", + "type": "uint8" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "mint", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "name", + "outputs": [ + { + "internalType": "string", + "name": "", + "type": "string" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "nonces", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "owner", + "type": "address" + }, + { + "internalType": "address", + "name": "spender", + "type": "address" + }, + { + "internalType": "uint256", + "name": "value", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "deadline", + "type": "uint256" + }, + { + "internalType": "uint8", + "name": "v", + "type": "uint8" + }, + { + "internalType": "bytes32", + "name": "r", + "type": "bytes32" + }, + { + "internalType": "bytes32", + "name": "s", + "type": "bytes32" + } + ], + "name": "permit", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "symbol", + "outputs": [ + { + "internalType": "string", + "name": "", + "type": "string" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "totalSupply", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "transfer", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "from", + "type": "address" + }, + { + "internalType": "address", + "name": "to", + "type": "address" + }, + { + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "transferFrom", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "uniV2Pool", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + } + ] +} \ No newline at end of file diff --git a/src/assets/contracts/MemeAltar.json b/src/assets/contracts/MemeAltar.json index 105129e..e7e56b7 100644 --- a/src/assets/contracts/MemeAltar.json +++ b/src/assets/contracts/MemeAltar.json @@ -1,6 +1,6 @@ { "contractName": "MemeAltar", - "contractAddress": "0x6Def7896c714b77bD9BcD6BF5d88A1e7000C86dE", + "contractAddress": "0x9842954639aF0c1d7A692222955868806287aeEA", "abi": [ { "inputs": [ @@ -19,11 +19,6 @@ "name": "_weth", "type": "address" }, - { - "internalType": "address", - "name": "_developer", - "type": "address" - }, { "internalType": "address", "name": "_admin", @@ -40,9 +35,9 @@ "type": "address" }, { - "internalType": "uint256[]", - "name": "roundGoals", - "type": "uint256[]" + "internalType": "uint112", + "name": "_defaultGoal", + "type": "uint112" } ], "stateMutability": "nonpayable", @@ -55,7 +50,7 @@ }, { "inputs": [], - "name": "Impossible", + "name": "InsufficientOutputAmount", "type": "error" }, { @@ -88,6 +83,11 @@ "name": "RoundCompletedRegistrationFailed", "type": "error" }, + { + "inputs": [], + "name": "SwitchRequiresMemeBeSet", + "type": "error" + }, { "inputs": [], "name": "TokenIsNotInSacrificableList", @@ -192,37 +192,37 @@ { "components": [ { - "internalType": "uint8", + "internalType": "uint40", "name": "b1", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "m1", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "b2", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "m2", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "b3", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "m4", - "type": "uint8" + "type": "uint40" } ], - "indexed": true, + "indexed": false, "internalType": "struct MemeAltar.BM", "name": "_bm", "type": "tuple" @@ -286,34 +286,34 @@ { "components": [ { - "internalType": "uint8", + "internalType": "uint40", "name": "b1", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "m1", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "b2", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "m2", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "b3", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "m4", - "type": "uint8" + "type": "uint40" } ], "internalType": "struct MemeAltar.BM", @@ -335,9 +335,9 @@ { "inputs": [ { - "internalType": "uint256", + "internalType": "uint112", "name": "newDefaultGoal", - "type": "uint256" + "type": "uint112" } ], "name": "adjustDefaultGoal", @@ -354,9 +354,9 @@ { "inputs": [ { - "internalType": "uint256", + "internalType": "uint32", "name": "newDurationLimit", - "type": "uint256" + "type": "uint32" } ], "name": "adjustRoundDurationLimit", @@ -401,34 +401,34 @@ "name": "bm", "outputs": [ { - "internalType": "uint8", + "internalType": "uint40", "name": "b1", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "m1", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "b2", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "m2", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "b3", - "type": "uint8" + "type": "uint40" }, { - "internalType": "uint8", + "internalType": "uint40", "name": "m4", - "type": "uint8" + "type": "uint40" } ], "stateMutability": "view", @@ -439,9 +439,9 @@ "name": "currentRound", "outputs": [ { - "internalType": "uint256", + "internalType": "uint112", "name": "", - "type": "uint256" + "type": "uint112" } ], "stateMutability": "view", @@ -452,8 +452,37 @@ "name": "defaultGoal", "outputs": [ { - "internalType": "uint256", + "internalType": "uint112", "name": "", + "type": "uint112" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "memeToSacrifice", + "type": "address" + }, + { + "internalType": "uint256", + "name": "amountToSacrifice", + "type": "uint256" + }, + { + "internalType": "bool", + "name": "roundParticipant", + "type": "bool" + } + ], + "name": "getAmountETHBase", + "outputs": [ + { + "internalType": "uint256", + "name": "amountETHBase", "type": "uint256" } ], @@ -466,6 +495,11 @@ "internalType": "address", "name": "memeToSacrifice", "type": "address" + }, + { + "internalType": "bool", + "name": "buyFunc", + "type": "bool" } ], "name": "getAmountToReachGoal", @@ -482,12 +516,12 @@ { "inputs": [ { - "internalType": "uint256", + "internalType": "uint112", "name": "roundNumber", - "type": "uint256" + "type": "uint112" } ], - "name": "getGoalInBLD", + "name": "getGoalInBLOOD", "outputs": [ { "internalType": "uint256", @@ -511,7 +545,7 @@ "type": "uint256" } ], - "name": "getRewardFor", + "name": "getRewardForSacrifice", "outputs": [ { "internalType": "uint256", @@ -525,9 +559,9 @@ { "inputs": [ { - "internalType": "uint256", + "internalType": "uint112", "name": "roundNumber", - "type": "uint256" + "type": "uint112" }, { "internalType": "address", @@ -652,9 +686,9 @@ "name": "roundDurationLimit", "outputs": [ { - "internalType": "uint256", + "internalType": "uint32", "name": "", - "type": "uint256" + "type": "uint32" } ], "stateMutability": "view", @@ -663,27 +697,27 @@ { "inputs": [ { - "internalType": "uint256", + "internalType": "uint112", "name": "", - "type": "uint256" + "type": "uint112" } ], "name": "rounds", "outputs": [ { - "internalType": "uint256", + "internalType": "uint112", "name": "goal", - "type": "uint256" + "type": "uint112" }, { - "internalType": "uint256", - "name": "expirationTimestamp", - "type": "uint256" - }, - { - "internalType": "uint256", + "internalType": "uint112", "name": "ethUsedToBuy", - "type": "uint256" + "type": "uint112" + }, + { + "internalType": "uint32", + "name": "expirationTimestamp", + "type": "uint32" } ], "stateMutability": "view", @@ -700,14 +734,19 @@ "internalType": "uint256", "name": "amountToSacrifice", "type": "uint256" + }, + { + "internalType": "uint112", + "name": "minETH", + "type": "uint112" } ], "name": "sacrificeMeme", "outputs": [ { - "internalType": "uint256", + "internalType": "uint128", "name": "reward", - "type": "uint256" + "type": "uint128" } ], "stateMutability": "nonpayable", @@ -715,11 +754,6 @@ }, { "inputs": [ - { - "internalType": "uint256", - "name": "minBLD", - "type": "uint256" - }, { "internalType": "address", "name": "memeToSacrifice", @@ -729,9 +763,14 @@ "internalType": "uint256", "name": "amountToSacrifice", "type": "uint256" + }, + { + "internalType": "uint256", + "name": "minBLOOD", + "type": "uint256" } ], - "name": "sacrificeMemeAndBuyBLD", + "name": "sacrificeMemeAndBuyBLOOD", "outputs": [ { "internalType": "uint256", @@ -774,6 +813,43 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "address", + "name": "meme", + "type": "address" + }, + { + "internalType": "address", + "name": "newUniV2Pool", + "type": "address" + } + ], + "name": "switchUniV2Pool", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "uniV3Pool", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ { @@ -809,10 +885,6 @@ ], "stateMutability": "view", "type": "function" - }, - { - "stateMutability": "payable", - "type": "receive" } ] } diff --git a/src/assets/contracts/MemeBurner.json b/src/assets/contracts/MemeBurner.json deleted file mode 100644 index 25d59fa..0000000 --- a/src/assets/contracts/MemeBurner.json +++ /dev/null @@ -1,736 +0,0 @@ -{ - "contractName": "MemeBurner", - "contractAddress": "0xc9cC73C414f122f85EfE20382EB753d29C5a0351", - "abi": [ - { - "inputs": [ - { - "internalType": "address[]", - "name": "sacrificableList", - "type": "address[]" - }, - { - "internalType": "address[]", - "name": "uniV2pools", - "type": "address[]" - }, - { - "internalType": "address", - "name": "_weth", - "type": "address" - }, - { - "internalType": "address", - "name": "_developer", - "type": "address" - }, - { - "internalType": "address", - "name": "_admin", - "type": "address" - }, - { - "internalType": "address", - "name": "_rewardLocker", - "type": "address" - }, - { - "internalType": "address", - "name": "_memeToken", - "type": "address" - }, - { - "internalType": "uint256[]", - "name": "roundGoals", - "type": "uint256[]" - } - ], - "stateMutability": "nonpayable", - "type": "constructor" - }, - { - "inputs": [], - "name": "ArraysHaveDifferentLength", - "type": "error" - }, - { - "inputs": [], - "name": "Impossible", - "type": "error" - }, - { - "inputs": [], - "name": "LiquidityOwnerAlreadyInitialized", - "type": "error" - }, - { - "inputs": [], - "name": "LiquidityOwnerTriggerFailed", - "type": "error" - }, - { - "inputs": [], - "name": "MemeIsNotInAList", - "type": "error" - }, - { - "inputs": [], - "name": "NextRoundRegistrationFailed", - "type": "error" - }, - { - "inputs": [], - "name": "NothingToSacrifice", - "type": "error" - }, - { - "inputs": [], - "name": "RewardRegistrationFailed", - "type": "error" - }, - { - "inputs": [], - "name": "RoundCompletedRegistrationFailed", - "type": "error" - }, - { - "inputs": [], - "name": "TokenIsNotInSacrificableList", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "uniV2Pool", - "type": "address" - } - ], - "name": "UniV2PoolWithoutLiquidity", - "type": "error" - }, - { - "anonymous": false, - "inputs": [ - { - "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": "MemeAddedToSacrificableList", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "uint256", - "name": "roundNumber", - "type": "uint256" - }, - { - "indexed": true, - "internalType": "address", - "name": "meme", - "type": "address" - } - ], - "name": "MemeRemovedFromSacrificableList", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "sacrificer", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "sacrificedToken", - "type": "address" - }, - { - "indexed": true, - "internalType": "uint256", - "name": "sacrificedAmount", - "type": "uint256" - } - ], - "name": "MemeSacrificed", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "newAdmin", - "type": "address" - } - ], - "name": "NewAdmin", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "components": [ - { - "internalType": "uint8", - "name": "b1", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "m1", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "b2", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "m2", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "b3", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "m4", - "type": "uint8" - } - ], - "indexed": true, - "internalType": "struct MemeBurner.BM", - "name": "_bm", - "type": "tuple" - } - ], - "name": "NewBM", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "uint256", - "name": "newDefaultGoal", - "type": "uint256" - } - ], - "name": "NewDefaultRoundGoal", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "uint256", - "name": "newDurationLimit", - "type": "uint256" - } - ], - "name": "NewRoundDurationLimit", - "type": "event" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "meme", - "type": "address" - }, - { - "internalType": "address", - "name": "uniV2Pool", - "type": "address" - } - ], - "name": "addMemeToList", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "components": [ - { - "internalType": "uint8", - "name": "b1", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "m1", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "b2", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "m2", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "b3", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "m4", - "type": "uint8" - } - ], - "internalType": "struct MemeBurner.BM", - "name": "newBM", - "type": "tuple" - } - ], - "name": "adjustBM", - "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": [ - { - "internalType": "uint256", - "name": "newDurationLimit", - "type": "uint256" - } - ], - "name": "adjustRoundDurationLimit", - "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": "bm", - "outputs": [ - { - "internalType": "uint8", - "name": "b1", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "m1", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "b2", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "m2", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "b3", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "m4", - "type": "uint8" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "currentRound", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "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": [ - { - "internalType": "uint256", - "name": "roundNumber", - "type": "uint256" - } - ], - "name": "getGoalInBLD", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "memeToSacrifice", - "type": "address" - }, - { - "internalType": "uint256", - "name": "amountToSacrifice", - "type": "uint256" - } - ], - "name": "getRewardFor", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "roundNumber", - "type": "uint256" - }, - { - "internalType": "address", - "name": "meme", - "type": "address" - } - ], - "name": "getSacrificedMeme", - "outputs": [ - { - "internalType": "bool", - "name": "participation", - "type": "bool" - }, - { - "internalType": "uint256", - "name": "amountAchieved", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "liquidityOwner", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "name": "memeList", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "name": "memesUniV2Pools", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "meme", - "type": "address" - } - ], - "name": "removeMemeFromList", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "rewardLocker", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "roundDurationLimit", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "name": "rounds", - "outputs": [ - { - "internalType": "uint256", - "name": "goal", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "expirationTimestamp", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "memeToSacrifice", - "type": "address" - }, - { - "internalType": "uint256", - "name": "amountToSacrifice", - "type": "uint256" - } - ], - "name": "sacrificeMeme", - "outputs": [ - { - "internalType": "uint256", - "name": "reward", - "type": "uint256" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "_liquidityOwner", - "type": "address" - } - ], - "name": "setLiquidityOwner", - "outputs": [], - "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", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - } - ] -} diff --git a/src/assets/contracts/MemeToken.json b/src/assets/contracts/Memes.json similarity index 87% rename from src/assets/contracts/MemeToken.json rename to src/assets/contracts/Memes.json index 15bd737..942c339 100644 --- a/src/assets/contracts/MemeToken.json +++ b/src/assets/contracts/Memes.json @@ -1,13 +1,36 @@ { - "contractName": "MemeToken", - "contractAddress": "0x9dcD7Cd83ED0Fe69DDfE3c2A265a1207F2Bc3219", + "Meme1": { + "address": "0x4435ABC578136e2Eca50b5EFf950F17CAF42485b", + "uniV2Pool": "0xdD84B97DbA213e1aAdFEFD3de7067fC4Ab357378" + }, + "Meme2": { + "address": "0xa0B7b2a78dF87eDc70736f7ED9D40d86c37B533F", + "uniV2Pool": "0xe9428ba55920DAB804153E9c4E8910EF1564a2b9" + }, + "Meme3": { + "address": "0xC99B9d1693b71eF503c86B4cC05f141714176E5b", + "uniV2Pool": "0x905F0FA7F878eB8bd50782F9a4B739fb50394715" + }, + "Meme4": { + "address": "0xBCf48173f0767465Ef22fcDe2e1a099C8A5B4712", + "uniV2Pool": "0x32Ba68Da1d5Df661181C8CA420b96925bFc748AA" + }, + "Meme5": { + "address": "0xD563C6d061c5fc09eCf94c6Ce30CB400Ce2FD295", + "uniV2Pool": "0xf51E0b3804945d05eC20a4a1a2B0F7eD5BFf0068" + }, "abi": [ { "inputs": [ { - "internalType": "address", - "name": "_rewardLocker", - "type": "address" + "internalType": "string", + "name": "name", + "type": "string" + }, + { + "internalType": "string", + "name": "symbol", + "type": "string" }, { "internalType": "address", @@ -16,23 +39,13 @@ }, { "internalType": "address", - "name": "_nfPositionManager", + "name": "_uniV2Factory", "type": "address" - }, - { - "internalType": "uint160[2]", - "name": "_sqrtPricesX96", - "type": "uint160[2]" } ], - "stateMutability": "nonpayable", + "stateMutability": "payable", "type": "constructor" }, - { - "inputs": [], - "name": "NotAllowedToMint", - "type": "error" - }, { "anonymous": false, "inputs": [ @@ -191,18 +204,13 @@ }, { "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - }, { "internalType": "uint256", "name": "amount", "type": "uint256" } ], - "name": "mintMemeToken", + "name": "mint", "outputs": [], "stateMutability": "nonpayable", "type": "function" @@ -282,19 +290,6 @@ "stateMutability": "nonpayable", "type": "function" }, - { - "inputs": [], - "name": "rewardLocker", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [], "name": "symbol", @@ -376,7 +371,7 @@ }, { "inputs": [], - "name": "uniV3Pool", + "name": "uniV2Pool", "outputs": [ { "internalType": "address", diff --git a/src/assets/contracts/RewardLocker.json b/src/assets/contracts/RewardLocker.json index c5a4d40..f51346a 100644 --- a/src/assets/contracts/RewardLocker.json +++ b/src/assets/contracts/RewardLocker.json @@ -1,6 +1,6 @@ { "contractName": "RewardLocker", - "contractAddress": "0xc180014777BC1E0720dDD4CA5952c1Cd277f7afE", + "contractAddress": "0xc9f5F78320D0f75099eEA8f8F6FD35BF246f0916", "abi": [ { "inputs": [ @@ -516,35 +516,6 @@ "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": [ { diff --git a/src/assets/contracts/UniswapPool.json b/src/assets/contracts/UniswapPool.json index 7145c02..12d3416 100644 --- a/src/assets/contracts/UniswapPool.json +++ b/src/assets/contracts/UniswapPool.json @@ -1,5 +1,5 @@ { "contractName": "OurUniV3Pool", - "contractAddress": "0x12e7D6FbE5430bAa1B1C31E04CFbB94940Ac655C", + "contractAddress": "0xAbcc96a2cA1642B52AeCa81F3BCb25A92D7b9dDB", "abi": [{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"int24","name":"tickLower","type":"int24"},{"indexed":true,"internalType":"int24","name":"tickUpper","type":"int24"},{"indexed":false,"internalType":"uint128","name":"amount","type":"uint128"},{"indexed":false,"internalType":"uint256","name":"amount0","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amount1","type":"uint256"}],"name":"Burn","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":false,"internalType":"address","name":"recipient","type":"address"},{"indexed":true,"internalType":"int24","name":"tickLower","type":"int24"},{"indexed":true,"internalType":"int24","name":"tickUpper","type":"int24"},{"indexed":false,"internalType":"uint128","name":"amount0","type":"uint128"},{"indexed":false,"internalType":"uint128","name":"amount1","type":"uint128"}],"name":"Collect","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"sender","type":"address"},{"indexed":true,"internalType":"address","name":"recipient","type":"address"},{"indexed":false,"internalType":"uint128","name":"amount0","type":"uint128"},{"indexed":false,"internalType":"uint128","name":"amount1","type":"uint128"}],"name":"CollectProtocol","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"sender","type":"address"},{"indexed":true,"internalType":"address","name":"recipient","type":"address"},{"indexed":false,"internalType":"uint256","name":"amount0","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amount1","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"paid0","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"paid1","type":"uint256"}],"name":"Flash","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint16","name":"observationCardinalityNextOld","type":"uint16"},{"indexed":false,"internalType":"uint16","name":"observationCardinalityNextNew","type":"uint16"}],"name":"IncreaseObservationCardinalityNext","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint160","name":"sqrtPriceX96","type":"uint160"},{"indexed":false,"internalType":"int24","name":"tick","type":"int24"}],"name":"Initialize","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"sender","type":"address"},{"indexed":true,"internalType":"address","name":"owner","type":"address"},{"indexed":true,"internalType":"int24","name":"tickLower","type":"int24"},{"indexed":true,"internalType":"int24","name":"tickUpper","type":"int24"},{"indexed":false,"internalType":"uint128","name":"amount","type":"uint128"},{"indexed":false,"internalType":"uint256","name":"amount0","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"amount1","type":"uint256"}],"name":"Mint","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint8","name":"feeProtocol0Old","type":"uint8"},{"indexed":false,"internalType":"uint8","name":"feeProtocol1Old","type":"uint8"},{"indexed":false,"internalType":"uint8","name":"feeProtocol0New","type":"uint8"},{"indexed":false,"internalType":"uint8","name":"feeProtocol1New","type":"uint8"}],"name":"SetFeeProtocol","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"sender","type":"address"},{"indexed":true,"internalType":"address","name":"recipient","type":"address"},{"indexed":false,"internalType":"int256","name":"amount0","type":"int256"},{"indexed":false,"internalType":"int256","name":"amount1","type":"int256"},{"indexed":false,"internalType":"uint160","name":"sqrtPriceX96","type":"uint160"},{"indexed":false,"internalType":"uint128","name":"liquidity","type":"uint128"},{"indexed":false,"internalType":"int24","name":"tick","type":"int24"}],"name":"Swap","type":"event"},{"inputs":[{"internalType":"int24","name":"tickLower","type":"int24"},{"internalType":"int24","name":"tickUpper","type":"int24"},{"internalType":"uint128","name":"amount","type":"uint128"}],"name":"burn","outputs":[{"internalType":"uint256","name":"amount0","type":"uint256"},{"internalType":"uint256","name":"amount1","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"recipient","type":"address"},{"internalType":"int24","name":"tickLower","type":"int24"},{"internalType":"int24","name":"tickUpper","type":"int24"},{"internalType":"uint128","name":"amount0Requested","type":"uint128"},{"internalType":"uint128","name":"amount1Requested","type":"uint128"}],"name":"collect","outputs":[{"internalType":"uint128","name":"amount0","type":"uint128"},{"internalType":"uint128","name":"amount1","type":"uint128"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"recipient","type":"address"},{"internalType":"uint128","name":"amount0Requested","type":"uint128"},{"internalType":"uint128","name":"amount1Requested","type":"uint128"}],"name":"collectProtocol","outputs":[{"internalType":"uint128","name":"amount0","type":"uint128"},{"internalType":"uint128","name":"amount1","type":"uint128"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"factory","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"fee","outputs":[{"internalType":"uint24","name":"","type":"uint24"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"feeGrowthGlobal0X128","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"feeGrowthGlobal1X128","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"recipient","type":"address"},{"internalType":"uint256","name":"amount0","type":"uint256"},{"internalType":"uint256","name":"amount1","type":"uint256"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"flash","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint16","name":"observationCardinalityNext","type":"uint16"}],"name":"increaseObservationCardinalityNext","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint160","name":"sqrtPriceX96","type":"uint160"}],"name":"initialize","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"liquidity","outputs":[{"internalType":"uint128","name":"","type":"uint128"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"maxLiquidityPerTick","outputs":[{"internalType":"uint128","name":"","type":"uint128"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"recipient","type":"address"},{"internalType":"int24","name":"tickLower","type":"int24"},{"internalType":"int24","name":"tickUpper","type":"int24"},{"internalType":"uint128","name":"amount","type":"uint128"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"mint","outputs":[{"internalType":"uint256","name":"amount0","type":"uint256"},{"internalType":"uint256","name":"amount1","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"observations","outputs":[{"internalType":"uint32","name":"blockTimestamp","type":"uint32"},{"internalType":"int56","name":"tickCumulative","type":"int56"},{"internalType":"uint160","name":"secondsPerLiquidityCumulativeX128","type":"uint160"},{"internalType":"bool","name":"initialized","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint32[]","name":"secondsAgos","type":"uint32[]"}],"name":"observe","outputs":[{"internalType":"int56[]","name":"tickCumulatives","type":"int56[]"},{"internalType":"uint160[]","name":"secondsPerLiquidityCumulativeX128s","type":"uint160[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"name":"positions","outputs":[{"internalType":"uint128","name":"liquidity","type":"uint128"},{"internalType":"uint256","name":"feeGrowthInside0LastX128","type":"uint256"},{"internalType":"uint256","name":"feeGrowthInside1LastX128","type":"uint256"},{"internalType":"uint128","name":"tokensOwed0","type":"uint128"},{"internalType":"uint128","name":"tokensOwed1","type":"uint128"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"protocolFees","outputs":[{"internalType":"uint128","name":"token0","type":"uint128"},{"internalType":"uint128","name":"token1","type":"uint128"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint8","name":"feeProtocol0","type":"uint8"},{"internalType":"uint8","name":"feeProtocol1","type":"uint8"}],"name":"setFeeProtocol","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"slot0","outputs":[{"internalType":"uint160","name":"sqrtPriceX96","type":"uint160"},{"internalType":"int24","name":"tick","type":"int24"},{"internalType":"uint16","name":"observationIndex","type":"uint16"},{"internalType":"uint16","name":"observationCardinality","type":"uint16"},{"internalType":"uint16","name":"observationCardinalityNext","type":"uint16"},{"internalType":"uint8","name":"feeProtocol","type":"uint8"},{"internalType":"bool","name":"unlocked","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"int24","name":"tickLower","type":"int24"},{"internalType":"int24","name":"tickUpper","type":"int24"}],"name":"snapshotCumulativesInside","outputs":[{"internalType":"int56","name":"tickCumulativeInside","type":"int56"},{"internalType":"uint160","name":"secondsPerLiquidityInsideX128","type":"uint160"},{"internalType":"uint32","name":"secondsInside","type":"uint32"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"recipient","type":"address"},{"internalType":"bool","name":"zeroForOne","type":"bool"},{"internalType":"int256","name":"amountSpecified","type":"int256"},{"internalType":"uint160","name":"sqrtPriceLimitX96","type":"uint160"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"swap","outputs":[{"internalType":"int256","name":"amount0","type":"int256"},{"internalType":"int256","name":"amount1","type":"int256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"int16","name":"","type":"int16"}],"name":"tickBitmap","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"tickSpacing","outputs":[{"internalType":"int24","name":"","type":"int24"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"int24","name":"","type":"int24"}],"name":"ticks","outputs":[{"internalType":"uint128","name":"liquidityGross","type":"uint128"},{"internalType":"int128","name":"liquidityNet","type":"int128"},{"internalType":"uint256","name":"feeGrowthOutside0X128","type":"uint256"},{"internalType":"uint256","name":"feeGrowthOutside1X128","type":"uint256"},{"internalType":"int56","name":"tickCumulativeOutside","type":"int56"},{"internalType":"uint160","name":"secondsPerLiquidityOutsideX128","type":"uint160"},{"internalType":"uint32","name":"secondsOutside","type":"uint32"},{"internalType":"bool","name":"initialized","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"token0","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"token1","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"}] } diff --git a/src/assets/contracts/test.json b/src/assets/contracts/test.json deleted file mode 100644 index 3e6b270..0000000 --- a/src/assets/contracts/test.json +++ /dev/null @@ -1,992 +0,0 @@ -{ - "contractName": "OurUniV3Pool", - "contractAddress": "0xCc08EECAD5cE5c47bD7B51385b701d00c8Bdfa90", - "abi": [ - { - "inputs": [], - "stateMutability": "nonpayable", - "type": "constructor" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "indexed": true, - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - }, - { - "indexed": false, - "internalType": "uint128", - "name": "amount", - "type": "uint128" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount0", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount1", - "type": "uint256" - } - ], - "name": "Burn", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "indexed": false, - "internalType": "address", - "name": "recipient", - "type": "address" - }, - { - "indexed": true, - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "indexed": true, - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - }, - { - "indexed": false, - "internalType": "uint128", - "name": "amount0", - "type": "uint128" - }, - { - "indexed": false, - "internalType": "uint128", - "name": "amount1", - "type": "uint128" - } - ], - "name": "Collect", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "recipient", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint128", - "name": "amount0", - "type": "uint128" - }, - { - "indexed": false, - "internalType": "uint128", - "name": "amount1", - "type": "uint128" - } - ], - "name": "CollectProtocol", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "recipient", - "type": "address" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount0", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount1", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "paid0", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "paid1", - "type": "uint256" - } - ], - "name": "Flash", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint16", - "name": "observationCardinalityNextOld", - "type": "uint16" - }, - { - "indexed": false, - "internalType": "uint16", - "name": "observationCardinalityNextNew", - "type": "uint16" - } - ], - "name": "IncreaseObservationCardinalityNext", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint160", - "name": "sqrtPriceX96", - "type": "uint160" - }, - { - "indexed": false, - "internalType": "int24", - "name": "tick", - "type": "int24" - } - ], - "name": "Initialize", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "owner", - "type": "address" - }, - { - "indexed": true, - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "indexed": true, - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - }, - { - "indexed": false, - "internalType": "uint128", - "name": "amount", - "type": "uint128" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount0", - "type": "uint256" - }, - { - "indexed": false, - "internalType": "uint256", - "name": "amount1", - "type": "uint256" - } - ], - "name": "Mint", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": false, - "internalType": "uint8", - "name": "feeProtocol0Old", - "type": "uint8" - }, - { - "indexed": false, - "internalType": "uint8", - "name": "feeProtocol1Old", - "type": "uint8" - }, - { - "indexed": false, - "internalType": "uint8", - "name": "feeProtocol0New", - "type": "uint8" - }, - { - "indexed": false, - "internalType": "uint8", - "name": "feeProtocol1New", - "type": "uint8" - } - ], - "name": "SetFeeProtocol", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "address", - "name": "sender", - "type": "address" - }, - { - "indexed": true, - "internalType": "address", - "name": "recipient", - "type": "address" - }, - { - "indexed": false, - "internalType": "int256", - "name": "amount0", - "type": "int256" - }, - { - "indexed": false, - "internalType": "int256", - "name": "amount1", - "type": "int256" - }, - { - "indexed": false, - "internalType": "uint160", - "name": "sqrtPriceX96", - "type": "uint160" - }, - { - "indexed": false, - "internalType": "uint128", - "name": "liquidity", - "type": "uint128" - }, - { - "indexed": false, - "internalType": "int24", - "name": "tick", - "type": "int24" - } - ], - "name": "Swap", - "type": "event" - }, - { - "inputs": [ - { - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - }, - { - "internalType": "uint128", - "name": "amount", - "type": "uint128" - } - ], - "name": "burn", - "outputs": [ - { - "internalType": "uint256", - "name": "amount0", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "amount1", - "type": "uint256" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "recipient", - "type": "address" - }, - { - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - }, - { - "internalType": "uint128", - "name": "amount0Requested", - "type": "uint128" - }, - { - "internalType": "uint128", - "name": "amount1Requested", - "type": "uint128" - } - ], - "name": "collect", - "outputs": [ - { - "internalType": "uint128", - "name": "amount0", - "type": "uint128" - }, - { - "internalType": "uint128", - "name": "amount1", - "type": "uint128" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "recipient", - "type": "address" - }, - { - "internalType": "uint128", - "name": "amount0Requested", - "type": "uint128" - }, - { - "internalType": "uint128", - "name": "amount1Requested", - "type": "uint128" - } - ], - "name": "collectProtocol", - "outputs": [ - { - "internalType": "uint128", - "name": "amount0", - "type": "uint128" - }, - { - "internalType": "uint128", - "name": "amount1", - "type": "uint128" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "factory", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "fee", - "outputs": [ - { - "internalType": "uint24", - "name": "", - "type": "uint24" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "feeGrowthGlobal0X128", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "feeGrowthGlobal1X128", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "recipient", - "type": "address" - }, - { - "internalType": "uint256", - "name": "amount0", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "amount1", - "type": "uint256" - }, - { - "internalType": "bytes", - "name": "data", - "type": "bytes" - } - ], - "name": "flash", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint16", - "name": "observationCardinalityNext", - "type": "uint16" - } - ], - "name": "increaseObservationCardinalityNext", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint160", - "name": "sqrtPriceX96", - "type": "uint160" - } - ], - "name": "initialize", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "liquidity", - "outputs": [ - { - "internalType": "uint128", - "name": "", - "type": "uint128" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "maxLiquidityPerTick", - "outputs": [ - { - "internalType": "uint128", - "name": "", - "type": "uint128" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "recipient", - "type": "address" - }, - { - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - }, - { - "internalType": "uint128", - "name": "amount", - "type": "uint128" - }, - { - "internalType": "bytes", - "name": "data", - "type": "bytes" - } - ], - "name": "mint", - "outputs": [ - { - "internalType": "uint256", - "name": "amount0", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "amount1", - "type": "uint256" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "name": "observations", - "outputs": [ - { - "internalType": "uint32", - "name": "blockTimestamp", - "type": "uint32" - }, - { - "internalType": "int56", - "name": "tickCumulative", - "type": "int56" - }, - { - "internalType": "uint160", - "name": "secondsPerLiquidityCumulativeX128", - "type": "uint160" - }, - { - "internalType": "bool", - "name": "initialized", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint32[]", - "name": "secondsAgos", - "type": "uint32[]" - } - ], - "name": "observe", - "outputs": [ - { - "internalType": "int56[]", - "name": "tickCumulatives", - "type": "int56[]" - }, - { - "internalType": "uint160[]", - "name": "secondsPerLiquidityCumulativeX128s", - "type": "uint160[]" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "bytes32", - "name": "", - "type": "bytes32" - } - ], - "name": "positions", - "outputs": [ - { - "internalType": "uint128", - "name": "liquidity", - "type": "uint128" - }, - { - "internalType": "uint256", - "name": "feeGrowthInside0LastX128", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "feeGrowthInside1LastX128", - "type": "uint256" - }, - { - "internalType": "uint128", - "name": "tokensOwed0", - "type": "uint128" - }, - { - "internalType": "uint128", - "name": "tokensOwed1", - "type": "uint128" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "protocolFees", - "outputs": [ - { - "internalType": "uint128", - "name": "token0", - "type": "uint128" - }, - { - "internalType": "uint128", - "name": "token1", - "type": "uint128" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "uint8", - "name": "feeProtocol0", - "type": "uint8" - }, - { - "internalType": "uint8", - "name": "feeProtocol1", - "type": "uint8" - } - ], - "name": "setFeeProtocol", - "outputs": [], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [], - "name": "slot0", - "outputs": [ - { - "internalType": "uint160", - "name": "sqrtPriceX96", - "type": "uint160" - }, - { - "internalType": "int24", - "name": "tick", - "type": "int24" - }, - { - "internalType": "uint16", - "name": "observationIndex", - "type": "uint16" - }, - { - "internalType": "uint16", - "name": "observationCardinality", - "type": "uint16" - }, - { - "internalType": "uint16", - "name": "observationCardinalityNext", - "type": "uint16" - }, - { - "internalType": "uint8", - "name": "feeProtocol", - "type": "uint8" - }, - { - "internalType": "bool", - "name": "unlocked", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - } - ], - "name": "snapshotCumulativesInside", - "outputs": [ - { - "internalType": "int56", - "name": "tickCumulativeInside", - "type": "int56" - }, - { - "internalType": "uint160", - "name": "secondsPerLiquidityInsideX128", - "type": "uint160" - }, - { - "internalType": "uint32", - "name": "secondsInside", - "type": "uint32" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "recipient", - "type": "address" - }, - { - "internalType": "bool", - "name": "zeroForOne", - "type": "bool" - }, - { - "internalType": "int256", - "name": "amountSpecified", - "type": "int256" - }, - { - "internalType": "uint160", - "name": "sqrtPriceLimitX96", - "type": "uint160" - }, - { - "internalType": "bytes", - "name": "data", - "type": "bytes" - } - ], - "name": "swap", - "outputs": [ - { - "internalType": "int256", - "name": "amount0", - "type": "int256" - }, - { - "internalType": "int256", - "name": "amount1", - "type": "int256" - } - ], - "stateMutability": "nonpayable", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "int16", - "name": "", - "type": "int16" - } - ], - "name": "tickBitmap", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "tickSpacing", - "outputs": [ - { - "internalType": "int24", - "name": "", - "type": "int24" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "int24", - "name": "", - "type": "int24" - } - ], - "name": "ticks", - "outputs": [ - { - "internalType": "uint128", - "name": "liquidityGross", - "type": "uint128" - }, - { - "internalType": "int128", - "name": "liquidityNet", - "type": "int128" - }, - { - "internalType": "uint256", - "name": "feeGrowthOutside0X128", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "feeGrowthOutside1X128", - "type": "uint256" - }, - { - "internalType": "int56", - "name": "tickCumulativeOutside", - "type": "int56" - }, - { - "internalType": "uint160", - "name": "secondsPerLiquidityOutsideX128", - "type": "uint160" - }, - { - "internalType": "uint32", - "name": "secondsOutside", - "type": "uint32" - }, - { - "internalType": "bool", - "name": "initialized", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "token0", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "token1", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - } - ] -} \ No newline at end of file diff --git a/src/assets/sass/buttons.sass b/src/assets/sass/buttons.sass index 1765212..135a0ca 100644 --- a/src/assets/sass/buttons.sass +++ b/src/assets/sass/buttons.sass @@ -7,6 +7,8 @@ display: block width: 100% text-decoration: none + &:hover,&:focus,&:active + cursor: pointer &[disabled], &.btn--disabled background-color: darken($purple, 10%) cursor: not-allowed @@ -20,4 +22,3 @@ cursor: not-allowed &:hover,&:focus,&:active background-color: darken($purple, 10%), - cursor: pointer diff --git a/src/assets/sass/main.sass b/src/assets/sass/main.sass index 1e1003a..3c1cdb7 100644 --- a/src/assets/sass/main.sass +++ b/src/assets/sass/main.sass @@ -17,11 +17,15 @@ body background-color: #2D2D2D color: $white font-family: 'Inter', sans-serif + &.sideoutpanel-open + &:not(.mobile) + overflow-y: hidden + padding-right: 10px + .navbar + padding-right: 10px html font-size: var(--font-size-main) -html, body, #app - height: 100% body margin: 0 @@ -29,10 +33,9 @@ body #app display: flex flex-direction: column + height: 100vh .footer margin-top: auto - @media (min-width: 992px) - margin-top: 80px .container margin-right: auto @@ -44,7 +47,7 @@ body // max-width: 800px // padding: 24px 64px @media (min-width: 992px) - max-width: 800px + max-width: 860px h1 font-weight: 700 diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass index d28724e..69f0bcc 100644 --- a/src/assets/sass/variables.sass +++ b/src/assets/sass/variables.sass @@ -10,7 +10,8 @@ $tertiary-light: lighten($tertiary, 20%) $white: #F9F9FA $black: #0F0F0F -$grey: #808080 +$grey: #858585 +$grey-light: lighten($grey, 20%) $red: #8B0000 $purple: #4B0082 $midnight-black: #0F0F0F @@ -31,7 +32,8 @@ $button-background-color: $black --tertiary-light: #{$tertiary-light} --tertiary-dark: #{$tertiary-dark} --white: #{#F9F9FA} - --grey: #{#858585} + --grey: #{$grey} + --grey-light: #{$grey-light} --grey2: #{$grey2} --dark-grey: #{$dark-grey} --purple: #{$purple} @@ -69,6 +71,8 @@ $button-background-color: $black font-style: normal font-weight: 400 line-height: normal + @media (min-width: 992px) + font-size: 18px .number-mobile font-family: Inter font-size: 24px diff --git a/src/components/ClaimComponent.vue b/src/components/ClaimComponent.vue index f10468f..d72f9a9 100644 --- a/src/components/ClaimComponent.vue +++ b/src/components/ClaimComponent.vue @@ -1,5 +1,5 @@ diff --git a/src/components/LoadingComponent.vue b/src/components/LoadingComponent.vue new file mode 100644 index 0000000..a5ebe22 --- /dev/null +++ b/src/components/LoadingComponent.vue @@ -0,0 +1,43 @@ + + + diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue index cd224ce..e54213e 100644 --- a/src/components/Navbar.vue +++ b/src/components/Navbar.vue @@ -1,17 +1,16 @@ diff --git a/src/components/SacrificeToken.vue b/src/components/SacrificeToken.vue index d37d7c5..cd4d994 100644 --- a/src/components/SacrificeToken.vue +++ b/src/components/SacrificeToken.vue @@ -1,161 +1,162 @@ diff --git a/src/components/StakeMenu.vue b/src/components/StakeMenu.vue index 0b960ab..3f63f0a 100644 --- a/src/components/StakeMenu.vue +++ b/src/components/StakeMenu.vue @@ -1,35 +1,19 @@