aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-2048-366/+1167
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | |
| | * Merge pull request #730 from ↵Jacob Evans2018-06-201-18/+22
| | |\ | | | | | | | | | | | | | | | | 0xProject/bug/contracts/eip712-191-prefix-asm-orderhash Assembler orderHash function
| | | * 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-18475-8090/+10335
| | |\
| | * | 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
| | | |
| * | | Merge pull request #717 from ↵Jacob Evans2018-06-203-17/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | 0xProject/feature/contracts/erc721proxy-always-safeTransferFrom ERC721Proxy Always call safeTransferFrom
| | * | | 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-20114-718/+1373
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 #732 from 0xProject/feature/update-pr-templateBrandon Millman2018-06-201-16/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Update PR template
| | * | | | Update PR templateBrandon Millman2018-06-201-16/+2
| | | | | |
| * | | | | 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 pull request #706 from 0xProject/feature/website/portal-v2-analyticsFrancesco Agosti2018-06-208-15/+74
| |\ \ \ \ | | | | | | | | | | | | Add logging to Portal V2
| | * \ \ \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-20166-1025/+3150
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | 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-1995-581/+1154
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1985-443/+921
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | 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-199-97/+75
| | | | | | | | | | |
| | * | | | | | | | | 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
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge pull request #731 from avonian/v2-prototypeLeonid Logvinov2018-06-192-4/+9
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix sendRawPaylodAsync for improved JSON-RPC compatibility
| | * | | | | | | | | Update default params in sendRawPaylodAsync for improved JSON-RPC compatibilityAra Kevonian2018-06-192-4/+9
| |/ / / / / / / / /
| * | | | | | | | | 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
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge pull request #716 from ↵Amir Bandeali2018-06-199-53/+331
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/contracts/publicSignatureValidator Make isValidSignature public
| | * | | | | | | Make isValidSignature publicAmir Bandeali2018-06-199-53/+331
| |/ / / / / / /
| * | | | | | | Merge pull request #713 from 0xProject/feature/contracts/batchFillReturnAmir Bandeali2018-06-192-10/+28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make batchFill methods return FIllResults struct
| | * | | | | | | Make batchFill methods return FIllResults structAmir Bandeali2018-06-192-10/+28
| |/ / / / / / /
| * | | | | | | Merge pull request #722 from 0xProject/improvement/publishing-v2Fabio Berger2018-06-199-116/+321
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improvements to pre-publishing checks
| | * | | | | | | 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-13230-1495/+4887
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | feature/website/onboarding-flow-allowances
| | * \ \ \ \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-07313-2491/+2811
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | |
| | * | | | | | Replace FlatButton with Button in RetryBrandon Millman2018-06-131-12/+12
| | | | | | | |
| | * | | | | | Fix incorrect colorsBrandon Millman2018-06-131-2/+2
| | | | | | | |
| | * | | | | | Add font family to Button component and use in Join0x componentBrandon Millman2018-06-132-13/+16
| | | | | | | |
| | * | | | | | Consolidate jobs page grey colors with shared colorsBrandon Millman2018-06-131-2/+2
| | | | | | | |
| | * | | | | | Fix lint errorsBrandon Millman2018-06-1310-15/+12
| | | | | | | |
| | * | | | | | Remove extra packagesBrandon Millman2018-06-132-2/+0
| | | | | | | |
| | * | | | | | Implement small open positionsBrandon Millman2018-06-138-120/+232
| | | | | | | |
| | * | | | | | Implement large screen open positionsBrandon Millman2018-06-139-104/+187
| | | | | | | |
| | * | | | | | Teams sectionBrandon Millman2018-06-136-75/+70
| | | | | | | |
| | * | | | | | Benefits sectionBrandon Millman2018-06-133-12/+75
| | | | | | | |
| | * | | | | | Refactor into BulletedItemList componentBrandon Millman2018-06-132-24/+33
| | | | | | | |
| | * | | | | | Rework values sectionBrandon Millman2018-06-132-44/+13
| | | | | | | |
| | * | | | | | Polish mission section and photo sectionBrandon Millman2018-06-137-40/+95
| | | | | | | |
| | * | | | | | Add link to open positions sectionBrandon Millman2018-06-133-6/+20
| | | | | | | |
| | * | | | | | Add scroll to top for jobs pageBrandon Millman2018-06-131-21/+28
| | | | | | | |
| | * | | | | | Skeleton for jobs page and initial implementationBrandon Millman2018-06-1322-12/+457
| | | |_|/ / / | | |/| | | |
* | | | | | | Use a defaultFillScenario in fillOrder testsFabio Berger2018-06-141-36/+39
| | | | | | |
* | | | | | | Fix incorrect string values in enumFabio Berger2018-06-141-2/+2
| | | | | | |
* | | | | | | Fix calculation of expFilledTakerAmount and expected values in events emittedFabio Berger2018-06-141-4/+7
| | | | | | |
* | | | | | | Replace initial set of legacy manually written fillOrder tests with ↵Fabio Berger2018-06-142-434/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | declarative FillScenario tests
* | | | | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ↵Fabio Berger2018-06-144-35/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | FillScenario
* | | | | | | Fix divide by zero bugFabio Berger2018-06-141-3/+3
| | | | | | |
* | | | | | | Move orderFill combinatorialTests to exchange folderFabio Berger2018-06-131-4/+4
| | | | | | |
* | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1364-1015/+1931
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | | | Merge pull request #694 from 0xProject/refactor-sol-covAlex Browne2018-06-135-306/+264
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor sol-cov to de-duplicate code for coverage and profiling
| | * | | | | | Rename _coverageCollector -> _profilerCollector in TraceCollectionSubproviderAlex Browne2018-06-131-4/+4
| | | | | | | |
| | * | | | | | Refactor sol-cov to de-duplicate code for coverage and profilingAlex Browne2018-06-135-306/+264
| | | | | | | |
| * | | | | | | Merge pull request #682 from 0xProject/feature/contracts/popProxyIdAmir Bandeali2018-06-1336-532/+710
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Remove proxyId checks in AssetProxies
| | * | | | | | Rename popByte and popAddressAmir Bandeali2018-06-135-18/+18
| | | | | | | |
| | * | | | | | Hard code test addresses/bytes32 instead of generating pseudorandom onesAmir Bandeali2018-06-131-19/+16
| | | | | | | |
| | * | | | | | Update artifactsAmir Bandeali2018-06-139-188/+182
| | | | | | | |
| | * | | | | | Unpop byte rather than making deep copyAmir Bandeali2018-06-134-90/+95
| | | | | | | |
| | * | | | | | Pass gas in to marketBuyOrdersNoThrowAmir Bandeali2018-06-131-1/+1
| | | | | | | |
| | * | | | | | Looks up the memory location of makerAssetData/takerAssetDataGreg Hysen2018-06-131-0/+2
| | | | | | | |
| | * | | | | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATAAmir Bandeali2018-06-135-23/+13
| | | | | | | |
| | * | | | | | Add tests for deepCopyBytes and missing write methods from LibBytesAmir Bandeali2018-06-133-70/+201
| | | | | | | |
| | * | | | | | Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-1320-209/+268
| | |/ / / / /
| * | | | | | Merge pull request #691 from 0xProject/fix/sol-cov-memoryAlex Browne2018-06-136-213/+74
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Refactor sol-cov to avoid keeping traceInfo in memory
| | * | | | | Rename computeCoverageAsync -> computeSingleTraceCoverageAsyncAlex Browne2018-06-134-4/+4
| | | | | | |
| | * | | | | Fix linter errorsAlex Browne2018-06-133-10/+6
| | | | | | |
| | * | | | | Refactor sol-cov to avoid keeping traceInfo in memoryAlex Browne2018-06-136-211/+76
| |/ / / / /
| * | | | | Upgrade solidity-parser-entlr 0.2.11 => 0.2.12Leonid Logvinov2018-06-132-4/+4
| | | | | |
| * | | | | Fix import orderLeonid Logvinov2018-06-121-1/+1
| | | | | |
| * | | | | Merge pull request #689 from 0xProject/geth-increase-startup-tx-delayLeonid Logvinov2018-06-121-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Increase delay when sending transactions during devnet startup
| | * | | | | Increase delay when sending transactions during devnet startupAlex Browne2018-06-121-2/+2
| | | | | | |
| * | | | | | Merge pull request #687 from 0xProject/feature/metacoin-docsLeonid Logvinov2018-06-126-13/+194
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add profiler and geth tests to metacoin
| | * | | | | | Fix typosLeonid Logvinov2018-06-124-10/+11
| | | | | | | |
| | * | | | | | Fix linter issuesLeonid Logvinov2018-06-122-2/+2
| | | | | | | |
| | * | | | | | Add profiler and geth tests to metacoinLeonid Logvinov2018-06-126-14/+194
| | | | | | | |
| * | | | | | | Merge pull request #688 from 0xProject/feature/await-transaction-speedupLeonid Logvinov2018-06-1219-150/+874
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts tests
| | * | | | | | | Add note to web3-wrapper CHANGELOG.jsonAlex Browne2018-06-121-0/+5
| | | | | | | | |
| | * | | | | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts ↵Alex Browne2018-06-1218-150/+869
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | tests
| * | | | | | | Merge pull request #690 from 0xProject/feature/truffle-sol-cov-fixesLeonid Logvinov2018-06-124-7/+21
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Sol-cov fixes
| | * | | | | | Add CHANGELOGsLeonid Logvinov2018-06-121-0/+12
| | | | | | | |
| | * | | | | | Speed-up sol-covLeonid Logvinov2018-06-121-2/+2
| | | | | | | |
| | * | | | | | Don't throw when no config file is foundLeonid Logvinov2018-06-121-4/+6
| | | | | | | |
| | * | | | | | Fix solidityVersion schema regexLeonid Logvinov2018-06-121-1/+1
| | |/ / / / /
* | | | | | | Implement initial set of orderFill combinatorial testsFabio Berger2018-06-1313-490/+784
| | | | | | |
* | | | | | | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper ↵Fabio Berger2018-06-134-9/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | superset
* | | | | | | Remaining refactors of order-utils components for V2Fabio Berger2018-06-135-46/+48
| | | | | | |
* | | | | | | For some reason order-watcher tests were timeing out so I increased the ↵Fabio Berger2018-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout limit
* | | | | | | Remove comment since we have added the testsFabio Berger2018-06-131-5/+0
| | | | | | |
* | | | | | | Variable rename for clarityFabio Berger2018-06-131-2/+2
| | | | | | |
* | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-12176-1101/+3564
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 pull request #684 from ↵Fabio Berger2018-06-1288-155/+977
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | 0xProject/fix/contract-wrappers/exchangeTransferSimulator Move ExchangeTransferSimulator & OrderValidationUtils to Order-Utils
| | * | | | | Stop exporting ArtifactWriterFabio Berger2018-06-122-5/+0
| | | | | | |
| | * | | | | Fix no-unused-variable tslint rule to include parameters and fix issuesFabio Berger2018-06-1266-113/+104
| | | | | | |
| | * | | | | Fix linter exclude ruleFabio Berger2018-06-121-1/+1
| | | | | | |
| | * | | | | Validate all signature types rather then only ECSignaturesFabio Berger2018-06-121-4/+12
| | | | | | |
| | * | | | | Store the instantiated OrderValidationUtilsFabio Berger2018-06-121-2/+2
| | | | | | |
| | * | | | | Remove global hooks from tests and deploy contracts from within the specific ↵Fabio Berger2018-06-122-54/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | tests
| | * | | | | Merge branch 'v2-prototype' into fix/contract-wrappers/exchangeTransferSimulatorFabio Berger2018-06-1244-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 issuesFabio Berger2018-06-125-8/+5
| | | | | | | |
| | * | | | | | Add back artifacts fileFabio Berger2018-06-121-0/+13
| | | | | | | |
| | * | | | | | Move OrderValidationUtils (+ tests) and ExchangeTransferSimulator to order-utilsFabio Berger2018-06-1216-18/+786
| | | | | | | |
| | * | | | | | export parseECSignature methodFabio Berger2018-06-122-0/+8
| | | | | | | |
| | * | | | | | Export ArtifactWriter from migrations packageFabio Berger2018-06-122-0/+9
| | | | | | | |
| | * | | | | | Remove unused artifact fileFabio Berger2018-06-121-13/+0
| | | | | | | |
| | * | | | | | Pass in generated contract wrapper to orderValidationUtils at instantiationFabio Berger2018-06-111-10/+25
| | | | | | | |
| | * | | | | | Refactor orderValidationUtils to use the generated contract wrapper instead ↵Fabio Berger2018-06-111-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the higher-level one
| | * | | | | | Refactor ExchangeTransferSimulator public interface to accet an ↵Fabio Berger2018-06-116-19/+71
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | AbstractBalanceAndProxyAllowanceLazyStore so that this module could be re-used in different contexts.
| * | | | | | Add EmitStatement to ASTVisitorLeonid Logvinov2018-06-121-0/+3
| | |/ / / / | |/| | | |
| * | | | | Merge pull request #675 from 0xProject/feature/sol-cov-gethLeonid Logvinov2018-06-1243-479/+870
| |\ \ \ \ \ | | |/ / / / | |/| | | | `ProfilerSubprovider` & Geth-related fixes for `sol-cov`
| | * | | | Fix a bug in SolCompilerArtifacts adapter config overridingLeonid Logvinov2018-06-121-2/+2
| | | | | |
| | * | | | Increase timeout for contract migrationsLeonid Logvinov2018-06-092-2/+2
| | | | | |
| | * | | | Remove some copy-paste codeLeonid Logvinov2018-06-091-36/+6
| | | | | |
| | * | | | Await transactions in migrationsLeonid Logvinov2018-06-091-35/+46
| | | | | |
| | * | | | Fix typosLeonid Logvinov2018-06-095-7/+23
| | | | | |
| | * | | | Await transactions in migrationsLeonid Logvinov2018-06-091-4/+12
| | | | | |
| | * | | | Await fake transactionsLeonid Logvinov2018-06-091-4/+4
| | | | | |
| | * | | | Fix a typoLeonid Logvinov2018-06-091-1/+1
| | | | | |
| | * | | | Implement SolidityProfiler & adapt sol-cov to work with GethLeonid Logvinov2018-06-0940-439/+825
| |/ / / /
| * | | | Merge pull request #627 from 0xProject/feature/contracts/erc721SafeTransferFromGreg Hysen2018-06-0945-429/+1641
| |\ \ \ \ | | | | | | | | | | | | On-Chain AssetData Decoding Lib + safeTransferFrom for ERC721 + Memcpy
| | * | | | Linter changes to contractsGreg Hysen2018-06-094-21/+6
| | | | | |
| | * | | | Fixed assetProxyUtils for linterGreg Hysen2018-06-091-2/+2
| | | | | |
| | * | | | Updated LibBytes error messagesGreg Hysen2018-06-083-28/+36
| | | | | |
| | * | | | Cleanup after last rebaseGreg Hysen2018-06-085-8/+7
| | | | | |
| | * | | | Updated tests to use new revert handlerGreg Hysen2018-06-082-13/+13
| | | | | |
| | * | | | Minor fixes after rebaseGreg Hysen2018-06-083-753/+11
| | | | | |
| | * | | | Camelcase in memCopyGreg Hysen2018-06-085-25/+25
| | | | | |
| | * | | | Moved some constants to global scope in assetProxyUtilsGreg Hysen2018-06-081-18/+26
| | | | | |
| | * | | | Style updates to contractsGreg Hysen2018-06-087-28/+23
| | | | | |
| | * | | | Union types for generalized decodeAssetDataGreg Hysen2018-06-083-21/+6
| | | | | |
| | * | | | Fixed a styling throughout contracts. Moved closing parenthesis for long ↵Greg Hysen2018-06-088-31/+62
| | | | | | | | | | | | | | | | | | | | | | | | list of function parameters to next line.
| | * | | | Removed setting makerAssetData/takerAssetData from tests where values are ↵Greg Hysen2018-06-081-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | same as defaultOrderParams.
| | * | | | Fixed merge error when rebasing wrt length variable in asset data decodersGreg Hysen2018-06-082-4/+4
| | | | | |
| | * | | | Style updates to ERC721 onReceiverGreg Hysen2018-06-087-16/+27
| | | | | |
| | * | | | Fixed after rebaseGreg Hysen2018-06-083-5/+5
| | | | | |
| | * | | | Fixes after rebasingGreg Hysen2018-06-086-49/+54
| | | | | |
| | * | | | updated migrations artifactsGreg Hysen2018-06-081-1/+735
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 23:07:49 +0800