aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update mainnet configsAmir Bandeali2018-09-053-4/+19
|
* Add mainnet migrationsAmir Bandeali2018-09-056-5/+177
|
* Merge pull request #1054 from 0xProject/addValidationMethodsFabio Berger2018-09-059-39/+135
|\ | | | | Temporarily Add Back Validation Methods
| * Export abstract fetchersFabio Berger2018-09-051-0/+2
| |
| * Export missing typeFabio Berger2018-09-042-0/+2
| |
| * Merge branch 'development' into addValidationMethodsFabio Berger2018-09-042-6/+0
| |\ | | | | | | | | | | | | * development: Remove unused imports
| | * Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2018-09-042-6/+0
| | |\ | | | | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x-monorepo: Remove unused imports
| * | | Add PR nrFabio Berger2018-09-041-2/+4
| |/ /
| * | Update yarn.lockFabio Berger2018-09-041-33/+29
| | |
| * | Add `validateFillOrderThrowIfInvalidAsync` and ↵Fabio Berger2018-09-043-2/+83
| | | | | | | | | | | | `validateOrderFillableOrThrowAsync` to ExchangeWrapper
| * | Import fetchers from contract-wrappersFabio Berger2018-09-041-2/+2
| | |
| * | Export fetchers from contract-wrappersFabio Berger2018-09-041-0/+3
| | |
| * | Move fetchers to contract-wrappersFabio Berger2018-09-043-2/+12
| | |
* | | Merge pull request #1050 from 0xProject/refactor/contracts/multisigAmir Bandeali2018-09-0511-112/+360
|\ \ \ | | | | | | | | Update MultiSig and add more tests
| * | | 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-044-15/+38
| | | |
| * | | 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
| | |/ | |/|
* | | Merge pull request #1052 from 0xProject/feature/remove-typesLeonid Logvinov2018-09-0417-165/+40
|\ \ \ | |/ / |/| | [typescript-typings] Remove types that were moved to DefinitelyTyped
| * | Fix the versionLeonid Logvinov2018-09-041-2/+1
| | |
| * | Change doc gen configsLeonid Logvinov2018-09-041-4/+2
| | |
| * | Move types used in public interfaces to dependenciesLeonid Logvinov2018-09-041-2/+2
| | |
| * | Add temporarily missing web3-provider-engine types in websiteLeonid Logvinov2018-09-041-0/+1
| | |
| * | Add CHANGELOG entryLeonid Logvinov2018-09-041-0/+9
| | |
| * | Add temporarily missing web3-provider-engine types in subprovidersLeonid Logvinov2018-09-041-0/+18
| | |
| * | Remove types for web3-provider-engine from typescript-typingsLeonid Logvinov2018-09-045-62/+4
| | |
| * | Remove types for eth-lightwallet from typescript-typingsLeonid Logvinov2018-09-043-55/+2
| | |
| * | Remove types for detect-node from typescript-typingsLeonid Logvinov2018-09-042-3/+1
| | |
| * | Remove types for ganache-core from typescript-typingsLeonid Logvinov2018-09-044-17/+3
| | |
| * | Remove types for newman from typescript-typingsLeonid Logvinov2018-09-042-24/+1
|/ /
* | Merge pull request #1053 from 0xProject/fix/linter_issuesLeonid Logvinov2018-09-042-6/+0
|\ \ | |/ |/| [website] Remove unused imports
| * Remove unused importsLeonid Logvinov2018-09-042-6/+0
|/
* Merge pull request #1051 from 0xProject/fix/contracts/styleAmir Bandeali2018-09-0444-76/+99
|\ | | | | Apply styling fixes to contracts
| * 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 #1048 from 0xProject/feature/website/patch-v2-landingBrandon Millman2018-08-313-10/+14
|\ | | | | [website] Final tweaks for landing page
| * Wording change for first benefitBrandon Millman2018-08-311-1/+1
| |
| * Tweaks to benefits and use casesBrandon Millman2018-08-311-2/+6
| |
| * Update yarn lockBrandon Millman2018-08-311-30/+34
| |
| * Final tweaks for landing pagefragosti2018-08-313-36/+32
| |
* | Merge pull request #1047 from 0xProject/feature/re-add-no-unused-variablesFrancesco Agosti2018-08-3116-22/+11
|\ \ | | | | | | Re-add no-unused-variable tslint rule
| * | run prettierfragosti2018-08-311-3/+1
| | |
| * | Fix unused vars for react-shared and websitefragosti2018-08-3116-19/+10
| | |
* | | 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 #1040 from 0xProject/feature/website/v2-tweaksBrandon Millman2018-08-3112-349/+699
|\ \ \ | | | | | | | | [website] Landing page tweaks for v2 launch
| * | | Revert whats new textBrandon Millman2018-08-311-2/+1
| | | |
| * | | Add new exchange everywhere graphicBrandon Millman2018-08-312-4/+8
| | | |
| * | | Remove unused render methods in landing pageBrandon Millman2018-08-311-110/+0
| | | |
| * | | Update yarn lockBrandon Millman2018-08-311-4/+4
| | | |
| * | | Merge pull request #1042 from 0xProject/feature/website/v2-tweaks-fraFrancesco Agosti2018-08-318-26/+146
| |\ \ \ | | | | | | | | | | [website] Add rotating text to landing header and careers button to topbar
| | * | | Remove conflict stringsfragosti2018-08-311-3/+0
| | | | |
| | * | | Add careers page to top barfragosti2018-08-311-1/+11
| | | | |
| | * | | Final tweaksfragosti2018-08-313-11/+17
| | | | |
| | * | | Remove redundant importfragosti2018-08-311-1/+0
| | | | |
| | * | | Add TypedText component and use it on landing pagefragosti2018-08-317-1/+119
| | | | |
| | * | | Add generic title changesfragosti2018-08-311-17/+7
| |/ / /
| * | | Added todo comments for missing itemsBrandon Millman2018-08-311-1/+2
| | | |
| * | | Add title header to use cases sectionBrandon Millman2018-08-313-14/+13
| | | |
| * | | Make hero image responsiveBrandon Millman2018-08-311-2/+3
| | | |
| * | | Update what's new stylingBrandon Millman2018-08-311-4/+4
| | | |
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-08-3032-426/+581
| |\ \ \ | | | |/ | | |/| | | | | feature/website/v2-tweaks
| * | | Update use cases sectionBrandon Millman2018-08-303-51/+98
| | | |
| * | | Update tokenization sectionBrandon Millman2018-08-303-45/+15
| | | |
| * | | Update benefitsBrandon Millman2018-08-302-8/+6
| | | |
| * | | Update whats newBrandon Millman2018-08-301-13/+19
| | | |
| * | | Add new header imageBrandon Millman2018-08-302-4/+391
| | | |
| * | | Replace projects section with relayersBrandon Millman2018-08-301-77/+5
| | | |
* | | | 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
| | |/ / | |/| |
* | | | Merge pull request #1043 from 0xProject/feature/contracts/edgeCaseTestsAmir Bandeali2018-08-318-15/+404
|\ \ \ \ | |/ / / |/| | | Add edge case tests
| * | | 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
| | | |
* | | | Merge pull request #1041 from ↵Amir Bandeali2018-08-3012-122/+105
|\| | | | | | | | | | | | | | | | | | | 0xProject/refactor/contracts/assetProxyOwnerVersion Update AssetProxyOwner to 0.4.24, remove redundant code
| * | | Fix geth testsAmir Bandeali2018-08-308-47/+83
| | | |
| * | | Remove unused importsAmir Bandeali2018-08-303-5/+1
| | | |
| * | | Update AssetProxyOwner to 0.4.24Amir Bandeali2018-08-303-70/+21
|/ / /
* | | Merge pull request #1023 from 0xProject/website/feature/react-16Francesco Agosti2018-08-3019-294/+368
|\ \ \ | | | | | | | | [website] Upgrade all the things to React 16
| * | | Apply prettierfragosti2018-08-301-5/+6
| | | |
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-08-3080-183/+276
| |\| | | | | | | | | | | | | | website/feature/react-16
| * | | Change VersionDropDown to use material-ui 3fragosti2018-08-293-11/+216
| | | |
| * | | Upgrade version of react-shared in websitefragosti2018-08-293-39/+3
| | | |
| * | | Upgrade react-copy-to-clipboardfragosti2018-08-292-17/+8
| | | |
| * | | Remove react-tap-event-plugin from react-sharedfragosti2018-08-292-12/+5
| | | |
| * | | Upgrade material ui in react-docsfragosti2018-08-292-62/+9
| | | |
| * | | Update lockfilefragosti2018-08-291-3/+3
| | | |
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-08-29140-1085/+3940
| |\ \ \ | | | | | | | | | | | | | | | website/feature/react-16
| * | | | Update material-ui in react-sharedfragosti2018-08-293-2/+39
| | | | |
| * | | | Revert "Simplify dropdown component"fragosti2018-08-291-15/+25
| | | | | | | | | | | | | | | | | | | | This reverts commit 91a9014a50cca8e0d42634666fe409839aeae8cf.
| * | | | Revert "Have new Popover component working in React 16"fragosti2018-08-298-84/+39
| | | | | | | | | | | | | | | | | | | | This reverts commit 5785ec0713c39466b3a6a171f5f0a2d38207b44b.
| * | | | Revert "Enable hovering state for dropdown"fragosti2018-08-293-10/+7
| | | | | | | | | | | | | | | | | | | | This reverts commit ac1640140c9279ac9e8a92d84702a2f84d9165fb.
| * | | | Upgrade material ui to 0.20.0fragosti2018-08-292-4/+64
| | | | |
| * | | | Enable hovering state for dropdownfragosti2018-08-293-7/+10
| | | | |
| * | | | Have new Popover component working in React 16fragosti2018-08-288-39/+84
| | | | |
| * | | | Simplify dropdown componentfragosti2018-08-251-25/+15
| | | | |
| * | | | Change all onTouchTap to onClickfragosti2018-08-2513-18/+18
| | | | |
| * | | | Upgrade typescript version used by sra-specfragosti2018-08-251-1/+1
| | | | |
| * | | | Add typescript dependency to typescript-typings (no idea how it was working)fragosti2018-08-251-1/+2
| | | | |
| * | | | Bump react-highlight in react-shared once morefragosti2018-08-252-6/+6
| | | | |
| * | | | Upgrade react-shared used by website to one that depends on react 16fragosti2018-08-252-155/+10
| | | | |
| * | | | Upgrade react-highlight to version that depends on React 16fragosti2018-08-252-1/+10
| | | | |
| * | | | Upgrade react in react-docsfragosti2018-08-251-2/+2
| | | | |
| * | | | Update react and remove tap event plugin [deprecated]fragosti2018-08-254-38/+38
| | | | |
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-08-25138-3560/+4683
| |\ \ \ \ | | | | | | | | | | | | | | | | | | website/feature/react-16
| * | | | | Add new react and typesfragosti2018-08-252-3386/+3206
| | | | | |
* | | | | | 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-3080-182/+276
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | Merge pull request #1022 from ↵Brandon Millman2018-08-2913-66/+490
|\ \ \ | | | | | | | | | | | | | | | | 0xProject/feature/contract-wrappers/order-validator [contract-wrappers] Write wrapper for OrderValidator contract
| * | | Export missing types and add OrderValidatorWrapper to hidden constructorsBrandon Millman2018-08-293-0/+7
| | | |
| * | | Add OrderValidatorWrapper to public interfaceBrandon Millman2018-08-282-0/+2
| | | |
| * | | Add contract-wrappers changelog entry for OrderValidatorWrapperBrandon Millman2018-08-281-0/+8
| | | |
| * | | Fix broken testBrandon Millman2018-08-281-2/+3
| | | |
| * | | Add getBalancesAndAllowances to wrapperBrandon Millman2018-08-281-0/+25
| | | |
| * | | Update OrderValidator artifact to include getBalancesAndAllowances functionBrandon Millman2018-08-281-62/+113
| | | |
| * | | Add params to all function commentsBrandon Millman2018-08-281-0/+12
| | | |
| * | | Add getERC721Owner to wrapperBrandon Millman2018-08-281-1/+13
| | | |
| * | | Update getOrdersAndTradersInfo to return an array insteadBrandon Millman2018-08-282-12/+12
| | | |
| * | | Add getBalanceAndAllowance to wrapperBrandon Millman2018-08-282-1/+25
| | | |
| * | | Add getTraderInfo and getTradersInfo to wrapperBrandon Millman2018-08-281-2/+27
| | | |
| * | | Add getOrderAndTraderInfoAsync to wrapperBrandon Millman2018-08-282-2/+24
| | | |
| * | | Add test for order validatorBrandon Millman2018-08-282-0/+142
| | | |
| * | | Remove some unused variables in forwarder wrapper testBrandon Millman2018-08-281-3/+0
| | | |
| * | | Initial OrderValidator wrapperBrandon Millman2018-08-285-1/+97
| | | |
* | | | Merge pull request #1036 from 0xProject/fix/contracts/calculateFillResultsGreg Hysen2018-08-292-9/+12
|\ \ \ \ | | | | | | | | | | Making rounding consistent in calculateFillResults
| * | | | 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
* | | | Merge pull request #1030 from 0xProject/fix/contracts/forwarderFillOrderNoThrowAmir Bandeali2018-08-282-8/+3
|\ \ \ \ | |/ / / |/| | | Remove redundant mstores from fillOrderNoThrow
| * | | Add clarifying commentsAmir Bandeali2018-08-282-0/+2
| | | |
| * | | Remove redundant mstores from fillOrderNoThrowAmir Bandeali2018-08-281-8/+1
|/ / /
* | | Merge pull request #1031 from ↵Alex Browne2018-08-281-3/+1
|\ \ \ | | | | | | | | | | | | | | | | 0xProject/fix/internal-tests-division-by-zero-assertion Use correct error message for division by zero
| * | | fix(contracts): Use correct error message for division by zeroAlex Browne2018-08-281-3/+1
|/ / /
* | | Exit with non-error code at end of publishReleaseFabio Berger2018-08-271-0/+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-2729-169/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Updated CHANGELOGSFabio Berger2018-08-2748-10/+252
| | |
* | | Fix prettierFabio Berger2018-08-278-16/+8
| | |
* | | Update changelog files for RC packagesFabio Berger2018-08-279-0/+84
| | |
* | | Merge pull request #1028 from 0xProject/fix-ciFabio Berger2018-08-275-12/+16
|\ \ \ | | | | | | | | Fix `test_publish` CI Test
| * | | Skip doc generation for local publishes since we test this in a separate CI testFabio Berger2018-08-271-3/+5
| | | |
| * | | Fix typoFabio Berger2018-08-271-1/+1
| | | |
| * | | Use absolute pathFabio Berger2018-08-271-3/+1
| | | |
| * | | Merge branch 'development' into fix-ciFabio Berger2018-08-271-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * development: Run yarn a second time if the first fails
| | * \ \ Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2018-08-271-1/+1
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x-monorepo: Run yarn a second time if the first fails
* | | | | Run yarn a second time if the first failsFabio Berger2018-08-271-1/+1
| | | | |
| * | | | Try relative to root dirFabio Berger2018-08-271-1/+3
| | | | |
| * | | | merge developmentFabio Berger2018-08-271-3/+3
| |\| | |
| | * | | Merge branch 'development' of github.com:0xProject/0x-monorepo into developmentFabio Berger2018-08-275-9/+13
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x-monorepo: Fix command Move md files to lib folder during build Change exit code to failure Fix sra-spec `main` and `types` in package.json Issue #1025 BlockParam unroll fix: Use yarn version 1.9.4 on CI
* | | | | Merge pull request #1009 from 0xProject/fix/ci-yarn-1.9.4Fabio Berger2018-08-271-3/+3
|\ \ \ \ \ | | | | | | | | | | | | fix: Use yarn version 1.9.4 on CI
| * | | | | fix: Use yarn version 1.9.4 on CIAlex Browne2018-08-241-3/+3
| | |_|/ / | |/| | |
* | | | | Fix commandFabio Berger2018-08-271-1/+1
| | | | |
* | | | | Move md files to lib folder during buildFabio Berger2018-08-272-2/+4
| | | | |
* | | | | Change exit code to failureFabio Berger2018-08-271-1/+3
| | | | |
* | | | | Fix sra-spec `main` and `types` in package.jsonFabio Berger2018-08-271-2/+2
| | | | |
* | | | | Merge pull request #1026 from ↵Fabio Berger2018-08-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/fix/contract-wrappers/block-param-literal [contract_templates] Issue #1025 BlockParam unroll
| * | | | | Issue #1025 BlockParam unrollJacob Evans2018-08-271-1/+1
|/ / / / / | | | | | | | | | | | | | | | BlockParam unrolls into number | BlockParamLiteral, though BlockParamLiteral does not get imported. This results in type build errors in downstream projects where tslint checks libs
| | * | | Actual relative pathFabio Berger2018-08-271-1/+1
| | | | |
| | * | | Try relative pathFabio Berger2018-08-271-1/+1
| | | | |
| | * | | Fix commandFabio Berger2018-08-271-1/+1
| | | | |
| | * | | Move md files to lib folder during buildFabio Berger2018-08-272-2/+4
| | | | |
| | * | | Fix sra-spec `main` and `types` in package.jsonFabio Berger2018-08-271-2/+2
| | | | |
| | * | | Add BlockParamLiteral to templateFabio Berger2018-08-271-1/+1
| | | | |
| | * | | Remove check since this method is now used in multiple placesFabio Berger2018-08-271-5/+0
| | | | |
| | * | | Also use failure exit code if unexpected error occursFabio Berger2018-08-271-1/+3
| | | | |
| | * | | Change exit code to failureFabio Berger2018-08-271-1/+1
| | |/ /
| | * / Combine importsFabio Berger2018-08-271-2/+9
| |/ / |/| |
* | | Bumop 0x.js version0x.js@1.0.1-rc.5Fabio Berger2018-08-271-1/+1
| | |
* | | Fix file path to main and types in package.jsonFabio Berger2018-08-272-2/+11
| | |
* | | Merge pull request #986 from 0xProject/feature/contracts/assertionsAmir Bandeali2018-08-254-30/+117
|\ \ \ | | | | | | | | Add more assertions to assertValidFill
| * \ \ Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js ↵Remco Bloemen2018-08-2532-300/+1081
| |\ \ \ | | | | | | | | | | | | | | | into fix/contracts/robustMatching
| * | | | Revert maker not equal taker checkRemco Bloemen2018-08-251-6/+1
| | | | |
| * | | | Fix mixin apiRemco Bloemen2018-08-253-21/+36
| | | | |
| * | | | Fix double definition of errorRemco Bloemen2018-08-251-1/+0
| | | | |
| * | | | Split into assertFillable and assertValidFillRemco Bloemen2018-08-252-29/+43
| | | | |
| * | | | Disallow self fillingRemco Bloemen2018-08-251-1/+7
| | | | |
| * | | | Add revert reasons to typesRemco Bloemen2018-08-251-0/+5
| | | | |
| * | | | 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
| | | | |
* | | | | Merge pull request #1008 from 0xProject/fix/contracts/robustMatchingAmir Bandeali2018-08-254-277/+848
|\ \ \ \ \ | |_|/ / / |/| | | | Robustness in Order Matching
| * | | | 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.
* | | | Merge pull request #1002 from 0xProject/feature/contracts/mutexAmir Bandeali2018-08-2516-176/+680
|\ \ \ \ | | | | | | | | | | [contracts] Add mutexes and reentrancy guards
| * | | | 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-2518-115/+392
|\ \ \ \ | | | | | | | | | | [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-2517-59/+59
| | | | |
| * | | | 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-253-13/+18
| | | | |
| * | | | Fix isRoundingErrorRemco Bloemen2018-08-251-10/+17
| | |_|/ | |/| |
* | | | Merge pull request #1021 from 0xProject/feature/contracts/skipselftransferAmir Bandeali2018-08-251-1/+1
|\ \ \ \ | |_|/ / |/| | | [Contracts] Skip self transfers
| * | | Skip self-transfersRemco Bloemen2018-08-251-1/+1
|/ / /
* | | Merge pull request #1018 from 0xProject/fix/migrations/order-validator-testnetBrandon Millman2018-08-251-1/+7
|\ \ \ | | | | | | | | [migrations] Add testnet network info to OrderValidator artifact
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 22:38:54 +0800