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
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
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
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
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
Remco Bloemen
a98ecc05af
ABI encoded asset data
2018-06-25 16:19:07 -07:00
Remco Bloemen
f7337c1a05
Remove proxyId argument from dispatchTransferFrom
2018-06-25 16:19:07 -07:00
Fabio Berger
ec9d1ca57e
Document all the contract test options in README
2018-06-25 15:18:02 +02:00
Fabio Berger
f811c07454
Move RevertReasons to @0xproject/types package
2018-06-25 12:59:26 +02:00
Fabio Berger
bb85382824
Add missing import
2018-06-25 12:47:44 +02:00
Fabio Berger
df79fb19af
Merge branch 'v2-prototype' into refactor/check-revert-reasons
...
* v2-prototype: (48 commits)
Fix typos in comments
Add modifier and tests for removeAuthorizedAddressAtIndex
Update and add tests
Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex
Move isFunctionRemoveAuthorizedAddress to test
Fix usage of `popLastByte`
Fix LibBytes is a library
Remove `areBytesEqual`
Fix usage of `contentAddress()`
Clean low bits in bytes4
Clean high bits in address
Refactor LibBytes.readBytes4 for consistency
Fix LibBytes.equals
Add trailing garbage testcase for LibBytes.equals
Rename bytes.equals
Add slice and sliceDestructive
Rename bytes.rawAddress and add bytes.contentAddress
Rename read/writeBytesWithLength
Using LibBytes for bytes
Make LibBytes a library
...
# Conflicts:
# packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol
# packages/contracts/test/libraries/lib_bytes.ts
2018-06-25 11:45:17 +02:00
Remco Bloemen
82af1df3c3
Fix typos in comments
2018-06-23 13:55:02 +02:00
Amir Bandeali
ea8c2b8d69
Add modifier and tests for removeAuthorizedAddressAtIndex
2018-06-23 13:53:39 +02:00
Amir Bandeali
8ddcb6c841
Update and add tests
2018-06-23 13:53:39 +02:00
Amir Bandeali
1681361aed
Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex
2018-06-23 13:53:39 +02:00
Remco Bloemen
6a6f98299d
Move isFunctionRemoveAuthorizedAddress to test
2018-06-23 13:53:39 +02:00
Remco Bloemen
19ba272d62
Fix usage of popLastByte
2018-06-23 13:53:39 +02:00
Remco Bloemen
2f8ceca2ef
Fix LibBytes is a library
2018-06-23 13:53:39 +02:00
Remco Bloemen
ba1baafca5
Remove areBytesEqual
2018-06-23 13:53:38 +02:00
Remco Bloemen
20a07494f6
Fix usage of contentAddress()
2018-06-23 13:53:38 +02:00
Remco Bloemen
c66477c690
Clean low bits in bytes4
2018-06-23 13:53:38 +02:00
Remco Bloemen
5c612a186f
Clean high bits in address
2018-06-23 13:53:38 +02:00
