Skip to content
This repository has been archived by the owner on Jul 9, 2021. It is now read-only.

Add MAP support to order-utils, order-watcher, and types #1363

Merged
merged 28 commits into from
Jan 7, 2019
Merged

Add MAP support to order-utils, order-watcher, and types #1363

merged 28 commits into from
Jan 7, 2019

Conversation

abandeali1
Copy link
Member

@abandeali1 abandeali1 commented Nov 30, 2018 •
edited
Loading

Description

Adds support for the MultiAssetProxy in order-utils, order-watcher, types, fill-scenarios, and partial support in contract-wrappers. Also uses the new MAP encoding function in the contracts tests.

Testing instructions

Types of changes

Checklist:

  • Prefix PR title with [WIP] if necessary.
  • Add tests to cover changes as needed.
  • Update documentation as needed.
  • Add new entries to the relevant CHANGELOG.jsons.

@abandeali1 abandeali1 force-pushed the feat/order-utils/abiEncoder branch 2 times, most recently from b9a3478 to 466c177 Compare November 30, 2018 23:58
@abandeali1 abandeali1 force-pushed the feat/order-utils/abiEncoder branch 3 times, most recently from f306210 to 039eae2 Compare December 2, 2018 06:33
@abandeali1 abandeali1 changed the title Use new ABI encoder in assetDataUtils Add MAP support to order-utils, order-watcher, and types Dec 2, 2018
@coveralls
Copy link

coveralls commented Dec 2, 2018 •
edited
Loading

Coverage Status

Coverage increased (+4.0%) to 85.382% when pulling d71196d on feat/order-utils/abiEncoder into 2111ea1 on development.

@abandeali1 abandeali1 force-pushed the feat/order-utils/abiEncoder branch 2 times, most recently from 0274cba to e2f2bd6 Compare December 2, 2018 21:16
@abandeali1 abandeali1 force-pushed the feat/order-utils/abiEncoder branch from 131a72f to b5b044d Compare December 2, 2018 22:43
fabioberger
fabioberger suggested changes Dec 3, 2018
View reviewed changes
packages/order-utils/package.json Outdated Show resolved Hide resolved
packages/order-utils/src/asset_data_utils.ts Outdated Show resolved Hide resolved
packages/order-utils/src/asset_data_utils.ts Outdated Show resolved Hide resolved
packages/order-utils/src/asset_data_utils.ts Outdated Show resolved Hide resolved
packages/order-utils/src/asset_data_utils.ts Outdated Show resolved Hide resolved
packages/order-watcher/src/order_watcher/dependent_order_hashes_tracker.ts Outdated Show resolved Hide resolved
@abandeali1 abandeali1 force-pushed the feat/order-utils/abiEncoder branch from b5b044d to b2d5452 Compare December 5, 2018 00:37
@abandeali1 abandeali1 force-pushed the feat/order-utils/abiEncoder branch from b2d5452 to 9dcb6a9 Compare December 5, 2018 00:39
@abandeali1 abandeali1 changed the title Add MAP support to order-utils, order-watcher, and types [WIP] Add MAP support to order-utils, order-watcher, and types Dec 5, 2018
@abandeali1 abandeali1 force-pushed the feat/order-utils/abiEncoder branch from 9dcb6a9 to 7a9f722 Compare December 23, 2018 21:16
@abandeali1 abandeali1 force-pushed the feat/order-utils/abiEncoder branch from 7a9f722 to 047a842 Compare January 3, 2019 01:06
@abandeali1 abandeali1 force-pushed the feat/order-utils/abiEncoder branch 2 times, most recently from 4c4fa4f to acf92b5 Compare January 3, 2019 22:30
@abandeali1 abandeali1 changed the title [WIP] Add MAP support to order-utils, order-watcher, and types Add MAP support to order-utils, order-watcher, and types Jan 3, 2019
@abandeali1
Use assetDataUtils instead of IAssetData for encoding MultiAsset values
d957cd5
@abandeali1
Update CHANGELOGs
1553b36
@abandeali1
Add length check to MultiAsset encoding
0cb5209
@abandeali1
fix: Add error message if assetProxyId is not ERC20 or ERC721
19e9344
@abandeali1
feat: Add support for MultiAssetProxy
67dfe60
@abandeali1
Update CHANGELOG
fc71d87
@abandeali1
Add support for MAP in fill-scenarios
46359c0
@abandeali1
Run linter
aae3203
@abandeali1
Fix decoding and add tests
8549252
@abandeali1
feat: Export MultiAssetData in types
492e0ae
@abandeali1
Add prefix to names of properties in EncodingRules and DecodingRules
c6ff77b
@abandeali1
Rename functions
0abace3
@abandeali1
Fix transferFrom to work with MAP
eeb07d7
@abandeali1
Do not attempt to parse tokenAddress if decoding data from multiAsset…
b797a45 
…Proxy
@abandeali1
Add individual balances and allowances to OrderRelevantState
de4916c
@abandeali1
feat: Add fields to OrderRelevantState and change AssetData to Single…
df4f3d9 
…AssetData
@abandeali1
feat: Add balance and allowance checks for MultiAssetProxy
0fba0b1
@abandeali1
Add recursive MultiAsset decoding, store first address in pipeline
1dda10b
@abandeali1
FIx linting errors
b90c319
@abandeali1
Update CHANGELOGs
70508f5
@abandeali1
Add tests for recursive MAP decoding
5720589
@abandeali1
Do not export AssetData in 0x.js
d7f9e3f
@abandeali1
Add tests for MAP in order watcher
ccdb81a
@abandeali1
Fix linting errors
a91bc41
@abandeali1
Minimize unnecessary type assertions
24564b9
@abandeali1 abandeali1 force-pushed the feat/order-utils/abiEncoder branch from d71196d to feb8862 Compare January 7, 2019 19:08
@abandeali1 abandeali1 force-pushed the feat/order-utils/abiEncoder branch from feb8862 to fd37e88 Compare January 7, 2019 19:11
@abandeali1 abandeali1 merged commit 3cdb856 into development Jan 7, 2019
@LogvinovLeon LogvinovLeon deleted the feat/order-utils/abiEncoder branch January 7, 2019 20:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@LogvinovLeon LogvinovLeon LogvinovLeon approved these changes

@fabioberger fabioberger fabioberger approved these changes

@albrow albrow albrow approved these changes

@dekz dekz Awaiting requested review from dekz

Assignees
No one assigned
Labels
0x.js contracts @0x/contract-wrappers @0x/fill-scenarios @0x/order-utils @0x/order-watcher @0x/types @0x/utils
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@abandeali1 @coveralls @albrow @fabioberger @LogvinovLeon