Update minimumProtocolFee

0xProject · Jun 10, 2020 · 80ffdfc · 80ffdfc
1 parent e88355f
commit 80ffdfc
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/handlers/meta_transaction_handlers.ts b/src/handlers/meta_transaction_handlers.ts
@@ -6,7 +6,7 @@ import * as HttpStatus from 'http-status-codes';
 import * as isValidUUID from 'uuid-validate';
 
 import { CHAIN_ID } from '../config';
-import { DEFAULT_QUOTE_SLIPPAGE_PERCENTAGE, META_TRANSACTION_DOCS_URL } from '../constants';
+import { DEFAULT_QUOTE_SLIPPAGE_PERCENTAGE, META_TRANSACTION_DOCS_URL, ZERO } from '../constants';
 import { TransactionEntity } from '../entities';
 import {
     GeneralErrorCodes,
@@ -158,6 +158,10 @@ export class MetaTransactionHandlers {
                 sellTokenAddress,
                 buyTokenAddress,
                 sources: metaTransactionPrice.sources,
+                estimatedGas: metaTransactionPrice.estimatedGas,
+                protocolFee: metaTransactionPrice.protocolFee,
+                estimatedGasTokenRefund: ZERO,
+                minimumProtocolFee: metaTransactionPrice.minimumProtocolFee,
             };
             res.status(HttpStatus.OK).send(metaTransactionPriceResponse);
         } catch (e) {

diff --git a/src/services/meta_transaction_service.ts b/src/services/meta_transaction_service.ts
@@ -30,6 +30,7 @@ import {
     SUBMITTED_TX_DB_POLLING_INTERVAL_MS,
     TEN_MINUTES_MS,
     TX_HASH_RESPONSE_WAIT_TIME_MS,
+    ZERO,
 } from '../constants';
 import { KeyValueEntity, TransactionEntity } from '../entities';
 import { logger } from '../logger';
@@ -136,7 +137,7 @@ export class MetaTransactionService {
             throw new Error('sellAmount or buyAmount required');
         }
         const { gasPrice } = swapQuote;
-        const { gas, protocolFee } = swapQuote.worstCaseQuoteInfo.worstCaseQuoteInfo;
+        const { gas, protocolFeeInWeiAmount: protocolFee } = swapQuote.worstCaseQuoteInfo;
         const makerAssetAmount = swapQuote.bestCaseQuoteInfo.makerAssetAmount;
         const totalTakerAssetAmount = swapQuote.bestCaseQuoteInfo.totalTakerAssetAmount;
 
@@ -162,9 +163,10 @@ export class MetaTransactionService {
             price,
             swapQuote,
             sources: serviceUtils.convertSourceBreakdownToArray(swapQuote.sourceBreakdown),
-            estimatedGas: gas,
+            estimatedGas: new BigNumber(gas),
             gasPrice,
             protocolFee,
+            minimumProtocolFee: protocolFee,
         };
         return response;
     }
@@ -179,6 +181,7 @@ export class MetaTransactionService {
             price,
             estimatedGas,
             protocolFee,
+            minimumProtocolFee,
         } = await this.calculateMetaTransactionPriceAsync(params, 'quote');
 
         const floatGasPrice = swapQuote.gasPrice;
@@ -221,6 +224,8 @@ export class MetaTransactionService {
             gasPrice,
             estimatedGas,
             protocolFee,
+            minimumProtocolFee,
+            estimatedGasTokenRefund: ZERO,
         };
         return apiMetaTransactionQuote;
     }

diff --git a/src/types.ts b/src/types.ts
@@ -420,9 +420,16 @@ export interface GetMetaTransactionQuoteResponse {
     gasPrice: BigNumber;
     protocolFee: BigNumber;
     estimatedGas: BigNumber;
+    estimatedGasTokenRefund: BigNumber;
+    minimumProtocolFee: BigNumber;
 }
 
-export interface GetMetaTransactionPriceResponse extends BasePriceResponse {}
+export interface GetMetaTransactionPriceResponse extends BasePriceResponse {
+    estimatedGas: BigNumber;
+    estimatedGasTokenRefund: BigNumber;
+    protocolFee: BigNumber;
+    minimumProtocolFee: BigNumber;
+}
 
 export interface GetMetaTransactionStatusResponse {
     refHash: string;
@@ -445,6 +452,7 @@ export interface CalculateMetaTransactionPriceResponse {
     sources: GetSwapQuoteResponseLiquiditySource[];
     gasPrice: BigNumber;
     protocolFee: BigNumber;
+    minimumProtocolFee: BigNumber;
     estimatedGas: BigNumber;
 }