cash-in working

This commit is contained in:
Josh Harvey 2016-04-07 13:25:34 +01:00
parent f357b6080e
commit e2d619c56d
3 changed files with 6 additions and 5 deletions

View file

@ -251,7 +251,7 @@ function _sendCoins (toAddress, cryptoAtoms, cryptoCode, cb) {
var walletPlugin = walletPlugins[cryptoCode]
var transactionFee = cachedConfig.exchanges.settings.transactionFee
if (cryptoCode === 'BTC') {
walletPlugin.sendBitcoins(toAddress, cryptoAtoms, transactionFee, cb)
walletPlugin.sendBitcoins(toAddress, cryptoAtoms.truncated().toNumber(), transactionFee, cb)
} else {
walletPlugin.sendBitcoins(toAddress, cryptoAtoms, cryptoCode, transactionFee, cb)
}
@ -301,7 +301,7 @@ function reapTx (row) {
var session = {fingerprint: row.device_fingerprint, id: row.session_id}
var tx = {
fiat: 0,
satoshis: row.satoshis,
satoshis: new BigNumber(row.satoshis),
toAddress: row.to_address,
currencyCode: row.currency_code,
cryptoCode: row.crypto_code,

View file

@ -182,8 +182,8 @@ function computeSendAmount (tx, totals) {
var fiatRemaining = (tx.fiat || totals.billsFiat) - totals.txFiat
var satoshisRemaining = tx.satoshis.eq(0)
? totals.billsSatoshis.minus(totals.txSatoshis)
: tx.satoshis.minus(totals.txSatoshis)
? totals.billsSatoshis.minus(totals.txSatoshis)
: tx.satoshis.minus(totals.txSatoshis)
var result = {
fiat: fiatRemaining,
@ -296,7 +296,7 @@ function insertTx (client, session, incoming, tx, satoshis, fiat, stage,
incoming,
session.fingerprint,
tx.toAddress,
satoshis,
satoshis.toString(),
tx.currencyCode,
tx.cryptoCode,
fiat,

View file

@ -115,6 +115,7 @@ function trade (req, res) {
function send (req, res) {
var tx = req.body
tx.cryptoAtoms = new BigNumber(tx.cryptoAtoms)
tx.satoshis = tx.cryptoAtoms
plugins.sendCoins(session(req), tx, function (err, status) {
// TODO: use status.statusCode here after confirming machine compatibility