This repository has been archived by the owner on Aug 12, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement fixes and improvements related to fees (#409)
* Handle edge cases in fees gracefully * Normalize fees in fill response
- Loading branch information
Showing
11 changed files
with
441 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,70 @@ | ||
| const _ = require('lodash'); | ||
|
|
||
| const { ZRX_TOKEN_DECIMALS } = require('../constants'); | ||
| const formatTokenAmount = require('../tokens/format-token-amount'); | ||
| const formatTokenType = require('../tokens/format-token-type'); | ||
| const formatTraderType = require('../traders/format-trader-type'); | ||
|
|
||
| const transformFee = fee => { | ||
| const tokenAmount = formatTokenAmount(_.get(fee, 'amount.token'), fee.token); | ||
|
|
||
| return { | ||
| amount: { | ||
| token: formatTokenAmount(_.get(fee, 'amount.token'), fee.token), | ||
| USD: _.get(fee, 'amount.USD'), | ||
| token: tokenAmount, | ||
| USD: _.get(fee, 'amount.USD', null), | ||
| }, | ||
| token: { | ||
| address: fee.tokenAddress, | ||
| id: fee.tokenId, | ||
| name: _.get(fee.token, 'name'), | ||
| symbol: _.get(fee.token, 'symbol'), | ||
| id: _.get(fee, 'tokenId', null), | ||
| name: _.get(fee.token, 'name', null), | ||
| symbol: _.get(fee.token, 'symbol', null), | ||
| type: formatTokenType(_.get(fee.token, 'type')), | ||
| }, | ||
| traderType: formatTraderType(fee.traderType), | ||
| }; | ||
| }; | ||
|
|
||
| const getFeesForFill = fill => | ||
| fill.protocolVersion < 3 | ||
| ? undefined | ||
| : _.map(fill.fees, fee => transformFee(fee)); | ||
| const ZRX_TOKEN = { | ||
| address: '0xe41d2489571d322189246dafa5ebde1f4699f498', | ||
| id: null, | ||
| name: '0x Protocol Token', | ||
| symbol: 'ZRX', | ||
| type: 'erc-20', | ||
| }; | ||
|
|
||
| const getFeesForFill = fill => { | ||
| const conversions = _.get(fill, `conversions.USD`, {}); | ||
| const makerFee = _.get(fill, 'makerFee', 0); | ||
| const takerFee = _.get(fill, 'takerFee', 0); | ||
|
|
||
| if (makerFee > 0 || takerFee > 0) { | ||
| return _.compact([ | ||
| makerFee === 0 | ||
| ? undefined | ||
| : { | ||
| amount: { | ||
| token: formatTokenAmount(makerFee, ZRX_TOKEN_DECIMALS), | ||
| USD: _.get(conversions, 'makerFee'), | ||
| }, | ||
| token: ZRX_TOKEN, | ||
| traderType: 'maker', | ||
| }, | ||
| takerFee === 0 | ||
| ? undefined | ||
| : { | ||
| amount: { | ||
| token: formatTokenAmount(takerFee, ZRX_TOKEN_DECIMALS), | ||
| USD: _.get(conversions, 'takerFee'), | ||
| }, | ||
| token: ZRX_TOKEN, | ||
| traderType: 'taker', | ||
| }, | ||
| ]); | ||
| } | ||
|
|
||
| return _.get(fill, 'fees', []) | ||
| .filter(fee => fee.amount.token > 0) | ||
| .map(transformFee); | ||
| }; | ||
|
|
||
| module.exports = getFeesForFill; |
Oops, something went wrong.