diff --git a/public/assets/img/tokenomics_footer.png b/public/assets/img/tokenomics_footer.png index 4c0ee47..113574b 100644 Binary files a/public/assets/img/tokenomics_footer.png and b/public/assets/img/tokenomics_footer.png differ diff --git a/src/App.vue b/src/App.vue index 8bd74ca..b88042c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -105,7 +105,7 @@ onMounted(async () => {
@@ -149,22 +154,30 @@ onMounted(async () => { .footer height: auto - background-color: var(--midnight-black) + background-color: #2D2D2D + padding-bottom: 72px @media (min-width: 992px) + background-color: var(--midnight-black) height: 150px min-height: 150px display: flex flex-direction: column justify-content: center + padding-bottom: unset + margin-top: auto .footer-inner - padding: 16px 0 24px 0 + padding: 24px 0 font-size: 24px display: flex flex-direction: column gap: 16px align-items: center + border-top: 1px solid #000 @media (min-width: 992px) + padding: 16px 0 24px 0 justify-content: center + border-top: unset + background-color: transparent .footer-headline font-size: 16px .footer-social-links diff --git a/src/assets/contracts/Bloodline.json b/src/assets/contracts/Bloodline.json index 63c7b8c..af00b23 100644 --- a/src/assets/contracts/Bloodline.json +++ b/src/assets/contracts/Bloodline.json @@ -1,6 +1,6 @@ { "contractName": "Bloodline", - "contractAddress": "0xfB97A4a863d75F72E6d3DCef4a47413E811c9D2E", + "contractAddress": "0x51bF3df58D123e8EA43fb2189f18027FD36a08Af", "abi": [ { "inputs": [ diff --git a/src/assets/contracts/LiquidityOwner.json b/src/assets/contracts/LiquidityOwner.json index c900393..2a53269 100644 --- a/src/assets/contracts/LiquidityOwner.json +++ b/src/assets/contracts/LiquidityOwner.json @@ -1,6 +1,6 @@ { "contractName": "LiquidityOwner", - "contractAddress": "0x0f18b2D23278E1f1d92cc2cE10a75604bDBE9Ad1", + "contractAddress": "0xF8bc4Ce13263DD4e12070e3192be50310eF7C95a", "abi": [ { "inputs": [ @@ -132,35 +132,6 @@ "stateMutability": "pure", "type": "function" }, - { - "inputs": [ - { - "internalType": "int24", - "name": "tick", - "type": "int24" - }, - { - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - } - ], - "name": "_liquidityCanBeProvided", - "outputs": [ - { - "internalType": "bool", - "name": "", - "type": "bool" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [ { @@ -198,54 +169,6 @@ "stateMutability": "view", "type": "function" }, - { - "inputs": [ - { - "internalType": "int24", - "name": "tickCycle", - "type": "int24" - } - ], - "name": "calculateTicksForRange1", - "outputs": [ - { - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - } - ], - "stateMutability": "pure", - "type": "function" - }, - { - "inputs": [ - { - "internalType": "int24", - "name": "tickCycle", - "type": "int24" - } - ], - "name": "calculateTicksForRange2", - "outputs": [ - { - "internalType": "int24", - "name": "tickLower", - "type": "int24" - }, - { - "internalType": "int24", - "name": "tickUpper", - "type": "int24" - } - ], - "stateMutability": "pure", - "type": "function" - }, { "inputs": [ { @@ -288,25 +211,6 @@ "stateMutability": "view", "type": "function" }, - { - "inputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "name": "cycleTicks", - "outputs": [ - { - "internalType": "int24", - "name": "", - "type": "int24" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [], "name": "memeAltar", diff --git a/src/assets/contracts/MemeAltar.json b/src/assets/contracts/MemeAltar.json index d96a15f..fbdcb69 100644 --- a/src/assets/contracts/MemeAltar.json +++ b/src/assets/contracts/MemeAltar.json @@ -1,6 +1,6 @@ { "contractName": "MemeAltar", - "contractAddress": "0x5368264F18DD0e09ea074a79F3F8B504e2363d84", + "contractAddress": "0xE4F42F3f8B0E57b1054D457fe3b49a1A10B1aCEa", "abi": [ { "inputs": [ @@ -53,11 +53,6 @@ "name": "CycleCompletedRegistrationFailed", "type": "error" }, - { - "inputs": [], - "name": "GoalCannotBeZero", - "type": "error" - }, { "inputs": [], "name": "InsufficientOutputAmount", @@ -220,16 +215,42 @@ "anonymous": false, "inputs": [ { - "indexed": true, - "internalType": "uint64", - "name": "b", - "type": "uint64" - }, - { - "indexed": true, - "internalType": "uint64", - "name": "m", - "type": "uint64" + "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" + } + ], + "indexed": false, + "internalType": "struct MemeAltar.BM", + "name": "_bm", + "type": "tuple" } ], "name": "NewBM", @@ -288,14 +309,41 @@ { "inputs": [ { - "internalType": "uint64", - "name": "newB", - "type": "uint64" - }, - { - "internalType": "uint64", - "name": "newM", - "type": "uint64" + "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", @@ -362,12 +410,12 @@ }, { "inputs": [], - "name": "b", + "name": "bloodline", "outputs": [ { - "internalType": "uint64", + "internalType": "contract Bloodline", "name": "", - "type": "uint64" + "type": "address" } ], "stateMutability": "view", @@ -375,12 +423,37 @@ }, { "inputs": [], - "name": "bloodline", + "name": "bm", "outputs": [ { - "internalType": "contract Bloodline", - "name": "", - "type": "address" + "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" } ], "stateMutability": "view", @@ -589,9 +662,9 @@ "name": "issuancePrice", "outputs": [ { - "internalType": "uint128", + "internalType": "uint256", "name": "", - "type": "uint128" + "type": "uint256" } ], "stateMutability": "view", @@ -610,19 +683,6 @@ "stateMutability": "view", "type": "function" }, - { - "inputs": [], - "name": "m", - "outputs": [ - { - "internalType": "uint64", - "name": "", - "type": "uint64" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [ { diff --git a/src/assets/contracts/RewardLocker.json b/src/assets/contracts/RewardLocker.json index ca9590f..5788079 100644 --- a/src/assets/contracts/RewardLocker.json +++ b/src/assets/contracts/RewardLocker.json @@ -1,6 +1,6 @@ { "contractName": "RewardLocker", - "contractAddress": "0x3342B37A0c06FEf2c3dD9481e31CCCF970e7235B", + "contractAddress": "0x2952253374973DE0ffbFe35269Ca13FaF28B935F", "abi": [ { "inputs": [ diff --git a/src/assets/contracts/UniswapPool.json b/src/assets/contracts/UniswapPool.json index a91de7a..9e7a4b3 100644 --- a/src/assets/contracts/UniswapPool.json +++ b/src/assets/contracts/UniswapPool.json @@ -1,5 +1,5 @@ { "contractName": "OurUniV3Pool", - "contractAddress": "0xA9e5ee6C0C4119B0d7e14CFEBcB10e42225D98Ed", + "contractAddress": "0xe00221498E85f4f0CC0179415afdE58d3ca205D3", "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/sass/main.sass b/src/assets/sass/main.sass index fc9ac66..b67a07b 100644 --- a/src/assets/sass/main.sass +++ b/src/assets/sass/main.sass @@ -34,8 +34,6 @@ body display: flex flex-direction: column height: 100vh - .footer - margin-top: auto .container margin-right: auto diff --git a/src/components/BloodChart.vue b/src/components/BloodChart.vue index 52244c6..a6e863e 100644 --- a/src/components/BloodChart.vue +++ b/src/components/BloodChart.vue @@ -73,7 +73,7 @@ @@ -96,7 +96,7 @@