Arbitrary Fee Tokens

.circleci/config.yml

@@ -85,6 +85,29 @@ jobs:
             - run: yarn wsrun test:circleci @0x/contracts-exchange-forwarder
             - run: yarn wsrun test:circleci @0x/contracts-coordinator
             - run: yarn wsrun test:circleci @0x/contracts-staking
+    test-contracts-ganache-3.0:
+        docker:
+            - image: circleci/node:9-browsers
+        working_directory: ~/repo
+        steps:
+            - restore_cache:
+                  keys:
+                      - repo-{{ .Environment.CIRCLE_SHA1 }}
+            - run: yarn wsrun test:circleci @0x/contracts-multisig
+            - run: yarn wsrun test:circleci @0x/contracts-utils
+            - run: yarn wsrun test:circleci @0x/contracts-exchange-libs
+            - run: yarn wsrun test:circleci @0x/contracts-erc20
+            - run: yarn wsrun test:circleci @0x/contracts-erc721
+            - run: yarn wsrun test:circleci @0x/contracts-erc1155
+            # TODO(dorothy-zbornak): Re-enable after updating this package for 3.0.
+            # - run: yarn wsrun test:circleci @0x/contracts-extensions
+            - run: yarn wsrun test:circleci @0x/contracts-asset-proxy
+            - run: yarn wsrun test:circleci @0x/contracts-exchange
+            # TODO(dorothy-zbornak): Re-enable after updating this package for 3.0.
+            # - run: yarn wsrun test:circleci @0x/contracts-exchange-forwarder
+            - run: yarn wsrun test:circleci @0x/contracts-coordinator
+            # TODO(dorothy-zbornak): Re-enable after this package is complete.
+            # - run: yarn wsrun test:circleci @0x/contracts-staking
     test-contracts-geth:
         docker:
             - image: circleci/node:9-browsers
@@ -241,7 +264,8 @@ jobs:
             - run: yarn wsrun test:circleci @0x/abi-gen
             - run: yarn wsrun test:circleci @0x/assert
             - run: yarn wsrun test:circleci @0x/base-contract
-            - run: yarn wsrun test:circleci @0x/contract-wrappers
+            # TODO(dorothy-zbornak): Re-enable after updating this package for 3.0.
+            # - run: yarn wsrun test:circleci @0x/contract-wrappers
             - run: yarn wsrun test:circleci @0x/dev-utils
             - run: yarn wsrun test:circleci @0x/json-schemas
             - run: yarn wsrun test:circleci @0x/order-utils
@@ -262,10 +286,11 @@ jobs:
                   key: coverage-base-contract-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
                       - ~/repo/packages/base-contract/coverage/lcov.info
-            - save_cache:
-                  key: coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
-                  paths:
-                      - ~/repo/packages/contract-wrappers/coverage/lcov.info
+            # TODO(dorothy-zbornak): Re-enable after updating this package for 3.0.
+            # - save_cache:
+            #       key: coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
+            #       paths:
+            #           - ~/repo/packages/contract-wrappers/coverage/lcov.info
             - save_cache:
                   key: coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
                   paths:
@@ -512,9 +537,10 @@ jobs:
             - restore_cache:
                   keys:
                       - coverage-connect-{{ .Environment.CIRCLE_SHA1 }}
-            - restore_cache:
-                  keys:
-                      - coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
+            # TODO(dorothy-zbornak): Re-enable after updating this package for 3.0.
+            # - restore_cache:
+            #       keys:
+            #           - coverage-contract-wrappers-{{ .Environment.CIRCLE_SHA1 }}
             - restore_cache:
                   keys:
                       - coverage-dev-utils-{{ .Environment.CIRCLE_SHA1 }}
@@ -549,7 +575,7 @@ workflows:
             # - build-website:
             #       requires:
             #           - build
-            - test-contracts-ganache:
+            - test-contracts-ganache-3.0:
                   requires:
                       - build-3.0
             # Disabled until geth docker image is fixed.

contracts/asset-proxy/CHANGELOG.json

@@ -5,6 +5,18 @@
             {
                 "note": "Update tests to use contract-built-in `awaitTransactionSuccessAsync`",
                 "pr": 1797
+            },
+            {
+                "note": "Make `ERC721Wrapper.setApprovalForAll()` take an owner address instead of a token ID",
+                "pr": 1819
+            },
+            {
+                "note": "Automatically set unlimited proxy allowances in `ERC721.setBalancesAndAllowancesAsync()`",
+                "pr": 1819
+            },
+            {
+                "note": "Add `setProxyAllowanceForAllAsync()` to `ERC1155ProxyWrapper`.",
+                "pr": 1819
             }
         ]
     },

contracts/asset-proxy/test/proxies.ts

@@ -676,7 +676,14 @@ describe('Asset Transfer Proxies', () => {
                 // Verify pre-condition
                 const ownerFromAsset = await erc721TokenA.ownerOf.callAsync(erc721AFromTokenId);
                 expect(ownerFromAsset).to.be.equal(fromAddress);
-                // Remove transfer approval for fromAddress.
+                // Remove blanket transfer approval for fromAddress.
+                await erc721TokenA.setApprovalForAll.awaitTransactionSuccessAsync(
+                    erc721Proxy.address,
+                    false,
+                    { from: fromAddress },
+                    constants.AWAIT_TRANSACTION_MINED_MS,
+                );
+                // Remove token transfer approval for fromAddress.
                 await erc721TokenA.approve.awaitTransactionSuccessAsync(
                     constants.NULL_ADDRESS,
                     erc721AFromTokenId,

contracts/asset-proxy/test/utils/erc1155_proxy_wrapper.ts

@@ -315,6 +315,22 @@ export class ERC1155ProxyWrapper {
         };
         return holdingsByOwner;
     }
+    /**
+     * @dev Set the approval for the proxy on behalf of `userAddress` .
+     * @param userAddress owner of ERC1155 tokens.
+     * @param contractAddress address of ERC1155 contract.
+     * @param isApproved Whether to approve the proxy for all or not.
+     */
+    public async setProxyAllowanceForAllAsync(
+        userAddress: string,
+        contractAddress: string,
+        isApproved: boolean,
+    ): Promise<void> {
+        this._validateProxyContractExistsOrThrow();
+        const tokenWrapper = this.getContractWrapper(contractAddress);
+        const operator = (this._proxyContract as ERC1155ProxyContract).address;
+        await tokenWrapper.setApprovalForAllAsync(userAddress, operator, isApproved);
+    }
     /**
      * @dev Checks if proxy is approved to transfer tokens on behalf of `userAddress`.
      * @param userAddress owner of ERC1155 tokens.

contracts/asset-proxy/test/utils/erc721_wrapper.ts

@@ -69,7 +69,7 @@ export class ERC721Wrapper {
                     }
                     this._initialTokenIdsByOwner[tokenOwnerAddress][dummyTokenContract.address].push(tokenId);
 
-                    await this.approveProxyAsync(dummyTokenContract.address, tokenId);
+                    await this.approveProxyForAllAsync(dummyTokenContract.address, tokenOwnerAddress, true);
                 }
             }
         }
@@ -84,14 +84,17 @@ export class ERC721Wrapper {
         const proxyAddress = (this._proxyContract as ERC721ProxyContract).address;
         await this.approveAsync(proxyAddress, tokenAddress, tokenId);
     }
-    public async approveProxyForAllAsync(tokenAddress: string, tokenId: BigNumber, isApproved: boolean): Promise<void> {
+    public async approveProxyForAllAsync(
+        tokenAddress: string,
+        ownerAddress: string,
+        isApproved: boolean,
+    ): Promise<void> {
         const tokenContract = this._getTokenContractFromAssetData(tokenAddress);
-        const tokenOwner = await this.ownerOfAsync(tokenAddress, tokenId);
         const proxyAddress = (this._proxyContract as ERC721ProxyContract).address;
         await tokenContract.setApprovalForAll.awaitTransactionSuccessAsync(
             proxyAddress,
             isApproved,
-            { from: tokenOwner },
+            { from: ownerAddress },
             constants.AWAIT_TRANSACTION_MINED_MS,
         );
     }

contracts/coordinator/CHANGELOG.json

@@ -33,6 +33,10 @@
             {
                 "note": "Remove LibZeroExTransaction contract",
                 "pr": 1753
+            },
+            {
+                "note": "Update tests for arbitrary fee tokens (ZEIP-28).",
+                "pr": 1819
             }
         ],
         "timestamp": 1554997931

contracts/coordinator/test/coordinator.ts

@@ -45,7 +45,7 @@ describe('Coordinator tests', () => {
     let erc20Proxy: ERC20ProxyContract;
     let erc20TokenA: DummyERC20TokenContract;
     let erc20TokenB: DummyERC20TokenContract;
-    let zrxToken: DummyERC20TokenContract;
+    let makerFeeToken: DummyERC20TokenContract;
     let coordinatorContract: CoordinatorContract;
     let exchange: ExchangeContract;
 
@@ -69,7 +69,7 @@ describe('Coordinator tests', () => {
         erc20Wrapper = new ERC20Wrapper(provider, usedAddresses, owner);
         erc20Proxy = await erc20Wrapper.deployProxyAsync();
         const numDummyErc20ToDeploy = 3;
-        [erc20TokenA, erc20TokenB, zrxToken] = await erc20Wrapper.deployDummyTokensAsync(
+        [erc20TokenA, erc20TokenB, makerFeeToken] = await erc20Wrapper.deployDummyTokensAsync(
             numDummyErc20ToDeploy,
             constants.DUMMY_TOKEN_DECIMALS,
         );
@@ -79,7 +79,6 @@ describe('Coordinator tests', () => {
             exchangeArtifacts.Exchange,
             provider,
             txDefaults,
-            assetDataUtils.encodeERC20AssetData(zrxToken.address),
             new BigNumber(chainId),
         );
 
@@ -109,6 +108,8 @@ describe('Coordinator tests', () => {
             feeRecipientAddress,
             makerAssetData: assetDataUtils.encodeERC20AssetData(erc20TokenA.address),
             takerAssetData: assetDataUtils.encodeERC20AssetData(erc20TokenB.address),
+            makerFeeAssetData: assetDataUtils.encodeERC20AssetData(makerFeeToken.address),
+            takerFeeAssetData: assetDataUtils.encodeERC20AssetData(makerFeeToken.address),
             domain: {
                 verifyingContractAddress: exchange.address,
                 chainId,

contracts/coordinator/test/mixins.ts

@@ -68,6 +68,8 @@ describe('Mixins tests', () => {
             takerAssetAmount: constants.ZERO_AMOUNT,
             makerFee: constants.ZERO_AMOUNT,
             takerFee: constants.ZERO_AMOUNT,
+            makerFeeAssetData: constants.NULL_BYTES,
+            takerFeeAssetData: constants.NULL_BYTES,
             expirationTimeSeconds: constants.ZERO_AMOUNT,
             salt: constants.ZERO_AMOUNT,
             signature: constants.NULL_BYTES,

contracts/erc1155/CHANGELOG.json

@@ -1,4 +1,13 @@
 [
+    {
+        "version": "1.1.2",
+        "changes": [
+            {
+                "note": "Add `mintKnownFungibleTokensAsync()`, `isNonFungibleItemAsync()`, `isFungibleItemAsync()`, `getOwnerOfAsync()`, `getBalanceAsync()` to `Erc1155Wrapper`.",
+                "pr": 1819
+            }
+        ]
+    },
     {
         "version": "1.1.1",
         "changes": [

contracts/erc1155/test/utils/erc1155_wrapper.ts

@@ -80,20 +80,28 @@ export class Erc1155Wrapper {
         );
         // tslint:disable-next-line no-unnecessary-type-assertion
         const createFungibleTokenLog = tx.logs[0] as LogWithDecodedArgs<ERC1155TransferSingleEventArgs>;
-        const token = createFungibleTokenLog.args.id;
+        const tokenId = createFungibleTokenLog.args.id;
+        await this.mintKnownFungibleTokensAsync(tokenId, beneficiaries, tokenAmounts);
+        return tokenId;
+    }
+    public async mintKnownFungibleTokensAsync(
+        tokenId: BigNumber,
+        beneficiaries: string[],
+        tokenAmounts: BigNumber | BigNumber[],
+    ): Promise<void> {
         const tokenAmountsAsArray = _.isArray(tokenAmounts) ? tokenAmounts : [];
         if (!_.isArray(tokenAmounts)) {
             _.each(_.range(0, beneficiaries.length), () => {
                 tokenAmountsAsArray.push(tokenAmounts);
             });
         }
-        await this._web3Wrapper.awaitTransactionSuccessAsync(
-            await this._erc1155Contract.mintFungible.sendTransactionAsync(token, beneficiaries, tokenAmountsAsArray, {
-                from: this._contractOwner,
-            }),
+        await this._erc1155Contract.mintFungible.awaitTransactionSuccessAsync(
+            tokenId,
+            beneficiaries,
+            tokenAmountsAsArray,
+            { from: this._contractOwner },
             constants.AWAIT_TRANSACTION_MINED_MS,
         );
-        return token;
     }
     public async mintNonFungibleTokensAsync(beneficiaries: string[]): Promise<[BigNumber, BigNumber[]]> {
         const tokenUri = 'dummyNonFungibleToken';
@@ -106,10 +114,10 @@ export class Erc1155Wrapper {
         // tslint:disable-next-line no-unnecessary-type-assertion
         const createFungibleTokenLog = tx.logs[0] as LogWithDecodedArgs<ERC1155TransferSingleEventArgs>;
         const token = createFungibleTokenLog.args.id;
-        await this._web3Wrapper.awaitTransactionSuccessAsync(
-            await this._erc1155Contract.mintNonFungible.sendTransactionAsync(token, beneficiaries, {
-                from: this._contractOwner,
-            }),
+        await this._erc1155Contract.mintNonFungible.awaitTransactionSuccessAsync(
+            token,
+            beneficiaries,
+            { from: this._contractOwner },
             constants.AWAIT_TRANSACTION_MINED_MS,
         );
         const encodedNftIds: BigNumber[] = [];
@@ -156,4 +164,19 @@ export class Erc1155Wrapper {
             expect(balance, `${ownersExtended[i]}${tokensExtended[i]}`).to.be.bignumber.equal(expectedBalances[i]);
         });
     }
+    public async isNonFungibleItemAsync(tokenId: BigNumber): Promise<boolean> {
+        return this._erc1155Contract.isNonFungibleItem.callAsync(tokenId);
+    }
+    public async isFungibleItemAsync(tokenId: BigNumber): Promise<boolean> {
+        return !(await this.isNonFungibleItemAsync(tokenId));
+    }
+    public async getOwnerOfAsync(tokenId: BigNumber): Promise<string> {
+        return this._erc1155Contract.ownerOf.callAsync(tokenId);
+    }
+    /**
+     * @dev Get the balance of an ERC1155 token for a given owner and token ID.
+     */
+    public async getBalanceAsync(ownerAddress: string, tokenId: BigNumber): Promise<BigNumber> {
+        return this._erc1155Contract.balanceOf.callAsync(ownerAddress, tokenId);
+    }
 }

contracts/exchange-forwarder/contracts/src/MixinExchangeWrapper.sol

@@ -50,7 +50,9 @@ contract MixinExchangeWrapper is
     {
         // ABI encode calldata for `fillOrder`
         bytes memory fillOrderCalldata = abi.encodeWithSelector(
-            FILL_ORDER_SELECTOR,
+            // bytes4(keccak256("fillOrder((address,address,address,address,uint256,uint256,uint256,uint256,uint256,uint256,bytes,bytes,bytes,bytes),uint256,bytes)"))
+            // = 0x9b44d556
+            0x9b44d556,
             order,
             takerAssetFillAmount,
             signature

contracts/exchange-libs/CHANGELOG.json

@@ -37,6 +37,18 @@
             {
                 "note": "Reorder some revert error parameters for consistency",
                 "pr": 1790
+            },
+            {
+                "note": "Add new `Order` fields for arbitrary fee tokens (ZEIP-28).",
+                "pr": 1819
+            },
+            {
+                "note": "Remove `LibAbiEncoder` and `LibConstants`.",
+                "pr": 1819
+            },
+            {
+                "note": "Add `generate-exchange-selectors` package script.",
+                "pr": 1819
             }
         ]
     },

contracts/exchange-libs/compiler.json

@@ -23,7 +23,6 @@
         }
     },
     "contracts": [
-        "src/LibConstants.sol",
         "src/LibEIP712ExchangeDomain.sol",
         "src/LibFillResults.sol",
         "src/LibMath.sol",