Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move packages/contracts to contracts/core | Leonid Logvinov | 2018-12-03 | 54 | -16511/+0 |
| | |||||
* | Don't load assetProxy if currentProxyid is equal to the last seen proxyid | Amir Bandeali | 2018-11-28 | 1 | -0/+1 |
| | |||||
* | Add Exchange tests with MultiAsset orders | Amir Bandeali | 2018-11-28 | 2 | -23/+362 |
| | |||||
* | Fix linting errors | Amir Bandeali | 2018-11-28 | 1 | -0/+2 |
| | |||||
* | Add more tests for MAP | Amir Bandeali | 2018-11-28 | 1 | -14/+341 |
| | |||||
* | Add initial MultiAssetProxy tests | Amir Bandeali | 2018-11-28 | 1 | -189/+478 |
| | |||||
* | Fix async loops in erc721Wrapper | Amir Bandeali | 2018-11-28 | 2 | -3/+3 |
| | |||||
* | fix: remove getApproved check from OrderValidator since approval is removed ↵ | Amir Bandeali | 2018-11-27 | 1 | -5/+8 |
| | | | | after a single transfer | ||||
* | Remove unnecessary conversion to BigNumber | Fabio Berger | 2018-11-12 | 1 | -2/+2 |
| | |||||
* | rename param | Fabio Berger | 2018-11-12 | 1 | -2/+2 |
| | |||||
* | Move signature validation into ↵ | Fabio Berger | 2018-11-10 | 1 | -1/+1 |
| | | | | OrderValidationUtils.validateOrderFillableOrThrowAsync | ||||
* | Fix validateOrderFillableOrThrowAsync method so it also checks order ↵ | Fabio Berger | 2018-11-09 | 2 | -3/+14 |
| | | | | signature, cancelled, cancelledUpTo, and throws helpful error messages | ||||
* | Run prettier and linter | Amir Bandeali | 2018-10-24 | 1 | -2/+0 |
| | |||||
* | Round up for Market Buys in Forwarding Contract. Includes new test cases + ↵ | Greg Hysen | 2018-10-24 | 2 | -4/+272 |
| | | | | regression testing. | ||||
* | chore: change package org from 0xproject to 0x | Jacob Evans | 2018-10-18 | 49 | -141/+141 |
| | |||||
* | Move generated contract wrappers and artifacts into contracts package | Alex Browne | 2018-10-16 | 30 | -499/+107 |
| | |||||
* | Throw and handle errors from Providers. | Jacob Evans | 2018-10-09 | 1 | -1/+1 |
| | | | | | | | In web3 wrapper when a response contains an error field we throw this rather than return response.result which is often undefined. In Signature Utils we handle the error thrown when a user rejects the signing dialogue to prevent double signing. Exposed the ZeroExTransaction JSON schema. In Website only use the MetamaskSubprovider if we can detect the provider is Metamask | ||||
* | Return SignedOrder from signing utils. | Jacob Evans | 2018-10-05 | 1 | -30/+4 |
| | | | | | Create a helper back in EIP712Utils for code cleanup. Moved constants in order-utils into the constants object | ||||
* | Add eth_signTypedData support to our wallet subproviders | Jacob Evans | 2018-10-05 | 2 | -29/+29 |
| | |||||
* | Introduce Metamask Subprovider. | Jacob Evans | 2018-10-05 | 1 | -9/+3 |
| | | | | MM has a number of inconsistencies with other providers when implementing the JSON RPC interface. This subprovider wraps those nuances so they do not leak into the rest of our code | ||||
* | Fix bug where if block wasn't found, getBlockAsync would throw. Now it ↵ | Fabio Berger | 2018-09-24 | 2 | -3/+9 |
| | | | | returns `undefined` | ||||
* | Fix bug in contracts tests | Alex Browne | 2018-09-05 | 1 | -1/+1 |
| | |||||
* | Fix geth tests | Amir Bandeali | 2018-09-04 | 2 | -6/+12 |
| | |||||
* | Add test for external_call visibility | Amir Bandeali | 2018-09-04 | 1 | -0/+15 |
| | |||||
* | Add MultiSigWalletWithTimeLock revert reasons to tests | Amir Bandeali | 2018-09-04 | 2 | -15/+31 |
| | |||||
* | Add more tests for MultiSigWalletWithTimeLock | Amir Bandeali | 2018-09-04 | 2 | -1/+152 |
| | |||||
* | Add test for executeRemoveAuthorizedAddressAtIndex when called by non-owner | Amir Bandeali | 2018-09-04 | 1 | -4/+40 |
| | |||||
* | Revert in Forwarder constructor if ERC20 proxy isn't registered | Amir Bandeali | 2018-09-04 | 1 | -4/+29 |
| | |||||
* | Merge pull request #1047 from 0xProject/feature/re-add-no-unused-variables | Francesco Agosti | 2018-08-31 | 2 | -5/+2 |
|\ | | | | | Re-add no-unused-variable tslint rule | ||||
| * | run prettier | fragosti | 2018-08-31 | 1 | -3/+1 |
| | | |||||
| * | Fix unused vars for react-shared and website | fragosti | 2018-08-31 | 2 | -2/+1 |
| | | |||||
* | | Merge pull request #1046 from ↵ | Greg Hysen | 2018-08-31 | 1 | -0/+94 |
|\ \ | | | | | | | | | | | | | 0xProject/fix/contracts/roundingFeeTestsMatchOrders Test cases for rounding fees in matchOrders | ||||
| * | | Test cases for rounding fees in matchOrders | Greg Hysen | 2018-08-31 | 1 | -0/+94 |
| | | | |||||
* | | | 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 | 2 | -0/+55 |
| | | | |||||
* | | | Add more proxy tests | Amir Bandeali | 2018-08-31 | 1 | -8/+176 |
| | | | |||||
* | | | Update used addresses for authorizable tests | Amir Bandeali | 2018-08-31 | 1 | -2/+2 |
| | | | |||||
* | | | Add test for fillOrder and dispatchTransferFrom where maker == taker | Amir Bandeali | 2018-08-31 | 2 | -1/+92 |
|/ / | |||||
* | | Fix geth tests | Amir Bandeali | 2018-08-30 | 5 | -46/+67 |
| | | |||||
* | | Update AssetProxyOwner to 0.4.24 | Amir Bandeali | 2018-08-30 | 1 | -19/+0 |
| | | |||||
* | | Merge pull request #1039 from 0xProject/fix/contracts/audit2Fixes | Greg Hysen | 2018-08-30 | 1 | -6/+43 |
|\| | | | | | Fixes as-per Audit for LibBytes + ERC20 Proxy Comments | ||||
| * | Typos in LibBytes tests | Greg Hysen | 2018-08-30 | 1 | -6/+6 |
| | | |||||
| * | More tests for LibBytes | Greg Hysen | 2018-08-30 | 1 | -3/+16 |
| | | |||||
| * | Updated readBytes4 to match spec + added unit tests. These are 3.5/3.6 from ↵ | Greg Hysen | 2018-08-30 | 1 | -1/+25 |
| | | | | | | | | audit | ||||
* | | 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 | ||||
* | Making rounding consistent in calculateFillResults | Amir Bandeali | 2018-08-29 | 1 | -7/+10 |
| | |||||
* | safeGetPartialAmount (#1035) | Amir Bandeali | 2018-08-29 | 2 | -87/+314 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Browne | 2018-08-28 | 2 | -26/+109 |
| | | | | | | | | | | error (#1032) * Catch cases where the actual error differs from the expected error * Add tests for testWithReferenceFuncAsync * Small style and comment fixes | ||||
* | fix(contracts): Use correct error message for division by zero | Alex Browne | 2018-08-28 | 1 | -3/+1 |
| | |||||
* | 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 |
| | |||||
* | Addressed linter errors in match order tesster | Greg Hysen | 2018-08-25 | 1 | -9/+2 |
| | |||||
* | 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 | 1 | -5/+79 |
| | |||||
* | All existing tests pass. | Greg Hysen | 2018-08-25 | 2 | -21/+137 |
| | |||||
* | Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow ↵ | Amir Bandeali | 2018-08-25 | 1 | -4/+0 |
| | | | | variations | ||||
* | 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 |
| | |||||
* | Merge pull request #1003 from 0xProject/feature/contracts/roundup | Amir Bandeali | 2018-08-25 | 4 | -65/+179 |
|\ | | | | | [contracts] Add getPartialAmountCeil and isRoundingErrorCeil | ||||
| * | Fix linting errors | Amir Bandeali | 2018-08-25 | 1 | -2/+2 |
| | | |||||
| * | Append -Floor to getPartialAmount and isRoundingError | Remco Bloemen | 2018-08-25 | 4 | -20/+20 |
| | | |||||
| * | Add tests | Remco Bloemen | 2018-08-25 | 2 | -22/+93 |
| | | |||||
| * | Add DIVISION_BY_ZERO to getPartialAmount for consistency | Remco Bloemen | 2018-08-25 | 1 | -16/+15 |
| | | |||||
| * | Remove .only | Remco Bloemen | 2018-08-25 | 1 | -1/+1 |
| | | |||||
| * | Add tests for getPartialAmountCeil | Remco Bloemen | 2018-08-25 | 1 | -0/+40 |
| | | |||||
| * | Update tests | Remco Bloemen | 2018-08-25 | 2 | -13/+17 |
| | | |||||
* | | 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 ↵ | Greg Hysen | 2018-08-25 | 1 | -0/+18 |
| | | | | | | | | message signed by Trezor One (firmware v1.6.2) | ||||
* | | Remove Trezor SignatureType | Amir Bandeali | 2018-08-25 | 1 | -47/+0 |
| | | |||||
* | | Remove SignatureType.Caller | Amir Bandeali | 2018-08-25 | 1 | -26/+0 |
| | | |||||
* | | Rethrow Wallet and Validator errors | Amir Bandeali | 2018-08-25 | 2 | -18/+14 |
| | | |||||
* | | Rename TestStaticCall => TestStaticCallReceiver | Amir Bandeali | 2018-08-25 | 3 | -12/+12 |
| | | |||||
* | | Revert if undefined function called in AssetProxies | Amir Bandeali | 2018-08-25 | 1 | -1/+23 |
| | | |||||
* | | Remove pragma experimental v0.5.0 and use staticcall is assembly | Amir Bandeali | 2018-08-25 | 2 | -11/+70 |
| | | |||||
* | | Add pragma experimental v0.5.0 to SignatureValidator and add tests | Amir Bandeali | 2018-08-25 | 2 | -1/+54 |
|/ | |||||
* | 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 | 17 | -19/+1040 |
|\ | |||||
| * | Add getBalancesAndAllowances | Amir Bandeali | 2018-08-22 | 1 | -0/+50 |
| | | |||||
| * | Add ZRX balances and allowances to TraderInfo | Amir Bandeali | 2018-08-22 | 1 | -3/+106 |
| | | |||||
| * | Add tests | Amir Bandeali | 2018-08-22 | 3 | -0/+449 |
| | | |||||
| * | Remove redundant constructor args | Amir Bandeali | 2018-08-22 | 1 | -2/+0 |
| | | |||||
| * | Fix typos, run prettier, and allow anyone to call on DummyERC721Token | Amir Bandeali | 2018-08-17 | 1 | -8/+8 |
| | | |||||
| * | 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 tests for ERC20 token with no return values | Amir Bandeali | 2018-08-17 | 3 | -1/+136 |
| | | |||||
| * | 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 | 4 | -1/+43 |
|\| | |||||
| * | [Order-utils] Order is valid when maker amount is very small | Jacob Evans | 2018-08-15 | 4 | -1/+43 |
| | | | | | | | | | | | | | | Previously our min fillable calculation would throw a rounding error when encountering a valid order (with a small maker amount). This was inconsistent with the on-chain logic which allowed this order to be filled. | ||||
* | | Merge development | Fabio Berger | 2018-08-15 | 6 | -77/+137 |
|\| | |||||
| * | Merge pull request #914 from 0xProject/feature/0x.js/ec-signature-string | Jacob Evans | 2018-08-14 | 1 | -6/+6 |
| |\ | | | | | | | 0x.js Return signature as a hex encoded string | ||||
| | * | 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 |
| | | | | | | | | | | | | This allows the developer to indicate the nuanced signer provider. Some have different implementations (trezor, ledger) and others have different implementations (metamask). Breaking the abstraction of eth_sign. EthSign assumes a spec compliant implementation and can be used as a default | ||||
| * | | Change withdrawERC20 => withdrawAsset, reuse transfer logic | Amir Bandeali | 2018-08-10 | 2 | -4/+25 |
| | | | |||||
| * | | Make marketBuy functions revert if entire amount not filled | Amir Bandeali | 2018-08-10 | 1 | -43/+15 |
| | | | |||||
| * | | Merge pull request #941 from 0xProject/feature/contracts/returnValuesTests | Amir Bandeali | 2018-08-10 | 2 | -11/+69 |
| |\ \ | | |/ | |/| | [contracts] Test fillOrder return values and abiEncodeFillOrder | ||||
| | * | 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 |
| | | | |||||
| * | | Add strictArgumentEncodingCheck to BaseContract and use it in contract templates | Alex Browne | 2018-08-09 | 1 | -3/+3 |
| |/ | |||||
| * | Update TypeScript to version 2.9.2 | Alex Browne | 2018-08-09 | 1 | -4/+19 |
| | | |||||
* | | 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 |
| | | | | | | | | together in the docs | ||||
* | | 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 | 8 | -125/+631 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | Use != instead of > in loops, add sanity checks to market fill functions | Amir Bandeali | 2018-07-23 | 1 | -1/+1 |
| | |||||
* | Add more tests and fixes | Amir Bandeali | 2018-07-23 | 2 | -406/+475 |
| | |||||
* | Get actual gasPrice from transaction instead of setting default | Amir Bandeali | 2018-07-23 | 1 | -35/+34 |
| | |||||
* | Use transferFrom instead of safeTransferFrom | Amir Bandeali | 2018-07-23 | 1 | -1/+0 |
| | |||||
* | Fix minimal tests | Amir Bandeali | 2018-07-23 | 3 | -729/+747 |
| | |||||
* | Add tests to verify ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 2 | -0/+18 |
| | |||||
* | Move example contracts into new examples dir | Amir Bandeali | 2018-07-23 | 2 | -12/+12 |
| | |||||
* | Merge pull request #877 from 0xProject/feature/contracts/removeERC721Callback | Amir Bandeali | 2018-07-23 | 2 | -109/+6 |
|\ | | | | | Removed receiverData and `onReceive` callback from ERC721 proxy. | ||||
| * | 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 | 1 | -2/+2 |
| | | |||||
| * | Removed receiverData and `onReceive` callback from ERC721 proxy. | Greg Hysen | 2018-07-18 | 2 | -105/+4 |
| | | |||||
* | | Merge branch 'v2-prototype' into feature/order-watcher-v2 | Leonid Logvinov | 2018-07-18 | 18 | -182/+201 |
|\| | |||||
| * | Merge pull request #884 from 0xProject/export-more-0x.js | Fabio Berger | 2018-07-18 | 18 | -182/+201 |
| |\ | | | | | | | Export missing V2 pieces from 0x.js | ||||
| | * | 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 | 12 | -131/+451 |
| | |\ | |||||
| | * | | 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 |
| | | | | | | | | | | | | | | | | them exported | ||||
| | * | | Rename assetProxyUtils to assetDataUtils | Fabio Berger | 2018-07-17 | 16 | -176/+176 |
| | | | | |||||
* | | | | 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 | 3 | -5/+311 |
| | | |||||
* | | 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 | 1 | -2/+1 |
| | |||||
* | Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytes | Amir Bandeali | 2018-07-11 | 4 | -7/+33 |
| | |||||
* | 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 |
|\ | | | | | V2 contract wrappers | ||||
| * | 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 | 5 | -0/+1056 |
|\ \ | |/ |/| | Forwarding contract | ||||
| * | Forwarding contract (squashed commits) | Jacob Evans | 2018-07-06 | 5 | -0/+1056 |
| | | |||||
* | | 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 | 17 | -185/+228 |
| | | |||||
* | | 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 |
| | | |||||
* | | Remove unused variable | Fabio Berger | 2018-07-02 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'v2-prototype' into fix/five_decimal_scenario | Fabio Berger | 2018-07-02 | 47 | -397/+3793 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 6 | -30/+30 |
| | | |||||
| * | Update file structure | Amir Bandeali | 2018-06-30 | 46 | -162/+3532 |
| | | |||||
| * | Make registerAssetProxy append only | Amir Bandeali | 2018-06-30 | 5 | -141/+42 |
| | | |||||
| * | Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes | Alex Browne | 2018-06-30 | 1 | -21/+3 |
| | | |||||
| * | Fix deployment to geth | Amir Bandeali | 2018-06-30 | 1 | -6/+5 |
| | | |||||
| * | Fix tests | Amir Bandeali | 2018-06-30 | 1 | -71/+134 |
| | | |||||
* | | Print out entire orderFill scenario | Fabio Berger | 2018-07-02 | 1 | -7/+1 |
|/ | |||||
* | Reduce the userAddresses to the individual addresses actually used by tests, ↵ | Fabio Berger | 2018-06-28 | 6 | -18/+30 |
| | | | | as well as only deploy the number of ERC20 tokens needed for each test suite | ||||
* | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 4 | -216/+45 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Improve 'web3-provider-engine' typings Fix build Update artifacts Add more revert reasons to tests Make dispatchTransferFrom revert with reason from AssetProxy on failure Remove redundant files, hard code function selector in dispatchTransferFrom, and modify revert reason Updated offset of receiverData length to reflect new assetData encoding. ERC20 Custom storage layout Golf the authorization check ERC20 manual memory layout ERC20 inline return ERC721 inline return Golf ERC721 transferFrom Inline ERC20 tranferFrom selector constant Optimize ERC20 transferFrom Polish asset picker layout Update relayer grid fallback icon Change metamask install link based on browser Use ethereumjs-tx@1.3.5 instead of our fork # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/core.ts # packages/migrations/artifacts/2.0.0/DummyERC721Token.json | ||||
| * | Add more revert reasons to tests | Amir Bandeali | 2018-06-27 | 3 | -19/+43 |
| | | |||||
| * | Make dispatchTransferFrom revert with reason from AssetProxy on failure | Amir Bandeali | 2018-06-27 | 1 | -2/+2 |
| | | |||||
| * | Remove redundant files, hard code function selector in dispatchTransferFrom, ↵ | Amir Bandeali | 2018-06-27 | 2 | -192/+0 |
| | | | | | | | | and modify revert reason | ||||
* | | Move combinatorial fillOrder tests into the `fill_ordere` test file | Fabio Berger | 2018-06-27 | 2 | -48/+21 |
| | | |||||
* | | Fix tests | Fabio Berger | 2018-06-27 | 1 | -3/+6 |
| | | |||||
* | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 10 | -86/+86 |
|\| | | | | | | | | | | | | | | | | | | | | | * refactor/check-revert-reasons: Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed` Expect RevertReason be passed in, not string Rename RevertReasons to RevertReason since singular enum names are more common # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/core.ts | ||||
| * | Temporarily switch revert reasons to `TransferFailed`. Should be ↵ | Fabio Berger | 2018-06-27 | 1 | -2/+2 |
| | | | | | | | | `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed` | ||||
| * | Rename RevertReasons to RevertReason since singular enum names are more common | Fabio Berger | 2018-06-26 | 10 | -95/+95 |
| | | |||||
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-26 | 7 | -60/+34 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts | ||||
* | | | Rename to singular | Fabio Berger | 2018-06-26 | 1 | -9/+9 |
| | | | |||||
* | | | Fix merge issues | Fabio Berger | 2018-06-26 | 1 | -1/+4 |
| | | | |||||
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-26 | 7 | -75/+45 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts | ||||
| * | | Don't use variables for revert reasons | Amir Bandeali | 2018-06-26 | 1 | -2/+4 |
| | | | |||||
| * | | Run prettier and fix linting errors | Amir Bandeali | 2018-06-26 | 1 | -18/+6 |
| | | | |||||
| * | | Fix tests | Amir Bandeali | 2018-06-26 | 4 | -5/+4 |
| | | | |||||
| * | | Update tests | Remco Bloemen | 2018-06-26 | 1 | -2/+2 |
| | | | |||||
| * | | Update tests | Remco Bloemen | 2018-06-26 | 2 | -33/+20 |
| | | | |||||
| * | | WIP | Remco Bloemen | 2018-06-26 | 1 | -0/+1 |
| | | | |||||
| * | | Remove proxyId argument from dispatchTransferFrom | Remco Bloemen | 2018-06-26 | 2 | -7/+4 |
| | | | |||||
* | | | Fix inconsistency between contract and reference implementation of order ↵ | Fabio Berger | 2018-06-26 | 1 | -0/+2 |
| | | | | | | | | | | | | validation logic | ||||
* | | | Prettier fixes | Fabio Berger | 2018-06-26 | 1 | -4/+1 |
| | | | |||||
* | | | Fix tslint issues | Fabio Berger | 2018-06-26 | 3 | -4/+1 |
| | | | |||||
* | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 10 | -22/+14 |
|\ \ \ | | |/ | |/| | |||||
| * | | Move RevertReasons to @0xproject/types package | Fabio Berger | 2018-06-25 | 10 | -22/+14 |
| | | | |||||
| * | | Add missing import | Fabio Berger | 2018-06-25 | 1 | -1/+4 |
| | | | |||||
* | | | Add missing import | Fabio Berger | 2018-06-25 | 1 | -1/+4 |
| | | | |||||
* | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 10 | -108/+172 |
|\| | | |||||
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-25 | 5 | -366/+539 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (48 commits) Fix typos in comments Add modifier and tests for removeAuthorizedAddressAtIndex Update and add tests Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex Move isFunctionRemoveAuthorizedAddress to test Fix usage of `popLastByte` Fix LibBytes is a library Remove `areBytesEqual` Fix usage of `contentAddress()` Clean low bits in bytes4 Clean high bits in address Refactor LibBytes.readBytes4 for consistency Fix LibBytes.equals Add trailing garbage testcase for LibBytes.equals Rename bytes.equals Add slice and sliceDestructive Rename bytes.rawAddress and add bytes.contentAddress Rename read/writeBytesWithLength Using LibBytes for bytes Make LibBytes a library ... # Conflicts: # packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol # packages/contracts/test/libraries/lib_bytes.ts | ||||
| * | | Fix tslint | Fabio Berger | 2018-06-23 | 4 | -4/+4 |
| | | | |||||
| * | | Fix prettier | Fabio Berger | 2018-06-23 | 5 | -15/+13 |
| | | | |||||
| * | | Rename ContractLibErrors to RevertReasons | Fabio Berger | 2018-06-23 | 10 | -95/+95 |
| | | | |||||
| * | | Remove revert reason 'Exchange' prefix | Fabio Berger | 2018-06-23 | 1 | -1/+1 |
| | | | |||||
| * | | Move constants over to ContractLibError enum and update all tests | Fabio Berger | 2018-06-23 | 3 | -29/+32 |
| | | | |||||
| * | | Fix test now that contract reverts with message | Fabio Berger | 2018-06-22 | 1 | -5/+3 |
| | | | |||||
| * | | Add revert reason checks to wrapper tests | Fabio Berger | 2018-06-22 | 1 | -10/+19 |
| | | | |||||
| * | | Fix tests | Fabio Berger | 2018-06-22 | 1 | -2/+2 |
| | | | |||||
| * | | Change Whitelist error messages to conform to rest and added revert reason ↵ | Fabio Berger | 2018-06-22 | 1 | -16/+24 |
| | | | | | | | | | | | | checks to transactions tests | ||||
| * | | Add revert reason checks to match_orders tests | Fabio Berger | 2018-06-22 | 1 | -7/+18 |
| | | | |||||
| * | | Fix tests | Fabio Berger | 2018-06-22 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-22 | 11 | -27/+435 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Use make-promises-safe as a preloader instead of manually importing Updated compiler runs to be 1,000,000 Add event to setSignatureValidatorApproval, rename signer => signerAddress accross all contracts Add senderAddress to Fill and Cancel logs, add comments to events and types Fix Island component Add missing image assets for Chris and Mel Fix some bugs in sol-cov Remove unreachable PreSigned check Fix linting Buttons look hella disabled now Remove border radius, fix width issue for unlock step Add Chris and Mel to about page fix linter issues only call getLocationByOffset if source if defined Set settleOrder and settleMatchedOrders to private Prevent prettier issue Support mobile friendly onboarding flows Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `settleMatchedOrders` into `MixinMatchOrders` Migrations after rebasing Linter ... | ||||
| * | | | Check revert reason in dispatcher tests | Fabio Berger | 2018-06-22 | 2 | -5/+13 |
| | | | | |||||
| * | | | remove unused import | Fabio Berger | 2018-06-22 | 1 | -1/+0 |
| | | | | |||||
| * | | | Test revert reasons in proxy tests | Fabio Berger | 2018-06-21 | 1 | -11/+23 |
| | | | | |||||
| * | | | remove only | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Check revert reasons in Authorizable tests | Fabio Berger | 2018-06-21 | 1 | -6/+14 |
| | | | | |||||
| * | | | remove .only | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update core tests to actually check revert message | Fabio Berger | 2018-06-21 | 1 | -34/+53 |
| | | | | |||||
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-25 | 14 | -393/+974 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (97 commits) Fix typos in comments Add modifier and tests for removeAuthorizedAddressAtIndex Update and add tests Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex Move isFunctionRemoveAuthorizedAddress to test Fix usage of `popLastByte` Fix LibBytes is a library Remove `areBytesEqual` Fix usage of `contentAddress()` Clean low bits in bytes4 Clean high bits in address Refactor LibBytes.readBytes4 for consistency Fix LibBytes.equals Add trailing garbage testcase for LibBytes.equals Rename bytes.equals Add slice and sliceDestructive Rename bytes.rawAddress and add bytes.contentAddress Rename read/writeBytesWithLength Using LibBytes for bytes Make LibBytes a library ... # Conflicts: # packages/contracts/src/utils/constants.ts # packages/contracts/test/exchange/core.ts | ||||
| * | | | Add modifier and tests for removeAuthorizedAddressAtIndex | Amir Bandeali | 2018-06-23 | 1 | -0/+69 |
| | | | | |||||
| * | | | Update and add tests | Amir Bandeali | 2018-06-23 | 2 | -170/+269 |
| | | | | |||||
| * | | | Move isFunctionRemoveAuthorizedAddress to test | Remco Bloemen | 2018-06-23 | 1 | -7/+18 |
| | | | | |||||
| * | | | Refactor LibBytes.readBytes4 for consistency | Remco Bloemen | 2018-06-23 | 1 | -3/+7 |
| | | | | |||||
| * | | | Add trailing garbage testcase for LibBytes.equals | Remco Bloemen | 2018-06-23 | 1 | -0/+10 |
| | | | | |||||
| * | | | Rename bytes.equals | Remco Bloemen | 2018-06-23 | 1 | -13/+13 |
| | | | | |||||
| * | | | Rename read/writeBytesWithLength | Remco Bloemen | 2018-06-23 | 1 | -29/+29 |
| | | | | |||||
| * | | | Merge LibMem and LibBytes | Remco Bloemen | 2018-06-23 | 3 | -191/+171 |
| | | | | |||||
| * | | | Use provided mem in refernce memcpy | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| | |/ | |/| | |||||
| * | | Use make-promises-safe as a preloader instead of manually importing | Alex Browne | 2018-06-22 | 10 | -10/+0 |
| | | | |||||
| * | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ↵ | Amir Bandeali | 2018-06-22 | 1 | -2/+50 |
| | | | | | | | | | | | | accross all contracts | ||||
| * | | Add senderAddress to Fill and Cancel logs, add comments to events and types | Amir Bandeali | 2018-06-22 | 1 | -0/+2 |
| | | | |||||
| * | | Linter | Greg Hysen | 2018-06-21 | 1 | -2/+1 |
| | | | |||||
| * | | Changed wording of two tests #nit | Greg Hysen | 2018-06-21 | 1 | -2/+2 |
| | | | |||||
| * | | Minor improvements to MixinSignatureValidator tests | Greg Hysen | 2018-06-21 | 1 | -14/+8 |
| | | | |||||
| * | | Remove .only | Greg Hysen | 2018-06-21 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed two mislabelled revert reasons + Signature Validator revert tests ↵ | Greg Hysen | 2018-06-21 | 1 | -6/+10 |
| | | | | | | | | | | | | working on Geth | ||||
| * | | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported ↵ | Greg Hysen | 2018-06-21 | 1 | -15/+386 |
| |/ | | | | | | | types. Fixed trezor prefix. | ||||
* | | Add support for approveAll in assetWrapper and fillOrderScenarios | Fabio Berger | 2018-06-21 | 1 | -1/+39 |
| | | |||||
* | | Split balance and allowance amount types in prep of adding the "unlimited" ↵ | Fabio Berger | 2018-06-20 | 1 | -13/+14 |
| | | | | | | | | allowance enum value | ||||
* | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-20 | 4 | -20/+140 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (22 commits) Fix closing parens in liborder Update after rebase ERC721Proxy Always call safeTransferFrom Rename makerEpoch => orderEpoch Make cancelOrdersUpTo compatible with sender abstraction Update PR template Use Image component instead of img tag Assembler orderHash function Optimize and remove redundant encodePacked Fix linting issue Fix bug where we do fetch balances on wallet login Check network state immediately instead of waiting for delay Fix onboarding persisting when changing routes Consolidate account state messaging logic Only elevate wallet zIndex when onboarding is in progress Rebase and update feedback Run linter Add Portal v2 logging Simplified handling of source < 32 edge case Basic EIP712 encoder ... | ||||
| * | Merge pull request #637 from 0xProject/bug/contracts/eip712-191-prefix | Jacob Evans | 2018-06-20 | 1 | -3/+7 |
| |\ | | | | | | | Add missing EIP191 prefix for EIP712 and Execute Transaction | ||||
| | * | Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefix | Jacob Evans | 2018-06-18 | 20 | -608/+1380 |
| | |\ | |||||
| | * | | Update Order utils to use eip712 | Jacob Evans | 2018-06-06 | 2 | -8/+6 |
| | | | | |||||
| | * | | Add missing EIP191 prefix for EIP712 | Jacob Evans | 2018-06-05 | 1 | -2/+7 |
| | | | | |||||
| * | | | ERC721Proxy Always call safeTransferFrom | Jacob Evans | 2018-06-20 | 1 | -2/+6 |
| | | | |