aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
Commit message (Collapse)AuthorAgeFilesLines
* merge v2-prototypeFabio Berger2018-04-243-97/+96
|\
| * Rename variables, create private validation methods in token wrappersAmir Bandeali2018-04-243-97/+96
| |
* | Fix testsAmir Bandeali2018-04-243-3/+54
| |
* | Combine Exchange with AssetProxyDispatcherAmir Bandeali2018-04-247-67/+58
|/
* Define numbers of dummy tokens to deploy in constantsAmir Bandeali2018-04-243-2/+4
|
* Remove type assertionsAmir Bandeali2018-04-241-18/+12
|
* Fix and cleanup testsAmir Bandeali2018-04-242-1/+13
|
* Add ERC721 wrapperAmir Bandeali2018-04-242-20/+161
|
* Add ERC20WrapperAmir Bandeali2018-04-243-32/+127
|
* Rename proxyUtils => assetProxyUtilsAmir Bandeali2018-04-231-6/+6
|
* Rename missed variablesAmir Bandeali2018-04-234-20/+20
|
* Reorder event argsAmir Bandeali2018-04-221-10/+10
|
* Add missing async suffixAmir Bandeali2018-04-221-1/+1
|
* Rename token => assetAmir Bandeali2018-04-2211-203/+203
|
* Rename Token => IERC20TokenAmir Bandeali2018-04-227-155/+47
|
* Rename DummyToken => DummyERC20TokenAmir Bandeali2018-04-226-66/+14
|
* export proxyUtils instead of individual functionsAmir Bandeali2018-04-221-34/+32
|
* Fix names and visibilities, use address type over contract type for function ↵Amir Bandeali2018-04-225-22/+21
| | | | args and returns
* Remove unused constructor argumentsAmir Bandeali2018-04-222-28/+15
|
* Add presigned signature typeAmir Bandeali2018-04-211-1/+29
|
* Fix zeppelin imports, run prettierAmir Bandeali2018-04-212-2/+2
|
* Added tests for (most functions in) LibBytes. The write methods are not ↵Greg Hysen2018-04-211-0/+1
| | | | currently compatible with our generated contract wrappers.
* Added description for the DummyERC721Token constructorGreg Hysen2018-04-211-0/+6
|
* Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less ↵Greg Hysen2018-04-213-11/+15
| | | | confusion. Also updated the function description.
* Reverting earlier change: interfaces now inherit from other interfacesGreg Hysen2018-04-212-2/+10
|
* Clarified that 0x0 could be passed into AssetProxyDispatcherGreg Hysen2018-04-212-4/+4
|
* Inlined decodeMetadata in the proxies and removed encodeMetadata (already ↵Greg Hysen2018-04-212-72/+5
| | | | exists in Typescript). This simplifies the code.
* Added @TODO for safeTransferFrom support in ERC721 proxyGreg Hysen2018-04-211-0/+2
|
* Removed outdated TODO comment in MixinSettlementProxyGreg Hysen2018-04-211-2/+0
|
* Miscellaneous style changes to the contracts package; specifically testsGreg Hysen2018-04-212-3/+3
|
* Removed ERC20 V1 Proxy + TokenTransferProxyGreg Hysen2018-04-219-296/+0
|
* Updated commenting. Noted that transferFrom succeeds or throws on all ↵Greg Hysen2018-04-214-7/+7
| | | | transferFrom implementations.
* Reverted change that allowed ERC721 transfer proxy to be called with amount ↵Greg Hysen2018-04-211-3/+0
| | | | 0. This now throws.
* Removed takerTokenAddress and makerTokenAddress from Order struct.Greg Hysen2018-04-217-63/+78
|
* toUnsigned -> toBuffer in assetProxyUtilsGreg Hysen2018-04-211-1/+1
|
* Unrolled the loop that copies the Order struct in FillOrderNoThrow. Saves ↵Greg Hysen2018-04-211-5/+17
| | | | 900 gas
* address -> IAssetProxy where possible for clarityGreg Hysen2018-04-212-13/+13
|
* Reverted to calling read/write uint256Greg Hysen2018-04-212-2/+28
|
* Minor changes to typescript testsGreg Hysen2018-04-212-4/+2
|
* Minor fixes to the contractsGreg Hysen2018-04-213-2/+5
|
* Rearranged preconditions in ERC721 proxyGreg Hysen2018-04-211-3/+3
|
* Changed order of encode/decode functions in token proxiesGreg Hysen2018-04-213-36/+36
|
* Updated name of AssetProxyChanged -> AssetProxySetGreg Hysen2018-04-213-3/+4
|
* Explicity declare `memory` for complex types, where possibleGreg Hysen2018-04-213-5/+5
|
* Improved readability of FillOrderNoThrow IIGreg Hysen2018-04-211-15/+15
|
* Improved readability of FillOrderNoThrowGreg Hysen2018-04-211-4/+4
|
* Updated ERC20 v1 proxy names in testsGreg Hysen2018-04-212-3/+3
|
* Proxy Metadata -> DataGreg Hysen2018-04-212-9/+9
|
* Cleaning up some wordingGreg Hysen2018-04-215-28/+26
|
* Minor style improvements to asset proxy utilsGreg Hysen2018-04-211-10/+3
|
* ethereum-js for encoding/decoding asset proxy dataGreg Hysen2018-04-211-41/+32
|
* Added memory to bytes arrays, where possibleGreg Hysen2018-04-214-7/+7
|
* Replaced read/write Uint256 with generic bytes32, plus castingGreg Hysen2018-04-214-16/+16
|
* Updated public -> externalGreg Hysen2018-04-216-9/+9
|
* Removed unused dependencyGreg Hysen2018-04-211-1/+0
|
* snake case to camel caseGreg Hysen2018-04-211-25/+25
|
* makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetDataGreg Hysen2018-04-214-18/+18
|
* IAssetProxyDispatcher to IAssetProxy in MixinSettlement layer + allowing ↵Greg Hysen2018-04-213-7/+8
| | | | 0-condition in ERC721 transfer
* Removed Log prefix from eventsGreg Hysen2018-04-212-5/+5
|
* removed unnecessary importGreg Hysen2018-04-211-2/+0
|
* setAssetProxy to addAssetProxyGreg Hysen2018-04-212-2/+2
|
* Renamed TransferProxy to ProxyGreg Hysen2018-04-211-2/+1
|
* Renaming TransferProxy to ProxyGreg Hysen2018-04-214-6/+6
|
* ERC20 V1 proxy compilingGreg Hysen2018-04-211-3/+3
|
* Changed order of write parameters in LibBytes. Now ordered by most ↵Greg Hysen2018-04-214-10/+10
| | | | generalized to most specific
* Asset Proxy DispatcherGreg Hysen2018-04-2123-122/+1088
|
* Use addFillResults function and add comments to all marketFill functionsAmir Bandeali2018-04-211-36/+84
|
* Fix EtherDelta importsAmir Bandeali2018-04-211-2/+2
|
* Add back require statements and tests (will move to another PR)Amir Bandeali2018-04-211-3/+8
|
* Revert variable namingAmir Bandeali2018-04-2110-141/+141
|
* Update Solidity syntax and commentsAmir Bandeali2018-04-213-50/+52
|
* Return all amounts traded and fees paidAmir Bandeali2018-04-217-106/+115
|
* Add tests for marketBuyOrdersAmir Bandeali2018-04-211-2/+2
|
* Add marketBuyOrders, rename variables, and fx old testsAmir Bandeali2018-04-218-226/+326
|
* Fix build errorsAmir Bandeali2018-04-213-13/+6
|
* Separate filled/cancelled errorsAmir Bandeali2018-04-213-4/+6
|
* Remove partial cancelsAmir Bandeali2018-04-216-72/+31
|
* Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that ↵Greg Hysen2018-04-214-12/+13
| | | | orders with salt <= to maker epoch will be cancelled (previously, it was salt < maker epoch)
* Renamed all instances of timestamp to salt. Clarified test case wording.Greg Hysen2018-04-212-3/+3
|
* Fixed spacingGreg Hysen2018-04-213-5/+5
|
* Implementation and tests in the protocol for cancelling all orders up to a ↵Greg Hysen2018-04-216-16/+67
| | | | specific time
* Update copyright headersAmir Bandeali2018-04-2130-24/+150
|
* Add private keys for testrpc mnemonicAmir Bandeali2018-04-211-20/+14
|
* Address feedback and lintAmir Bandeali2018-04-2117-170/+89
|
* Add tests for fillOrderNoThrow based functionsAmir Bandeali2018-04-211-0/+42
|
* Fix fillOrderNoThrowAmir Bandeali2018-04-211-29/+15
|
* Fix package.jsonAmir Bandeali2018-04-211-5/+5
|
* Bump Solidity version to 0.4.21Amir Bandeali2018-04-2120-30/+29
|
* Add fillOrderNoThrow to exchange wrapper and add testAmir Bandeali2018-04-211-0/+21
|
* Update formattingAmir Bandeali2018-04-214-34/+40
|
* Update fillOrderNoThrowAmir Bandeali2018-04-211-111/+103
|
* Update order utilsAmir Bandeali2018-04-211-5/+5
|
* Add script for starting testrpc with preconfigured private keysAmir Bandeali2018-04-212-0/+29
|
* Add utils for hashing and signing orders, update wrappersAmir Bandeali2018-04-216-53/+96
|
* Modify utils to work with new signature formatAmir Bandeali2018-04-217-150/+189
|
* Change order field namesAmir Bandeali2018-04-215-74/+73
|
* Revert getOrderHash to old logicAmir Bandeali2018-04-211-2/+16
|
* Fix compile errorsAmir Bandeali2018-04-2111-30/+54
|
* Update fillOrderNoThrowRemco Bloemen2018-04-211-39/+45
|
* Use ABIv2 exchange core in wrapper functionsRemco Bloemen2018-04-211-55/+34
|
* Implement ABIv2 in ExchangeCoreRemco Bloemen2018-04-212-60/+33
|
* Implement EIP712 and ABIv2 in LibOrderRemco Bloemen2018-04-211-20/+12
|
* Run prettierAmir Bandeali2018-04-211-1/+1
|
* Add fillOrderNoThrow and wrapper functionsAmir Bandeali2018-04-211-1/+1
|
* Fix compile errorsAmir Bandeali2018-04-214-12/+12
|
* Fix spelling of latterRemco Bloemen2018-04-211-1/+1
|
* Add offset to signatureRemco Bloemen2018-04-211-11/+13
|
* Document noThrow wrapper and correct fixed array offsetRemco Bloemen2018-04-211-39/+81
|
* Add Trezor signaturesRemco Bloemen2018-04-211-0/+23
|
* Add TodosRemco Bloemen2018-04-212-0/+3
|
* Fix documentationRemco Bloemen2018-04-211-3/+3
|
* Verify length on EIP712 signaturesRemco Bloemen2018-04-211-1/+2
|
* Remove unused return valueRemco Bloemen2018-04-211-3/+0
|
* Spelling fixesRemco Bloemen2018-04-211-7/+8
|
* Add documentationRemco Bloemen2018-04-211-2/+16
|
* Make wrappers external againRemco Bloemen2018-04-211-2/+2
|
* Explicit returnsRemco Bloemen2018-04-211-5/+6
|
* Revert cancel order signature abstractionRemco Bloemen2018-04-211-7/+2
|
* Fix hash argument nameRemco Bloemen2018-04-211-2/+2
|
* Fix batchFillOrdersNoThrow nameRemco Bloemen2018-04-211-1/+1
|
* Fix input length in fillOrderNoThrowRemco Bloemen2018-04-211-6/+11
|
* Add SignatureType.Invalid and documentationRemco Bloemen2018-04-211-0/+21
|
* Make first value illegalRemco Bloemen2018-04-211-6/+4
|
* Implement EIP712 at verify-signature call siteRemco Bloemen2018-04-213-25/+19
|
* Cancel signature abstractionRemco Bloemen2018-04-211-3/+10
|
* Cache order maker signature (ZEIP-15)Remco Bloemen2018-04-211-8/+10
|
* Add EIP712 signatures (implements ZEIP-17)Remco Bloemen2018-04-211-4/+40
|
* Add external contract call signatures (relates to ZEIP 1 and 7)Remco Bloemen2018-04-212-1/+36
|
* Revert after cascadeRemco Bloemen2018-04-211-6/+7
|
* Add 'caller' signature typeRemco Bloemen2018-04-211-17/+35
|
* Abstract signature to opaque bytearrayRemco Bloemen2018-04-217-161/+148
|
* Use interfaces for contract typesRemco Bloemen2018-04-213-36/+33
|
* Use new logDecoder interfaceAmir Bandeali2018-04-212-10/+13
|
* Rename variablesAmir Bandeali2018-04-212-27/+27
|
* Move log decoding logic to exchange wrapperAmir Bandeali2018-04-211-11/+39
|
* Add logDecoder, remove outdated testsAmir Bandeali2018-04-214-16/+77
|
* Move utils dir into srcAmir Bandeali2018-04-2110-0/+679
|
* Run prettierAmir Bandeali2018-04-212-3/+3
|
* Add fillOrderNoThrow and wrapper functionsAmir Bandeali2018-04-2110-285/+386
|
* Move order settlement to MSettlementRemco Bloemen2018-04-214-59/+68
|
* Exchange refactor using mixin patternRemco Bloemen2018-04-2111-578/+873
|
* Fix compiler warningsRemco Bloemen2018-04-211-4/+6
|
* Update exchange to use interfaces and current SafeMathRemco Bloemen2018-04-211-7/+7
|
* Copy Exchange and deps to previous as Exchange_v1Remco Bloemen2018-04-214-0/+995
|
* Add interfaces for Exchange, TokenRegistery and TokenTransferProxyRemco Bloemen2018-04-215-0/+563
|
* Remove nested .gitignore files since `yarn publish` gets confused by them ↵Fabio Berger2018-03-271-1/+0
| | | | and ignores their contents on the top-level scope
* Add sol-cover implementationLeonid Logvinov2018-03-121-1/+0
|
* Move tutorials to adhere to current dir structureLeonid Logvinov2018-03-023-0/+0
|
* Improve the commentsLeonid Logvinov2018-03-021-0/+4
|
* Improve the commentsLeonid Logvinov2018-03-021-1/+4
|
* Add comments to Arbitrage contractLeonid Logvinov2018-03-021-21/+28
|
* Don't pass tokenGet and tokenGive because we can get them from 0x orderLeonid Logvinov2018-03-021-11/+9
|
* Pretty-print ED contractsLeonid Logvinov2018-03-022-167/+167
|
* Make externalLeonid Logvinov2018-03-021-1/+1
|
* Change type to uint256Leonid Logvinov2018-03-021-1/+1
|
* Make setAllowances externalLeonid Logvinov2018-03-021-1/+1
|
* Put all ED contracts in one folderLeonid Logvinov2018-03-022-1/+1
|
* Move tutorials contracts to src folderLeonid Logvinov2018-03-023-0/+281
|
* Move BaseContract to web3WrapperLeonid Logvinov2018-02-282-78/+1
|
* Use the same templates as 0x.jsLeonid Logvinov2018-02-281-8/+43
|
* Apply prettier after generating contractsLeonid Logvinov2018-02-281-2/+2
|
* Delete artifacts directoryAmir Bandeali2018-02-2111-4287/+0
|
* Run prettierAmir Bandeali2018-02-1611-20/+553
|
* Fix checks, add contract list to compile script in package.jsonAmir Bandeali2018-02-1621-1810/+30
|
* Special-case ZRXToken snake case conversionLeonid Logvinov2018-02-071-1/+1
|
* Add base_contract.tsLeonid Logvinov2018-02-071-0/+35
|
* Remove generated filesLeonid Logvinov2018-02-075-2208/+0
|
* .gitignore gemerated filesLeonid Logvinov2018-02-071-0/+8
|
* Add CLI option for networkId, add abi-gen to contracts packageAmir Bandeali2018-02-0747-0/+7742
|
* Update contract versions, fix testsAmir Bandeali2018-02-035-5/+5
|
* Rename directoriesAmir Bandeali2018-02-0321-0/+2959