v6.1.5

Kwenta · Feb 22, 2023 · 4efb8ca · 4efb8ca
2 parents 72a6723 + cdb7111
commit 4efb8ca
Show file tree

Hide file tree

Showing 31 changed files with 1,678 additions and 126 deletions.
diff --git a/assets/png/marketing/market-order-preview.png b/assets/png/marketing/market-order-preview.png
diff --git a/assets/svg/app/eligible.svg b/assets/svg/app/eligible.svg
diff --git a/assets/svg/app/not-eligible.svg b/assets/svg/app/not-eligible.svg
diff --git a/assets/svg/brand/logo-yellow.svg b/assets/svg/brand/logo-yellow.svg
diff --git a/components/Text/LogoText.tsx b/components/Text/LogoText.tsx
@@ -1,19 +1,22 @@
 import { memo, FC } from 'react';
 import styled, { css } from 'styled-components';
 
+import HelpIcon from 'assets/svg/app/question-mark.svg';
 import KwentaLogo from 'assets/svg/earn/KWENTA.svg';
 
 import Heading from './Heading';
 
 type LogoTextProps = {
 	yellow?: boolean;
+	isToolTip?: boolean;
 };
 
-export const LogoText: FC<LogoTextProps> = memo(({ children, yellow }) => {
+export const LogoText: FC<LogoTextProps> = memo(({ children, yellow, isToolTip = false }) => {
 	return (
 		<div style={{ display: 'flex', alignItems: 'center' }}>
 			<TitleText $yellow={yellow}>{children}</TitleText>
 			<KwentaLogo />
+			{isToolTip && <SpacedHelpIcon />}
 		</div>
 	);
 });
@@ -30,4 +33,8 @@ const TitleText = styled(Heading)<{ $yellow?: boolean; $mono?: boolean }>`
 		`}
 `;
 
+const SpacedHelpIcon = styled(HelpIcon)`
+	margin-left: 8px;
+`;
+
 export default LogoText;
diff --git a/constants/links.ts b/constants/links.ts
@@ -5,6 +5,7 @@ export const PROD_HOSTNAME = 'kwenta.eth.limo';
 export const EXTERNAL_LINKS = {
 	Trading: {
 		Legacy: 'https://legacy.kwenta.io/exchange',
+		PerpsV1: 'https://v1.kwenta.eth.limo',
 		DexAG: 'https://dex.ag/',
 		Uniswap: 'https://uniswap.exchange/',
 		OneInch: `https://1inch.exchange/`,
@@ -32,23 +33,27 @@ export const EXTERNAL_LINKS = {
 		DocsRoot: 'https://docs.kwenta.io/',
 		FeeReclamation: 'https://docs.kwenta.io/resources/fee-reclamation',
 		HowToTrade: 'https://docs.kwenta.io/products/futures',
-		Governance: 'https://docs.kwenta.io/dao/governance-framework',
-		DaoRoles: 'https://docs.kwenta.io/dao/dao-roles',
+		Governance:
+			'https://app.radicle.xyz/seeds/maple.radicle.garden/rad:git:hnrkq1oex148yz4zi9tm7spfnjaryyuc93yay/tree/master/sections/1.md',
+		DaoRoles:
+			'https://app.radicle.xyz/seeds/maple.radicle.garden/rad:git:hnrkq1oex148yz4zi9tm7spfnjaryyuc93yay/tree/master/sections/2.md',
 		HowToUse: 'https://docs.kwenta.io/onboard/how-to-start-using-kwenta',
 		Perpetuals: 'https://docs.kwenta.io/products/futures',
 		Spot: 'https://docs.kwenta.io/products/swaps ',
 		DevDao: 'https://docs.kwenta.io/dao/contribute/devdao-contribute',
-		MarketingDao: 'https://docs.kwenta.io/dao/contribute/marketingDAO',
+		MarketingDao:
+			'https://app.radicle.xyz/seeds/maple.radicle.garden/rad:git:hnrkq1oex148yz4zi9tm7spfnjaryyuc93yay/tree/master/sections/2.md#marketingdao-grants-council-trial',
 		Faq: 'https://docs.kwenta.io/resources/faq',
 		CrossMarginFaq: 'https://docs.kwenta.io/products/futures/cross-margin-accounts',
 		Staking: 'https://docs.kwenta.io/using-kwenta/staking-kwenta',
+		TradingRewardsV2: 'https://mirror.xyz/kwenta.eth/7k-5UYXXcCNJ_DRRWvYBsK5zDm5UA945My4QrInhxoI',
 	},
 	Optimism: {
 		Home: 'https://optimism.io/',
 	},
 	Trade: {
-		NextPriceBlogPost: 'https://docs.kwenta.io/products/futures/next-price',
-		PerpsV2: 'https://alpha.kwenta.eth.limo/market/?accountType=isolated_margin&asset=sETH',
+		PerpsV2: 'https://kwenta.eth.limo/market/?accountType=isolated_margin&asset=sETH',
+		Spot: 'https://kwenta.eth.limo/exchange/',
 		V1: 'https://v1.kwenta.eth.limo/dashboard',
 	},
 	Governance: {
@@ -59,7 +64,4 @@ export const EXTERNAL_LINKS = {
 	Competition: {
 		LearnMore: 'https://mirror.xyz/kwenta.eth/s_PO64SxvuwDHz9fdHebsYeQAOOc73D3bL2q4nC6LvU',
 	},
-	Aelin: {
-		Pool: 'https://app.aelin.xyz/pool/mainnet/0x21f4F88a95f656ef4ee1ea107569b3b38cf8daef',
-	},
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/queries/staking/utils.ts b/queries/staking/utils.ts
@@ -50,6 +50,7 @@ export const STAKING_REWARDS_RATIO = 0.6;
 export const TRADING_REWARDS_RATIO = 0.05;
 export const STAKING_HIGH_GAS_LIMIT = BigNumber.from('400000');
 export const STAKING_LOW_GAS_LIMIT = BigNumber.from('200000');
+export const TRADING_REWARDS_CUTOFF_EPOCH = 13;
 
 const SUPPLY_RATE = wei(1).sub(wei(DECAY_RATE));
 

diff --git a/sdk/contracts/abis/BatchClaimer.json b/sdk/contracts/abis/BatchClaimer.json
@@ -0,0 +1,47 @@
+[
+    {
+        "inputs": [
+            {
+                "internalType": "contract IMultipleMerkleDistributor[]",
+                "name": "_distributors",
+                "type": "address[]"
+            },
+            {
+                "components": [
+                    {
+                        "internalType": "uint256",
+                        "name": "index",
+                        "type": "uint256"
+                    },
+                    {
+                        "internalType": "address",
+                        "name": "account",
+                        "type": "address"
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "amount",
+                        "type": "uint256"
+                    },
+                    {
+                        "internalType": "bytes32[]",
+                        "name": "merkleProof",
+                        "type": "bytes32[]"
+                    },
+                    {
+                        "internalType": "uint256",
+                        "name": "epoch",
+                        "type": "uint256"
+                    }
+                ],
+                "internalType": "struct IMultipleMerkleDistributor.Claims[][]",
+                "name": "_claims",
+                "type": "tuple[][]"
+            }
+        ],
+        "name": "claimMultiple",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }
+]