From 5072dfe4e3e8770818fe48b6006d18c5bb675f3c Mon Sep 17 00:00:00 2001 From: NguyenNguyen Date: Tue, 2 Jun 2020 14:32:19 +0700 Subject: [PATCH] update checking TIPTomoXLending condition --- tomoxlending/order_processor.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tomoxlending/order_processor.go b/tomoxlending/order_processor.go index 0eb5c84aef..52317058ad 100644 --- a/tomoxlending/order_processor.go +++ b/tomoxlending/order_processor.go @@ -287,7 +287,7 @@ func (l *Lending) processOrderList(header *types.Header, coinbase common.Address if collateralPrice == nil || collateralPrice.Sign() <= 0 { return nil, nil, nil, fmt.Errorf("invalid collateral price") } - tradedQuantity, collateralLockedAmount, rejectMaker, settleBalanceResult, err := l.getLendQuantity(lendTokenTOMOPrice, collateralPrice, depositRate, borrowFee, coinbase, chain, statedb, order, &oldestOrder, maxTradedQuantity) + tradedQuantity, collateralLockedAmount, rejectMaker, settleBalanceResult, err := l.getLendQuantity(lendTokenTOMOPrice, collateralPrice, depositRate, borrowFee, coinbase, chain, header, statedb, order, &oldestOrder, maxTradedQuantity) if err != nil && err == lendingstate.ErrQuantityTradeTooSmall && tradedQuantity != nil && tradedQuantity.Sign() >= 0 { if tradedQuantity.Cmp(maxTradedQuantity) == 0 { if quantityToTrade.Cmp(amount) == 0 { // reject Taker & maker @@ -422,7 +422,7 @@ func (l *Lending) getLendQuantity( collateralPrice, depositRate, borrowFee *big.Int, - coinbase common.Address, chain consensus.ChainContext, statedb *state.StateDB, takerOrder *lendingstate.LendingItem, makerOrder *lendingstate.LendingItem, quantityToTrade *big.Int) (*big.Int, *big.Int, bool, *lendingstate.LendingSettleBalance, error) { + coinbase common.Address, chain consensus.ChainContext, header *types.Header, statedb *state.StateDB, takerOrder *lendingstate.LendingItem, makerOrder *lendingstate.LendingItem, quantityToTrade *big.Int) (*big.Int, *big.Int, bool, *lendingstate.LendingSettleBalance, error) { if collateralPrice == nil || collateralPrice.Sign() == 0 { if takerOrder.Side == lendingstate.Borrowing { log.Debug("Reject lending order taker , can not found collateral price ") @@ -478,7 +478,7 @@ func (l *Lending) getLendQuantity( log.Debug("GetLendQuantity", "side", takerOrder.Side, "takerBalance", takerBalance, "makerBalance", makerBalance, "LendingToken", makerOrder.LendingToken, "CollateralToken", collateralToken, "quantity", quantity, "rejectMaker", rejectMaker) if quantity.Sign() > 0 { // Apply Match Order - isTomoXLendingFork := chain.Config().IsTIPTomoXLending(chain.CurrentHeader().Number) + isTomoXLendingFork := chain.Config().IsTIPTomoXLending(header.Number) settleBalanceResult, err := lendingstate.GetSettleBalance(isTomoXLendingFork, takerOrder.Side, lendTokenTOMOPrice, collateralPrice, depositRate, borrowFee, lendToken, collateralToken, LendingTokenDecimal, collateralTokenDecimal, quantity) log.Debug("GetSettleBalance", "settleBalanceResult", settleBalanceResult, "err", err) if err == nil {