aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
Commit message (Expand)AuthorAgeFilesLines
* Removed receiverData from ERC721 Proxy Id generationGreg Hysen2018-07-183-6/+4
* Removed receiverData and `onReceive` callback from ERC721 proxy.Greg Hysen2018-07-181-73/+21
* Reorder checks in getOrderInfoAmir Bandeali2018-07-181-7/+9
* Add getOrdersInfo functionAmir Bandeali2018-07-182-0/+24
* Remove extra ERC20ProxyId from Forwarder constructorJacob Evans2018-07-111-1/+0
* Add Migrations for ForwarderJacob Evans2018-07-111-2/+2
* Add revert reasons and optimization to safeMathAmir Bandeali2018-07-111-3/+15
* Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytesAmir Bandeali2018-07-113-10/+43
* Move functions out of Forwarder.solAmir Bandeali2018-07-0812-42/+35
* Add interfaces and mixinsAmir Bandeali2018-07-0816-61/+573
* Combine mixinsAmir Bandeali2018-07-086-284/+218
* Use interfaces instead of full contractsAmir Bandeali2018-07-084-7/+39
* Remove TODOs that won't be addressedAmir Bandeali2018-07-074-10/+3
* Remove AbiV2 where unusedAmir Bandeali2018-07-0723-38/+27
* Only reset currentContextAddress if it was previously updatedAmir Bandeali2018-07-071-8/+11
* Change uint => uint256Amir Bandeali2018-07-071-8/+7
* Apply new linter rulesAmir Bandeali2018-07-0773-298/+350
* Merge pull request #522 from 0xProject/feature/contracts/forwarderJacob Evans2018-07-0611-1/+1102
|\
| * Forwarding contract (squashed commits)Jacob Evans2018-07-0611-1/+1102
* | Contracts 2.0.0 were linted with solhintAlex Shafranovich2018-07-0660-1/+78
|/
* Update file structureAmir Bandeali2018-06-30107-3375/+1
* Make registerAssetProxy append onlyAmir Bandeali2018-06-306-60/+25
* Change getTransactionReceipt to awaitTransactionMinedAmir Bandeali2018-06-301-1/+1
* Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codesAlex Browne2018-06-301-6/+35
* Fix deployment to gethAmir Bandeali2018-06-301-1/+1
* Fix testsAmir Bandeali2018-06-303-7/+10
* Remove transferFrom, implement in fallback functionAmir Bandeali2018-06-306-290/+267
* Merge pull request #774 from 0xProject/style/contracts/abiEncodeAsmCommentsAmir Bandeali2018-06-302-0/+22
|\
| * Updated hashing comments as-per PRGreg Hysen2018-06-291-9/+4
| * Comments for ASM hashingGreg Hysen2018-06-262-0/+27
* | Remove unused constantsFabio Berger2018-06-281-2/+0
* | Reduce the userAddresses to the individual addresses actually used by tests, ...Fabio Berger2018-06-281-1/+2
* | Add await time constantFabio Berger2018-06-281-0/+2
* | Add missing awaitTransactionSuccessAsync callsFabio Berger2018-06-281-6/+10
* | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2712-517/+312
|\ \
| * | Make dispatchTransferFrom revert with reason from AssetProxy on failureAmir Bandeali2018-06-271-5/+4
| * | Remove redundant files, hard code function selector in dispatchTransferFrom, ...Amir Bandeali2018-06-2713-701/+198
| * | Updated offset of receiverData length to reflect new assetData encoding.Greg Hysen2018-06-271-2/+2
| * | ERC20 Custom storage layoutRemco Bloemen2018-06-272-3/+5
| * | Golf the authorization checkRemco Bloemen2018-06-272-122/+132
| * | ERC20 manual memory layoutRemco Bloemen2018-06-271-11/+6
| * | ERC20 inline returnRemco Bloemen2018-06-271-6/+11
| * | ERC721 inline returnRemco Bloemen2018-06-271-8/+9
| * | Golf ERC721 transferFromRemco Bloemen2018-06-272-3/+166
| * | Inline ERC20 tranferFrom selector constantRemco Bloemen2018-06-271-4/+3
| * | Optimize ERC20 transferFromRemco Bloemen2018-06-271-2/+126
* | | Fix type issueFabio Berger2018-06-271-2/+2
* | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testingFabio Berger2018-06-271-1/+5
|\| |
| * | Expect RevertReason be passed in, not stringFabio Berger2018-06-261-1/+5
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2623-202/+370
| |\ \
* | | | Update AbstractAssetWrapperFabio Berger2018-06-261-1/+1
* | | | Fix merge issuesFabio Berger2018-06-264-16/+17
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2623-202/+370
|\ \ \ \ | | |/ / | |/| |
| * | | Don't use variables for revert reasonsAmir Bandeali2018-06-2613-84/+82
| * | | Add comments to dispatchTransferFromAmir Bandeali2018-06-261-30/+56
| * | | Document IAssetDataRemco Bloemen2018-06-261-0/+3
| * | | Compute bytes4 proxyid constantsRemco Bloemen2018-06-262-2/+2
| * | | Return inplace bytes in LibBytes.readBytesWithLengthRemco Bloemen2018-06-261-9/+7
| * | | Add Greg's documentation to MixinErc721TransferRemco Bloemen2018-06-261-33/+44
| * | | Add Greg's documentation to MixinErc20TransferRemco Bloemen2018-06-261-13/+35
| * | | Gas golf the transfer success logicRemco Bloemen2018-06-261-11/+10
| * | | Optimize like in PR #767Remco Bloemen2018-06-263-34/+157
| * | | Fix testsAmir Bandeali2018-06-261-16/+0
| * | | Fix ERC721Proxy TokenIdRemco Bloemen2018-06-261-1/+1
| * | | WIPRemco Bloemen2018-06-262-2/+2
| * | | ABI encoded asset dataRemco Bloemen2018-06-269-29/+51
| * | | Remove proxyId argument from dispatchTransferFromRemco Bloemen2018-06-266-34/+16
| | |/ | |/|
* | | Prettier fixesFabio Berger2018-06-261-4/+1
* | | Fix tslint issuesFabio Berger2018-06-264-18/+3
* | | Check revert reasons in declarative and combinatorial testsFabio Berger2018-06-251-7/+8
* | | merge check-revert-reasonsFabio Berger2018-06-251-44/+0
|\ \ \ | | |/ | |/|
| * | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-251-44/+0
* | | merge check-revert-reasonsFabio Berger2018-06-255-21/+63
|\| |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2519-340/+424
| |\|
| * | Rename ContractLibErrors to RevertReasonsFabio Berger2018-06-231-1/+1
| * | Remove revert reason 'Exchange' prefixFabio Berger2018-06-231-2/+2
| * | Move constants over to ContractLibError enum and update all testsFabio Berger2018-06-232-15/+10
| * | Standardize ERC20 error strings given conventionFabio Berger2018-06-231-3/+2
| * | Fix test now that contract reverts with messageFabio Berger2018-06-221-0/+1
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-223-27/+48
| |\ \
| * | | Change Whitelist error messages to conform to rest and added revert reason ch...Fabio Berger2018-06-222-5/+7
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2226-352/+454
| |\ \ \
| * | | | Check revert reasons in Authorizable testsFabio Berger2018-06-211-0/+1
| * | | | Change revert reason in ownable to be similar to all other revert reasonsFabio Berger2018-06-211-1/+1
| * | | | Update core tests to actually check revert messageFabio Berger2018-06-212-0/+44
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2538-703/+910
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix typos in commentsRemco Bloemen2018-06-231-2/+2
| * | | | Add modifier and tests for removeAuthorizedAddressAtIndexAmir Bandeali2018-06-232-2/+10
| * | | | Update and add testsAmir Bandeali2018-06-232-3/+5
| * | | | Change removeAuthorizedAddress => removeAuthorizedAddressAtIndexAmir Bandeali2018-06-232-13/+22
| * | | | Move isFunctionRemoveAuthorizedAddress to testRemco Bloemen2018-06-233-14/+50
| * | | | 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-233-11/+18
| * | | | Fix LibBytes.equalsRemco Bloemen2018-06-231-21/+4
| * | | | Add trailing garbage testcase for LibBytes.equalsRemco Bloemen2018-06-231-0/+11
| * | | | Rename bytes.equalsRemco Bloemen2018-06-232-2/+37
| * | | | 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-233-7/+7
| * | | | Using LibBytes for bytesRemco Bloemen2018-06-236-26/+38
| * | | | Make LibBytes a libraryRemco Bloemen2018-06-236-35/+30
| * | | | Merge LibMem and LibBytesRemco Bloemen2018-06-236-206/+150
| * | | | 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
| * | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ac...Amir Bandeali2018-06-2214-68/+94
| * | | Add senderAddress to Fill and Cancel logs, add comments to events and typesAmir Bandeali2018-06-224-44/+45
| |/ /
| * | 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
| * | Renamed constants in test wallet/validatorGreg Hysen2018-06-212-11/+11
| * | Few more minor #nit wording changesGreg Hysen2018-06-212-5/+5
| * | Fixed two mislabelled revert reasons + Signature Validator revert tests worki...Greg Hysen2018-06-212-2/+7
| * | Minor style tweaksGreg Hysen2018-06-213-8/+8
| * | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported t...Greg Hysen2018-06-216-11/+141
| |/
* | Add support for approveAll in assetWrapper and fillOrderScenariosFabio Berger2018-06-213-4/+41
* | 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-202-38/+45
* | 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-2015-82/+301
|\|
| * Merge pull request #637 from 0xProject/bug/contracts/eip712-191-prefixJacob Evans2018-06-206-42/+159
| |\
| | * 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-1846-311/+1056
| | |\
| | * | 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-067-170/+44
| | * | Add missing EIP191 prefix for EIP712Jacob Evans2018-06-059-48/+272
| * | | Update after rebaseJacob Evans2018-06-201-7/+1
| * | | Rename makerEpoch => orderEpochAmir Bandeali2018-06-205-26/+29
| * | | Make cancelOrdersUpTo compatible with sender abstractionAmir Bandeali2018-06-205-7/+110
| * | | 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-191-6/+6
* | | | | 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-196-129/+206
|\| | | |
| * | | | 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-198-30/+104
|\| | | |
| * | | | 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-151-5/+6
| * | | | Fix a bug in revert_trace.tsAlex Browne2018-06-151-23/+23
| * | | | Introduce subprovider for printing revert stack tracesAlex Browne2018-06-152-22/+50
| |/ / /
* | | | Add ability to tweak the relevant balances/allowances for the maker and taker...Fabio Berger2018-06-152-35/+323
* | | | - Refactor assetWrapper to contain more of the normalizing logic instead of e...Fabio Berger2018-06-156-72/+311
* | | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert generateOr...Fabio Berger2018-06-143-43/+48
* | | | 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
* | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ...Fabio Berger2018-06-143-29/+141
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1319-205/+200
|\| | |
| * | | Rename popByte and popAddressAmir Bandeali2018-06-134-12/+12
| * | | Unpop byte rather than making deep copyAmir Bandeali2018-06-133-90/+91
| * | | 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-131-19/+9
| * | | Add tests for deepCopyBytes and missing write methods from LibBytesAmir Bandeali2018-06-132-0/+16
| * | | Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-1316-149/+132
| * | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts t...Alex Browne2018-06-121-1/+4
* | | | Implement initial set of orderFill combinatorial testsFabio Berger2018-06-1310-187/+553
* | | | 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-1230-141/+724
|\| | |
| * | | Implement SolidityProfiler & adapt sol-cov to work with GethLeonid Logvinov2018-06-093-1/+51
| |/ /
| * | Updated LibBytes error messagesGreg Hysen2018-06-082-6/+6
| * | Camelcase in memCopyGreg Hysen2018-06-083-22/+22
| * | Style updates to contractsGreg Hysen2018-06-083-16/+16
| * | Fixed a styling throughout contracts. Moved closing parenthesis for long list...Greg Hysen2018-06-088-31/+62
| * | Fixed merge error when rebasing wrt length variable in asset data decodersGreg Hysen2018-06-082-4/+4
| * | Style updates to ERC721 onReceiverGreg Hysen2018-06-083-8/+6
| * | Fixed after rebaseGreg Hysen2018-06-083-5/+5
| * | Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-082-16/+9
| * | Style audit for proxies + libmem + libbytesGreg Hysen2018-06-086-23/+40
| * | Style audit proxiesGreg Hysen2018-06-083-20/+64
| * | Call safeTransferFrom only when there is receiver data presentGreg Hysen2018-06-081-1/+6
| * | 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-081-11/+17
| * | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. T...Greg Hysen2018-06-086-88/+57
| * | Converged on naming scheme for asset data: renamed all instances of assetMeta...Greg Hysen2018-06-0813-67/+67
| * | proxyData -> assetDataGreg Hysen2018-06-081-11/+11
| * | Implement memcpy using masking and end-aligned wordsRemco Bloemen2018-06-081-59/+85
| * | Convert Solidity tests to vectorsRemco Bloemen2018-06-081-203/+0
| * | Generate tests from vectorsRemco Bloemen2018-06-081-3/+24
| * | Fixed up wording in memcpyGreg Hysen2018-06-081-3/+3
| * | Tons of tests around nested byte arrays and ERC721 receiverGreg Hysen2018-06-082-10/+32
| * | Test for onReceived erc721 callbackGreg Hysen2018-06-082-0/+3
| * | LibAssetProxyDecoder testsGreg Hysen2018-06-081-1/+1
| * | Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-083-0/+53
| * | Tests for libMemGreg Hysen2018-06-083-15/+11
| * | LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721ReceiverGreg Hysen2018-06-087-27/+579
* | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-085-8/+8
|\| |
| * | Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changesFabio Berger2018-06-081-0/+1
| |\ \
| * \ \ merge v2-prototypeFabio Berger2018-06-0714-42/+151
| |\ \ \
| * | | | move generated contract wrappers from `contract_wrappers/generated/` to `gene...Fabio Berger2018-06-066-13/+13
| | |_|/ | |/| |
* | | | Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria...Fabio Berger2018-06-081-0/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix tslint failureFabio Berger2018-06-081-0/+1
| | |/ | |/|
* | | POC: Generates an order from spec, get's the amount fillableFabio Berger2018-06-086-32/+196
* | | merge v2-prototypeFabio Berger2018-06-0714-42/+151
|\| |
| * | 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-075-8/+144
| |\| |
| | * | Apply various fixes based on PR feedbackAlex Browne2018-06-071-1/+1
| | * | Use an enum for ProviderType in contracts/src/utils/web3_wrapperAlex Browne2018-06-071-4/+21
| | * | Add Async suffix to relevant assertionsAlex Browne2018-06-071-9/+9
| | * | Fix linter errorsAlex Browne2018-06-072-2/+36
| | * | Update more things to work with both Geth and GanacheAlex Browne2018-06-071-22/+14
| | * | Small fixes and cleanupAlex Browne2018-06-072-6/+2
| | * | Add additional gas to calls to fillOrderNoThrowAlex Browne2018-06-071-6/+6
| | * | Throw in web3-wrapper when rawCallResult is '0x'Alex Browne2018-06-072-0/+13
| | * | Fix some more test cases, especially those that call increaseTimeAlex Browne2018-06-071-0/+26
| | * | Add support for TEST_PROVIDER env varAlex Browne2018-06-071-3/+4
| | * | Update more tests to pass on GethAlex Browne2018-06-072-0/+14
| | * | Get LibBytes tests working on both Ganache and GethAlex Browne2018-06-072-1/+6
| | * | Add ability to quickly switch between Geth and Ganache by changing a constAlex Browne2018-06-071-3/+16
| | * | Replace constant.REVERT test assertions with expectRevertOrAlwaysFailingTrans...Alex Browne2018-06-071-2/+2
| | * | Update code after rebaseAlex Browne2018-06-073-2/+27
| | |/
| * | Get build and tests to passfragosti2018-06-071-1/+2
| * | Linter now passesfragosti2018-06-0610-34/+6
| |/
* / Implement initial generateOrder function that given the scenario values for a...Fabio Berger2018-06-072-0/+244
|/
* rename GT to GREATER_THANJacob Evans2018-06-053-3/+3
* Update Exchange statuses, revert instead of emmitting event on fill/cancel fa...Amir Bandeali2018-06-0524-630/+420
* 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
* | Fix tslint issuesFabio Berger2018-06-021-2/+1
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-029-15/+25
|\|
| * Fix linter errorsLeonid Logvinov2018-06-014-4/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 04:22:13 +0800