| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #1039 from 0xProject/fix/contracts/audit2Fixes | Greg Hysen | 2018-08-30 | 5 | -17/+115 |
|\ |
|
| * | Typos in LibBytes tests | Greg Hysen | 2018-08-30 | 1 | -6/+6 |
| * | Reverted syntax used by readBytes4 in AssetProxyOwner to be compatible with S... | Greg Hysen | 2018-08-30 | 1 | -5/+1 |
| * | More tests for LibBytes | Greg Hysen | 2018-08-30 | 1 | -3/+16 |
| * | Updated comments for ERC20 proxy to clarify how we load the token address fro... | Greg Hysen | 2018-08-30 | 2 | -9/+60 |
| * | Updated readBytes4 to match spec + added unit tests. These are 3.5/3.6 from a... | Greg Hysen | 2018-08-30 | 3 | -4/+42 |
* | | feat: Add support for TypeScript project references (#991) | Alex Browne | 2018-08-30 | 3 | -8/+5 |
|/ |
|
* | Making rounding consistent in calculateFillResults | Amir Bandeali | 2018-08-29 | 2 | -9/+12 |
* | safeGetPartialAmount (#1035) | Amir Bandeali | 2018-08-29 | 7 | -110/+442 |
* | fix(contracts): Catch cases where the actual error differs from the expected ... | Alex Browne | 2018-08-28 | 2 | -26/+109 |
* | Add clarifying comments | Amir Bandeali | 2018-08-28 | 2 | -0/+2 |
* | Remove redundant mstores from fillOrderNoThrow | Amir Bandeali | 2018-08-28 | 1 | -8/+1 |
* | fix(contracts): Use correct error message for division by zero | Alex Browne | 2018-08-28 | 1 | -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.6 | Fabio Berger | 2018-08-27 | 1 | -19/+15 |
* | Merge pull request #986 from 0xProject/feature/contracts/assertions | Amir Bandeali | 2018-08-25 | 3 | -30/+113 |
|\ |
|
| * | Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js int... | Remco Bloemen | 2018-08-25 | 27 | -286/+1066 |
| |\ |
|
| * | | Revert maker not equal taker check | Remco Bloemen | 2018-08-25 | 1 | -6/+1 |
| * | | Fix mixin api | Remco Bloemen | 2018-08-25 | 3 | -21/+36 |
| * | | Split into assertFillable and assertValidFill | Remco Bloemen | 2018-08-25 | 2 | -29/+43 |
| * | | Disallow self filling | Remco Bloemen | 2018-08-25 | 1 | -1/+7 |
| * | | Remove BUG_ from revert reasons | Remco Bloemen | 2018-08-25 | 1 | -3/+3 |
| * | | Document accetable price check | Remco Bloemen | 2018-08-25 | 1 | -2/+16 |
| * | | Fix taker overpay check | Remco Bloemen | 2018-08-25 | 1 | -1/+1 |
| * | | Check fillable early | Remco Bloemen | 2018-08-25 | 1 | -0/+6 |
| * | | Update for new assertValidFill signature | Remco Bloemen | 2018-08-25 | 2 | -5/+8 |
| * | | Add overfill and price assertion to assertValidFill | Remco Bloemen | 2018-08-25 | 2 | -2/+32 |
* | | | Added comments to order matching | Greg Hysen | 2018-08-25 | 1 | -1/+13 |
* | | | Rephrased some of the math in MixinMatchOrders to improve readability | Greg Hysen | 2018-08-25 | 1 | -3/+3 |
* | | | Run all tests | Greg Hysen | 2018-08-25 | 1 | -1/+1 |
* | | | Give right maker better price when correct value is not integral | Greg Hysen | 2018-08-25 | 1 | -10/+14 |
* | | | Extract only `fill` event logs | Greg Hysen | 2018-08-25 | 1 | -4/+5 |
* | | | Added temporary @todo to MixinMatchOrders | Greg Hysen | 2018-08-25 | 1 | -4/+4 |
* | | | Wording in MixinMatchOrders | Greg Hysen | 2018-08-25 | 1 | -2/+2 |
* | | | Addressed linter errors in match order tesster | Greg Hysen | 2018-08-25 | 1 | -9/+2 |
* | | | Removed a redundant comment from matchOrders | Greg Hysen | 2018-08-25 | 1 | -5/+1 |
* | | | Tests for matchOrders edge cases | Greg Hysen | 2018-08-25 | 1 | -13/+71 |
* | | | Swapped direction of `expect` values to match output in failure cases | Greg Hysen | 2018-08-25 | 1 | -37/+26 |
* | | | Renaming verify -> assert in order matching | Greg Hysen | 2018-08-25 | 2 | -53/+52 |
* | | | Fixed a function comment | Greg Hysen | 2018-08-25 | 1 | -1/+2 |
* | | | Added function signature comments | Greg Hysen | 2018-08-25 | 3 | -239/+233 |
* | | | Added `expect` messages for checking left/right order states | Greg Hysen | 2018-08-25 | 1 | -2/+6 |
* | | | Ran prettier and linter | Greg Hysen | 2018-08-25 | 3 | -224/+317 |
* | | | Updated all existing match order tests to use new format | Greg Hysen | 2018-08-25 | 2 | -128/+301 |
* | | | Passes comprehensive test | Greg Hysen | 2018-08-25 | 1 | -191/+141 |
* | | | Verify logs | Greg Hysen | 2018-08-25 | 1 | -72/+44 |
* | | | First balance test with intentional values | Greg Hysen | 2018-08-25 | 2 | -59/+95 |
* | | | Ironing out the new set of test cases for order matchubng | Greg Hysen | 2018-08-25 | 2 | -11/+102 |
* | | | Rounding for fees in match orders addressed, plus example | Greg Hysen | 2018-08-25 | 2 | -9/+83 |
* | | | All existing tests pass. | Greg Hysen | 2018-08-25 | 2 | -21/+137 |
* | | | Added fees to matchOrders (previously in calculateFillResults | Greg Hysen | 2018-08-25 | 1 | -0/+24 |
* | | | Removed calculateFillResults from matchOrders workflow. Eliminates compounded... | Greg Hysen | 2018-08-25 | 1 | -38/+29 |
| |/
|/| |
|
* | | Fix build | Amir Bandeali | 2018-08-25 | 1 | -4/+7 |
* | | Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow var... | Amir Bandeali | 2018-08-25 | 6 | -61/+11 |
* | | Add tests for matchOrders | Amir Bandeali | 2018-08-25 | 2 | -122/+53 |
* | | Add reentrancy tests for fillOrder and wrapper functions | Amir Bandeali | 2018-08-25 | 4 | -0/+239 |
* | | Update ReentrantERC20Token with new functions and check that revert is occuri... | Amir Bandeali | 2018-08-25 | 1 | -35/+75 |
* | | Add nonReentrant modifiers on functions that use getCurrentContextAddress onl... | Amir Bandeali | 2018-08-25 | 4 | -15/+17 |
* | | Split modifiers into check only and check, lock, unlock | Amir Bandeali | 2018-08-25 | 1 | -0/+13 |
* | | Add ReentrantToken | Amir Bandeali | 2018-08-25 | 3 | -1/+175 |
* | | Add internal fill functions, add reentrancy guard to public functions that ma... | Amir Bandeali | 2018-08-25 | 6 | -41/+148 |
* | | Add ReentrancyGuard contract | Amir Bandeali | 2018-08-25 | 1 | -0/+44 |
* | | Remove redundant sload from getCurrentContextAddress | Amir Bandeali | 2018-08-25 | 1 | -1/+2 |
* | | Merge pull request #1003 from 0xProject/feature/contracts/roundup | Amir Bandeali | 2018-08-25 | 13 | -101/+377 |
|\ \ |
|
| * | | Fix linting errors | Amir Bandeali | 2018-08-25 | 1 | -2/+2 |
| * | | Stylistic fixes | Remco Bloemen | 2018-08-25 | 1 | -5/+20 |
| * | | Append -Floor to getPartialAmount and isRoundingError | Remco Bloemen | 2018-08-25 | 13 | -45/+45 |
| * | | Disambiguate the operator precedence | Remco Bloemen | 2018-08-25 | 1 | -2/+2 |
| * | | Add tests | Remco Bloemen | 2018-08-25 | 4 | -23/+145 |
| * | | Add docs | Remco Bloemen | 2018-08-25 | 1 | -2/+7 |
| * | | Fix incorect modulus | Remco Bloemen | 2018-08-25 | 1 | -4/+2 |
| * | | Add DIVISION_BY_ZERO to getPartialAmount for consistency | Remco Bloemen | 2018-08-25 | 2 | -20/+18 |
| * | | Remove .only | Remco Bloemen | 2018-08-25 | 1 | -1/+1 |
| * | | Improve getPartialAmountCeil docs | Remco Bloemen | 2018-08-25 | 1 | -3/+3 |
| * | | Add tests for getPartialAmountCeil | Remco Bloemen | 2018-08-25 | 2 | -0/+57 |
| * | | Add isRoundingErrorCeil | Remco Bloemen | 2018-08-25 | 1 | -0/+29 |
| * | | Add getPartialAmountCeil | Remco Bloemen | 2018-08-25 | 1 | -3/+32 |
| * | | Handle zero case | Remco Bloemen | 2018-08-25 | 1 | -3/+15 |
| * | | Update tests | Remco Bloemen | 2018-08-25 | 2 | -13/+17 |
| * | | Fix isRoundingError | Remco Bloemen | 2018-08-25 | 1 | -10/+17 |
* | | | Skip self-transfers | Remco Bloemen | 2018-08-25 | 1 | -1/+1 |
| |/
|/| |
|
* | | SignatureType.Trezor -> SignatureType.EthSign in Signature Validator tests | Greg Hysen | 2018-08-25 | 1 | -1/+1 |
* | | Test case for Trezor Model T signature | Greg Hysen | 2018-08-25 | 1 | -0/+18 |
* | | Fixed trezor personal message in client+contracts; added a test using message... | Greg Hysen | 2018-08-25 | 1 | -0/+18 |
* | | Remove Trezor SignatureType | Amir Bandeali | 2018-08-25 | 3 | -77/+1 |
* | | Remove SignatureType.Caller | Amir Bandeali | 2018-08-25 | 4 | -57/+16 |
* | | Rethrow Wallet and Validator errors | Amir Bandeali | 2018-08-25 | 3 | -22/+42 |
* | | Rename TestStaticCall => TestStaticCallReceiver | Amir Bandeali | 2018-08-25 | 6 | -15/+16 |
* | | Revert if undefined function called in AssetProxies | Amir Bandeali | 2018-08-25 | 3 | -1/+29 |
* | | Remove pragma experimental v0.5.0 and use staticcall is assembly | Amir Bandeali | 2018-08-25 | 6 | -15/+198 |
* | | Add pragma experimental v0.5.0 to SignatureValidator and add tests | Amir Bandeali | 2018-08-25 | 7 | -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.4 | Fabio Berger | 2018-08-25 | 1 | -22/+18 |
* | Fix many linter errors that showed up upon upgrading tsutil | Fabio Berger | 2018-08-23 | 3 | -4/+4 |
* | Merge development branch | Fabio Berger | 2018-08-22 | 47 | -688/+2197 |
|\ |
|
| * | Add getBalancesAndAllowances | Amir Bandeali | 2018-08-22 | 2 | -0/+69 |
| * | Add ZRX balances and allowances to TraderInfo | Amir Bandeali | 2018-08-22 | 2 | -10/+122 |
| * | Add tests | Amir Bandeali | 2018-08-22 | 5 | -1/+451 |
| * | Don't throw if ERC721 token isn't owned | Amir Bandeali | 2018-08-22 | 1 | -1/+51 |
| * | Add OrderValidator contract | Amir Bandeali | 2018-08-22 | 14 | -23/+163 |
| * | Remove redundant constructor args | Amir Bandeali | 2018-08-22 | 3 | -10/+8 |
| * | fix(sol-cov): Remove old files and update config.contractsDir | Alex Browne | 2018-08-21 | 1 | -1/+1 |
| * | Fix typos, run prettier, and allow anyone to call on DummyERC721Token | Amir Bandeali | 2018-08-17 | 6 | -14/+14 |
| * | Fix Geth tests | Amir Bandeali | 2018-08-17 | 1 | -9/+9 |
| * | Fix linting errors | Amir Bandeali | 2018-08-17 | 8 | -11/+10 |
| * | Fix tests that assumed logs were being filtered | Amir Bandeali | 2018-08-17 | 4 | -4/+11 |
| * | Add tests for ERC721Token | Amir Bandeali | 2018-08-17 | 4 | -2/+281 |
| * | Add ERC721Receiver that returns incorrect value | Amir Bandeali | 2018-08-17 | 3 | -1/+68 |
| * | Increase max mintable amount | Amir Bandeali | 2018-08-17 | 1 | -1/+1 |
| * | Fix DummyERC721Receiver | Amir Bandeali | 2018-08-17 | 1 | -32/+32 |
| * | Add tests for ERC20 token with no return values | Amir Bandeali | 2018-08-17 | 6 | -5/+261 |
| * | Add constructor back to DummyERC721Token | Amir Bandeali | 2018-08-17 | 2 | -0/+14 |
| * | Restructure directories | Amir Bandeali | 2018-08-17 | 6 | -52/+103 |
| * | Update checking for erc721 existence | Amir Bandeali | 2018-08-17 | 1 | -3/+2 |
| * | Update ERC20Token | Amir Bandeali | 2018-08-17 | 6 | -47/+113 |
| * | Optimize ERC721Token | Amir Bandeali | 2018-08-17 | 5 | -510/+462 |
* | | Move types from sol-compiler to types so they can be used in other places wit... | Fabio Berger | 2018-08-22 | 3 | -3/+3 |
* | | Fix comment | Fabio Berger | 2018-08-17 | 1 | -1/+2 |
* | | Merge development | Fabio Berger | 2018-08-17 | 5 | -3/+45 |
|\| |
|
| * | Merge pull request #928 from 0xProject/dependabot/npm_and_yarn/copyfiles-2.0.0 | Fabio Berger | 2018-08-17 | 1 | -1/+1 |
| |\ |
|
| | * | Bump copyfiles from 1.2.0 to 2.0.0 | dependabot[bot] | 2018-08-15 | 1 | -1/+1 |
| * | | [Order-utils] Order is valid when maker amount is very small | Jacob Evans | 2018-08-15 | 4 | -1/+43 |
| |/ |
|
| * | feat: Upgrade TypeScript to 3.0.1 | Alex Browne | 2018-08-15 | 1 | -1/+1 |
* | | Merge development | Fabio Berger | 2018-08-15 | 22 | -255/+292 |
|\| |
|
| * | Publish | Alex Browne | 2018-08-14 | 1 | -14/+14 |
| * | Merge pull request #914 from 0xProject/feature/0x.js/ec-signature-string | Jacob Evans | 2018-08-14 | 1 | -6/+6 |
| |\ |
|
| | * | Rename from SignerProviderType.EthSign to SignerType.Default | Jacob Evans | 2018-08-11 | 1 | -5/+5 |
| | * | Introduce SignerProviderType | Jacob Evans | 2018-08-09 | 1 | -6/+6 |
| * | | Merge pull request #948 from 0xProject/feature/contracts/forwarderFoK | Amir Bandeali | 2018-08-10 | 10 | -163/+84 |
| |\ \ |
|
| | * | | Change withdrawERC20 => withdrawAsset, reuse transfer logic | Amir Bandeali | 2018-08-10 | 6 | -22/+40 |
| | * | | Make marketBuy functions revert if entire amount not filled | Amir Bandeali | 2018-08-10 | 6 | -141/+44 |
| * | | | fix: Update dependencies | Alex Browne | 2018-08-10 | 1 | -2/+2 |
| |/ / |
|
| * | | Merge pull request #941 from 0xProject/feature/contracts/returnValuesTests | Amir Bandeali | 2018-08-10 | 6 | -23/+98 |
| |\ \
| | |/
| |/| |
|
| | * | Revert incrementing memory ptr in dispatchTransferFrom | Amir Bandeali | 2018-08-09 | 3 | -9/+3 |
| | * | Test abiEncodeFillOrder as part of combinatorial follOrder tests | Amir Bandeali | 2018-08-09 | 3 | -5/+24 |
| | * | Increment free memory pointer for internal Exchange functions that use asm | Amir Bandeali | 2018-08-09 | 3 | -12/+34 |
| | * | Add return values to combinatorial fillOrder tests | Amir Bandeali | 2018-08-09 | 2 | -11/+51 |
| * | | Merge pull request #915 from 0xProject/feature/encode-decode-checks | Alex Browne | 2018-08-09 | 1 | -3/+3 |
| |\ \
| | |/
| |/| |
|
| | * | Add strictArgumentEncodingCheck to BaseContract and use it in contract templates | Alex Browne | 2018-08-09 | 1 | -3/+3 |
| * | | Merge pull request #946 from 0xProject/fix/contracts/signatureValidatorComments | Amir Bandeali | 2018-08-09 | 1 | -4/+9 |
| |\ \
| | |/
| |/| |
|
| | * | fix comments and styling for MixinSignatureValidator | Amir Bandeali | 2018-08-09 | 1 | -4/+9 |
| * | | Merge pull request #945 from 0xProject/fix/typescript-2.9.2 | Alex Browne | 2018-08-09 | 2 | -5/+20 |
| |\ \
| | |/
| |/| |
|
| | * | Update TypeScript to version 2.9.2 | Alex Browne | 2018-08-09 | 2 | -5/+20 |
| * | | Use asm for hashEIP712Message, increment free memory pointer after asm hashin... | Amir Bandeali | 2018-08-09 | 2 | -9/+28 |
| * | | Fix comments, styling, and optimize hashOrder | Amir Bandeali | 2018-08-08 | 3 | -25/+33 |
| |/ |
|
* | | Rename EIP712Utils to eip712Utils since objectLiterals shouldn't start with caps | Fabio Berger | 2018-08-04 | 2 | -5/+5 |
* | | Stop exporting crypto | Fabio Berger | 2018-08-03 | 1 | -1/+2 |
* | | Make signature_util into an object literal so related functions are rendered ... | Fabio Berger | 2018-08-03 | 1 | -5/+17 |
* | | Add missing doc comments | Fabio Berger | 2018-08-03 | 1 | -0/+6 |
|/ |
|
* | Add combinatorial tests for internal Exchange functions (#807) | Alex Browne | 2018-07-27 | 12 | -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.4 | Fabio Berger | 2018-07-26 | 1 | -11/+11 |
* | Point to actual current version | Fabio Berger | 2018-07-26 | 1 | -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.3 | Fabio Berger | 2018-07-26 | 1 | -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.2 | Fabio Berger | 2018-07-26 | 1 | -22/+18 |
* | Revert to publishing ethereum-types | Fabio Berger | 2018-07-26 | 1 | -1/+1 |
* | Temporarily have all packages depend on an older, published version of ethere... | Fabio Berger | 2018-07-26 | 1 | -1/+1 |
* | Modify WETH9 event arg names to be identical to ERC20 standard suggested names | Fabio Berger | 2018-07-26 | 1 | -4/+4 |
* | merge v2-prototype | Fabio Berger | 2018-07-25 | 2 | -2/+2 |
|\ |
|
| * | Update orderEpoch comments | Amir Bandeali | 2018-07-25 | 2 | -2/+2 |
* | | Revert "Revert "Publish"" | Fabio Berger | 2018-07-24 | 1 | -16/+16 |
|/ |
|
* | Remove ERC721 callback functions | Amir Bandeali | 2018-07-23 | 4 | -49/+3 |
* | Use != instead of > in loops, add sanity checks to market fill functions | Amir Bandeali | 2018-07-23 | 3 | -19/+19 |
* | Add more tests and fixes | Amir Bandeali | 2018-07-23 | 7 | -411/+483 |
* | Remove MConstants and MixinConstants for LibConstants | Amir Bandeali | 2018-07-23 | 8 | -57/+23 |
* | Remove redundant external call by reimplementing fillOrderNoThrow | Amir Bandeali | 2018-07-23 | 6 | -166/+355 |
* | Remove orders length check | Amir Bandeali | 2018-07-23 | 2 | -11/+0 |
* | Add assertValidFillResults | Amir Bandeali | 2018-07-23 | 1 | -61/+88 |
* | Get actual gasPrice from transaction instead of setting default | Amir Bandeali | 2018-07-23 | 1 | -35/+34 |
* | Store orders length in varible before looping over orders | Amir Bandeali | 2018-07-23 | 2 | -14/+25 |
* | Use transferFrom instead of safeTransferFrom | Amir Bandeali | 2018-07-23 | 2 | -6/+2 |
* | Fix minimal tests | Amir Bandeali | 2018-07-23 | 3 | -729/+747 |
* | Fix rounding error issues, use different logic when makerAsset is ZRX | Amir Bandeali | 2018-07-23 | 6 | -52/+95 |
* | Rename marketSellEth => marketSellWeth | Amir Bandeali | 2018-07-23 | 2 | -3/+3 |
* | Update percentage constants | Amir Bandeali | 2018-07-23 | 3 | -17/+18 |
* | Update transferEthFeeAndRefund, add check to ERC721 transfer | Amir Bandeali | 2018-07-23 | 6 | -26/+54 |
* | Refactor forwarding contract architecture, remove batch functions | Amir Bandeali | 2018-07-23 | 20 | -1038/+572 |
* | Add tests to verify ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 5 | -1/+77 |
* | Add comments for deploying with constant ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 2 | -2/+15 |
* | Move example contracts into new examples dir | Amir Bandeali | 2018-07-23 | 10 | -24/+33 |
* | Merge pull request #877 from 0xProject/feature/contracts/removeERC721Callback | Amir Bandeali | 2018-07-23 | 5 | -188/+31 |
|\ |
|
| * | Fixed merge errors | Greg Hysen | 2018-07-18 | 1 | -2/+0 |
| * | Fixed merge error | Greg Hysen | 2018-07-18 | 1 | -11/+11 |
| * | Ran prettier | Greg Hysen | 2018-07-18 | 1 | -11/+11 |
| * | Removed receiverData from ERC721 Proxy Id generation | Greg Hysen | 2018-07-18 | 4 | -8/+6 |
| * | Removed receiverData and `onReceive` callback from ERC721 proxy. | Greg Hysen | 2018-07-18 | 3 | -178/+25 |
* | | Fix version of ethereumjs-abi to 0.6.5 to fix decoding bug | Fabio Berger | 2018-07-22 | 1 | -1/+1 |
* | | fix decodeAssetData for addresses starting in 0 | Luke Autry | 2018-07-22 | 1 | -2/+2 |
* | | Hard code fillOrder selector into abiEncodeFillOrder | Amir Bandeali | 2018-07-20 | 1 | -7/+4 |
* | | Returns byte array instead of memory range for encoding fillOrder calldata | Greg Hysen | 2018-07-20 | 2 | -24/+26 |
* | | Created LibAbiEncoder with `fillOrderNoThrow` | Greg Hysen | 2018-07-20 | 2 | -170/+235 |
* | | Change all package to depend on the new @0xproject/sol-cov@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | Change all package to depend on the new @0xproject/order-utils@1.0.0-rc.1 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | Change all package to depend on the new @0xproject/sol-compiler@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | Change all package to depend on the new @0xproject/dev-utils@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | Change all package to depend on the new @0xproject/subproviders@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | Change all package to depend on the new @0xproject/base-contract@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | Change all package to depend on the new @0xproject/web3-wrapper@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | Change all package to depend on the new @0xproject/abi-gen@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | Change all package to depend on the new @0xproject/utils@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | Change all package to depend on the new @0xproject/types@1.0.0-rc.1 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | Change all package to depend on the new @0xproject/tslint-config@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | Change all package to depend on the new @0xproject/typescript-typings@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | Change all package to depend on the new ethereum-types@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
* | | merge v2-prototype | Fabio Berger | 2018-07-18 | 2 | -1/+2 |
|\ \ |
|
| * | | Merge branch 'v2-prototype' into feature/order-watcher-v2 | Leonid Logvinov | 2018-07-18 | 18 | -182/+201 |
| |\| |
|
| * | | Merge | Leonid Logvinov | 2018-07-18 | 1 | -1/+1 |
| * | | Merge branch 'v2-prototype' into feature/order-watcher-v2 | Leonid Logvinov | 2018-07-18 | 29 | -186/+534 |
| |\ \ |
|
| * | | | Upgrade tslint to use prefer-readonly | Leonid Logvinov | 2018-07-13 | 1 | -1/+1 |
| * | | | Update contract artifacts | Leonid Logvinov | 2018-07-13 | 1 | -0/+1 |
* | | | | Update package versions | Fabio Berger | 2018-07-18 | 1 | -10/+10 |
| |_|/
|/| | |
|
* | | | Merge pull request #884 from 0xProject/export-more-0x.js | Fabio Berger | 2018-07-18 | 18 | -182/+201 |
|\ \ \
| |_|/
|/| | |
|
| * | | Fix prettier | Fabio Berger | 2018-07-18 | 2 | -9/+3 |
| * | | Fix linter | Fabio Berger | 2018-07-18 | 1 | -1/+1 |
| * | | merge v2-prototype | Fabio Berger | 2018-07-18 | 15 | -138/+484 |
| |\ \ |
|
| * | | | Rename decodeAssetDataId to decodeAssetProxyId for consistency | Fabio Berger | 2018-07-18 | 4 | -11/+11 |
| * | | | Move encodeUint256 & decodeUint256 out of assetDataUtils since we don't want ... | Fabio Berger | 2018-07-18 | 4 | -6/+31 |
| * | | | Rename assetProxyUtils to assetDataUtils | Fabio Berger | 2018-07-17 | 16 | -176/+176 |
| | |/
| |/| |
|
* | | | Merge pull request #883 from 0xProject/feature/tslint-improvements | Leonid Logvinov | 2018-07-18 | 16 | -48/+50 |
|\ \ \
| |_|/
|/| | |
|
| * | | Fix tslint issues | Leonid Logvinov | 2018-07-17 | 15 | -47/+49 |
| * | | Upgrade tslint to the newest version | Leonid Logvinov | 2018-07-17 | 1 | -1/+1 |
| |/ |
|
* | | Add tests for getOrderInfo and getOrdersInfo | Amir Bandeali | 2018-07-18 | 3 | -5/+311 |
* | | Reorder checks in getOrderInfo | Amir Bandeali | 2018-07-18 | 1 | -7/+9 |
* | | Add getOrdersInfo function | Amir Bandeali | 2018-07-18 | 2 | -0/+24 |
* | | Fix bugs having to do with block timestamps and order expirationTimes | Alex Browne | 2018-07-17 | 11 | -128/+142 |
|/ |
|
* | Remove extra ERC20ProxyId from Forwarder constructor | Jacob Evans | 2018-07-11 | 2 | -3/+1 |
* | Add Migrations for Forwarder | Jacob Evans | 2018-07-11 | 1 | -2/+2 |
* | Add revert reasons and optimization to safeMath | Amir Bandeali | 2018-07-11 | 1 | -3/+15 |
* | Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytes | Amir Bandeali | 2018-07-11 | 7 | -17/+76 |
* | Update package versions | Fabio Berger | 2018-07-10 | 1 | -11/+11 |
* | Move functions out of Forwarder.sol | Amir Bandeali | 2018-07-08 | 12 | -42/+35 |
* | Add interfaces and mixins | Amir Bandeali | 2018-07-08 | 16 | -61/+573 |
* | Combine mixins | Amir Bandeali | 2018-07-08 | 6 | -284/+218 |
* | Use interfaces instead of full contracts | Amir Bandeali | 2018-07-08 | 4 | -7/+39 |
* | Add lint-contracts to default lint command | Amir Bandeali | 2018-07-07 | 1 | -1/+1 |
* | Remove TODOs that won't be addressed | Amir Bandeali | 2018-07-07 | 4 | -10/+3 |
* | Remove AbiV2 where unused | Amir Bandeali | 2018-07-07 | 23 | -38/+27 |
* | Only reset currentContextAddress if it was previously updated | Amir Bandeali | 2018-07-07 | 1 | -8/+11 |
* | Change uint => uint256 | Amir Bandeali | 2018-07-07 | 1 | -8/+7 |
* | Apply new linter rules | Amir Bandeali | 2018-07-07 | 74 | -299/+351 |
* | Update linter config | Amir Bandeali | 2018-07-07 | 2 | -11/+14 |
* | Fix imports | Leonid Logvinov | 2018-07-06 | 1 | -2/+2 |
* | Merge pull request #822 from 0xProject/v2-contract-wrappers-WIP | Leonid Logvinov | 2018-07-06 | 14 | -66/+68 |
|\ |
|
| * | Make it possible to configure block polling interval in base contract wrapper | Leonid Logvinov | 2018-07-05 | 14 | -66/+68 |
* | | Types: Move Forwarder Revert Reason into types package | Jacob Evans | 2018-07-06 | 1 | -13/+6 |
* | | Forwarder specify the revert reasons | Jacob Evans | 2018-07-06 | 1 | -21/+31 |
* | | Forwarder fix linter error | Jacob Evans | 2018-07-06 | 1 | -1/+1 |
* | | Update to new assertions | Jacob Evans | 2018-07-06 | 1 | -18/+16 |
* | | Merge pull request #522 from 0xProject/feature/contracts/forwarder | Jacob Evans | 2018-07-06 | 18 | -8/+2163 |
|\ \ |
|
| * | | Forwarding contract (squashed commits) | Jacob Evans | 2018-07-06 | 18 | -8/+2163 |
* | | | Contracts 2.0.0 were linted with solhint | Alex Shafranovich | 2018-07-06 | 60 | -1/+78 |
* | | | Added Solhint package and 'lint-contracts' npm script | Alex Shafranovich | 2018-07-06 | 2 | -1/+20 |
| |/
|/| |
|
* | | merge v2-prototype | Fabio Berger | 2018-07-04 | 17 | -186/+235 |
|\ \ |
|