Merge pull request #1152 from Badger-Finance/staging

release: fix fee lookup
Badger-Finance · Oct 12, 2021 · a1c432c · a1c432c
2 parents 32412a5 + 222459c
commit a1c432c
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 43 deletions.
diff --git a/src/components-v2/landing/LockedCvxDelegation.tsx b/src/components-v2/landing/LockedCvxDelegation.tsx
@@ -29,7 +29,7 @@ const LockedCvxDelegationAction = observer(() => {
 	const classes = useStyles();
 
 	const { delegationState } = lockedCvxDelegation;
-	const canUserDelegateLockedCVX = delegationState === DelegationState.Eligible;
+	const canUserDelegateLockedCVX = delegationState === DelegationState.Eligible || DelegationState.Delegated;
 
 	if (network.id !== NETWORK_IDS.ETH || !delegationState) {
 		return null;

diff --git a/src/config/system/strategies.ts b/src/config/system/strategies.ts
@@ -150,7 +150,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[bscDeploy.sett_system.vaults['native.bBadgerBtcb']]: {
 					address: bscDeploy.sett_system.strategies['native.bBadgerBtcb'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.strategistPerformance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(50),
 					},
@@ -160,7 +160,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[bscDeploy.sett_system.vaults['native.bDiggBtcb']]: {
 					address: bscDeploy.sett_system.strategies['native.bDiggBtcb'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.strategistPerformance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(50),
 					},
@@ -173,7 +173,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.badger']]: {
 					address: ethDeploy.sett_system.strategies['native.badger'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(0),
+						[StrategyFee.performance]: new BigNumber(0),
 						[StrategyFee.strategistPerformance]: new BigNumber(0),
 						[StrategyFee.withdraw]: new BigNumber(0),
 					},
@@ -186,7 +186,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.renCrv']]: {
 					address: ethDeploy.sett_system.strategies['native.renCrv'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.strategistPerformance]: new BigNumber(0),
 						[StrategyFee.withdraw]: new BigNumber(50),
 					},
@@ -198,7 +198,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.sbtcCrv']]: {
 					address: ethDeploy.sett_system.strategies['native.sbtcCrv'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.strategistPerformance]: new BigNumber(0),
 						[StrategyFee.withdraw]: new BigNumber(50),
 					},
@@ -210,7 +210,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.tbtcCrv']]: {
 					address: ethDeploy.sett_system.strategies['native.tbtcCrv'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.strategistPerformance]: new BigNumber(0),
 						[StrategyFee.withdraw]: new BigNumber(50),
 					},
@@ -222,7 +222,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.uniBadgerWbtc']]: {
 					address: ethDeploy.sett_system.strategies['native.uniBadgerWbtc'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(0),
+						[StrategyFee.performance]: new BigNumber(0),
 						[StrategyFee.strategistPerformance]: new BigNumber(0),
 						[StrategyFee.withdraw]: new BigNumber(0),
 					},
@@ -252,7 +252,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 					// 	'can be claimed in the dashboard.',
 					address: ethDeploy.sett_system.strategies['native.sushiWbtcEth'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.strategistPerformance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(50),
 					},
@@ -264,7 +264,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.sushiBadgerWbtc']]: {
 					address: ethDeploy.sett_system.strategies['native.sushiBadgerWbtc'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.strategistPerformance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(0),
 					},
@@ -277,7 +277,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.digg']]: {
 					address: ethDeploy.sett_system.strategies['native.digg'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(0),
+						[StrategyFee.performance]: new BigNumber(0),
 						[StrategyFee.strategistPerformance]: new BigNumber(0),
 						[StrategyFee.withdraw]: new BigNumber(0),
 					},
@@ -290,7 +290,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.uniDiggWbtc']]: {
 					address: ethDeploy.sett_system.strategies['native.uniDiggWbtc'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(0),
+						[StrategyFee.performance]: new BigNumber(0),
 						[StrategyFee.strategistPerformance]: new BigNumber(0),
 						[StrategyFee.withdraw]: new BigNumber(0),
 					},
@@ -299,7 +299,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.sushiDiggWbtc']]: {
 					address: ethDeploy.sett_system.strategies['native.sushiDiggWbtc'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.strategistPerformance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(0),
 					},
@@ -323,7 +323,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.sushiibBTCwBTC']]: {
 					address: ethDeploy.sett_system.strategies['experimental.sushiIBbtcWbtc'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.strategistPerformance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(20),
 					},
@@ -336,7 +336,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['experimental.digg']]: {
 					address: ethDeploy.sett_system.strategies['experimental.digg'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(250),
+						[StrategyFee.performance]: new BigNumber(250),
 						[StrategyFee.strategistPerformance]: new BigNumber(0),
 						[StrategyFee.withdraw]: new BigNumber(50),
 					},
@@ -346,7 +346,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.hbtcCrv']]: {
 					address: ethDeploy.sett_system.strategies['native.hbtcCrv'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(50),
 					},
 					strategyLink: 'https://badger.wiki/strategies#56cd7b65cd384740aa9f339bf3ee2597',
@@ -357,7 +357,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.pbtcCrv']]: {
 					address: ethDeploy.sett_system.strategies['native.pbtcCrv'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(50),
 					},
 					strategyLink: 'https://badger.wiki/strategies#39a0decd933b4869b98c9276118b9d39',
@@ -368,7 +368,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.obtcCrv']]: {
 					address: ethDeploy.sett_system.strategies['native.obtcCrv'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(50),
 					},
 					strategyLink: 'https://badger.wiki/strategies#82d72e94cb3b49f0836d8197ad13bc36',
@@ -379,7 +379,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.bbtcCrv']]: {
 					address: ethDeploy.sett_system.strategies['native.bbtcCrv'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(50),
 					},
 					strategyLink: 'https://badger.wiki/strategies#fe4a64edc830472da5a700d0fc30716c',
@@ -390,15 +390,15 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.tricryptoCrv']]: {
 					address: ethDeploy.sett_system.strategies['native.tricrypto'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(0),
 					},
 					strategyLink: 'https://badger.wiki/strategies#f03b01a576d241aa9d9cee153876c976',
 				},
 				[ethDeploy.sett_system.vaults['native.tricryptoCrv2']]: {
 					address: ethDeploy.sett_system.strategies['native.tricrypto2'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(2000),
+						[StrategyFee.performance]: new BigNumber(2000),
 						[StrategyFee.withdraw]: new BigNumber(50),
 					},
 					strategyLink: 'https://badger.wiki/strategies#d5806054c232432e8e8a1d75ae329bf8',
@@ -409,7 +409,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.cvxCrv']]: {
 					address: ethDeploy.sett_system.strategies['native.cvxCrv'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(10),
 					},
 					strategyLink: 'https://badger.wiki/strategies#51d48102bc4847a6a5a1a059c4b827b3',
@@ -419,7 +419,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.cvx']]: {
 					address: ethDeploy.sett_system.strategies['native.cvx'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(10),
 					},
 					strategyLink: 'https://badger.wiki/strategies#1346adfaad7946eebd29a17fb4f6e8b7',
@@ -429,16 +429,17 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.icvx']]: {
 					address: ethDeploy.sett_system.strategies['native.icvx'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(0),
+						[StrategyFee.performance]: new BigNumber(0),
 						[StrategyFee.withdraw]: new BigNumber(10),
 					},
-					depositLink: 'https://www.convexfinance.com/lock-cvx',
+					depositLink:
+						'https://app.sushi.com/swap?inputCurrency=ETH&outputCurrency=0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B',
 					userGuide: 'https://docs.badger.com/badger-finance/sett-user-guides/blcvx-locked-convex',
 				},
 				[ethDeploy.sett_system.vaults['native.imBtc']]: {
 					address: ethDeploy.sett_system.strategies['native.imBtc'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(75),
 					},
 					strategyLink: 'https://badgerwiki.notion.site/placeholder',
@@ -447,7 +448,7 @@ export const getStrategies = (network: ChainNetwork): StrategyNetworkConfig => {
 				[ethDeploy.sett_system.vaults['native.fPmBtcHBtc']]: {
 					address: ethDeploy.sett_system.strategies['native.fPmBtcHBtc'],
 					fees: {
-						[StrategyFee.daoPerformance]: new BigNumber(1000),
+						[StrategyFee.performance]: new BigNumber(1000),
 						[StrategyFee.withdraw]: new BigNumber(75),
 					},
 					strategyLink: 'https://badgerwiki.notion.site/placeholder',

diff --git a/src/mobx/model/system-config/stategy-fees.ts b/src/mobx/model/system-config/stategy-fees.ts
@@ -2,7 +2,6 @@ export enum StrategyFee {
 	performance = 'performance',
 	strategistPerformance = 'strategistPerformance',
 	withdraw = 'withdraw',
-	daoPerformance = 'daoPerformance',
 	yearnPerformance = 'yearnPerformance',
 	yearnManagement = 'yearnManagement',
 	harvestPerformance = 'harvestPerformance',
@@ -13,7 +12,6 @@ export const userReadableFeeNames: Record<StrategyFee, string> = {
 	[StrategyFee.performance]: 'Performance Fee',
 	[StrategyFee.strategistPerformance]: 'Strategist Performance Fee',
 	[StrategyFee.withdraw]: 'Withdraw Fee',
-	[StrategyFee.daoPerformance]: 'DAO Performance Fee',
 	[StrategyFee.yearnPerformance]: 'Yearn Performance Fee',
 	[StrategyFee.yearnManagement]: 'Yearn Management Fee',
 	[StrategyFee.harvestPerformance]: 'Harvest Performance Fee',

diff --git a/src/mobx/utils/fees.ts b/src/mobx/utils/fees.ts
@@ -27,9 +27,6 @@ export function getStrategyFee(sett: Sett, fee: StrategyFee, config: StrategyCon
 			case StrategyFee.strategistPerformance:
 				requestedFee = defaultFee.strategistPerformance?.toNumber();
 				break;
-			case StrategyFee.daoPerformance:
-				requestedFee = defaultFee.daoPerformance?.toNumber();
-				break;
 			case StrategyFee.yearnManagement:
 				requestedFee = defaultFee.yearnManagement?.toNumber();
 				break;
@@ -60,8 +57,6 @@ function getSettStrategyFee(strategy: SettStrategy, fee: StrategyFee): number |
 			return strategy.performanceFee;
 		case StrategyFee.strategistPerformance:
 			return strategy.strategistFee;
-		case StrategyFee.daoPerformance:
-			return strategy.performanceFee + strategy.strategistFee;
 		default:
 			return;
 	}

diff --git a/src/tests/__snapshots__/LockedCvxDelegationAction.test.tsx.snap b/src/tests/__snapshots__/LockedCvxDelegationAction.test.tsx.snap
@@ -13,16 +13,18 @@ exports[`LockedCvxDelegationAction handles badger delegated state 1`] = `
 exports[`LockedCvxDelegationAction handles delegated state 1`] = `
 <div>
   <button
-    class="MuiButtonBase-root-32 MuiButton-root-3 MuiButton-contained-11 makeStyles-linkButton-2 MuiButton-containedPrimary-12 MuiButton-containedSizeSmall-22 MuiButton-sizeSmall-24 MuiButton-disabled-16 MuiButtonBase-disabled-33"
-    disabled=""
-    tabindex="-1"
+    class="MuiButtonBase-root-32 MuiButton-root-3 MuiButton-contained-11 makeStyles-linkButton-2 MuiButton-containedPrimary-12 MuiButton-containedSizeSmall-22 MuiButton-sizeSmall-24"
+    tabindex="0"
     type="button"
   >
     <span
       class="MuiButton-label-4"
     >
       Click here to delegate your locked CVX balance to Badger
     </span>
+    <span
+      class="MuiTouchRipple-root-35"
+    />
   </button>
 </div>
 `;

diff --git a/src/tests/__snapshots__/SettDeposit.test.tsx.snap b/src/tests/__snapshots__/SettDeposit.test.tsx.snap
@@ -231,12 +231,12 @@ exports[`Sett Deposit can go back from full fees descriptions  1`] = `
                 <p
                   class="MuiTypography-root-56 makeStyles-specName-445 MuiTypography-body1-58 MuiTypography-colorTextSecondary-82 MuiTypography-displayInline-84"
                 >
-                  DAO Performance Fee
+                  Performance Fee
                 </p>
                 <h6
                   class="MuiTypography-root-56 MuiTypography-subtitle2-68 MuiTypography-displayInline-84"
                 >
-                  0.3%
+                  0.2%
                 </h6>
               </div>
               <div
@@ -635,12 +635,12 @@ exports[`Sett Deposit displays sett information 1`] = `
                 <p
                   class="MuiTypography-root-56 makeStyles-specName-325 MuiTypography-body1-58 MuiTypography-colorTextSecondary-82 MuiTypography-displayInline-84"
                 >
-                  DAO Performance Fee
+                  Performance Fee
                 </p>
                 <h6
                   class="MuiTypography-root-56 MuiTypography-subtitle2-68 MuiTypography-displayInline-84"
                 >
-                  0.3%
+                  0.2%
                 </h6>
               </div>
               <div

diff --git a/src/tests/sett-details/__snapshots__/SpecsCard.test.tsx.snap b/src/tests/sett-details/__snapshots__/SpecsCard.test.tsx.snap
@@ -216,12 +216,12 @@ exports[`Specs Section displays sett information 1`] = `
             <p
               class="MuiTypography-root-145 makeStyles-specName-267 MuiTypography-body1-147 MuiTypography-colorTextSecondary-171 MuiTypography-displayInline-173"
             >
-              DAO Performance Fee
+              Performance Fee
             </p>
             <h6
               class="MuiTypography-root-145 MuiTypography-subtitle2-157 MuiTypography-displayInline-173"
             >
-              0.3%
+              0.2%
             </h6>
           </div>
           <div