Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Add Portal v2 logging | fragosti | 2018-06-15 | 8 | -15/+62 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #694 from 0xProject/refactor-sol-cov | Alex Browne | 2018-06-13 | 5 | -306/+264 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Refactor sol-cov to de-duplicate code for coverage and profiling | |||||
| * | | | | | | Rename _coverageCollector -> _profilerCollector in TraceCollectionSubprovider | Alex Browne | 2018-06-13 | 1 | -4/+4 | |
| | | | | | | | ||||||
| * | | | | | | Refactor sol-cov to de-duplicate code for coverage and profiling | Alex Browne | 2018-06-13 | 5 | -306/+264 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #682 from 0xProject/feature/contracts/popProxyId | Amir Bandeali | 2018-06-13 | 36 | -532/+710 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Remove proxyId checks in AssetProxies | |||||
| * | | | | | | Rename popByte and popAddress | Amir Bandeali | 2018-06-13 | 5 | -18/+18 | |
| | | | | | | | ||||||
| * | | | | | | Hard code test addresses/bytes32 instead of generating pseudorandom ones | Amir Bandeali | 2018-06-13 | 1 | -19/+16 | |
| | | | | | | | ||||||
| * | | | | | | Update artifacts | Amir Bandeali | 2018-06-13 | 9 | -188/+182 | |
| | | | | | | | ||||||
| * | | | | | | Unpop byte rather than making deep copy | Amir Bandeali | 2018-06-13 | 4 | -90/+95 | |
| | | | | | | | ||||||
| * | | | | | | Pass gas in to marketBuyOrdersNoThrow | Amir Bandeali | 2018-06-13 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Looks up the memory location of makerAssetData/takerAssetData | Greg Hysen | 2018-06-13 | 1 | -0/+2 | |
| | | | | | | | ||||||
| * | | | | | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA | Amir Bandeali | 2018-06-13 | 5 | -23/+13 | |
| | | | | | | | ||||||
| * | | | | | | Add tests for deepCopyBytes and missing write methods from LibBytes | Amir Bandeali | 2018-06-13 | 3 | -70/+201 | |
| | | | | | | | ||||||
| * | | | | | | Pop id from assetData before dispatching to AssetProxies | Amir Bandeali | 2018-06-13 | 20 | -209/+268 | |
| |/ / / / / | ||||||
* | | | | | | Rename computeCoverageAsync -> computeSingleTraceCoverageAsync | Alex Browne | 2018-06-13 | 4 | -4/+4 | |
| | | | | | | ||||||
* | | | | | | Fix linter errors | Alex Browne | 2018-06-13 | 3 | -10/+6 | |
| | | | | | | ||||||
* | | | | | | Refactor sol-cov to avoid keeping traceInfo in memory | Alex Browne | 2018-06-13 | 6 | -211/+76 | |
|/ / / / / | ||||||
* | | | | | Upgrade solidity-parser-entlr 0.2.11 => 0.2.12 | Leonid Logvinov | 2018-06-13 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Fix import order | Leonid Logvinov | 2018-06-12 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge pull request #689 from 0xProject/geth-increase-startup-tx-delay | Leonid Logvinov | 2018-06-12 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Increase delay when sending transactions during devnet startup | |||||
| * | | | | | Increase delay when sending transactions during devnet startup | Alex Browne | 2018-06-12 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #687 from 0xProject/feature/metacoin-docs | Leonid Logvinov | 2018-06-12 | 6 | -13/+194 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add profiler and geth tests to metacoin | |||||
| * | | | | | | Fix typos | Leonid Logvinov | 2018-06-12 | 4 | -10/+11 | |
| | | | | | | | ||||||
| * | | | | | | Fix linter issues | Leonid Logvinov | 2018-06-12 | 2 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Add profiler and geth tests to metacoin | Leonid Logvinov | 2018-06-12 | 6 | -14/+194 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #688 from 0xProject/feature/await-transaction-speedup | Leonid Logvinov | 2018-06-12 | 19 | -150/+874 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts tests | |||||
| * | | | | | | | Add note to web3-wrapper CHANGELOG.json | Alex Browne | 2018-06-12 | 1 | -0/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts ↵ | Alex Browne | 2018-06-12 | 18 | -150/+869 | |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | tests | |||||
* | | | | | | | Merge pull request #690 from 0xProject/feature/truffle-sol-cov-fixes | Leonid Logvinov | 2018-06-12 | 4 | -7/+21 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Sol-cov fixes | |||||
| * | | | | | | Add CHANGELOGs | Leonid Logvinov | 2018-06-12 | 1 | -0/+12 | |
| | | | | | | | ||||||
| * | | | | | | Speed-up sol-cov | Leonid Logvinov | 2018-06-12 | 1 | -2/+2 | |
| | | | | | | | ||||||
| * | | | | | | Don't throw when no config file is found | Leonid Logvinov | 2018-06-12 | 1 | -4/+6 | |
| | | | | | | | ||||||
| * | | | | | | Fix solidityVersion schema regex | Leonid Logvinov | 2018-06-12 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge pull request #684 from ↵ | Fabio Berger | 2018-06-12 | 88 | -155/+977 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | 0xProject/fix/contract-wrappers/exchangeTransferSimulator Move ExchangeTransferSimulator & OrderValidationUtils to Order-Utils | |||||
| * | | | | | Stop exporting ArtifactWriter | Fabio Berger | 2018-06-12 | 2 | -5/+0 | |
| | | | | | | ||||||
| * | | | | | Fix no-unused-variable tslint rule to include parameters and fix issues | Fabio Berger | 2018-06-12 | 66 | -113/+104 | |
| | | | | | | ||||||
| * | | | | | Fix linter exclude rule | Fabio Berger | 2018-06-12 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Validate all signature types rather then only ECSignatures | Fabio Berger | 2018-06-12 | 1 | -4/+12 | |
| | | | | | | ||||||
| * | | | | | Store the instantiated OrderValidationUtils | Fabio Berger | 2018-06-12 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Remove global hooks from tests and deploy contracts from within the specific ↵ | Fabio Berger | 2018-06-12 | 2 | -54/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | tests | |||||
| * | | | | | Merge branch 'v2-prototype' into fix/contract-wrappers/exchangeTransferSimulator | Fabio Berger | 2018-06-12 | 44 | -481/+869 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix a bug in SolCompilerArtifacts adapter config overriding Increase timeout for contract migrations Remove some copy-paste code Await transactions in migrations Fix typos Await transactions in migrations Await fake transactions Fix a typo Implement SolidityProfiler & adapt sol-cov to work with Geth # Conflicts: # packages/migrations/CHANGELOG.json | |||||
| * | | | | | | Fix tslint issues | Fabio Berger | 2018-06-12 | 5 | -8/+5 | |
| | | | | | | | ||||||
| * | | | | | | Add back artifacts file | Fabio Berger | 2018-06-12 | 1 | -0/+13 | |
| | | | | | | | ||||||
| * | | | | | | Move OrderValidationUtils (+ tests) and ExchangeTransferSimulator to order-utils | Fabio Berger | 2018-06-12 | 16 | -18/+786 | |
| | | | | | | | ||||||
| * | | | | | | export parseECSignature method | Fabio Berger | 2018-06-12 | 2 | -0/+8 | |
| | | | | | | | ||||||
| * | | | | | | Export ArtifactWriter from migrations package | Fabio Berger | 2018-06-12 | 2 | -0/+9 | |
| | | | | | | | ||||||
| * | | | | | | Remove unused artifact file | Fabio Berger | 2018-06-12 | 1 | -13/+0 | |
| | | | | | | | ||||||
| * | | | | | | Pass in generated contract wrapper to orderValidationUtils at instantiation | Fabio Berger | 2018-06-11 | 1 | -10/+25 | |
| | | | | | | | ||||||
| * | | | | | | Refactor orderValidationUtils to use the generated contract wrapper instead ↵ | Fabio Berger | 2018-06-11 | 1 | -7/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the higher-level one | |||||
| * | | | | | | Refactor ExchangeTransferSimulator public interface to accet an ↵ | Fabio Berger | 2018-06-11 | 6 | -19/+71 | |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | AbstractBalanceAndProxyAllowanceLazyStore so that this module could be re-used in different contexts. | |||||
* | | | | | | Add EmitStatement to ASTVisitor | Leonid Logvinov | 2018-06-12 | 1 | -0/+3 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Fix a bug in SolCompilerArtifacts adapter config overriding | Leonid Logvinov | 2018-06-12 | 1 | -2/+2 | |
| | | | | | ||||||
* | | | | | Increase timeout for contract migrations | Leonid Logvinov | 2018-06-09 | 2 | -2/+2 | |
| | | | | | ||||||
* | | | | | Remove some copy-paste code | Leonid Logvinov | 2018-06-09 | 1 | -36/+6 | |
| | | | | | ||||||
* | | | | | Await transactions in migrations | Leonid Logvinov | 2018-06-09 | 1 | -35/+46 | |
| | | | | | ||||||
* | | | | | Fix typos | Leonid Logvinov | 2018-06-09 | 5 | -7/+23 | |
| | | | | | ||||||
* | | | | | Await transactions in migrations | Leonid Logvinov | 2018-06-09 | 1 | -4/+12 | |
| | | | | | ||||||
* | | | | | Await fake transactions | Leonid Logvinov | 2018-06-09 | 1 | -4/+4 | |
| | | | | | ||||||
* | | | | | Fix a typo | Leonid Logvinov | 2018-06-09 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Implement SolidityProfiler & adapt sol-cov to work with Geth | Leonid Logvinov | 2018-06-09 | 40 | -439/+825 | |
|/ / / / | ||||||
* | | | | Merge pull request #627 from 0xProject/feature/contracts/erc721SafeTransferFrom | Greg Hysen | 2018-06-09 | 45 | -429/+1641 | |
|\ \ \ \ | | | | | | | | | | | On-Chain AssetData Decoding Lib + safeTransferFrom for ERC721 + Memcpy | |||||
| * | | | | Linter changes to contracts | Greg Hysen | 2018-06-09 | 4 | -21/+6 | |
| | | | | | ||||||
| * | | | | Fixed assetProxyUtils for linter | Greg Hysen | 2018-06-09 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Updated LibBytes error messages | Greg Hysen | 2018-06-08 | 3 | -28/+36 | |
| | | | | | ||||||
| * | | | | Cleanup after last rebase | Greg Hysen | 2018-06-08 | 5 | -8/+7 | |
| | | | | | ||||||
| * | | | | Updated tests to use new revert handler | Greg Hysen | 2018-06-08 | 2 | -13/+13 | |
| | | | | | ||||||
| * | | | | Minor fixes after rebase | Greg Hysen | 2018-06-08 | 3 | -753/+11 | |
| | | | | | ||||||
| * | | | | Camelcase in memCopy | Greg Hysen | 2018-06-08 | 5 | -25/+25 | |
| | | | | | ||||||
| * | | | | Moved some constants to global scope in assetProxyUtils | Greg Hysen | 2018-06-08 | 1 | -18/+26 | |
| | | | | | ||||||
| * | | | | Style updates to contracts | Greg Hysen | 2018-06-08 | 7 | -28/+23 | |
| | | | | | ||||||
| * | | | | Union types for generalized decodeAssetData | Greg Hysen | 2018-06-08 | 3 | -21/+6 | |
| | | | | | ||||||
| * | | | | Fixed a styling throughout contracts. Moved closing parenthesis for long ↵ | Greg Hysen | 2018-06-08 | 8 | -31/+62 | |
| | | | | | | | | | | | | | | | | | | | | list of function parameters to next line. | |||||
| * | | | | Removed setting makerAssetData/takerAssetData from tests where values are ↵ | Greg Hysen | 2018-06-08 | 1 | -34/+0 | |
| | | | | | | | | | | | | | | | | | | | | same as defaultOrderParams. | |||||
| * | | | | Fixed merge error when rebasing wrt length variable in asset data decoders | Greg Hysen | 2018-06-08 | 2 | -4/+4 | |
| | | | | | ||||||
| * | | | | Style updates to ERC721 onReceiver | Greg Hysen | 2018-06-08 | 7 | -16/+27 | |
| | | | | | ||||||
| * | | | | Fixed after rebase | Greg Hysen | 2018-06-08 | 3 | -5/+5 | |
| | | | | | ||||||
| * | | | | Fixes after rebasing | Greg Hysen | 2018-06-08 | 6 | -49/+54 | |
| | | | | | ||||||
| * | | | | updated migrations artifacts | Greg Hysen | 2018-06-08 | 1 | -1/+735 | |
| | | | | | ||||||
| * | | | | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 8 | -53/+34 | |
| | | | | | ||||||
| * | | | | Style audit for proxies + libmem + libbytes | Greg Hysen | 2018-06-08 | 8 | -50/+72 | |
| | | | | | ||||||
| * | | | | Style audit proxies | Greg Hysen | 2018-06-08 | 3 | -20/+64 | |
| | | | | | ||||||
| * | | | | Call safeTransferFrom only when there is receiver data present | Greg Hysen | 2018-06-08 | 3 | -13/+20 | |
| | | | | | ||||||
| * | | | | Fixed formatting in memory layout | Greg Hysen | 2018-06-08 | 1 | -6/+6 | |
| | | | | | ||||||
| * | | | | Resolved edge case in Memcpy where where send would eventually turn ↵ | Greg Hysen | 2018-06-08 | 2 | -144/+154 | |
| | | | | | | | | | | | | | | | | | | | | "negative" and wrap around. | |||||
| * | | | | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵ | Greg Hysen | 2018-06-08 | 9 | -95/+64 | |
| | | | | | | | | | | | | | | | | | | | | This way they can still be used by the forwarding contract. TestAssetDataDecoders inherits them in the same way the forwarding contract would | |||||
| * | | | | Converged on naming scheme for asset data: renamed all instances of ↵ | Greg Hysen | 2018-06-08 | 23 | -323/+290 | |
| | | | | | | | | | | | | | | | | | | | | assetMetadata, proxyData, proxyMetadata to assetData | |||||
| * | | | | proxyData -> assetData | Greg Hysen | 2018-06-08 | 2 | -12/+12 | |
| | | | | | ||||||
| * | | | | Implement memcpy using masking and end-aligned words | Remco Bloemen | 2018-06-08 | 1 | -59/+85 | |
| | | | | | ||||||
| * | | | | Add tests for word loop iteration | Remco Bloemen | 2018-06-08 | 1 | -2/+6 | |
| | | | | | ||||||
| * | | | | Add test for zero-size overlap | Remco Bloemen | 2018-06-08 | 1 | -1/+3 | |
| | | | | | ||||||
| * | | | | Add test cases | Remco Bloemen | 2018-06-08 | 1 | -17/+133 | |
| | | | | | ||||||
| * | | | | Cleanup test script | Remco Bloemen | 2018-06-08 | 1 | -16/+1 | |
| | | | | | ||||||
| * | | | | Convert Solidity tests to vectors | Remco Bloemen | 2018-06-08 | 2 | -232/+6 | |
| | | | | | ||||||
| * | | | | Generate tests from vectors | Remco Bloemen | 2018-06-08 | 2 | -5/+64 | |
| | | | | | ||||||
| * | | | | Tests for writing bytes to nested bytes | Greg Hysen | 2018-06-08 | 1 | -9/+91 | |
| | | | | | ||||||
| * | | | | Fixed up wording in memcpy | Greg Hysen | 2018-06-08 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Tons of tests around nested byte arrays and ERC721 receiver | Greg Hysen | 2018-06-08 | 6 | -32/+223 | |
| | | | | | ||||||
| * | | | | Test for onReceived erc721 callback | Greg Hysen | 2018-06-08 | 6 | -5/+126 | |
| | | | | | ||||||
| * | | | | LibAssetProxyDecoder tests | Greg Hysen | 2018-06-08 | 3 | -35/+70 | |
| | | | | | ||||||
| * | | | | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 8 | -2/+216 | |
| | | | | | ||||||
| * | | | | Tests for libMem | Greg Hysen | 2018-06-08 | 5 | -16/+80 | |
| | | | | | ||||||
| * | | | | LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721Receiver | Greg Hysen | 2018-06-08 | 8 | -27/+581 | |
| | | | | | ||||||
* | | | | | Run contracts tests against Geth in CI | Alex Browne | 2018-06-08 | 1 | -0/+2 | |
|/ / / / | ||||||
* | | | | Add missing awaitTransactionSuccessAsync calls | Alex Browne | 2018-06-08 | 2 | -23/+53 | |
| | | | | ||||||
* | | | | Fix linter issue | Fabio Berger | 2018-06-08 | 1 | -1/+0 | |
| | | | | ||||||
* | | | | Fix linter issue | Fabio Berger | 2018-06-08 | 1 | -1/+0 | |
| | | | | ||||||
* | | | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-08 | 45 | -285/+288 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder Fix missing paths Revert to returning orderState on invalid order - Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary. Fixed path Use source-map-support package to include correct line numbers in mocha move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers | |||||
| * \ \ \ | Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changes | Fabio Berger | 2018-06-08 | 7 | -206/+206 | |
| |\ \ \ \ | | | | | | | | | | | | | Remaining Order-utils V2 Changes | |||||
| | * | | | | Fix tslint failure | Fabio Berger | 2018-06-08 | 5 | -10/+11 | |
| | | | | | | ||||||
| | * | | | | Pass in fee and assetAmount rather then the whole signedOrder | Fabio Berger | 2018-06-08 | 3 | -45/+26 | |
| | | | | | | ||||||
| | * | | | | Revert to returning orderState on invalid order | Fabio Berger | 2018-06-08 | 1 | -1/+6 | |
| | | | | | | ||||||
| | * | | | | - Refactor remainingFillableCalculator so it can be used for the maker and ↵ | Fabio Berger | 2018-06-08 | 2 | -141/+162 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | taker side - Moved the tests over from order-watcher - Did some token -> asset renaming | |||||
| | * | | | | Update naming in orderStateUtils to use asset over token, also removed ↵ | Fabio Berger | 2018-06-08 | 3 | -48/+40 | |
| | | | | | | | | | | | | | | | | | | | | | | | | cancelledAmount since in V2 it's binary. | |||||
| * | | | | | Merge pull request #670 from 0xProject/fix/generated-nesting | Fabio Berger | 2018-06-08 | 25 | -62/+65 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Remove unnecessary folder nesting | |||||
| | * | | | | | Fix tslint issues | Fabio Berger | 2018-06-08 | 2 | -2/+2 | |
| | | | | | | | ||||||
| | * | | | | | Fix missing paths | Fabio Berger | 2018-06-08 | 2 | -5/+5 | |
| | | | | | | | ||||||
| | * | | | | | Fixed path | Fabio Berger | 2018-06-07 | 4 | -12/+12 | |
| | | | | | | | ||||||
| | * | | | | | merge v2-prototype | Fabio Berger | 2018-06-07 | 287 | -2364/+2701 | |
| | |\| | | | | ||||||
| | * | | | | | move generated contract wrappers from `contract_wrappers/generated/` to ↵ | Fabio Berger | 2018-06-06 | 26 | -65/+68 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers | |||||
| * | | | | | | Merge pull request #676 from 0xProject/feature/mocha-source-maps | Alex Browne | 2018-06-08 | 16 | -17/+17 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Use source-map-support package to include correct line numbers in mocha | |||||
| | * | | | | | Use source-map-support package to include correct line numbers in mocha | Alex Browne | 2018-06-07 | 16 | -17/+17 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-07 | 286 | -2348/+2687 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (66 commits) Run prettier Remove unused variable Fix linting issues Change shouldRenderHeader prop to shouldHideHeader Get build and tests to pass typo Apply prettier Update contracts tests after rebase Apply various fixes based on PR feedback Document debug_increaseTime method and fix typo in devnet README Use an enum for ProviderType in contracts/src/utils/web3_wrapper Update contracts package README Update relevant changelogs Remove global gas estimate buffer Add Async suffix to relevant assertions Fix linter errors Update package.json and yarn.lock Update more things to work with both Geth and Ganache Small fixes and cleanup Add additional gas to calls to fillOrderNoThrow ... # Conflicts: # packages/order-watcher/src/order_watcher/order_watcher.ts # packages/react-docs/src/components/type.tsx # packages/website/ts/components/ui/lifecycle_raised_button.tsx # packages/website/ts/components/wallet/wallet.tsx | |||||
| * | | | | | | Merge pull request #673 from mohoff/patch-1 | Fabio Berger | 2018-06-07 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | typo | |||||
| | * | | | | | typo | mohoff | 2018-06-07 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Run prettier | fragosti | 2018-06-07 | 8 | -27/+13 | |
| | | | | | | | ||||||
| * | | | | | | Remove unused variable | fragosti | 2018-06-07 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 9 | -39/+102 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | feature/improve-linting | |||||
| | * | | | | | Merge pull request #672 from 0xProject/feature/website/account-management-polish | Brandon Millman | 2018-06-07 | 9 | -39/+102 | |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | Account management polish | |||||
| | | * | | | | Change shouldRenderHeader prop to shouldHideHeader | Brandon Millman | 2018-06-07 | 5 | -13/+13 | |
| | | | | | | | ||||||
| | | * | | | | Fix undefined ether balance | Brandon Millman | 2018-06-06 | 3 | -9/+13 | |
| | | | | | | | ||||||
| | | * | | | | Make scrollability a prop on TradeHistory | Brandon Millman | 2018-06-06 | 2 | -3/+10 | |
| | | | | | | | ||||||
| | | * | | | | Fix EthWrappers background color | Brandon Millman | 2018-06-06 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | | * | | | | Update GenerateOrderForm and FillOrder components | Brandon Millman | 2018-06-06 | 4 | -6/+34 | |
| | | | | | | | ||||||
| | | * | | | | Update EthWrappers component | Brandon Millman | 2018-06-06 | 2 | -1/+7 | |
| | | | | | | | ||||||
| | | * | | | | Update TradeHistory component | Brandon Millman | 2018-06-06 | 2 | -3/+16 | |
| | | | | | | | ||||||
| | | * | | | | Hide action column on mainnet | Brandon Millman | 2018-06-06 | 1 | -13/+14 | |
| | | | | | | | ||||||
| | | * | | | | Fix TokenBalances background color | Brandon Millman | 2018-06-06 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | * | | | | Add isFullWidth prop to TokenBalances component | Brandon Millman | 2018-06-06 | 2 | -1/+5 | |
| | | | | | | | ||||||
| * | | | | | | Fix linting issues | fragosti | 2018-06-07 | 4 | -6/+3 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 59 | -255/+1016 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | feature/improve-linting | |||||
| | * | | | | | Apply prettier | Alex Browne | 2018-06-07 | 2 | -3/+10 | |
| | | | | | | | ||||||
| | * | | | | | Update contracts tests after rebase | Alex Browne | 2018-06-07 | 2 | -14/+14 | |
| | | | | | | | ||||||
| | * | | | | | Apply various fixes based on PR feedback | Alex Browne | 2018-06-07 | 5 | -20/+79 | |
| | | | | | | | ||||||
| | * | | | | | Document debug_increaseTime method and fix typo in devnet README | Alex Browne | 2018-06-07 | 1 | -1/+36 | |
| | | | | | | | ||||||
| | * | | | | | Use an enum for ProviderType in contracts/src/utils/web3_wrapper | Alex Browne | 2018-06-07 | 1 | -4/+21 | |
| | | | | | | | ||||||
| | * | | | | | Update contracts package README | Alex Browne | 2018-06-07 | 1 | -0/+9 | |
| | | | | | | | ||||||
| | * | | | | | Update relevant changelogs | Alex Browne | 2018-06-07 | 2 | -0/+30 | |
| | | | | | | | ||||||
| | * | | | | | Remove global gas estimate buffer | Alex Browne | 2018-06-07 | 1 | -5/+1 | |
| | | | | | | | ||||||
| | * | | | | | Add Async suffix to relevant assertions | Alex Browne | 2018-06-07 | 14 | -112/+112 | |
| | | | | | | | ||||||
| | * | | | | | Fix linter errors | Alex Browne | 2018-06-07 | 3 | -8/+38 | |
| | | | | | | | ||||||
| | * | | | | | Update more things to work with both Geth and Ganache | Alex Browne | 2018-06-07 | 6 | -50/+64 | |
| | | | | | | | ||||||
| | * | | | | | Small fixes and cleanup | Alex Browne | 2018-06-07 | 6 | -55/+5 | |
| | | | | | | | ||||||
| | * | | | | | Add additional gas to calls to fillOrderNoThrow | Alex Browne | 2018-06-07 | 3 | -152/+55 | |
| | | | | | | | ||||||
| | * | | | | | Remove extra logs and other small fixes | Alex Browne | 2018-06-07 | 4 | -19/+14 | |
| | | | | | | | ||||||
| | * | | | | | Throw in web3-wrapper when rawCallResult is '0x' | Alex Browne | 2018-06-07 | 4 | -6/+20 | |
| | | | | | | | ||||||
| | * | | | | | Remove outdated todo | Alex Browne | 2018-06-07 | 1 | -4/+0 | |
| | | | | | | | ||||||
| | * | | | | | Fix some more test cases, especially those that call increaseTime | Alex Browne | 2018-06-07 | 4 | -55/+84 | |
| | | | | | | | ||||||
| | * | | | | | Add support for TEST_PROVIDER env var | Alex Browne | 2018-06-07 | 2 | -5/+6 | |
| | | | | | | | ||||||
| | * | | | | | Update more tests to pass on Geth | Alex Browne | 2018-06-07 | 4 | -21/+29 | |
| | | | | | | | ||||||
| | * | | | | | Get LibBytes tests working on both Ganache and Geth | Alex Browne | 2018-06-07 | 3 | -25/+34 | |
| | | | | | | | ||||||
| | * | | | | | Add ability to quickly switch between Geth and Ganache by changing a const | Alex Browne | 2018-06-07 | 2 | -4/+23 | |
| | | | | | | | ||||||
| | * | | | | | Update exchange/transactions tests for Geth error messages | Alex Browne | 2018-06-07 | 1 | -4/+4 | |
| | | | | | | | ||||||
| | * | | | | | Update some tests after rebase | Alex Browne | 2018-06-07 | 3 | -20/+29 | |
| | | | | | | | ||||||
| | * | | | | | Add more transactions to Geth on init. Skip tests that are failing. | Alex Browne | 2018-06-07 | 16 | -645/+771 | |
| | | | | | | | ||||||
| | * | | | | | Increase gas limit to account for bigger ExchangeContract | Alex Browne | 2018-06-07 | 2 | -2/+2 | |
| | | | | | | | ||||||
| | * | | | | | Replace constant.REVERT test assertions with ↵ | Alex Browne | 2018-06-07 | 12 | -170/+143 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction | |||||
| | * | | | | | Update code after rebase | Alex Browne | 2018-06-07 | 3 | -3/+8 | |
| | | | | | | | ||||||
| | * | | | | | Use Geth for contract tests | Alex Browne | 2018-06-07 | 22 | -11/+337 | |
| | | | | | | | ||||||
| | * | | | | | Merge pull request #669 from 0xProject/bug/website/fix-balance-rendering | Brandon Millman | 2018-06-07 | 1 | -9/+14 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Update balance amount rendering logic | |||||
| | | * | | | | | Update balance amount rendering logic | Brandon Millman | 2018-06-06 | 1 | -9/+14 | |
| | | |/ / / / | ||||||
| | * | | | | | Merge pull request #653 from 0xProject/feature/ethereum-types-docs | Leonid Logvinov | 2018-06-07 | 15 | -2/+190 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Add a documentation page for ethereum-types package | |||||
| | | * | | | | | Add EthereumTypes to _renderDrawer | Leonid Logvinov | 2018-06-07 | 1 | -0/+11 | |
| | | | | | | | | ||||||
| | | * | | | | | Add a TODO comment on StructLog type in the docs | Leonid Logvinov | 2018-06-05 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | | * | | | | | Add a documentation page for ethereum types | Leonid Logvinov | 2018-06-05 | 15 | -2/+179 | |
| | | | | | | | | ||||||
| * | | | | | | | Get build and tests to pass | fragosti | 2018-06-07 | 33 | -1524/+1440 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix merge conflict | fragosti | 2018-06-07 | 1 | -14/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 11 | -16/+12 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/improve-linting | |||||
| | * | | | | | | Fix linter issues in generated contract wrappers | Leonid Logvinov | 2018-06-07 | 3 | -4/+4 | |
| | | | | | | | | ||||||
| | * | | | | | | Stop running prettier on generated files | Leonid Logvinov | 2018-06-07 | 8 | -13/+9 | |
| | | |_|/ / / | | |/| | | | | ||||||
| * | | | | | | Use CLI for exclude | fragosti | 2018-06-07 | 6 | -14/+5 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 31 | -52/+62 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | feature/improve-linting | |||||
| * | | | | | | Add missing import | Fabio Berger | 2018-06-06 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Fix remaining tslint issues | Fabio Berger | 2018-06-06 | 5 | -26/+2 | |
| | | | | | | | ||||||
| * | | | | | | merge v2-prototype | Fabio Berger | 2018-06-06 | 69 | -3860/+1198 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | Exclude generate contract wrappers from tslint | Fabio Berger | 2018-06-06 | 6 | -6/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | remove unused imports from 0x.js test | Fabio Berger | 2018-06-06 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Remove unused imports from contract handlebar template | Fabio Berger | 2018-06-06 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Some cleanup | fragosti | 2018-06-06 | 1 | -11/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Linter now passes | fragosti | 2018-06-06 | 37 | -110/+48 | |
| | | | | | | | | ||||||
| * | | | | | | | Try enabling no-unused-variable... | fragosti | 2018-06-05 | 180 | -420/+110 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
* | | | | | | | Move spawnSwitchErr to @0xproject/utils | Fabio Berger | 2018-06-06 | 15 | -25/+24 | |
| |_|/ / / / |/| | | | | | ||||||
* | | | | | | Add missing `yarn` | Fabio Berger | 2018-06-06 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Add missing build:all command | Fabio Berger | 2018-06-06 | 1 | -0/+1 | |
| | | | | | | ||||||
* | | | | | | Merge v2-prototype | Fabio Berger | 2018-06-06 | 48 | -127/+457 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge branch 'v2-prototype' into fixes/misc-small-fixes | Fabio Berger | 2018-06-06 | 31 | -109/+436 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Remove TranslatedText Fix prettier Add back UMD bundles for 0x.js Move portal disclaimer to the account management section Move prices into portal Use stricter check for subscribe input text Make buttons stack on mobile Do not show subscribe form if language is not english Address PR feedback Lint and cleanup Implement subscription form Add styled-components and polished Have basic newsletter subscribe form working | |||||
| | * | | | | Remove TranslatedText | fragosti | 2018-06-06 | 1 | -15/+0 | |
| | | | | | | ||||||
| | * | | | | Fix prettier | Brandon Millman | 2018-06-06 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Merge pull request #668 from 0xProject/feature/website/move-disclaimer | Brandon Millman | 2018-06-06 | 1 | -16/+18 | |
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | Move portal disclaimer to the account management section | |||||
| | | * | | | Move portal disclaimer to the account management section | Brandon Millman | 2018-06-06 | 1 | -16/+18 | |
| | | | | | | ||||||
| | * | | | | Add back UMD bundles for 0x.js | Leonid Logvinov | 2018-06-06 | 1 | -1/+3 | |
| | | | | | | ||||||
| | * | | | | Move prices into portal | Brandon Millman | 2018-06-06 | 2 | -30/+32 | |
| | |/ / / | ||||||
| | * | | | Merge pull request #652 from ↵ | Francesco Agosti | 2018-06-06 | 29 | -62/+398 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/website/landing-subscribe-button-2 Implement subscribe form on landing page | |||||
| | | * | | | Use stricter check for subscribe input text | fragosti | 2018-06-06 | 1 | -1/+2 | |
| | | | | | | ||||||
| | | * | | | Make buttons stack on mobile | fragosti | 2018-06-05 | 2 | -5/+6 | |
| | | | | | | ||||||
| | | * | | | Do not show subscribe form if language is not english | fragosti | 2018-06-05 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | Address PR feedback | fragosti | 2018-06-05 | 8 | -40/+46 | |
| | | | | | | ||||||
| | | * | | | Lint and cleanup | fragosti | 2018-06-02 | 4 | -7/+7 | |
| | | | | | | ||||||
| | | * | | | Merge branch 'feature/website/landing-subscribe-button' into ↵ | fragosti | 2018-06-02 | 29 | -50/+378 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | feature/website/landing-subscribe-button-2 | |||||
| | | | * | | | Implement subscription form | fragosti | 2018-06-02 | 7 | -68/+288 | |
| | | | | | | | ||||||
| | | | * | | | Add styled-components and polished | fragosti | 2018-06-02 | 20 | -19/+36 | |
| | | | | | | | ||||||
| | | | * | | | Have basic newsletter subscribe form working | fragosti | 2018-06-02 | 6 | -2/+93 | |
| | | | | | | | ||||||
| * | | | | | | Mention the gasLimit until in the doc comment | Fabio Berger | 2018-06-05 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'v2-prototype' into fixes/misc-small-fixes | Fabio Berger | 2018-06-05 | 1 | -2/+2 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix broken link to `contract_templates` # Conflicts: # packages/abi-gen/README.md | |||||
| * | | | | | | Replace `-` with `_` in yarn script name so that we are consistent across ↵ | Fabio Berger | 2018-06-05 | 15 | -15/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | yarn script names | |||||
| * | | | | | | Add `switch-default` tslint rule and add missing default statement | Fabio Berger | 2018-06-05 | 2 | -0/+4 | |
| | | | | | | | ||||||
| * | | | | | | Remove outdated link in ABI-gen README | Fabio Berger | 2018-06-05 | 1 | -2/+1 | |
| | | | | | | | ||||||
* | | | | | | | - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ↵ | Fabio Berger | 2018-06-05 | 31 | -53/+61 | |
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | running watch from root dir, with sub-package dir - stop using special prebuild script name and run pre_build steps for `watch` and `build` commands - Remove `clean` step from `build`/`watch` | |||||
* | | | | | | Merge pull request #661 from feuGeneA/patch-1 | Fabio Berger | 2018-06-05 | 1 | -2/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Fix broken link to `contract_templates` | |||||
| * | | | | | Fix broken link to `contract_templates` | F. Eugene Aumson | 2018-06-05 | 1 | -2/+2 | |
| | |_|/ / | |/| | | | | | | | | Note there is still a broken link here, the "wrapper files" one in the second paragraph. | |||||
* | | | | | Merge pull request #656 from 0xProject/refactor/fill-scenarios/for-v2 | Fabio Berger | 2018-06-05 | 22 | -3764/+715 | |
|\ \ \ \ \ | | | | | | | | | | | | | Refactor fill-scenarios for v2 | |||||
| * | | | | | Use _.omit for conciseness | Fabio Berger | 2018-06-05 | 1 | -15/+5 | |
| | | | | | | ||||||
| * | | | | | revert multisig change | Fabio Berger | 2018-06-05 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | reset multisign | Fabio Berger | 2018-06-05 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Add PR to changelog | Fabio Berger | 2018-06-05 | 1 | -1/+2 | |
| | | | | | | ||||||
| * | | | | | Update fill-scenarios for V2 and add CHANGELOG entry | Fabio Berger | 2018-06-05 | 2 | -64/+91 | |
| | | | | | | ||||||
| * | | | | | Remove unused compact artifacts from order-utils | Fabio Berger | 2018-06-05 | 7 | -1845/+0 | |
| | | | | | | ||||||
| * | | | | | Add missing exports to order-utils and add CHANGELOG entry | Fabio Berger | 2018-06-05 | 2 | -1/+18 | |
| | | | | | | ||||||
| * | | | | | Add new 2.0 artifacts to migrations | Fabio Berger | 2018-06-05 | 2 | -0/+601 | |
| | | | | | | ||||||
| * | | | | | Remove compact_artifacts and replace with updated artifacts | Fabio Berger | 2018-06-05 | 9 | -1852/+12 | |
| | | | | | | ||||||
| * | | | | | Update fill-scenarios to depend on v2 updated order-utils and types. Needed ↵ | Fabio Berger | 2018-06-05 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | to re-employ the symlink hack. | |||||
* | | | | | | Merge pull request #658 from 0xProject/dont-automatically-rebuild-for-tests | Alex Browne | 2018-06-05 | 15 | -19/+31 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Don't automatically rebuild when running yarn test | |||||
| * | | | | | Remove duplicate cleans in package.json when clean is called in prebuild | Alex Browne | 2018-06-05 | 4 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | Remove common-js/umd differentiation from 0x.js/package.json | Alex Browne | 2018-06-05 | 1 | -6/+3 | |
| | | | | | | ||||||
| * | | | | | Don't automatically rebuild when running yarn test | Alex Browne | 2018-06-05 | 15 | -15/+30 | |
| | | | | | | ||||||
* | | | | | | rename GT to GREATER_THAN | Jacob Evans | 2018-06-05 | 3 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | Rebase from v2-prototype | Jacob Evans | 2018-06-05 | 2 | -38/+2 | |
| | | | | | | ||||||
* | | | | | | Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵ | Amir Bandeali | 2018-06-05 | 30 | -702/+491 | |
|/ / / / / | | | | | | | | | | | | | | | | failures, and remove redundant logic in matchOrders | |||||
* / / / / | Update artifacts in migrations | Alex Browne | 2018-06-05 | 8 | -51/+79 | |
|/ / / / | ||||||
* | | | | Address feedback | fragosti | 2018-06-05 | 4 | -14/+20 | |
| | | | | ||||||
* | | | | Implement WETH step logic for continue | fragosti | 2018-06-05 | 3 | -7/+14 | |
| | | | | ||||||
* | | | | Move trackedTokenStateByAddress logic into portal | fragosti | 2018-06-05 | 2 | -83/+100 | |
| |_|/ |/| | | ||||||
* | | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 15 | -175/+215 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Set contract expiration time to a constant 10 minutes Remove unused promises array Make erc20_wrapper and erc721_wrapper serial Rename changelogs to changelog Add CHANGELOG entry Check that git branch is up to date before publishing Move prepublish checks before building packages for publishing Refactor changelog utils to a separate module | |||||
| * | | Set contract expiration time to a constant 10 minutes | Alex Browne | 2018-06-02 | 1 | -1/+2 | |
| | | | ||||||
| * | | Remove unused promises array | Alex Browne | 2018-06-02 | 2 | -6/+0 | |
| | | | ||||||
| * | | Make erc20_wrapper and erc721_wrapper serial | Alex Browne | 2018-06-02 | 2 | -48/+50 | |
| | | | ||||||
| * | | Merge pull request #650 from 0xProject/feature/publishing | Leonid Logvinov | 2018-06-02 | 12 | -120/+163 | |
| |\ \ | | | | | | | | | Improve publishing flow | |||||
| | * | | Rename changelogs to changelog | Leonid Logvinov | 2018-06-02 | 1 | -8/+8 | |
| | | | | ||||||
| | * | | Add CHANGELOG entry | Leonid Logvinov | 2018-06-02 | 1 | -0/+9 | |
| | | | | ||||||
| | * | | Check that git branch is up to date before publishing | Leonid Logvinov | 2018-06-02 | 1 | -1/+17 | |
| | | | | ||||||
| | * | | Move prepublish checks before building packages for publishing | Leonid Logvinov | 2018-06-02 | 3 | -53/+56 | |
| | | | |