update fee data source from config to metadata

tradingstrategy-ai · Sep 18, 2024 · 4e429f7 · 4e429f7
1 parent 219f6a2
commit 4e429f7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.env b/.env
@@ -31,7 +31,7 @@ TS_PUBLIC_TYPESENSE_API_URL=https://typesense.tradingstrategy.ai
 TS_PUBLIC_TYPESENSE_API_KEY=npdPPJNELDhdr7v6IS9rQUpFG2VvdyAL
 TS_PUBLIC_DISCORD_URL=https://discord.gg/5M88m9nM8H
 TS_PUBLIC_WALLET_CONNECT_PROJECT_ID=9ee7efad98897eb60ba023db6aa72355
-TS_PUBLIC_STRATEGIES='[{"id":"enzyme-polygon-eth-btc-rsi","name":"ETH-BTC price surge","url":"https://enzyme-polygon-eth-btc-rsi.tradingstrategy.ai/","frontpage":true,"hiddenPositions":[4]},{"id":"enzyme-ethereum-btc-eth-stoch-rsi","name":"Stochastic ETH/BTC long","url":"https://enzyme-ethereum-btc-eth-stoch-rsi.tradingstrategy.ai","fees":{"trading_strategy_protocol_fee":0.02,"strategy_developer_fee":0.1},"frontpage":true},{"id":"enzyme-polygon-eth-rolling-ratio","name":"ETH/BTC rolling ratio","url":"https://enzyme-polygon-eth-rolling-ratio.tradingstrategy.ai/","fees":{"trading_strategy_protocol_fee":0.02,"strategy_developer_fee":0.05},"frontpage":true},{"id":"enzyme-polygon-matic-eth-usdc","name":"ETH-MATIC-USDC momentum","url":"https://enzyme-polygon-matic-eth-usdc.tradingstrategy.ai","frontpage":true},{"id":"enzyme-polygon-eth-btc-usdc","name":"ETH-BTC-USDC momentum","url":"https://enzyme-polygon-eth-btc-usdc.tradingstrategy.ai","new_version_id":"enzyme-polygon-eth-btc-rsi","frontpage":true},{"id":"enzyme-polygon-matic-usdc","name":"MATIC breakout","url":"https://enzyme-polygon-matic-usdc.tradingstrategy.ai"},{"id":"enzyme-polygon-eth-breakout","name":"ETH breakout","url":"https://enzyme-polygon-eth-breakout.tradingstrategy.ai"},{"id":"enzyme-polygon-eth-usdc","name":"ETH Breakout bounce","url":"https://enzyme-polygon-eth-usdc.tradingstrategy.ai"},{"id":"enzyme-polygon-eth-usdc-sls","name":"ETH Balance snap","url":"https://enzyme-polygon-eth-usdc-sls.tradingstrategy.ai"},{"id":"polygon-eth-spot-short","name":"ETH mean reversion bounce","url":"https://polygon-eth-spot-short.tradingstrategy.ai"},{"id":"arbitrum-btc-breakout","name":"BTC Barrier Breach","url":"https://arbitrum-btc-breakout.tradingstrategy.ai"}]'
+TS_PUBLIC_STRATEGIES='[{"id":"enzyme-polygon-eth-btc-rsi","name":"ETH-BTC price surge","url":"https://enzyme-polygon-eth-btc-rsi.tradingstrategy.ai/","frontpage":true,"hiddenPositions":[4]},{"id":"enzyme-ethereum-btc-eth-stoch-rsi","name":"Stochastic ETH/BTC long","url":"https://enzyme-ethereum-btc-eth-stoch-rsi.tradingstrategy.ai","frontpage":true},{"id":"enzyme-polygon-eth-rolling-ratio","name":"ETH/BTC rolling ratio","url":"https://enzyme-polygon-eth-rolling-ratio.tradingstrategy.ai/","frontpage":true},{"id":"enzyme-polygon-matic-eth-usdc","name":"ETH-MATIC-USDC momentum","url":"https://enzyme-polygon-matic-eth-usdc.tradingstrategy.ai","frontpage":true},{"id":"enzyme-polygon-eth-btc-usdc","name":"ETH-BTC-USDC momentum","url":"https://enzyme-polygon-eth-btc-usdc.tradingstrategy.ai","new_version_id":"enzyme-polygon-eth-btc-rsi","frontpage":true},{"id":"enzyme-polygon-matic-usdc","name":"MATIC breakout","url":"https://enzyme-polygon-matic-usdc.tradingstrategy.ai"},{"id":"enzyme-polygon-eth-breakout","name":"ETH breakout","url":"https://enzyme-polygon-eth-breakout.tradingstrategy.ai"},{"id":"enzyme-polygon-eth-usdc","name":"ETH Breakout bounce","url":"https://enzyme-polygon-eth-usdc.tradingstrategy.ai"},{"id":"enzyme-polygon-eth-usdc-sls","name":"ETH Balance snap","url":"https://enzyme-polygon-eth-usdc-sls.tradingstrategy.ai"},{"id":"polygon-eth-spot-short","name":"ETH mean reversion bounce","url":"https://polygon-eth-spot-short.tradingstrategy.ai"},{"id":"arbitrum-btc-breakout","name":"BTC Barrier Breach","url":"https://arbitrum-btc-breakout.tradingstrategy.ai"}]'
 TS_PUBLIC_GEO_BLOCK='{"strategies:view":["CU","IR","KP","RU","SY"],"strategies:deposit":["CU","IR","KP","RU","SY","US","UK"]}'
 # Uncomment to test chain maintenance error
 # TS_PUBLIC_CHAINS_UNDER_MAINTENANCE='{ "binance": "BNB Chain" }'

diff --git a/src/lib/trade-executor/strategy/configuration.ts b/src/lib/trade-executor/strategy/configuration.ts
@@ -1,20 +1,11 @@
 import { strategyConfig } from '$lib/config';
 import { z } from 'zod';
-import { percent, primaryKey } from '../state/utility-types';
-
-export const strategyFeesSchema = z.object({
-	management_fee: percent.default(0),
-	trading_strategy_protocol_fee: percent.default(0),
-	strategy_developer_fee: percent.default(0),
-	enzyme_protocol_fee: percent.default(0.0025)
-});
-export type StrategyFees = z.infer<typeof strategyFeesSchema>;
+import { primaryKey } from '../state/utility-types';
 
 export const strategyConfigurationSchema = z.object({
 	id: z.string(),
 	name: z.string(),
 	url: z.string().url(),
-	fees: strategyFeesSchema.default({}),
 	new_version_id: z.string().nullish(),
 	frontpage: z.boolean().nullish(),
 	hiddenPositions: primaryKey.array().default([])

diff --git a/src/lib/trade-executor/strategy/summary.ts b/src/lib/trade-executor/strategy/summary.ts
@@ -91,6 +91,13 @@ export const strategySummaryStatisticsSchema = z.object({
 });
 export type StrategySummaryStatistics = z.infer<typeof strategySummaryStatisticsSchema>;
 
+export const strategyFeesSchema = z.object({
+	management_fee: percent.default(0),
+	trading_strategy_protocol_fee: percent.default(0),
+	strategy_developer_fee: percent.default(0)
+});
+export type StrategyFees = z.infer<typeof strategyFeesSchema>;
+
 export const strategySummarySchema = z.object({
 	name: z.string(),
 	short_description: z.string().nullish(),
@@ -106,6 +113,7 @@ export const strategySummarySchema = z.object({
 	crashed_at: unixTimestampToDate.nullish(),
 	badges: z.string().array(),
 	tags: z.string().array(),
-	sort_priority: z.number().default(0)
+	sort_priority: z.number().default(0),
+	fees: strategyFeesSchema.default({})
 });
 export type StrategySummary = z.infer<typeof strategySummarySchema>;
diff --git a/src/routes/strategies/[strategy]/fees/+page.svelte b/src/routes/strategies/[strategy]/fees/+page.svelte
@@ -11,6 +11,7 @@
 
 	const hasEnzymeVault = strategy.on_chain_data.asset_management_mode === 'enzyme';
 	const enzymeFeeUrl = 'https://docs.enzyme.finance/what-is-enzyme/faq#fees-performance-and-accounting';
+	const enzymeProtocolFee = 0.0025;
 </script>
 
 <svelte:head>
@@ -95,7 +96,7 @@
 						</p>
 					</div>
 				</Tooltip>
-				<span>{formatPercent(fees.enzyme_protocol_fee, 2)}</span>
+				<span>{formatPercent(enzymeProtocolFee, 2)}</span>
 			</div>
 		{/if}
 	</div>