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
5704afc54c
ERC1155 Asset Data tests + types
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
d5d9df383e
Added remaining erc1155 revert reasons to types package
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
Greg Hysen
b77dcbd39b
bumped revision verson for types package
2019-03-15 15:05:02 -07:00
fragosti
d3f45d2148
Remove facebook from credits page
2019-03-15 11:30:36 -07:00
Xianny
7326dbd108
add greenhouse ( #1690 )
2019-03-15 10:37:52 -07:00
F. Eugene Aumson
4bf311a282
Enable cryptokitties data from nonfungible.com ( #1680 )
...
* enable cryptokitties
Recall that nonfungible.com sent us an initial data dump so that we
wouldn't have to pull everything from the API. And recall that we're
storing that initial dump on S3. Finally, recall that the cryptokitties
data was particularly voluminous (~1GB), which doesn't easily transfer to
and from S3.
These changes provide a CLI script to partition that data (or any such data
from nonfungible.com) into a set of smaller files; and a scraping script
that seamlessly recombines those partitions for loading into the database.
* add chainbreakers, chibifighters & mlbcryptobaseball
2019-03-15 10:50:59 -04:00
F. Eugene Aumson
7f5a3f12ca
Relay failures through command line interface ( #1700 )
...
* Relay failures through command line interface
2019-03-15 10:38:21 -04:00
Amir Bandeali
70e550a25f
Merge pull request #1698 from ochikov/patch-3
...
Update constants.ts
2019-03-14 20:25:54 -07:00
ochikov
1328882ab6
Update constants.ts
2019-03-14 18:12:50 +02:00
Jacob Evans
b378a0608d
Merge pull request #1692 from 0xProject/fix/order-watcher/1550
...
Fix error where object could be undefined given an approval event
2019-03-14 11:30:54 +01:00
Jacob Evans
e28c6d6f9c
Add a regression test for #1550
2019-03-14 10:45:20 +01:00
Jacob Evans
f57f29e426
Update changelog
2019-03-14 10:12:13 +01:00
Jacob Evans
f2857452e3
Fix error were object could be undefined given an approval event
2019-03-14 10:12:03 +01:00
Amir Bandeali
af04c294b9
Merge pull request #1693 from 0xProject/fix/contracts/unpinVersions
...
Unpin Solidity versions for contracts that are not deployed
2019-03-13 22:34:31 -07:00
Amir Bandeali
65c8630534
Unpin Solidity versions for contracts that are not deployed
2019-03-13 16:53:22 -07:00
Greg Hysen
667c22169f
Merge pull request #1657 from 0xProject/feature/contracts/erc1155MinimalImplementation
...
erc1155 minimal implementation
2019-03-12 12:51:43 -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
Amir Bandeali
2822e77716
Merge pull request #1682 from 0xProject/feat/contracts/solidity0.5.5
...
Upgrade contracts to Solidity 0.5.5
2019-03-11 17:06:28 -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
dfdb48ce7d
Updated README and circleci for erc1155 package
2019-03-11 15:00:41 -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
ebfa00d555
Added remaining erc1155 revert reasons to types package
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
a1c121e2fe
ignore erc1155 artifacts and wrappers for prettier
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
