dexorder/web
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ordershape fixes

Browse Source
This commit is contained in:
tim
2024-09-23 02:44:57 -04:00
parent b82171dfb0
commit bc443172a1
9 changed files with 113 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/charts/ordershapes.js
View File

@@ -1,7 +1,6 @@
import {DISTANT_FUTURE, DISTANT_PAST} from "@/blockchain/orderlib.js";
import {DLine, HLine} from "@/charts/shape.js";
import {allocationText, DLine, HLine} from "@/charts/shape.js";
import {createShape, deleteShapeId} from "@/charts/chart.js";
import {allocationText} from "@/orderbuild.js";
import {timestamp} from "@/misc.js";
export class OrderShapes {
@@ -63,28 +62,37 @@ class TrancheShapes {
const symbol = this.symbol
const scale = 10**symbol.decimals;
const buy = order.tokenIn === this.symbol.quote.a
const inverted = buy === symbol.inverted
const amountIsBase = buy !== this.status.order.amountIsInput
const filledAmount = this.status.order.amountIsInput ? f.filledIn : f.filledOut;
const amount = Number(filledAmount)
* 10 ** -(amountIsBase ? this.symbol.base.d : this.symbol.quote.d)
const weight = Number(filledAmount) / Number(this.status.order.amount)
const amountSymbol = amountIsBase ? this.symbol.base.s : this.symbol.quote.s
console.log('fillpoint', buy, filledAmount, this.status.order, this.symbol)
const time = f.time
const out = Number(f.filledOut) / (1-this.status.order.route.fee/1000000)
let price = out / Number(f.filledIn)
if (inverted)
if (buy)
price = 1/price
price *= scale
// console.log('price', price)
const channel = buy?'low':'high';
const text = (buy ? 'Buy ' : 'Sell ') + allocationText(null, f.filled, '')
const text = (buy ? 'Buy ' : 'Sell ') + allocationText(weight, amount, amountSymbol, '\n')
const s = createShape(buy?'arrow_up':'arrow_down', {time, price}, {channel,text,lock:true})
// console.log('created fill shape at', time, price)
this.fills.push(s)
}
createLine(slope, intercept) {
createLine(slope, intercept, amount) {
const t = this.tranche
const status = this.status
const symbol = this.symbol
const scale = 10**symbol.decimals;
const buy = status.order.tokenIn === this.symbol.quote.a
const inverted = buy === symbol.inverted
amount = Number(amount)
* 10 ** -(buy ? this.symbol.base.d : this.symbol.quote.d)
const amountSymbol = buy ? this.symbol.base.s : this.symbol.quote.s
const color = buy ? 'green' : 'red'
if (intercept !== 0 || slope !== 0) {
// console.log('tranche line', intercept, slope)
@@ -96,19 +104,16 @@ class TrancheShapes {
price *= scale
// horizontal line
// console.log('hline', price, inverted)
const s = new HLine({price, color,
// todo allocation maxAllocation amount amountSymbol
}, null, null, null, true)
const model = {price, color, maxAllocation: status.order.amount, amount, amountSymbol};
const s = new HLine(model, null, null, null, true)
this.shapes.push(s)
} else {
// diagonal line
let startTime = t.startTime
// noinspection EqualityComparisonWithCoercionJS
if (startTime == DISTANT_PAST)
if (startTime === DISTANT_PAST)
startTime = 1231006505 // use Bitcoin genesis as the drawing point's start time. unnecessary.
let endTime = t.endTime
// noinspection EqualityComparisonWithCoercionJS
if (endTime == DISTANT_FUTURE)
if (endTime === DISTANT_FUTURE)
endTime = timestamp() // use "now" as the drawing point's time
let startPrice = (intercept + slope * startTime);
let endPrice = (intercept + slope * endTime);
@@ -118,15 +123,17 @@ class TrancheShapes {
}
startPrice *= scale
endPrice *= scale
// console.log('dline', startTime, endTime, DISTANT_FUTURE, startPrice, endPrice)
const s = new DLine({
pointA: {time: t.startTime, price: startPrice},
pointB: {time: t.endTime, price: endPrice},
console.log('dline', startTime, endTime, DISTANT_FUTURE, startPrice, endPrice)
// noinspection EqualityComparisonWithCoercionJS
const model = {
pointA: {time: startTime, price: startPrice},
pointB: {time: endTime, price: endPrice},
extendLeft: t.startTime === DISTANT_PAST,
extendRight: t.endTime === DISTANT_FUTURE,
color,
// todo allocation maxAllocation amount amountSymbol
}, null, null, null, true)
maxAllocation: status.order.amount, amount, amountSymbol,
};
const s = new DLine(model, null, null, null, true)
this.shapes.push(s)
}
}