aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #569 from 0xProject/feature/contracts/batchTransferAmir Bandeali2018-05-036-180/+446
|\ \ \
| * | | Add MixinAssetProxy to reuse redundant codeAmir Bandeali2018-05-034-98/+117
| * | | Add tests for batchTransferFromAmir Bandeali2018-05-021-151/+296
| * | | Add batchTransferFrom to asset proxiesAmir Bandeali2018-05-023-9/+111
|/ / /
* | | Merge pull request #563 from 0xProject/feature/contracts/proxyIdsAmir Bandeali2018-05-017-9/+78
|\ \ \
| * | | Remove outdated commentAmir Bandeali2018-05-012-4/+2
| * | | Add hard coded proxyId into each AssetProxyAmir Bandeali2018-05-016-5/+76
|/ / /
* | | Merge pull request #560 from 0xProject/refactor/contracts/structureAmir Bandeali2018-05-0129-323/+1099
|\ \ \
| * | | Move TokenRegistry to 'previous' directoryAmir Bandeali2018-04-272-2/+2
| * | | Make all lib functions internal, add contracts for testingAmir Bandeali2018-04-2719-271/+448
| * | | Add LibFillResultsAmir Bandeali2018-04-2711-78/+107
| * | | Add ERC721 contracts from zeppelin-solidityAmir Bandeali2018-04-276-4/+574
|/ / /
* | | Merge pull request #498 from 0xProject/feature/contracts/takerAbstractionAmir Bandeali2018-04-2712-48/+489
|\ \ \
| * | | Add tests and commentsAmir Bandeali2018-04-275-31/+50
| * | | Add testsAmir Bandeali2018-04-271-4/+38
| * | | Update tests and utilsAmir Bandeali2018-04-277-1/+226
| * | | Implement sender abstractionAmir Bandeali2018-04-276-47/+210
|/ / /
* | | Remove remenants of MaliciousToken contractFabio Berger2018-04-263-3/+2
* | | Fix prettierFabio Berger2018-04-251-3/+9
* | | Fix merge conflict issuesFabio Berger2018-04-242-2/+0
* | | Fix @types/react version to avoid accidental minor version bumps with breakin...Fabio Berger2018-04-245-13/+7
* | | Merge pull request #549 from 0xProject/feature/contracts/combineAssetProxyDis...Fabio Berger2018-04-2418-253/+186
|\ \ \
| * | | Fix CI failures caused by Webkit css properties not being recognized by React...Fabio Berger2018-04-241-7/+12
| * | | Revert "Fix CI test failure"Fabio Berger2018-04-241-10/+7
| * | | Fix CI test failureFabio Berger2018-04-241-7/+10
| * | | merge v2-prototypeFabio Berger2018-04-248-285/+309
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #548 from 0xProject/refactor/contracts/test-cleanupFabio Berger2018-04-2414-803/+971
|\ \ \ \
| * | | | Rename variables, create private validation methods in token wrappersAmir Bandeali2018-04-248-286/+308
| | * | | Fix testsAmir Bandeali2018-04-2410-181/+116
| | * | | 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-248-673/+587
| * | | Add ERC721 wrapperAmir Bandeali2018-04-242-20/+161
| * | | Add ERC20WrapperAmir Bandeali2018-04-243-32/+127
|/ / /
* | | Merge pull request #547 from 0xProject/refactor/contracts/cleanupAmir Bandeali2018-04-2436-1202/+1028
|\ \ \
| * | | Rename proxyUtils => assetProxyUtilsAmir Bandeali2018-04-236-57/+57
| * | | Rename missed variablesAmir Bandeali2018-04-237-274/+274
| * | | Reorder event argsAmir Bandeali2018-04-221-10/+10
| * | | Add missing async suffixAmir Bandeali2018-04-222-12/+12
| * | | Rename token => assetAmir Bandeali2018-04-2215-656/+656
| * | | Rename Token => IERC20TokenAmir Bandeali2018-04-228-156/+48
| * | | Rename DummyToken => DummyERC20TokenAmir Bandeali2018-04-2214-108/+61
| * | | export proxyUtils instead of individual functionsAmir Bandeali2018-04-226-85/+83
| * | | Fix names and visibilities, use address type over contract type for function ...Amir Bandeali2018-04-225-22/+21
| * | | Remove unused constructor argumentsAmir Bandeali2018-04-225-34/+18
|/ / /
* | | Add presigned signature typeAmir Bandeali2018-04-211-1/+29
* | | Fix zeppelin imports, run prettierAmir Bandeali2018-04-216-265/+275
* | | Added tests for (most functions in) LibBytes. The write methods are not curre...Greg Hysen2018-04-213-2/+241
* | | Added description for the DummyERC721Token constructorGreg Hysen2018-04-211-0/+6
* | | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less c...Greg Hysen2018-04-216-29/+33
* | | 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 exi...Greg Hysen2018-04-213-132/+5
* | | 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-219-24/+40
* | | Ran prettierGreg Hysen2018-04-214-58/+15
* | | renaming after tokenTransferProxy was removedGreg Hysen2018-04-214-127/+127
* | | Commented out 0x.js tests until migration package is ready.Greg Hysen2018-04-211-1/+2
* | | Removed ERC20 V1 Proxy + TokenTransferProxyGreg Hysen2018-04-2117-631/+82
* | | Updated commenting. Noted that transferFrom succeeds or throws on all transfe...Greg Hysen2018-04-214-7/+7
* | | switched to constants in default order params.Greg Hysen2018-04-212-4/+4
* | | Reverted change that allowed ERC721 transfer proxy to be called with amount 0...Greg Hysen2018-04-212-14/+10
* | | Removed takerTokenAddress and makerTokenAddress from Order struct.Greg Hysen2018-04-2110-239/+237
* | | Added clarity to not-authorized test case in dispatcherGreg Hysen2018-04-211-3/+4
* | | toUnsigned -> toBuffer in assetProxyUtilsGreg Hysen2018-04-211-1/+1
* | | Unrolled the loop that copies the Order struct in FillOrderNoThrow. Saves 900...Greg Hysen2018-04-211-5/+17
* | | address -> IAssetProxy where possible for clarityGreg Hysen2018-04-212-13/+13
* | | Reverted to calling read/write uint256Greg Hysen2018-04-212-2/+28
* | | More testing of common functionality across proxiesGreg Hysen2018-04-211-19/+58
* | | Updates to proxy tests.Greg Hysen2018-04-211-13/+13
* | | More authorized -> owner in test commentsGreg Hysen2018-04-211-3/+3
* | | Removed unnecessary deployments in testGreg Hysen2018-04-211-17/+1
* | | Moved ERC721 FillOrderNoThrow tests into wrapperGreg Hysen2018-04-212-45/+60
* | | Style improvements to the Asset Proxy testsGreg Hysen2018-04-212-134/+140
* | | Replaced instances of `accounts[0]` with `owner` in contracts test casesGreg Hysen2018-04-215-23/+26
* | | Minor changes to typescript testsGreg Hysen2018-04-213-8/+6
* | | 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-215-10/+10
* | | Ran prettier/linter on new contract testsGreg Hysen2018-04-213-4/+0
* | | Added comments around deploying contracts to helper/wrapper testsGreg Hysen2018-04-212-65/+34
* | | TS styles in core contract testsGreg Hysen2018-04-211-91/+38
* | | Added more comments to proxy testsGreg Hysen2018-04-211-52/+25
* | | Cleaned up TS in dispatcher testsGreg Hysen2018-04-211-44/+36
* | | Proxy Metadata -> DataGreg Hysen2018-04-212-9/+9
* | | Cleaning up some wordingGreg Hysen2018-04-215-28/+26
* | | Removed some unused ERC721 tokensGreg Hysen2018-04-211-62/+13
* | | Minor style improvements to asset proxy utilsGreg Hysen2018-04-216-72/+65
* | | 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-217-46/+46
* | | nilAddress to ZeroEx.NULL_ADDRESSGreg Hysen2018-04-215-27/+22
* | | IAssetProxyDispatcher to IAssetProxy in MixinSettlement layer + allowing 0-co...Greg Hysen2018-04-213-7/+8
* | | Removed Log prefix from eventsGreg Hysen2018-04-212-5/+5
* | | Removed unnecessary assetProxyManagerAddressGreg Hysen2018-04-215-29/+17
* | | removed unnecessary importGreg Hysen2018-04-211-2/+0
* | | setAssetProxy to addAssetProxyGreg Hysen2018-04-216-23/+23
* | | Renamed TransferProxy to ProxyGreg Hysen2018-04-215-13/+14
* | | Renaming TransferProxy to ProxyGreg Hysen2018-04-2110-56/+56
* | | ERC20 V1 proxy compilingGreg Hysen2018-04-211-3/+3
* | | Changed order of write parameters in LibBytes. Now ordered by most generalize...Greg Hysen2018-04-214-10/+10
* | | Asset Proxy DispatcherGreg Hysen2018-04-2130-164/+2473
* | | Fix type issueFabio Berger2018-04-211-2/+2
* | | Fix mergeFabio Berger2018-04-211-2/+2
* | | 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-212-3/+50
* | | Revert variable namingAmir Bandeali2018-04-2113-444/+454
* | | Update Solidity syntax and commentsAmir Bandeali2018-04-215-70/+67
* | | Return all amounts traded and fees paidAmir Bandeali2018-04-217-106/+115
* | | Add tests for marketBuyOrdersAmir Bandeali2018-04-212-4/+174
* | | Add marketBuyOrders, rename variables, and fx old testsAmir Bandeali2018-04-2111-645/+681
* | | Fix build errorsAmir Bandeali2018-04-215-29/+40
* | | Separate filled/cancelled errorsAmir Bandeali2018-04-214-6/+8
* | | Remove partial cancelsAmir Bandeali2018-04-218-141/+35
* | | updated test name to reflect smart contractsGreg Hysen2018-04-211-1/+1
* | | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that orders...Greg Hysen2018-04-215-35/+40
* | | Renamed all instances of timestamp to salt. Clarified test case wording.Greg Hysen2018-04-213-18/+18
* | | Fixed spacingGreg Hysen2018-04-214-56/+56
* | | Implementation and tests in the protocol for cancelling all orders up to a sp...Greg Hysen2018-04-217-16/+134
* | | Fix build errorsAmir Bandeali2018-04-211-149/+190
* | | Update copyright headersAmir Bandeali2018-04-2130-24/+150
* | | Add private keys for testrpc mnemonicAmir Bandeali2018-04-215-70/+20
* | | Address feedback and lintAmir Bandeali2018-04-2119-176/+92
* | | Add tests for fillOrderNoThrow based functionsAmir Bandeali2018-04-213-130/+344
* | | Fix fillOrderNoThrowAmir Bandeali2018-04-211-29/+15
* | | Add logging to testrpc scriptAmir Bandeali2018-04-211-0/+1
* | | Fix package.jsonAmir Bandeali2018-04-213-23/+27
* | | Bump Solidity version to 0.4.21Amir Bandeali2018-04-2120-30/+29
* | | Add fillOrderNoThrow to exchange wrapper and add testAmir Bandeali2018-04-212-6/+69
* | | Update formattingAmir Bandeali2018-04-214-34/+40
* | | Update fillOrderNoThrowAmir Bandeali2018-04-211-111/+103
* | | Update order utilsAmir Bandeali2018-04-211-5/+5
* | | Modify tests to work with new utilsAmir Bandeali2018-04-214-584/+632
* | | Add script for starting testrpc with preconfigured private keysAmir Bandeali2018-04-213-0/+72
* | | 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
* | | Fix log decodingAmir Bandeali2018-04-211-13/+13
* | | 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
* | | Add logDecoder, remove outdated testsAmir Bandeali2018-04-211-13/+14
* | | Merge developmentAmir Bandeali2018-04-211-105/+0
* | | Run prettierAmir Bandeali2018-04-211-1/+1
* | | Fix utils to work with new ABIAmir Bandeali2018-04-211-0/+105
* | | Add fillOrderNoThrow and wrapper functionsAmir Bandeali2018-04-211-1/+1
* | | Fix compile errorsAmir Bandeali2018-04-216-22/+22
* | | 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-212-21/+48
* | | Add logDecoder, remove outdated testsAmir Bandeali2018-04-215-144/+158
* | | Move utils dir into srcAmir Bandeali2018-04-2122-59/+54
* | | Merge developmentAmir Bandeali2018-04-215-123/+15
* | | Run prettierAmir Bandeali2018-04-214-26/+9
* | | Get tests to buildAmir Bandeali2018-04-212-173/+150
* | | Fix utils to work with new ABIAmir Bandeali2018-04-215-68/+148
* | | 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
|/ /
* | Merge pull request #545 from 0xProject/feature/deployer/solidity-0.4.23Amir Bandeali2018-04-216-6/+16
|\ \
| * | Fix getABIEncodedTransactionData in contract templatesAmir Bandeali2018-04-211-1/+1
| * | Add support for solidity 0.4.23Amir Bandeali2018-04-215-5/+15
|/ /
* | Merge pull request #543 from 0xProject/feature/website/integrate-relayer-infoBrandon Millman2018-04-214-103/+125
|\ \
| * | Add specific render path for error and loadingBrandon Millman2018-04-211-5/+7
| * | Integrate relayer index with website backendBrandon Millman2018-04-204-103/+123
* | | Merge pull request #540 from 0xProject/feature/abi-gen/tuple-return-typesJacob Evans2018-04-2015-23/+90
|\ \ \
| * | | Remove ethers-contracts typesJacob Evans2018-04-203-30/+2
| * | | Update CHANGELOGsJacob Evans2018-04-196-15/+31
| * | | Interface for EventDescription renamed topicsJacob Evans2018-04-192-2/+2
| * | | Use ethers in abi_decoder utilsJacob Evans2018-04-192-4/+4
| * | | Add ethers to web3-wrapperJacob Evans2018-04-191-0/+1
| * | | Update 0x.js package json for ethersJacob Evans2018-04-191-1/+1
| * | | Update ethers in metacoin projectJacob Evans2018-04-191-1/+1
| * | | Support Tuples from function returnsJacob Evans2018-04-197-15/+93
| | |/ | |/|
* | | Add ImToken to landing pageFabio Berger2018-04-193-7/+7
* | | Merge pull request #526 from 0xProject/fix/expiration-watcherFabio Berger2018-04-197-11/+68
|\ \ \ | |_|/ |/| |
| * | Merge branch 'development' into fix/expiration-watcherFabio Berger2018-04-1912-75/+148
| |\|
| * | Remove hack above migrations packageFabio Berger2018-04-191-3/+0
| * | Fix expiration watcher comparatorLeonid Logvinov2018-04-187-12/+72
* | | Merge pull request #539 from 0xProject/feature/website/backend-clientBrandon Millman2018-04-197-52/+123
|\ \ \
| * | | Implement backendClient object to unify calls to the portal apiBrandon Millman2018-04-197-52/+123
* | | | Merge pull request #534 from 0xProject/feature/website/integrate-pricesBrandon Millman2018-04-192-39/+80
|\| | | | |_|/ |/| |
| * | Add price information to walletBrandon Millman2018-04-182-39/+80
* | | Publishcontracts@2.1.25@0xproject/website@0.0.28@0xproject/testnet-faucets@1.0.26@0xproject/sra-report@0.0.11Leonid Logvinov2018-04-195-10/+10
* | | Updated CHANGELOGSLeonid Logvinov2018-04-194-1/+19
* | | Move @0xproject/migrations to devDependenciesLeonid Logvinov2018-04-192-3/+9
* | | Publishcontracts@2.1.24@0xproject/website@0.0.27@0xproject/testnet-faucets@1.0.25@0xproject/sra-report@0.0.10@0xproject/migrations@0.0.3Leonid Logvinov2018-04-196-10/+10
* | | Updated CHANGELOGSLeonid Logvinov2018-04-196-60/+107
* | | Make @0xproject/migrations publicLeonid Logvinov2018-04-192-2/+4
| |/ |/|
* | Publishcontracts@2.1.23@0xproject/website@0.0.26@0xproject/testnet-faucets@1.0.24@0xproject/sra-report@0.0.9@0xproject/sol-resolver@0.0.2@0xproject/react-docs-example@0.0.8@0xproject/monorepo-scripts@0.1.18@0xproject/migrations@0.0.2@0xproject/metacoin@0.0.4@0xproject/dev-utils@0.3.6@0xproject/base-contract@0.2.1Fabio Berger2018-04-1826-167/+168
* | Print out stderrFabio Berger2018-04-181-0/+4
* | Updated CHANGELOGSFabio Berger2018-04-1839-149/+366
* | Merge pull request #535 from 0xProject/fix/commentRenderingFabio Berger2018-04-188-30/+75
|\ \
| * | Bold property namesFabio Berger2018-04-181-2/+5
| * | Update PR templateFabio Berger2018-04-181-2/+1
| * | Improve rendering of type definition commentsFabio Berger2018-04-182-1/+43
| * | Fix commentsFabio Berger2018-04-185-27/+28
* | | Merge pull request #531 from 0xProject/feature/deployer/solidity-0.4.22Jacob Evans2018-04-187-7/+33
|\ \ \ | |_|/ |/| |
| * | Update test fixturesJacob Evans2018-04-182-5/+11
| * | Remove prettier change on package.jsonJacob Evans2018-04-182-15/+10
| * | Update changelog with PRJacob Evans2018-04-181-1/+2
| * | Update deployer and contracts repo to use solidity 0.4.22Jacob Evans2018-04-185-12/+36
* | | Merge pull request #532 from 0xProject/bug/0x.js/fix-formatting-and-lintingJacob Evans2018-04-187-12/+26
|\ \ \
| * | | Fix linter and prettierJacob Evans2018-04-187-12/+26
|/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 23:57:24 +0800