aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
Commit message (Collapse)AuthorAgeFilesLines
* Publishethereum-types@1.0.6contracts@2.1.43@0xproject/website@0.0.47@0xproject/web3-wrapper@2.0.2@0xproject/utils@1.0.8@0xproject/typescript-typings@2.0.0@0xproject/types@1.0.1@0xproject/tslint-config@1.0.7@0xproject/testnet-faucets@1.0.44@0xproject/subproviders@2.0.2@0xproject/sra-spec@1.0.1@0xproject/sra-report@1.0.8@0xproject/sol-resolver@1.0.8@0xproject/sol-cov@2.1.2@0xproject/sol-compiler@1.1.2@0xproject/react-shared@1.0.9@0xproject/react-docs@1.0.8@0xproject/order-watcher@1.0.1@0xproject/order-utils@1.0.1@0xproject/monorepo-scripts@1.0.8@0xproject/migrations@1.0.7@0xproject/metacoin@0.0.18@0xproject/json-schemas@1.0.1@0xproject/forwarder-helper@1.0.1@0xproject/fill-scenarios@1.0.1@0xproject/dev-utils@1.0.7@0xproject/contract-wrappers@1.0.1@0xproject/connect@2.0.0@0xproject/base-contract@2.0.2@0xproject/assert@1.0.8@0xproject/abi-gen@1.0.80x.js@1.0.1Fabio Berger2018-09-051-22/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1 - @0xproject/abi-gen@1.0.8 - @0xproject/assert@1.0.8 - @0xproject/base-contract@2.0.2 - @0xproject/connect@2.0.0 - @0xproject/contract-wrappers@1.0.1 - contracts@2.1.43 - @0xproject/dev-utils@1.0.7 - ethereum-types@1.0.6 - @0xproject/fill-scenarios@1.0.1 - @0xproject/forwarder-helper@1.0.1 - @0xproject/json-schemas@1.0.1 - @0xproject/metacoin@0.0.18 - @0xproject/migrations@1.0.7 - @0xproject/monorepo-scripts@1.0.8 - @0xproject/order-utils@1.0.1 - @0xproject/order-watcher@1.0.1 - @0xproject/react-docs@1.0.8 - @0xproject/react-shared@1.0.9 - @0xproject/sol-compiler@1.1.2 - @0xproject/sol-cov@2.1.2 - @0xproject/sol-resolver@1.0.8 - @0xproject/sra-report@1.0.8 - @0xproject/sra-spec@1.0.1 - @0xproject/subproviders@2.0.2 - @0xproject/testnet-faucets@1.0.44 - @0xproject/tslint-config@1.0.7 - @0xproject/types@1.0.1 - @0xproject/typescript-typings@2.0.0 - @0xproject/utils@1.0.8 - @0xproject/web3-wrapper@2.0.2 - @0xproject/website@0.0.47
* Fix bug in contracts testsAlex Browne2018-09-051-1/+1
|
* More small chnages/bug fixesAlex Browne2018-09-051-2/+2
|
* Rename and update some artifact locationsAlex Browne2018-09-051-1/+1
|
* Remove TODOs that will not be addressedAmir Bandeali2018-09-043-3/+2
|
* Fix geth testsAmir Bandeali2018-09-042-6/+12
|
* Add test for external_call visibilityAmir Bandeali2018-09-041-0/+15
|
* Add MultiSigWalletWithTimeLock revert reasons to testsAmir Bandeali2018-09-042-15/+31
|
* Update MultiSigWalletWithTimeLock to 0.4.24Amir Bandeali2018-09-042-24/+24
|
* Add more tests for MultiSigWalletWithTimeLockAmir Bandeali2018-09-042-1/+152
|
* Add test for executeRemoveAuthorizedAddressAtIndex when called by non-ownerAmir Bandeali2018-09-041-4/+40
|
* Update to most recent multisigAmir Bandeali2018-09-043-71/+89
|
* Apply styling fixesAmir Bandeali2018-09-0442-67/+64
|
* Revert in Forwarder constructor if ERC20 proxy isn't registeredAmir Bandeali2018-09-042-9/+35
|
* Merge pull request #1047 from 0xProject/feature/re-add-no-unused-variablesFrancesco Agosti2018-08-312-5/+2
|\ | | | | Re-add no-unused-variable tslint rule
| * run prettierfragosti2018-08-311-3/+1
| |
| * Fix unused vars for react-shared and websitefragosti2018-08-312-2/+1
| |
* | Merge pull request #1046 from ↵Greg Hysen2018-08-311-0/+94
|\ \ | | | | | | | | | | | | 0xProject/fix/contracts/roundingFeeTestsMatchOrders Test cases for rounding fees in matchOrders
| * | Test cases for rounding fees in matchOrdersGreg Hysen2018-08-311-0/+94
| | |
* | | Merge pull request #1045 from 0xProject/feature/contracts/cancelOrderInternalAmir Bandeali2018-08-315-9/+31
|\ \ \ | | | | | | | | Add cancelOrderInternal, use within batchCancelOrders
| * | | Add cancelOrderInternal, use within batchCancelOrdersAmir Bandeali2018-08-315-9/+31
| | |/ | |/|
* | | Add tests for token that returns >32 bytesAmir Bandeali2018-08-315-4/+134
| | |
* | | Add more proxy testsAmir Bandeali2018-08-311-8/+176
| | |
* | | Update used addresses for authorizable testsAmir Bandeali2018-08-311-2/+2
| | |
* | | Add test for fillOrder and dispatchTransferFrom where maker == takerAmir Bandeali2018-08-312-1/+92
|/ /
* | Fix geth testsAmir Bandeali2018-08-306-47/+71
| |
* | Remove unused importsAmir Bandeali2018-08-303-5/+1
| |
* | Update AssetProxyOwner to 0.4.24Amir Bandeali2018-08-303-70/+21
| |
* | Merge pull request #1039 from 0xProject/fix/contracts/audit2FixesGreg Hysen2018-08-305-17/+115
|\| | | | | Fixes as-per Audit for LibBytes + ERC20 Proxy Comments
| * Typos in LibBytes testsGreg Hysen2018-08-301-6/+6
| |
| * Reverted syntax used by readBytes4 in AssetProxyOwner to be compatible with ↵Greg Hysen2018-08-301-5/+1
| | | | | | | | Solidity v0.4.10
| * More tests for LibBytesGreg Hysen2018-08-301-3/+16
| |
| * Updated comments for ERC20 proxy to clarify how we load the token address ↵Greg Hysen2018-08-302-9/+60
| | | | | | | | from calldata (3.18 from audit)
| * Updated readBytes4 to match spec + added unit tests. These are 3.5/3.6 from ↵Greg Hysen2018-08-303-4/+42
| | | | | | | | audit
* | feat: Add support for TypeScript project references (#991)Alex Browne2018-08-303-8/+5
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update all package.json and tsconfig.json * fix(contracts): Make test/utils/web3_wrapper.ts compatible with project refs * Fix webpack config for 0x.js * Fix linter errors by adding rootDir to tsconfig.json as needed * Add build:ts and watch:ts commands to package.json * Update sra-spec to work with project references * Update tsconfig.json with latest new/removed packages * Add TypeScript as devDependency at root * Add missing rootDir to forwarder-helper package * Use a separate tsconfig file for typedoc * Fix linter errors * Apply PR feedback (add comments) * Fix 0x.js tsconfig
* Making rounding consistent in calculateFillResultsAmir Bandeali2018-08-292-9/+12
|
* safeGetPartialAmount (#1035)Amir Bandeali2018-08-297-110/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added Test "Should transfer correct amounts when left order is fully filled and values pass isRoundingErrorCeil but fail isRoundingErrorFloor" * Added RoundingError exception to reference function for getPartialAmount * Added RoundingError exception to reference function for getPartialAmount * Added isRoundingErrorCeil to getPartialAmountCeil reference funtion * Computed new values for "Should give right maker a better buy price when correct price is not integral" that does not have a rounding error * Almost all tests for match orders are passing after adding isRoundingErrorCeil check * WIP commit: Added rounding error checks to getPartialAmount * WIP commit: Added rounding error checks to getPartialAmount * Use safe versions of getPartialAmount * Update Exchange internals tests * Run linter * Found new values for "Should transfer correct amounts when right order fill amount deviates from amount derived by `Exchange.fillOrder`" * Fixed merge conflicts * Run all tests * Cleaned up some comments on match Orders tests * Fix tests for geth
* fix(contracts): Catch cases where the actual error differs from the expected ↵Alex Browne2018-08-282-26/+109
| | | | | | | | | | error (#1032) * Catch cases where the actual error differs from the expected error * Add tests for testWithReferenceFuncAsync * Small style and comment fixes
* Add clarifying commentsAmir Bandeali2018-08-282-0/+2
|
* Remove redundant mstores from fillOrderNoThrowAmir Bandeali2018-08-281-8/+1
|
* fix(contracts): Use correct error message for division by zeroAlex Browne2018-08-281-3/+1
|
* Publishcontracts@2.1.42@0xproject/website@0.0.46@0xproject/web3-wrapper@2.0.1@0xproject/utils@1.0.7@0xproject/types@1.0.1-rc.6@0xproject/testnet-faucets@1.0.43@0xproject/subproviders@2.0.1@0xproject/sra-spec@1.0.1-rc.6@0xproject/sra-report@1.0.7@0xproject/sol-resolver@1.0.7@0xproject/sol-cov@2.1.1@0xproject/sol-compiler@1.1.1@0xproject/react-shared@1.0.8@0xproject/react-docs@1.0.7@0xproject/order-watcher@1.0.1-rc.5@0xproject/order-utils@1.0.1-rc.6@0xproject/monorepo-scripts@1.0.7@0xproject/migrations@1.0.6@0xproject/metacoin@0.0.17@0xproject/json-schemas@1.0.1-rc.6@0xproject/forwarder-helper@1.0.1-rc.2@0xproject/fill-scenarios@1.0.1-rc.5@0xproject/dev-utils@1.0.6@0xproject/contract-wrappers@1.0.1-rc.5@0xproject/connect@2.0.0-rc.2@0xproject/base-contract@2.0.1@0xproject/assert@1.0.7@0xproject/abi-gen@1.0.70x.js@1.0.1-rc.6Fabio Berger2018-08-271-19/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.6 - @0xproject/abi-gen@1.0.7 - @0xproject/assert@1.0.7 - @0xproject/base-contract@2.0.1 - @0xproject/connect@2.0.0-rc.2 - @0xproject/contract-wrappers@1.0.1-rc.5 - contracts@2.1.42 - @0xproject/dev-utils@1.0.6 - @0xproject/fill-scenarios@1.0.1-rc.5 - @0xproject/forwarder-helper@1.0.1-rc.2 - @0xproject/json-schemas@1.0.1-rc.6 - @0xproject/metacoin@0.0.17 - @0xproject/migrations@1.0.6 - @0xproject/monorepo-scripts@1.0.7 - @0xproject/order-utils@1.0.1-rc.6 - @0xproject/order-watcher@1.0.1-rc.5 - @0xproject/react-docs@1.0.7 - @0xproject/react-shared@1.0.8 - @0xproject/sol-compiler@1.1.1 - @0xproject/sol-cov@2.1.1 - @0xproject/sol-resolver@1.0.7 - @0xproject/sra-report@1.0.7 - @0xproject/sra-spec@1.0.1-rc.6 - @0xproject/subproviders@2.0.1 - @0xproject/testnet-faucets@1.0.43 - @0xproject/types@1.0.1-rc.6 - @0xproject/utils@1.0.7 - @0xproject/web3-wrapper@2.0.1 - @0xproject/website@0.0.46
* Merge pull request #986 from 0xProject/feature/contracts/assertionsAmir Bandeali2018-08-253-30/+113
|\ | | | | Add more assertions to assertValidFill
| * Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js ↵Remco Bloemen2018-08-2527-286/+1066
| |\ | | | | | | | | | into fix/contracts/robustMatching
| * | Revert maker not equal taker checkRemco Bloemen2018-08-251-6/+1
| | |
| * | Fix mixin apiRemco Bloemen2018-08-253-21/+36
| | |
| * | Split into assertFillable and assertValidFillRemco Bloemen2018-08-252-29/+43
| | |
| * | Disallow self fillingRemco Bloemen2018-08-251-1/+7
| | |
| * | Remove BUG_ from revert reasonsRemco Bloemen2018-08-251-3/+3
| | |
| * | Document accetable price checkRemco Bloemen2018-08-251-2/+16
| | |
| * | Fix taker overpay checkRemco Bloemen2018-08-251-1/+1
| | |
| * | Check fillable earlyRemco Bloemen2018-08-251-0/+6
| | |
| * | Update for new assertValidFill signatureRemco Bloemen2018-08-252-5/+8
| | |
| * | Add overfill and price assertion to assertValidFillRemco Bloemen2018-08-252-2/+32
| | |
* | | Added comments to order matchingGreg Hysen2018-08-251-1/+13
| | |
* | | Rephrased some of the math in MixinMatchOrders to improve readabilityGreg Hysen2018-08-251-3/+3
| | |
* | | Run all testsGreg Hysen2018-08-251-1/+1
| | |
* | | Give right maker better price when correct value is not integralGreg Hysen2018-08-251-10/+14
| | |
* | | Extract only `fill` event logsGreg Hysen2018-08-251-4/+5
| | |
* | | Added temporary @todo to MixinMatchOrdersGreg Hysen2018-08-251-4/+4
| | |
* | | Wording in MixinMatchOrdersGreg Hysen2018-08-251-2/+2
| | |
* | | Addressed linter errors in match order tessterGreg Hysen2018-08-251-9/+2
| | |
* | | Removed a redundant comment from matchOrdersGreg Hysen2018-08-251-5/+1
| | |
* | | Tests for matchOrders edge casesGreg Hysen2018-08-251-13/+71
| | |
* | | Swapped direction of `expect` values to match output in failure casesGreg Hysen2018-08-251-37/+26
| | |
* | | Renaming verify -> assert in order matchingGreg Hysen2018-08-252-53/+52
| | |
* | | Fixed a function commentGreg Hysen2018-08-251-1/+2
| | |
* | | Added function signature commentsGreg Hysen2018-08-253-239/+233
| | |
* | | Added `expect` messages for checking left/right order statesGreg Hysen2018-08-251-2/+6
| | |
* | | Ran prettier and linterGreg Hysen2018-08-253-224/+317
| | |
* | | Updated all existing match order tests to use new formatGreg Hysen2018-08-252-128/+301
| | |
* | | Passes comprehensive testGreg Hysen2018-08-251-191/+141
| | |
* | | Verify logsGreg Hysen2018-08-251-72/+44
| | |
* | | First balance test with intentional valuesGreg Hysen2018-08-252-59/+95
| | |
* | | Ironing out the new set of test cases for order matchubngGreg Hysen2018-08-252-11/+102
| | |
* | | Rounding for fees in match orders addressed, plus exampleGreg Hysen2018-08-252-9/+83
| | |
* | | All existing tests pass.Greg Hysen2018-08-252-21/+137
| | |
* | | Added fees to matchOrders (previously in calculateFillResultsGreg Hysen2018-08-251-0/+24
| | |
* | | Removed calculateFillResults from matchOrders workflow. Eliminates ↵Greg Hysen2018-08-251-38/+29
| |/ |/| | | | | compounded rounding errors.
* | Fix buildAmir Bandeali2018-08-251-4/+7
| |
* | Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow ↵Amir Bandeali2018-08-256-61/+11
| | | | | | | | variations
* | Add tests for matchOrdersAmir Bandeali2018-08-252-122/+53
| |
* | Add reentrancy tests for fillOrder and wrapper functionsAmir Bandeali2018-08-254-0/+239
| |
* | Update ReentrantERC20Token with new functions and check that revert is ↵Amir Bandeali2018-08-251-35/+75
| | | | | | | | occuring for correct reason
* | Add nonReentrant modifiers on functions that use getCurrentContextAddress ↵Amir Bandeali2018-08-254-15/+17
| | | | | | | | only, add lockMutex modifier on functions that make external calls
* | Split modifiers into check only and check, lock, unlockAmir Bandeali2018-08-251-0/+13
| |
* | Add ReentrantTokenAmir Bandeali2018-08-253-1/+175
| |
* | Add internal fill functions, add reentrancy guard to public functions that ↵Amir Bandeali2018-08-256-41/+148
| | | | | | | | make external calls
* | Add ReentrancyGuard contractAmir Bandeali2018-08-251-0/+44
| |
* | Remove redundant sload from getCurrentContextAddressAmir Bandeali2018-08-251-1/+2
| |
* | Merge pull request #1003 from 0xProject/feature/contracts/roundupAmir Bandeali2018-08-2513-101/+377
|\ \ | | | | | | [contracts] Add getPartialAmountCeil and isRoundingErrorCeil
| * | Fix linting errorsAmir Bandeali2018-08-251-2/+2
| | |
| * | Stylistic fixesRemco Bloemen2018-08-251-5/+20
| | |
| * | Append -Floor to getPartialAmount and isRoundingErrorRemco Bloemen2018-08-2513-45/+45
| | |
| * | Disambiguate the operator precedenceRemco Bloemen2018-08-251-2/+2
| | |
| * | Add testsRemco Bloemen2018-08-254-23/+145
| | |
| * | Add docsRemco Bloemen2018-08-251-2/+7
| | |
| * | Fix incorect modulusRemco Bloemen2018-08-251-4/+2
| | |
| * | Add DIVISION_BY_ZERO to getPartialAmount for consistencyRemco Bloemen2018-08-252-20/+18
| | |
| * | Remove .onlyRemco Bloemen2018-08-251-1/+1
| | |
| * | Improve getPartialAmountCeil docsRemco Bloemen2018-08-251-3/+3
| | |
| * | Add tests for getPartialAmountCeilRemco Bloemen2018-08-252-0/+57
| | |
| * | Add isRoundingErrorCeilRemco Bloemen2018-08-251-0/+29
| | |
| * | Add getPartialAmountCeilRemco Bloemen2018-08-251-3/+32
| | |
| * | Handle zero caseRemco Bloemen2018-08-251-3/+15
| | |
| * | Update testsRemco Bloemen2018-08-252-13/+17
| | |
| * | Fix isRoundingErrorRemco Bloemen2018-08-251-10/+17
| | |
* | | Skip self-transfersRemco Bloemen2018-08-251-1/+1
| |/ |/|
* | SignatureType.Trezor -> SignatureType.EthSign in Signature Validator testsGreg Hysen2018-08-251-1/+1
| |
* | Test case for Trezor Model T signatureGreg Hysen2018-08-251-0/+18
| |
* | Fixed trezor personal message in client+contracts; added a test using ↵Greg Hysen2018-08-251-0/+18
| | | | | | | | message signed by Trezor One (firmware v1.6.2)
* | Remove Trezor SignatureTypeAmir Bandeali2018-08-253-77/+1
| |
* | Remove SignatureType.CallerAmir Bandeali2018-08-254-57/+16
| |
* | Rethrow Wallet and Validator errorsAmir Bandeali2018-08-253-22/+42
| |
* | Rename TestStaticCall => TestStaticCallReceiverAmir Bandeali2018-08-256-15/+16
| |
* | Revert if undefined function called in AssetProxiesAmir Bandeali2018-08-253-1/+29
| |
* | Remove pragma experimental v0.5.0 and use staticcall is assemblyAmir Bandeali2018-08-256-15/+198
| |
* | Add pragma experimental v0.5.0 to SignatureValidator and add testsAmir Bandeali2018-08-257-2/+123
|/
* Publishethereum-types@1.0.5contracts@2.1.41@0xproject/website@0.0.45@0xproject/web3-wrapper@2.0.0@0xproject/utils@1.0.6@0xproject/typescript-typings@1.0.5@0xproject/types@1.0.1-rc.5@0xproject/tslint-config@1.0.6@0xproject/testnet-faucets@1.0.42@0xproject/subproviders@2.0.0@0xproject/sra-report@1.0.6@0xproject/sra-api@1.0.1-rc.5@0xproject/sol-resolver@1.0.6@0xproject/sol-cov@2.1.0@0xproject/sol-compiler@1.1.0@0xproject/react-shared@1.0.7@0xproject/react-docs@1.0.6@0xproject/order-watcher@1.0.1-rc.4@0xproject/order-utils@1.0.1-rc.4@0xproject/monorepo-scripts@1.0.6@0xproject/migrations@1.0.5@0xproject/metacoin@0.0.16@0xproject/json-schemas@1.0.1-rc.5@0xproject/forwarder-helper@1.0.1-rc.1@0xproject/fill-scenarios@1.0.1-rc.4@0xproject/dev-utils@1.0.5@0xproject/contract-wrappers@1.0.1-rc.4@0xproject/connect@2.0.0-rc.1@0xproject/base-contract@2.0.0@0xproject/assert@1.0.6@0xproject/abi-gen@1.0.60x.js@1.0.1-rc.4Fabio Berger2018-08-251-22/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.4 - @0xproject/abi-gen@1.0.6 - @0xproject/assert@1.0.6 - @0xproject/base-contract@2.0.0 - @0xproject/connect@2.0.0-rc.1 - @0xproject/contract-wrappers@1.0.1-rc.4 - contracts@2.1.41 - @0xproject/dev-utils@1.0.5 - ethereum-types@1.0.5 - @0xproject/fill-scenarios@1.0.1-rc.4 - @0xproject/forwarder-helper@1.0.1-rc.1 - @0xproject/json-schemas@1.0.1-rc.5 - @0xproject/metacoin@0.0.16 - @0xproject/migrations@1.0.5 - @0xproject/monorepo-scripts@1.0.6 - @0xproject/order-utils@1.0.1-rc.4 - @0xproject/order-watcher@1.0.1-rc.4 - @0xproject/react-docs@1.0.6 - @0xproject/react-shared@1.0.7 - @0xproject/sol-compiler@1.1.0 - @0xproject/sol-cov@2.1.0 - @0xproject/sol-resolver@1.0.6 - @0xproject/sra-api@1.0.1-rc.5 - @0xproject/sra-report@1.0.6 - @0xproject/subproviders@2.0.0 - @0xproject/testnet-faucets@1.0.42 - @0xproject/tslint-config@1.0.6 - @0xproject/types@1.0.1-rc.5 - @0xproject/typescript-typings@1.0.5 - @0xproject/utils@1.0.6 - @0xproject/web3-wrapper@2.0.0 - @0xproject/website@0.0.45
* Fix many linter errors that showed up upon upgrading tsutilFabio Berger2018-08-233-4/+4
|
* Merge development branchFabio Berger2018-08-2247-688/+2197
|\
| * Add getBalancesAndAllowancesAmir Bandeali2018-08-222-0/+69
| |
| * Add ZRX balances and allowances to TraderInfoAmir Bandeali2018-08-222-10/+122
| |
| * Add testsAmir Bandeali2018-08-225-1/+451
| |
| * Don't throw if ERC721 token isn't ownedAmir Bandeali2018-08-221-1/+51
| |
| * Add OrderValidator contractAmir Bandeali2018-08-2214-23/+163
| |
| * Remove redundant constructor argsAmir Bandeali2018-08-223-10/+8
| |
| * fix(sol-cov): Remove old files and update config.contractsDirAlex Browne2018-08-211-1/+1
| |
| * Fix typos, run prettier, and allow anyone to call on DummyERC721TokenAmir Bandeali2018-08-176-14/+14
| |
| * Fix Geth testsAmir Bandeali2018-08-171-9/+9
| |
| * Fix linting errorsAmir Bandeali2018-08-178-11/+10
| |
| * Fix tests that assumed logs were being filteredAmir Bandeali2018-08-174-4/+11
| |
| * Add tests for ERC721TokenAmir Bandeali2018-08-174-2/+281
| |
| * Add ERC721Receiver that returns incorrect valueAmir Bandeali2018-08-173-1/+68
| |
| * Increase max mintable amountAmir Bandeali2018-08-171-1/+1
| |
| * Fix DummyERC721ReceiverAmir Bandeali2018-08-171-32/+32
| |
| * Add tests for ERC20 token with no return valuesAmir Bandeali2018-08-176-5/+261
| |
| * Add constructor back to DummyERC721TokenAmir Bandeali2018-08-172-0/+14
| |
| * Restructure directoriesAmir Bandeali2018-08-176-52/+103
| |
| * Update checking for erc721 existenceAmir Bandeali2018-08-171-3/+2
| |
| * Update ERC20TokenAmir Bandeali2018-08-176-47/+113
| |
| * Optimize ERC721TokenAmir Bandeali2018-08-175-510/+462
| |
* | Move types from sol-compiler to types so they can be used in other places ↵Fabio Berger2018-08-223-3/+3
| | | | | | | | without requiring sol-compiler as a dep
* | Fix commentFabio Berger2018-08-171-1/+2
| |
* | Merge developmentFabio Berger2018-08-175-3/+45
|\|
| * Merge pull request #928 from 0xProject/dependabot/npm_and_yarn/copyfiles-2.0.0Fabio Berger2018-08-171-1/+1
| |\ | | | | | | Bump copyfiles from 1.2.0 to 2.0.0
| | * Bump copyfiles from 1.2.0 to 2.0.0dependabot[bot]2018-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | Bumps [copyfiles](https://github.com/calvinmetcalf/copyfiles) from 1.2.0 to 2.0.0. - [Release notes](https://github.com/calvinmetcalf/copyfiles/releases) - [Commits](https://github.com/calvinmetcalf/copyfiles/compare/v1.2.0...v2.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
| * | [Order-utils] Order is valid when maker amount is very smallJacob Evans2018-08-154-1/+43
| |/ | | | | | | | | | | | | Previously our min fillable calculation would throw a rounding error when encountering a valid order (with a small maker amount). This was inconsistent with the on-chain logic which allowed this order to be filled.
| * feat: Upgrade TypeScript to 3.0.1Alex Browne2018-08-151-1/+1
| |
* | Merge developmentFabio Berger2018-08-1522-255/+292
|\|
| * PublishAlex Browne2018-08-141-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.3 - @0xproject/abi-gen@1.0.5 - @0xproject/assert@1.0.5 - @0xproject/base-contract@2.0.0-rc.1 - @0xproject/connect@1.0.5 - @0xproject/contract-wrappers@1.0.1-rc.3 - contracts@2.1.40 - @0xproject/dev-utils@1.0.4 - ethereum-types@1.0.4 - @0xproject/fill-scenarios@1.0.1-rc.3 - @0xproject/json-schemas@1.0.1-rc.4 - @0xproject/metacoin@0.0.15 - @0xproject/migrations@1.0.4 - @0xproject/monorepo-scripts@1.0.5 - @0xproject/order-utils@1.0.1-rc.3 - @0xproject/order-watcher@1.0.1-rc.3 - @0xproject/react-docs@1.0.5 - @0xproject/react-docs-example@0.0.20 - @0xproject/react-shared@1.0.6 - @0xproject/sol-compiler@1.0.5 - @0xproject/sol-cov@2.0.0 - @0xproject/sol-resolver@1.0.5 - @0xproject/sra-api@1.0.1-rc.4 - @0xproject/sra-report@1.0.5 - @0xproject/subproviders@1.0.5 - @0xproject/testnet-faucets@1.0.41 - @0xproject/tslint-config@1.0.5 - @0xproject/types@1.0.1-rc.4 - @0xproject/typescript-typings@1.0.4 - @0xproject/utils@1.0.5 - @0xproject/web3-wrapper@1.2.0 - @0xproject/website@0.0.44
| * Merge pull request #914 from 0xProject/feature/0x.js/ec-signature-stringJacob Evans2018-08-141-6/+6
| |\ | | | | | | 0x.js Return signature as a hex encoded string
| | * Rename from SignerProviderType.EthSign to SignerType.DefaultJacob Evans2018-08-111-5/+5
| | |
| | * Introduce SignerProviderTypeJacob Evans2018-08-091-6/+6
| | | | | | | | | | | | This allows the developer to indicate the nuanced signer provider. Some have different implementations (trezor, ledger) and others have different implementations (metamask). Breaking the abstraction of eth_sign. EthSign assumes a spec compliant implementation and can be used as a default
| * | Merge pull request #948 from 0xProject/feature/contracts/forwarderFoKAmir Bandeali2018-08-1010-163/+84
| |\ \ | | | | | | | | [contracts] Make marketBuy functions revert if entire amount not filled
| | * | Change withdrawERC20 => withdrawAsset, reuse transfer logicAmir Bandeali2018-08-106-22/+40
| | | |
| | * | Make marketBuy functions revert if entire amount not filledAmir Bandeali2018-08-106-141/+44
| | | |
| * | | fix: Update dependenciesAlex Browne2018-08-101-2/+2
| |/ /
| * | Merge pull request #941 from 0xProject/feature/contracts/returnValuesTestsAmir Bandeali2018-08-106-23/+98
| |\ \ | | |/ | |/| [contracts] Test fillOrder return values and abiEncodeFillOrder
| | * Revert incrementing memory ptr in dispatchTransferFromAmir Bandeali2018-08-093-9/+3
| | |
| | * Test abiEncodeFillOrder as part of combinatorial follOrder testsAmir Bandeali2018-08-093-5/+24
| | |
| | * Increment free memory pointer for internal Exchange functions that use asmAmir Bandeali2018-08-093-12/+34
| | |
| | * Add return values to combinatorial fillOrder testsAmir Bandeali2018-08-092-11/+51
| | |
| * | Merge pull request #915 from 0xProject/feature/encode-decode-checksAlex Browne2018-08-091-3/+3
| |\ \ | | |/ | |/| Add strictArgumentEncodingCheck to BaseContract and use it in contract templates
| | * Add strictArgumentEncodingCheck to BaseContract and use it in contract templatesAlex Browne2018-08-091-3/+3
| | |
| * | Merge pull request #946 from 0xProject/fix/contracts/signatureValidatorCommentsAmir Bandeali2018-08-091-4/+9
| |\ \ | | |/ | |/| [contracts] Fix comments and styling for MixinSignatureValidator
| | * fix comments and styling for MixinSignatureValidatorAmir Bandeali2018-08-091-4/+9
| | |
| * | Merge pull request #945 from 0xProject/fix/typescript-2.9.2Alex Browne2018-08-092-5/+20
| |\ \ | | |/ | |/| Update TypeScript to version 2.9.2
| | * Update TypeScript to version 2.9.2Alex Browne2018-08-092-5/+20
| | |
| * | Use asm for hashEIP712Message, increment free memory pointer after asm ↵Amir Bandeali2018-08-092-9/+28
| | | | | | | | | | | | hashing functions
| * | Fix comments, styling, and optimize hashOrderAmir Bandeali2018-08-083-25/+33
| |/
* | Rename EIP712Utils to eip712Utils since objectLiterals shouldn't start with capsFabio Berger2018-08-042-5/+5
| |
* | Stop exporting cryptoFabio Berger2018-08-031-1/+2
| |
* | Make signature_util into an object literal so related functions are rendered ↵Fabio Berger2018-08-031-5/+17
| | | | | | | | together in the docs
* | Add missing doc commentsFabio Berger2018-08-031-0/+6
|/
* Add combinatorial tests for internal Exchange functions (#807)Alex Browne2018-07-2712-128/+756
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP add combinatorial tests for internal Exchange functions * Change combinitorial testing strategy based on feedback * Check value of filled[orderHash] in updateFilledState tests * Add combinatorial tests for addFillResults * Add combinatorial tests for getPartialAmount * Implement generic `testWithReferenceFuncAsync` * Implement generic `testCombinatoriallyWithReferenceFuncAsync` * Add combinatorial tests for isRoundingError * Add combinatorial tests for calculateFillResults * Add support for Geth in internal contract tests * Fix contract artifacts * Change DECIMAL_PLACES to 78 and add a note. * Document new functions in utils * Optimize tests by only reseting state when needed * Rename/move some files * Print parameter names on failure in testWithReferenceFuncAsync * Add to changelog for utils package * Appease various linters * Rename some more things related to FillOrderCombinatorialUtils * Remove .only from test/exchange/internal.ts * Remove old test for isRoundingError and getPartialAmount * Appease linters again * Remove old todos * Fix typos, add comments, rename some things * Re-add some LibMath tests * Update contract internal tests to use new SafeMath revert reasons * Apply PR feedback from Amir * Apply PR feedback from Remco * Re-add networks to ZRXToken artifact * Remove duplicate Whitelist in compiler.json
* Publishcontracts@2.1.39@0xproject/website@0.0.43@0xproject/testnet-faucets@1.0.40@0xproject/react-docs-example@0.0.19@0xproject/metacoin@0.0.14@0xproject/abi-gen@1.0.4Fabio Berger2018-07-261-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.2 - @0xproject/abi-gen@1.0.4 - @0xproject/assert@1.0.4 - @0xproject/base-contract@1.0.4 - @0xproject/connect@1.0.4 - @0xproject/contract-wrappers@1.0.1-rc.2 - contracts@2.1.39 - @0xproject/dev-utils@1.0.3 - @0xproject/fill-scenarios@1.0.1-rc.2 - @0xproject/json-schemas@1.0.1-rc.3 - @0xproject/metacoin@0.0.14 - @0xproject/migrations@1.0.3 - @0xproject/order-utils@1.0.1-rc.2 - @0xproject/order-watcher@1.0.1-rc.2 - @0xproject/react-docs@1.0.4 - @0xproject/react-docs-example@0.0.19 - @0xproject/react-shared@1.0.5 - @0xproject/sol-compiler@1.0.4 - @0xproject/sol-cov@1.0.3 - @0xproject/sol-resolver@1.0.4 - @0xproject/sra-report@1.0.4 - @0xproject/subproviders@1.0.4 - @0xproject/testnet-faucets@1.0.40 - @0xproject/types@1.0.1-rc.3 - @0xproject/utils@1.0.4 - @0xproject/web3-wrapper@1.1.2 - @0xproject/website@0.0.43
* Point to actual current versionFabio Berger2018-07-261-3/+3
|
* Publishcontracts@2.1.38@0xproject/website@0.0.42@0xproject/testnet-faucets@1.0.39@0xproject/sol-compiler@1.0.3@0xproject/react-docs-example@0.0.18@0xproject/monorepo-scripts@1.0.4@0xproject/metacoin@0.0.13@0xproject/abi-gen@1.0.3Fabio Berger2018-07-261-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.2 - @0xproject/abi-gen@1.0.3 - @0xproject/assert@1.0.3 - @0xproject/base-contract@1.0.3 - @0xproject/connect@1.0.3 - @0xproject/contract-wrappers@1.0.1-rc.2 - contracts@2.1.38 - @0xproject/dev-utils@1.0.3 - ethereum-types@1.0.3 - @0xproject/fill-scenarios@1.0.1-rc.2 - @0xproject/json-schemas@1.0.1-rc.2 - @0xproject/metacoin@0.0.13 - @0xproject/migrations@1.0.3 - @0xproject/monorepo-scripts@1.0.4 - @0xproject/order-utils@1.0.1-rc.2 - @0xproject/order-watcher@1.0.1-rc.2 - @0xproject/react-docs@1.0.3 - @0xproject/react-docs-example@0.0.18 - @0xproject/react-shared@1.0.4 - @0xproject/sol-compiler@1.0.3 - @0xproject/sol-cov@1.0.3 - @0xproject/sol-resolver@1.0.3 - @0xproject/sra-report@1.0.3 - @0xproject/subproviders@1.0.3 - @0xproject/testnet-faucets@1.0.39 - @0xproject/tslint-config@1.0.4 - @0xproject/types@1.0.1-rc.2 - @0xproject/typescript-typings@1.0.3 - @0xproject/utils@1.0.3 - @0xproject/web3-wrapper@1.1.1 - @0xproject/website@0.0.42
* Publishcontracts@2.1.37@0xproject/website@0.0.41@0xproject/testnet-faucets@1.0.38@0xproject/react-docs-example@0.0.17@0xproject/monorepo-scripts@1.0.3@0xproject/metacoin@0.0.12@0xproject/abi-gen@1.0.2Fabio Berger2018-07-261-22/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.1 - @0xproject/abi-gen@1.0.2 - @0xproject/assert@1.0.2 - @0xproject/base-contract@1.0.2 - @0xproject/connect@1.0.2 - @0xproject/contract-wrappers@1.0.1-rc.1 - contracts@2.1.37 - @0xproject/dev-utils@1.0.2 - ethereum-types@1.0.2 - @0xproject/fill-scenarios@1.0.1-rc.1 - @0xproject/json-schemas@1.0.1-rc.1 - @0xproject/metacoin@0.0.12 - @0xproject/migrations@1.0.2 - @0xproject/monorepo-scripts@1.0.3 - @0xproject/order-utils@1.0.1-rc.1 - @0xproject/order-watcher@1.0.1-rc.1 - @0xproject/react-docs@1.0.2 - @0xproject/react-docs-example@0.0.17 - @0xproject/react-shared@1.0.3 - @0xproject/sol-compiler@1.0.2 - @0xproject/sol-cov@1.0.2 - @0xproject/sol-resolver@1.0.2 - @0xproject/sra-report@1.0.2 - @0xproject/subproviders@1.0.2 - @0xproject/testnet-faucets@1.0.38 - @0xproject/tslint-config@1.0.3 - @0xproject/types@1.0.1-rc.1 - @0xproject/typescript-typings@1.0.2 - @0xproject/utils@1.0.2 - @0xproject/web3-wrapper@1.1.0 - @0xproject/website@0.0.41
* Revert to publishing ethereum-typesFabio Berger2018-07-261-1/+1
|
* Temporarily have all packages depend on an older, published version of ↵Fabio Berger2018-07-261-1/+1
| | | | ethereum-types since we cannot publish a new one
* Modify WETH9 event arg names to be identical to ERC20 standard suggested namesFabio Berger2018-07-261-4/+4
|
* merge v2-prototypeFabio Berger2018-07-252-2/+2
|\
| * Update orderEpoch commentsAmir Bandeali2018-07-252-2/+2
| |
* | Revert "Revert "Publish""Fabio Berger2018-07-241-16/+16
|/ | | | This reverts commit a66ccaa1da2af753038bf22a5e7e63bdc307bf2f.
* Remove ERC721 callback functionsAmir Bandeali2018-07-234-49/+3
|
* Use != instead of > in loops, add sanity checks to market fill functionsAmir Bandeali2018-07-233-19/+19
|
* Add more tests and fixesAmir Bandeali2018-07-237-411/+483
|
* Remove MConstants and MixinConstants for LibConstantsAmir Bandeali2018-07-238-57/+23
|
* Remove redundant external call by reimplementing fillOrderNoThrowAmir Bandeali2018-07-236-166/+355
|
* Remove orders length checkAmir Bandeali2018-07-232-11/+0
|
* Add assertValidFillResultsAmir Bandeali2018-07-231-61/+88
|
* Get actual gasPrice from transaction instead of setting defaultAmir Bandeali2018-07-231-35/+34
|
* Store orders length in varible before looping over ordersAmir Bandeali2018-07-232-14/+25
|
* Use transferFrom instead of safeTransferFromAmir Bandeali2018-07-232-6/+2
|
* Fix minimal testsAmir Bandeali2018-07-233-729/+747
|
* Fix rounding error issues, use different logic when makerAsset is ZRXAmir Bandeali2018-07-236-52/+95
|
* Rename marketSellEth => marketSellWethAmir Bandeali2018-07-232-3/+3
|
* Update percentage constantsAmir Bandeali2018-07-233-17/+18
|
* Update transferEthFeeAndRefund, add check to ERC721 transferAmir Bandeali2018-07-236-26/+54
|
* Refactor forwarding contract architecture, remove batch functionsAmir Bandeali2018-07-2320-1038/+572
|
* Add tests to verify ZRX_ASSET_DATAAmir Bandeali2018-07-235-1/+77
|
* Add comments for deploying with constant ZRX_ASSET_DATAAmir Bandeali2018-07-232-2/+15
|
* Move example contracts into new examples dirAmir Bandeali2018-07-2310-24/+33
|
* Merge pull request #877 from 0xProject/feature/contracts/removeERC721CallbackAmir Bandeali2018-07-235-188/+31
|\ | | | | Removed receiverData and `onReceive` callback from ERC721 proxy.
| * Fixed merge errorsGreg Hysen2018-07-181-2/+0
| |
| * Fixed merge errorGreg Hysen2018-07-181-11/+11
| |
| * Ran prettierGreg Hysen2018-07-181-11/+11
| |
| * Removed receiverData from ERC721 Proxy Id generationGreg Hysen2018-07-184-8/+6
| |
| * Removed receiverData and `onReceive` callback from ERC721 proxy.Greg Hysen2018-07-183-178/+25
| |
* | Fix version of ethereumjs-abi to 0.6.5 to fix decoding bugFabio Berger2018-07-221-1/+1
| |
* | fix decodeAssetData for addresses starting in 0Luke Autry2018-07-221-2/+2
| |
* | Hard code fillOrder selector into abiEncodeFillOrderAmir Bandeali2018-07-201-7/+4
| |
* | Returns byte array instead of memory range for encoding fillOrder calldataGreg Hysen2018-07-202-24/+26
| |
* | Created LibAbiEncoder with `fillOrderNoThrow`Greg Hysen2018-07-202-170/+235
| |
* | Change all package to depend on the new @0xproject/sol-cov@1.0.0Leonid Logvinov2018-07-201-1/+1
| |
* | Change all package to depend on the new @0xproject/order-utils@1.0.0-rc.1Leonid Logvinov2018-07-201-1/+1
| |
* | Change all package to depend on the new @0xproject/sol-compiler@1.0.0Leonid Logvinov2018-07-201-1/+1
| |
* | Change all package to depend on the new @0xproject/dev-utils@1.0.0Leonid Logvinov2018-07-201-1/+1
| |
* | Change all package to depend on the new @0xproject/subproviders@1.0.0Leonid Logvinov2018-07-201-1/+1
| |
* | Change all package to depend on the new @0xproject/base-contract@1.0.0Leonid Logvinov2018-07-201-1/+1
| |
* | Change all package to depend on the new @0xproject/web3-wrapper@1.0.0Leonid Logvinov2018-07-201-1/+1
| |
* | Change all package to depend on the new @0xproject/abi-gen@1.0.0Leonid Logvinov2018-07-201-1/+1
| |
* | Change all package to depend on the new @0xproject/utils@1.0.0Leonid Logvinov2018-07-201-1/+1
| |
* | Change all package to depend on the new @0xproject/types@1.0.0-rc.1Leonid Logvinov2018-07-201-1/+1
| |
* | Change all package to depend on the new @0xproject/tslint-config@1.0.0Leonid Logvinov2018-07-201-1/+1
| |
* | Change all package to depend on the new @0xproject/typescript-typings@1.0.0Leonid Logvinov2018-07-201-1/+1
| |
* | Change all package to depend on the new ethereum-types@1.0.0Leonid Logvinov2018-07-201-1/+1
| |
* | merge v2-prototypeFabio Berger2018-07-182-1/+2
|\ \
| * | Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-1818-182/+201
| |\|
| * | MergeLeonid Logvinov2018-07-181-1/+1
| | |
| * | Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-1829-186/+534
| |\ \
| * | | Upgrade tslint to use prefer-readonlyLeonid Logvinov2018-07-131-1/+1
| | | |
| * | | Update contract artifactsLeonid Logvinov2018-07-131-0/+1
| | | |
* | | | Update package versionsFabio Berger2018-07-181-10/+10
| |_|/ |/| |
* | | Merge pull request #884 from 0xProject/export-more-0x.jsFabio Berger2018-07-1818-182/+201
|\ \ \ | |_|/ |/| | Export missing V2 pieces from 0x.js
| * | Fix prettierFabio Berger2018-07-182-9/+3
| | |
| * | Fix linterFabio Berger2018-07-181-1/+1
| | |
| * | merge v2-prototypeFabio Berger2018-07-1815-138/+484
| |\ \
| * | | Rename decodeAssetDataId to decodeAssetProxyId for consistencyFabio Berger2018-07-184-11/+11
| | | |
| * | | Move encodeUint256 & decodeUint256 out of assetDataUtils since we don't want ↵Fabio Berger2018-07-184-6/+31
| | | | | | | | | | | | | | | | them exported
| * | | Rename assetProxyUtils to assetDataUtilsFabio Berger2018-07-1716-176/+176
| | |/ | |/|
* | | Merge pull request #883 from 0xProject/feature/tslint-improvementsLeonid Logvinov2018-07-1816-48/+50
|\ \ \ | |_|/ |/| | New tslint rules
| * | Fix tslint issuesLeonid Logvinov2018-07-1715-47/+49
| | |
| * | Upgrade tslint to the newest versionLeonid Logvinov2018-07-171-1/+1
| |/
* | Add tests for getOrderInfo and getOrdersInfoAmir Bandeali2018-07-183-5/+311
| |
* | Reorder checks in getOrderInfoAmir Bandeali2018-07-181-7/+9
| |
* | Add getOrdersInfo functionAmir Bandeali2018-07-182-0/+24
| |
* | Fix bugs having to do with block timestamps and order expirationTimesAlex Browne2018-07-1711-128/+142
|/