| リビジョン | bbe84f523ad9e73fbbe5031696109c1577473043 (tree) |
|---|---|
| 日時 | 2020-03-25 23:23:35 |
| 作者 | paladz <453256728@qq.c...> |
| コミッター | paladz |
allow 5% fee
application/mov/match/engine.go (diff) application/mov/match/fee_strategy.go (diff) application/mov/mov_core.go (diff)| @@ -125,8 +125,8 @@ func (e *Engine) buildMatchTx(orders []*common.Order) (*types.Tx, error) { | ||
| 125 | 125 | txData.Inputs = append(txData.Inputs, input) |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - receivedAmounts := CalcReceivedAmount(orders) | |
| 129 | - allocatedAssets := e.feeStrategy.Allocate(receivedAmounts) | |
| 128 | + receivedAmounts, priceDiff := CalcReceivedAmount(orders) | |
| 129 | + allocatedAssets := e.feeStrategy.Allocate(receivedAmounts, priceDiff) | |
| 130 | 130 | if err := addMatchTxOutput(txData, orders, receivedAmounts, allocatedAssets); err != nil { |
| 131 | 131 | return nil, err |
| 132 | 132 | } |
| @@ -190,16 +190,25 @@ func calcShouldPayAmount(receiveAmount uint64, ratioNumerator, ratioDenominator | ||
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | // CalcReceivedAmount return amount of assets received by each participant in the matching transaction and the price difference |
| 193 | -func CalcReceivedAmount(orders []*common.Order) []*bc.AssetAmount { | |
| 194 | - var receivedAmounts []*bc.AssetAmount | |
| 193 | +func CalcReceivedAmount(orders []*common.Order) ([]*bc.AssetAmount, []*bc.AssetAmount) { | |
| 194 | + var receivedAmounts, priceDiffs, shouldPayAmounts []*bc.AssetAmount | |
| 195 | 195 | for i, order := range orders { |
| 196 | 196 | requestAmount := CalcRequestAmount(order.Utxo.Amount, order.RatioNumerator, order.RatioDenominator) |
| 197 | 197 | oppositeOrder := orders[calcOppositeIndex(len(orders), i)] |
| 198 | 198 | receiveAmount := vprMath.MinUint64(oppositeOrder.Utxo.Amount, requestAmount) |
| 199 | + shouldPayAmount := calcShouldPayAmount(receiveAmount, order.RatioNumerator, order.RatioDenominator) | |
| 199 | 200 | receivedAmounts = append(receivedAmounts, &bc.AssetAmount{AssetId: order.ToAssetID, Amount: receiveAmount}) |
| 201 | + shouldPayAmounts = append(shouldPayAmounts, &bc.AssetAmount{AssetId: order.FromAssetID, Amount: shouldPayAmount}) | |
| 200 | 202 | } |
| 201 | 203 | |
| 202 | - return receivedAmounts | |
| 204 | + for i, receivedAmount := range receivedAmounts { | |
| 205 | + oppositeShouldPayAmount := shouldPayAmounts[calcOppositeIndex(len(orders), i)] | |
| 206 | + priceDiffs = append(priceDiffs, &bc.AssetAmount{AssetId: oppositeShouldPayAmount.AssetId, Amount: 0}) | |
| 207 | + if oppositeShouldPayAmount.Amount > receivedAmount.Amount { | |
| 208 | + priceDiffs[i].Amount = oppositeShouldPayAmount.Amount - receivedAmount.Amount | |
| 209 | + } | |
| 210 | + } | |
| 211 | + return receivedAmounts, priceDiffs | |
| 203 | 212 | } |
| 204 | 213 | |
| 205 | 214 | // IsMatched check does the orders can be exchange |
| @@ -24,7 +24,7 @@ type FeeStrategy interface { | ||
| 24 | 24 | // @param receiveAmounts the amount of assets that the participants in the matching transaction can received when no fee is considered |
| 25 | 25 | // @param priceDiffs price differential of matching transaction |
| 26 | 26 | // @return reallocated assets after calculating fees |
| 27 | - Allocate(receiveAmounts []*bc.AssetAmount) *AllocatedAssets | |
| 27 | + Allocate(receiveAmounts, priceDiff []*bc.AssetAmount) *AllocatedAssets | |
| 28 | 28 | |
| 29 | 29 | // Validate verify that the fee charged for a matching transaction is correct |
| 30 | 30 | Validate(receiveAmounts []*bc.AssetAmount, feeAmounts map[bc.AssetID]uint64) error |
| @@ -39,14 +39,18 @@ func NewDefaultFeeStrategy() *DefaultFeeStrategy { | ||
| 39 | 39 | } |
| 40 | 40 | |
| 41 | 41 | // Allocate will allocate the price differential in matching transaction to the participants and the fee |
| 42 | -func (d *DefaultFeeStrategy) Allocate(receiveAmounts []*bc.AssetAmount) *AllocatedAssets { | |
| 42 | +func (d *DefaultFeeStrategy) Allocate(receiveAmounts, priceDiff []*bc.AssetAmount) *AllocatedAssets { | |
| 43 | 43 | receives := make([]*bc.AssetAmount, len(receiveAmounts)) |
| 44 | 44 | fees := make([]*bc.AssetAmount, len(receiveAmounts)) |
| 45 | 45 | |
| 46 | 46 | for i, receiveAmount := range receiveAmounts { |
| 47 | - minFeeAmount := d.calcMinFeeAmount(receiveAmount.Amount) | |
| 48 | - receives[i] = &bc.AssetAmount{AssetId: receiveAmount.AssetId, Amount: receiveAmount.Amount - minFeeAmount} | |
| 49 | - fees[i] = &bc.AssetAmount{AssetId: receiveAmount.AssetId, Amount: minFeeAmount} | |
| 47 | + fee := d.calcMinFeeAmount(receiveAmount.Amount) + priceDiff[i].Amount | |
| 48 | + if maxFeeAmount := d.calcMaxFeeAmount(receiveAmount.Amount); fee > maxFeeAmount { | |
| 49 | + fee = maxFeeAmount | |
| 50 | + } | |
| 51 | + | |
| 52 | + receives[i] = &bc.AssetAmount{AssetId: receiveAmount.AssetId, Amount: receiveAmount.Amount - fee} | |
| 53 | + fees[i] = &bc.AssetAmount{AssetId: receiveAmount.AssetId, Amount: fee} | |
| 50 | 54 | } |
| 51 | 55 | return &AllocatedAssets{Receives: receives, Fees: fees} |
| 52 | 56 | } |
| @@ -298,7 +298,7 @@ func validateMatchedTxFee(tx *types.Tx, blockHeight uint64) error { | ||
| 298 | 298 | return err |
| 299 | 299 | } |
| 300 | 300 | |
| 301 | - receivedAmount := match.CalcReceivedAmount(orders) | |
| 301 | + receivedAmount, _ := match.CalcReceivedAmount(orders) | |
| 302 | 302 | feeAmounts := make(map[bc.AssetID]uint64) |
| 303 | 303 | for assetID, fee := range matchedTxFees { |
| 304 | 304 | feeAmounts[assetID] = fee.amount |
Fork