lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: add trade id to trade entry object

Browse source
This commit is contained in:
José Oliveira 2021-06-29 13:59:37 +01:00 • committed by Josh Harvey
parent 700244e45b
commit 9b4bae4097
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/exchange.js
View file

@ -19,25 +19,25 @@ function fetchExchange (settings, cryptoCode) {
}) })
} }
function buy (settings, tradeEntry, tradeId) { function buy (settings, tradeEntry) {
const { cryptoAtoms, fiatCode, cryptoCode } = tradeEntry const { cryptoAtoms, fiatCode, cryptoCode } = tradeEntry
return fetchExchange(settings, cryptoCode) return fetchExchange(settings, cryptoCode)
.then(r => { .then(r => {
if (r.exchangeName === 'mock-exchange') { if (r.exchangeName === 'mock-exchange') {
return mockExchange.buy(cryptoAtoms, fiatCode, cryptoCode) return mockExchange.buy(cryptoAtoms, fiatCode, cryptoCode)
} }
return ccxt.trade('buy', r.account, cryptoAtoms, fiatCode, cryptoCode, r.exchangeName, tradeId) return ccxt.trade('buy', r.account, tradeEntry, r.exchangeName)
}) })
} }
function sell (settings, tradeEntry, tradeId) { function sell (settings, tradeEntry) {
const { cryptoAtoms, fiatCode, cryptoCode } = tradeEntry const { cryptoAtoms, fiatCode, cryptoCode } = tradeEntry
return fetchExchange(settings, cryptoCode) return fetchExchange(settings, cryptoCode)
.then(r => { .then(r => {
if (r.exchangeName === 'mock-exchange') { if (r.exchangeName === 'mock-exchange') {
return mockExchange.sell(cryptoAtoms, fiatCode, cryptoCode) return mockExchange.sell(cryptoAtoms, fiatCode, cryptoCode)
} }
return ccxt.trade('sell', r.account, cryptoAtoms, fiatCode, cryptoCode, r.exchangeName, tradeId) return ccxt.trade('sell', r.account, tradeEntry, r.exchangeName)
}) })
} }

7
lib/plugins.js
View file

@ -517,8 +517,9 @@ function plugins (settings, deviceId) {
const execute = tradeEntry.type === 'buy' ? exchange.buy : exchange.sell const execute = tradeEntry.type === 'buy' ? exchange.buy : exchange.sell
return recordTrade(tradeEntry) return recordTrade(tradeEntry)
.then(newEntry => .then(newEntry => {
execute(settings, tradeEntry, newEntry.id) tradeEntry.tradeId = newEntry.id
return execute(settings, tradeEntry)
.catch(err => { .catch(err => {
updateTradeEntry(tradeEntry, newEntry, err) updateTradeEntry(tradeEntry, newEntry, err)
.then(() => { .then(() => {
@ -526,7 +527,7 @@ function plugins (settings, deviceId) {
throw err throw err
}) })
}) })
) })
} }
function updateTradeEntry (tradeEntry, newEntry, err) { function updateTradeEntry (tradeEntry, newEntry, err) {

3
lib/plugins/exchange/ccxt.js
View file

@ -8,7 +8,8 @@ const { ORDER_TYPES } = require('./consts')
const DEFAULT_PRICE_PRECISION = 2 const DEFAULT_PRICE_PRECISION = 2
const DEFAULT_AMOUNT_PRECISION = 8 const DEFAULT_AMOUNT_PRECISION = 8
function trade (side, account, cryptoAtoms, fiatCode, cryptoCode, exchangeName, tradeId) { function trade (side, account, tradeEntry, exchangeName) {
const { cryptoAtoms, fiatCode, cryptoCode, tradeId } = tradeEntry
try { try {
const exchangeConfig = ALL[exchangeName] const exchangeConfig = ALL[exchangeName]
if (!exchangeConfig) throw Error('Exchange configuration not found') if (!exchangeConfig) throw Error('Exchange configuration not found')