Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix issue where onboarding doesn't scroll to wallet when starting from ↵ | fragosti | 2018-07-04 | 2 | -6/+5 |
| | | | | relayers page | ||||
* | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-07-04 | 43 | -468/+622 |
|\ | | | | | | | feature/website/portal-mobile-improvements | ||||
| * | Merge pull request #811 from 0xProject/feature/website/onboarding-polish-2 | Francesco Agosti | 2018-07-04 | 10 | -48/+111 |
| |\ | | | | | | | Add Hotjar, and other small improvements | ||||
| | * | Persist whether onboarding is open or close across refreshes | fragosti | 2018-07-04 | 1 | -1/+3 |
| | | | |||||
| | * | Fix linting | fragosti | 2018-07-04 | 2 | -3/+2 |
| | | | |||||
| | * | Merge branch 'fixed-position-onboarding' into ↵ | fragosti | 2018-07-04 | 2 | -33/+67 |
| | |\ | | | | | | | | | | | | | feature/website/onboarding-polish-2 | ||||
| | | * | Implement fixed position onboarding option | fragosti | 2018-07-03 | 2 | -33/+67 |
| | | | | |||||
| | * | | Remove unused import | fragosti | 2018-07-03 | 1 | -1/+0 |
| | | | | |||||
| | * | | Add end comment to hotjar tracking code | fragosti | 2018-07-03 | 1 | -0/+1 |
| | | | | |||||
| | * | | Add media file and remove stray comment | fragosti | 2018-07-03 | 2 | -2/+15 |
| | |/ | |||||
| | * | Add media query abstraction around ScreenWidths and stop relayer grid hover ↵ | fragosti | 2018-07-03 | 5 | -10/+22 |
| | | | | | | | | | | | | effect on mobile | ||||
| | * | Remove max-width from onboarding card to support iPad | fragosti | 2018-07-03 | 1 | -1/+1 |
| | | | |||||
| | * | Only auto-start onboarding if blockchain is loaded | fragosti | 2018-07-03 | 1 | -2/+5 |
| | | | |||||
| * | | Merge pull request #812 from 0xProject/fix/revert-assertions-improvements | Alex Browne | 2018-07-04 | 24 | -221/+298 |
| |\ \ | | | | | | | | | Improve robustness of revert reason assertions | ||||
| | * | | Move NodeType caching out of web3-wrapper and into our internal code | Alex Browne | 2018-07-04 | 3 | -12/+19 |
| | | | | |||||
| | * | | Update CHANGELOG.json for ethereum-types and web3-wrapper | Alex Browne | 2018-07-04 | 2 | -0/+14 |
| | | | | |||||
| | * | | Add TransactionReceiptStatus type to ethereum-types | Alex Browne | 2018-07-04 | 2 | -3/+5 |
| | | | | |||||
| | * | | Actually cache node type in web3-wrapper | Alex Browne | 2018-07-04 | 1 | -0/+6 |
| | | | | |||||
| | * | | Improve robustness of revert reason assertions | Alex Browne | 2018-07-03 | 21 | -221/+269 |
| | | | | |||||
| * | | | Merge pull request #799 from 0xProject/feature/website/wallet-menu | Brandon Millman | 2018-07-04 | 9 | -199/+213 |
| |\ \ \ | | | | | | | | | | | Add menu for at the top of wallet and top right component | ||||
| | * | | | Remove InstallPrompt | Brandon Millman | 2018-07-04 | 2 | -61/+0 |
| | | | | | |||||
| | * | | | Implement clickaway for wallet menu on mobile | Brandon Millman | 2018-07-04 | 2 | -14/+24 |
| | | | | | |||||
| | * | | | Add optional onClick to Link simple menu item | Brandon Millman | 2018-07-03 | 1 | -2/+7 |
| | | | | | |||||
| | * | | | Lint fixes | Brandon Millman | 2018-07-02 | 4 | -17/+5 |
| | | | | | |||||
| | * | | | More cleanup | Brandon Millman | 2018-07-02 | 2 | -31/+31 |
| | | | | | |||||
| | * | | | Consolidate logic for common menu items | Brandon Millman | 2018-07-02 | 3 | -33/+74 |
| | | | | | |||||
| | * | | | Give connected header accessory more padding | Brandon Millman | 2018-07-02 | 1 | -9/+13 |
| | | | | | |||||
| | * | | | Implement correct behavior for menu in the wallet | Brandon Millman | 2018-07-02 | 6 | -31/+52 |
| | | | | | |||||
| | * | | | Add menu to wallet | Brandon Millman | 2018-07-02 | 1 | -8/+32 |
| | | | | | |||||
| | * | | | Implement simple menu | Brandon Millman | 2018-07-02 | 5 | -91/+50 |
| | | | | | |||||
| | * | | | Clean up a bit of the provider display logic | Brandon Millman | 2018-07-02 | 3 | -73/+80 |
| | | | | | |||||
| | * | | | Implement icon button | Brandon Millman | 2018-07-02 | 2 | -2/+18 |
| | | | | | |||||
* | | | | | Add toshi logo asset | fragosti | 2018-07-04 | 1 | -0/+0 |
| | | | | | |||||
* | | | | | Prompt user to download Toshi or MetaMask in install wallet onboarding step | fragosti | 2018-07-04 | 3 | -46/+73 |
| | | | | | |||||
* | | | | | Show different download links and icons when on mobile | fragosti | 2018-07-04 | 3 | -20/+47 |
| | | | | | |||||
* | | | | | Rename isMobile utility fn to be more specific and add isMobileOperatingSystem | fragosti | 2018-07-04 | 3 | -5/+8 |
| | | | | | |||||
* | | | | | Add OperatingSystemType and get OS util | fragosti | 2018-07-04 | 2 | -0/+28 |
|/ / / / | |||||
* | | | | Fix alignment | Fabio Berger | 2018-07-04 | 7 | -7/+7 |
| | | | | |||||
* | | | | Update blockstream to latest version, propogate errors to top-level callers | Fabio Berger | 2018-07-04 | 3 | -3/+20 |
| | | | | |||||
* | | | | Update web3-provider-engine version w/o caret | Fabio Berger | 2018-07-03 | 7 | -7/+7 |
| | | | | |||||
* | | | | Update web3-provider-engine | Fabio Berger | 2018-07-03 | 7 | -7/+7 |
| | | | | |||||
* | | | | Merge pull request #801 from feuGeneA/patch-3 | Fabio Berger | 2018-07-03 | 1 | -2/+1 |
|\ \ \ \ | | | | | | | | | | | in subproviders/package.json, cite typescript-typings only once | ||||
| * | | | | in subproviders, cite typescript-typings only once | F. Eugene Aumson | 2018-07-02 | 1 | -2/+1 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | `yarn build` was giving the following warning: warning package.json: "dependencies" has dependency "@0xproject/typescript-typings" with range "^0.4.1" that collides with a dependency in "devDependencies" of the same name with version "^0.4.2" | ||||
* | | | | Merge pull request #806 from ↵ | Brandon Millman | 2018-07-03 | 4 | -0/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/website/mobile-readable-web3-names Add detection logic for Toshi and Cipher | ||||
| * | | | | Add human readable names for Toshi and Cipher | Brandon Millman | 2018-07-03 | 4 | -0/+11 |
| | | | | | |||||
* | | | | | Merge pull request #808 from 0xProject/feature/website/better-balance-formatting | Brandon Millman | 2018-07-03 | 4 | -18/+23 |
|\ \ \ \ \ | | | | | | | | | | | | | Add better balance formatting rules for balances and usd values | ||||
| * | | | | | Add better balance formatting rules for balances and usd values | Brandon Millman | 2018-07-03 | 4 | -18/+23 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #810 from 0xProject/feature/wesbite/remove-add-balance | Brandon Millman | 2018-07-03 | 5 | -42/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove increase balance link from balance_bounded_input component | ||||
| * | | | | | Remove increase balance link from balance_bounded_input component | Brandon Millman | 2018-07-03 | 5 | -42/+2 |
| | | | | | | |||||
* | | | | | | Use new lock svg | Brandon Millman | 2018-07-03 | 2 | -2/+5 |
|/ / / / / | |||||
* | / / / | Always show the wrap ether row in between ETH and WETH | Brandon Millman | 2018-07-03 | 2 | -18/+20 |
| |/ / / |/| | | | |||||
* | | | | Update start onboarding copy and relayer grid empty color | Brandon Millman | 2018-07-03 | 3 | -7/+10 |
|/ / / | |||||
* | / | Add Alex Browne to about page | fragosti | 2018-07-03 | 2 | -10/+19 |
| |/ |/| | |||||
* | | Update incorrect versions of deps | Fabio Berger | 2018-07-02 | 18 | -19/+19 |
| | | |||||
* | | Add new changelog entry | Fabio Berger | 2018-07-02 | 1 | -0/+9 |
| | | |||||
* | | fix prettier | Fabio Berger | 2018-07-02 | 1 | -4/+4 |
| | | |||||
* | | Git command outputs logs to stdErr so only way to check for errors if with ↵ | Fabio Berger | 2018-07-02 | 1 | -6/+8 |
| | | | | | | | | try/catch | ||||
* | | Remove remote tag before local one | Fabio Berger | 2018-07-02 | 1 | -6/+6 |
| | | |||||
* | | Add logs for when tags get removed | Fabio Berger | 2018-07-02 | 1 | -0/+2 |
| | | |||||
* | | combine changelog entries since we haven't published yet | Fabio Berger | 2018-07-02 | 2 | -10/+5 |
| | | |||||
* | | version outdated | Fabio Berger | 2018-07-02 | 1 | -1/+1 |
| | | |||||
* | | Throw if changelog version is below package.json version | Fabio Berger | 2018-07-02 | 1 | -0/+3 |
| | | |||||
* | | Update outdated changelogs | Fabio Berger | 2018-07-02 | 4 | -2/+23 |
| | | |||||
* | | 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 | 201 | -1991/+5671 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ... | ||||
| * | Update relayer grid tiles to use Text | Brandon Millman | 2018-07-01 | 2 | -50/+17 |
| | | |||||
| * | Fix build | Amir Bandeali | 2018-06-30 | 7 | -31/+31 |
| | | |||||
| * | Update file structure | Amir Bandeali | 2018-06-30 | 125 | -199/+195 |
| | | |||||
| * | Merge pull request #770 from 0xProject/feature/migrations/kovan-deploy | Amir Bandeali | 2018-06-30 | 25 | -227/+3803 |
| |\ | | | | | | | Add Kovan migrations | ||||
| | * | Update 2.0.0 artifacts | Amir Bandeali | 2018-06-30 | 5 | -149/+99 |
| | | | |||||
| | * | Move ledgerhq module declarations to typescript-typings | Amir Bandeali | 2018-06-30 | 7 | -79/+59 |
| | | | |||||
| | * | Export LedgerEthereumClient type in subproviders | Amir Bandeali | 2018-06-30 | 4 | -49/+19 |
| | | | |||||
| | * | Update artifacts | Amir Bandeali | 2018-06-30 | 4 | -12/+26 |
| | | | |||||
| | * | Add logging and updated artifacts | Amir Bandeali | 2018-06-30 | 5 | -32/+45 |
| | | | |||||
| | * | Fix migrations | Amir Bandeali | 2018-06-30 | 7 | -3451/+3402 |
| | | | |||||
| | * | Run prettier | Amir Bandeali | 2018-06-30 | 4 | -3369/+3442 |
| | | | |||||
| | * | Add Kovan artifacts | Amir Bandeali | 2018-06-30 | 4 | -0/+3373 |
| | | | |||||
| | * | Use ledger subprovider | Amir Bandeali | 2018-06-30 | 13 | -46/+159 |
| | | | |||||
| | * | Add Kovan migrations | Amir Bandeali | 2018-06-30 | 10 | -13/+152 |
| | | | |||||
| * | | Merge pull request #787 from 0xProject/feature/website/portal-onboarding-polish | Francesco Agosti | 2018-06-30 | 19 | -360/+354 |
| |\ \ | | |/ | |/| | Portal v2 onboarding polish | ||||
| | * | Remove state variable from Link component in Portal | fragosti | 2018-06-30 | 1 | -4/+1 |
| | | | |||||
| | * | Remove extra call to scrollIntoView for wallet in onboarding | fragosti | 2018-06-30 | 1 | -4/+0 |
| | | | |||||
| | * | Bump automatic show onborading delay by 1000ms | fragosti | 2018-06-30 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-30 | 58 | -5503/+1792 |
| | |\ | | | | | | | | | | | | | feature/website/portal-onboarding-polish | ||||
| | * | | Fix onboarding always starting | fragosti | 2018-06-30 | 1 | -1/+2 |
| | | | | |||||
| | * | | Rename userHasAllowances bool to follow proper convention | fragosti | 2018-06-30 | 2 | -6/+6 |
| | | | | |||||
| | * | | Allow you to continue the onboarding flow once youve installed metamask and ↵ | fragosti | 2018-06-30 | 5 | -17/+18 |
| | | | | | | | | | | | | | | | | refreshed the page | ||||
| | * | | Use Image component where relevant and add back tracked token timestamp logic | fragosti | 2018-06-30 | 3 | -8/+24 |
| | | | | |||||
| | * | | Bold all balances in onboarding | fragosti | 2018-06-29 | 2 | -6/+8 |
| | | | | |||||
| | * | | Customize allowance setting onboarding step if you have your allowances set | fragosti | 2018-06-29 | 2 | -0/+4 |
| | | | | |||||
| | * | | Re-center react-popper on every step | fragosti | 2018-06-29 | 2 | -16/+4 |
| | | | | |||||
| | * | | Fix button hover and active hover state | fragosti | 2018-06-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | Show eth balance in add eth balance onboarding step | fragosti | 2018-06-29 | 3 | -11/+16 |
| | | | | |||||
| | * | | Change onboarding flow to communicate 3 steps | fragosti | 2018-06-29 | 2 | -6/+10 |
| | | | | |||||
| | * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-29 | 48 | -1012/+2580 |
| | |\ \ | | | | | | | | | | | | | | | | feature/website/portal-onboarding-polish | ||||
| | * | | | Scroll to top when going to relayers page from onboarding | fragosti | 2018-06-28 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Bring you directly to relayers page once you finish onboarding | fragosti | 2018-06-28 | 3 | -1/+14 |
| | | | | | |||||
| | * | | | Remove period in title from last step | fragosti | 2018-06-28 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Always restart onboarding from 0 and other small improvements | fragosti | 2018-06-28 | 2 | -3/+5 |
| | | | | | |||||
| | * | | | Customize flow depending on what steps you've completed | fragosti | 2018-06-28 | 4 | -20/+43 |
| | | | | | |||||
| | * | | | Break wrapping ETH into a 3rd step | fragosti | 2018-06-28 | 2 | -5/+24 |
| | | | | | |||||
| | * | | | Fix animation when coming from bottom | fragosti | 2018-06-28 | 1 | -0/+6 |
| | | | | | |||||
| | * | | | Fix width issue with onboarding card on mobile | fragosti | 2018-06-28 | 2 | -1/+3 |
| | | | | | |||||
| | * | | | Clicking overlay closes onboarding | fragosti | 2018-06-28 | 4 | -6/+12 |
| | | | | | |||||
| | * | | | Fix z index issue with wrap buttons and onboarding cards | fragosti | 2018-06-28 | 2 | -1/+2 |
| | | | | | |||||
| | * | | | Break wrath ETH step into 2 | fragosti | 2018-06-28 | 3 | -70/+72 |
| | | | | | |||||
| | * | | | Fix skip button position on first step | fragosti | 2018-06-28 | 1 | -11/+15 |
| | | | | | |||||
| | * | | | Make onboarding bounce around less | fragosti | 2018-06-28 | 2 | -13/+5 |
| | | | | | |||||
| | * | | | Scroll to wallet when onboarding automatically starts as well | fragosti | 2018-06-28 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | Change asset for final onboarding step | fragosti | 2018-06-28 | 1 | -217/+122 |
| | | | | | |||||
| * | | | | Make registerAssetProxy append only | Amir Bandeali | 2018-06-30 | 12 | -203/+68 |
| | | | | | |||||
| * | | | | Update staging api link | Brandon Millman | 2018-06-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #793 from 0xProject/feature/contracts/transferFromFallback | Amir Bandeali | 2018-06-30 | 12 | -383/+437 |
| |\ \ \ \ | | | | | | | | | | | | | Optimize transferFrom (saves ~2000 gas /fill) | ||||
| | * | | | | Change getTransactionReceipt to awaitTransactionMined | Amir Bandeali | 2018-06-30 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes | Alex Browne | 2018-06-30 | 2 | -27/+38 |
| | | | | | | |||||
| | * | | | | Fix deployment to geth | Amir Bandeali | 2018-06-30 | 2 | -7/+6 |
| | | | | | | |||||
| | * | | | | Fix tests | Amir Bandeali | 2018-06-30 | 6 | -79/+146 |
| | | | | | | |||||
| | * | | | | Remove transferFrom, implement in fallback function | Amir Bandeali | 2018-06-30 | 6 | -290/+267 |
| | | |_|/ | | |/| | | |||||
| * / | | | Move /docs route to the end | Brandon Millman | 2018-06-30 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #792 from 0xProject/feature/website/wallet-polish | Brandon Millman | 2018-06-30 | 24 | -397/+585 |
| |\ \ \ | | | | | | | | | | | Various wallet polish items | ||||
| | * | | | Change function to a const | Brandon Millman | 2018-06-30 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Move wallet scrollIntoView into PortalOnboardingFlow | Brandon Millman | 2018-06-30 | 2 | -7/+7 |
| | | | | | |||||
| | * | | | Add dollar sign to NullTokenRow | Brandon Millman | 2018-06-29 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Remove unused imports and variables | Brandon Millman | 2018-06-29 | 5 | -20/+1 |
| | | | | | |||||
| | * | | | Refactor inline styles out of Wallet | Brandon Millman | 2018-06-29 | 6 | -132/+139 |
| | | | | | |||||
| | * | | | Remove some hardcoded MetaMask colors | Brandon Millman | 2018-06-29 | 2 | -3/+5 |
| | | | | | |||||
| | * | | | Create AccountConnection component | Brandon Millman | 2018-06-29 | 3 | -31/+61 |
| | | | | | |||||
| | * | | | Fix scrollbar bug | Brandon Millman | 2018-06-29 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Start onboarding from relayer index | Brandon Millman | 2018-06-29 | 1 | -6/+20 |
| | | | | | |||||
| | * | | | Fix learn how to set up account layout | Brandon Millman | 2018-06-29 | 2 | -11/+13 |
| | | | | | |||||
| | * | | | Fix typo | Brandon Millman | 2018-06-29 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Get rid of unused stuff in wallet | Brandon Millman | 2018-06-29 | 1 | -65/+1 |
| | | | | | |||||
| | * | | | Fix body overlay on mobile | Brandon Millman | 2018-06-29 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | Change learn how to update your account styling | Brandon Millman | 2018-06-29 | 1 | -27/+17 |
| | | | | | |||||
| | * | | | Fix key issue and remove WalletDisconnectedItem | Brandon Millman | 2018-06-29 | 2 | -112/+1 |
| | | | | | |||||
| | * | | | Implement new locked and uninstalled states | Brandon Millman | 2018-06-29 | 7 | -7/+178 |
| | | | | | |||||
| | * | | | Fix off center icon in wallet | Brandon Millman | 2018-06-29 | 1 | -4/+7 |
| | | | | | |||||
| | * | | | Change wallet margin based on hover to prevent re-layout | Brandon Millman | 2018-06-29 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Update ProviderDisplay with new design | Brandon Millman | 2018-06-29 | 5 | -37/+118 |
| | | | | | |||||
| | * | | | Implement provider name in header | Brandon Millman | 2018-06-29 | 2 | -4/+18 |
| | | | | | |||||
| | * | | | Implement loading body rows | Brandon Millman | 2018-06-29 | 4 | -28/+80 |
| | | | | | |||||
| | * | | | Added Circle component | Brandon Millman | 2018-06-29 | 3 | -6/+21 |
| | | | | | |||||
| * | | | | Merge pull request #774 from 0xProject/style/contracts/abiEncodeAsmComments | Amir Bandeali | 2018-06-30 | 2 | -0/+22 |
| |\ \ \ \ | | | | | | | | | | | | | Added some comments for ASM hashing | ||||
| | * | | | | Updated hashing comments as-per PR | Greg Hysen | 2018-06-29 | 1 | -9/+4 |
| | | | | | | |||||
| | * | | | | Comments for ASM hashing | Greg Hysen | 2018-06-26 | 2 | -0/+27 |
| | | | | | | |||||
| * | | | | | Merge pull request #794 from 0xProject/fix/devnet-minimum-blocks | Alex Browne | 2018-06-30 | 3 | -22/+40 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Improve reliability of the minimum block number hack for devnet/geth | ||||
| | * | | | | | Add @0xproject/utils as dependency to dev-utils/package.json | Alex Browne | 2018-06-29 | 1 | -0/+1 |
| | | | | | | | |||||
| | * | | | | | Improve reliability of the minimum block number hack for the devnet/geth | Alex Browne | 2018-06-29 | 2 | -22/+39 |
| | | |/ / / | | |/| | | | |||||
* | | | | | | Add commented out scenarios not run by default | Fabio Berger | 2018-07-02 | 1 | -16/+82 |
| | | | | | | |||||
* | | | | | | Fix comment | Fabio Berger | 2018-07-02 | 1 | -2/+1 |
| | | | | | | |||||
* | | | | | | Fix validation logic by checking for 0 maker/taker amount before 0 ↵ | Fabio Berger | 2018-07-02 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | fillTakerAssetAmount since one causes the other during combinatorial testing | ||||
* | | | | | | Print out entire orderFill scenario | Fabio Berger | 2018-07-02 | 1 | -7/+1 |
| | | | | | | |||||
* | | | | | | Transfer ERC721 token instead of burning, so we can still set an allowance ↵ | Fabio Berger | 2018-07-02 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | to it in tests | ||||
* | | | | | | Fix bug where using nullAddress for order instead of actual taker address | Fabio Berger | 2018-07-02 | 1 | -11/+3 |
| | | | | | | |||||
* | | | | | | Add maker and taker balance/allowance scenarios to generateFillOrderCombination | Fabio Berger | 2018-07-02 | 1 | -8/+24 |
|/ / / / / | |||||
* | | | | | Merge v2-prototype | Fabio Berger | 2018-06-29 | 52 | -1014/+2684 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Fix NotFound component and render 0x.js docs for /docs | Brandon Millman | 2018-06-29 | 3 | -3/+5 |
| |/ / / | |||||
| * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-29 | 132 | -4133/+4839 |
| |\ \ \ | | | | | | | | | | | | | | | | feature/website/support-new-metamask | ||||
| | * | | | Remove isTracked field on token in favor of trackedTimestamp | Brandon Millman | 2018-06-29 | 11 | -26/+31 |
| | | | | | |||||
| | * | | | Use moment and lodash | Brandon Millman | 2018-06-29 | 2 | -2/+3 |
| | | | | | |||||
| | * | | | Sort wallet tokens by timestamp added and scroll to newly added token | Brandon Millman | 2018-06-29 | 6 | -11/+26 |
| | | | | | |||||
| | * | | | Merge pull request #707 from 0xProject/feature/combinatorial-testing | Fabio Berger | 2018-06-28 | 29 | -711/+2276 |
| | |\ \ \ | | | |_|/ | | |/| | | OrderFill Declarative Testing & Combinatorial Tests [Merge after #760] | ||||
| | | * | | Remove unused constants | Fabio Berger | 2018-06-28 | 1 | -2/+0 |
| | | | | | |||||
| | | * | | Reduce the userAddresses to the individual addresses actually used by tests, ↵ | Fabio Berger | 2018-06-28 | 7 | -19/+32 |
| | | | | | | | | | | | | | | | | | | | | as well as only deploy the number of ERC20 tokens needed for each test suite | ||||
| | | * | | Add await time constant | Fabio Berger | 2018-06-28 | 1 | -0/+2 |
| | | | | | |||||
| | | * | | Add missing awaitTransactionSuccessAsync calls | Fabio Berger | 2018-06-28 | 1 | -6/+10 |
| | | | | | |||||
| | | * | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 61 | -3136/+1866 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| | | * | | | 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 |
| | | | | | | |||||
| | | * | | | Fix enum name | Fabio Berger | 2018-06-27 | 1 | -9/+9 |
| | | | | | | |||||
| | | * | | | Fix type issue | Fabio Berger | 2018-06-27 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 12 | -88/+92 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| | | * | | | | Update AbstractAssetWrapper | Fabio Berger | 2018-06-26 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Rename to singular | Fabio Berger | 2018-06-26 | 1 | -9/+9 |
| | | | | | | | |||||
| | | * | | | | Fix merge issues | Fabio Berger | 2018-06-26 | 5 | -17/+21 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-26 | 36 | -379/+532 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| | | * | | | | | Fix inconsistency between contract and reference implementation of order ↵ | Fabio Berger | 2018-06-26 | 2 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | validation logic | ||||
| | | * | | | | | Prettier fixes | Fabio Berger | 2018-06-26 | 2 | -8/+2 |
| | | | | | | | | |||||
| | | * | | | | | Fix tslint issues | Fabio Berger | 2018-06-26 | 9 | -24/+4 |
| | | | | | | | | |||||
| | | * | | | | | Fix lint errors | Fabio Berger | 2018-06-26 | 3 | -5/+2 |
| | | | | | | | | |||||
| | | * | | | | | Fix revertReason | Fabio Berger | 2018-06-25 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | Remove no longer used method | Fabio Berger | 2018-06-25 | 1 | -16/+0 |
| | | | | | | | | |||||
| | | * | | | | | Check revert reasons in declarative and combinatorial tests | Fabio Berger | 2018-06-25 | 2 | -61/+67 |
| | | | | | | | | |||||
| | | * | | | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 12 | -66/+58 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Add missing import | Fabio Berger | 2018-06-25 | 1 | -1/+4 |
| | | | | | | | | | |||||
| | | * | | | | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 15 | -129/+235 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-25 | 177 | -1732/+3341 |
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 support for approveAll in assetWrapper and fillOrderScenarios | Fabio Berger | 2018-06-21 | 4 | -5/+80 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fix orderValidationUtils where was confusing a makerAssetAmount as a ↵ | Fabio Berger | 2018-06-21 | 3 | -11/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | takerAssetAmount | ||||
| | | * | | | | | | | Improve verbose logging | Fabio Berger | 2018-06-21 | 1 | -2/+5 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Fix merge variable name issue | Fabio Berger | 2018-06-20 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Add support for setting allowance to unlimited | Fabio Berger | 2018-06-20 | 2 | -7/+35 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Add noop conditionals for clarity | Fabio Berger | 2018-06-20 | 1 | -0/+10 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Rename for clarity | Fabio Berger | 2018-06-20 | 1 | -8/+8 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Split balance and allowance amount types in prep of adding the "unlimited" ↵ | Fabio Berger | 2018-06-20 | 3 | -51/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allowance enum value | ||||
| | | * | | | | | | | Remove unneeded explicit type def | Fabio Berger | 2018-06-20 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Add TS 2.7 numeric separators to improve readability | Fabio Berger | 2018-06-20 | 1 | -6/+6 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-20 | 47 | -350/+1165 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ... | ||||
| | | * | | | | | | | | Add ability for verbose logging | Fabio Berger | 2018-06-20 | 1 | -2/+10 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Fix typo | Fabio Berger | 2018-06-19 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Rename NewOrderFactory to OrderFactoryFromScenario for clarity | Fabio Berger | 2018-06-19 | 2 | -5/+5 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Remove hack in ERC20Wrapper | Fabio Berger | 2018-06-19 | 7 | -12/+30 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Cleanup coreCombinatorialUtils | Fabio Berger | 2018-06-19 | 1 | -220/+226 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Comments and cleanup | Fabio Berger | 2018-06-19 | 1 | -20/+8 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 94 | -492/+1087 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Prettier fix Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility Fix missed merge conflicts Fix additional versions and update yarn.lock Add OrderWatcherConfig type to 0x.js docs page Export OrderWatcherConfig from 0x.js Update all package versions to match latest published to NPM Update CHANGELOG's with publishes performed on development branch Rebase with latest removing PROXY_ID from transfer Split transfer impl and AssetProxyMixin change @0xproject/types to ethereum-types remove mistaken comment workaround for TypeScript trailing comma bug Document contract_templates | ||||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 73 | -415/+1965 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Increase number of columns in relayer grid for small screens Make isValidSignature public Make batchFill methods return FIllResults struct Remove remove_tags script Small fixes Use semver package instead of getNextPatchVersion Use semver library instead of semverUtils small fixes Show all errors of a given kind at once rather then throwing after the first instance is encountered fix package.json Add more prepublish checks remove remove_tags script Create a shared Image component Adjust version in changelog Update RelayerGridTile render logic to incorportate colors and logos Add max width to top bar Set max-width for LargeLayout Finish last onboarding step Finish set allowance step Add onboarding assets ... | ||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-15 | 8 | -23/+132 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Run prettify Implement allowance and final flow step Render TokenAllowance Add utilities for getting tokens from tokensByAddress Wrap AllowanceToggle in redux container | ||||
| | | * | | | | | | | | | | | Add ability to tweak the relevant balances/allowances for the maker and ↵ | Fabio Berger | 2018-06-15 | 4 | -78/+380 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | taker for a fillScenario. Convert more of the core tests to the declarative form. | ||||
| | | * | | | | | | | | | | | - Refactor assetWrapper to contain more of the normalizing logic instead of ↵ | Fabio Berger | 2018-06-15 | 10 | -84/+341 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erc20Wrapper and erc721Wrapper - Add burn method to DummyERC721Token - Add additional methods to assetWrapper to set balance/allowances on ERC20 and ERC721 tokens - Use approve instead of approveAll for ERC721 tokens | ||||
| | | * | | | | | | | | | | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert ↵ | Fabio Berger | 2018-06-14 | 5 | -60/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generateOrderCombinations to generateFillOrderCombinations | ||||
| | | * | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-14 | 29 | -38/+814 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (27 commits) Add back redirector behind feature flag Update minHeight in Text Use Text components in Values Use spread operator instead of React.createElement Fix issue with positions hash Revert localhost config Use Text in Teams Use Text in OpenPositions Use Text component for HeaderItem Remove FloatingImage Move FilledImage into components/ui Replace FlatButton with Button in Retry Fix incorrect colors Add font family to Button component and use in Join0x component Consolidate jobs page grey colors with shared colors Fix lint errors Remove extra packages Implement small open positions Implement large screen open positions Teams section ... | ||||
| | | * | | | | | | | | | | | | Use a defaultFillScenario in fillOrder tests | Fabio Berger | 2018-06-14 | 1 | -36/+39 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Fix incorrect string values in enum | Fabio Berger | 2018-06-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Fix calculation of expFilledTakerAmount and expected values in events emitted | Fabio Berger | 2018-06-14 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Replace initial set of legacy manually written fillOrder tests with ↵ | Fabio Berger | 2018-06-14 | 2 | -434/+186 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | declarative FillScenario tests | ||||
| | | * | | | | | | | | | | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ↵ | Fabio Berger | 2018-06-14 | 4 | -35/+153 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FillScenario | ||||
| | | * | | | | | | | | | | | | Fix divide by zero bug | Fabio Berger | 2018-06-14 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Move orderFill combinatorialTests to exchange folder | Fabio Berger | 2018-06-13 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-13 | 63 | -1012/+1928 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (26 commits) Rename _coverageCollector -> _profilerCollector in TraceCollectionSubprovider Refactor sol-cov to de-duplicate code for coverage and profiling Rename popByte and popAddress Hard code test addresses/bytes32 instead of generating pseudorandom ones Update artifacts Rename computeCoverageAsync -> computeSingleTraceCoverageAsync Fix linter errors Refactor sol-cov to avoid keeping traceInfo in memory Unpop byte rather than making deep copy Pass gas in to marketBuyOrdersNoThrow Looks up the memory location of makerAssetData/takerAssetData Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA Add tests for deepCopyBytes and missing write methods from LibBytes Pop id from assetData before dispatching to AssetProxies Upgrade solidity-parser-entlr 0.2.11 => 0.2.12 Fix import order Fix typos Add CHANGELOGs Speed-up sol-cov Increase delay when sending transactions during devnet startup ... | ||||
| | | * | | | | | | | | | | | | | Implement initial set of orderFill combinatorial tests | Fabio Berger | 2018-06-13 | 13 | -490/+784 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper ↵ | Fabio Berger | 2018-06-13 | 4 | -9/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | superset | ||||
| | | * | | | | | | | | | | | | | Remaining refactors of order-utils components for V2 | Fabio Berger | 2018-06-13 | 5 | -46/+48 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | For some reason order-watcher tests were timeing out so I increased the ↵ | Fabio Berger | 2018-06-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout limit | ||||
| | | * | | | | | | | | | | | | | Remove comment since we have added the tests | Fabio Berger | 2018-06-13 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Variable rename for clarity | Fabio Berger | 2018-06-13 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-12 | 175 | -1082/+3542 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (68 commits) Stop exporting ArtifactWriter Fix no-unused-variable tslint rule to include parameters and fix issues Fix linter exclude rule Validate all signature types rather then only ECSignatures Store the instantiated OrderValidationUtils Remove global hooks from tests and deploy contracts from within the specific tests Add EmitStatement to ASTVisitor Fix tslint issues Add back artifacts file Fix a bug in SolCompilerArtifacts adapter config overriding Move OrderValidationUtils (+ tests) and ExchangeTransferSimulator to order-utils export parseECSignature method Export ArtifactWriter from migrations package Remove unused artifact file Pass in generated contract wrapper to orderValidationUtils at instantiation Refactor orderValidationUtils to use the generated contract wrapper instead of the higher-level one Refactor ExchangeTransferSimulator public interface to accet an AbstractBalanceAndProxyAllowanceLazyStore so that this module could be re-used in different contexts. Increase timeout for contract migrations Remove some copy-paste code Await transactions in migrations ... | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-08 | 41 | -79/+80 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix linter issue Fix linter issue Fix tslint issues Fix missing paths 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 branch 'fix/order-utils/remaining-v2-changes' into ↵ | Fabio Berger | 2018-06-08 | 7 | -55/+37 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/combinatorial-testing * fix/order-utils/remaining-v2-changes: Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder | ||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'fix/order-utils/remaining-v2-changes' into ↵ | Fabio Berger | 2018-06-08 | 5 | -183/+201 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/combinatorial-testing * fix/order-utils/remaining-v2-changes: 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. | ||||
| | | * | | | | | | | | | | | | | | | | | POC: Generates an order from spec, get's the amount fillable | Fabio Berger | 2018-06-08 | 7 | -32/+462 |
| | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | merge v2-prototype | Fabio Berger | 2018-06-07 | 286 | -2348/+2687 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | Implement initial generateOrder function that given the scenario values for ↵ | Fabio Berger | 2018-06-07 | 2 | -0/+244 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an order, generates the actual order. | ||||
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #766 from perissology/feature/solcov-ignore | Fabio Berger | 2018-06-28 | 4 | -2/+104 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [sol-cov] add ability to ignore covering specific code blocks | ||||
| | | * | | | | | | | | | | | | | | | | | | | rename function | perissology | 2018-06-27 | 2 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | add /*solcov ignore next*/ tests | perissology | 2018-06-25 | 2 | -0/+52 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | support ignoring entire contracts | perissology | 2018-06-25 | 1 | -7/+11 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | add ability to ignore covering specific code blocks | perissology | 2018-06-23 | 2 | -2/+48 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Changing provider to ledger more consistent with previous experience | fragosti | 2018-06-28 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Fix convention stuff | fragosti | 2018-06-28 | 2 | -20/+20 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Remove IS_MAINNET_ENABLED config | fragosti | 2018-06-28 | 4 | -74/+49 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Rename all corresponding bools to shouldUseLedgerProvider | fragosti | 2018-06-28 | 1 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Never use trackedTokenState when fetching new token state | fragosti | 2018-06-27 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Fix bug where we are requesting tokens on a different network | fragosti | 2018-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Remove unused variables | fragosti | 2018-06-27 | 4 | -24/+9 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Make unsubscribing work | fragosti | 2018-06-27 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Fix stateful ledger dialog edge state | fragosti | 2018-06-27 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Get things working with legacy portal | fragosti | 2018-06-27 | 1 | -10/+8 |
| | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Fix subtle issues with ledger config dialog | fragosti | 2018-06-27 | 3 | -11/+13 |
| | | | | | | | | | | | | | | | | | | | | | |