Some minor updates for update to short trading

This commit is contained in:
Matthias 2022-03-30 20:12:19 +02:00
parent 9c3b4482a2
commit 4c375792ca
3 changed files with 17 additions and 11 deletions

View File

@ -276,7 +276,7 @@ export default class BacktestResultView extends Vue {
get perSellReason() {
return [
{ key: 'sell_reason', label: 'Sell Reason' },
{ key: 'sell_reason', label: 'Exit Reason' },
{ key: 'trades', label: 'Buys' },
{ key: 'profit_mean', label: 'Avg Profit %', formatter: (value) => formatPercent(value, 2) },
{ key: 'profit_sum', label: 'Cum Profit %', formatter: (value) => formatPercent(value, 2) },

View File

@ -141,7 +141,11 @@ export default class ForceBuyForm extends Vue {
this.price = null;
this.stakeAmount = null;
if (this.botApiVersion > 1.1) {
this.ordertype = this.botState?.order_types?.forcebuy || this.botState?.order_types?.buy;
this.ordertype =
this.botState?.order_types?.forcebuy ||
this.botState?.order_types?.forceentry ||
this.botState?.order_types?.buy ||
this.botState?.order_types?.entry;
}
}

View File

@ -68,8 +68,10 @@ export enum RunModes {
}
export interface UnfilledTimeout {
buy: number;
sell: number;
buy?: number; // Deprecated
entry?: number;
sell?: number; // Deprecated
exit?: number;
unit: string;
exit_timeout_count: number;
}
@ -95,14 +97,12 @@ export interface PriceBase {
price_side: string;
use_order_book: boolean;
order_book_top: number;
price_last_balance?: number;
}
export interface AskStrategy extends PriceBase {
bid_last_balance?: number;
}
export type ExitPricing = PriceBase;
export interface BidStrategy extends PriceBase {
ask_last_balance?: number;
export interface EntryPricing extends PriceBase {
check_depth_of_market: object;
}
@ -117,8 +117,10 @@ export interface BotState {
short_allowed?: boolean;
state: BotStates;
runmode: RunModes;
bid_strategy: BidStrategy;
ask_strategy: AskStrategy;
bid_strategy?: EntryPricing;
ask_strategy?: ExitPricing;
entry_pricing?: EntryPricing;
exit_pricing?: ExitPricing;
unfilledtimeout: UnfilledTimeout;
order_types: OrderTypes;
exchange: string;