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
Lawrence Forman
616907eff8
Update coordinator tests to comply with mixed EIP712 domains.
2019-03-15 16:52:18 -04:00
Lawrence Forman
afaabb3673
Move Coordinator EIP712 constants from contracts/test-utils to packages/order-utils.
...
Export `constants` from `packages/types`.
Add `SignatureInvalid` to `RevertReason` in `packages/types`.
2019-03-15 16:52:18 -04:00
Lawrence Forman
1c1f625352
Add SignatureType.Invalid to Coordinator.
...
`LibEIP712Domain.sol` can now produce hashes for both Coordinator and Exchange data through `hashEIP712CoordinatorMessage()` and `hashEIP712ExchangeMessage()`.
Coordinator now only uses its own domain for approval hashes, and the Exchange's domain for transaction hashes.
2019-03-15 16:52:18 -04:00
Amir Bandeali
65c8630534
Unpin Solidity versions for contracts that are not deployed
2019-03-13 16:53:22 -07:00
Greg Hysen
c53edf6bd9
0.5.3 -> 0.5.5 in erc1155 contracts
2019-03-12 11:39:00 -07:00
Greg Hysen
b601220845
Updated package.json dependencies
2019-03-12 11:09:39 -07:00
Greg Hysen
e77a608f45
Got build working on erc1155
2019-03-11 19:07:58 -07:00
Greg Hysen
98227928af
Added Address.sol for isContract checks to contracts-utils package
2019-03-11 16:12:31 -07:00
Greg Hysen
430afbdc80
Replaced SafeMath in ERC1155 package with the version in contracts-utils
2019-03-11 16:06:18 -07:00
Greg Hysen
257d1b2b52
Set evm version to byzantium to avoid using unsupported opcodes in solidity 0.5.5
2019-03-11 15:00:41 -07:00
Greg Hysen
07200437b6
style improvements for erc1155 basic implementation
2019-03-11 15:00:41 -07:00
Greg Hysen
421f555d57
Ran prettier
2019-03-11 14:59:58 -07:00
Greg Hysen
4b60d941cc
erc1155 wrapper improvements - handle minting for mutliple addresses at once + more revert reasons
2019-03-11 14:59:58 -07:00
Greg Hysen
60d24ada62
tests for allowance approvals on erc1155
2019-03-11 14:59:58 -07:00
Greg Hysen
b3775a3ca5
more style cleanup of erc1155 basic implementation
2019-03-11 14:59:58 -07:00
Greg Hysen
5d36c97a46
Added license to utils
2019-03-11 14:59:58 -07:00
Greg Hysen
4bdd412c15
added pr to changelogs
2019-03-11 14:59:58 -07:00
Greg Hysen
46e3bcd6b9
cleaned up reference implementation revert reasons
2019-03-11 14:59:58 -07:00
Greg Hysen
68a85ddf90
removed unnecessary solhintignore
2019-03-11 14:59:58 -07:00
Greg Hysen
9de151cc14
ran prettier
2019-03-11 14:55:45 -07:00
Greg Hysen
b8c9a5dd1f
renamed contracts::lib -> contracts::utils
2019-03-11 14:55:45 -07:00
Greg Hysen
4dfb3507c4
updated compiler.json
2019-03-11 14:55:45 -07:00
Greg Hysen
0cac2d407b
Cleanup
2019-03-11 14:55:45 -07:00
Greg Hysen
b3106cd932
Removed DummyERC1155Token
2019-03-11 14:55:45 -07:00
Greg Hysen
c4a467fa96
Ran lint-contracts
2019-03-11 14:55:45 -07:00
Greg Hysen
cf7afbe7f6
ran linter
2019-03-11 14:55:45 -07:00
Greg Hysen
a8d58aeac4
ran prettier
2019-03-11 14:55:45 -07:00
Greg Hysen
28209e9413
cleaning
2019-03-11 14:55:45 -07:00
Greg Hysen
68ed56f2d9
some cleanup
2019-03-11 14:55:45 -07:00
Greg Hysen
0c03747807
Basic ERC1155 wrapper
2019-03-11 14:55:45 -07:00
Greg Hysen
3039d8edfa
Ran prettier
2019-03-11 14:55:45 -07:00
Greg Hysen
7c850cc082
Basic ERC1155 Implementation. Derived from reference implementation, with bug fixes.
2019-03-11 14:55:45 -07:00
