aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #661 from feuGeneA/patch-1Fabio Berger2018-06-051-2/+2
|\ | | | | Fix broken link to `contract_templates`
| * Fix broken link to `contract_templates`F. Eugene Aumson2018-06-051-2/+2
| | | | | | Note there is still a broken link here, the "wrapper files" one in the second paragraph.
* | Merge pull request #656 from 0xProject/refactor/fill-scenarios/for-v2Fabio Berger2018-06-0524-3766/+730
|\ \ | | | | | | Refactor fill-scenarios for v2
| * | Use _.omit for concisenessFabio Berger2018-06-051-15/+5
| | |
| * | revert multisig changeFabio Berger2018-06-051-1/+1
| | |
| * | reset multisignFabio Berger2018-06-051-1/+1
| | |
| * | Add PR to changelogFabio Berger2018-06-051-1/+2
| | |
| * | Update fill-scenarios for V2 and add CHANGELOG entryFabio Berger2018-06-052-64/+91
| | |
| * | Remove unused compact artifacts from order-utilsFabio Berger2018-06-057-1845/+0
| | |
| * | Add missing exports to order-utils and add CHANGELOG entryFabio Berger2018-06-052-1/+18
| | |
| * | Add new 2.0 artifacts to migrationsFabio Berger2018-06-052-0/+601
| | |
| * | Remove compact_artifacts and replace with updated artifactsFabio Berger2018-06-059-1852/+12
| | |
| * | Update fill-scenarios to depend on v2 updated order-utils and types. Needed ↵Fabio Berger2018-06-053-4/+17
| | | | | | | | | | | | to re-employ the symlink hack.
* | | Merge pull request #658 from 0xProject/dont-automatically-rebuild-for-testsAlex Browne2018-06-0515-19/+31
|\ \ \ | |_|/ |/| | Don't automatically rebuild when running yarn test
| * | Remove duplicate cleans in package.json when clean is called in prebuildAlex Browne2018-06-054-4/+4
| | |
| * | Remove common-js/umd differentiation from 0x.js/package.jsonAlex Browne2018-06-051-6/+3
| | |
| * | Don't automatically rebuild when running yarn testAlex Browne2018-06-0515-15/+30
| | |
* | | Merge pull request #633 from 0xProject/feature/contracts/errorsJacob Evans2018-06-0530-737/+490
|\ \ \ | |/ / |/| | Update error handling
| * | rename GT to GREATER_THANJacob Evans2018-06-053-3/+3
| | |
| * | Rebase from v2-prototypeJacob Evans2018-06-052-38/+2
| | |
| * | Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵Amir Bandeali2018-06-0530-702/+491
|/ / | | | | | | failures, and remove redundant logic in matchOrders
* | Merge pull request #655 from 0xProject/update-migrationsAlex Browne2018-06-058-51/+79
|\ \ | |/ |/| Update artifacts in migrations
| * Update artifacts in migrationsAlex Browne2018-06-058-51/+79
|/
* Merge pull request #644 from ↵Francesco Agosti2018-06-055-97/+127
|\ | | | | | | | | 0xProject/feature/website/refactor-token-state-fetching Move TokenState fetching logic up into Portal.tsx so it can be used by Wallet and PortalOnboardingFlow
| * Address feedbackfragosti2018-06-054-14/+20
| |
| * Implement WETH step logic for continuefragosti2018-06-053-7/+14
| |
| * Move trackedTokenStateByAddress logic into portalfragosti2018-06-052-83/+100
|/
* Merge pull request #636 from 0xProject/refactor/order-utils/for-v2Fabio Berger2018-06-0253-518/+828
|\ | | | | Refactor order-utils for v2
| * Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-0216-177/+219
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | * v2-prototype: Set contract expiration time to a constant 10 minutes Remove unused promises array Make erc20_wrapper and erc721_wrapper serial Rename changelogs to changelog Add CHANGELOG entry Check that git branch is up to date before publishing Move prepublish checks before building packages for publishing Refactor changelog utils to a separate module
* | Merge pull request #651 from 0xProject/serial-contract-wrappersAlex Browne2018-06-023-55/+52
|\ \ | | | | | | Make erc20_wrapper and erc721_wrapper serial and increase contract expiration time
| * | Set contract expiration time to a constant 10 minutesAlex Browne2018-06-021-1/+2
| | |
| * | Remove unused promises arrayAlex Browne2018-06-022-6/+0
| | |
| * | Make erc20_wrapper and erc721_wrapper serialAlex Browne2018-06-022-48/+50
|/ /
* | Merge pull request #650 from 0xProject/feature/publishingLeonid Logvinov2018-06-0213-122/+167
|\ \ | | | | | | Improve publishing flow
| * | Rename changelogs to changelogLeonid Logvinov2018-06-021-8/+8
| | |
| * | Add CHANGELOG entryLeonid Logvinov2018-06-021-0/+9
| | |
| * | Check that git branch is up to date before publishingLeonid Logvinov2018-06-021-1/+17
| | |
| * | Move prepublish checks before building packages for publishingLeonid Logvinov2018-06-024-55/+60
| | |
| * | Refactor changelog utils to a separate moduleLeonid Logvinov2018-06-029-63/+78
| | |
| | * Improve comments and remove unused importsFabio Berger2018-06-024-4/+7
| | |
| | * Fix tslint issuesFabio Berger2018-06-023-5/+3
| | |
| | * Add comment to exported methodFabio Berger2018-06-021-0/+7
| | |
| | * Add missing depFabio Berger2018-06-021-0/+1
| | |
| | * Fix types versionFabio Berger2018-06-021-1/+1
| | |
| | * Also manually symlink types package in contractsFabio Berger2018-06-021-1/+1
| | |
| | * Remove usage of `prebuild` since it doesn't run on `watch`Fabio Berger2018-06-021-2/+3
| | |
| | * remove artifactsDir and contracts from compiler.jsonFabio Berger2018-06-021-13/+0
| | |
| | * Add postinstall hack to get around `yarn` not setting up symlinks properly. ↵Fabio Berger2018-06-021-1/+3
| | | | | | | | | | | | This is a temporary fix while we wait on: https://github.com/yarnpkg/yarn/issues/5907
| | * Fix type importsFabio Berger2018-06-025-5/+8
| | |
| | * Remove ISigner artifactFabio Berger2018-06-021-76/+0
| | |
| | * Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-023-17/+18
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Update v2 artifacts Add IWallet and IValidator to compiled contracts Split migrations compile command into one for V1 and another for V2 # Conflicts: # packages/migrations/artifacts/2.0.0/Exchange.json # packages/migrations/artifacts/2.0.0/TestSignatureValidator.json
* | | Merge pull request #649 from 0xProject/addArtifactsFabio Berger2018-06-0218-4497/+4732
|\ \ \ | | | | | | | | Add Updated V2 Artifacts
| * | | Update v2 artifactsFabio Berger2018-06-0217-4493/+4727
| | | |
| * | | Add IWallet and IValidator to compiled contractsFabio Berger2018-06-021-2/+2
| | | |
| * | | Split migrations compile command into one for V1 and another for V2Fabio Berger2018-06-021-3/+4
|/ / /
| | * Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-02130-1126/+1223
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (33 commits) Only show ProviderDisplay in portal Improve sol-cov docs Remove old parse code Refactor order parser and add shared order support to new portal Add generate and fill order routes Address feedback Override ethereumjs-tx version Fix missing key Update placeholder param ordering Change userEtherBalanceInWei to optional so we can know if its loading Add loading state to ProviderDisplay Tweaks Add Placeholder component Add StandardIconRow Split render into loading and loaaded Fix linter errors Fix linter errors Add ethereum-types to extraFileIncludes Introduce ethereum-types package Remove merge conflicts from yarn.lock ... # Conflicts: # packages/contracts/src/utils/exchange_wrapper.ts # packages/contracts/src/utils/match_order_tester.ts # packages/contracts/src/utils/types.ts # packages/contracts/test/exchange/core.ts # packages/contracts/test/exchange/match_orders.ts # packages/contracts/test/libraries/lib_bytes.ts # packages/sol-cov/package.json
* | | Merge pull request #648 from 0xProject/feature/website/fill-orderBrandon Millman2018-06-024-34/+75
|\ \ \ | | | | | | | | Add shared order support
| * | | Remove old parse codeBrandon Millman2018-06-021-26/+0
| | | |
| * | | Refactor order parser and add shared order support to new portalBrandon Millman2018-06-023-3/+43
| | | |
| * | | Add generate and fill order routesBrandon Millman2018-06-022-7/+34
| | | |
* | | | Only show ProviderDisplay in portalBrandon Millman2018-06-021-12/+14
| |/ / |/| |
* | | Improve sol-cov docsLeonid Logvinov2018-06-022-6/+78
|/ /
* | Merge pull request #642 from 0xProject/feature/ethereum-typesLeonid Logvinov2018-06-0190-366/+538
|\ \ | | | | | | Introduce ethereum-types package
| * | Address feedbackLeonid Logvinov2018-06-012-2/+3
| | |
| * | Fix linter errorsLeonid Logvinov2018-06-0120-23/+20
| | |
| * | Fix linter errorsLeonid Logvinov2018-06-015-3/+5
| | |
| * | Add ethereum-types to extraFileIncludesLeonid Logvinov2018-06-018-8/+22
| | |
| * | Introduce ethereum-types packageLeonid Logvinov2018-06-0181-361/+511
| | |
* | | Merge pull request #643 from 0xProject/feature/website/wallet-loadingBrandon Millman2018-06-0116-94/+195
|\ \ \ | | | | | | | | Add loading states to wallet and provider display
| * | | Fix missing keyBrandon Millman2018-06-011-1/+2
| | | |
| * | | Update placeholder param orderingBrandon Millman2018-06-011-10/+21
| | | |
| * | | Change userEtherBalanceInWei to optional so we can know if its loadingBrandon Millman2018-06-0113-22/+26
| | | |
| * | | Add loading state to ProviderDisplayBrandon Millman2018-06-012-22/+39
| | | |
| * | | TweaksBrandon Millman2018-06-012-8/+29
| | | |
| * | | Add Placeholder componentBrandon Millman2018-06-011-14/+48
| | | |
| * | | Add StandardIconRowBrandon Millman2018-06-011-34/+41
| | | |
| * | | Split render into loading and loaadedBrandon Millman2018-06-011-5/+11
| |/ /
* | | Merge pull request #647 from 0xProject/override-ethereumjs-tx-versionAlex Browne2018-06-012-11/+6
|\ \ \ | |/ / |/| | Override ethereumjs-tx version
| * | Override ethereumjs-tx versionAlex Browne2018-06-012-11/+6
|/ /
* | Merge pull request #624 from 0xProject/feature/fast-ci2Leonid Logvinov2018-06-013-168/+210
|\ \ | | | | | | Rebalance CI tests to run faster
| * | Remove merge conflicts from yarn.lockLeonid Logvinov2018-06-011-13/+0
| | |
| * | Don't wait con contract tests to submit coverageLeonid Logvinov2018-06-011-1/+0
| | |
| * | Keep node versions consistentLeonid Logvinov2018-06-011-5/+5
| | |
| * | Split tests into two bucketsLeonid Logvinov2018-06-011-25/+23
| | |
| * | Use a newer version of node/yarn to speed-up deps instaationLeonid Logvinov2018-06-013-77/+167
| | |
| * | Try to cache dependenciesLeonid Logvinov2018-06-011-15/+12
| | |
| * | Combine lint and pretttier tests togetherLeonid Logvinov2018-06-011-17/+3
| | |
| * | Rebalance testsLeonid Logvinov2018-06-011-25/+10
| | |
* | | Merge pull request #641 from 0xProject/feature/remove-typesLeonid Logvinov2018-06-0119-444/+76
|\ \ \ | | | | | | | | Remove types
| * | | Add changelog entry for typescript-typingsLeonid Logvinov2018-06-011-8/+8
| | | |
| * | | Remove some typesLeonid Logvinov2018-06-0115-421/+63
| | | |
| * | | Remove published typesLeonid Logvinov2018-06-015-15/+5
| |/ /
* / / Fix buildAmir Bandeali2018-06-011-1/+1
|/ /
* | Merge pull request #640 from 0xProject/await-transaction-successAlex Browne2018-05-315-25/+64
|\ \ | | | | | | Add awaitTransactionSuccess where needed
| * | Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapperAlex Browne2018-05-312-5/+7
| | |
| * | Add awaitTransactionSuccess where neededAlex Browne2018-05-314-22/+59
| | |
| | * Update json-schemas version to 1.0.0 to avoid possible conflictsFabio Berger2018-06-023-2/+11
| | |
| | * Add signature specific validation methods, and other refactorsFabio Berger2018-06-025-55/+98
| | |
| | * Fix TODOsFabio Berger2018-06-011-2/+1
| | |
| | * Update all artifactsFabio Berger2018-06-018-2233/+2148
| | |
| | * List V2 contracts in compile.json nowFabio Berger2018-06-011-6/+5
| | |
| | * Fix sol-cov issue by changing it's dep to current version of typesFabio Berger2018-06-011-1/+1
| | |
| | * Rename ISigner to IWallet and implement SignatureType.ValidatorFabio Berger2018-06-017-9/+196
| | |
| | * Bump types to a major version to avoid the caretFabio Berger2018-06-013-3/+3
| | |
| | * Fix metadata offsetsFabio Berger2018-06-011-5/+7
| | |
| | * fix method renameFabio Berger2018-06-011-1/+1
| | |
| | * Rename Ecrecover to EthSignFabio Berger2018-06-013-6/+3
| | |
| | * Update artifactsFabio Berger2018-06-0110-2286/+2457
| | |
| | * Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-0182-515/+1629
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (45 commits) Check length before accessing indices, add awaitTransactionSuccess where needed, and rename function Add back before/after snapshots for each test Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMIT Make preSigned and allowedValidators mappings public Change names of signature types Fix formatting and tests Make AssetProxyId last byte of assetData Add signer to txHash, allow approveValidator to be used with executeTransaction Update Whitelist Fix Exchange interface Increase block gas limit Use last byte of signature as signature type Remove TxOrigin signature type, modify whitelist to use Validator signature type Update Whitelist contract with comments, also require maker to be whitelisted Fix build Add example whitelist contract and minimum tests Add sample whitelist contract Add TxOrigin signature type and rearrange order of types Add approveValidator function Add Validator signature type ... # Conflicts: # packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol # packages/contracts/src/utils/types.ts # packages/contracts/test/exchange/transactions.ts # packages/order-utils/src/asset_proxy_utils.ts
* | | Merge pull request #561 from 0xProject/feature/contracts/txoriginAmir Bandeali2018-05-3146-154/+955
|\ \ \ | | | | | | | | Add Validator signature type
| * | | Check length before accessing indices, add awaitTransactionSuccess where ↵Amir Bandeali2018-05-315-25/+43
| | | | | | | | | | | | | | | | needed, and rename function
| * | | Add back before/after snapshots for each testAmir Bandeali2018-05-3116-0/+97
| | | |
| * | | Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMITAmir Bandeali2018-05-318-10/+10
| | | |
| * | | Make preSigned and allowedValidators mappings publicAmir Bandeali2018-05-311-2/+2
| | | |
| * | | Change names of signature typesAmir Bandeali2018-05-312-6/+6
| | | |
| * | | Fix formatting and testsAmir Bandeali2018-05-3118-94/+16
| | | |
| * | | Make AssetProxyId last byte of assetDataAmir Bandeali2018-05-3118-37/+74
| | | |
| * | | Add signer to txHash, allow approveValidator to be used with executeTransactionAmir Bandeali2018-05-313-7/+10
| | | |
| * | | Update WhitelistAmir Bandeali2018-05-317-24/+335
| | | |
| * | | Fix Exchange interfaceAmir Bandeali2018-05-311-7/+5
| | | |
| * | | Increase block gas limitAmir Bandeali2018-05-312-1/+2
| | | |
| * | | Use last byte of signature as signature typeAmir Bandeali2018-05-318-106/+103
| | | |
| * | | Remove TxOrigin signature type, modify whitelist to use Validator signature typeAmir Bandeali2018-05-317-35/+35
| | | |
| * | | Update Whitelist contract with comments, also require maker to be whitelistedAmir Bandeali2018-05-315-16/+72
| | | |
| * | | Fix buildAmir Bandeali2018-05-313-19/+24
| | | |
| * | | Add example whitelist contract and minimum testsAmir Bandeali2018-05-313-11/+121
| | | |
| * | | Add sample whitelist contractAmir Bandeali2018-05-313-1/+60
| | | |
| * | | Add TxOrigin signature type and rearrange order of typesAmir Bandeali2018-05-313-63/+77
| | | |
| * | | Add approveValidator functionAmir Bandeali2018-05-312-2/+17
| | | |
| * | | Add Validator signature typeAmir Bandeali2018-05-314-3/+69
| | | |
| * | | Add deepCopyBytes method to LibBytesAmir Bandeali2018-05-313-0/+92
|/ / /
* | | Merge pull request #639 from 0xProject/fix/contracts/multisigWrapperAmir Bandeali2018-05-313-50/+62
|\ \ \ | | | | | | | | Update LogDecoder
| * | | Change logDecoder back into class, remove awaitTransactionMined from ↵Amir Bandeali2018-05-313-50/+62
| |/ / | | | | | | | | | multiSigWrapper
* | | Merge pull request #635 from 0xProject/feature/website/custom-onboarding-tooltipFrancesco Agosti2018-05-3123-277/+530
|\ \ \ | |/ / |/| | Remove react-joyride and some more refactoring
| * | Merge pull request #638 from 0xProject/feature/website/onboarding-eth-flowFrancesco Agosti2018-05-317-47/+121
| |\ \ | | | | | | | | Onboarding: implement add ETH step, and stub for add WETH step
| | * | Onboarding: implement add ETH step, and stub for add WETH stepfragosti2018-05-307-47/+121
| |/ /
| * | Address PR feedbackfragosti2018-05-307-40/+41
| | |
| * | Remove react-joyride from depsfragosti2018-05-302-80/+2
| | |
| * | Add entry to CHANGELOG.jsonfragosti2018-05-301-0/+8
| | |
| * | Remove blacklist conceptfragosti2018-05-304-66/+20
| | |
| * | Some cleanupfragosti2018-05-302-11/+13
| | |
| * | Improve tooltip lookfragosti2018-05-307-13/+69
| | |
| * | Add types for react-popper, remove types for react-joyridefragosti2018-05-304-105/+62
| | |
| * | Replace react-joyride with react-popperfragosti2018-05-306-56/+96
| | |
| * | Write custom tooltip componentfragosti2018-05-263-7/+57
| | |
| * | Run linterfragosti2018-05-262-2/+5
| | |
| * | Add localstorage helperfragosti2018-05-261-0/+16
| | |
| * | Add next buttonfragosti2018-05-263-2/+13
| | |
| * | Auto-show onboarding flow on first page viewfragosti2018-05-265-7/+53
| | |
| * | Add ability to blacklist onboarding stepsfragosti2018-05-263-34/+92
| | |
| * | Fix PortalOnboardingFlowPropsfragosti2018-05-261-1/+0
| | |
| * | Implement metamask installation flowfragosti2018-05-266-19/+75
| | |
* | | Fix unselected relayer drawer itemBrandon Millman2018-05-301-1/+1
| | |
* | | Merge pull request #621 from 0xProject/feature/compiler-assertionsLeonid Logvinov2018-05-306-7/+56
|\ \ \ | | | | | | | | Add schema assertions on public methods of @0xproject/sol-compiler
| * | | Add a CHANGELOG entryLeonid Logvinov2018-05-301-0/+4
| | | |
| * | | Make opts param optional in CompilerLeonid Logvinov2018-05-301-6/+7
| | | |
| * | | Throw if trying to schema-validate an undefinedLeonid Logvinov2018-05-301-0/+3
| | | |
| * | | Add CHANGELOG entryLeonid Logvinov2018-05-302-1/+10
| | | |
| * | | Add schema assertions on public methods of @0xproject/sol-compilerLeonid Logvinov2018-05-304-1/+33
|/ / /
| | * Expose isValidPresignedSignatureAsync methodFabio Berger2018-05-311-3/+19
| | |
| | * Move isValidOrderHash to the order_hash_test fileFabio Berger2018-05-312-15/+15
| | |
| | * Decide to throw for Caller signature type for nowFabio Berger2018-05-311-2/+3
| | |
| | * Introduce OrderWithoutExchangeAddress type since this is what get's sent to ↵Fabio Berger2018-05-315-32/+43
| | | | | | | | | | | | the smart contracts
| | * Add ISigner artifactsFabio Berger2018-05-311-0/+76
| | |
| | * Fix order-utils testsFabio Berger2018-05-317-81/+123
| | |
| | * Revivie the ECSignatureSchemaFabio Berger2018-05-312-0/+22
| | |
| | * Initial refactor of order-utils. Move many utils from contracts into this ↵Fabio Berger2018-05-3038-401/+510
| | | | | | | | | | | | package.
| | * Freeze order-utils at 0.0.5 for all packages except contractsFabio Berger2018-05-308-7/+23
| | |
| | * Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-05-267-118/+109
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | * v2-prototype: Hide wallet management option and expand component on small screens Remove registry override Revert "Change the registry in yarn.lock" Change the registry in yarn.lock Remove contracts -> @0xproject/order-utils dependency
* | | Merge pull request #625 from ↵Fabio Berger2018-05-265-103/+86
|\ \ \ | | | | | | | | | | | | | | | | 0xProject/feature/contracts-without-contract-wrappers Remove contracts -> @0xproject/contract-wrappers dependency
| * | | Remove registry overrideLeonid Logvinov2018-05-261-3/+0
| | | |
| * | | Revert "Change the registry in yarn.lock"Leonid Logvinov2018-05-261-1995/+1995
| | | | | | | | | | | | | | | | This reverts commit 76579a300444fc212ba4c32736a1a51958627c37.
| * | | Change the registry in yarn.lockLeonid Logvinov2018-05-261-1995/+1995
| | | |
| * | | Remove contracts -> @0xproject/order-utils dependencyLeonid Logvinov2018-05-266-103/+89
| |/ /
* / / Hide wallet management option and expand component on small screensBrandon Millman2018-05-262-15/+23
|/ /
| * Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-05-2628-407/+1474
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix imports in order_utils Use web3-wrapper instead of 0x.js, update logDecoder Cleanup tests Add errMsg when throwing on unrecognized error Move readFirst4 to LibBytes Add old MultiSig to previous contracts, cleanup file structure Fix build Address feedback, rename contract to AssetProxyOwner Update multisig tests and utils Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress to use a mapping of registered proxies Implement design for relayers with no volume or tokens
* | Merge pull request #620 from 0xProject/feature/website/relayer-emptyBrandon Millman2018-05-253-9/+31
|\ \ | | | | | | Implement design for relayers with no volume or tokens
| * | Implement design for relayers with no volume or tokensBrandon Millman2018-05-253-9/+31
| | |
* | | Fix imports in order_utilsLeonid Logvinov2018-05-252-1/+22
| | |
* | | Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-2523-397/+1421
|\ \ \ | | | | | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress
| * | | Use web3-wrapper instead of 0x.js, update logDecoderAmir Bandeali2018-05-257-49/+48
| | | |
| * | | Cleanup testsAmir Bandeali2018-05-254-6/+12
| | | |
| * | | Add errMsg when throwing on unrecognized errorAmir Bandeali2018-05-251-1/+1
| | | |
| * | | Move readFirst4 to LibBytesAmir Bandeali2018-05-255-39/+53
| | | |
| * | | Add old MultiSig to previous contracts, cleanup file structureAmir Bandeali2018-05-257-16/+16
| | | |
| * | | Fix buildAmir Bandeali2018-05-256-13/+882
| | | |
| * | | Address feedback, rename contract to AssetProxyOwnerAmir Bandeali2018-05-256-33/+37
| | | |
| * | | Update multisig tests and utilsAmir Bandeali2018-05-254-253/+355
| | | |
| * | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress to use a ↵Amir Bandeali2018-05-251-18/+48
| |/ / | | | | | | | | | mapping of registered proxies
| | * Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-05-2543-2459/+2655
| | |\ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Temporarily disable installation tests Use domain separator for exchange address publicGetOrderSchemaHash -> getOrderSchemaHash Update order hash to match latest eip712 Pin connect in sra-report Fix a typo Pin types in sra-report Fix linter issues Unpin types version in @0xproject/connect Pin types version in website Do a fake version bump on types so that yarn doesn't try to install updated version for not yet migrated packages Migrate migrations to v2
* | | Merge pull request #575 from 0xProject/feature/contracts/eip712-order-hashFabio Berger2018-05-256-2331/+2368
|\ \ \ | | | | | | | | Update order hash to match latest eip712
| * \ \ Merge branch 'v2-prototype' into feature/contracts/eip712-order-hashFabio Berger2018-05-2539-128/+287
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Temporarily disable installation tests Pin connect in sra-report Fix a typo Pin types in sra-report Fix linter issues Unpin types version in @0xproject/connect Pin types version in website Do a fake version bump on types so that yarn doesn't try to install updated version for not yet migrated packages Migrate migrations to v2 # Conflicts: # packages/contracts/src/utils/order_utils.ts
* | | | Merge pull request #618 from 0xProject/feature/v2-migrationsLeonid Logvinov2018-05-2538-126/+285
|\ \ \ \ | | | | | | | | | | Migrate migrations, types to v2
| * | | | Pin connect in sra-reportLeonid Logvinov2018-05-251-1/+1
| | | | |
| * | | | Fix a typoLeonid Logvinov2018-05-251-2/+2
| | | | |
| * | | | Pin types in sra-reportLeonid Logvinov2018-05-251-1/+1
| | | | |
| * | | | Fix linter issuesLeonid Logvinov2018-05-253-3/+3
| | | | |
| * | | | Unpin types version in @0xproject/connectLeonid Logvinov2018-05-253-3/+3
| | | | |
| * | | | Pin types version in websiteLeonid Logvinov2018-05-251-0/+1
| | | | |
| * | | | Do a fake version bump on types so that yarn doesn't try to install updated ↵Leonid Logvinov2018-05-253-4/+13
| | | | | | | | | | | | | | | | | | | | version for not yet migrated packages
| * | | | Migrate migrations to v2Leonid Logvinov2018-05-2533-122/+271
| | | | |
* | | | | Temporarily disable installation testsLeonid Logvinov2018-05-251-3/+3
| |_|/ / |/| | |
| | * | Use domain separator for exchange addressJacob Evans2018-05-256-2300/+2314
| | | |
| | * | publicGetOrderSchemaHash -> getOrderSchemaHashJacob Evans2018-05-252-2/+2
| | | |
| | * | Update order hash to match latest eip712Jacob Evans2018-05-254-34/+57
| |/ / |/| |
| | * Add senderAddress to order schemaFabio Berger2018-05-252-0/+3
| |/ |/|
* | Merge pull request #617 from 0xProject/feature/no-coverage-ci-contractsLeonid Logvinov2018-05-252-9/+1
|\ \ | | | | | | Disable contracts coverage on CI
| * | Disable contracts coverage on CILeonid Logvinov2018-05-252-9/+1
| |/
* | Merge pull request #607 from 0xProject/feature/website/onboarding-setupFrancesco Agosti2018-05-2517-41/+420
|\ \ | | | | | | Set up structure for onboarding flow along with basic step 0
| * | Improve OnboardingFlow API and typescript typesfragosti2018-05-254-14/+27
| | |
| * | Address PR feedbackfragosti2018-05-258-38/+54
| | |
| * | Undo change to react-highlightfragosti2018-05-251-1/+0
| | |
| * | Fix build errorsfragosti2018-05-253-13/+14
| | |
| * | Fix issue where modal can be out of sync with app statefragosti2018-05-257-18/+56
| | |
| * | Basic onboarding flow infrastructure set upfragosti2018-05-2517-38/+350
|/ /
* | Merge pull request #612 from 0xProject/feature/website/add-redux-devtoolsFrancesco Agosti2018-05-253-1/+7
|\ \ | |/ |/| Add redux-devtools-extension to project
| * Move to deps from devDeps and use in development onlyfragosti2018-05-232-2/+2
| |
| * Add redux-devtools-extension to projectfragosti2018-05-233-2/+8
| |
* | Merge pull request #615 from 0xProject/refactor/json-schemas/for-v2Fabio Berger2018-05-2516-112/+83
|\ \ | | | | | | Refactor order schemas in json-schemas for v2
| * | Change all `wsrun` commands so that they fast-exit (e.g any one failing ↵Fabio Berger2018-05-241-6/+6
| | | | | | | | | | | | stops the entire process from executing)
| * | Have source-map-loader ignore node_modules packagesFabio Berger2018-05-241-1/+6
| | |
| * | Revert to an earlier version that worksFabio Berger2018-05-248-11/+11
| | |
| * | Force hex to have at least two hex values after the prefix, but it could be ↵Fabio Berger2018-05-242-2/+2
| | | | | | | | | | | | two zeros
| * | Fix Hex regex and testsFabio Berger2018-05-242-3/+4
| | |
| * | Remove the caret so it actually installs this versionFabio Berger2018-05-248-7/+16
| | |
| * | Merge branch 'v2-prototype' into refactor/json-schemas/for-v2Fabio Berger2018-05-241-0/+1
| |\ \ | | | | | | | | | | | | | | | | * v2-prototype: Ignore v2 artifacts
| * | | Add CHANGELOG entryFabio Berger2018-05-241-0/+10
| | | |
| * | | Updated Order, SignedOrder schemas, removed ECSignature schema types and ↵Fabio Berger2018-05-245-98/+44
| | | | | | | | | | | | | | | | added Hex basic type
| * | | Bump all dependencies on json-schemas down a patch version so that they ↵Fabio Berger2018-05-247-7/+7
| | | | | | | | | | | | | | | | don't auto-magically get upgraded to the next version during the next publish
* | | | Merge pull request #613 from 0xProject/check-tx-receipt-statusAlex Browne2018-05-2421-94/+144
|\ \ \ \ | | | | | | | | | | Check transaction receipt status
| * | | | Change error message for awaitTransactionSuccessAsyncAlex Browne2018-05-241-1/+1
| | | | |
| * | | | Check transaction receipt status codes where applicableAlex Browne2018-05-2421-94/+144
| |/ / /
* | | | Merge pull request #603 from 0xProject/feature/website/wallet-flex-boxBrandon Millman2018-05-244-129/+161
|\ \ \ \ | |_|/ / |/| | | Improve wallet layout using flexbox
| * | | Use visibility property instead of placeholder div in wrap ether itemBrandon Millman2018-05-241-7/+4
| | | |
| * | | Merge branch 'v2-prototype' into feature/website/wallet-flex-boxBrandon Millman2018-05-24233-1250/+2528
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (95 commits) Add missing dep to website Upgrade solidity parser Fix trace test Fix linter issues Move contract utils Fix prettier Fix NameResolver Fix prettier Remove 0x.js as a dependency from website Enable 0x.js tests Fix small bug in order-utils Address feedback Fix Tslint error caused by "PromiseLike" value Fix Tslint error caused by "PromiseLike" value Update dogfood url fix contract-wrappers version Parse compiler.json in SolCompilerArtifactsAdapter Fix TokenTransferProxy artifact name since it's now suffixed with _v1 Update yarn.lock Fix signature verification test ...
| * | | Add missing keyBrandon Millman2018-05-221-3/+6
| | | |
| * | | Use flexbox for wrapped ether itemBrandon Millman2018-05-221-21/+29
| | | |
| * | | Re add wrapped ether itemBrandon Millman2018-05-221-7/+24
| | | |
| * | | Rewrite balance rows using flex boxBrandon Millman2018-05-223-122/+129
| | | |
* | | | Merge pull request #614 from 0xProject/bug/prettier/ignore-v2-artifactsFabio Berger2018-05-241-0/+1
|\ \ \ \ | |_|/ / |/| | | Ignore v2 artifacts
| * | | Ignore v2 artifactsJacob Evans2018-05-241-0/+1
|/ / /
* | | Add missing dep to websiteFabio Berger2018-05-241-0/+1
| | |
* | | Merge pull request #589 from 0xProject/feature/truffle-sol-covFabio Berger2018-05-2455-229/+615
|\ \ \ | | | | | | | | Sol-cov artifact Adapters (truffle)
| * | | Upgrade solidity parserLeonid Logvinov2018-05-242-4/+4
| | | |
| * | | Fix trace testLeonid Logvinov2018-05-241-1/+1
| | | |
| * | | Fix linter issuesLeonid Logvinov2018-05-242-4/+5
| | | |
| * | | Move contract utilsLeonid Logvinov2018-05-245-19/+19
| | | |
| * | | Merge branch 'v2-prototype' into feature/truffle-sol-covLeonid Logvinov2018-05-2455-424/+428
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #611 from 0xProject/feature/remove-0x-from=-websiteLeonid Logvinov2018-05-2424-119/+136
|\ \ \ \ | | | | | | | | | | Remove 0x.js as a dependency from website
| * | | | Fix prettierLeonid Logvinov2018-05-243-3/+9
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 20:01:39 +0800