aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/utils
Commit message (Expand)AuthorAgeFilesLines
* 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-0713-41/+150
|\|
| * 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
|/
* Update Exchange statuses, revert instead of emmitting event on fill/cancel fa...Amir Bandeali2018-06-052-16/+7
* 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
| * Add ethereum-types to extraFileIncludesLeonid Logvinov2018-06-011-2/+9
| * Introduce ethereum-types packageLeonid Logvinov2018-06-018-14/+11
| * Merge pull request #640 from 0xProject/await-transaction-successAlex Browne2018-05-311-4/+10
| |\
| | * Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapperAlex Browne2018-05-311-4/+6
| | * Add awaitTransactionSuccess where neededAlex Browne2018-05-311-2/+6
* | | Rename Ecrecover to EthSignFabio Berger2018-06-013-6/+3
* | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-019-58/+73
|\| |
| * | Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMITAmir Bandeali2018-05-311-1/+1
| * | Make AssetProxyId last byte of assetDataAmir Bandeali2018-05-311-8/+8
| * | Add signer to txHash, allow approveValidator to be used with executeTransactionAmir Bandeali2018-05-311-5/+4
| * | Use last byte of signature as signature typeAmir Bandeali2018-05-311-2/+2
| * | Remove TxOrigin signature type, modify whitelist to use Validator signature typeAmir Bandeali2018-05-311-0/+1
| * | Update Whitelist contract with comments, also require maker to be whitelistedAmir Bandeali2018-05-311-0/+2
| * | Add example whitelist contract and minimum testsAmir Bandeali2018-05-311-0/+1
| * | Add TxOrigin signature type and rearrange order of typesAmir Bandeali2018-05-311-3/+5
| * | Change logDecoder back into class, remove awaitTransactionMined from multiSig...Amir Bandeali2018-05-313-50/+62
| |/
* | Introduce OrderWithoutExchangeAddress type since this is what get's sent to t...Fabio Berger2018-05-313-26/+22
* | Initial refactor of order-utils. Move many utils from contracts into this pac...Fabio Berger2018-05-3010-316/+25
|/
* Remove contracts -> @0xproject/order-utils dependencyLeonid Logvinov2018-05-261-0/+1
* Fix imports in order_utilsLeonid Logvinov2018-05-251-1/+1
* Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-257-62/+76
|\
| * Use web3-wrapper instead of 0x.js, update logDecoderAmir Bandeali2018-05-255-42/+41
| * Cleanup testsAmir Bandeali2018-05-251-1/+1
| * Add old MultiSig to previous contracts, cleanup file structureAmir Bandeali2018-05-251-5/+5
| * Address feedback, rename contract to AssetProxyOwnerAmir Bandeali2018-05-253-8/+5
| * Update multisig tests and utilsAmir Bandeali2018-05-251-25/+43
* | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hashFabio Berger2018-05-256-38/+17
|\ \
| * | Fix linter issuesLeonid Logvinov2018-05-251-1/+1
| * | Migrate migrations to v2Leonid Logvinov2018-05-256-39/+18
| |/
* | Use domain separator for exchange addressJacob Evans2018-05-251-4/+19
* | Update order hash to match latest eip712Jacob Evans2018-05-251-19/+26
|/
* Check transaction receipt status codes where applicableAlex Browne2018-05-241-1/+1
* Move contract utilsLeonid Logvinov2018-05-242-0/+377
* Merge branch 'v2-prototype' into feature/truffle-sol-covLeonid Logvinov2018-05-246-23/+26
|\
| * Fix ExchangeWrapperFabio Berger2018-05-231-3/+5
| * Fix importsFabio Berger2018-05-231-1/+1
| * Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-237-18/+31
| |\
| * | Remove 0x.js dep from contractsFabio Berger2018-05-236-23/+24
* | | Fix a bug in CALL-like opcode handlingLeonid Logvinov2018-05-231-1/+2
* | | Remove web3Factory.create and remove dev-tools dependency on sol-covLeonid Logvinov2018-05-231-3/+9
| |/ |/|
* | Merge pull request #601 from 0xProject/contracts-test-fixesAlex Browne2018-05-231-0/+1
|\ \
| * | Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-221-0/+1
| |/
* | Add CancelOrder and MatchOrder typesRemco Bloemen2018-05-222-3/+15
* | Add missing return typesRemco Bloemen2018-05-224-14/+14
|/
* orderFilledAmount -> orderTakerAssetFilledAmountGreg Hysen2018-05-191-1/+1
* Cleaned up interface for decoding proxy data. Added a general decoder, which ...Greg Hysen2018-05-192-5/+53
* Removed redundant log decode callGreg Hysen2018-05-191-2/+0
* The OrderInfo struct is now returned by the getOrderInfo functionGreg Hysen2018-05-192-5/+9
* Style changes to atomic order matchingGreg Hysen2018-05-191-6/+8
* Added require reasons to MixinMatchOrders and cleaned up some comments.Greg Hysen2018-05-191-20/+15
* Atomic Order Matching - TestsGreg Hysen2018-05-194-6/+147
* Merge pull request #583 from 0xProject/bug/contracts/erc721-encoded-padJacob Evans2018-05-181-1/+2
|\
| * Pad to 32 if asset ids are smallJacob Evans2018-05-101-1/+2
* | Merge branch 'development' into v2-prototypeFabio Berger2018-05-164-8/+8
* | Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-168-76/+98
|/
* Make LibBytes methods internal, add TestLibBytesAmir Bandeali2018-05-051-1/+1
* Make all lib functions internal, add contracts for testingAmir Bandeali2018-04-272-31/+2
* Add tests and commentsAmir Bandeali2018-04-271-2/+0
* Update tests and utilsAmir Bandeali2018-04-276-1/+65
* 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-242-3/+21
|/
* 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-231-1/+1
* Add missing async suffixAmir Bandeali2018-04-221-1/+1
* Rename token => assetAmir Bandeali2018-04-224-57/+57
* Rename Token => IERC20TokenAmir Bandeali2018-04-221-2/+0
* Rename DummyToken => DummyERC20TokenAmir Bandeali2018-04-223-9/+6
* export proxyUtils instead of individual functionsAmir Bandeali2018-04-221-34/+32
* Added tests for (most functions in) LibBytes. The write methods are not curre...Greg Hysen2018-04-211-0/+1
* Miscellaneous style changes to the contracts package; specifically testsGreg Hysen2018-04-211-2/+2
* Removed ERC20 V1 Proxy + TokenTransferProxyGreg Hysen2018-04-213-13/+0
* Removed takerTokenAddress and makerTokenAddress from Order struct.Greg Hysen2018-04-212-8/+0
* toUnsigned -> toBuffer in assetProxyUtilsGreg Hysen2018-04-211-1/+1
* Minor changes to typescript testsGreg Hysen2018-04-212-4/+2
* Updated ERC20 v1 proxy names in testsGreg Hysen2018-04-212-3/+3
* 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
* Removed unused dependencyGreg Hysen2018-04-211-1/+0
* snake case to camel caseGreg Hysen2018-04-211-25/+25
* makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetDataGreg Hysen2018-04-212-10/+10
* Renaming TransferProxy to ProxyGreg Hysen2018-04-211-3/+3
* Asset Proxy DispatcherGreg Hysen2018-04-215-2/+94
* Revert variable namingAmir Bandeali2018-04-214-55/+55
* Add marketBuyOrders, rename variables, and fx old testsAmir Bandeali2018-04-214-104/+121
* Fix build errorsAmir Bandeali2018-04-212-12/+5
* Separate filled/cancelled errorsAmir Bandeali2018-04-211-1/+2
* Remove partial cancelsAmir Bandeali2018-04-213-24/+6
* Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that orders...Greg Hysen2018-04-211-2/+2
* Renamed all instances of timestamp to salt. Clarified test case wording.Greg Hysen2018-04-212-3/+3
* Fixed spacingGreg Hysen2018-04-211-2/+2
* Implementation and tests in the protocol for cancelling all orders up to a sp...Greg Hysen2018-04-212-0/+16
* Add private keys for testrpc mnemonicAmir Bandeali2018-04-211-20/+14
* Address feedback and lintAmir Bandeali2018-04-217-121/+36
* Add tests for fillOrderNoThrow based functionsAmir Bandeali2018-04-211-0/+42
* Fix package.jsonAmir Bandeali2018-04-211-5/+5
* Add fillOrderNoThrow to exchange wrapper and add testAmir Bandeali2018-04-211-0/+21
* 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-215-52/+95
* Modify utils to work with new signature formatAmir Bandeali2018-04-216-149/+189
* 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