Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion routes/dao_coin_exchange_with_fees.go
Original file line number Diff line number Diff line change
Expand Up @@ -1526,6 +1526,9 @@ func (fes *APIServer) HandleMarketOrder(
feeBaseUnits,
req.MinFeeRateNanosPerKB,
nil)
if err != nil {
return nil, fmt.Errorf("HandleMarketOrder: Problem creating transaction: %v", err)
}
_, _, _, _, err = utxoView.ConnectTransaction(
txn, txn.Hash(), fes.blockchain.BlockTip().Height,
fes.blockchain.BlockTip().Header.TstampNanoSecs,
Expand Down Expand Up @@ -1991,7 +1994,7 @@ func (fes *APIServer) HandleMarketOrder(
}

// Wrap all of the resulting txns into an atomic
allTxns := append(transferTxns, orderTxn)
allTxns := append([]*lib.MsgDeSoTxn{orderTxn}, transferTxns...)
if tokenWhitelistTxn != nil && !skipWhitelist {
allTxns = append(allTxns, tokenWhitelistTxn)
}
Expand Down