From 718d48b7d54c702d5d41f3f22de6a664db172e04 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Thu, 6 Jun 2019 08:35:45 -0700 Subject: [PATCH] Fix linting errors and update CHANGELOGs --- contracts/asset-proxy/CHANGELOG.json | 2 +- contracts/dev-utils/CHANGELOG.json | 16 ++++++++++++++++ contracts/dev-utils/test/lib_asset_data.ts | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/contracts/asset-proxy/CHANGELOG.json b/contracts/asset-proxy/CHANGELOG.json index f383c96a97..4f2e5ce78a 100644 --- a/contracts/asset-proxy/CHANGELOG.json +++ b/contracts/asset-proxy/CHANGELOG.json @@ -12,7 +12,7 @@ "version": "2.2.0", "changes": [ { - "note": "Add `LibAssetProxyIds` and `LibAssetData` contracts", + "note": "Add `LibAssetProxyIds` contract", "pr": 1835 } ] diff --git a/contracts/dev-utils/CHANGELOG.json b/contracts/dev-utils/CHANGELOG.json index 4249f2d831..0c8c344861 100644 --- a/contracts/dev-utils/CHANGELOG.json +++ b/contracts/dev-utils/CHANGELOG.json @@ -5,6 +5,22 @@ { "note": "Create dev-utils package", "pr": 1848 + }, + { + "note": "Add `LibssetData` and `LibTransactionDecoder` contracts", + "pr": 1848 + }, + { + "note": "Refactor `LibAssetData` to only check 0x-specific allowances", + "pr": 1848 + }, + { + "note": "Refactor `LibAssetData` balance/allowance checks to never revert", + "pr": 1848 + }, + { + "note": "Refactor `OrderValidationUtils` to calculate `fillableTakerAssetAmount`", + "pr": 1848 } ] } diff --git a/contracts/dev-utils/test/lib_asset_data.ts b/contracts/dev-utils/test/lib_asset_data.ts index 39fbfee911..d9708f3f4f 100644 --- a/contracts/dev-utils/test/lib_asset_data.ts +++ b/contracts/dev-utils/test/lib_asset_data.ts @@ -13,7 +13,7 @@ import { ERC1155MintableContract, ERC1155TransferSingleEventArgs, } from '@0x/contracts-erc1155'; -import { artifacts as erc20Artifacts, DummyERC20TokenContract, ERC20TokenContract } from '@0x/contracts-erc20'; +import { artifacts as erc20Artifacts, DummyERC20TokenContract } from '@0x/contracts-erc20'; import { artifacts as erc721Artifacts, DummyERC721TokenContract } from '@0x/contracts-erc721'; import { artifacts as exchangeArtifacts, ExchangeContract } from '@0x/contracts-exchange'; import { chaiSetup, constants, LogDecoder, provider, txDefaults, web3Wrapper } from '@0x/contracts-test-utils';