aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
Commit message (Expand)AuthorAgeFilesLines
* Move packages/contracts to contracts/coreLeonid Logvinov2018-12-03156-28189/+0
* Merge pull request #1224 from 0xProject/feature/contracts/multiAssetProxyAmir Bandeali2018-11-2911-221/+1499
|\
| * Update CHANGELOGAmir Bandeali2018-11-281-0/+10
| * Don't load assetProxy if currentProxyid is equal to the last seen proxyidAmir Bandeali2018-11-282-9/+18
| * Add Exchange tests with MultiAsset ordersAmir Bandeali2018-11-282-23/+362
| * Fix linting errorsAmir Bandeali2018-11-282-1/+6
| * Add more tests for MAPAmir Bandeali2018-11-282-15/+342
| * Add initial MultiAssetProxy testsAmir Bandeali2018-11-284-191/+485
| * Fix async loops in erc721WrapperAmir Bandeali2018-11-282-3/+3
| * Factor offsets into calldata locationsAmir Bandeali2018-11-282-20/+57
| * feat: Implement MultiAssetProxyAmir Bandeali2018-11-283-2/+259
* | Publishcontracts@2.1.56@0x/website@0.0.61@0x/web3-wrapper@3.1.6@0x/testnet-faucets@1.0.58@0x/subproviders@2.1.6@0x/sol-doc@1.0.9@0x/sol-cov@2.1.14@0x/sol-compiler@1.1.14@0x/react-shared@1.0.23@0x/react-docs@1.0.20@0x/order-watcher@2.2.6@0x/order-utils@3.0.4@0x/migrations@2.2.0@0x/metacoin@0.0.30@0x/instant@1.0.2@0x/fill-scenarios@1.0.14@0x/dev-utils@1.0.19@0x/dev-tools-pages@0.0.8@0x/contract-wrappers@4.1.1@0x/contract-artifacts@1.1.2@0x/contract-addresses@2.0.0@0x/connect@3.0.8@0x/base-contract@3.0.8@0x/asset-buyer@3.0.2@0x/abi-gen-wrappers@2.0.0@0x/abi-gen-templates@1.0.10x.js@2.0.6Jacob Evans2018-11-281-8/+8
|/
* Update CHANGELOGAmir Bandeali2018-11-271-0/+10
* fix: remove getApproved check from OrderValidator since approval is removed a...Amir Bandeali2018-11-272-6/+9
* Rename contract-templates to abi-gen-templatesLeonid Logvinov2018-11-231-1/+1
* Make contract-templates an npm packageLeonid Logvinov2018-11-221-1/+1
* Publishcontracts@2.1.55@0x/website@0.0.60@0x/web3-wrapper@3.1.5@0x/utils@2.0.6@0x/types@1.3.0@0x/testnet-faucets@1.0.57@0x/subproviders@2.1.5@0x/sra-spec@1.0.11@0x/sol-resolver@1.0.17@0x/sol-doc@1.0.8@0x/sol-cov@2.1.13@0x/sol-compiler@1.1.13@0x/react-shared@1.0.22@0x/react-docs@1.0.19@0x/order-watcher@2.2.5@0x/order-utils@3.0.3@0x/monorepo-scripts@1.0.14@0x/migrations@2.1.0@0x/metacoin@0.0.29@0x/json-schemas@2.1.2@0x/instant@1.0.1@0x/fill-scenarios@1.0.13@0x/dev-utils@1.0.18@0x/dev-tools-pages@0.0.7@0x/contract-wrappers@4.1.0@0x/contract-addresses@1.2.0@0x/connect@3.0.7@0x/base-contract@3.0.7@0x/asset-buyer@3.0.1@0x/assert@1.0.18@0x/abi-gen@1.0.17@0x/abi-gen-wrappers@1.1.00x.js@2.0.5Fabio Berger2018-11-221-11/+11
* Publishcontracts@2.1.54@0x/website@0.0.59@0x/web3-wrapper@3.1.4@0x/utils@2.0.5@0x/testnet-faucets@1.0.56@0x/subproviders@2.1.4@0x/sra-spec@1.0.10@0x/sol-doc@1.0.7@0x/sol-cov@2.1.12@0x/sol-compiler@1.1.12@0x/react-shared@1.0.21@0x/react-docs@1.0.18@0x/order-watcher@2.2.4@0x/order-utils@3.0.2@0x/migrations@2.0.4@0x/metacoin@0.0.28@0x/json-schemas@2.1.1@0x/instant@0.0.7@0x/fill-scenarios@1.0.12@0x/dev-utils@1.0.17@0x/dev-tools-pages@0.0.6@0x/contract-wrappers@4.0.2@0x/connect@3.0.6@0x/base-contract@3.0.6@0x/asset-buyer@3.0.0@0x/assert@1.0.17@0x/abi-gen@1.0.16@0x/abi-gen-wrappers@1.0.50x.js@2.0.4Leonid Logvinov2018-11-141-10/+10
* Publishcontracts@2.1.53@0x/website@0.0.58@0x/web3-wrapper@3.1.3@0x/testnet-faucets@1.0.55@0x/subproviders@2.1.3@0x/sol-doc@1.0.6@0x/sol-cov@2.1.11@0x/sol-compiler@1.1.11@0x/react-shared@1.0.20@0x/react-docs@1.0.17@0x/order-watcher@2.2.3@0x/order-utils@3.0.1@0x/migrations@2.0.3@0x/metacoin@0.0.27@0x/instant@0.0.6@0x/fill-scenarios@1.0.11@0x/dev-utils@1.0.16@0x/dev-tools-pages@0.0.5@0x/contract-wrappers@4.0.1@0x/connect@3.0.5@0x/base-contract@3.0.5@0x/asset-buyer@2.2.2@0x/abi-gen-wrappers@1.0.40x.js@2.0.3Leonid Logvinov2018-11-141-8/+8
* Publishcontracts@2.1.52@0x/website@0.0.57@0x/web3-wrapper@3.1.2@0x/testnet-faucets@1.0.54@0x/subproviders@2.1.2@0x/sra-spec@1.0.9@0x/sol-doc@1.0.5@0x/sol-cov@2.1.10@0x/sol-compiler@1.1.10@0x/react-shared@1.0.19@0x/react-docs@1.0.16@0x/order-watcher@2.2.2@0x/order-utils@3.0.0@0x/migrations@2.0.2@0x/metacoin@0.0.26@0x/json-schemas@2.1.0@0x/instant@0.0.5@0x/fill-scenarios@1.0.10@0x/dev-utils@1.0.15@0x/dev-tools-pages@0.0.4@0x/contract-wrappers@4.0.0@0x/connect@3.0.4@0x/base-contract@3.0.4@0x/asset-buyer@2.2.1@0x/assert@1.0.16@0x/abi-gen-wrappers@1.0.30x.js@2.0.2Leonid Logvinov2018-11-121-8/+8
* Merge pull request #1235 from 0xProject/fixOrderValidationFabio B2018-11-123-5/+16
|\
| * Remove unnecessary conversion to BigNumberFabio Berger2018-11-121-2/+2
| * rename paramFabio Berger2018-11-121-2/+2
| * Move signature validation into OrderValidationUtils.validateOrderFillableOrTh...Fabio Berger2018-11-101-1/+1
| * Merge branch 'development' into fixOrderValidationFabio Berger2018-11-101-14/+14
| |\
| * | Fix validateOrderFillableOrThrowAsync method so it also checks order signatur...Fabio Berger2018-11-092-3/+14
* | | Add CHANGELOG comment to READMEAmir Bandeali2018-11-121-1/+1
* | | Add CHANGELOG.jsonAmir Bandeali2018-11-121-0/+115
| |/ |/|
* | Publishethereum-types@1.1.2contracts@2.1.51@0x/website@0.0.56@0x/web3-wrapper@3.1.1@0x/utils@2.0.4@0x/typescript-typings@3.0.4@0x/types@1.2.1@0x/tslint-config@1.0.10@0x/testnet-faucets@1.0.53@0x/subproviders@2.1.1@0x/sra-spec@1.0.8@0x/sol-resolver@1.0.16@0x/sol-doc@1.0.4@0x/sol-cov@2.1.9@0x/sol-compiler@1.1.9@0x/react-shared@1.0.18@0x/react-docs@1.0.15@0x/order-watcher@2.2.1@0x/order-utils@2.0.1@0x/monorepo-scripts@1.0.13@0x/migrations@2.0.1@0x/metacoin@0.0.25@0x/json-schemas@2.0.1@0x/instant@0.0.4@0x/fill-scenarios@1.0.9@0x/dev-utils@1.0.14@0x/dev-tools-pages@0.0.3@0x/contract-wrappers@3.0.1@0x/contract-artifacts@1.1.0@0x/contract-addresses@1.1.0@0x/connect@3.0.3@0x/base-contract@3.0.3@0x/asset-buyer@2.2.0@0x/assert@1.0.15@0x/abi-gen@1.0.15@0x/abi-gen-wrappers@1.0.20x.js@2.0.1Jacob Evans2018-11-091-14/+14
|/
* chore: Add --format stylish to tslintAlex Browne2018-10-241-1/+1
* Run prettier and linterAmir Bandeali2018-10-241-2/+0
* Round up for Market Buys in Forwarding Contract. Includes new test cases + re...Greg Hysen2018-10-243-8/+280
* Update links, remove 1.0 from READMEAmir Bandeali2018-10-201-14/+8
* Publishethereum-types@1.1.1contracts@2.1.50@0x/website@0.0.55@0x/web3-wrapper@3.1.0@0x/utils@2.0.3@0x/typescript-typings@3.0.3@0x/types@1.2.0@0x/tslint-config@1.0.9@0x/testnet-faucets@1.0.52@0x/subproviders@2.1.0@0x/sra-spec@1.0.7@0x/sol-resolver@1.0.15@0x/sol-doc@1.0.3@0x/sol-cov@2.1.8@0x/sol-compiler@1.1.8@0x/react-shared@1.0.17@0x/react-docs@1.0.14@0x/order-watcher@2.2.0@0x/order-utils@2.0.0@0x/monorepo-scripts@1.0.12@0x/migrations@2.0.0@0x/metacoin@0.0.24@0x/json-schemas@2.0.0@0x/instant@0.0.3@0x/fill-scenarios@1.0.8@0x/dev-utils@1.0.13@0x/dev-tools-pages@0.0.2@0x/contract-wrappers@3.0.0@0x/contract-artifacts@1.0.1@0x/contract-addresses@1.0.1@0x/connect@3.0.2@0x/base-contract@3.0.2@0x/asset-buyer@2.1.0@0x/assert@1.0.14@0x/abi-gen@1.0.14@0x/abi-gen-wrappers@1.0.10x.js@2.0.0Leonid Logvinov2018-10-181-14/+14
* Fix ethereum-types versionsLeonid Logvinov2018-10-181-1/+1
* chore: change README.md from 0xproject to 0xJacob Evans2018-10-181-1/+1
* chore: change tslint.json from 0xproject to 0xJacob Evans2018-10-181-1/+1
* chore: change package org from 0xproject to 0xJacob Evans2018-10-1850-153/+153
* Remove as any hack from artifacts in contracts packageAlex Browne2018-10-163-42/+38
* Introduce new contract-addresses package and use it everywhereAlex Browne2018-10-162-2/+0
* Remove unused copyfiles dependenciesAlex Browne2018-10-161-1/+0
* Cleanup migrations and contracts package. Make contracts private again.Alex Browne2018-10-162-5/+3
* Remove generated artifacts in the contracts packageAlex Browne2018-10-1636-36120/+0
* Add generated contract wrappers in contracts package to gitignoreAlex Browne2018-10-1634-30010/+0
* Change @0xproject/contracts version number back to 2.1.48Alex Browne2018-10-161-1/+1
* Update contract-wrappers package to use new contracts package for generated f...Alex Browne2018-10-165-7/+1459
* Move generated contract wrappers and artifacts into contracts packageAlex Browne2018-10-16209-2461/+64959
* Upgrade ethers.js versionLeonid Logvinov2018-10-091-1/+1
* Throw and handle errors from Providers.Jacob Evans2018-10-091-1/+1
* Return SignedOrder from signing utils.Jacob Evans2018-10-051-30/+4
* Add eth_signTypedData support to our wallet subprovidersJacob Evans2018-10-052-29/+29
* Introduce Metamask Subprovider.Jacob Evans2018-10-051-9/+3
* Publishethereum-types@1.0.11contracts@2.1.49@0xproject/website@0.0.54@0xproject/web3-wrapper@3.0.3@0xproject/utils@2.0.2@0xproject/typescript-typings@3.0.2@0xproject/types@1.1.4@0xproject/tslint-config@1.0.8@0xproject/testnet-faucets@1.0.51@0xproject/subproviders@2.0.7@0xproject/sra-spec@1.0.6@0xproject/sra-report@1.0.13@0xproject/sol-resolver@1.0.14@0xproject/sol-doc@1.0.2@0xproject/sol-cov@2.1.7@0xproject/sol-compiler@1.1.7@0xproject/react-shared@1.0.15@0xproject/react-docs@1.0.13@0xproject/order-watcher@2.1.1@0xproject/order-utils@1.0.7@0xproject/monorepo-scripts@1.0.11@0xproject/migrations@1.0.14@0xproject/metacoin@0.0.23@0xproject/json-schemas@1.0.7@0xproject/instant@0.0.2@0xproject/fill-scenarios@1.0.7@0xproject/dev-utils@1.0.12@0xproject/contract-wrappers@2.0.2@0xproject/connect@3.0.1@0xproject/base-contract@3.0.1@0xproject/asset-buyer@2.0.0@0xproject/assert@1.0.13@0xproject/abi-gen@1.0.130x.js@1.0.8Brandon Millman2018-10-051-14/+14
* Introduce a build:ci command that doesn't build webpack bundlesLeonid Logvinov2018-10-021-0/+1
* Publishethereum-types@1.0.9contracts@2.1.48@0xproject/website@0.0.53@0xproject/web3-wrapper@3.0.2@0xproject/utils@2.0.0@0xproject/typescript-typings@3.0.0@0xproject/types@1.1.2@0xproject/testnet-faucets@1.0.50@0xproject/subproviders@2.0.6@0xproject/sra-spec@1.0.5@0xproject/sra-report@1.0.12@0xproject/sol-resolver@1.0.12@0xproject/sol-doc@1.0.1@0xproject/sol-cov@2.1.6@0xproject/sol-compiler@1.1.6@0xproject/react-shared@1.0.13@0xproject/react-docs@1.0.12@0xproject/order-watcher@2.1.0@0xproject/order-utils@1.0.6@0xproject/monorepo-scripts@1.0.10@0xproject/migrations@1.0.13@0xproject/metacoin@0.0.22@0xproject/json-schemas@1.0.5@0xproject/fill-scenarios@1.0.6@0xproject/dev-utils@1.0.11@0xproject/contract-wrappers@2.0.1@0xproject/connect@3.0.0@0xproject/base-contract@3.0.0@0xproject/asset-buyer@1.0.2@0xproject/assert@1.0.12@0xproject/abi-gen@1.0.120x.js@1.0.7Fabio Berger2018-09-291-13/+13
* Remove ethers.js carret as it's a beta versionLeonid Logvinov2018-09-271-1/+1
* Merge branch 'development' into feature/ts-ethersLeonid Logvinov2018-09-263-17/+23
|\
| * Publishethereum-types@1.0.8contracts@2.1.47@0xproject/website@0.0.52@0xproject/web3-wrapper@3.0.1@0xproject/utils@1.0.11@0xproject/typescript-typings@2.0.2@0xproject/types@1.1.1@0xproject/testnet-faucets@1.0.49@0xproject/subproviders@2.0.5@0xproject/sra-spec@1.0.4@0xproject/sra-report@1.0.11@0xproject/sol-resolver@1.0.11@0xproject/sol-cov@2.1.5@0xproject/sol-compiler@1.1.5@0xproject/react-shared@1.0.12@0xproject/react-docs@1.0.11@0xproject/order-watcher@2.0.0@0xproject/order-utils@1.0.5@0xproject/migrations@1.0.12@0xproject/metacoin@0.0.21@0xproject/json-schemas@1.0.4@0xproject/fill-scenarios@1.0.5@0xproject/dev-utils@1.0.10@0xproject/contract-wrappers@2.0.0@0xproject/connect@2.0.4@0xproject/base-contract@2.0.5@0xproject/asset-buyer@1.0.1@0xproject/assert@1.0.11@0xproject/abi-gen@1.0.110x.js@1.0.6Fabio Berger2018-09-261-13/+13
| * Publishcontracts@2.1.46@0xproject/website@0.0.51@0xproject/web3-wrapper@3.0.0@0xproject/utils@1.0.10@0xproject/types@1.1.0@0xproject/testnet-faucets@1.0.48@0xproject/subproviders@2.0.4@0xproject/sra-spec@1.0.3@0xproject/sra-report@1.0.10@0xproject/sol-resolver@1.0.10@0xproject/sol-cov@2.1.4@0xproject/sol-compiler@1.1.4@0xproject/react-shared@1.0.11@0xproject/react-docs@1.0.10@0xproject/order-watcher@1.0.5@0xproject/order-utils@1.0.4@0xproject/migrations@1.0.11@0xproject/metacoin@0.0.20@0xproject/json-schemas@1.0.3@0xproject/fill-scenarios@1.0.4@0xproject/dev-utils@1.0.9@0xproject/contract-wrappers@1.0.5@0xproject/connect@2.0.3@0xproject/base-contract@2.0.4@0xproject/asset-buyer@1.0.0@0xproject/assert@1.0.10@0xproject/abi-gen@1.0.100x.js@1.0.5Leonid Logvinov2018-09-251-11/+11
| * Fix bug where if block wasn't found, getBlockAsync would throw. Now it return...Fabio Berger2018-09-242-3/+9
| * Publishethereum-types@1.0.7contracts@2.1.45@0xproject/website@0.0.50@0xproject/web3-wrapper@2.0.3@0xproject/utils@1.0.9@0xproject/typescript-typings@2.0.1@0xproject/types@1.0.2@0xproject/testnet-faucets@1.0.47@0xproject/subproviders@2.0.3@0xproject/sra-spec@1.0.2@0xproject/sra-report@1.0.9@0xproject/sol-resolver@1.0.9@0xproject/sol-cov@2.1.3@0xproject/sol-compiler@1.1.3@0xproject/react-shared@1.0.10@0xproject/react-docs@1.0.9@0xproject/order-watcher@1.0.4@0xproject/order-utils@1.0.3@0xproject/monorepo-scripts@1.0.9@0xproject/migrations@1.0.10@0xproject/metacoin@0.0.19@0xproject/json-schemas@1.0.2@0xproject/forwarder-helper@1.0.4@0xproject/fill-scenarios@1.0.3@0xproject/dev-utils@1.0.8@0xproject/contract-wrappers@1.0.4@0xproject/connect@2.0.2@0xproject/base-contract@2.0.3@0xproject/assert@1.0.9@0xproject/abi-gen@1.0.90x.js@1.0.4Leonid Logvinov2018-09-211-13/+13
| * Don't depend on a specific version of node typesLeonid Logvinov2018-09-211-1/+1
* | Upgrade to TS version of ethersLeonid Logvinov2018-09-191-1/+1
|/
* Publishcontracts@2.1.44@0xproject/website@0.0.49@0xproject/testnet-faucets@1.0.46@0xproject/order-watcher@1.0.3@0xproject/order-utils@1.0.2@0xproject/migrations@1.0.9@0xproject/forwarder-helper@1.0.3@0xproject/fill-scenarios@1.0.2@0xproject/contract-wrappers@1.0.3@0xproject/connect@2.0.10x.js@1.0.3Fabio Berger2018-09-191-2/+2
* Link bug bounty section to wikiAmir Bandeali2018-09-061-40/+1
* Update README with directory structure and bug bountyAmir Bandeali2018-09-061-6/+66
* 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
* 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
|\
| * run prettierfragosti2018-08-311-3/+1
| * Fix unused vars for react-shared and websitefragosti2018-08-312-2/+1
* | Merge pull request #1046 from 0xProject/fix/contracts/roundingFeeTestsMatchOr...Greg Hysen2018-08-311-0/+94
|\ \
| * | 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 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
|\|
| * Typos in LibBytes testsGreg Hysen2018-08-301-6/+6
| * Reverted syntax used by readBytes4 in AssetProxyOwner to be compatible with S...Greg Hysen2018-08-301-5/+1
| * More tests for LibBytesGreg Hysen2018-08-301-3/+16
| * Updated comments for ERC20 proxy to clarify how we load the token address fro...Greg Hysen2018-08-302-9/+60
| * Updated readBytes4 to match spec + added unit tests. These are 3.5/3.6 from a...Greg Hysen2018-08-303-4/+42
* | feat: Add support for TypeScript project references (#991)Alex Browne2018-08-303-8/+5
|/
* Making rounding consistent in calculateFillResultsAmir Bandeali2018-08-292-9/+12
* safeGetPartialAmount (#1035)Amir Bandeali2018-08-297-110/+442
* fix(contracts): Catch cases where the actual error differs from the expected ...Alex Browne2018-08-282-26/+109
* 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
* Merge pull request #986 from 0xProject/feature/contracts/assertionsAmir Bandeali2018-08-253-30/+113
|\
| * Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js int...Remco Bloemen2018-08-2527-286/+1066
| |\
| * | 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 compounded...Greg Hysen2018-08-251-38/+29
| |/ |/|
* | Fix buildAmir Bandeali2018-08-251-4/+7
* | Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow var...Amir Bandeali2018-08-256-61/+11
* | 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 occuri...Amir Bandeali2018-08-251-35/+75
* | Add nonReentrant modifiers on functions that use getCurrentContextAddress onl...Amir Bandeali2018-08-254-15/+17
* | 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 ma...Amir Bandeali2018-08-256-41/+148
* | 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
|\ \
| * | 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 message...Greg Hysen2018-08-251-0/+18
* | 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
* 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 wit...Fabio Berger2018-08-223-3/+3
* | 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.0dependabot[bot]2018-08-151-1/+1
| * | [Order-utils] Order is valid when maker amount is very smallJacob Evans2018-08-154-1/+43
| |/
| * 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
| * Merge pull request #914 from 0xProject/feature/0x.js/ec-signature-stringJacob Evans2018-08-141-6/+6
| |\
| | * Rename from SignerProviderType.EthSign to SignerType.DefaultJacob Evans2018-08-111-5/+5
| | * Introduce SignerProviderTypeJacob Evans2018-08-091-6/+6
| * | Merge pull request #948 from 0xProject/feature/contracts/forwarderFoKAmir Bandeali2018-08-1010-163/+84
| |\ \
| | * | 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
| |\ \ | | |/ | |/|
| | * 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 templatesAlex Browne2018-08-091-3/+3
| * | Merge pull request #946 from 0xProject/fix/contracts/signatureValidatorCommentsAmir Bandeali2018-08-091-4/+9
| |\ \ | | |/ | |/|
| | * 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.2Alex Browne2018-08-092-5/+20
| * | Use asm for hashEIP712Message, increment free memory pointer after asm hashin...Amir Bandeali2018-08-092-9/+28
| * | 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
* | Add missing doc commentsFabio Berger2018-08-031-0/+6
|/
* Add combinatorial tests for internal Exchange functions (#807)Alex Browne2018-07-2712-128/+756
* 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
* 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
* 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
* Revert to publishing ethereum-typesFabio Berger2018-07-261-1/+1
* Temporarily have all packages depend on an older, published version of ethere...Fabio Berger2018-07-261-1/+1
* 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
|\