aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused constantsFabio Berger2018-06-281-2/+0
|
* Reduce the userAddresses to the individual addresses actually used by tests, ↵Fabio Berger2018-06-287-19/+32
| | | | as well as only deploy the number of ERC20 tokens needed for each test suite
* Add await time constantFabio Berger2018-06-281-0/+2
|
* Add missing awaitTransactionSuccessAsync callsFabio Berger2018-06-281-6/+10
|
* Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2763-3140/+1876
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Improve 'web3-provider-engine' typings Fix build Update artifacts Add more revert reasons to tests Make dispatchTransferFrom revert with reason from AssetProxy on failure Remove redundant files, hard code function selector in dispatchTransferFrom, and modify revert reason Updated offset of receiverData length to reflect new assetData encoding. ERC20 Custom storage layout Golf the authorization check ERC20 manual memory layout ERC20 inline return ERC721 inline return Golf ERC721 transferFrom Inline ERC20 tranferFrom selector constant Optimize ERC20 transferFrom Polish asset picker layout Update relayer grid fallback icon Change metamask install link based on browser Use ethereumjs-tx@1.3.5 instead of our fork # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/core.ts # packages/migrations/artifacts/2.0.0/DummyERC721Token.json
| * Improve 'web3-provider-engine' typingsNikita Galkin2018-06-272-1/+18
| |
| * Merge pull request #773 from 0xProject/feature/contracts/abi-calldata-proxyAmir Bandeali2018-06-2750-3094/+1785
| |\ | | | | | | Optimize transfer
| | * Fix buildAmir Bandeali2018-06-275-3/+392
| | |
| | * Update artifactsAmir Bandeali2018-06-2730-2689/+1363
| | |
| | * Add more revert reasons to testsAmir Bandeali2018-06-274-19/+44
| | |
| | * Make dispatchTransferFrom revert with reason from AssetProxy on failureAmir Bandeali2018-06-272-7/+6
| | |
| | * Remove redundant files, hard code function selector in dispatchTransferFrom, ↵Amir Bandeali2018-06-2717-896/+201
| | | | | | | | | | | | and modify revert reason
| | * Updated offset of receiverData length to reflect new assetData encoding.Greg Hysen2018-06-271-2/+2
| | |
| | * ERC20 Custom storage layoutRemco Bloemen2018-06-272-3/+5
| | |
| | * Golf the authorization checkRemco Bloemen2018-06-272-122/+132
| | |
| | * ERC20 manual memory layoutRemco Bloemen2018-06-271-11/+6
| | |
| | * ERC20 inline returnRemco Bloemen2018-06-271-6/+11
| | |
| | * ERC721 inline returnRemco Bloemen2018-06-271-8/+9
| | |
| | * Golf ERC721 transferFromRemco Bloemen2018-06-272-3/+166
| | |
| | * Inline ERC20 tranferFrom selector constantRemco Bloemen2018-06-271-4/+3
| | |
| | * Optimize ERC20 transferFromRemco Bloemen2018-06-271-2/+126
| |/
| * Polish asset picker layoutBrandon Millman2018-06-271-4/+4
| |
| * Update relayer grid fallback iconBrandon Millman2018-06-272-1/+1
| |
| * Merge pull request #777 from 0xProject/feature/website/browser-detectionBrandon Millman2018-06-276-18/+61
| |\ | | | | | | Change metamask install link based on browser
| | * Change metamask install link based on browserBrandon Millman2018-06-266-18/+104
| | |
| * | Merge pull request #776 from 0xProject/ethereum-js-tx-1.3.5Alex Browne2018-06-274-5/+54
| |\ \ | | | | | | | | Use ethereumjs-tx@1.3.5 instead of our fork
| | * | Use ethereumjs-tx@1.3.5 instead of our forkAlex Browne2018-06-264-5/+54
| | | |
| * | | Merge pull request #760 from 0xProject/refactor/check-revert-reasonsFabio Berger2018-06-2716-140/+255
| |\ \ \ | | |_|/ | |/| | Check Revert Reasons in Contract Tests
* | | | Move combinatorial fillOrder tests into the `fill_ordere` test fileFabio Berger2018-06-272-48/+21
| | | |
* | | | Fix testsFabio Berger2018-06-271-3/+6
| | | |
* | | | Fix enum nameFabio Berger2018-06-271-9/+9
| | | |
* | | | Fix type issueFabio Berger2018-06-271-2/+2
| | | |
* | | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testingFabio Berger2018-06-2712-88/+92
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refactor/check-revert-reasons: Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed` Expect RevertReason be passed in, not string Rename RevertReasons to RevertReason since singular enum names are more common # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/core.ts
| * | | Temporarily switch revert reasons to `TransferFailed`. Should be ↵Fabio Berger2018-06-271-2/+2
| | | | | | | | | | | | | | | | `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed`
| * | | Expect RevertReason be passed in, not stringFabio Berger2018-06-261-1/+5
| | | |
| * | | Rename RevertReasons to RevertReason since singular enum names are more commonFabio Berger2018-06-2611-96/+96
| | | |
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2636-364/+521
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts
* | | | Update AbstractAssetWrapperFabio Berger2018-06-261-1/+1
| | | |
* | | | Rename to singularFabio Berger2018-06-261-9/+9
| | | |
* | | | Fix merge issuesFabio Berger2018-06-265-17/+21
| | | |
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2636-379/+532
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts
| * | | Merge pull request #743 from 0xProject/feature/contracts/abi-encodedAmir Bandeali2018-06-2635-361/+478
| |\ \ \ | | |_|/ | |/| | ABI encode assetData fields
| | * | Don't use variables for revert reasonsAmir Bandeali2018-06-2614-86/+86
| | | |
| | * | Add comments to dispatchTransferFromAmir Bandeali2018-06-261-30/+56
| | | |
| | * | Document IAssetDataRemco Bloemen2018-06-261-0/+3
| | | |
| | * | Compute bytes4 proxyid constantsRemco Bloemen2018-06-262-2/+2
| | | |
| | * | Return inplace bytes in LibBytes.readBytesWithLengthRemco Bloemen2018-06-261-9/+7
| | | |
| | * | Add Greg's documentation to MixinErc721TransferRemco Bloemen2018-06-261-33/+44
| | | |
| | * | Add Greg's documentation to MixinErc20TransferRemco Bloemen2018-06-261-13/+35
| | | |
| | * | Gas golf the transfer success logicRemco Bloemen2018-06-261-11/+10
| | | |
| | * | Optimize like in PR #767Remco Bloemen2018-06-263-34/+157
| | | |
| | * | Run prettier and fix linting errorsAmir Bandeali2018-06-263-55/+54
| | | |
| | * | Fix testsAmir Bandeali2018-06-265-21/+4
| | | |
| | * | Update testsRemco Bloemen2018-06-261-2/+2
| | | |
| | * | Fix AssetProxyUtilsRemco Bloemen2018-06-261-1/+1
| | | |
| | * | Update testsRemco Bloemen2018-06-262-33/+20
| | | |
| | * | Fix ERC721Proxy TokenIdRemco Bloemen2018-06-261-1/+1
| | | |
| | * | Update AssetProxyUtilsRemco Bloemen2018-06-261-90/+41
| | | |
| | * | Add IAssetDataRemco Bloemen2018-06-262-1/+2
| | | |
| | * | WIPRemco Bloemen2018-06-265-23/+36
| | | |
| | * | ABI encoded asset dataRemco Bloemen2018-06-269-29/+51
| | | |
| | * | Remove proxyId argument from dispatchTransferFromRemco Bloemen2018-06-268-41/+20
| |/ /
| * | Merge pull request #772 from 0xProject/add-coverage-instructionsFabio Berger2018-06-261-3/+43
| |\ \ | | | | | | | | Improve Contracts README Testing Section
| | * | Document all the contract test options in READMEFabio Berger2018-06-251-3/+43
| |/ /
* | | Fix inconsistency between contract and reference implementation of order ↵Fabio Berger2018-06-262-0/+5
| | | | | | | | | | | | validation logic
* | | Prettier fixesFabio Berger2018-06-262-8/+2
| | |
* | | Fix tslint issuesFabio Berger2018-06-269-24/+4
| | |
* | | Fix lint errorsFabio Berger2018-06-263-5/+2
| | |
* | | Fix revertReasonFabio Berger2018-06-251-1/+1
| | |
* | | Update yarn.lockFabio Berger2018-06-251-0/+43
| | |
* | | Remove no longer used methodFabio Berger2018-06-251-16/+0
| | |
* | | Check revert reasons in declarative and combinatorial testsFabio Berger2018-06-252-61/+67
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-2512-66/+58
|\ \ \ | | |/ | |/|
| * | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-2512-66/+58
| | |
| * | Add missing importFabio Berger2018-06-251-1/+4
| | |
* | | Add missing importFabio Berger2018-06-251-1/+4
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-2516-129/+236
|\| |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2546-908/+1178
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (48 commits) Fix typos in comments Add modifier and tests for removeAuthorizedAddressAtIndex Update and add tests Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex Move isFunctionRemoveAuthorizedAddress to test Fix usage of `popLastByte` Fix LibBytes is a library Remove `areBytesEqual` Fix usage of `contentAddress()` Clean low bits in bytes4 Clean high bits in address Refactor LibBytes.readBytes4 for consistency Fix LibBytes.equals Add trailing garbage testcase for LibBytes.equals Rename bytes.equals Add slice and sliceDestructive Rename bytes.rawAddress and add bytes.contentAddress Rename read/writeBytesWithLength Using LibBytes for bytes Make LibBytes a library ... # Conflicts: # packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol # packages/contracts/test/libraries/lib_bytes.ts
| * | Fix tslintFabio Berger2018-06-234-4/+4
| | |
| * | Fix prettierFabio Berger2018-06-235-15/+13
| | |
| * | Rename ContractLibErrors to RevertReasonsFabio Berger2018-06-2311-96/+96
| | |
| * | Remove revert reason 'Exchange' prefixFabio Berger2018-06-232-3/+3
| | |
| * | Move constants over to ContractLibError enum and update all testsFabio Berger2018-06-235-44/+42
| | |
| * | Standardize ERC20 error strings given conventionFabio Berger2018-06-231-3/+2
| | |
| * | Fix test now that contract reverts with messageFabio Berger2018-06-222-5/+4
| | |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-223-27/+48
| |\ \ | | | | | | | | | | | | | | | | * v2-prototype: Check that assetProxy exists before attempting transfer
| * | | Add revert reason checks to wrapper testsFabio Berger2018-06-221-10/+19
| | | |
| * | | Fix testsFabio Berger2018-06-221-2/+2
| | | |
| * | | Change Whitelist error messages to conform to rest and added revert reason ↵Fabio Berger2018-06-223-21/+31
| | | | | | | | | | | | | | | | checks to transactions tests
| * | | Add revert reason checks to match_orders testsFabio Berger2018-06-221-7/+18
| | | |
| * | | Fix testsFabio Berger2018-06-221-2/+2
| | | |
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-226-21/+268
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Update ganache-core in yarn.lock Add coverage and test:circleci command to sra-report Add missing artifacts Skip failing tests temporarily Fix web3-wrapper test fix name Add missing package tests from circleci
| * | | | Fix expected version in testFabio Berger2018-06-221-1/+1
| | | | |
| * | | | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-22146-887/+1891
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Use make-promises-safe as a preloader instead of manually importing Updated compiler runs to be 1,000,000 Add event to setSignatureValidatorApproval, rename signer => signerAddress accross all contracts Add senderAddress to Fill and Cancel logs, add comments to events and types Fix Island component Add missing image assets for Chris and Mel Fix some bugs in sol-cov Remove unreachable PreSigned check Fix linting Buttons look hella disabled now Remove border radius, fix width issue for unlock step Add Chris and Mel to about page fix linter issues only call getLocationByOffset if source if defined Set settleOrder and settleMatchedOrders to private Prevent prettier issue Support mobile friendly onboarding flows Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `settleMatchedOrders` into `MixinMatchOrders` Migrations after rebasing Linter ...
| * | | | | Check revert reason in dispatcher testsFabio Berger2018-06-222-5/+13
| | | | | |
| * | | | | remove unused importFabio Berger2018-06-221-1/+0
| | | | | |
| * | | | | Test revert reasons in proxy testsFabio Berger2018-06-211-11/+23
| | | | | |
| * | | | | remove onlyFabio Berger2018-06-211-1/+1
| | | | | |
| * | | | | Check revert reasons in Authorizable testsFabio Berger2018-06-212-6/+15
| | | | | |
| * | | | | Change revert reason in ownable to be similar to all other revert reasonsFabio Berger2018-06-211-1/+1
| | | | | |
| * | | | | remove .onlyFabio Berger2018-06-211-1/+1
| | | | | |
| * | | | | Update yarn.lockFabio Berger2018-06-211-105/+68
| | | | | |
| * | | | | Update core tests to actually check revert messageFabio Berger2018-06-213-34/+97
| | | | | |
| * | | | | Add command to remove all node_modules, nested and hoistedFabio Berger2018-06-211-0/+1
| | | | | |
* | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-25179-1859/+3476
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (97 commits) Fix typos in comments Add modifier and tests for removeAuthorizedAddressAtIndex Update and add tests Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex Move isFunctionRemoveAuthorizedAddress to test Fix usage of `popLastByte` Fix LibBytes is a library Remove `areBytesEqual` Fix usage of `contentAddress()` Clean low bits in bytes4 Clean high bits in address Refactor LibBytes.readBytes4 for consistency Fix LibBytes.equals Add trailing garbage testcase for LibBytes.equals Rename bytes.equals Add slice and sliceDestructive Rename bytes.rawAddress and add bytes.contentAddress Rename read/writeBytesWithLength Using LibBytes for bytes Make LibBytes a library ... # Conflicts: # packages/contracts/src/utils/constants.ts # packages/contracts/test/exchange/core.ts
| * | | | | Merge pull request #735 from feuGeneA/metacoin-independenceLeonid Logvinov2018-06-252-3/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | Metacoin independence
| | * | | | | ethereum-types now only has v0.0.2, no 0.0.1F. Eugene Aumson2018-06-201-1/+1
| | | | | | |
| | * | | | | add missing metacoin dependenciesF. Eugene Aumson2018-06-201-0/+4
| | | | | | |
| | * | | | | make metacoin tsconfig independentF. Eugene Aumson2018-06-201-2/+11
| | | | | | |
| * | | | | | Merge pull request #758 from 0xProject/fix/order-utils/known-order-hashJacob Evans2018-06-251-8/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix known order hash value test in order-utils
| | * | | | | | Fix known order hash value testJacob Evans2018-06-221-8/+4
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #698 from 0xProject/fix/contracts/using-libbytesRemco Bloemen2018-06-2325-700/+947
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes and refactoring regarding LibBytes
| | * | | | | | Fix typos in commentsRemco Bloemen2018-06-231-2/+2
| | | | | | | |
| | * | | | | | Add modifier and tests for removeAuthorizedAddressAtIndexAmir Bandeali2018-06-233-2/+79
| | | | | | | |
| | * | | | | | Update and add testsAmir Bandeali2018-06-234-173/+274
| | | | | | | |
| | * | | | | | Change removeAuthorizedAddress => removeAuthorizedAddressAtIndexAmir Bandeali2018-06-232-13/+22
| | | | | | | |
| | * | | | | | Move isFunctionRemoveAuthorizedAddress to testRemco Bloemen2018-06-236-22/+70
| | | | | | | |
| | * | | | | | Fix usage of `popLastByte`Remco Bloemen2018-06-231-2/+2
| | | | | | | |
| | * | | | | | Fix LibBytes is a libraryRemco Bloemen2018-06-236-15/+12
| | | | | | | |
| | * | | | | | Remove `areBytesEqual`Remco Bloemen2018-06-231-35/+0
| | | | | | | |
| | * | | | | | Fix usage of `contentAddress()`Remco Bloemen2018-06-231-2/+2
| | | | | | | |
| | * | | | | | Clean low bits in bytes4Remco Bloemen2018-06-231-0/+3
| | | | | | | |
| | * | | | | | Clean high bits in addressRemco Bloemen2018-06-231-0/+4
| | | | | | | |
| | * | | | | | Refactor LibBytes.readBytes4 for consistencyRemco Bloemen2018-06-234-14/+25
| | | | | | | |
| | * | | | | | Fix LibBytes.equalsRemco Bloemen2018-06-231-21/+4
| | | | | | | |
| | * | | | | | Add trailing garbage testcase for LibBytes.equalsRemco Bloemen2018-06-232-0/+21
| | | | | | | |
| | * | | | | | Rename bytes.equalsRemco Bloemen2018-06-233-15/+50
| | | | | | | |
| | * | | | | | Add slice and sliceDestructiveRemco Bloemen2018-06-231-0/+46
| | | | | | | |
| | * | | | | | Rename bytes.rawAddress and add bytes.contentAddressRemco Bloemen2018-06-232-8/+25
| | | | | | | |
| | * | | | | | Rename read/writeBytesWithLengthRemco Bloemen2018-06-234-36/+36
| | | | | | | |
| | * | | | | | Using LibBytes for bytesRemco Bloemen2018-06-236-26/+38
| | | | | | | |
| | * | | | | | Make LibBytes a libraryRemco Bloemen2018-06-236-35/+30
| | | | | | | |
| | * | | | | | Merge LibMem and LibBytesRemco Bloemen2018-06-2311-399/+322
| | | | | | | |
| | * | | | | | Use provided mem in refernce memcpyRemco Bloemen2018-06-231-2/+2
| |/ / / / / /
| * | | | | | Merge pull request #749 from 0xProject/feature/contracts/transactionHashAsmAmir Bandeali2018-06-231-8/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Converted `hashZeroExTransaction` to assembly. Saves 1k gas
| | * | | | | | Apply mask to address to zero-out unused bytes.Greg Hysen2018-06-231-1/+1
| | | | | | | |
| | * | | | | | Converted `hashZeroExTransaction` to assembly. Saves 1k gasGreg Hysen2018-06-221-8/+18
| | | | | | | |
| * | | | | | | Remove extra border from the bottom of the walletBrandon Millman2018-06-231-3/+11
| | | | | | | |
| * | | | | | | Do not render ZRX or WETH as removable tracked tokensBrandon Millman2018-06-231-1/+4
| | | | | | | |
| * | | | | | | Center items in portal drawer headerBrandon Millman2018-06-231-1/+1
| | | | | | | |
| * | | | | | | Merge pull request #764 from 0xProject/feature/website/relay-grid-stacking-bugFrancesco Agosti2018-06-232-5/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix issue where hovered tiles appear over top bar
| | * | | | | | | Fix issue where hovered tiles appear over top barfragosti2018-06-232-5/+10
| |/ / / / / / /
| * | | | | | | Merge pull request #746 from 0xProject/feature/website/relayer-grid-polishFrancesco Agosti2018-06-2311-152/+138
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Relayer grid polish
| | * | | | | | | Remove unecessary position relative rulesfragosti2018-06-232-2/+4
| | | | | | | | |
| | * | | | | | | Lint and fix typofragosti2018-06-222-2/+2
| | | | | | | | |
| | * | | | | | | Fix z-index issuesfragosti2018-06-226-49/+63
| | | | | | | | |
| | * | | | | | | Fix issues that arose from mergefragosti2018-06-222-4/+8
| | | | | | | | |
| | * | | | | | | Remove Background componentBrandon Millman2018-06-225-57/+12
| | | | | | | | |
| | * | | | | | | Padding adjustmentBrandon Millman2018-06-221-1/+2
| | | | | | | | |
| | * | | | | | | Remove styles from Portal componentBrandon Millman2018-06-221-24/+13
| | | | | | | | |
| | * | | | | | | Add Background componentBrandon Millman2018-06-223-14/+35
| | | | | | | | |
| | * | | | | | | Various relayer grid ui polish itemsBrandon Millman2018-06-226-42/+42
| | |/ / / / / /
| * | | | | | | Fix tslint errorfragosti2018-06-231-10/+10
| | | | | | | |
| * | | | | | | Merge https://github.com/0xProject/0x-monorepo into v2-prototypefragosti2018-06-232-14/+16
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #750 from 0xProject/bug/website/fix-add-tokenBrandon Millman2018-06-232-14/+16
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Various add token flow bugs
| | | * | | | | | | Pulled out reset AssetPicker state into a common variableBrandon Millman2018-06-231-15/+9
| | | | | | | | | |
| | | * | | | | | | Fix state mutation in reducerBrandon Millman2018-06-221-4/+4
| | | | | | | | | |
| | | * | | | | | | Do not add empty token to local storageBrandon Millman2018-06-221-0/+8
| | | |/ / / / / /
| * | | | | | | | Remove diverse from about pagefragosti2018-06-231-3/+3
| | | | | | | | |
| * | | | | | | | Use Ops instead of Operations in Mels descriptionfragosti2018-06-231-1/+1
| |/ / / / / / /
| * | | | | | / Comment out Chris, and move Mel up in about pagefragosti2018-06-232-12/+12
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #748 from 0xProject/fix/contracts/nullAssetProxyFabio Berger2018-06-223-27/+48
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Check that assetProxy exists before attempting transfer
| | * | | | | Check that assetProxy exists before attempting transferAmir Bandeali2018-06-223-27/+48
| | | | | | |
| * | | | | | Merge pull request #757 from 0xProject/fix/circle-ciFabio Berger2018-06-228-127/+337
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | Add missing package tests from circleci
| | * | | | | Update ganache-core in yarn.lockFabio Berger2018-06-221-105/+68
| | | | | | |
| | * | | | | Add coverage and test:circleci command to sra-reportFabio Berger2018-06-222-0/+4
| | | | | | |
| | * | | | | Add missing artifactsFabio Berger2018-06-222-0/+194
| | | | | | |
| | * | | | | Skip failing tests temporarilyFabio Berger2018-06-221-2/+6
| | | | | | |
| | * | | | | Fix web3-wrapper testFabio Berger2018-06-221-1/+1
| | | | | | |
| | * | | | | fix nameFabio Berger2018-06-221-1/+1
| | | | | | |
| | * | | | | Add missing package tests from circleciFabio Berger2018-06-221-19/+64
| |/ / / / /
| * | | | | Merge pull request #752 from 0xProject/make-promises-safe-preloaderFabio Berger2018-06-2271-72/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | Use make-promises-safe as a preloader instead of manually importing
| | * | | | | Use make-promises-safe as a preloader instead of manually importingAlex Browne2018-06-2271-72/+17
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #751 from 0xProject/feature/contracts/compilerRunsAmir Bandeali2018-06-221-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | Updated compiler runs to be 1,000,000
| | * | | | Updated compiler runs to be 1,000,000Greg Hysen2018-06-221-1/+1
| | | | | |
| * | | | | Merge pull request #740 from 0xProject/feature/contracts/updateEventsAmir Bandeali2018-06-2218-112/+189
| |\ \ \ \ \ | | | | | | | | | | | | | | Update events
| | * | | | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ↵Amir Bandeali2018-06-2215-70/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | accross all contracts
| | * | | | | Add senderAddress to Fill and Cancel logs, add comments to events and typesAmir Bandeali2018-06-225-44/+47
| |/ / / / /
| * | | | | Merge pull request #747 from 0xProject/fix/sol-cov-bugsAlex Browne2018-06-222-7/+23
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Fix some bugs in sol-cov
| | * | | | Fix some bugs in sol-covAlex Browne2018-06-222-7/+23
| | |/ / /
| * | | | Merge pull request #744 from NoteGio/v2-prototype-unreachableAmir Bandeali2018-06-221-4/+0
| |\ \ \ \ | | | | | | | | | | | | Remove unreachable PreSigned check
| | * | | | Remove unreachable PreSigned checkAustin Roberts2018-06-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | This code was unreachable, as it had the exact same condition as line 206.
| * | | | | Fix Island componentfragosti2018-06-221-2/+2
| | | | | |
| * | | | | Add missing image assets for Chris and Melfragosti2018-06-222-0/+0
| | | | | |
| * | | | | Merge pull request #739 from ↵Francesco Agosti2018-06-2212-159/+267
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | 0xProject/feature/website/mobile-friendly-onboarding Add support for mobile-friendly onboarding flows
| | * | | | Fix lintingfragosti2018-06-221-2/+2
| | | | | |
| | * | | | Buttons look hella disabled nowfragosti2018-06-222-9/+17
| | | | | |
| | * | | | Remove border radius, fix width issue for unlock stepfragosti2018-06-224-5/+12
| | | | | |
| | * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-2270-647/+1798
| | |\| | | | | | | | | | | | | | | | | | | | | feature/website/mobile-friendly-onboarding
| | * | | | Prevent prettier issuefragosti2018-06-211-10/+8
| | | | | |
| | * | | | Support mobile friendly onboarding flowsfragosti2018-06-219-87/+180
| | | | | |
| | * | | | Scroll to wallet for mobile onboardingfragosti2018-06-211-23/+28
| | | | | |
| | * | | | Change Island to use styled-componentsfragosti2018-06-201-15/+8
| | | | | |
| | * | | | Show start onboarding flow button on top of wallet on mobilefragosti2018-06-201-25/+29
| | | | | |
| * | | | | Merge pull request #742 from 0xProject/feature/website/chris-mel-about-pageFrancesco Agosti2018-06-222-2/+21
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Add Chris and Mel to about page
| | * | | | Add Chris and Mel to about pagefragosti2018-06-222-2/+21
| | | | | |
| * | | | | Merge pull request #734 from 0xProject/feature/website/shadow-stylingBrandon Millman2018-06-224-10/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | Update Island shadow styling and use Island in more places
| | * | | | | Update Island shadow styling and use Island in more placesBrandon Millman2018-06-204-10/+8
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #702 from perissology/feature/missing-sourcesLeonid Logvinov2018-06-223-3/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | [sol-cov] Only collect coverage for provided sources
| | * | | | | fix linter issuesperissology2018-06-221-1/+1
| | | | | | |
| | * | | | | only call getLocationByOffset if source if definedperissology2018-06-211-4/+1
| | | | | | |
| | * | | | | Collect coverage for provided sourcesperissology2018-06-153-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When solidity generates source maps during contract compilation, the contracts are referred to by an id, which corresponds to an array index. We may not want to cover all sources that were included in a compilation, but because we use array indexes (vs. the id that is provided by solidity compiler) to map the contract to the sourceMap, the provided sourceCodes array must include the code at the correct index. This can result in empty slots in the sourceCodes array. This commit allows the coverage to only be collected for the contracts with provided sourceCode.
| * | | | | | Merge pull request #692 from 0xProject/refactor/contracts/RemovedMixinSettlementRemco Bloemen2018-06-219-295/+249
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Removed MixinSettlement
| | * | | | | Set settleOrder and settleMatchedOrders to privateGreg Hysen2018-06-215-85/+104
| | | | | | |
| | * | | | | Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and ↵Greg Hysen2018-06-219-297/+232
| |/ / / / / | | | | | | | | | | | | | | | | | | `settleMatchedOrders` into `MixinMatchOrders`
| * | | | | Merge pull request #733 from 0xProject/bug/website/identicon-layoutBrandon Millman2018-06-213-3/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | Move some layout logic out of the Identicon component
| | * | | | | Move some layout logic out of the Identicon componentBrandon Millman2018-06-203-3/+6
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #736 from ↵Greg Hysen2018-06-2127-218/+857
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/contracts/MixinSignatureValidatorTests MixinSignatureValidator Test Cases + Bug Fixes
| | * | | | | Migrations after rebasingGreg Hysen2018-06-2113-188/+320
| | | | | | |
| | * | | | | LinterGreg Hysen2018-06-211-2/+1
| | | | | | |
| | * | | | | Renamed constants in test wallet/validatorGreg Hysen2018-06-212-11/+11
| | | | | | |
| | * | | | | Few more minor #nit wording changesGreg Hysen2018-06-212-5/+5
| | | | | | |
| | * | | | | Changed wording of two tests #nitGreg Hysen2018-06-211-2/+2
| | | | | | |
| | * | | | | Minor improvements to MixinSignatureValidator testsGreg Hysen2018-06-211-14/+8
| | | | | | |
| | * | | | | Remove .onlyGreg Hysen2018-06-211-1/+1
| | | | | | |
| | * | | | | Fixed two mislabelled revert reasons + Signature Validator revert tests ↵Greg Hysen2018-06-213-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | working on Geth
| | * | | | | Minor style tweaksGreg Hysen2018-06-213-8/+8
| | | | | | |
| | * | | | | Fixed how trezor messages are signed in `signature_utils`. Now uses ↵Greg Hysen2018-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `byteLength` instead of `length`.
| | * | | | | Fixed `callAsync` template. Previously did not append `callData`, so we ↵Greg Hysen2018-06-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | couldn’t specify `from` address
| | * | | | | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported ↵Greg Hysen2018-06-2110-27/+531
| |/ / / / / | | | | | | | | | | | | | | | | | | types. Fixed trezor prefix.
| * | | | | Merge pull request #725 from 0xProject/feature/revert-trace-code-snippetsAlex Browne2018-06-219-39/+282
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Include source code snippets in revert stack traces
| | * | | | Update version for @types/solidity-parser-antlrAlex Browne2018-06-212-4/+4
| | | | | |
| | * | | | Update to match latest type definitions and other small changesAlex Browne2018-06-212-9/+11
| | | | | |
| | * | | | Update sol-cov CHANGELOG.jsonAlex Browne2018-06-211-12/+20
| | | | | |
| | * | | | Include source code snippets in revert stack tracesAlex Browne2018-06-215-21/+254
| |/ / / /
| * | | | Merge pull request #738 from 0xProject/fix/changelogsAlex Browne2018-06-215-0/+112
| |\ \ \ \ | | | | | | | | | | | | Fix CHANGELOG entries changed during incorrect merge (2a4456b)
| | * | | | Fix CHANGELOG entries changed during incorrect merge (2a4456b)Fabio Berger2018-06-215-0/+112
| |/ / / /
* | | | | Add support for approveAll in assetWrapper and fillOrderScenariosFabio Berger2018-06-214-5/+80
| | | | |
* | | | | Fix orderValidationUtils where was confusing a makerAssetAmount as a ↵Fabio Berger2018-06-213-11/+18
| | | | | | | | | | | | | | | | | | | | takerAssetAmount
* | | | | Improve verbose loggingFabio Berger2018-06-211-2/+5
| | | | |
* | | | | Fix merge variable name issueFabio Berger2018-06-201-1/+1
| | | | |
* | | | | Add support for setting allowance to unlimitedFabio Berger2018-06-202-7/+35
| | | | |
* | | | | Add noop conditionals for clarityFabio Berger2018-06-201-0/+10
| | | | |
* | | | | Rename for clarityFabio Berger2018-06-201-8/+8
| | | | |
* | | | | Split balance and allowance amount types in prep of adding the "unlimited" ↵Fabio Berger2018-06-203-51/+59
| | | | | | | | | | | | | | | | | | | | allowance enum value
* | | | | Remove unneeded explicit type defFabio Berger2018-06-201-1/+1
| | | | |
* | | | | Add TS 2.7 numeric separators to improve readabilityFabio Berger2018-06-201-6/+6
| | | | |
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-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
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 03:40:26 +0800