Amir Bandeali
8da42b12f4
Remove transferFrom, implement in fallback function
2018-06-29 13:33:22 -07:00
Amir Bandeali
50556e2609
Merge pull request #774 from 0xProject/style/contracts/abiEncodeAsmComments
...
Added some comments for ASM hashing
2018-06-29 11:41:23 -07:00
Greg Hysen
46d79e5115
Updated hashing comments as-per PR
2018-06-28 15:41:06 -07:00
Fabio Berger
4fe6269043
Remove unused constants
2018-06-28 10:45:28 +02:00
Fabio Berger
646927962a
Reduce the userAddresses to the individual addresses actually used by tests, as well as only deploy the number of ERC20 tokens needed for each test suite
2018-06-28 10:43:37 +02:00
Fabio Berger
b56baefaa6
Add await time constant
2018-06-28 09:34:13 +02:00
Fabio Berger
f49a507297
Add missing awaitTransactionSuccessAsync calls
2018-06-28 09:13:56 +02:00
Fabio Berger
c308359f59
Merge branch 'v2-prototype' into feature/combinatorial-testing
...
* v2-prototype:
Improve 'web3-provider-engine' typings
Fix build
Update artifacts
Add more revert reasons to tests
Make dispatchTransferFrom revert with reason from AssetProxy on failure
Remove redundant files, hard code function selector in dispatchTransferFrom, and modify revert reason
Updated offset of receiverData length to reflect new assetData encoding.
ERC20 Custom storage layout
Golf the authorization check
ERC20 manual memory layout
ERC20 inline return
ERC721 inline return
Golf ERC721 transferFrom
Inline ERC20 tranferFrom selector constant
Optimize ERC20 transferFrom
Polish asset picker layout
Update relayer grid fallback icon
Change metamask install link based on browser
Use ethereumjs-tx@1.3.5 instead of our fork
# Conflicts:
# packages/contracts/test/asset_proxy/proxies.ts
# packages/contracts/test/exchange/core.ts
# packages/migrations/artifacts/2.0.0/DummyERC721Token.json
2018-06-27 10:59:37 +02:00
Fabio Berger
375d667144
Move combinatorial fillOrder tests into the fill_ordere test file
2018-06-27 10:43:12 +02:00
Amir Bandeali
ec3e9efdaa
Fix build
2018-06-26 18:30:20 -07:00
Amir Bandeali
7f233dcb15
Add more revert reasons to tests
2018-06-26 17:34:43 -07:00
Fabio Berger
6a2421c683
Fix tests
2018-06-26 23:17:29 +02:00
Amir Bandeali
b6d8dcb6e1
Make dispatchTransferFrom revert with reason from AssetProxy on failure
2018-06-26 13:57:55 -07:00
Amir Bandeali
08ee1ab2e6
Remove redundant files, hard code function selector in dispatchTransferFrom, and modify revert reason
2018-06-26 13:57:51 -07:00
Greg Hysen
873ec898d8
Updated offset of receiverData length to reflect new assetData encoding.
2018-06-26 12:23:19 -07:00
Remco Bloemen
97a70d14a3
ERC20 Custom storage layout
2018-06-26 12:23:19 -07:00
Remco Bloemen
394fbebfa8
Golf the authorization check
2018-06-26 12:23:19 -07:00
Remco Bloemen
b79588c4a0
ERC20 manual memory layout
2018-06-26 12:23:19 -07:00
Remco Bloemen
3b46e82625
ERC20 inline return
2018-06-26 12:23:19 -07:00
Remco Bloemen
dbaf1fcd43
ERC721 inline return
2018-06-26 12:23:19 -07:00
Remco Bloemen
4caf1271e4
Golf ERC721 transferFrom
2018-06-26 12:23:19 -07:00
Remco Bloemen
6921943aff
Inline ERC20 tranferFrom selector constant
2018-06-26 12:23:19 -07:00
Remco Bloemen
3ce90b8257
Optimize ERC20 transferFrom
2018-06-26 12:23:19 -07:00
Fabio Berger
2a82807be4
Fix type issue
2018-06-26 19:16:57 +02:00
Fabio Berger
43ae868c69
Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testing
...
* refactor/check-revert-reasons:
Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed`
Expect RevertReason be passed in, not string
Rename RevertReasons to RevertReason since singular enum names are more common
# Conflicts:
# packages/contracts/test/asset_proxy/proxies.ts
# packages/contracts/test/exchange/core.ts
2018-06-26 18:53:44 +02:00
Fabio Berger
1bc742aed1
Temporarily switch revert reasons to TransferFailed. Should be InvalidAmount but because of an oversight in the assembly implementation of dispatchTransferFrom, it always throws TransferFailed
2018-06-26 18:49:10 +02:00
Fabio Berger
6dc852774e
Update AbstractAssetWrapper
2018-06-26 08:52:25 +02:00
Fabio Berger
7967ebed57
Rename to singular
2018-06-26 08:51:40 +02:00
Fabio Berger
105b927397
Fix merge issues
2018-06-26 08:43:37 +02:00
Fabio Berger
9219f9d8ae
Merge branch 'v2-prototype' into feature/combinatorial-testing
...
* v2-prototype: (21 commits)
Don't use variables for revert reasons
Add comments to dispatchTransferFrom
Document IAssetData
Compute bytes4 proxyid constants
Return inplace bytes in LibBytes.readBytesWithLength
Add Greg's documentation to MixinErc721Transfer
Add Greg's documentation to MixinErc20Transfer
Gas golf the transfer success logic
Optimize like in PR #767
Run prettier and fix linting errors
Fix tests
Update tests
Fix AssetProxyUtils
Update tests
Fix ERC721Proxy TokenId
Update AssetProxyUtils
Add IAssetData
WIP
ABI encoded asset data
Remove proxyId argument from dispatchTransferFrom
...
# Conflicts:
# packages/contracts/test/asset_proxy/proxies.ts
2018-06-26 08:13:59 +02:00
Fabio Berger
f780e6f235
Expect RevertReason be passed in, not string
2018-06-26 08:11:32 +02:00
Fabio Berger
27670f4da6
Rename RevertReasons to RevertReason since singular enum names are more common
2018-06-26 08:11:14 +02:00
Fabio Berger
e051743a3d
Merge branch 'v2-prototype' into refactor/check-revert-reasons
...
* v2-prototype: (21 commits)
Don't use variables for revert reasons
Add comments to dispatchTransferFrom
Document IAssetData
Compute bytes4 proxyid constants
Return inplace bytes in LibBytes.readBytesWithLength
Add Greg's documentation to MixinErc721Transfer
Add Greg's documentation to MixinErc20Transfer
Gas golf the transfer success logic
Optimize like in PR #767
Run prettier and fix linting errors
Fix tests
Update tests
Fix AssetProxyUtils
Update tests
Fix ERC721Proxy TokenId
Update AssetProxyUtils
Add IAssetData
WIP
ABI encoded asset data
Remove proxyId argument from dispatchTransferFrom
...
# Conflicts:
# packages/contracts/test/asset_proxy/proxies.ts
2018-06-26 08:07:37 +02:00
Fabio Berger
fb03003b3a
Fix inconsistency between contract and reference implementation of order validation logic
2018-06-26 07:50:24 +02:00
Amir Bandeali
a89908540f
Don't use variables for revert reasons
2018-06-25 16:34:06 -07:00
Amir Bandeali
0163984ea4
Add comments to dispatchTransferFrom
2018-06-25 16:19:08 -07:00
Remco Bloemen
db3ce08cab
Document IAssetData
2018-06-25 16:19:08 -07:00
Remco Bloemen
1076959006
Compute bytes4 proxyid constants
2018-06-25 16:19:08 -07:00
Remco Bloemen
5127cbb22c
Return inplace bytes in LibBytes.readBytesWithLength
2018-06-25 16:19:08 -07:00
Remco Bloemen
9175b43542
Add Greg's documentation to MixinErc721Transfer
2018-06-25 16:19:07 -07:00
Remco Bloemen
562fec01d8
Add Greg's documentation to MixinErc20Transfer
2018-06-25 16:19:07 -07:00
Remco Bloemen
b8051c8fed
Gas golf the transfer success logic
2018-06-25 16:19:07 -07:00
Remco Bloemen
4df66a4802
Optimize like in PR #767
2018-06-25 16:19:07 -07:00
Amir Bandeali
a2ff63daa5
Run prettier and fix linting errors
2018-06-25 16:19:07 -07:00
Amir Bandeali
7ce0f9682f
Fix tests
2018-06-25 16:19:07 -07:00
Remco Bloemen
3c6d0dc3e0
Update tests
2018-06-25 16:19:07 -07:00
Remco Bloemen
07734a5184
Update tests
2018-06-25 16:19:07 -07:00
Remco Bloemen
32d4994219
Fix ERC721Proxy TokenId
2018-06-25 16:19:07 -07:00
Remco Bloemen
b7b0185baf
Add IAssetData
2018-06-25 16:19:07 -07:00
Remco Bloemen
7b0c13c121
WIP
2018-06-25 16:19:07 -07:00
