aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix a typoLeonid Logvinov2018-06-292-2/+2
* Fix linter errorsLeonid Logvinov2018-06-291-2/+0
* Fix addresses in WETH9 and ZRX token artifactsLeonid Logvinov2018-06-292-2/+2
* Fix the token supply in migrationsLeonid Logvinov2018-06-291-1/+1
* Dump assert version and make the order-watcher depend on the old assert versionLeonid Logvinov2018-06-298-10/+20
* Change event args names after templates changeLeonid Logvinov2018-06-291-16/+16
* Add contract-wrappers -> json-schemas and order-utils to postinstall hackLeonid Logvinov2018-06-291-1/+1
* Change import paths from z_r_x and e_r_c to zrx and erc in migrationsLeonid Logvinov2018-06-292-5/+5
* Regenerate yarn.lockLeonid Logvinov2018-06-291-9/+29
* Export newly refactored contracts from contract-wrappers and index.tsLeonid Logvinov2018-06-292-70/+50
* Change artifacts list and add dependencies to package.jsonLeonid Logvinov2018-06-291-6/+6
* Bump the version so that order-watcher doesn't pick it upLeonid Logvinov2018-06-291-1/+1
* Refactor event subscription testsLeonid Logvinov2018-06-291-13/+27
* Refactor typesLeonid Logvinov2018-06-291-35/+21
* Implement ERC721 token wrapper and token transfer proxy with testsLeonid Logvinov2018-06-294-0/+1008
* Refactor ERC20 token transfer proxy and it's testsLeonid Logvinov2018-06-292-29/+27
* Refactor ERC20 token wrapper and it's testsLeonid Logvinov2018-06-292-151/+208
* Refactor ether token wrapper testLeonid Logvinov2018-06-291-53/+64
* Refactor base contract-wrapper class to use new names, artifact format and on...Leonid Logvinov2018-06-291-21/+13
* Refactor EtherToken contract wrapper to use new names and artifacts formatLeonid Logvinov2018-06-291-19/+19
* Use new signature verification method in assertionsLeonid Logvinov2018-06-291-9/+12
* Export txDefaults from web3_wrapper.tsLeonid Logvinov2018-06-291-3/+7
* Refactor tokenUtils to not use tokenRegistryLeonid Logvinov2018-06-291-30/+42
* Add new test constantsLeonid Logvinov2018-06-291-0/+8
* Skip & refactor artifacts testsLeonid Logvinov2018-06-291-15/+9
* Run V2 migrations instead of V1 before testsLeonid Logvinov2018-06-291-3/+3
* Remove unused params in filter_utilsLeonid Logvinov2018-06-291-13/+3
* Start unused parameter names with underscoreLeonid Logvinov2018-06-291-4/+4
* Remove old contracts and add new ones to/from artifacts.tsLeonid Logvinov2018-06-291-14/+19
* Remove exchange-related functionality for nowLeonid Logvinov2018-06-2912-3691/+0
* Update compact_wrtifactsLeonid Logvinov2018-06-2914-1820/+3311
* Change import paths from z_r_x and e_r_c to zrx and erc. Also rename event ar...Leonid Logvinov2018-06-2912-61/+359
* Change import paths from z_r_x and e_r_c to zrx and ercLeonid Logvinov2018-06-291-2/+2
* Rename TransferContractEventArgs to MetacoinTransferEventArgs after changing ...Leonid Logvinov2018-06-291-4/+4
* Change import paths from z_r_x and e_r_c to zrx and ercLeonid Logvinov2018-06-292-4/+4
* Pin contract-wrappers versionLeonid Logvinov2018-06-291-1/+1
* Remove unused code/variables from abi-decoderLeonid Logvinov2018-06-291-2/+0
* Rename {{*}}ContractEventArgs to {{*}}EventArgs and append {{contractName}} t...Leonid Logvinov2018-06-292-3/+3
* Update json-schema version to 1.0.0Leonid Logvinov2018-06-291-1/+1
* Add to postinstall hack: rm fill-scenarios/node_modules/@0xprojectLeonid Logvinov2018-06-291-1/+1
* Remove generated contract directory before writing new contracts and replace ...Leonid Logvinov2018-06-292-3/+5
* Merge pull request #783 from 0xProject/miscenaleous-fixesFabio Berger2018-06-2931-5088/+1148
|\
| * Fix mergeFabio Berger2018-06-291-4/+0
| * Merge v2-prototypeFabio Berger2018-06-2953-1014/+2688
| |\ | |/ |/|
* | Merge pull request #791 from 0xProject/bug/website/broken-not-foundBrandon Millman2018-06-293-3/+5
|\ \
| * | Fix NotFound component and render 0x.js docs for /docsBrandon Millman2018-06-293-3/+5
|/ /
* | Merge pull request #780 from 0xProject/feature/website/support-new-metamaskFrancesco Agosti2018-06-2911-265/+263
|\ \
| * \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ...fragosti2018-06-29134-4139/+4913
| |\ \ | |/ / |/| |
* | | Merge pull request #762 from 0xProject/feature/website/scroll-to-tokenBrandon Millman2018-06-2912-35/+56
|\ \ \
| * | | Remove isTracked field on token in favor of trackedTimestampBrandon Millman2018-06-2911-26/+31
| * | | Use moment and lodashBrandon Millman2018-06-292-2/+3
| * | | Sort wallet tokens by timestamp added and scroll to newly added tokenBrandon Millman2018-06-296-11/+26
|/ / /
* | | Merge pull request #707 from 0xProject/feature/combinatorial-testingFabio Berger2018-06-2829-711/+2276
|\ \ \
| * | | 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
| * | | 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
| |\ \ \
| * | | | 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
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * | | | | | Fix inconsistency between contract and reference implementation of order vali...Fabio Berger2018-06-262-0/+5
| * | | | | | 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
| |\ \ \ \ \ \
| * | | | | | | Add missing importFabio Berger2018-06-251-1/+4
| * | | | | | | merge check-revert-reasonsFabio Berger2018-06-2516-129/+236
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-25179-1859/+3476
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add support for approveAll in assetWrapper and fillOrderScenariosFabio Berger2018-06-214-5/+80
| * | | | | | | | | Fix orderValidationUtils where was confusing a makerAssetAmount as a takerAss...Fabio Berger2018-06-213-11/+18
| * | | | | | | | | 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" al...Fabio Berger2018-06-203-51/+59
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add ability for verbose loggingFabio Berger2018-06-201-2/+10
| * | | | | | | | | | Fix typoFabio Berger2018-06-191-2/+2
| * | | | | | | | | | Rename NewOrderFactory to OrderFactoryFromScenario for clarityFabio Berger2018-06-192-5/+5
| * | | | | | | | | | Remove hack in ERC20WrapperFabio Berger2018-06-197-12/+30
| * | | | | | | | | | Cleanup coreCombinatorialUtilsFabio Berger2018-06-191-220/+226
| * | | | | | | | | | Comments and cleanupFabio Berger2018-06-191-20/+8
| * | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1995-581/+1154
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1973-415/+1965
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-158-23/+132
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add ability to tweak the relevant balances/allowances for the maker and taker...Fabio Berger2018-06-154-78/+380
| * | | | | | | | | | | | | - Refactor assetWrapper to contain more of the normalizing logic instead of e...Fabio Berger2018-06-1510-84/+341
| * | | | | | | | | | | | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert generateOr...Fabio Berger2018-06-145-60/+59
| * | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1429-38/+814
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use a defaultFillScenario in fillOrder testsFabio Berger2018-06-141-36/+39
| * | | | | | | | | | | | | | Fix incorrect string values in enumFabio Berger2018-06-141-2/+2
| * | | | | | | | | | | | | | Fix calculation of expFilledTakerAmount and expected values in events emittedFabio Berger2018-06-141-4/+7
| * | | | | | | | | | | | | | Replace initial set of legacy manually written fillOrder tests with declarati...Fabio Berger2018-06-142-434/+186
| * | | | | | | | | | | | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ...Fabio Berger2018-06-144-35/+153
| * | | | | | | | | | | | | | Fix divide by zero bugFabio Berger2018-06-141-3/+3
| * | | | | | | | | | | | | | Move orderFill combinatorialTests to exchange folderFabio Berger2018-06-131-4/+4
| * | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1364-1015/+1931
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Implement initial set of orderFill combinatorial testsFabio Berger2018-06-1313-490/+784
| * | | | | | | | | | | | | | | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper supe...Fabio Berger2018-06-134-9/+95
| * | | | | | | | | | | | | | | Remaining refactors of order-utils components for V2Fabio Berger2018-06-135-46/+48
| * | | | | | | | | | | | | | | For some reason order-watcher tests were timeing out so I increased the timeo...Fabio Berger2018-06-131-1/+1
| * | | | | | | | | | | | | | | Remove comment since we have added the testsFabio Berger2018-06-131-5/+0
| * | | | | | | | | | | | | | | Variable rename for clarityFabio Berger2018-06-131-2/+2
| * | | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-12176-1101/+3564
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-0845-84/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria...Fabio Berger2018-06-087-55/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria...Fabio Berger2018-06-085-183/+201
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | POC: Generates an order from spec, get's the amount fillableFabio Berger2018-06-087-32/+462
| * | | | | | | | | | | | | | | | | | | merge v2-prototypeFabio Berger2018-06-07291-2388/+2711
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Implement initial generateOrder function that given the scenario values for a...Fabio Berger2018-06-072-0/+244
* | | | | | | | | | | | | | | | | | | | | Merge pull request #766 from perissology/feature/solcov-ignoreFabio Berger2018-06-284-2/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | rename functionperissology2018-06-272-8/+8
| * | | | | | | | | | | | | | | | | | | | | add /*solcov ignore next*/ testsperissology2018-06-252-0/+52
| * | | | | | | | | | | | | | | | | | | | | support ignoring entire contractsperissology2018-06-251-7/+11
| * | | | | | | | | | | | | | | | | | | | | add ability to ignore covering specific code blocksperissology2018-06-232-2/+48
| | | | | | | | | | | | | | | | | | | | * | Changing provider to ledger more consistent with previous experiencefragosti2018-06-282-5/+5
| | | | | | | | | | | | | | | | | | | | * | Fix convention stufffragosti2018-06-282-20/+20
| | | | | | | | | | | | | | | | | | | | * | Remove IS_MAINNET_ENABLED configfragosti2018-06-284-74/+49
| | | | | | | | | | | | | | | | | | | | * | Rename all corresponding bools to shouldUseLedgerProviderfragosti2018-06-281-13/+13
| | | | | | | | | | | | | | | | | | | | * | Never use trackedTokenState when fetching new token statefragosti2018-06-271-6/+5
| | | | | | | | | | | | | | | | | | | | * | Fix bug where we are requesting tokens on a different networkfragosti2018-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | * | Remove unused variablesfragosti2018-06-274-24/+9
| | | | | | | | | | | | | | | | | | | | * | Make unsubscribing workfragosti2018-06-271-1/+5
| | | | | | | | | | | | | | | | | | | | * | Fix stateful ledger dialog edge statefragosti2018-06-272-2/+2
| | | | | | | | | | | | | | | | | | | | * | Get things working with legacy portalfragosti2018-06-271-10/+8
| | | | | | | | | | | | | | | | | | | | * | Fix subtle issues with ledger config dialogfragosti2018-06-273-11/+13
| | | | | | | | | | | | | | | | | | | | * | Ledger to metamask to ledger workingfragosti2018-06-273-42/+35
| | | | | | | | | | | | | | | | | | | | * | Have basic network switching workingfragosti2018-06-266-120/+158
| | | | | | | | | | | | | | | | | | | | * | Remove existing networkId watching logic from BlockchainWatcherfragosti2018-06-262-28/+15
| | | | | | | | | | | | | | | | | | | | | * Merge pull request #795 from 0xProject/miscellaneous-fixes/v2-exchange-regist...Jacob Evans2018-06-291-5/+26
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * Register the asset proxies to exchangeJacob Evans2018-06-291-5/+26
| | | | | | | | | | | | | | | | | | | | | |/
| | | | | | | | | | | | | | | | | | | | | * Remove network 50 detailsFabio Berger2018-06-286-48/+12
| | | | | | | | | | | | | | | | | | | | | * Re-generate and clean up artifacts for 2.0.0Fabio Berger2018-06-2823-5076/+1144
| | | | | | | | | | | | | | | | | | | | | * Add missing `AssetProxyOwner` from `compile:v2` commandFabio Berger2018-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | * Improve `ganache-core`'s `GanacheOpts` type and require it instead of `any`Fabio Berger2018-06-282-1/+3
| | | | | | | | | | | | | | | | | | | | | * Encode ZRX address as needed.Fabio Berger2018-06-283-2/+3
| | | | | | | | | | | | | | | | | | | | | * Add optimizer settings to `migrations` `compiler.json`Fabio Berger2018-06-281-0/+4
| | | | | | | | | | | | | | | | | | | | | * Update ganache-cli to latestFabio Berger2018-06-282-5/+23
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #763 from prettymuchbryce/invalid-argument-errorFabio Berger2018-06-279-7/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix tslintFabio Berger2018-06-271-2/+2
| * | | | | | | | | | | | | | | | | | | | Merge branch 'v2-prototype' into invalid-argument-errorFabio Berger2018-06-27115-4256/+3591
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | | | 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 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 forkAlex Browne2018-06-264-5/+54
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #760 from 0xProject/refactor/check-revert-reasonsFabio Berger2018-06-2716-140/+255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmou...Fabio Berger2018-06-271-2/+2
| * | | | | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #743 from 0xProject/feature/contracts/abi-encodedAmir Bandeali2018-06-2635-361/+478
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Document all the contract test options in READMEFabio Berger2018-06-251-3/+43
|/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-2512-66/+58
| * | | | | | | | | | | | | | | | Add missing importFabio Berger2018-06-251-1/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2546-908/+1178
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #735 from feuGeneA/metacoin-independenceLeonid Logvinov2018-06-252-3/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | 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 testJacob Evans2018-06-221-8/+4
| | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #698 from 0xProject/fix/contracts/using-libbytesRemco Bloemen2018-06-2325-700/+947
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | 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 barfragosti2018-06-232-5/+10
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge pull request #746 from 0xProject/feature/website/relayer-grid-polishFrancesco Agosti2018-06-2311-152/+138
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 01:18:54 +0800