diff --git a/src/App.vue b/src/App.vue index 1c131eb..e2953b0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -223,7 +223,7 @@ onMounted(async () => { margin-top: 82px padding: 24px 0 @media (min-width: 992px) - margin-top: 128px + margin-top: 96px padding: 80px 0 &.mobile &.no-scroll diff --git a/src/assets/contracts/Bloodline.json b/src/assets/contracts/Bloodline.json index e4a7386..e57d493 100644 --- a/src/assets/contracts/Bloodline.json +++ b/src/assets/contracts/Bloodline.json @@ -1,6 +1,6 @@ { "contractName": "Bloodline", - "contractAddress": "0xBd6bB82108D5F27E8A8f081723408bF26d665a8c", + "contractAddress": "0x00E5DAd5dA0FC4Da0baB7f0D99E28C07d8A88ee4", "abi": [ { "inputs": [ diff --git a/src/assets/contracts/LiquidityOwner.json b/src/assets/contracts/LiquidityOwner.json index 0917e82..6f05eba 100644 --- a/src/assets/contracts/LiquidityOwner.json +++ b/src/assets/contracts/LiquidityOwner.json @@ -1,6 +1,6 @@ { "contractName": "LiquidityOwner", - "contractAddress": "0xEb898F92F7db3bbF807513C847bfDeE846E1b5Ff", + "contractAddress": "0x947f05D74ac7dA0Eb0CA88eF9b579D196B178BaE", "abi": [ { "inputs": [ @@ -19,80 +19,25 @@ "name": "_weth", "type": "address" }, + { + "internalType": "address", + "name": "_nfPositionManager", + "type": "address" + }, { "internalType": "address", "name": "_memeAltar", "type": "address" + }, + { + "internalType": "uint256", + "name": "_chunk", + "type": "uint256" } ], - "stateMutability": "nonpayable", + "stateMutability": "payable", "type": "constructor" }, - { - "inputs": [], - "name": "CurrentPriceDisallowsToProvide", - "type": "error" - }, - { - "inputs": [], - "name": "NothingToProvide", - "type": "error" - }, - { - "inputs": [], - "name": "ProjectAlive", - "type": "error" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "indexed": true, - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - }, - { - "indexed": true, - "internalType": "uint256", - "name": "amountWETH", - "type": "uint256" - } - ], - "name": "LiquidityProvided", - "type": "event" - }, - { - "anonymous": false, - "inputs": [ - { - "indexed": true, - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "indexed": true, - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - }, - { - "indexed": true, - "internalType": "uint256", - "name": "amountWETH", - "type": "uint256" - } - ], - "name": "LiquidityShouldBeProvidedLater", - "type": "event" - }, { "inputs": [ { @@ -117,6 +62,69 @@ "stateMutability": "pure", "type": "function" }, + { + "inputs": [ + { + "components": [ + { + "internalType": "int24", + "name": "tickLower", + "type": "int24" + }, + { + "internalType": "int24", + "name": "tickUpper", + "type": "int24" + }, + { + "internalType": "uint128", + "name": "liquidity", + "type": "uint128" + }, + { + "internalType": "uint80", + "name": "tokenId", + "type": "uint80" + } + ], + "internalType": "struct LiquidityOwner.Position", + "name": "position", + "type": "tuple" + } + ], + "name": "addETHPositionToLinkedList", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "int24", + "name": "_tickLower", + "type": "int24" + }, + { + "internalType": "int24", + "name": "_tickUpper", + "type": "int24" + }, + { + "internalType": "uint256", + "name": "amountBloodline", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "amountWETH", + "type": "uint256" + } + ], + "name": "addNewPosition", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -125,17 +133,12 @@ "type": "int48" } ], - "name": "_positions", + "name": "allRangesLinkedList", "outputs": [ { - "internalType": "uint112", - "name": "providedETH", - "type": "uint112" - }, - { - "internalType": "uint112", - "name": "unprovidedETH", - "type": "uint112" + "internalType": "int48", + "name": "", + "type": "int48" } ], "stateMutability": "view", @@ -154,30 +157,45 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [], + "name": "burn", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "chunk", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ { - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "internalType": "int24", - "name": "tickUpper", - "type": "int24" + "internalType": "uint256[]", + "name": "liquidityTokenIds", + "type": "uint256[]" } ], "name": "collectDeveloperFees", "outputs": [ { - "internalType": "uint128", - "name": "wethAmount", - "type": "uint128" + "internalType": "uint256", + "name": "amount0", + "type": "uint256" }, { - "internalType": "uint128", - "name": "bloodlineAmount", - "type": "uint128" + "internalType": "uint256", + "name": "amount1", + "type": "uint256" } ], "stateMutability": "nonpayable", @@ -188,14 +206,79 @@ "name": "collectedEthTotal", "outputs": [ { - "internalType": "uint112", + "internalType": "uint256", "name": "", - "type": "uint112" + "type": "uint256" } ], "stateMutability": "view", "type": "function" }, + { + "inputs": [], + "name": "currentTokenIdToFill", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "tokenId", + "type": "uint256" + }, + { + "internalType": "uint128", + "name": "liquidity", + "type": "uint128" + } + ], + "name": "decreasePositionLiquidity", + "outputs": [ + { + "internalType": "uint256", + "name": "amount0", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "amount1", + "type": "uint256" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "tokenId", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "amountWETH", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "amountBloodline", + "type": "uint256" + } + ], + "name": "increasePositionLiquidity", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [], "name": "memeAltar", @@ -211,13 +294,94 @@ }, { "inputs": [ + { + "internalType": "uint256[]", + "name": "positionsToCancel", + "type": "uint256[]" + }, { "internalType": "uint256", - "name": "developerFee", + "name": "amountOfWETHToUse", "type": "uint256" } ], - "name": "payDeveloperFee", + "name": "movePriceUP", + "outputs": [ + { + "internalType": "uint256", + "name": "amount0Collected", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "amount1Collected", + "type": "uint256" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "nfPositionManager", + "outputs": [ + { + "internalType": "contract INonfungiblePositionManager", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + }, + { + "internalType": "address", + "name": "", + "type": "address" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + }, + { + "internalType": "bytes", + "name": "", + "type": "bytes" + } + ], + "name": "onERC721Received", + "outputs": [ + { + "internalType": "bytes4", + "name": "", + "type": "bytes4" + } + ], + "stateMutability": "pure", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "developerFee", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "amountOfETHToPaySender", + "type": "uint256" + } + ], + "name": "payDeveloperFeeAndForGas", "outputs": [], "stateMutability": "nonpayable", "type": "function" @@ -240,34 +404,16 @@ "stateMutability": "nonpayable", "type": "function" }, - { - "inputs": [], - "name": "pool", - "outputs": [ - { - "internalType": "contract IUniswapV3Pool", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, - { - "inputs": [], - "name": "previousBLDTotalSupply", - "outputs": [ - { - "internalType": "uint128", - "name": "", - "type": "uint128" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "name": "positions", + "outputs": [ { "internalType": "int24", "name": "tickLower", @@ -277,37 +423,29 @@ "internalType": "int24", "name": "tickUpper", "type": "int24" + }, + { + "internalType": "uint128", + "name": "liquidity", + "type": "uint128" + }, + { + "internalType": "uint80", + "name": "tokenId", + "type": "uint80" } ], - "name": "provideUnprovidedLiquidity", - "outputs": [], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { - "inputs": [ - { - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - } - ], - "name": "rageQuit", + "inputs": [], + "name": "rebalance", "outputs": [ { - "internalType": "uint128", - "name": "wethAmount", - "type": "uint128" - }, - { - "internalType": "uint128", - "name": "bloodlineAmount", - "type": "uint128" + "internalType": "uint256", + "name": "tokenId", + "type": "uint256" } ], "stateMutability": "nonpayable", @@ -316,9 +454,28 @@ { "inputs": [ { - "internalType": "uint112", + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "name": "tokenIds", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", "name": "collectedEthInRound", - "type": "uint112" + "type": "uint256" } ], "name": "triggerRoundCompleted", @@ -332,25 +489,38 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [], + "name": "uniV3Pool", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ { - "internalType": "uint256", - "name": "amount0Owed", - "type": "uint256" + "internalType": "int256", + "name": "amount0Delta", + "type": "int256" }, { - "internalType": "uint256", - "name": "amount1Owed", - "type": "uint256" + "internalType": "int256", + "name": "amount1Delta", + "type": "int256" }, { "internalType": "bytes", - "name": "", + "name": "_data", "type": "bytes" } ], - "name": "uniswapV3MintCallback", + "name": "uniswapV3SwapCallback", "outputs": [], "stateMutability": "nonpayable", "type": "function" @@ -367,6 +537,17 @@ ], "stateMutability": "view", "type": "function" + }, + { + "inputs": [], + "name": "withdrawETH", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "stateMutability": "payable", + "type": "receive" } ] } diff --git a/src/assets/contracts/MemeAltar.json b/src/assets/contracts/MemeAltar.json index 147fee4..e7e56b7 100644 --- a/src/assets/contracts/MemeAltar.json +++ b/src/assets/contracts/MemeAltar.json @@ -1,6 +1,6 @@ { "contractName": "MemeAltar", - "contractAddress": "0x9fA80C0A942016A0a246402e97d30562CF93f5AE", + "contractAddress": "0x9842954639aF0c1d7A692222955868806287aeEA", "abi": [ { "inputs": [ @@ -484,11 +484,6 @@ "internalType": "uint256", "name": "amountETHBase", "type": "uint256" - }, - { - "internalType": "uint256", - "name": "amountETHForSelling", - "type": "uint256" } ], "stateMutability": "view", @@ -500,6 +495,11 @@ "internalType": "address", "name": "memeToSacrifice", "type": "address" + }, + { + "internalType": "bool", + "name": "buyFunc", + "type": "bool" } ], "name": "getAmountToReachGoal", @@ -549,12 +549,7 @@ "outputs": [ { "internalType": "uint256", - "name": "rewardCurrentCycle", - "type": "uint256" - }, - { - "internalType": "uint256", - "name": "rewardNextCycle", + "name": "", "type": "uint256" } ], diff --git a/src/assets/contracts/RewardLocker.json b/src/assets/contracts/RewardLocker.json index 611fb30..f51346a 100644 --- a/src/assets/contracts/RewardLocker.json +++ b/src/assets/contracts/RewardLocker.json @@ -1,6 +1,6 @@ { "contractName": "RewardLocker", - "contractAddress": "0xC21568120adc35AB0aA7460A4A5E1C3D4f845269", + "contractAddress": "0xc9f5F78320D0f75099eEA8f8F6FD35BF246f0916", "abi": [ { "inputs": [ @@ -551,14 +551,14 @@ "name": "rounds", "outputs": [ { - "internalType": "uint32", + "internalType": "uint256", "name": "roundCompletedTimestamp", - "type": "uint32" + "type": "uint256" }, { - "internalType": "uint224", + "internalType": "uint256", "name": "totalSacrificeCompetitionRewards", - "type": "uint224" + "type": "uint256" }, { "internalType": "uint256", diff --git a/src/assets/contracts/UniswapPool.json b/src/assets/contracts/UniswapPool.json index 47b29ee..12d3416 100644 --- a/src/assets/contracts/UniswapPool.json +++ b/src/assets/contracts/UniswapPool.json @@ -1,5 +1,5 @@ { "contractName": "OurUniV3Pool", - "contractAddress": "0xAAC69F9d8A960eeda4F8211CA9F17aD6151D8F25", + "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/admin-altar.json b/src/assets/contracts/admin-altar.json index 68081f2..71f34ce 100644 --- a/src/assets/contracts/admin-altar.json +++ b/src/assets/contracts/admin-altar.json @@ -1 +1 @@ -[{"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":"uint40","name":"b1","type":"uint40"},{"internalType":"uint40","name":"m1","type":"uint40"},{"internalType":"uint40","name":"b2","type":"uint40"},{"internalType":"uint40","name":"m2","type":"uint40"},{"internalType":"uint40","name":"b3","type":"uint40"},{"internalType":"uint40","name":"m4","type":"uint40"}],"internalType":"struct MemeAltar.BM","name":"newBM","type":"tuple"}],"name":"adjustBM","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint112","name":"newDefaultGoal","type":"uint112"}],"name":"adjustDefaultGoal","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint32","name":"newDurationLimit","type":"uint32"}],"name":"adjustRoundDurationLimit","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"newAdmin","type":"address"}],"name":"switchAdmin","outputs":[{"internalType":"bool","name":"","type":"bool"}],"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":[{"internalType":"address","name":"meme","type":"address"}],"name":"removeMemeFromList","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}] +[{"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 MemeAltar.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":[{"internalType":"address","name":"meme","type":"address"}],"name":"removeMemeFromList","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"newAdmin","type":"address"}],"name":"switchAdmin","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"newFixedPrice","type":"uint256"}],"name":"adjustFixedPrice","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}] diff --git a/src/assets/sass/base.sass b/src/assets/sass/base.sass index b34b56d..1ef3065 100644 --- a/src/assets/sass/base.sass +++ b/src/assets/sass/base.sass @@ -1,20 +1,18 @@ .bloodline-devider font-size: 42px text-align: center - @media (min-width: 992px) - margin: 24px 0 .bloodline-border - padding: 16px + padding: 12px border-radius: 16px border: 2px solid #000 &.bloodline-border--variant1 - border: 4px solid var(--midnight-black) + border: 3px solid var(--midnight-black) &.bloodline-border__thin border-width: 1px @media (min-width: 992px) - padding: 24px 32px - border: 4px solid #000 + padding: 18px 24px + border: 3px solid #000 &.purple border-color: var(--purple) &.white @@ -23,7 +21,7 @@ border-color: var(--grey, #858585) .bloodline-badge - padding: 8px 16px 8px 16px + padding: 6px 12px 6px 12px border-radius: 14px background-color: #0F0F0F display: flex diff --git a/src/assets/sass/main.sass b/src/assets/sass/main.sass index 3c1cdb7..76582fd 100644 --- a/src/assets/sass/main.sass +++ b/src/assets/sass/main.sass @@ -47,7 +47,7 @@ body // max-width: 800px // padding: 24px 64px @media (min-width: 992px) - max-width: 860px + max-width: 640px h1 font-weight: 700 diff --git a/src/assets/sass/variables.sass b/src/assets/sass/variables.sass index 69f0bcc..b44e9ef 100644 --- a/src/assets/sass/variables.sass +++ b/src/assets/sass/variables.sass @@ -43,25 +43,28 @@ $button-background-color: $black --darkgrey: #{$darkgrey} //fonts +.tiny-text + font-family: Inter + font-size: 14px .low-mid-text font-family: Inter font-size: 16px font-style: normal font-weight: 400 line-height: normal - @media (min-width: 992px) - font-size: 24px + // @media (min-width: 992px) + // font-size: 18px .mid-mid-text font-family: Inter font-size: 18px font-style: normal font-weight: 400 line-height: normal - @media (min-width: 992px) - font-size: 24px + // @media (min-width: 992px) + // font-size: 24px .mid-text font-family: Inter - font-size: 24px + font-size: 18px font-style: normal font-weight: 400 line-height: normal @@ -86,8 +89,8 @@ $button-background-color: $black font-weight: 400 line-height: normal font-size: 24px - @media (min-width: 992px) - font-size: 32px + // @media (min-width: 992px) + // font-size: 32px .header font-family: Inter font-size: 32px @@ -95,7 +98,7 @@ $button-background-color: $black font-weight: 400 line-height: normal @media (min-width: 992px) - font-size: 40px + font-size: 30px // :root // --font-size-text: 16px diff --git a/src/components/BloodChart.vue b/src/components/BloodChart.vue index ec8d74d..fe5e78e 100644 --- a/src/components/BloodChart.vue +++ b/src/components/BloodChart.vue @@ -23,7 +23,7 @@