Lawrence
|
78b9a45158
|
Add PR#s to changelogs.
|
2019-03-20 10:19:46 -04:00 |
|
Lawrence
|
b8925baa88
|
Add unit tests for contracts/utils/LibAddressArray.
Fix `LibAddressArray.indexOf` returning wrong index.
|
2019-03-20 10:19:46 -04:00 |
|
Fabio Berger
|
843caf86fb
|
merge development
|
2019-03-20 14:32:26 +01:00 |
|
Greg Hysen
|
7ed3afe9f0
|
Updated function signature for ERC1155 ProxyId - ERC1155Token -> ERC1155Assets
|
2019-03-19 15:35:08 -07:00 |
|
Greg Hysen
|
98c6fa10e6
|
Added 1explicit ERC1555Poxy testsfor cwhen receiver allback data is NULLL (0x)
|
2019-03-19 09:37:16 -07:00 |
|
Greg Hysen
|
30d0bdec07
|
Updated changelog and yarn.lock
|
2019-03-19 09:37:16 -07:00 |
|
Greg Hysen
|
7024f29865
|
updated changelogs
|
2019-03-19 09:36:12 -07:00 |
|
Greg Hysen
|
29ebed9514
|
Added ERC1155 artifacts to log decoder for exchange wrapper
|
2019-03-19 09:36:11 -07:00 |
|
Greg Hysen
|
c0260bc44a
|
rebased against development
|
2019-03-19 09:36:11 -07:00 |
|
Greg Hysen
|
6992bff0e0
|
Ran prettier & linter
|
2019-03-19 09:36:11 -07:00 |
|
Greg Hysen
|
6957e6e8f7
|
ERC1155 integration tests with MultiAssetProxy
|
2019-03-19 09:36:11 -07:00 |
|
Greg Hysen
|
31dbca7efc
|
More integration tests for ERC1155 <> Multi Asset Proxy encoding / decoding
|
2019-03-19 09:36:11 -07:00 |
|
Greg Hysen
|
82b6dad1ba
|
Exchange Integration Tests
|
2019-03-19 09:36:11 -07:00 |
|
Amir Bandeali
|
b008fabdac
|
Change petersburg to constantinople
|
2019-03-18 13:07:34 -07:00 |
|
Amir Bandeali
|
caf286b8cb
|
Update CHANGELOGs
|
2019-03-18 13:07:34 -07:00 |
|
Amir Bandeali
|
aea278c022
|
Update evmVersion to petersburg
|
2019-03-18 13:07:34 -07:00 |
|
Fabio Berger
|
d4187dffa3
|
Add createCoordinatorApprovalTypedData method to order-utils and use in Coordinator tests
|
2019-03-18 17:20:51 +01:00 |
|
Amir Bandeali
|
6fa645aab9
|
Merge pull request #1705 from merklejerk/feature/contracts/coordinator-tx-eip712-mixed-domains
Separate domains for Coordinator transactions and approvals
|
2019-03-16 16:21:01 -07:00 |
|
Greg Hysen
|
e1cfbcd4f6
|
Copied MixinAssetProxyDispatcher from exchange
|
2019-03-15 21:16:21 -07:00 |
|
Greg Hysen
|
6f17ff55fa
|
Added deployed contract packages to readme (and link to top-level readme)
|
2019-03-15 21:16:18 -07:00 |
|
Greg Hysen
|
d88af4dfa6
|
Bumped version of ERC1155Proxy to 0.5.5 + merged ERC20Proxy/ERC721Proxy/MultiAssetProxy dependencies into base contract files
|
2019-03-15 19:02:24 -07:00 |
|
Lawrence Forman
|
4c55004b08
|
Correct comment in hashEIP712Message() in LibEIP712Domai.sol.
Merge janky changelog notes in `types` package.
Correct changelog note in `coordinator` changelog.
|
2019-03-15 19:23:56 -04:00 |
|
Lawrence Forman
|
ae24119c09
|
Merge branch 'development' into feature/contracts/coordinator-tx-eip712-mixed-domains
|
2019-03-15 19:10:44 -04:00 |
|
Lawrence Forman
|
b8753d8f20
|
Add PR numbers to changelogs.
|
2019-03-15 18:29:26 -04:00 |
|
Greg Hysen
|
22bc1fb21e
|
additional zero outcome tests
|
2019-03-15 15:05:52 -07:00 |
|
Greg Hysen
|
63ba764de8
|
renamed perUnitValue to valueMultiplier
|
2019-03-15 15:05:52 -07:00 |
|
Greg Hysen
|
6a7530d741
|
added test for amount=0
|
2019-03-15 15:05:52 -07:00 |
|
Greg Hysen
|
eb9bf7c4f9
|
Adjusted changelog version since nothing has been published during this PR
|
2019-03-15 15:05:52 -07:00 |
|
Greg Hysen
|
b6571d0ca3
|
Added calldatacopy comment
|
2019-03-15 15:05:52 -07:00 |
|
Greg Hysen
|
9207d1c680
|
Do not revert if value or amount are zero. Only if amount is non-zero and there is an overflow.
|
2019-03-15 15:05:52 -07:00 |
|
Greg Hysen
|
f783c9bb25
|
updated comment for calldatacopy
|
2019-03-15 15:05:52 -07:00 |
|
Greg Hysen
|
2a6ed0c96e
|
Renamed tokenIds -> ids, tokenValues -> values, callbackData -> data to be consistent with the ERC1155 reference implementation.
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
9ec380777a
|
Rebased against development
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
8916d0d367
|
Ran prettier
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
1e5648111e
|
Updated changelogs and documentation for erc1155 proxy
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
ae51cfe8b9
|
Added method descriptions to erc1155 proxy wrapper
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
05ef250ab4
|
Ran prettier & linter
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
38e4871f32
|
Moved transferFrom with/without logs into ERC1155 Proxy Wrapper
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
a86ba7af2e
|
moved transferFrom into ERC1155 Proxy Wrapper
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
55c4fc9aca
|
Ran prettier / linter
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
888c17353b
|
Renamed erc1155token to erc1155Contract in proxy tests
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
054c0e91a3
|
removed erc1155 proxy tests from general proxy test file
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
4dfb610eba
|
updated erc1155 proxy tests and moved to their own test file
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
008eb8dd8b
|
cleaning up erc1155 proxy tests
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
2882c4bb89
|
test with several tokens erc1155 proxy
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
4473851f5b
|
Remaining tests for erc1155 proxy
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
15d9e2d3d5
|
Split ERC1155 Asset Proxy from ERC1155 POC implementation - squashed
|
2019-03-15 15:05:02 -07:00 |
|
Greg Hysen
|
243a04b756
|
tests for allowance approvals on erc1155
|
2019-03-15 15:05:02 -07:00 |
|
Lawrence Forman
|
ad5d4bdfc5
|
Unexport constants from order-utils.
Directly grab the EIP712 constants from the `order-utils` package in `/contracts/coordinator/test/util/hash_utils`.
Update changelogs.
|
2019-03-15 18:01:43 -04:00 |
|
Lawrence Forman
|
54c17b0068
|
Ran prettier & linter.
Updated CHANGELOGs.
|
2019-03-15 17:32:36 -04:00 |
|