diff --git a/src/lib/Tractor/api/tractor-api.ts b/src/lib/Tractor/api/tractor-api.ts index ce9069b0..7e2604e9 100644 --- a/src/lib/Tractor/api/tractor-api.ts +++ b/src/lib/Tractor/api/tractor-api.ts @@ -103,13 +103,13 @@ const segregateExecutionsByBlueprintType = ( const isSowV0BlueprintExecution = ( result: TractorAPIResponseExecution, ): result is TractorAPIExecutionSowOrderItem => { - return result.orderInfo.orderType === "SOW_V0"; + return result.orderInfo.orderType === "SOW"; }; const isConvertUpBlueprintV0Execution = ( result: TractorAPIResponseExecution, ): result is TractorAPIExecutionConvertUpOrderItem => { - return result.orderInfo.orderType === "CONVERT_UP_V0"; + return result.orderInfo.orderType === "CONVERT_UP"; }; export interface TractorAPIExecutionsOptions { @@ -203,7 +203,7 @@ const getTractorBaseURL = (isConvert?: boolean) => { * const results = await paginateTractorApiRequest( * (body) => fetch('/api/orders', { body }), * (res) => res.orders.length, - * { orderType: 'SOW_V0' } + * { orderType: 'SOW' } * ); * ``` */ diff --git a/src/lib/Tractor/api/tractor-api.types.ts b/src/lib/Tractor/api/tractor-api.types.ts index 3d47b046..ed4183a2 100644 --- a/src/lib/Tractor/api/tractor-api.types.ts +++ b/src/lib/Tractor/api/tractor-api.types.ts @@ -11,9 +11,9 @@ export type BaseTractorAPIResponse = { totalRecords: number; } & T; -export type TractorAPISowOrderType = "SOW_V0"; +export type TractorAPISowOrderType = "SOW"; -export type TractorAPIConvertOrderType = "CONVERT_UP_V0"; +export type TractorAPIConvertOrderType = "CONVERT_UP"; export type TractorAPIOrderType = TractorAPISowOrderType | TractorAPIConvertOrderType; @@ -74,8 +74,8 @@ interface TractorAPIConvertUpBlueprint { } type OrderBlueprintTypeLookup = { - SOW_V0: TractorAPISowOrderBlueprint; - CONVERT_UP_V0: TractorAPIConvertUpBlueprint; + SOW: TractorAPISowOrderBlueprint; + CONVERT_UP: TractorAPIConvertUpBlueprint; }; export interface TractorAPIOrder { diff --git a/src/pages/explorer/TractorExplorer.tsx b/src/pages/explorer/TractorExplorer.tsx index 9edf61c1..046329db 100644 --- a/src/pages/explorer/TractorExplorer.tsx +++ b/src/pages/explorer/TractorExplorer.tsx @@ -49,13 +49,13 @@ const TractorExplorer = () => { const uniquePublishersData = useSeasonalTractorUniquePublishers( Math.max(0, season - tabToSeasonalLookback(publishersTab)), season, - "SOW_V0", + "SOW", ); const convertUpPublishersData = useSeasonalTractorUniquePublishers( Math.max(0, season - tabToSeasonalLookback(convertUpPublishersTab)), season, - "CONVERT_UP_V0", + "CONVERT_UP", ); return ( diff --git a/src/state/seasonal/queries/useSeasonalTractorSnapshots.ts b/src/state/seasonal/queries/useSeasonalTractorSnapshots.ts index 928ab83d..baa50f2c 100644 --- a/src/state/seasonal/queries/useSeasonalTractorSnapshots.ts +++ b/src/state/seasonal/queries/useSeasonalTractorSnapshots.ts @@ -43,8 +43,8 @@ export type ConvertUpV0Snapshot = BaseTractorSnapshot & ConvertUpV0SnapshotBase; export type AggregatedTractorSnapshot = BaseTractorSnapshot & SowV0Snapshot & ConvertUpV0Snapshot; export type TractorSnapshotV2 = { - SOW_V0: SowV0Snapshot[]; - CONVERT_UP_V0: ConvertUpV0Snapshot[]; + SOW: SowV0Snapshot[]; + CONVERT_UP: ConvertUpV0Snapshot[]; }; type BaseTractorSnapshotResponse = { @@ -57,7 +57,7 @@ export type TractorSnapshotResponse = BaseTractorSnapshotResponse; -type TractorSnapshotOrderType = "SOW_V0" | "CONVERT_UP_V0"; +type TractorSnapshotOrderType = "SOW" | "CONVERT_UP"; const sortBySeasonAsc = (a: { season: number }, b: { season: number }) => a.season - b.season; const sortBySeasonDesc = (a: { season: number }, b: { season: number }) => b.season - a.season; diff --git a/src/state/seasonal/seasonalDataHooks.ts b/src/state/seasonal/seasonalDataHooks.ts index a7e9a48d..6ddd6779 100644 --- a/src/state/seasonal/seasonalDataHooks.ts +++ b/src/state/seasonal/seasonalDataHooks.ts @@ -358,10 +358,10 @@ export function useSeasonalWrappedDepositTotalSupply(fromSeason: number, toSeaso /** ==================== Tractor API Hourly Snapshots ==================== **/ -const ALL_ORDER_TYPES: MayArray<"SOW_V0" | "CONVERT_UP_V0"> = ["SOW_V0", "CONVERT_UP_V0"] as const; +const ALL_ORDER_TYPES: MayArray<"SOW" | "CONVERT_UP"> = ["SOW", "CONVERT_UP"] as const; export function useSeasonalTractorSownPinto(fromSeason: number, toSeason: number): UseSeasonalResult { - return useSeasonalTractorSnapshots("SOW_V0", fromSeason, toSeason, (data) => ({ + return useSeasonalTractorSnapshots("SOW", fromSeason, toSeason, (data) => ({ season: data.season, value: TV.fromBlockchain(data.totalPintoSown, PODS.decimals).toNumber(), timestamp: new Date(data.snapshotTimestamp), @@ -369,7 +369,7 @@ export function useSeasonalTractorSownPinto(fromSeason: number, toSeason: number } export function useSeasonalTractorPodsIssued(fromSeason: number, toSeason: number): UseSeasonalResult { - return useSeasonalTractorSnapshots("SOW_V0", fromSeason, toSeason, (data) => ({ + return useSeasonalTractorSnapshots("SOW", fromSeason, toSeason, (data) => ({ season: data.season, value: TV.fromBlockchain(data.totalPodsMinted, PODS.decimals).toNumber(), timestamp: new Date(data.snapshotTimestamp), @@ -377,7 +377,7 @@ export function useSeasonalTractorPodsIssued(fromSeason: number, toSeason: numbe } export function useSeasonalTractorFundedAmount(fromSeason: number, toSeason: number): UseSeasonalResult { - return useSeasonalTractorSnapshots("SOW_V0", fromSeason, toSeason, (data) => ({ + return useSeasonalTractorSnapshots("SOW", fromSeason, toSeason, (data) => ({ season: data.season, value: TV.fromBlockchain(data.totalCascadeFundedBelowTemp, PINTO.decimals).toNumber(), timestamp: new Date(data.snapshotTimestamp), @@ -389,7 +389,7 @@ export function useSeasonalTractorCumulativeTips(fromSeason: number, toSeason: n } export function useSeasonalTractorMaxSow(fromSeason: number, toSeason: number): UseSeasonalResult { - return useSeasonalTractorSnapshots("SOW_V0", fromSeason, toSeason, (data) => ({ + return useSeasonalTractorSnapshots("SOW", fromSeason, toSeason, (data) => ({ season: data.season, value: TV.fromBlockchain(data.maxSowThisSeason, PINTO.decimals).toNumber(), timestamp: new Date(data.snapshotTimestamp), @@ -407,7 +407,7 @@ export function useSeasonalTractorExecutionsCount(fromSeason: number, toSeason: export function useSeasonalTractorUniquePublishers( fromSeason: number, toSeason: number, - orderType: "SOW_V0" | "CONVERT_UP_V0", + orderType: "SOW" | "CONVERT_UP", ): UseSeasonalResult { return useSeasonalTractorSnapshots(orderType, fromSeason, toSeason, (data) => ({ season: data.season, @@ -461,7 +461,7 @@ const selectMultiOrderTypesV2Data = ( ) => { const bySeason: { [season: number]: SeasonalChartData } = {}; - data.SOW_V0.forEach((item) => { + data.SOW.forEach((item) => { bySeason[item.season] = { season: item.season, value: selectSow(item), @@ -469,7 +469,7 @@ const selectMultiOrderTypesV2Data = ( }; }); - data.CONVERT_UP_V0.forEach((item) => { + data.CONVERT_UP.forEach((item) => { const existing = bySeason[item.season]; if (existing) { const value = combine ? combine(existing.value, selectConvertUp(item)) : selectConvertUp(item); diff --git a/src/state/tractor/useTractorConvertUpOrders.ts b/src/state/tractor/useTractorConvertUpOrders.ts index 7decb581..7daea3c3 100644 --- a/src/state/tractor/useTractorConvertUpOrders.ts +++ b/src/state/tractor/useTractorConvertUpOrders.ts @@ -49,7 +49,7 @@ const useTractorAPIConvertUpOrders = ({ const args = { publisher: address, - orderType: "CONVERT_UP_V0", + orderType: "CONVERT_UP", cancelled, } as const; @@ -61,7 +61,7 @@ const useTractorAPIConvertUpOrders = ({ queryKey: queryKeys.tractor.convertUpOrders({ ...args }), queryFn: async () => { if (!chainId) return; - return TractorAPI.getOrders<"CONVERT_UP_V0">({ ...args }); + return TractorAPI.getOrders<"CONVERT_UP">({ ...args }); }, enabled: queryEnabled, select, @@ -72,7 +72,7 @@ const useTractorAPIConvertUpOrders = ({ }; const transformAPIOrderbookData = - (chainId: number) => (response: TractorAPIOrdersResponse<"CONVERT_UP_V0"> | undefined) => { + (chainId: number) => (response: TractorAPIOrdersResponse<"CONVERT_UP"> | undefined) => { if (!response) { return { orders: [], diff --git a/src/state/tractor/useTractorExecutions.ts b/src/state/tractor/useTractorExecutions.ts index 44a6e395..cdc5f6c9 100644 --- a/src/state/tractor/useTractorExecutions.ts +++ b/src/state/tractor/useTractorExecutions.ts @@ -95,7 +95,7 @@ export default function usePublisherTractorExecutions( const allExecutions: PublisherTractorExecution[] = [...sowBlueprintv0, ...convertUpBlueprint]; - // Filter out any on-chain executions that already exist in the API data & add the SOW_V0 executions if sowEvent is present + // Filter out any on-chain executions that already exist in the API data & add the SOW executions if sowEvent is present onChainExecutions?.forEach((exec) => { if (!existingTxHashes.has(exec.transactionHash.toLowerCase())) { allExecutions.push(exec); diff --git a/src/state/tractor/useTractorSowOrders.ts b/src/state/tractor/useTractorSowOrders.ts index 4525be83..76ef7b15 100644 --- a/src/state/tractor/useTractorSowOrders.ts +++ b/src/state/tractor/useTractorSowOrders.ts @@ -45,7 +45,7 @@ const useTractorAPISowOrders = ({ // biome-ignore lint/correctness/useExhaustiveDependencies: only re-run when the address / chainId changes const selectAndTransformOrders = useMemo(() => transformAPIOrderbookData(chainId), [chainId, address]); - const args = { publisher: address, orderType: "SOW_V0", cancelled } as const; + const args = { publisher: address, orderType: "SOW", cancelled } as const; const queryKey = queryKeys.tractor.sowOrdersV0({ ...args }); @@ -59,7 +59,7 @@ const useTractorAPISowOrders = ({ orders: [], }; - const response = await TractorAPI.getOrders<"SOW_V0">({ ...args, orderType: "SOW_V0" }); + const response = await TractorAPI.getOrders<"SOW">({ ...args, orderType: "SOW" }); return response; }, enabled: !!chainId && !chainOnly && !!enabled, @@ -68,7 +68,7 @@ const useTractorAPISowOrders = ({ }); }; -const transformAPIOrderbookData = (chainId: number) => (response: TractorAPIOrdersResponse<"SOW_V0"> | undefined) => { +const transformAPIOrderbookData = (chainId: number) => (response: TractorAPIOrdersResponse<"SOW"> | undefined) => { if (!response) return { orders: [], lastUpdated: 0, totalRecords: 0 }; const mainToken = getChainConstant(resolveChainId(chainId), MAIN_TOKEN); @@ -96,7 +96,7 @@ const transformAPIOrderbookData = (chainId: number) => (response: TractorAPIOrde blockNumber: order.publishedBlock, timestamp: Number(new Date(order.publishedTimestamp).getTime()), isCancelled: order.cancelled, - requisitionType: order.orderType === "SOW_V0" ? "sowBlueprintv0" : "unknown", + requisitionType: order.orderType === "SOW" ? "sowBlueprintv0" : "unknown", pintosLeftToSow: totalAmountToSow.sub(pintoSownCounter), totalAvailablePinto: cascadeAmountFunded, currentlySowable: cascadeAmountFunded, diff --git a/src/state/useSeasonsData.ts b/src/state/useSeasonsData.ts index 78c0a60a..775505fe 100644 --- a/src/state/useSeasonsData.ts +++ b/src/state/useSeasonsData.ts @@ -326,7 +326,7 @@ export default function useSeasonsData( const useAPYQuery = useSeasonalAPYs(tokenData.mainToken.address, fromSeason, toSeason, { enabled: apyData }); - const useTractorQuery = useSeasonalTractorSnapshots("SOW_V0", fromSeason, toSeason, (e: any) => e, { + const useTractorQuery = useSeasonalTractorSnapshots("SOW", fromSeason, toSeason, (e: any) => e, { orderBy: "desc", enabled: tractorData, });