Merge pull request #1363 from 0xProject/feat/order-utils/abiEncoder

Add MAP support to order-utils, order-watcher, and types
0xProject · Jan 7, 2019 · 3cdb856 · 3cdb856
2 parents 71c9b2f + fd37e88
commit 3cdb856
Show file tree

Hide file tree

Showing 53 changed files with 1,104 additions and 394 deletions.
diff --git a/contracts/protocol/test/asset_proxy/proxies.ts b/contracts/protocol/test/asset_proxy/proxies.ts
@@ -715,7 +715,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
                 const amounts = [erc20Amount];
                 const nestedAssetData = [erc20AssetData];
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -778,7 +778,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc20AssetData2 = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
                 const amounts = [erc20Amount1, erc20Amount2];
                 const nestedAssetData = [erc20AssetData1, erc20AssetData2];
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -811,7 +811,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc20AssetData2 = assetDataUtils.encodeERC20AssetData(erc20TokenB.address);
                 const amounts = [erc20Amount1, erc20Amount2];
                 const nestedAssetData = [erc20AssetData1, erc20AssetData2];
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -849,7 +849,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
                 const amounts = [erc721Amount];
                 const nestedAssetData = [erc721AssetData];
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -881,7 +881,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc721Amount = new BigNumber(1);
                 const amounts = [erc721Amount, erc721Amount];
                 const nestedAssetData = [erc721AssetData1, erc721AssetData2];
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -913,7 +913,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc721Amount = new BigNumber(1);
                 const amounts = [erc721Amount, erc721Amount];
                 const nestedAssetData = [erc721AssetData1, erc721AssetData2];
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -946,7 +946,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -984,10 +984,7 @@ describe('Asset Transfer Proxies', () => {
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
                 const extraData = '0102030405060708';
-                const assetData = `${assetDataInterface.MultiAsset.getABIEncodedTransactionData(
-                    amounts,
-                    nestedAssetData,
-                )}${extraData}`;
+                const assetData = `${assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData)}${extraData}`;
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1024,7 +1021,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc20AssetData2 = assetDataUtils.encodeERC20AssetData(erc20TokenB.address);
                 const amounts = [erc20Amount1, erc20Amount2];
                 const nestedAssetData = [erc20AssetData1, erc20AssetData2];
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1085,7 +1082,7 @@ describe('Asset Transfer Proxies', () => {
                     erc721AssetData3,
                     erc721AssetData4,
                 ];
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1143,7 +1140,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1169,6 +1166,7 @@ describe('Asset Transfer Proxies', () => {
                 const invalidErc721AssetData = `${invalidProxyId}${erc721AssetData.slice(10)}`;
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, invalidErc721AssetData];
+                // HACK: This is used to get around validation built into assetDataUtils
                 const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
@@ -1192,6 +1190,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
                 const amounts = [erc20Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
+                // HACK: This is used to get around validation built into assetDataUtils
                 const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
@@ -1214,7 +1213,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc20AssetData = assetDataUtils.encodeERC20AssetData(erc20TokenA.address);
                 const amounts = [erc20Amount];
                 const nestedAssetData = [erc20AssetData];
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,
@@ -1238,6 +1237,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc721AssetData = '0x123456';
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
+                // HACK: This is used to get around validation built into assetDataUtils
                 const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
@@ -1262,7 +1262,7 @@ describe('Asset Transfer Proxies', () => {
                 const erc721AssetData = assetDataUtils.encodeERC721AssetData(erc721TokenA.address, erc721AFromTokenId);
                 const amounts = [erc20Amount, erc721Amount];
                 const nestedAssetData = [erc20AssetData, erc721AssetData];
-                const assetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(amounts, nestedAssetData);
+                const assetData = assetDataUtils.encodeMultiAssetData(amounts, nestedAssetData);
                 const data = assetProxyInterface.transferFrom.getABIEncodedTransactionData(
                     assetData,
                     fromAddress,

diff --git a/contracts/protocol/test/exchange/core.ts b/contracts/protocol/test/exchange/core.ts
@@ -1,4 +1,3 @@
-import { artifacts as interfacesArtifacts, IAssetDataContract } from '@0x/contracts-interfaces';
 import {
     chaiSetup,
     constants,
@@ -43,11 +42,6 @@ import { ExchangeWrapper } from '../utils/exchange_wrapper';
 chaiSetup.configure();
 const expect = chai.expect;
 const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper);
-const assetDataInterface = new IAssetDataContract(
-    interfacesArtifacts.IAssetData.compilerOutput.abi,
-    constants.NULL_ADDRESS,
-    provider,
-);
 // tslint:disable:no-unnecessary-type-assertion
 describe('Exchange core', () => {
     let makerAddress: string;
@@ -777,10 +771,7 @@ describe('Exchange core', () => {
                 assetDataUtils.encodeERC20AssetData(erc20TokenA.address),
                 assetDataUtils.encodeERC20AssetData(erc20TokenB.address),
             ];
-            const makerAssetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(
-                makerAmounts,
-                makerNestedAssetData,
-            );
+            const makerAssetData = assetDataUtils.encodeMultiAssetData(makerAmounts, makerNestedAssetData);
             const makerAssetAmount = new BigNumber(1);
             const takerAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
             const takerAssetAmount = new BigNumber(10);
@@ -830,21 +821,15 @@ describe('Exchange core', () => {
                 assetDataUtils.encodeERC20AssetData(erc20TokenA.address),
                 assetDataUtils.encodeERC20AssetData(erc20TokenB.address),
             ];
-            const makerAssetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(
-                makerAmounts,
-                makerNestedAssetData,
-            );
+            const makerAssetData = assetDataUtils.encodeMultiAssetData(makerAmounts, makerNestedAssetData);
             const makerAssetAmount = new BigNumber(1);
             const takerAmounts = [new BigNumber(10), new BigNumber(1)];
             const takerAssetId = erc721TakerAssetIds[0];
             const takerNestedAssetData = [
                 assetDataUtils.encodeERC20AssetData(zrxToken.address),
                 assetDataUtils.encodeERC721AssetData(erc721Token.address, takerAssetId),
             ];
-            const takerAssetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(
-                takerAmounts,
-                takerNestedAssetData,
-            );
+            const takerAssetData = assetDataUtils.encodeMultiAssetData(takerAmounts, takerNestedAssetData);
             const takerAssetAmount = new BigNumber(1);
             signedOrder = await orderFactory.newSignedOrderAsync({
                 makerAssetData,
@@ -900,10 +885,7 @@ describe('Exchange core', () => {
                 assetDataUtils.encodeERC20AssetData(erc20TokenA.address),
                 assetDataUtils.encodeERC20AssetData(erc20TokenB.address),
             ];
-            const makerAssetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(
-                makerAmounts,
-                makerNestedAssetData,
-            );
+            const makerAssetData = assetDataUtils.encodeMultiAssetData(makerAmounts, makerNestedAssetData);
             const makerAssetAmount = new BigNumber(30);
             const takerAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
             const takerAssetAmount = new BigNumber(10);
@@ -980,10 +962,7 @@ describe('Exchange core', () => {
                 assetDataUtils.encodeERC20AssetData(erc20TokenA.address),
                 assetDataUtils.encodeERC20AssetData(erc20TokenB.address),
             ];
-            const takerAssetData = assetDataInterface.MultiAsset.getABIEncodedTransactionData(
-                takerAmounts,
-                takerNestedAssetData,
-            );
+            const takerAssetData = assetDataUtils.encodeMultiAssetData(takerAmounts, takerNestedAssetData);
             const takerAssetAmount = new BigNumber(30);
             const makerAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
             const makerAssetAmount = new BigNumber(10);

diff --git a/contracts/tokens/src/artifacts/index.ts b/contracts/tokens/src/artifacts/index.ts
@@ -22,6 +22,7 @@ import * as UnlimitedAllowanceToken_v1 from '../../generated-artifacts/Unlimited
 import * as WETH9 from '../../generated-artifacts/WETH9.json';
 import * as ZRXToken from '../../generated-artifacts/ZRXToken.json';
 
+// tslint:disable:no-unnecessary-type-assertion
 export const artifacts = {
     DummyERC20Token: DummyERC20Token as ContractArtifact,
     DummyMultipleReturnERC20Token: DummyMultipleReturnERC20Token as ContractArtifact,

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
@@ -1,4 +1,14 @@
 [
+    {
+        "version": "3.0.0",
+        "changes": [
+            {
+                "note":
+                    "Export `MultiAssetData`, `MultiAssetDataWithRecursiveDecoding`, `ObjectMap`, and `SingleAssetData` from types. No longer export `AssetData`.",
+                "pr": 1363
+            }
+        ]
+    },
     {
         "version": "2.0.8",
         "changes": [

diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
@@ -79,10 +79,13 @@ export {
     OrderStateInvalid,
     OrderState,
     AssetProxyId,
-    AssetData,
+    SingleAssetData,
     ERC20AssetData,
     ERC721AssetData,
+    MultiAssetData,
+    MultiAssetDataWithRecursiveDecoding,
     SignatureType,
+    ObjectMap,
     OrderRelevantState,
     Stats,
 } from '@0x/types';

diff --git a/packages/contract-wrappers/CHANGELOG.json b/packages/contract-wrappers/CHANGELOG.json
@@ -1,9 +1,13 @@
 [
     {
-        "version": "4.1.4",
+        "version": "4.2.0",
         "changes": [
             {
                 "note": "Add support for Trust Wallet signature denial error"
+            },
+            {
+                "note": "Add balance and allowance queries for `MultiAssetProxy`",
+                "pr": 1363
             }
         ]
     },