crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2522 from 0xProject/fix/asset-swapper/fee-schedule

Browse Source 
`@0x/asset-swapper`: Fix fee schedule not being scaled by gas price.
This commit is contained in:
Lawrence Forman
2020-03-13 01:14:23 -04:00
committed by GitHub
parent baf6372179 2b58a7242b
commit aaa62beca7
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/asset-swapper/CHANGELOG.json
View File

@@ -25,6 +25,10 @@
{
"note": "Add `maxFallbackSlippage` option.",
"pr": 2513
},
{
"note": "Fix fee schedule not being scaled by gas price.",
"pr": 2522
}
]
},

6
packages/asset-swapper/src/utils/swap_quote_calculator.ts
View File

@@ -20,7 +20,7 @@ import {
import { fillableAmountsUtils } from './fillable_amounts_utils';
import { MarketOperationUtils } from './market_operation_utils';
import { convertNativeOrderToFullyFillableOptimizedOrders } from './market_operation_utils/orders';
import { ERC20BridgeSource, OptimizedMarketOrder } from './market_operation_utils/types';
import { ERC20BridgeSource, GetMarketOrdersOpts, OptimizedMarketOrder } from './market_operation_utils/types';
import { ProtocolFeeUtils } from './protocol_fee_utils';
import {
isOrderTakerFeePayableWithMakerAsset,
@@ -132,9 +132,9 @@ export class SwapQuoteCalculator {
{
// Scale fees by gas price.
const _opts = {
const _opts: GetMarketOrdersOpts = {
...opts,
fees: _.mapValues(opts.feeSchedule, v => v.times(gasPrice)),
feeSchedule: _.mapValues(opts.feeSchedule, v => v.times(gasPrice)),
};
const firstOrderMakerAssetData = !!prunedOrders[0]