Merge pull request #1465 from 0xProject/feature/contracts/dutchAuctionWrapper

Dutch Auction Wrapper

4 files changed, 129 insertions, 137 deletions

diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json
index 083ad33fb..40e25565e 100644
--- a/contracts/extensions/CHANGELOG.json
+++ b/contracts/extensions/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "version": "1.2.0",
+        "changes": [
+            {
+                "note": "Added Dutch Auction Wrapper",
+                "pr": 1465
+            }
+        ]
+    },
+    {
         "version": "1.1.0",
         "changes": [
             {
diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json
index 069b5d2d5..aee995645 100644
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/package.json
@@ -45,6 +45,7 @@
     "homepage": "https://github.com/0xProject/0x-monorepo/contracts/extensions/README.md",
     "devDependencies": {
         "@0x/abi-gen": "^1.0.19",
+        "@0x/contract-wrappers": "^4.1.3",
         "@0x/contracts-test-utils": "^1.0.2",
         "@0x/dev-utils": "^1.0.21",
         "@0x/sol-compiler": "^1.1.16",
diff --git a/contracts/extensions/test/extensions/dutch_auction.ts b/contracts/extensions/test/extensions/dutch_auction.ts
index 6c3b2f0f3..22b3caa16 100644
--- a/contracts/extensions/test/extensions/dutch_auction.ts
+++ b/contracts/extensions/test/extensions/dutch_auction.ts
@@ -1,3 +1,4 @@
+import { DutchAuctionWrapper } from '@0x/contract-wrappers';
 import {
     artifacts as protocolArtifacts,
     ERC20Wrapper,
@@ -29,12 +30,11 @@ import { RevertReason, SignedOrder } from '@0x/types';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as chai from 'chai';
-import ethAbi = require('ethereumjs-abi');
-import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
 import { DutchAuctionContract } from '../../generated-wrappers/dutch_auction';
 import { artifacts } from '../../src/artifacts';
+import { DutchAuctionTestWrapper } from '../utils/dutch_auction_test_wrapper';
 
 chaiSetup.configure();
 const expect = chai.expect;
@@ -68,19 +68,8 @@ describe(ContractName.DutchAuction, () => {
     let erc721MakerAssetIds: BigNumber[];
     const tenMinutesInSeconds = 10 * 60;
 
-    function extendMakerAssetData(makerAssetData: string, beginTimeSeconds: BigNumber, beginAmount: BigNumber): string {
-        return ethUtil.bufferToHex(
-            Buffer.concat([
-                ethUtil.toBuffer(makerAssetData),
-                ethUtil.toBuffer(
-                    (ethAbi as any).rawEncode(
-                        ['uint256', 'uint256'],
-                        [beginTimeSeconds.toString(), beginAmount.toString()],
-                    ),
-                ),
-            ]),
-        );
-    }
+    let dutchAuctionTestWrapper: DutchAuctionTestWrapper;
+    let defaultERC20MakerAssetData: string;
 
     before(async () => {
         await blockchainLifecycle.startAsync();
@@ -136,6 +125,7 @@ describe(ContractName.DutchAuction, () => {
             dutchAuctionInstance.address,
             provider,
         );
+        dutchAuctionTestWrapper = new DutchAuctionTestWrapper(dutchAuctionInstance, provider);
 
         defaultMakerAssetAddress = erc20TokenA.address;
         const defaultTakerAssetAddress = wethContract.address;
@@ -174,7 +164,7 @@ describe(ContractName.DutchAuction, () => {
             feeRecipientAddress,
             // taker address or sender address should be set to the ducth auction contract
             takerAddress: dutchAuctionContract.address,
-            makerAssetData: extendMakerAssetData(
+            makerAssetData: DutchAuctionWrapper.encodeDutchAuctionAssetData(
                 assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress),
                 auctionBeginTimeSeconds,
                 auctionBeginAmount,
@@ -199,6 +189,7 @@ describe(ContractName.DutchAuction, () => {
         const takerPrivateKey = constants.TESTRPC_PRIVATE_KEYS[accounts.indexOf(takerAddress)];
         sellerOrderFactory = new OrderFactory(makerPrivateKey, sellerDefaultOrderParams);
         buyerOrderFactory = new OrderFactory(takerPrivateKey, buyerDefaultOrderParams);
+        defaultERC20MakerAssetData = assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress);
     });
     after(async () => {
         await blockchainLifecycle.revertAsync();
@@ -215,49 +206,41 @@ describe(ContractName.DutchAuction, () => {
     describe('matchOrders', () => {
         it('should be worth the begin price at the begining of the auction', async () => {
             auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp + 2);
-            sellOrder = await sellerOrderFactory.newSignedOrderAsync({
-                makerAssetData: extendMakerAssetData(
-                    assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress),
-                    auctionBeginTimeSeconds,
-                    auctionBeginAmount,
-                ),
-            });
-            const auctionDetails = await dutchAuctionContract.getAuctionDetails.callAsync(sellOrder);
+            const makerAssetData = DutchAuctionWrapper.encodeDutchAuctionAssetData(
+                defaultERC20MakerAssetData,
+                auctionBeginTimeSeconds,
+                auctionBeginAmount,
+            );
+            sellOrder = await sellerOrderFactory.newSignedOrderAsync({ makerAssetData });
+            const auctionDetails = await dutchAuctionTestWrapper.getAuctionDetailsAsync(sellOrder);
+            expect(auctionDetails.currentTimeSeconds).to.be.bignumber.lte(auctionBeginTimeSeconds);
             expect(auctionDetails.currentAmount).to.be.bignumber.equal(auctionBeginAmount);
             expect(auctionDetails.beginAmount).to.be.bignumber.equal(auctionBeginAmount);
         });
         it('should be be worth the end price at the end of the auction', async () => {
             auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds * 2);
             auctionEndTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds);
+            const makerAssetData = DutchAuctionWrapper.encodeDutchAuctionAssetData(
+                defaultERC20MakerAssetData,
+                auctionBeginTimeSeconds,
+                auctionBeginAmount,
+            );
             sellOrder = await sellerOrderFactory.newSignedOrderAsync({
-                makerAssetData: extendMakerAssetData(
-                    assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress),
-                    auctionBeginTimeSeconds,
-                    auctionBeginAmount,
-                ),
+                makerAssetData,
                 expirationTimeSeconds: auctionEndTimeSeconds,
             });
-            const auctionDetails = await dutchAuctionContract.getAuctionDetails.callAsync(sellOrder);
+            const auctionDetails = await dutchAuctionTestWrapper.getAuctionDetailsAsync(sellOrder);
+            expect(auctionDetails.currentTimeSeconds).to.be.bignumber.gte(auctionEndTimeSeconds);
             expect(auctionDetails.currentAmount).to.be.bignumber.equal(auctionEndAmount);
             expect(auctionDetails.beginAmount).to.be.bignumber.equal(auctionBeginAmount);
         });
         it('should match orders at current amount and send excess to buyer', async () => {
-            const beforeAuctionDetails = await dutchAuctionContract.getAuctionDetails.callAsync(sellOrder);
+            const beforeAuctionDetails = await dutchAuctionTestWrapper.getAuctionDetailsAsync(sellOrder);
             buyOrder = await buyerOrderFactory.newSignedOrderAsync({
                 makerAssetAmount: beforeAuctionDetails.currentAmount.times(2),
             });
-            await web3Wrapper.awaitTransactionSuccessAsync(
-                await dutchAuctionContract.matchOrders.sendTransactionAsync(
-                    buyOrder,
-                    sellOrder,
-                    buyOrder.signature,
-                    sellOrder.signature,
-                    {
-                        from: takerAddress,
-                    },
-                ),
-            );
-            const afterAuctionDetails = await dutchAuctionContract.getAuctionDetails.callAsync(sellOrder);
+            await dutchAuctionTestWrapper.matchOrdersAsync(buyOrder, sellOrder, takerAddress);
+            const afterAuctionDetails = await dutchAuctionTestWrapper.getAuctionDetailsAsync(sellOrder);
             const newBalances = await erc20Wrapper.getBalancesAsync();
             expect(newBalances[dutchAuctionContract.address][wethContract.address]).to.be.bignumber.equal(
                 constants.ZERO_AMOUNT,
@@ -276,17 +259,8 @@ describe(ContractName.DutchAuction, () => {
             sellOrder = await sellerOrderFactory.newSignedOrderAsync({
                 makerFee: new BigNumber(1),
             });
-            const txHash = await dutchAuctionContract.matchOrders.sendTransactionAsync(
-                buyOrder,
-                sellOrder,
-                buyOrder.signature,
-                sellOrder.signature,
-                {
-                    from: takerAddress,
-                },
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(txHash);
-            const afterAuctionDetails = await dutchAuctionContract.getAuctionDetails.callAsync(sellOrder);
+            await dutchAuctionTestWrapper.matchOrdersAsync(buyOrder, sellOrder, takerAddress);
+            const afterAuctionDetails = await dutchAuctionTestWrapper.getAuctionDetailsAsync(sellOrder);
             const newBalances = await erc20Wrapper.getBalancesAsync();
             expect(newBalances[makerAddress][wethContract.address]).to.be.bignumber.gte(
                 erc20Balances[makerAddress][wethContract.address].plus(afterAuctionDetails.currentAmount),
@@ -299,18 +273,9 @@ describe(ContractName.DutchAuction, () => {
             buyOrder = await buyerOrderFactory.newSignedOrderAsync({
                 makerFee: new BigNumber(1),
             });
-            const txHash = await dutchAuctionContract.matchOrders.sendTransactionAsync(
-                buyOrder,
-                sellOrder,
-                buyOrder.signature,
-                sellOrder.signature,
-                {
-                    from: takerAddress,
-                },
-            );
-            await web3Wrapper.awaitTransactionSuccessAsync(txHash);
+            await dutchAuctionTestWrapper.matchOrdersAsync(buyOrder, sellOrder, takerAddress);
             const newBalances = await erc20Wrapper.getBalancesAsync();
-            const afterAuctionDetails = await dutchAuctionContract.getAuctionDetails.callAsync(sellOrder);
+            const afterAuctionDetails = await dutchAuctionTestWrapper.getAuctionDetailsAsync(sellOrder);
             expect(newBalances[makerAddress][wethContract.address]).to.be.bignumber.gte(
                 erc20Balances[makerAddress][wethContract.address].plus(afterAuctionDetails.currentAmount),
             );
@@ -321,24 +286,17 @@ describe(ContractName.DutchAuction, () => {
         it('should revert when auction expires', async () => {
             auctionBeginTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds * 2);
             auctionEndTimeSeconds = new BigNumber(currentBlockTimestamp - tenMinutesInSeconds);
+            const makerAssetData = DutchAuctionWrapper.encodeDutchAuctionAssetData(
+                defaultERC20MakerAssetData,
+                auctionBeginTimeSeconds,
+                auctionBeginAmount,
+            );
             sellOrder = await sellerOrderFactory.newSignedOrderAsync({
                 expirationTimeSeconds: auctionEndTimeSeconds,
-                makerAssetData: extendMakerAssetData(
-                    assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress),
-                    auctionBeginTimeSeconds,
-                    auctionBeginAmount,
-                ),
+                makerAssetData,
             });
             return expectTransactionFailedAsync(
-                dutchAuctionContract.matchOrders.sendTransactionAsync(
-                    buyOrder,
-                    sellOrder,
-                    buyOrder.signature,
-                    sellOrder.signature,
-                    {
-                        from: takerAddress,
-                    },
-                ),
+                dutchAuctionTestWrapper.matchOrdersAsync(buyOrder, sellOrder, takerAddress),
                 RevertReason.AuctionExpired,
             );
         });
@@ -347,15 +305,7 @@ describe(ContractName.DutchAuction, () => {
                 makerAssetAmount: sellOrder.takerAssetAmount,
             });
             return expectTransactionFailedAsync(
-                dutchAuctionContract.matchOrders.sendTransactionAsync(
-                    buyOrder,
-                    sellOrder,
-                    buyOrder.signature,
-                    sellOrder.signature,
-                    {
-                        from: takerAddress,
-                    },
-                ),
+                dutchAuctionTestWrapper.matchOrdersAsync(buyOrder, sellOrder, takerAddress),
                 RevertReason.AuctionInvalidAmount,
             );
         });
@@ -364,38 +314,23 @@ describe(ContractName.DutchAuction, () => {
                 takerAssetAmount: auctionBeginAmount.plus(1),
             });
             return expectTransactionFailedAsync(
-                dutchAuctionContract.matchOrders.sendTransactionAsync(
-                    buyOrder,
-                    sellOrder,
-                    buyOrder.signature,
-                    sellOrder.signature,
-                    {
-                        from: takerAddress,
-                    },
-                ),
+                dutchAuctionTestWrapper.matchOrdersAsync(buyOrder, sellOrder, takerAddress),
                 RevertReason.AuctionInvalidAmount,
             );
         });
         it('begin time is less than end time', async () => {
             auctionBeginTimeSeconds = new BigNumber(auctionEndTimeSeconds).plus(tenMinutesInSeconds);
+            const makerAssetData = DutchAuctionWrapper.encodeDutchAuctionAssetData(
+                defaultERC20MakerAssetData,
+                auctionBeginTimeSeconds,
+                auctionBeginAmount,
+            );
             sellOrder = await sellerOrderFactory.newSignedOrderAsync({
                 expirationTimeSeconds: auctionEndTimeSeconds,
-                makerAssetData: extendMakerAssetData(
-                    assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress),
-                    auctionBeginTimeSeconds,
-                    auctionBeginAmount,
-                ),
+                makerAssetData,
             });
             return expectTransactionFailedAsync(
-                dutchAuctionContract.matchOrders.sendTransactionAsync(
-                    buyOrder,
-                    sellOrder,
-                    buyOrder.signature,
-                    sellOrder.signature,
-                    {
-                        from: takerAddress,
-                    },
-                ),
+                dutchAuctionTestWrapper.matchOrdersAsync(buyOrder, sellOrder, takerAddress),
                 RevertReason.AuctionInvalidBeginTime,
             );
         });
@@ -404,45 +339,30 @@ describe(ContractName.DutchAuction, () => {
                 makerAssetData: assetDataUtils.encodeERC20AssetData(defaultMakerAssetAddress),
             });
             return expectTransactionFailedAsync(
-                dutchAuctionContract.matchOrders.sendTransactionAsync(
-                    buyOrder,
-                    sellOrder,
-                    buyOrder.signature,
-                    sellOrder.signature,
-                    {
-                        from: takerAddress,
-                    },
-                ),
+                dutchAuctionTestWrapper.matchOrdersAsync(buyOrder, sellOrder, takerAddress),
                 RevertReason.InvalidAssetData,
             );
         });
+
         describe('ERC721', () => {
             it('should match orders when ERC721', async () => {
                 const makerAssetId = erc721MakerAssetIds[0];
+                const erc721MakerAssetData = assetDataUtils.encodeERC721AssetData(erc721Token.address, makerAssetId);
+                const makerAssetData = DutchAuctionWrapper.encodeDutchAuctionAssetData(
+                    erc721MakerAssetData,
+                    auctionBeginTimeSeconds,
+                    auctionBeginAmount,
+                );
                 sellOrder = await sellerOrderFactory.newSignedOrderAsync({
                     makerAssetAmount: new BigNumber(1),
-                    makerAssetData: extendMakerAssetData(
-                        assetDataUtils.encodeERC721AssetData(erc721Token.address, makerAssetId),
-                        auctionBeginTimeSeconds,
-                        auctionBeginAmount,
-                    ),
+                    makerAssetData,
                 });
                 buyOrder = await buyerOrderFactory.newSignedOrderAsync({
                     takerAssetAmount: new BigNumber(1),
                     takerAssetData: sellOrder.makerAssetData,
                 });
-                await web3Wrapper.awaitTransactionSuccessAsync(
-                    await dutchAuctionContract.matchOrders.sendTransactionAsync(
-                        buyOrder,
-                        sellOrder,
-                        buyOrder.signature,
-                        sellOrder.signature,
-                        {
-                            from: takerAddress,
-                        },
-                    ),
-                );
-                const afterAuctionDetails = await dutchAuctionContract.getAuctionDetails.callAsync(sellOrder);
+                await dutchAuctionTestWrapper.matchOrdersAsync(buyOrder, sellOrder, takerAddress);
+                const afterAuctionDetails = await dutchAuctionTestWrapper.getAuctionDetailsAsync(sellOrder);
                 const newBalances = await erc20Wrapper.getBalancesAsync();
                 // HACK gte used here due to a bug in ganache where the timestamp can change
                 // between multiple calls to the same block. Which can move the amount in our case
diff --git a/contracts/extensions/test/utils/dutch_auction_test_wrapper.ts b/contracts/extensions/test/utils/dutch_auction_test_wrapper.ts
new file mode 100644
index 000000000..c1e2f2070
--- /dev/null
+++ b/contracts/extensions/test/utils/dutch_auction_test_wrapper.ts
@@ -0,0 +1,62 @@
+import { artifacts as protocolArtifacts } from '@0x/contracts-protocol';
+import { LogDecoder } from '@0x/contracts-test-utils';
+import { artifacts as tokensArtifacts } from '@0x/contracts-tokens';
+import { DutchAuctionDetails, SignedOrder } from '@0x/types';
+import { Web3Wrapper } from '@0x/web3-wrapper';
+import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
+import * as _ from 'lodash';
+
+import { DutchAuctionContract } from '../../generated-wrappers/dutch_auction';
+import { artifacts } from '../../src/artifacts';
+
+export class DutchAuctionTestWrapper {
+    private readonly _dutchAuctionContract: DutchAuctionContract;
+    private readonly _web3Wrapper: Web3Wrapper;
+    private readonly _logDecoder: LogDecoder;
+
+    constructor(contractInstance: DutchAuctionContract, provider: Provider) {
+        this._dutchAuctionContract = contractInstance;
+        this._web3Wrapper = new Web3Wrapper(provider);
+        this._logDecoder = new LogDecoder(this._web3Wrapper, {
+            ...artifacts,
+            ...tokensArtifacts,
+            ...protocolArtifacts,
+        });
+    }
+    /**
+     * Matches the buy and sell orders at an amount given the following: the current block time, the auction
+     * start time and the auction begin amount. The sell order is a an order at the lowest amount
+     * at the end of the auction. Excess from the match is transferred to the seller.
+     * Over time the price moves from beginAmount to endAmount given the current block.timestamp.
+     * @param buyOrder The Buyer's order. This order is for the current expected price of the auction.
+     * @param sellOrder The Seller's order. This order is for the lowest amount (at the end of the auction).
+     * @param from Address the transaction is being sent from.
+     * @return Transaction receipt with decoded logs.
+     */
+    public async matchOrdersAsync(
+        buyOrder: SignedOrder,
+        sellOrder: SignedOrder,
+        from: string,
+    ): Promise<TransactionReceiptWithDecodedLogs> {
+        const txHash = await this._dutchAuctionContract.matchOrders.sendTransactionAsync(
+            buyOrder,
+            sellOrder,
+            buyOrder.signature,
+            sellOrder.signature,
+            {
+                from,
+            },
+        );
+        const tx = await this._logDecoder.getTxWithDecodedLogsAsync(txHash);
+        return tx;
+    }
+    /**
+     * Calculates the Auction Details for the given order
+     * @param sellOrder The Seller's order. This order is for the lowest amount (at the end of the auction).
+     * @return The dutch auction details.
+     */
+    public async getAuctionDetailsAsync(sellOrder: SignedOrder): Promise<DutchAuctionDetails> {
+        const auctionDetails = await this._dutchAuctionContract.getAuctionDetails.callAsync(sellOrder);
+        return auctionDetails;
+    }
+}