Merge pull request #1037 from 0xProject/feature/forwarder-helper/sra-and-rpc

[asset-buyer] Create new AssetBuyer class

packages/contract-wrappers/src/contract_wrappers/forwarder_wrapper.ts

@@ -12,6 +12,7 @@ import { TransactionOpts } from '../types';
 import { assert } from '../utils/assert';
 import { calldataOptimizationUtils } from '../utils/calldata_optimization_utils';
 import { constants } from '../utils/constants';
+import { utils } from '../utils/utils';
 
 import { ContractWrapper } from './contract_wrapper';
 import { ForwarderContract } from './generated/forwarder';
@@ -57,7 +58,7 @@ export class ForwarderWrapper extends ContractWrapper {
         takerAddress: string,
         ethAmount: BigNumber,
         signedFeeOrders: SignedOrder[] = [],
-        feePercentage: BigNumber = constants.ZERO_AMOUNT,
+        feePercentage: number = 0,
         feeRecipientAddress: string = constants.NULL_ADDRESS,
         txOpts: TransactionOpts = {},
     ): Promise<string> {
@@ -66,7 +67,7 @@ export class ForwarderWrapper extends ContractWrapper {
         await assert.isSenderAddressAsync('takerAddress', takerAddress, this._web3Wrapper);
         assert.isBigNumber('ethAmount', ethAmount);
         assert.doesConformToSchema('signedFeeOrders', signedFeeOrders, schemas.signedOrdersSchema);
-        assert.isBigNumber('feePercentage', feePercentage);
+        assert.isNumber('feePercentage', feePercentage);
         assert.isETHAddressHex('feeRecipientAddress', feeRecipientAddress);
         assert.doesConformToSchema('txOpts', txOpts, txOptsSchema);
         // other assertions
@@ -76,6 +77,8 @@ export class ForwarderWrapper extends ContractWrapper {
             this.getZRXTokenAddress(),
             this.getEtherTokenAddress(),
         );
+        // format feePercentage
+        const formattedFeePercentage = utils.numberPercentageToEtherTokenAmountPercentage(feePercentage);
         // lowercase input addresses
         const normalizedTakerAddress = takerAddress.toLowerCase();
         const normalizedFeeRecipientAddress = feeRecipientAddress.toLowerCase();
@@ -89,7 +92,7 @@ export class ForwarderWrapper extends ContractWrapper {
             _.map(optimizedMarketOrders, order => order.signature),
             optimizedFeeOrders,
             _.map(optimizedFeeOrders, order => order.signature),
-            feePercentage,
+            formattedFeePercentage,
             feeRecipientAddress,
             {
                 value: ethAmount,
@@ -124,7 +127,7 @@ export class ForwarderWrapper extends ContractWrapper {
         takerAddress: string,
         ethAmount: BigNumber,
         signedFeeOrders: SignedOrder[] = [],
-        feePercentage: BigNumber = constants.ZERO_AMOUNT,
+        feePercentage: number = 0,
         feeRecipientAddress: string = constants.NULL_ADDRESS,
         txOpts: TransactionOpts = {},
     ): Promise<string> {
@@ -134,7 +137,7 @@ export class ForwarderWrapper extends ContractWrapper {
         await assert.isSenderAddressAsync('takerAddress', takerAddress, this._web3Wrapper);
         assert.isBigNumber('ethAmount', ethAmount);
         assert.doesConformToSchema('signedFeeOrders', signedFeeOrders, schemas.signedOrdersSchema);
-        assert.isBigNumber('feePercentage', feePercentage);
+        assert.isNumber('feePercentage', feePercentage);
         assert.isETHAddressHex('feeRecipientAddress', feeRecipientAddress);
         assert.doesConformToSchema('txOpts', txOpts, txOptsSchema);
         // other assertions
@@ -144,6 +147,8 @@ export class ForwarderWrapper extends ContractWrapper {
             this.getZRXTokenAddress(),
             this.getEtherTokenAddress(),
         );
+        // format feePercentage
+        const formattedFeePercentage = utils.numberPercentageToEtherTokenAmountPercentage(feePercentage);
         // lowercase input addresses
         const normalizedTakerAddress = takerAddress.toLowerCase();
         const normalizedFeeRecipientAddress = feeRecipientAddress.toLowerCase();
@@ -158,7 +163,7 @@ export class ForwarderWrapper extends ContractWrapper {
             _.map(optimizedMarketOrders, order => order.signature),
             optimizedFeeOrders,
             _.map(optimizedFeeOrders, order => order.signature),
-            feePercentage,
+            formattedFeePercentage,
             feeRecipientAddress,
             {
                 value: ethAmount,

packages/contract-wrappers/src/utils/constants.ts

@@ -12,4 +12,6 @@ export const constants = {
     UNLIMITED_ALLOWANCE_IN_BASE_UNITS: new BigNumber(2).pow(256).minus(1),
     DEFAULT_BLOCK_POLLING_INTERVAL: 1000,
     ZERO_AMOUNT: new BigNumber(0),
+    ONE_AMOUNT: new BigNumber(1),
+    ETHER_TOKEN_DECIMALS: 18,
 };

packages/contract-wrappers/src/utils/utils.ts

@@ -1,4 +1,7 @@
 import { BigNumber } from '@0xproject/utils';
+import { Web3Wrapper } from '@0xproject/web3-wrapper';
+
+import { constants } from './constants';
 
 export const utils = {
     getCurrentUnixTimestampSec(): BigNumber {
@@ -8,4 +11,7 @@ export const utils = {
     getCurrentUnixTimestampMs(): BigNumber {
         return new BigNumber(Date.now());
     },
+    numberPercentageToEtherTokenAmountPercentage(percentage: number): BigNumber {
+        return Web3Wrapper.toBaseUnitAmount(constants.ONE_AMOUNT, constants.ETHER_TOKEN_DECIMALS).mul(percentage);
+    },
 };