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
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
8064914bb7
Prettier fixes
2018-06-25 23:17:56 +02:00
Fabio Berger
1134ff1075
Fix tslint issues
2018-06-25 20:17:00 +02:00
Greg Hysen
94740155e5
Comments for ASM hashing
2018-06-25 11:02:31 -07:00
Fabio Berger
ec9d1ca57e
Document all the contract test options in README
2018-06-25 15:18:02 +02:00
Fabio Berger
ad67a6add5
Check revert reasons in declarative and combinatorial tests
2018-06-25 13:51:00 +02:00
Fabio Berger
1353723b58
merge check-revert-reasons
2018-06-25 13:02:38 +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
3ed4a1ba20
Add missing import
2018-06-25 12:47:13 +02:00
Fabio Berger
c50da5d034
merge check-revert-reasons
2018-06-25 12:32:16 +02:00
Fabio Berger
9b196ba68c
Merge branch 'v2-prototype' into feature/combinatorial-testing
...
* v2-prototype: (97 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/utils/constants.ts
# packages/contracts/test/exchange/core.ts
2018-06-25 11:49:14 +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
Remco Bloemen
943e556f43
Refactor LibBytes.readBytes4 for consistency
2018-06-23 13:53:38 +02:00