aboutsummaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-25177-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
| * Merge pull request #735 from feuGeneA/metacoin-independenceLeonid Logvinov2018-06-252-3/+16
| |\ | | | | | | Metacoin independence
| | * ethereum-types now only has v0.0.2, no 0.0.1F. Eugene Aumson2018-06-201-1/+1
| | |
| | * add missing metacoin dependenciesF. Eugene Aumson2018-06-201-0/+4
| | |
| | * make metacoin tsconfig independentF. Eugene Aumson2018-06-201-2/+11
| | |
| * | Merge pull request #758 from 0xProject/fix/order-utils/known-order-hashJacob Evans2018-06-251-8/+4
| |\ \ | | | | | | | | Fix known order hash value test in order-utils
| | * | Fix known order hash value testJacob Evans2018-06-221-8/+4
| | | |
| * | | Fix typos in commentsRemco Bloemen2018-06-231-2/+2
| | | |
| * | | Add modifier and tests for removeAuthorizedAddressAtIndexAmir Bandeali2018-06-233-2/+79
| | | |
| * | | Update and add testsAmir Bandeali2018-06-234-173/+274
| | | |
| * | | Change removeAuthorizedAddress => removeAuthorizedAddressAtIndexAmir Bandeali2018-06-232-13/+22
| | | |
| * | | Move isFunctionRemoveAuthorizedAddress to testRemco Bloemen2018-06-236-22/+70
| | | |
| * | | Fix usage of `popLastByte`Remco Bloemen2018-06-231-2/+2
| | | |
| * | | Fix LibBytes is a libraryRemco Bloemen2018-06-236-15/+12
| | | |
| * | | Remove `areBytesEqual`Remco Bloemen2018-06-231-35/+0
| | | |
| * | | Fix usage of `contentAddress()`Remco Bloemen2018-06-231-2/+2
| | | |
| * | | Clean low bits in bytes4Remco Bloemen2018-06-231-0/+3
| | | |
| * | | Clean high bits in addressRemco Bloemen2018-06-231-0/+4
| | | |
| * | | Refactor LibBytes.readBytes4 for consistencyRemco Bloemen2018-06-234-14/+25
| | | |
| * | | Fix LibBytes.equalsRemco Bloemen2018-06-231-21/+4
| | | |
| * | | Add trailing garbage testcase for LibBytes.equalsRemco Bloemen2018-06-232-0/+21
| | | |
| * | | Rename bytes.equalsRemco Bloemen2018-06-233-15/+50
| | | |
| * | | Add slice and sliceDestructiveRemco Bloemen2018-06-231-0/+46
| | | |
| * | | Rename bytes.rawAddress and add bytes.contentAddressRemco Bloemen2018-06-232-8/+25
| | | |
| * | | Rename read/writeBytesWithLengthRemco Bloemen2018-06-234-36/+36
| | | |
| * | | Using LibBytes for bytesRemco Bloemen2018-06-236-26/+38
| | | |
| * | | Make LibBytes a libraryRemco Bloemen2018-06-236-35/+30
| | | |
| * | | Merge LibMem and LibBytesRemco Bloemen2018-06-2311-399/+322
| | | |
| * | | Use provided mem in refernce memcpyRemco Bloemen2018-06-231-2/+2
| | | |
| * | | Merge pull request #749 from 0xProject/feature/contracts/transactionHashAsmAmir Bandeali2018-06-231-8/+18
| |\ \ \ | | | | | | | | | | Converted `hashZeroExTransaction` to assembly. Saves 1k gas
| | * | | Apply mask to address to zero-out unused bytes.Greg Hysen2018-06-231-1/+1
| | | | |
| | * | | Converted `hashZeroExTransaction` to assembly. Saves 1k gasGreg Hysen2018-06-221-8/+18
| | | | |
| * | | | Remove extra border from the bottom of the walletBrandon Millman2018-06-231-3/+11
| | | | |
| * | | | Do not render ZRX or WETH as removable tracked tokensBrandon Millman2018-06-231-1/+4
| | | | |
| * | | | Center items in portal drawer headerBrandon Millman2018-06-231-1/+1
| | | | |
| * | | | Fix issue where hovered tiles appear over top barfragosti2018-06-232-5/+10
| | | | |
| * | | | Merge pull request #746 from 0xProject/feature/website/relayer-grid-polishFrancesco Agosti2018-06-2311-152/+138
| |\ \ \ \ | | | | | | | | | | | | Relayer grid polish
| | * | | | Remove unecessary position relative rulesfragosti2018-06-232-2/+4
| | | | | |
| | * | | | Lint and fix typofragosti2018-06-222-2/+2
| | | | | |
| | * | | | Fix z-index issuesfragosti2018-06-226-49/+63
| | | | | |
| | * | | | Fix issues that arose from mergefragosti2018-06-222-4/+8
| | | | | |
| | * | | | Remove Background componentBrandon Millman2018-06-225-57/+12
| | | | | |
| | * | | | Padding adjustmentBrandon Millman2018-06-221-1/+2
| | | | | |
| | * | | | Remove styles from Portal componentBrandon Millman2018-06-221-24/+13
| | | | | |
| | * | | | Add Background componentBrandon Millman2018-06-223-14/+35
| | | | | |
| | * | | | Various relayer grid ui polish itemsBrandon Millman2018-06-226-42/+42
| | |/ / /
| * | | | Fix tslint errorfragosti2018-06-231-10/+10
| | | | |
| * | | | Merge https://github.com/0xProject/0x-monorepo into v2-prototypefragosti2018-06-232-14/+16
| |\ \ \ \
| | * \ \ \ Merge pull request #750 from 0xProject/bug/website/fix-add-tokenBrandon Millman2018-06-232-14/+16
| | |\ \ \ \ | | | | | | | | | | | | | | Various add token flow bugs
| | | * | | | Pulled out reset AssetPicker state into a common variableBrandon Millman2018-06-231-15/+9
| | | | | | |
| | | * | | | Fix state mutation in reducerBrandon Millman2018-06-221-4/+4
| | | | | | |
| | | * | | | Do not add empty token to local storageBrandon Millman2018-06-221-0/+8
| | | |/ / /
| * | | | | Remove diverse from about pagefragosti2018-06-231-3/+3
| | | | | |
| * | | | | Use Ops instead of Operations in Mels descriptionfragosti2018-06-231-1/+1
| |/ / / /
| * | | | Comment out Chris, and move Mel up in about pagefragosti2018-06-232-12/+12
| | | | |
| * | | | Merge pull request #748 from 0xProject/fix/contracts/nullAssetProxyFabio Berger2018-06-223-27/+48
| |\ \ \ \ | | |_|/ / | |/| | | Check that assetProxy exists before attempting transfer
| | * | | Check that assetProxy exists before attempting transferAmir Bandeali2018-06-223-27/+48
| | | | |
| * | | | Add coverage and test:circleci command to sra-reportFabio Berger2018-06-222-0/+4
| | | | |
| * | | | Add missing artifactsFabio Berger2018-06-222-0/+194
| | | | |
| * | | | Skip failing tests temporarilyFabio Berger2018-06-221-2/+6
| | | | |
| * | | | Fix web3-wrapper testFabio Berger2018-06-221-1/+1
| | | | |
| * | | | Merge pull request #752 from 0xProject/make-promises-safe-preloaderFabio Berger2018-06-2271-72/+17
| |\ \ \ \ | | | | | | | | | | | | Use make-promises-safe as a preloader instead of manually importing
| | * | | | Use make-promises-safe as a preloader instead of manually importingAlex Browne2018-06-2271-72/+17
| | | |/ / | | |/| |
| * | | | Merge pull request #751 from 0xProject/feature/contracts/compilerRunsAmir Bandeali2018-06-221-1/+1
| |\ \ \ \ | | |/ / / | |/| | | Updated compiler runs to be 1,000,000
| | * | | Updated compiler runs to be 1,000,000Greg Hysen2018-06-221-1/+1
| | | | |
| * | | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ↵Amir Bandeali2018-06-2215-70/+144
| | | | | | | | | | | | | | | | | | | | accross all contracts
| * | | | Add senderAddress to Fill and Cancel logs, add comments to events and typesAmir Bandeali2018-06-225-44/+47
| | | | |
| * | | | Merge pull request #747 from 0xProject/fix/sol-cov-bugsAlex Browne2018-06-222-7/+23
| |\ \ \ \ | | |_|/ / | |/| | | Fix some bugs in sol-cov
| | * | | Fix some bugs in sol-covAlex Browne2018-06-222-7/+23
| | |/ /
| * | | Merge pull request #744 from NoteGio/v2-prototype-unreachableAmir Bandeali2018-06-221-4/+0
| |\ \ \ | | | | | | | | | | Remove unreachable PreSigned check
| | * | | Remove unreachable PreSigned checkAustin Roberts2018-06-221-4/+0
| | | | | | | | | | | | | | | | | | | | This code was unreachable, as it had the exact same condition as line 206.
| * | | | Fix Island componentfragosti2018-06-221-2/+2
| | | | |
| * | | | Add missing image assets for Chris and Melfragosti2018-06-222-0/+0
| | | | |
| * | | | Merge pull request #739 from ↵Francesco Agosti2018-06-2212-159/+267
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | 0xProject/feature/website/mobile-friendly-onboarding Add support for mobile-friendly onboarding flows
| | * | | Fix lintingfragosti2018-06-221-2/+2
| | | | |
| | * | | Buttons look hella disabled nowfragosti2018-06-222-9/+17
| | | | |
| | * | | Remove border radius, fix width issue for unlock stepfragosti2018-06-224-5/+12
| | | | |
| | * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-2269-644/+1795
| | |\| | | | | | | | | | | | | | | | | feature/website/mobile-friendly-onboarding
| | * | | Prevent prettier issuefragosti2018-06-211-10/+8
| | | | |
| | * | | Support mobile friendly onboarding flowsfragosti2018-06-219-87/+180
| | | | |
| | * | | Scroll to wallet for mobile onboardingfragosti2018-06-211-23/+28
| | | | |
| | * | | Change Island to use styled-componentsfragosti2018-06-201-15/+8
| | | | |
| | * | | Show start onboarding flow button on top of wallet on mobilefragosti2018-06-201-25/+29
| | | | |
| * | | | Merge pull request #742 from 0xProject/feature/website/chris-mel-about-pageFrancesco Agosti2018-06-222-2/+21
| |\ \ \ \ | | |_|/ / | |/| | | Add Chris and Mel to about page
| | * | | Add Chris and Mel to about pagefragosti2018-06-222-2/+21
| | | | |
| * | | | Merge pull request #734 from 0xProject/feature/website/shadow-stylingBrandon Millman2018-06-224-10/+8
| |\ \ \ \ | | | | | | | | | | | | Update Island shadow styling and use Island in more places
| | * | | | Update Island shadow styling and use Island in more placesBrandon Millman2018-06-204-10/+8
| | | |/ / | | |/| |
| * | | | Merge pull request #702 from perissology/feature/missing-sourcesLeonid Logvinov2018-06-223-3/+9
| |\ \ \ \ | | | | | | | | | | | | [sol-cov] Only collect coverage for provided sources
| | * | | | fix linter issuesperissology2018-06-221-1/+1
| | | | | |
| | * | | | only call getLocationByOffset if source if definedperissology2018-06-211-4/+1
| | | | | |
| | * | | | Collect coverage for provided sourcesperissology2018-06-153-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When solidity generates source maps during contract compilation, the contracts are referred to by an id, which corresponds to an array index. We may not want to cover all sources that were included in a compilation, but because we use array indexes (vs. the id that is provided by solidity compiler) to map the contract to the sourceMap, the provided sourceCodes array must include the code at the correct index. This can result in empty slots in the sourceCodes array. This commit allows the coverage to only be collected for the contracts with provided sourceCode.
| * | | | | Set settleOrder and settleMatchedOrders to privateGreg Hysen2018-06-215-85/+104
| | | | | |
| * | | | | Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and ↵Greg Hysen2018-06-219-297/+232
| | |_|/ / | |/| | | | | | | | | | | | | `settleMatchedOrders` into `MixinMatchOrders`
| * | | | Merge pull request #733 from 0xProject/bug/website/identicon-layoutBrandon Millman2018-06-213-3/+6
| |\ \ \ \ | | | | | | | | | | | | Move some layout logic out of the Identicon component
| | * | | | Move some layout logic out of the Identicon componentBrandon Millman2018-06-203-3/+6
| | | |_|/ | | |/| |
| * | | | Migrations after rebasingGreg Hysen2018-06-2113-188/+320
| | | | |
| * | | | LinterGreg Hysen2018-06-211-2/+1
| | | | |
| * | | | Renamed constants in test wallet/validatorGreg Hysen2018-06-212-11/+11
| | | | |
| * | | | Few more minor #nit wording changesGreg Hysen2018-06-212-5/+5
| | | | |
| * | | | Changed wording of two tests #nitGreg Hysen2018-06-211-2/+2
| | | | |
| * | | | Minor improvements to MixinSignatureValidator testsGreg Hysen2018-06-211-14/+8
| | | | |
| * | | | Remove .onlyGreg Hysen2018-06-211-1/+1
| | | | |
| * | | | Fixed two mislabelled revert reasons + Signature Validator revert tests ↵Greg Hysen2018-06-213-8/+17
| | | | | | | | | | | | | | | | | | | | working on Geth
| * | | | Minor style tweaksGreg Hysen2018-06-213-8/+8
| | | | |
| * | | | Fixed how trezor messages are signed in `signature_utils`. Now uses ↵Greg Hysen2018-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | `byteLength` instead of `length`.
| * | | | Fixed `callAsync` template. Previously did not append `callData`, so we ↵Greg Hysen2018-06-211-0/+1
| | | | | | | | | | | | | | | | | | | | couldn’t specify `from` address
| * | | | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported ↵Greg Hysen2018-06-2110-27/+531
| | | | | | | | | | | | | | | | | | | | types. Fixed trezor prefix.
| * | | | Update version for @types/solidity-parser-antlrAlex Browne2018-06-211-1/+1
| | | | |
| * | | | Update to match latest type definitions and other small changesAlex Browne2018-06-212-9/+11
| | | | |
| * | | | Update sol-cov CHANGELOG.jsonAlex Browne2018-06-211-12/+20
| | | | |
| * | | | Include source code snippets in revert stack tracesAlex Browne2018-06-215-21/+254
| | | | |
| * | | | Fix CHANGELOG entries changed during incorrect merge (2a4456b)Fabio Berger2018-06-215-0/+112
| | | | |
* | | | | Add support for approveAll in assetWrapper and fillOrderScenariosFabio Berger2018-06-214-5/+80
| | | | |
* | | | | Fix orderValidationUtils where was confusing a makerAssetAmount as a ↵Fabio Berger2018-06-213-11/+18
| | | | | | | | | | | | | | | | | | | | takerAssetAmount
* | | | | Improve verbose loggingFabio Berger2018-06-211-2/+5
| | | | |
* | | | | Fix merge variable name issueFabio Berger2018-06-201-1/+1
| | | | |
* | | | | Add support for setting allowance to unlimitedFabio Berger2018-06-202-7/+35
| | | | |
* | | | | Add noop conditionals for clarityFabio Berger2018-06-201-0/+10
| | | | |
* | | | | Rename for clarityFabio Berger2018-06-201-8/+8
| | | | |
* | | | | Split balance and allowance amount types in prep of adding the "unlimited" ↵Fabio Berger2018-06-203-51/+59
| | | | | | | | | | | | | | | | | | | | allowance enum value
* | | | | Remove unneeded explicit type defFabio Berger2018-06-201-1/+1
| | | | |
* | | | | Add TS 2.7 numeric separators to improve readabilityFabio Berger2018-06-201-6/+6
| | | | |
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2047-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 ...
| * | | | Merge pull request #637 from 0xProject/bug/contracts/eip712-191-prefixJacob Evans2018-06-2011-107/+305
| |\ \ \ \ | | | | | | | | | | | | Add missing EIP191 prefix for EIP712 and Execute Transaction
| | * | | | Fix closing parens in liborderJacob Evans2018-06-201-16/+15
| | | | | |
| | * | | | Assembler orderHash functionRemco Bloemen2018-06-191-18/+22
| | | | | |
| | * | | | Optimize and remove redundant encodePackedJacob Evans2018-06-196-18/+23
| | | | | |
| | * | | | Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefixJacob Evans2018-06-18469-8020/+10214
| | |\ \ \ \
| | * | | | | Rebase and update feedbackJacob Evans2018-06-188-114/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache the domain separator data with address this Use the EIP712Types enum for types everywhere Rename EIP712 struct ExecuteTransaction to ZeroExTransaction
| | * | | | | Basic EIP712 encoderJacob Evans2018-06-083-40/+61
| | | | | | |
| | * | | | | Update Order utils to use eip712Jacob Evans2018-06-0612-183/+121
| | | | | | |
| | * | | | | Add missing EIP191 prefix for EIP712Jacob Evans2018-06-0510-50/+279
| | | | | | |
| * | | | | | Update after rebaseJacob Evans2018-06-201-7/+1
| | | | | | |
| * | | | | | ERC721Proxy Always call safeTransferFromJacob Evans2018-06-202-10/+14
| | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #714 from 0xProject/feature/contracts/cancelOrdersUpToSenderAmir Bandeali2018-06-2016-96/+600
| |\ \ \ \ \ | | | | | | | | | | | | | | Make cancelOrdersUpTo compatible with sender abstraction
| | * | | | | Rename makerEpoch => orderEpochAmir Bandeali2018-06-2012-110/+113
| | | | | | |
| | * | | | | Make cancelOrdersUpTo compatible with sender abstractionAmir Bandeali2018-06-2011-47/+548
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #724 from 0xProject/bug/website/onboarding-improvementsFrancesco Agosti2018-06-204-7/+22
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix Wallet appearing over Drawer, and Onboarding not exiting when changing routes
| | * | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-20112-613/+1304
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | bug/website/onboarding-improvements
| | * | | | | Fix onboarding persisting when changing routesfragosti2018-06-192-3/+12
| | | | | | |
| | * | | | | Only elevate wallet zIndex when onboarding is in progressfragosti2018-06-193-4/+10
| | | | | | |
| * | | | | | Merge pull request #727 from ↵Francesco Agosti2018-06-201-3/+7
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | 0xProject/bug/website/fix-fetching-balances-on-wallet-login Fix bug where we do not fetch balances on wallet login
| | * | | | | Fix linting issuefragosti2018-06-191-1/+1
| | | | | | |
| | * | | | | Fix bug where we do fetch balances on wallet loginfragosti2018-06-191-3/+7
| | |/ / / /
| * | | | | Merge pull request #723 from 0xProject/bug/website/drawer-addressBrandon Millman2018-06-206-48/+82
| |\ \ \ \ \ | | | | | | | | | | | | | | Consolidate account state display message logic
| | * | | | | Use Image component instead of img tagBrandon Millman2018-06-203-8/+9
| | | | | | |
| | * | | | | Consolidate account state messaging logicBrandon Millman2018-06-195-47/+80
| | |/ / / /
| * | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-20165-936/+3083
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | feature/website/portal-v2-analytics
| | * \ \ \ \ Merge pull request #726 from 0xProject/bug/website/late-eth-balanceBrandon Millman2018-06-202-47/+48
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Check network state immediately instead of waiting for delay
| | | * | | | | Check network state immediately instead of waiting for delayBrandon Millman2018-06-192-47/+48
| | | | | | | |
| | * | | | | | Merge pull request #683 from 0xProject/fix/contracts/memcpyRemco Bloemen2018-06-191-10/+12
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Simplified handling of source < 32 edge case
| | | * | | | | | Simplified handling of source < 32 edge caseRemco Bloemen2018-06-111-10/+12
| | | | | | | | |
| * | | | | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-1536-61/+946
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/website/portal-v2-analytics
| * | | | | | | | | Run linterfragosti2018-06-155-8/+21
| | | | | | | | | |
| * | | | | | | | | Add Portal v2 loggingfragosti2018-06-158-15/+62
| | | | | | | | | |
* | | | | | | | | | Add ability for verbose loggingFabio Berger2018-06-201-2/+10
| | | | | | | | | |
* | | | | | | | | | Fix typoFabio Berger2018-06-191-2/+2
| | | | | | | | | |
* | | | | | | | | | Rename NewOrderFactory to OrderFactoryFromScenario for clarityFabio Berger2018-06-192-5/+5
| | | | | | | | | |
* | | | | | | | | | Remove hack in ERC20WrapperFabio Berger2018-06-197-12/+30
| | | | | | | | | |
* | | | | | | | | | Cleanup coreCombinatorialUtilsFabio Berger2018-06-191-220/+226
| | | | | | | | | |
* | | | | | | | | | Comments and cleanupFabio Berger2018-06-191-20/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1994-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
| * | | | | | | | | Prettier fixFabio Berger2018-06-191-3/+5
| | | | | | | | | |
| * | | | | | | | | Merge pull request #701 from feuGeneA/v2-prototypeFabio Berger2018-06-193-5/+16
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Document use of contract_templates (take 2; based on v2-prototype, not master)
| | * | | | | | | | | change @0xproject/types to ethereum-typesF. Eugene Aumson2018-06-151-1/+1
| | | | | | | | | | |
| | * | | | | | | | | remove mistaken commentF. Eugene Aumson2018-06-151-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It must have been left over from when an abi-gen output was modified to be the source of this template.
| | * | | | | | | | | workaround for TypeScript trailing comma bugF. Eugene Aumson2018-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before this change, TypeScript compilation of the generated contract wrapper was giving me the following errors: $ abi-gen --abis 'build/contracts/*.json' --out build/types --template contract_templates/contract.handlebars --partials 'contract_templates/partials/*.handlebars' Found 7 partial templates Found 1 ABI files Processing: Migrations... Created: build/types/migrations.ts $ tsc build/types/migrations.ts(81,23): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(108,23): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(130,23): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(146,25): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(173,25): error TS1013: A rest parameter or binding pattern may not have a trailing comma. build/types/migrations.ts(195,25): error TS1013: A rest parameter or binding pattern may not have a trailing comma. info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command. Here is the generated code around the first error: 74: public setCompleted = { 75: async sendTransactionAsync( 76: completed: BigNumber, 77: txData: Partial<TxData> = {}, 78: ): Promise<string> { 79: const self = this as any as MigrationsContract; 80: const inputAbi = self._lookupAbi('setCompleted(uint256)').inputs; 81: [completed, 82: ] = BaseContract._formatABIDataItemList(inputAbi, [completed, 83: ], BaseContract._bigNumberToString.bind(self)); All of the other errors are the same, a destructuring assignment with a single element but with a trailing comma. This is legal JavaScript but it is not allowed by the TypeScript compiler, apparently per the bug described at https://github.com/Microsoft/TypeScript/issues/24628 . While awaiting the 3.0 version of TypeScript, it's a simple enough change to have the template not append a trailing comma.
| | * | | | | | | | | Document contract_templatesF. Eugene Aumson2018-06-151-0/+15
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge pull request #728 from 0xProject/fix/post-dev-publishFabio Berger2018-06-1984-356/+856
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Update v2-prototype w/ development changes since publish
| | * | | | | | | | | Fix missed merge conflictsFabio Berger2018-06-193-14/+0
| | | | | | | | | | |
| | * | | | | | | | | Fix additional versions and update yarn.lockFabio Berger2018-06-198-8/+8
| | | | | | | | | | |
| | * | | | | | | | | Add OrderWatcherConfig type to 0x.js docs pageFabio Berger2018-06-191-0/+1
| | | | | | | | | | |
| | * | | | | | | | | Export OrderWatcherConfig from 0x.jsFabio Berger2018-06-191-0/+2
| | | | | | | | | | |
| | * | | | | | | | | Update all package versions to match latest published to NPMFabio Berger2018-06-1931-234/+234
| | | | | | | | | | |
| | * | | | | | | | | Update CHANGELOG's with publishes performed on development branchFabio Berger2018-06-1950-111/+622
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Update default params in sendRawPaylodAsync for improved JSON-RPC compatibilityAra Kevonian2018-06-191-2/+7
| | | | | | | | | |
| * | | | | | | | | Merge pull request #659 from ↵Jacob Evans2018-06-196-129/+206
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/contracts/split-proxy-internal-logic Split transfer implementation and AssetProxyMixin
| | * | | | | | | | Rebase with latest removing PROXY_ID from transferJacob Evans2018-06-185-95/+111
| | | | | | | | | |
| | * | | | | | | | Split transfer impl and AssetProxyMixinJacob Evans2018-06-184-95/+156
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1973-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 ...
| * | | | | | | | Increase number of columns in relayer grid for small screensBrandon Millman2018-06-191-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Make isValidSignature publicAmir Bandeali2018-06-199-53/+331
| | | | | | | |
| * | | | | | | Make batchFill methods return FIllResults structAmir Bandeali2018-06-192-10/+28
| | | | | | | |
| * | | | | | | Remove remove_tags scriptFabio Berger2018-06-191-57/+0
| | | | | | | |
| * | | | | | | Small fixesFabio Berger2018-06-193-10/+4
| | | | | | | |
| * | | | | | | Use semver package instead of getNextPatchVersionFabio Berger2018-06-192-7/+16
| | | | | | | |
| * | | | | | | Use semver library instead of semverUtilsFabio Berger2018-06-196-73/+17
| | | | | | | |
| * | | | | | | small fixesFabio Berger2018-06-191-2/+2
| | | | | | | |
| * | | | | | | Show all errors of a given kind at once rather then throwing after the first ↵Fabio Berger2018-06-191-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instance is encountered
| * | | | | | | fix package.jsonFabio Berger2018-06-191-1/+1
| | | | | | | |
| * | | | | | | Add more prepublish checksFabio Berger2018-06-198-39/+332
| | | | | | | |
| * | | | | | | remove remove_tags scriptFabio Berger2018-06-192-4/+0
| | | | | | | |
| * | | | | | | Merge pull request #712 from 0xProject/feature/website/portal-faceliftBrandon Millman2018-06-196-42/+68
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change relayer grid tile to use logos and primary colors
| | * | | | | | | Create a shared Image componentBrandon Millman2018-06-192-35/+48
| | | | | | | | |
| | * | | | | | | Update RelayerGridTile render logic to incorportate colors and logosBrandon Millman2018-06-173-14/+24
| | | | | | | | |
| | * | | | | | | Add max width to top barBrandon Millman2018-06-172-1/+3
| | | | | | | | |
| | * | | | | | | Set max-width for LargeLayoutBrandon Millman2018-06-171-4/+5
| | |/ / / / / /
| * | | | | | | Merge pull request #704 from 0xProject/bug/website/fix-filling-orderFrancesco Agosti2018-06-198-4/+21
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix filling orders on Portal
| | * | | | | | | Adjust version in changelogfragosti2018-06-191-1/+1
| | | | | | | | |
| | * | | | | | | Prettierfragosti2018-06-151-1/+1
| | | | | | | | |
| | * | | | | | | Add to changelog for contract-wrappersfragosti2018-06-151-0/+8
| | | | | | | | |
| | * | | | | | | Fix typofragosti2018-06-151-1/+1
| | | | | | | | |
| | * | | | | | | Fix filling orders on Portalfragosti2018-06-157-4/+13
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge pull request #711 from ↵Francesco Agosti2018-06-1925-85/+801
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | 0xProject/website/feature/prettier-onboarding-components Made onboarding look like the mocks
| | * | | | | | Finish last onboarding stepfragosti2018-06-167-2/+277
| | | | | | | |
| | * | | | | | Finish set allowance stepfragosti2018-06-162-5/+32
| | | | | | | |
| | * | | | | | Add onboarding assetsfragosti2018-06-167-0/+82
| | | | | | | |
| | * | | | | | Add all steps to their own filefragosti2018-06-1611-71/+196
| | | | | | | |
| | * | | | | | Prettify account setup and add eth steps of onboardingfragosti2018-06-163-3/+32
| | | | | | | |
| | * | | | | | Make metamask part of the fow prettyfragosti2018-06-163-7/+35
| | | | | | | |
| | * | | | | | Make start onboarding button prettyfragosti2018-06-161-2/+17
| | | | | | | |
| | * | | | | | Improve styles of onboarding tooltipfragosti2018-06-167-53/+117
| | | | | | | |
| | * | | | | | Add Pointer componentfragosti2018-06-152-16/+87
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #700 from 0xProject/fix/contracts/tokenbugsRemco Bloemen2018-06-161-1/+29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Handle tokens that do not return bool
| | * | | | | | Handle tokens that do not return boolRemco Bloemen2018-06-141-1/+29
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #705 from 0xProject/feature/revert-trace-subproviderAlex Browne2018-06-1514-103/+365
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Introduce subprovider for printing revert stack traces
| | * | | | | Change wording of error message when you try to use more than one subproviderAlex Browne2018-06-151-1/+1
| | | | | | |
| | * | | | | Remove redundant check in trace.ts and revert_trace.tsAlex Browne2018-06-152-6/+1
| | | | | | |
| | * | | | | Fix linter errorsAlex Browne2018-06-151-0/+1
| | | | | | |
| | * | | | | De-duplicate code by refactoring subprovider classesAlex Browne2018-06-155-204/+89
| | | | | | |
| | * | | | | Fix linter errors and remove coverage.jsonAlex Browne2018-06-151-2/+1
| | | | | | |
| | * | | | | Remove unused variables and other small fixesAlex Browne2018-06-154-10/+11
| | | | | | |
| | * | | | | Reverse order of stack trace to match behavior of most other language stack ↵Alex Browne2018-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | traces
| | * | | | | Fix a bug in revert_trace.tsAlex Browne2018-06-154-40/+55
| | | | | | |
| | * | | | | Introduce subprovider for printing revert stack tracesAlex Browne2018-06-1510-50/+416
| | | |/ / / | | |/| | |
* | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-158-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
| * | | | | Merge pull request #695 from ↵Francesco Agosti2018-06-158-23/+132
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | 0xProject/feature/website/onboarding-flow-allowances Implement allowances and final "congrats" onboarding flow step
| | * | | | Run prettifyfragosti2018-06-151-7/+8
| | | | | |
| | * | | | Implement allowance and final flow stepfragosti2018-06-136-21/+42
| | | | | |
| | * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-13225-1468/+4849
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | feature/website/onboarding-flow-allowances
| | * \ \ \ \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-07308-2450/+2786
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | feature/website/onboarding-flow-allowances
| | * | | | | | Render TokenAllowancefragosti2018-06-072-5/+20
| | | | | | | |
| | * | | | | | Add utilities for getting tokens from tokensByAddressfragosti2018-06-074-3/+20
| | | | | | | |
| | * | | | | | Wrap AllowanceToggle in redux containerfragosti2018-06-075-11/+66
| | | | | | | |
* | | | | | | | Add ability to tweak the relevant balances/allowances for the maker and ↵Fabio Berger2018-06-154-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 Berger2018-06-1510-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 Berger2018-06-145-60/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generateOrderCombinations to generateFillOrderCombinations
* | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1429-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 ...
| * | | | | | | Merge pull request #685 from 0xProject/feature/website/jobs-pageBrandon Millman2018-06-1429-38/+814
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | Jobs page
| | * | | | | | Add back redirector behind feature flagBrandon Millman2018-06-143-1/+19
| | | | | | | |
| | * | | | | | Update minHeight in TextBrandon Millman2018-06-141-1/+1
| | | | | | | |
| | * | | | | | Use Text components in ValuesBrandon Millman2018-06-141-3/+7
| | | | | | | |
| | * | | | | | Use spread operator instead of React.createElementBrandon Millman2018-06-143-7/+7
| | | | | | | |
| | * | | | | | Fix issue with positions hashBrandon Millman2018-06-131-19/+21
| | | | | | | |
| | * | | | | | Revert localhost configBrandon Millman2018-06-131-1/+1
| | | | | | | |
| | * | | | | | Use Text in TeamsBrandon Millman2018-06-131-3/+7
| | | | | | | |
| | * | | | | | Use Text in OpenPositionsBrandon Millman2018-06-133-5/+8
| | | | | | | |
| | * | | | | | Use Text component for HeaderItemBrandon Millman2018-06-132-7/+11
| | | | | | | |
| | * | | | | | Remove FloatingImageBrandon Millman2018-06-133-12/+3
| | | | | | | |
| | * | | | | | Move FilledImage into components/uiBrandon Millman2018-06-133-2/+2
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 09:49:07 +0800