Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #655 from 0xProject/update-migrations | Alex Browne | 2018-06-05 | 8 | -51/+79 |
|\ | | | | | Update artifacts in migrations | ||||
| * | Update artifacts in migrations | Alex Browne | 2018-06-05 | 8 | -51/+79 |
|/ | |||||
* | Merge pull request #644 from ↵ | Francesco Agosti | 2018-06-05 | 5 | -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 feedback | fragosti | 2018-06-05 | 4 | -14/+20 |
| | | |||||
| * | Implement WETH step logic for continue | fragosti | 2018-06-05 | 3 | -7/+14 |
| | | |||||
| * | Move trackedTokenStateByAddress logic into portal | fragosti | 2018-06-05 | 2 | -83/+100 |
|/ | |||||
* | Merge pull request #636 from 0xProject/refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 53 | -518/+828 |
|\ | | | | | Refactor order-utils for v2 | ||||
| * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 16 | -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-wrappers | Alex Browne | 2018-06-02 | 3 | -55/+52 |
|\ \ | | | | | | | Make erc20_wrapper and erc721_wrapper serial and increase contract expiration time | ||||
| * | | Set contract expiration time to a constant 10 minutes | Alex Browne | 2018-06-02 | 1 | -1/+2 |
| | | | |||||
| * | | Remove unused promises array | Alex Browne | 2018-06-02 | 2 | -6/+0 |
| | | | |||||
| * | | Make erc20_wrapper and erc721_wrapper serial | Alex Browne | 2018-06-02 | 2 | -48/+50 |
|/ / | |||||
* | | Merge pull request #650 from 0xProject/feature/publishing | Leonid Logvinov | 2018-06-02 | 13 | -122/+167 |
|\ \ | | | | | | | Improve publishing flow | ||||
| * | | Rename changelogs to changelog | Leonid Logvinov | 2018-06-02 | 1 | -8/+8 |
| | | | |||||
| * | | Add CHANGELOG entry | Leonid Logvinov | 2018-06-02 | 1 | -0/+9 |
| | | | |||||
| * | | Check that git branch is up to date before publishing | Leonid Logvinov | 2018-06-02 | 1 | -1/+17 |
| | | | |||||
| * | | Move prepublish checks before building packages for publishing | Leonid Logvinov | 2018-06-02 | 4 | -55/+60 |
| | | | |||||
| * | | Refactor changelog utils to a separate module | Leonid Logvinov | 2018-06-02 | 9 | -63/+78 |
| | | | |||||
| | * | Improve comments and remove unused imports | Fabio Berger | 2018-06-02 | 4 | -4/+7 |
| | | | |||||
| | * | Fix tslint issues | Fabio Berger | 2018-06-02 | 3 | -5/+3 |
| | | | |||||
| | * | Add comment to exported method | Fabio Berger | 2018-06-02 | 1 | -0/+7 |
| | | | |||||
| | * | Add missing dep | Fabio Berger | 2018-06-02 | 1 | -0/+1 |
| | | | |||||
| | * | Fix types version | Fabio Berger | 2018-06-02 | 1 | -1/+1 |
| | | | |||||
| | * | Also manually symlink types package in contracts | Fabio Berger | 2018-06-02 | 1 | -1/+1 |
| | | | |||||
| | * | Remove usage of `prebuild` since it doesn't run on `watch` | Fabio Berger | 2018-06-02 | 1 | -2/+3 |
| | | | |||||
| | * | remove artifactsDir and contracts from compiler.json | Fabio Berger | 2018-06-02 | 1 | -13/+0 |
| | | | |||||
| | * | Add postinstall hack to get around `yarn` not setting up symlinks properly. ↵ | Fabio Berger | 2018-06-02 | 1 | -1/+3 |
| | | | | | | | | | | | | This is a temporary fix while we wait on: https://github.com/yarnpkg/yarn/issues/5907 | ||||
| | * | Fix type imports | Fabio Berger | 2018-06-02 | 5 | -5/+8 |
| | | | |||||
| | * | Remove ISigner artifact | Fabio Berger | 2018-06-02 | 1 | -76/+0 |
| | | | |||||
| | * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 3 | -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/addArtifacts | Fabio Berger | 2018-06-02 | 18 | -4497/+4732 |
|\ \ \ | | | | | | | | | Add Updated V2 Artifacts | ||||
| * | | | Update v2 artifacts | Fabio Berger | 2018-06-02 | 17 | -4493/+4727 |
| | | | | |||||
| * | | | Add IWallet and IValidator to compiled contracts | Fabio Berger | 2018-06-02 | 1 | -2/+2 |
| | | | | |||||
| * | | | Split migrations compile command into one for V1 and another for V2 | Fabio Berger | 2018-06-02 | 1 | -3/+4 |
|/ / / | |||||
| | * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 130 | -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-order | Brandon Millman | 2018-06-02 | 4 | -34/+75 |
|\ \ \ | | | | | | | | | Add shared order support | ||||
| * | | | Remove old parse code | Brandon Millman | 2018-06-02 | 1 | -26/+0 |
| | | | | |||||
| * | | | Refactor order parser and add shared order support to new portal | Brandon Millman | 2018-06-02 | 3 | -3/+43 |
| | | | | |||||
| * | | | Add generate and fill order routes | Brandon Millman | 2018-06-02 | 2 | -7/+34 |
| | | | | |||||
* | | | | Only show ProviderDisplay in portal | Brandon Millman | 2018-06-02 | 1 | -12/+14 |
| |/ / |/| | | |||||
* | | | Improve sol-cov docs | Leonid Logvinov | 2018-06-02 | 2 | -6/+78 |
|/ / | |||||
* | | Merge pull request #642 from 0xProject/feature/ethereum-types | Leonid Logvinov | 2018-06-01 | 90 | -366/+538 |
|\ \ | | | | | | | Introduce ethereum-types package | ||||
| * | | Address feedback | Leonid Logvinov | 2018-06-01 | 2 | -2/+3 |
| | | | |||||
| * | | Fix linter errors | Leonid Logvinov | 2018-06-01 | 20 | -23/+20 |
| | | | |||||
| * | | Fix linter errors | Leonid Logvinov | 2018-06-01 | 5 | -3/+5 |
| | | | |||||
| * | | Add ethereum-types to extraFileIncludes | Leonid Logvinov | 2018-06-01 | 8 | -8/+22 |
| | | | |||||
| * | | Introduce ethereum-types package | Leonid Logvinov | 2018-06-01 | 81 | -361/+511 |
| | | | |||||
* | | | Merge pull request #643 from 0xProject/feature/website/wallet-loading | Brandon Millman | 2018-06-01 | 16 | -94/+195 |
|\ \ \ | | | | | | | | | Add loading states to wallet and provider display | ||||
| * | | | Fix missing key | Brandon Millman | 2018-06-01 | 1 | -1/+2 |
| | | | | |||||
| * | | | Update placeholder param ordering | Brandon Millman | 2018-06-01 | 1 | -10/+21 |
| | | | | |||||
| * | | | Change userEtherBalanceInWei to optional so we can know if its loading | Brandon Millman | 2018-06-01 | 13 | -22/+26 |
| | | | | |||||
| * | | | Add loading state to ProviderDisplay | Brandon Millman | 2018-06-01 | 2 | -22/+39 |
| | | | | |||||
| * | | | Tweaks | Brandon Millman | 2018-06-01 | 2 | -8/+29 |
| | | | | |||||
| * | | | Add Placeholder component | Brandon Millman | 2018-06-01 | 1 | -14/+48 |
| | | | | |||||
| * | | | Add StandardIconRow | Brandon Millman | 2018-06-01 | 1 | -34/+41 |
| | | | | |||||
| * | | | Split render into loading and loaaded | Brandon Millman | 2018-06-01 | 1 | -5/+11 |
| |/ / | |||||
* | | | Merge pull request #647 from 0xProject/override-ethereumjs-tx-version | Alex Browne | 2018-06-01 | 2 | -11/+6 |
|\ \ \ | |/ / |/| | | Override ethereumjs-tx version | ||||
| * | | Override ethereumjs-tx version | Alex Browne | 2018-06-01 | 2 | -11/+6 |
|/ / | |||||
* | | Merge pull request #624 from 0xProject/feature/fast-ci2 | Leonid Logvinov | 2018-06-01 | 3 | -168/+210 |
|\ \ | | | | | | | Rebalance CI tests to run faster | ||||
| * | | Remove merge conflicts from yarn.lock | Leonid Logvinov | 2018-06-01 | 1 | -13/+0 |
| | | | |||||
| * | | Don't wait con contract tests to submit coverage | Leonid Logvinov | 2018-06-01 | 1 | -1/+0 |
| | | | |||||
| * | | Keep node versions consistent | Leonid Logvinov | 2018-06-01 | 1 | -5/+5 |
| | | | |||||
| * | | Split tests into two buckets | Leonid Logvinov | 2018-06-01 | 1 | -25/+23 |
| | | | |||||
| * | | Use a newer version of node/yarn to speed-up deps instaation | Leonid Logvinov | 2018-06-01 | 3 | -77/+167 |
| | | | |||||
| * | | Try to cache dependencies | Leonid Logvinov | 2018-06-01 | 1 | -15/+12 |
| | | | |||||
| * | | Combine lint and pretttier tests together | Leonid Logvinov | 2018-06-01 | 1 | -17/+3 |
| | | | |||||
| * | | Rebalance tests | Leonid Logvinov | 2018-06-01 | 1 | -25/+10 |
| | | | |||||
* | | | Merge pull request #641 from 0xProject/feature/remove-types | Leonid Logvinov | 2018-06-01 | 19 | -444/+76 |
|\ \ \ | | | | | | | | | Remove types | ||||
| * | | | Add changelog entry for typescript-typings | Leonid Logvinov | 2018-06-01 | 1 | -8/+8 |
| | | | | |||||
| * | | | Remove some types | Leonid Logvinov | 2018-06-01 | 15 | -421/+63 |
| | | | | |||||
| * | | | Remove published types | Leonid Logvinov | 2018-06-01 | 5 | -15/+5 |
| |/ / | |||||
* / / | Fix build | Amir Bandeali | 2018-06-01 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #640 from 0xProject/await-transaction-success | Alex Browne | 2018-05-31 | 5 | -25/+64 |
|\ \ | | | | | | | Add awaitTransactionSuccess where needed | ||||
| * | | Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapper | Alex Browne | 2018-05-31 | 2 | -5/+7 |
| | | | |||||
| * | | Add awaitTransactionSuccess where needed | Alex Browne | 2018-05-31 | 4 | -22/+59 |
| | | | |||||
| | * | Update json-schemas version to 1.0.0 to avoid possible conflicts | Fabio Berger | 2018-06-02 | 3 | -2/+11 |
| | | | |||||
| | * | Add signature specific validation methods, and other refactors | Fabio Berger | 2018-06-02 | 5 | -55/+98 |
| | | | |||||
| | * | Fix TODOs | Fabio Berger | 2018-06-01 | 1 | -2/+1 |
| | | | |||||
| | * | Update all artifacts | Fabio Berger | 2018-06-01 | 8 | -2233/+2148 |
| | | | |||||
| | * | List V2 contracts in compile.json now | Fabio Berger | 2018-06-01 | 1 | -6/+5 |
| | | | |||||
| | * | Fix sol-cov issue by changing it's dep to current version of types | Fabio Berger | 2018-06-01 | 1 | -1/+1 |
| | | | |||||
| | * | Rename ISigner to IWallet and implement SignatureType.Validator | Fabio Berger | 2018-06-01 | 7 | -9/+196 |
| | | | |||||
| | * | Bump types to a major version to avoid the caret | Fabio Berger | 2018-06-01 | 3 | -3/+3 |
| | | | |||||
| | * | Fix metadata offsets | Fabio Berger | 2018-06-01 | 1 | -5/+7 |
| | | | |||||
| | * | fix method rename | Fabio Berger | 2018-06-01 | 1 | -1/+1 |
| | | | |||||
| | * | Rename Ecrecover to EthSign | Fabio Berger | 2018-06-01 | 3 | -6/+3 |
| | | | |||||
| | * | Update artifacts | Fabio Berger | 2018-06-01 | 10 | -2286/+2457 |
| | | | |||||
| | * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-01 | 82 | -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/txorigin | Amir Bandeali | 2018-05-31 | 46 | -154/+955 |
|\ \ \ | | | | | | | | | Add Validator signature type | ||||
| * | | | Check length before accessing indices, add awaitTransactionSuccess where ↵ | Amir Bandeali | 2018-05-31 | 5 | -25/+43 |
| | | | | | | | | | | | | | | | | needed, and rename function | ||||
| * | | | Add back before/after snapshots for each test | Amir Bandeali | 2018-05-31 | 16 | -0/+97 |
| | | | | |||||
| * | | | Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMIT | Amir Bandeali | 2018-05-31 | 8 | -10/+10 |
| | | | | |||||
| * | | | Make preSigned and allowedValidators mappings public | Amir Bandeali | 2018-05-31 | 1 | -2/+2 |
| | | | | |||||
| * | | | Change names of signature types | Amir Bandeali | 2018-05-31 | 2 | -6/+6 |
| | | | | |||||
| * | | | Fix formatting and tests | Amir Bandeali | 2018-05-31 | 18 | -94/+16 |
| | | | | |||||
| * | | | Make AssetProxyId last byte of assetData | Amir Bandeali | 2018-05-31 | 18 | -37/+74 |
| | | | | |||||
| * | | | Add signer to txHash, allow approveValidator to be used with executeTransaction | Amir Bandeali | 2018-05-31 | 3 | -7/+10 |
| | | | | |||||
| * | | | Update Whitelist | Amir Bandeali | 2018-05-31 | 7 | -24/+335 |
| | | | | |||||
| * | | | Fix Exchange interface | Amir Bandeali | 2018-05-31 | 1 | -7/+5 |
| | | | | |||||
| * | | | Increase block gas limit | Amir Bandeali | 2018-05-31 | 2 | -1/+2 |
| | | | | |||||
| * | | | Use last byte of signature as signature type | Amir Bandeali | 2018-05-31 | 8 | -106/+103 |
| | | | | |||||
| * | | | Remove TxOrigin signature type, modify whitelist to use Validator signature type | Amir Bandeali | 2018-05-31 | 7 | -35/+35 |
| | | | | |||||
| * | | | Update Whitelist contract with comments, also require maker to be whitelisted | Amir Bandeali | 2018-05-31 | 5 | -16/+72 |
| | | | | |||||
| * | | | Fix build | Amir Bandeali | 2018-05-31 | 3 | -19/+24 |
| | | | | |||||
| * | | | Add example whitelist contract and minimum tests | Amir Bandeali | 2018-05-31 | 3 | -11/+121 |
| | | | | |||||
| * | | | Add sample whitelist contract | Amir Bandeali | 2018-05-31 | 3 | -1/+60 |
| | | | | |||||
| * | | | Add TxOrigin signature type and rearrange order of types | Amir Bandeali | 2018-05-31 | 3 | -63/+77 |
| | | | | |||||
| * | | | Add approveValidator function | Amir Bandeali | 2018-05-31 | 2 | -2/+17 |
| | | | | |||||
| * | | | Add Validator signature type | Amir Bandeali | 2018-05-31 | 4 | -3/+69 |
| | | | | |||||
| * | | | Add deepCopyBytes method to LibBytes | Amir Bandeali | 2018-05-31 | 3 | -0/+92 |
|/ / / | |||||
* | | | Merge pull request #639 from 0xProject/fix/contracts/multisigWrapper | Amir Bandeali | 2018-05-31 | 3 | -50/+62 |
|\ \ \ | | | | | | | | | Update LogDecoder | ||||
| * | | | Change logDecoder back into class, remove awaitTransactionMined from ↵ | Amir Bandeali | 2018-05-31 | 3 | -50/+62 |
| |/ / | | | | | | | | | | multiSigWrapper | ||||
* | | | Merge pull request #635 from 0xProject/feature/website/custom-onboarding-tooltip | Francesco Agosti | 2018-05-31 | 23 | -277/+530 |
|\ \ \ | |/ / |/| | | Remove react-joyride and some more refactoring | ||||
| * | | Merge pull request #638 from 0xProject/feature/website/onboarding-eth-flow | Francesco Agosti | 2018-05-31 | 7 | -47/+121 |
| |\ \ | | | | | | | | | Onboarding: implement add ETH step, and stub for add WETH step | ||||
| | * | | Onboarding: implement add ETH step, and stub for add WETH step | fragosti | 2018-05-30 | 7 | -47/+121 |
| |/ / | |||||
| * | | Address PR feedback | fragosti | 2018-05-30 | 7 | -40/+41 |
| | | | |||||
| * | | Remove react-joyride from deps | fragosti | 2018-05-30 | 2 | -80/+2 |
| | | | |||||
| * | | Add entry to CHANGELOG.json | fragosti | 2018-05-30 | 1 | -0/+8 |
| | | | |||||
| * | | Remove blacklist concept | fragosti | 2018-05-30 | 4 | -66/+20 |
| | | | |||||
| * | | Some cleanup | fragosti | 2018-05-30 | 2 | -11/+13 |
| | | | |||||
| * | | Improve tooltip look | fragosti | 2018-05-30 | 7 | -13/+69 |
| | | | |||||
| * | | Add types for react-popper, remove types for react-joyride | fragosti | 2018-05-30 | 4 | -105/+62 |
| | | | |||||
| * | | Replace react-joyride with react-popper | fragosti | 2018-05-30 | 6 | -56/+96 |
| | | | |||||
| * | | Write custom tooltip component | fragosti | 2018-05-26 | 3 | -7/+57 |
| | | | |||||
| * | | Run linter | fragosti | 2018-05-26 | 2 | -2/+5 |
| | | | |||||
| * | | Add localstorage helper | fragosti | 2018-05-26 | 1 | -0/+16 |
| | | | |||||
| * | | Add next button | fragosti | 2018-05-26 | 3 | -2/+13 |
| | | | |||||
| * | | Auto-show onboarding flow on first page view | fragosti | 2018-05-26 | 5 | -7/+53 |
| | | | |||||
| * | | Add ability to blacklist onboarding steps | fragosti | 2018-05-26 | 3 | -34/+92 |
| | | | |||||
| * | | Fix PortalOnboardingFlowProps | fragosti | 2018-05-26 | 1 | -1/+0 |
| | | | |||||
| * | | Implement metamask installation flow | fragosti | 2018-05-26 | 6 | -19/+75 |
| | | | |||||
* | | | Fix unselected relayer drawer item | Brandon Millman | 2018-05-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #621 from 0xProject/feature/compiler-assertions | Leonid Logvinov | 2018-05-30 | 6 | -7/+56 |
|\ \ \ | | | | | | | | | Add schema assertions on public methods of @0xproject/sol-compiler | ||||
| * | | | Add a CHANGELOG entry | Leonid Logvinov | 2018-05-30 | 1 | -0/+4 |
| | | | | |||||
| * | | | Make opts param optional in Compiler | Leonid Logvinov | 2018-05-30 | 1 | -6/+7 |
| | | | | |||||
| * | | | Throw if trying to schema-validate an undefined | Leonid Logvinov | 2018-05-30 | 1 | -0/+3 |
| | | | | |||||
| * | | | Add CHANGELOG entry | Leonid Logvinov | 2018-05-30 | 2 | -1/+10 |
| | | | | |||||
| * | | | Add schema assertions on public methods of @0xproject/sol-compiler | Leonid Logvinov | 2018-05-30 | 4 | -1/+33 |
|/ / / | |||||
| | * | Expose isValidPresignedSignatureAsync method | Fabio Berger | 2018-05-31 | 1 | -3/+19 |
| | | | |||||
| | * | Move isValidOrderHash to the order_hash_test file | Fabio Berger | 2018-05-31 | 2 | -15/+15 |
| | | | |||||
| | * | Decide to throw for Caller signature type for now | Fabio Berger | 2018-05-31 | 1 | -2/+3 |
| | | | |||||
| | * | Introduce OrderWithoutExchangeAddress type since this is what get's sent to ↵ | Fabio Berger | 2018-05-31 | 5 | -32/+43 |
| | | | | | | | | | | | | the smart contracts | ||||
| | * | Add ISigner artifacts | Fabio Berger | 2018-05-31 | 1 | -0/+76 |
| | | | |||||
| | * | Fix order-utils tests | Fabio Berger | 2018-05-31 | 7 | -81/+123 |
| | | | |||||
| | * | Revivie the ECSignatureSchema | Fabio Berger | 2018-05-31 | 2 | -0/+22 |
| | | | |||||
| | * | Initial refactor of order-utils. Move many utils from contracts into this ↵ | Fabio Berger | 2018-05-30 | 38 | -401/+510 |
| | | | | | | | | | | | | package. | ||||
| | * | Freeze order-utils at 0.0.5 for all packages except contracts | Fabio Berger | 2018-05-30 | 8 | -7/+23 |
| | | | |||||
| | * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-05-26 | 7 | -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 Berger | 2018-05-26 | 5 | -103/+86 |
|\ \ \ | | | | | | | | | | | | | | | | | 0xProject/feature/contracts-without-contract-wrappers Remove contracts -> @0xproject/contract-wrappers dependency | ||||
| * | | | Remove registry override | Leonid Logvinov | 2018-05-26 | 1 | -3/+0 |
| | | | | |||||
| * | | | Revert "Change the registry in yarn.lock" | Leonid Logvinov | 2018-05-26 | 1 | -1995/+1995 |
| | | | | | | | | | | | | | | | | This reverts commit 76579a300444fc212ba4c32736a1a51958627c37. | ||||
| * | | | Change the registry in yarn.lock | Leonid Logvinov | 2018-05-26 | 1 | -1995/+1995 |
| | | | | |||||
| * | | | Remove contracts -> @0xproject/order-utils dependency | Leonid Logvinov | 2018-05-26 | 6 | -103/+89 |
| |/ / | |||||
* / / | Hide wallet management option and expand component on small screens | Brandon Millman | 2018-05-26 | 2 | -15/+23 |
|/ / | |||||
| * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-05-26 | 28 | -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-empty | Brandon Millman | 2018-05-25 | 3 | -9/+31 |
|\ \ | | | | | | | Implement design for relayers with no volume or tokens | ||||
| * | | Implement design for relayers with no volume or tokens | Brandon Millman | 2018-05-25 | 3 | -9/+31 |
| | | | |||||
* | | | Fix imports in order_utils | Leonid Logvinov | 2018-05-25 | 2 | -1/+22 |
| | | | |||||
* | | | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 23 | -397/+1421 |
|\ \ \ | | | | | | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress | ||||
| * | | | Use web3-wrapper instead of 0x.js, update logDecoder | Amir Bandeali | 2018-05-25 | 7 | -49/+48 |
| | | | | |||||
| * | | | Cleanup tests | Amir Bandeali | 2018-05-25 | 4 | -6/+12 |
| | | | | |||||
| * | | | Add errMsg when throwing on unrecognized error | Amir Bandeali | 2018-05-25 | 1 | -1/+1 |
| | | | | |||||
| * | | | Move readFirst4 to LibBytes | Amir Bandeali | 2018-05-25 | 5 | -39/+53 |
| | | | | |||||
| * | | | Add old MultiSig to previous contracts, cleanup file structure | Amir Bandeali | 2018-05-25 | 7 | -16/+16 |
| | | | | |||||
| * | | | Fix build | Amir Bandeali | 2018-05-25 | 6 | -13/+882 |
| | | | | |||||
| * | | | Address feedback, rename contract to AssetProxyOwner | Amir Bandeali | 2018-05-25 | 6 | -33/+37 |
| | | | | |||||
| * | | | Update multisig tests and utils | Amir Bandeali | 2018-05-25 | 4 | -253/+355 |
| | | | | |||||
| * | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress to use a ↵ | Amir Bandeali | 2018-05-25 | 1 | -18/+48 |
| |/ / | | | | | | | | | | mapping of registered proxies | ||||
| | * | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-05-25 | 43 | -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-hash | Fabio Berger | 2018-05-25 | 6 | -2331/+2368 |
|\ \ \ | | | | | | | | | Update order hash to match latest eip712 | ||||
| * \ \ | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash | Fabio Berger | 2018-05-25 | 39 | -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-migrations | Leonid Logvinov | 2018-05-25 | 38 | -126/+285 |
|\ \ \ \ | | | | | | | | | | | Migrate migrations, types to v2 | ||||
| * | | | | Pin connect in sra-report | Leonid Logvinov | 2018-05-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix a typo | Leonid Logvinov | 2018-05-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Pin types in sra-report | Leonid Logvinov | 2018-05-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix linter issues | Leonid Logvinov | 2018-05-25 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | Unpin types version in @0xproject/connect | Leonid Logvinov | 2018-05-25 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | Pin types version in website | Leonid Logvinov | 2018-05-25 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Do a fake version bump on types so that yarn doesn't try to install updated ↵ | Leonid Logvinov | 2018-05-25 | 3 | -4/+13 |
| | | | | | | | | | | | | | | | | | | | | version for not yet migrated packages | ||||
| * | | | | Migrate migrations to v2 | Leonid Logvinov | 2018-05-25 | 33 | -122/+271 |
| | | | | | |||||
* | | | | | Temporarily disable installation tests | Leonid Logvinov | 2018-05-25 | 1 | -3/+3 |
| |_|/ / |/| | | | |||||
| | * | | Use domain separator for exchange address | Jacob Evans | 2018-05-25 | 6 | -2300/+2314 |
| | | | | |||||
| | * | | publicGetOrderSchemaHash -> getOrderSchemaHash | Jacob Evans | 2018-05-25 | 2 | -2/+2 |
| | | | | |||||
| | * | | Update order hash to match latest eip712 | Jacob Evans | 2018-05-25 | 4 | -34/+57 |
| |/ / |/| | | |||||
| | * | Add senderAddress to order schema | Fabio Berger | 2018-05-25 | 2 | -0/+3 |
| |/ |/| | |||||
* | | Merge pull request #617 from 0xProject/feature/no-coverage-ci-contracts | Leonid Logvinov | 2018-05-25 | 2 | -9/+1 |
|\ \ | | | | | | | Disable contracts coverage on CI | ||||
| * | | Disable contracts coverage on CI | Leonid Logvinov | 2018-05-25 | 2 | -9/+1 |
| |/ | |||||
* | | Merge pull request #607 from 0xProject/feature/website/onboarding-setup | Francesco Agosti | 2018-05-25 | 17 | -41/+420 |
|\ \ | | | | | | | Set up structure for onboarding flow along with basic step 0 | ||||
| * | | Improve OnboardingFlow API and typescript types | fragosti | 2018-05-25 | 4 | -14/+27 |
| | | | |||||
| * | | Address PR feedback | fragosti | 2018-05-25 | 8 | -38/+54 |
| | | | |||||
| * | | Undo change to react-highlight | fragosti | 2018-05-25 | 1 | -1/+0 |
| | | | |||||
| * | | Fix build errors | fragosti | 2018-05-25 | 3 | -13/+14 |
| | | | |||||
| * | | Fix issue where modal can be out of sync with app state | fragosti | 2018-05-25 | 7 | -18/+56 |
| | | | |||||
| * | | Basic onboarding flow infrastructure set up | fragosti | 2018-05-25 | 17 | -38/+350 |
|/ / | |||||
* | | Merge pull request #612 from 0xProject/feature/website/add-redux-devtools | Francesco Agosti | 2018-05-25 | 3 | -1/+7 |
|\ \ | |/ |/| | Add redux-devtools-extension to project | ||||
| * | Move to deps from devDeps and use in development only | fragosti | 2018-05-23 | 2 | -2/+2 |
| | | |||||
| * | Add redux-devtools-extension to project | fragosti | 2018-05-23 | 3 | -2/+8 |
| | | |||||
* | | Merge pull request #615 from 0xProject/refactor/json-schemas/for-v2 | Fabio Berger | 2018-05-25 | 16 | -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 Berger | 2018-05-24 | 1 | -6/+6 |
| | | | | | | | | | | | | stops the entire process from executing) | ||||
| * | | Have source-map-loader ignore node_modules packages | Fabio Berger | 2018-05-24 | 1 | -1/+6 |
| | | | |||||
| * | | Revert to an earlier version that works | Fabio Berger | 2018-05-24 | 8 | -11/+11 |
| | | | |||||
| * | | Force hex to have at least two hex values after the prefix, but it could be ↵ | Fabio Berger | 2018-05-24 | 2 | -2/+2 |
| | | | | | | | | | | | | two zeros | ||||
| * | | Fix Hex regex and tests | Fabio Berger | 2018-05-24 | 2 | -3/+4 |
| | | | |||||
| * | | Remove the caret so it actually installs this version | Fabio Berger | 2018-05-24 | 8 | -7/+16 |
| | | | |||||
| * | | Merge branch 'v2-prototype' into refactor/json-schemas/for-v2 | Fabio Berger | 2018-05-24 | 1 | -0/+1 |
| |\ \ | | | | | | | | | | | | | | | | | * v2-prototype: Ignore v2 artifacts | ||||
| * | | | Add CHANGELOG entry | Fabio Berger | 2018-05-24 | 1 | -0/+10 |
| | | | | |||||
| * | | | Updated Order, SignedOrder schemas, removed ECSignature schema types and ↵ | Fabio Berger | 2018-05-24 | 5 | -98/+44 |
| | | | | | | | | | | | | | | | | added Hex basic type | ||||
| * | | | Bump all dependencies on json-schemas down a patch version so that they ↵ | Fabio Berger | 2018-05-24 | 7 | -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-status | Alex Browne | 2018-05-24 | 21 | -94/+144 |
|\ \ \ \ | | | | | | | | | | | Check transaction receipt status | ||||
| * | | | | Change error message for awaitTransactionSuccessAsync | Alex Browne | 2018-05-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 21 | -94/+144 |
| |/ / / | |||||
* | | | | Merge pull request #603 from 0xProject/feature/website/wallet-flex-box | Brandon Millman | 2018-05-24 | 4 | -129/+161 |
|\ \ \ \ | |_|/ / |/| | | | Improve wallet layout using flexbox | ||||
| * | | | Use visibility property instead of placeholder div in wrap ether item | Brandon Millman | 2018-05-24 | 1 | -7/+4 |
| | | | | |||||
| * | | | Merge branch 'v2-prototype' into feature/website/wallet-flex-box | Brandon Millman | 2018-05-24 | 233 | -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 key | Brandon Millman | 2018-05-22 | 1 | -3/+6 |
| | | | | |||||
| * | | | Use flexbox for wrapped ether item | Brandon Millman | 2018-05-22 | 1 | -21/+29 |
| | | | | |||||
| * | | | Re add wrapped ether item | Brandon Millman | 2018-05-22 | 1 | -7/+24 |
| | | | | |||||
| * | | | Rewrite balance rows using flex box | Brandon Millman | 2018-05-22 | 3 | -122/+129 |
| | | | | |||||
* | | | | Merge pull request #614 from 0xProject/bug/prettier/ignore-v2-artifacts | Fabio Berger | 2018-05-24 | 1 | -0/+1 |
|\ \ \ \ | |_|/ / |/| | | | Ignore v2 artifacts | ||||
| * | | | Ignore v2 artifacts | Jacob Evans | 2018-05-24 | 1 | -0/+1 |
|/ / / | |||||
* | | | Add missing dep to website | Fabio Berger | 2018-05-24 | 1 | -0/+1 |
| | | | |||||
* | | | Merge pull request #589 from 0xProject/feature/truffle-sol-cov | Fabio Berger | 2018-05-24 | 55 | -229/+615 |
|\ \ \ | | | | | | | | | Sol-cov artifact Adapters (truffle) | ||||
| * | | | Upgrade solidity parser | Leonid Logvinov | 2018-05-24 | 2 | -4/+4 |
| | | | | |||||
| * | | | Fix trace test | Leonid Logvinov | 2018-05-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix linter issues | Leonid Logvinov | 2018-05-24 | 2 | -4/+5 |
| | | | | |||||
| * | | | Move contract utils | Leonid Logvinov | 2018-05-24 | 5 | -19/+19 |
| | | | | |||||
| * | | | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-24 | 55 | -424/+428 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #611 from 0xProject/feature/remove-0x-from=-website | Leonid Logvinov | 2018-05-24 | 24 | -119/+136 |
|\ \ \ \ | | | | | | | | | | | Remove 0x.js as a dependency from website | ||||
| * | | | | Fix prettier | Leonid Logvinov | 2018-05-24 | 3 | -3/+9 |
| | | | | | |||||
| * | | | | Fix prettier | Leonid Logvinov | 2018-05-24 | 2 | -6/+2 |
| | | | | | |||||
| * | | | | Remove 0x.js as a dependency from website | Leonid Logvinov | 2018-05-24 | 24 | -122/+137 |
|/ / / / | |||||
* | | | | Merge pull request #609 from 0xProject/refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-24 | 24 | -296/+275 |
|\ \ \ \ | | | | | | | | | | | Remove 0x.js dep from Contracts | ||||
| * | | | | Enable 0x.js tests | Fabio Berger | 2018-05-23 | 1 | -3/+1 |
| | | | | | |||||
| * | | | | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 2 | -2/+2 |
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix small bug in order-utils Fix Tslint error caused by "PromiseLike" value Update dogfood url | ||||
* | | | | | Fix small bug in order-utils | Alex Browne | 2018-05-23 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵ | Fabio Berger | 2018-05-23 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2-prototype * 'v2-prototype' of github.com:0xProject/0x-monorepo: Update dogfood url | ||||
| * | | | | | Update dogfood url | Brandon Millman | 2018-05-23 | 2 | -2/+2 |
| | | | | | | |||||
* | | | | | | Fix Tslint error caused by "PromiseLike" value | Fabio Berger | 2018-05-23 | 1 | -0/+6 |
|/ / / / / | |||||
| * | | | | Fix Tslint error caused by "PromiseLike" value | Fabio Berger | 2018-05-23 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | fix contract-wrappers version | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | merge v2-prototype | Fabio Berger | 2018-05-23 | 82 | -264/+560 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Fix TokenTransferProxy artifact name since it's now suffixed with _v1 | Fabio Berger | 2018-05-23 | 3 | -3/+3 |
| | | | | | |||||
* | | | | | Merge pull request #610 from 0xProject/feature/sra-report-without-0x | Leonid Logvinov | 2018-05-23 | 2 | -3/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove 0x.js dependency from sra-report | ||||
| * | | | | | Remove 0x.js dependency from sra-report | Leonid Logvinov | 2018-05-23 | 2 | -3/+5 |
|/ / / / / | |||||
| * | | | | Update yarn.lock | Fabio Berger | 2018-05-23 | 1 | -117/+0 |
| | | | | | |||||
| * | | | | Fix signature verification test | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix TokenTransferProxy artifact name since it's now suffixed with _v1 | Fabio Berger | 2018-05-23 | 3 | -3/+3 |
| | | | | | |||||
| * | | | | Fix dep version | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix import | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix await calls | Fabio Berger | 2018-05-23 | 1 | -12/+3 |
| | | | | |