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 |
|
Greg Hysen
|
5063c17e6b
|
ERC1155 Asset Data tests + types
|
2019-03-19 09:36:11 -07:00 |
|
Amir Bandeali
|
3fff3d9c60
|
Merge pull request #1707 from 0xProject/fix/update-ganache
Change `evmVersion` to `constantinople` for contract compilation
|
2019-03-19 08:23:12 -07:00 |
|
Francesco Agosti
|
2675833b0d
|
Merge pull request #1709 from 0xProject/feature/website/add-Daniel
adds daniel pyrahon to website
|
2019-03-18 14:53:49 -07:00 |
|
fragosti
|
939a5b477a
|
Run linter
|
2019-03-18 14:51:51 -07:00 |
|
Rahul Singireddy
|
dc57e7a5b3
|
adds daniel pyrahon to website
|
2019-03-18 14:19:27 -07:00 |
|
Amir Bandeali
|
a401b8f475
|
Fix web3wrapper node version test
|
2019-03-18 13:07:34 -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 |
|
Amir Bandeali
|
4e20fe1602
|
Update ganache-core to 2.5.3
|
2019-03-18 13:07:34 -07:00 |
|
Fabio Berger
|
d3ab612a89
|
Fix order-watcher version
|
2019-03-18 11:59:56 +01:00 |
|
Alex Svanevik
|
a8720806f1
|
Merge pull request #1702 from 0xProject/fix/pipeline/replace-edps-endpoint
Changed EDPS endpoint to a 0x AWS one
|
2019-03-18 18:09:31 +08:00 |
|
askeluv
|
5aac4c2e5d
|
Linting
|
2019-03-18 17:36:19 +08: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
|
842ea4645b
|
Merge pull request #1701 from 0xProject/feature/contracts/erc1155ProxySolidity055
Upgrade asset-proxy package to solidity 0.5.5
|
2019-03-15 21:32:57 -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 |
|
fragosti
|
bb0ba21e92
|
Merge https://github.com/0xProject/0x-monorepo into development
|
2019-03-15 16:48:41 -07:00 |
|
fragosti
|
f0753c8e58
|
Make credits program participants 1 row
|
2019-03-15 16:48:18 -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
|
bab368b956
|
Merge pull request #1661 from 0xProject/feature/contracts/erc1155Proxy-4
ERC1155 Asset Proxy
|
2019-03-15 15:25:55 -07: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
|
df5786deda
|
yarn.lock for erc1155 proxy
|
2019-03-15 15:05:51 -07:00 |
|
Greg Hysen
|
de971e6c46
|
added exports for 1155 proxy
|
2019-03-15 15:05:02 -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
|
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 |
|