Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix geth tests | Amir Bandeali | 2018-09-04 | 1 | -4/+6 |
| | |||||
* | Add more tests for MultiSigWalletWithTimeLock | Amir Bandeali | 2018-09-04 | 1 | -0/+5 |
| | |||||
* | Merge pull request #1045 from 0xProject/feature/contracts/cancelOrderInternal | Amir Bandeali | 2018-08-31 | 1 | -0/+1 |
|\ | | | | | Add cancelOrderInternal, use within batchCancelOrders | ||||
| * | Add cancelOrderInternal, use within batchCancelOrders | Amir Bandeali | 2018-08-31 | 1 | -0/+1 |
| | | |||||
* | | Add tests for token that returns >32 bytes | Amir Bandeali | 2018-08-31 | 1 | -0/+2 |
|/ | |||||
* | Fix geth tests | Amir Bandeali | 2018-08-30 | 1 | -2/+15 |
| | |||||
* | feat: Add support for TypeScript project references (#991) | Alex Browne | 2018-08-30 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | fix(contracts): Catch cases where the actual error differs from the expected ↵ | Alex Browne | 2018-08-28 | 1 | -26/+46 |
| | | | | | | | | | | error (#1032) * Catch cases where the actual error differs from the expected error * Add tests for testWithReferenceFuncAsync * Small style and comment fixes | ||||
* | Extract only `fill` event logs | Greg Hysen | 2018-08-25 | 1 | -4/+5 |
| | |||||
* | Addressed linter errors in match order tesster | Greg Hysen | 2018-08-25 | 1 | -9/+2 |
| | |||||
* | 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 | 1 | -35/+34 |
| | |||||
* | Fixed a function comment | Greg Hysen | 2018-08-25 | 1 | -1/+2 |
| | |||||
* | Added function signature comments | Greg Hysen | 2018-08-25 | 2 | -212/+206 |
| | |||||
* | 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 | 2 | -183/+314 |
| | |||||
* | Updated all existing match order tests to use new format | Greg Hysen | 2018-08-25 | 1 | -6/+14 |
| | |||||
* | 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 | 1 | -48/+71 |
| | |||||
* | Ironing out the new set of test cases for order matchubng | Greg Hysen | 2018-08-25 | 1 | -10/+101 |
| | |||||
* | Rounding for fees in match orders addressed, plus example | Greg Hysen | 2018-08-25 | 1 | -5/+79 |
| | |||||
* | All existing tests pass. | Greg Hysen | 2018-08-25 | 1 | -20/+33 |
| | |||||
* | Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow ↵ | Amir Bandeali | 2018-08-25 | 1 | -4/+0 |
| | | | | variations | ||||
* | Add reentrancy tests for fillOrder and wrapper functions | Amir Bandeali | 2018-08-25 | 2 | -0/+18 |
| | |||||
* | Merge pull request #1003 from 0xProject/feature/contracts/roundup | Amir Bandeali | 2018-08-25 | 2 | -7/+7 |
|\ | | | | | [contracts] Add getPartialAmountCeil and isRoundingErrorCeil | ||||
| * | Append -Floor to getPartialAmount and isRoundingError | Remco Bloemen | 2018-08-25 | 2 | -7/+7 |
| | | |||||
* | | Rename TestStaticCall => TestStaticCallReceiver | Amir Bandeali | 2018-08-25 | 1 | -2/+2 |
| | | |||||
* | | Add pragma experimental v0.5.0 to SignatureValidator and add tests | Amir Bandeali | 2018-08-25 | 1 | -0/+2 |
|/ | |||||
* | Fix many linter errors that showed up upon upgrading tsutil | Fabio Berger | 2018-08-23 | 2 | -3/+3 |
| | |||||
* | Merge development branch | Fabio Berger | 2018-08-22 | 7 | -9/+20 |
|\ | |||||
| * | Add tests | Amir Bandeali | 2018-08-22 | 1 | -0/+2 |
| | | |||||
| * | Fix linting errors | Amir Bandeali | 2018-08-17 | 4 | -6/+4 |
| | | |||||
| * | Fix tests that assumed logs were being filtered | Amir Bandeali | 2018-08-17 | 2 | -1/+8 |
| | | |||||
| * | Add tests for ERC721Token | Amir Bandeali | 2018-08-17 | 2 | -1/+2 |
| | | |||||
| * | Add tests for ERC20 token with no return values | Amir Bandeali | 2018-08-17 | 1 | -0/+2 |
| | | |||||
| * | Add constructor back to DummyERC721Token | Amir Bandeali | 2018-08-17 | 1 | -0/+2 |
| | | |||||
| * | Update checking for erc721 existence | Amir Bandeali | 2018-08-17 | 1 | -3/+2 |
| | | |||||
* | | Move types from sol-compiler to types so they can be used in other places ↵ | Fabio Berger | 2018-08-22 | 2 | -2/+2 |
| | | | | | | | | without requiring sol-compiler as a dep | ||||
* | | Fix comment | Fabio Berger | 2018-08-17 | 1 | -1/+2 |
| | | |||||
* | | Merge development | Fabio Berger | 2018-08-17 | 3 | -1/+32 |
|\| | |||||
| * | [Order-utils] Order is valid when maker amount is very small | Jacob Evans | 2018-08-15 | 3 | -1/+32 |
| | | | | | | | | | | | | | | 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. | ||||
* | | Merge development | Fabio Berger | 2018-08-15 | 3 | -14/+72 |
|\| | |||||
| * | Change withdrawERC20 => withdrawAsset, reuse transfer logic | Amir Bandeali | 2018-08-10 | 1 | -3/+3 |
| | | |||||
| * | Test abiEncodeFillOrder as part of combinatorial follOrder tests | Amir Bandeali | 2018-08-09 | 2 | -5/+23 |
| | | |||||
| * | Add return values to combinatorial fillOrder tests | Amir Bandeali | 2018-08-09 | 2 | -11/+51 |
| | | |||||
* | | Rename EIP712Utils to eip712Utils since objectLiterals shouldn't start with caps | Fabio Berger | 2018-08-04 | 1 | -3/+3 |
| | | |||||
* | | Stop exporting crypto | Fabio Berger | 2018-08-03 | 1 | -1/+2 |
| | | |||||
* | | 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 | 5 | -9/+270 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Add more tests and fixes | Amir Bandeali | 2018-07-23 | 1 | -2/+2 |
| | |||||
* | Fix minimal tests | Amir Bandeali | 2018-07-23 | 2 | -164/+64 |
| | |||||
* | Add tests to verify ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 1 | -0/+2 |
| | |||||
* | Move example contracts into new examples dir | Amir Bandeali | 2018-07-23 | 1 | -4/+4 |
| | |||||
* | Merge branch 'v2-prototype' into feature/order-watcher-v2 | Leonid Logvinov | 2018-07-18 | 8 | -40/+59 |
|\ | |||||
| * | Merge pull request #884 from 0xProject/export-more-0x.js | Fabio Berger | 2018-07-18 | 8 | -40/+59 |
| |\ | | | | | | | Export missing V2 pieces from 0x.js | ||||
| | * | Fix prettier | Fabio Berger | 2018-07-18 | 1 | -6/+2 |
| | | | |||||
| | * | merge v2-prototype | Fabio Berger | 2018-07-18 | 3 | -5/+19 |
| | |\ | |||||
| | * | | 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 | 2 | -0/+23 |
| | | | | | | | | | | | | | | | | them exported | ||||
| | * | | Rename assetProxyUtils to assetDataUtils | Fabio Berger | 2018-07-17 | 6 | -36/+36 |
| | | | | |||||
* | | | | Merge | Leonid Logvinov | 2018-07-18 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #883 from 0xProject/feature/tslint-improvements | Leonid Logvinov | 2018-07-18 | 15 | -47/+49 |
|\ \ \ | |_|/ |/| | | New tslint rules | ||||
| * | | Fix tslint issues | Leonid Logvinov | 2018-07-17 | 15 | -47/+49 |
| |/ | |||||
* | | Add tests for getOrderInfo and getOrdersInfo | Amir Bandeali | 2018-07-18 | 1 | -0/+4 |
| | | |||||
* | | Fix bugs having to do with block timestamps and order expirationTimes | Alex Browne | 2018-07-17 | 2 | -5/+15 |
|/ | |||||
* | Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytes | Amir Bandeali | 2018-07-11 | 2 | -2/+8 |
| | |||||
* | Merge pull request #822 from 0xProject/v2-contract-wrappers-WIP | Leonid Logvinov | 2018-07-06 | 4 | -7/+7 |
|\ | | | | | V2 contract wrappers | ||||
| * | Make it possible to configure block polling interval in base contract wrapper | Leonid Logvinov | 2018-07-05 | 4 | -7/+7 |
| | | |||||
* | | Merge pull request #522 from 0xProject/feature/contracts/forwarder | Jacob Evans | 2018-07-06 | 4 | -0/+238 |
|\ \ | |/ |/| | Forwarding contract | ||||
| * | Forwarding contract (squashed commits) | Jacob Evans | 2018-07-06 | 4 | -0/+238 |
| | | |||||
* | | Move NodeType caching out of web3-wrapper and into our internal code | Alex Browne | 2018-07-04 | 1 | -2/+8 |
| | | |||||
* | | Add TransactionReceiptStatus type to ethereum-types | Alex Browne | 2018-07-04 | 1 | -2/+2 |
| | | |||||
* | | Improve robustness of revert reason assertions | Alex Browne | 2018-07-03 | 3 | -61/+105 |
| | | |||||
* | | Fix bug where 18 decimal tokens instead of 5 decimal tokens created | Fabio Berger | 2018-07-02 | 1 | -1/+1 |
| | | |||||
* | | Disable custom-no-magic-number for block | Fabio Berger | 2018-07-02 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'v2-prototype' into fix/five_decimal_scenario | Fabio Berger | 2018-07-02 | 29 | -0/+3451 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (75 commits) Update relayer grid tiles to use Text Fix build Update file structure Update 2.0.0 artifacts Move ledgerhq module declarations to typescript-typings Export LedgerEthereumClient type in subproviders Update artifacts Add logging and updated artifacts Fix migrations Run prettier Add Kovan artifacts Use ledger subprovider Add Kovan migrations Remove state variable from Link component in Portal Make registerAssetProxy append only Update staging api link Change getTransactionReceipt to awaitTransactionMined Move /docs route to the end Remove extra call to scrollIntoView for wallet in onboarding Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes ... | ||||
| * | Fix build | Amir Bandeali | 2018-06-30 | 3 | -25/+27 |
| | | |||||
| * | Update file structure | Amir Bandeali | 2018-06-30 | 28 | -0/+3368 |
|/ | |||||
* | Move contract utils | Leonid Logvinov | 2018-05-24 | 2 | -377/+0 |
| | |||||
* | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-24 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 1 | -7/+10 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Add `are` to boolean naming conventions Fix tslint Fix the tsutils version, fixing ts typings issue Rename some variables in multi_sig_with_time_lock.ts Remove extra awaitTransactionMinedAsync calls Update artifacts Update yarn.lock Fix warnings in Metacoin Upgrade UglifyJS to include ES6 support Add CancelOrder and MatchOrder types Add missing return types Ignore classnames linter rule Apply changes to test/exchange/match_orders.ts Fix some unhandled promise rejections Add awaitTransactionMinedAsync after every sent transaction Add missing blockchainLifecycle calls to contracts tests # Conflicts: # packages/contracts/src/utils/exchange_wrapper.ts # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/dispatcher.ts # packages/contracts/test/multi_sig_with_time_lock.ts | ||||
| * | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | | |||||
* | | | Parse compiler.json in SolCompilerArtifactsAdapter | Leonid Logvinov | 2018-05-23 | 1 | -3/+1 |
| | | | |||||
* | | | Fix a bug in CALL-like opcode handling | Leonid Logvinov | 2018-05-23 | 1 | -3/+3 |
| | | | |||||
* | | | Rename ZeroExArtifactAdapter to SolCompilerArtifactAdapter | Leonid Logvinov | 2018-05-23 | 1 | -2/+2 |
| | | | |||||
* | | | Assign then return | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
| | | | |||||
* | | | Introduce CONFIG_FILE | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
| | | | |||||
* | | | Remove web3Factory.create and remove dev-tools dependency on sol-cov | Leonid Logvinov | 2018-05-23 | 1 | -0/+21 |
| |/ |/| | |||||
* | | Fix tslint issues | Fabio Berger | 2018-05-23 | 1 | -6/+9 |
| | | |||||
* | | Add missing return types | Remco Bloemen | 2018-05-22 | 1 | -1/+1 |
|/ | |||||
* | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 1 | -12/+12 |
| | |||||
* | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 1 | -2/+2 |
| | |||||
* | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ↵ | Greg Hysen | 2018-05-19 | 1 | -118/+125 |
| | | | | we dont need to pass it in on each call. | ||||
* | Cleaned up interface for decoding proxy data. Added a general decoder, which ↵ | Greg Hysen | 2018-05-19 | 1 | -12/+10 |
| | | | | should be useful for the forwarding contract code. | ||||
* | Style improvements to the match orders typescript test class | Greg Hysen | 2018-05-19 | 1 | -18/+14 |
| | |||||
* | Style changes to atomic order matching | Greg Hysen | 2018-05-19 | 1 | -1/+0 |
| | |||||
* | Atomic Order Matching - Tests | Greg Hysen | 2018-05-19 | 1 | -0/+353 |
| | |||||
* | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 3 | -39/+0 |
|\ | |||||
| * | Remove unused deployer docs configs | Leonid Logvinov | 2018-05-10 | 1 | -1/+1 |
| | | |||||
| * | Remove deployer from metacoin and contract tests | Leonid Logvinov | 2018-05-10 | 2 | -19/+5 |
| | | |||||
* | | Move utils dir into src | Amir Bandeali | 2018-04-21 | 1 | -1/+1 |
|/ | |||||
* | Simplify the tests | Fabio Berger | 2018-04-11 | 1 | -1/+1 |
| | |||||
* | Move migrations into separate monorepo subpackage and hook it up to 0x.js ↵ | Fabio Berger | 2018-04-09 | 1 | -1/+1 |
| | | | | and contracts | ||||
* | Move away from using web3 directly in 0x.js tests | Fabio Berger | 2018-04-06 | 1 | -3/+4 |
| | |||||
* | Fix tests | Leonid Logvinov | 2018-04-05 | 1 | -2/+1 |
| | |||||
* | Move our contract templates to accept Provider instead of Web3Wrapper | Leonid Logvinov | 2018-04-04 | 1 | -1/+2 |
| | |||||
* | Make Deployer configurable by jsonrpcUrl instead of jsonrpcPort | Leonid Logvinov | 2018-03-12 | 1 | -1/+1 |
| | |||||
* | Rename useInProcessGanache to shouldUseInProcessGanache | Leonid Logvinov | 2018-03-12 | 1 | -1/+1 |
| | |||||
* | Use in-process Ganache in contracts | Leonid Logvinov | 2018-03-12 | 1 | -1/+2 |
| | |||||
* | Add sol-cover implementation | Leonid Logvinov | 2018-03-12 | 2 | -0/+8 |
| | |||||
* | Fix artifacts path | Amir Bandeali | 2018-02-07 | 1 | -1/+1 |
| | |||||
* | Rename directories | Amir Bandeali | 2018-02-03 | 1 | -1/+1 |
| | |||||
* | Remove truffle from tests | Leonid Logvinov | 2018-01-30 | 1 | -0/+16 |
| | |||||
* | Remove truffle from tokenTransferProxy tests | Leonid Logvinov | 2018-01-30 | 1 | -0/+13 |