aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
Commit message (Expand)AuthorAgeFilesLines
...
* | | merge check-revert-reasonsFabio Berger2018-06-2511-66/+14
|\ \ \ | | |/ | |/|
| * | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-2511-66/+14
| * | Add missing importFabio Berger2018-06-251-1/+4
* | | Add missing importFabio Berger2018-06-251-1/+4
* | | merge check-revert-reasonsFabio Berger2018-06-2515-129/+235
|\| |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2526-708/+965
| |\|
| * | Fix tslintFabio Berger2018-06-234-4/+4
| * | Fix prettierFabio Berger2018-06-235-15/+13
| * | Rename ContractLibErrors to RevertReasonsFabio Berger2018-06-2311-96/+96
| * | Remove revert reason 'Exchange' prefixFabio Berger2018-06-232-3/+3
| * | Move constants over to ContractLibError enum and update all testsFabio Berger2018-06-235-44/+42
| * | Standardize ERC20 error strings given conventionFabio Berger2018-06-231-3/+2
| * | Fix test now that contract reverts with messageFabio Berger2018-06-222-5/+4
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-223-27/+48
| |\ \
| * | | Add revert reason checks to wrapper testsFabio Berger2018-06-221-10/+19
| * | | Fix testsFabio Berger2018-06-221-2/+2
| * | | Change Whitelist error messages to conform to rest and added revert reason ch...Fabio Berger2018-06-223-21/+31
| * | | Add revert reason checks to match_orders testsFabio Berger2018-06-221-7/+18
| * | | Fix testsFabio Berger2018-06-221-2/+2
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2239-382/+894
| |\ \ \
| * | | | Check revert reason in dispatcher testsFabio Berger2018-06-222-5/+13
| * | | | remove unused importFabio Berger2018-06-221-1/+0
| * | | | Test revert reasons in proxy testsFabio Berger2018-06-211-11/+23
| * | | | remove onlyFabio Berger2018-06-211-1/+1
| * | | | Check revert reasons in Authorizable testsFabio Berger2018-06-212-6/+15
| * | | | Change revert reason in ownable to be similar to all other revert reasonsFabio Berger2018-06-211-1/+1
| * | | | remove .onlyFabio Berger2018-06-211-1/+1
| * | | | Update core tests to actually check revert messageFabio Berger2018-06-213-34/+97
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2554-1100/+1890
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix typos in commentsRemco Bloemen2018-06-231-2/+2
| * | | | Add modifier and tests for removeAuthorizedAddressAtIndexAmir Bandeali2018-06-233-2/+79
| * | | | Update and add testsAmir Bandeali2018-06-234-173/+274
| * | | | Change removeAuthorizedAddress => removeAuthorizedAddressAtIndexAmir Bandeali2018-06-232-13/+22
| * | | | Move isFunctionRemoveAuthorizedAddress to testRemco Bloemen2018-06-236-22/+70
| * | | | Fix usage of `popLastByte`Remco Bloemen2018-06-231-2/+2
| * | | | Fix LibBytes is a libraryRemco Bloemen2018-06-236-15/+12
| * | | | Remove `areBytesEqual`Remco Bloemen2018-06-231-35/+0
| * | | | Fix usage of `contentAddress()`Remco Bloemen2018-06-231-2/+2
| * | | | Clean low bits in bytes4Remco Bloemen2018-06-231-0/+3
| * | | | Clean high bits in addressRemco Bloemen2018-06-231-0/+4
| * | | | Refactor LibBytes.readBytes4 for consistencyRemco Bloemen2018-06-234-14/+25
| * | | | Fix LibBytes.equalsRemco Bloemen2018-06-231-21/+4
| * | | | Add trailing garbage testcase for LibBytes.equalsRemco Bloemen2018-06-232-0/+21
| * | | | Rename bytes.equalsRemco Bloemen2018-06-233-15/+50
| * | | | Add slice and sliceDestructiveRemco Bloemen2018-06-231-0/+46
| * | | | Rename bytes.rawAddress and add bytes.contentAddressRemco Bloemen2018-06-232-8/+25
| * | | | Rename read/writeBytesWithLengthRemco Bloemen2018-06-234-36/+36
| * | | | Using LibBytes for bytesRemco Bloemen2018-06-236-26/+38
| * | | | Make LibBytes a libraryRemco Bloemen2018-06-236-35/+30
| * | | | Merge LibMem and LibBytesRemco Bloemen2018-06-2311-399/+322
| * | | | Use provided mem in refernce memcpyRemco Bloemen2018-06-231-2/+2
| * | | | Merge pull request #749 from 0xProject/feature/contracts/transactionHashAsmAmir Bandeali2018-06-231-8/+18
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Apply mask to address to zero-out unused bytes.Greg Hysen2018-06-231-1/+1
| | * | | Converted `hashZeroExTransaction` to assembly. Saves 1k gasGreg Hysen2018-06-221-8/+18
| * | | | Merge pull request #748 from 0xProject/fix/contracts/nullAssetProxyFabio Berger2018-06-223-27/+48
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Check that assetProxy exists before attempting transferAmir Bandeali2018-06-223-27/+48
| * | | | Merge pull request #752 from 0xProject/make-promises-safe-preloaderFabio Berger2018-06-2211-11/+1
| |\ \ \ \
| | * | | | Use make-promises-safe as a preloader instead of manually importingAlex Browne2018-06-2211-11/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #751 from 0xProject/feature/contracts/compilerRunsAmir Bandeali2018-06-221-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Updated compiler runs to be 1,000,000Greg Hysen2018-06-221-1/+1
| * | | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ac...Amir Bandeali2018-06-2215-70/+144
| * | | | Add senderAddress to Fill and Cancel logs, add comments to events and typesAmir Bandeali2018-06-225-44/+47
| | |/ / | |/| |
| * | | Remove unreachable PreSigned checkAustin Roberts2018-06-221-4/+0
| |/ /
| * | Set settleOrder and settleMatchedOrders to privateGreg Hysen2018-06-214-25/+2
| * | Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `se...Greg Hysen2018-06-218-238/+205
| * | LinterGreg Hysen2018-06-211-2/+1
| * | Renamed constants in test wallet/validatorGreg Hysen2018-06-212-11/+11
| * | Few more minor #nit wording changesGreg Hysen2018-06-212-5/+5
| * | Changed wording of two tests #nitGreg Hysen2018-06-211-2/+2
| * | Minor improvements to MixinSignatureValidator testsGreg Hysen2018-06-211-14/+8
| * | Remove .onlyGreg Hysen2018-06-211-1/+1
| * | Fixed two mislabelled revert reasons + Signature Validator revert tests worki...Greg Hysen2018-06-213-8/+17
| * | Minor style tweaksGreg Hysen2018-06-213-8/+8
| * | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported t...Greg Hysen2018-06-219-27/+530
| |/
* | Add support for approveAll in assetWrapper and fillOrderScenariosFabio Berger2018-06-214-5/+80
* | Improve verbose loggingFabio Berger2018-06-211-2/+5
* | Fix merge variable name issueFabio Berger2018-06-201-1/+1
* | Add support for setting allowance to unlimitedFabio Berger2018-06-202-7/+35
* | Add noop conditionals for clarityFabio Berger2018-06-201-0/+10
* | Rename for clarityFabio Berger2018-06-201-8/+8
* | Split balance and allowance amount types in prep of adding the "unlimited" al...Fabio Berger2018-06-203-51/+59
* | Remove unneeded explicit type defFabio Berger2018-06-201-1/+1
* | Add TS 2.7 numeric separators to improve readabilityFabio Berger2018-06-201-6/+6
* | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2021-103/+444
|\|
| * Merge pull request #637 from 0xProject/bug/contracts/eip712-191-prefixJacob Evans2018-06-207-45/+166
| |\
| | * Fix closing parens in liborderJacob Evans2018-06-201-16/+15
| | * Assembler orderHash functionRemco Bloemen2018-06-191-18/+22
| | * Optimize and remove redundant encodePackedJacob Evans2018-06-194-13/+23
| | * Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefixJacob Evans2018-06-1870-929/+2461
| | |\
| | * | Rebase and update feedbackJacob Evans2018-06-184-81/+85
| | * | Basic EIP712 encoderJacob Evans2018-06-081-10/+11
| | * | Update Order utils to use eip712Jacob Evans2018-06-069-178/+50
| | * | Add missing EIP191 prefix for EIP712Jacob Evans2018-06-0510-50/+279
| * | | Update after rebaseJacob Evans2018-06-201-7/+1
| * | | ERC721Proxy Always call safeTransferFromJacob Evans2018-06-201-2/+6
| * | | Rename makerEpoch => orderEpochAmir Bandeali2018-06-207-46/+49
| * | | Make cancelOrdersUpTo compatible with sender abstractionAmir Bandeali2018-06-208-8/+225
| * | | Merge pull request #683 from 0xProject/fix/contracts/memcpyRemco Bloemen2018-06-191-10/+12
| |\ \ \
| | * | | Simplified handling of source < 32 edge caseRemco Bloemen2018-06-111-10/+12
* | | | | Add ability for verbose loggingFabio Berger2018-06-201-2/+10
* | | | | Fix typoFabio Berger2018-06-191-2/+2
* | | | | Rename NewOrderFactory to OrderFactoryFromScenario for clarityFabio Berger2018-06-192-5/+5
* | | | | Remove hack in ERC20WrapperFabio Berger2018-06-197-12/+30
* | | | | Cleanup coreCombinatorialUtilsFabio Berger2018-06-191-220/+226
* | | | | Comments and cleanupFabio Berger2018-06-191-20/+8
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-197-141/+218
|\| | | |
| * | | | Merge pull request #728 from 0xProject/fix/post-dev-publishFabio Berger2018-06-191-12/+12
| |\ \ \ \
| | * | | | Fix additional versions and update yarn.lockFabio Berger2018-06-191-1/+1
| | * | | | Update all package versions to match latest published to NPMFabio Berger2018-06-191-11/+11
| * | | | | Merge pull request #659 from 0xProject/feature/contracts/split-proxy-internal...Jacob Evans2018-06-196-129/+206
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Rebase with latest removing PROXY_ID from transferJacob Evans2018-06-185-95/+111
| | * | | | Split transfer impl and AssetProxyMixinJacob Evans2018-06-184-95/+156
| | | |_|/ | | |/| |
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-199-30/+105
|\| | | |
| * | | | Make isValidSignature publicAmir Bandeali2018-06-193-15/+15
| * | | | Make batchFill methods return FIllResults structAmir Bandeali2018-06-192-10/+28
| |/ / /
| * | | Merge pull request #700 from 0xProject/fix/contracts/tokenbugsRemco Bloemen2018-06-161-1/+29
| |\ \ \
| | * | | Handle tokens that do not return boolRemco Bloemen2018-06-141-1/+29
| * | | | Change wording of error message when you try to use more than one subproviderAlex Browne2018-06-151-1/+1
| * | | | Fix linter errors and remove coverage.jsonAlex Browne2018-06-151-2/+1
| * | | | Remove unused variables and other small fixesAlex Browne2018-06-152-6/+7
| * | | | Fix a bug in revert_trace.tsAlex Browne2018-06-151-23/+23
| * | | | Introduce subprovider for printing revert stack tracesAlex Browne2018-06-153-22/+51
| |/ / /
* | | | Add ability to tweak the relevant balances/allowances for the maker and taker...Fabio Berger2018-06-154-78/+380
* | | | - Refactor assetWrapper to contain more of the normalizing logic instead of e...Fabio Berger2018-06-158-74/+314
* | | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert generateOr...Fabio Berger2018-06-145-60/+59
* | | | Use a defaultFillScenario in fillOrder testsFabio Berger2018-06-141-36/+39
* | | | Fix incorrect string values in enumFabio Berger2018-06-141-2/+2
* | | | Fix calculation of expFilledTakerAmount and expected values in events emittedFabio Berger2018-06-141-4/+7
* | | | Replace initial set of legacy manually written fillOrder tests with declarati...Fabio Berger2018-06-142-434/+186
* | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ...Fabio Berger2018-06-144-35/+153
* | | | Move orderFill combinatorialTests to exchange folderFabio Berger2018-06-131-4/+4
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1327-345/+532
|\| | |
| * | | Rename popByte and popAddressAmir Bandeali2018-06-135-18/+18
| * | | Hard code test addresses/bytes32 instead of generating pseudorandom onesAmir Bandeali2018-06-131-19/+16
| * | | Unpop byte rather than making deep copyAmir Bandeali2018-06-134-90/+95
| * | | Pass gas in to marketBuyOrdersNoThrowAmir Bandeali2018-06-131-1/+1
| * | | Looks up the memory location of makerAssetData/takerAssetDataGreg Hysen2018-06-131-0/+2
| * | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATAAmir Bandeali2018-06-135-23/+13
| * | | Add tests for deepCopyBytes and missing write methods from LibBytesAmir Bandeali2018-06-133-70/+201
| * | | Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-1320-209/+268
| * | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts t...Alex Browne2018-06-121-1/+4
* | | | Implement initial set of orderFill combinatorial testsFabio Berger2018-06-1311-427/+575
* | | | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper supe...Fabio Berger2018-06-134-9/+95
* | | | Variable rename for clarityFabio Berger2018-06-131-2/+2
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1246-387/+1541
|\| | |
| * | | Fix no-unused-variable tslint rule to include parameters and fix issuesFabio Berger2018-06-122-2/+2
| * | | Implement SolidityProfiler & adapt sol-cov to work with GethLeonid Logvinov2018-06-096-1/+58
| |/ /
| * | Linter changes to contractsGreg Hysen2018-06-094-21/+6
| * | Updated LibBytes error messagesGreg Hysen2018-06-083-28/+36
| * | Cleanup after last rebaseGreg Hysen2018-06-084-6/+5
| * | Updated tests to use new revert handlerGreg Hysen2018-06-082-13/+13
| * | Minor fixes after rebaseGreg Hysen2018-06-081-14/+6
| * | Camelcase in memCopyGreg Hysen2018-06-084-23/+23
| * | Style updates to contractsGreg Hysen2018-06-086-26/+20
| * | Union types for generalized decodeAssetDataGreg Hysen2018-06-081-2/+2
| * | Fixed a styling throughout contracts. Moved closing parenthesis for long list...Greg Hysen2018-06-088-31/+62
| * | Removed setting makerAssetData/takerAssetData from tests where values are sam...Greg Hysen2018-06-081-34/+0
| * | Fixed merge error when rebasing wrt length variable in asset data decodersGreg Hysen2018-06-082-4/+4
| * | Style updates to ERC721 onReceiverGreg Hysen2018-06-086-12/+21
| * | Fixed after rebaseGreg Hysen2018-06-083-5/+5
| * | Fixes after rebasingGreg Hysen2018-06-083-8/+6
| * | Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-087-50/+30
| * | Style audit for proxies + libmem + libbytesGreg Hysen2018-06-088-50/+72
| * | Style audit proxiesGreg Hysen2018-06-083-20/+64
| * | Call safeTransferFrom only when there is receiver data presentGreg Hysen2018-06-083-13/+20
| * | Fixed formatting in memory layoutGreg Hysen2018-06-081-6/+6
| * | Resolved edge case in Memcpy where where send would eventually turn "negative...Greg Hysen2018-06-082-144/+154
| * | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. T...Greg Hysen2018-06-089-95/+64
| * | Converged on naming scheme for asset data: renamed all instances of assetMeta...Greg Hysen2018-06-0822-290/+257
| * | proxyData -> assetDataGreg Hysen2018-06-082-12/+12
| * | Implement memcpy using masking and end-aligned wordsRemco Bloemen2018-06-081-59/+85
| * | Add tests for word loop iterationRemco Bloemen2018-06-081-2/+6
| * | Add test for zero-size overlapRemco Bloemen2018-06-081-1/+3
| * | Add test casesRemco Bloemen2018-06-081-17/+133
| * | Cleanup test scriptRemco Bloemen2018-06-081-16/+1
| * | Convert Solidity tests to vectorsRemco Bloemen2018-06-082-232/+6
| * | Generate tests from vectorsRemco Bloemen2018-06-082-5/+64
| * | Tests for writing bytes to nested bytesGreg Hysen2018-06-081-9/+91
| * | Fixed up wording in memcpyGreg Hysen2018-06-081-3/+3
| * | Tons of tests around nested byte arrays and ERC721 receiverGreg Hysen2018-06-085-28/+197
| * | Test for onReceived erc721 callbackGreg Hysen2018-06-086-5/+126
| * | LibAssetProxyDecoder testsGreg Hysen2018-06-082-27/+31
| * | Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-087-2/+128
| * | Tests for libMemGreg Hysen2018-06-085-16/+80
| * | LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721ReceiverGreg Hysen2018-06-088-27/+581
| * | Add missing awaitTransactionSuccessAsync callsAlex Browne2018-06-082-23/+53
* | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-0823-55/+55
|\| |
| * | Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changesFabio Berger2018-06-081-0/+1
| |\ \
| * \ \ Merge pull request #670 from 0xProject/fix/generated-nestingFabio Berger2018-06-0823-56/+56
| |\ \ \
| | * | | Fix tslint issuesFabio Berger2018-06-082-2/+2
| | * | | Fix missing pathsFabio Berger2018-06-081-4/+4
| | * | | Fixed pathFabio Berger2018-06-073-11/+11
| | * | | merge v2-prototypeFabio Berger2018-06-0732-335/+465
| | |\ \ \
| | * | | | move generated contract wrappers from `contract_wrappers/generated/` to `gene...Fabio Berger2018-06-0624-60/+60
| * | | | | Merge pull request #676 from 0xProject/feature/mocha-source-mapsAlex Browne2018-06-081-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Use source-map-support package to include correct line numbers in mochaAlex Browne2018-06-071-1/+1
* | | | | | Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria...Fabio Berger2018-06-083-2/+3
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fix tslint failureFabio Berger2018-06-083-2/+3
| |/ / / /
* | | | | POC: Generates an order from spec, get's the amount fillableFabio Berger2018-06-087-32/+462
* | | | | merge v2-prototypeFabio Berger2018-06-0732-321/+451
|\| | | |
| * | | | Merge pull request #673 from mohoff/patch-1Fabio Berger2018-06-071-1/+1
| |\ \ \ \
| | * | | | typomohoff2018-06-071-1/+1
| | |/ / /
| * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-0719-214/+416
| |\| | |
| | * | | Apply prettierAlex Browne2018-06-072-3/+10
| | * | | Update contracts tests after rebaseAlex Browne2018-06-072-14/+14
| | * | | Apply various fixes based on PR feedbackAlex Browne2018-06-073-12/+55
| | * | | Use an enum for ProviderType in contracts/src/utils/web3_wrapperAlex Browne2018-06-071-4/+21
| | * | | Update contracts package READMEAlex Browne2018-06-071-0/+9
| | * | | Add Async suffix to relevant assertionsAlex Browne2018-06-0714-112/+112
| | * | | Fix linter errorsAlex Browne2018-06-073-8/+38
| | * | | Update more things to work with both Geth and GanacheAlex Browne2018-06-073-38/+42
| | * | | Small fixes and cleanupAlex Browne2018-06-073-8/+4
| | * | | Add additional gas to calls to fillOrderNoThrowAlex Browne2018-06-073-152/+55
| | * | | Throw in web3-wrapper when rawCallResult is '0x'Alex Browne2018-06-073-6/+17
| | * | | Fix some more test cases, especially those that call increaseTimeAlex Browne2018-06-074-55/+84
| | * | | Add support for TEST_PROVIDER env varAlex Browne2018-06-071-3/+4
| | * | | Update more tests to pass on GethAlex Browne2018-06-074-21/+29
| | * | | Get LibBytes tests working on both Ganache and GethAlex Browne2018-06-073-25/+34
| | * | | Add ability to quickly switch between Geth and Ganache by changing a constAlex Browne2018-06-071-3/+16
| | * | | Update exchange/transactions tests for Geth error messagesAlex Browne2018-06-071-4/+4
| | * | | Update some tests after rebaseAlex Browne2018-06-073-20/+29
| | * | | Add more transactions to Geth on init. Skip tests that are failing.Alex Browne2018-06-076-20/+135
| | * | | Replace constant.REVERT test assertions with expectRevertOrAlwaysFailingTrans...Alex Browne2018-06-0712-170/+143
| | * | | Update code after rebaseAlex Browne2018-06-073-3/+8
| | * | | Use Geth for contract testsAlex Browne2018-06-071-0/+20
| * | | | Get build and tests to passfragosti2018-06-071-1/+2
| * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-071-2/+1
| |\| | |
| | * | | Stop running prettier on generated filesLeonid Logvinov2018-06-071-2/+1
| | |/ /
| * | | Use CLI for excludefragosti2018-06-072-4/+1
| * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-071-3/+3
| |\| |
| * | | merge v2-prototypeFabio Berger2018-06-061-1/+2
| |\ \ \
| * | | | Linter now passesfragosti2018-06-0627-104/+35
| | |_|/ | |/| |
* | | | Implement initial generateOrder function that given the scenario values for a...Fabio Berger2018-06-072-0/+244
| |_|/ |/| |
* | | Merge v2-prototypeFabio Berger2018-06-061-1/+1
|\ \ \ | | |/ | |/|
| * | Replace `-` with `_` in yarn script name so that we are consistent across yar...Fabio Berger2018-06-051-1/+1
* | | - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ...Fabio Berger2018-06-051-3/+3
|/ /
* | Merge pull request #658 from 0xProject/dont-automatically-rebuild-for-testsAlex Browne2018-06-051-1/+2
|\ \ | |/ |/|
| * Don't automatically rebuild when running yarn testAlex Browne2018-06-051-1/+2
* | rename GT to GREATER_THANJacob Evans2018-06-053-3/+3
* | Rebase from v2-prototypeJacob Evans2018-06-052-38/+2
* | Update Exchange statuses, revert instead of emmitting event on fill/cancel fa...Amir Bandeali2018-06-0530-702/+491
|/
* Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-023-55/+52
|\
| * Set contract expiration time to a constant 10 minutesAlex Browne2018-06-021-1/+2
| * Remove unused promises arrayAlex Browne2018-06-022-6/+0
| * Make erc20_wrapper and erc721_wrapper serialAlex Browne2018-06-022-48/+50
* | Improve comments and remove unused importsFabio Berger2018-06-021-1/+1
* | Fix tslint issuesFabio Berger2018-06-023-5/+3
* | Fix types versionFabio Berger2018-06-021-1/+1
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-0219-42/+91
|\|
| * Fix linter errorsLeonid Logvinov2018-06-016-6/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 00:47:53 +0800