aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert all changes to the contractsLeonid Logvinov2018-07-0514-360/+64
|
* Merge pull request #782 from 0xProject/feature/contract-wrappers-v2Leonid Logvinov2018-07-03113-11290/+6659
|\ | | | | @0xproject/contract-wrappers V2 refactor. Part 1
| * Fix build after rebaseLeonid Logvinov2018-06-292-3/+3
| |
| * Add a commentLeonid Logvinov2018-06-291-0/+2
| |
| * Assign true values to names varsLeonid Logvinov2018-06-291-8/+13
| |
| * Fix a typoLeonid Logvinov2018-06-291-1/+1
| |
| * Set the interval to 0 in awaitTranscationSuccessAsyncLeonid Logvinov2018-06-2910-34/+76
| |
| * Make promises dangerousLeonid Logvinov2018-06-293-3/+0
| |
| * Add a TODO commentLeonid Logvinov2018-06-291-0/+1
| |
| * Add isSubscriptionToken assertionLeonid Logvinov2018-06-294-0/+8
| |
| * Rename approved to approvedAddressLeonid Logvinov2018-06-291-2/+2
| |
| * Use removeUndefinedProperties for txOptsLeonid Logvinov2018-06-293-32/+55
| |
| * Rename getApprovedAsync to getApprovedIfExistsAsyncLeonid Logvinov2018-06-292-8/+11
| |
| * Add HACK commentsLeonid Logvinov2018-06-294-0/+8
| |
| * Add assertions for txOpts and methodOptsLeonid Logvinov2018-06-294-38/+75
| |
| * Remove v2 artifact scriptsLeonid Logvinov2018-06-291-4/+1
| |
| * Remove tokenTransferProxyAddress from configLeonid Logvinov2018-06-292-10/+6
| |
| * Add a hack commentLeonid Logvinov2018-06-291-0/+2
| |
| * 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 ↵Leonid Logvinov2018-06-291-21/+13
| | | | | | | | only decode logs from that contract
| * 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 ↵Leonid Logvinov2018-06-2912-61/+359
| | | | | | | | args after templates change
| * 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
| | | | | | | | contracts templates
| * 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}} ↵Leonid Logvinov2018-06-292-3/+3
| | | | | | | | to each event name (ERC721TransferEventArgs instead of TransferContractEventArgs)
| * 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
| | | | | | | | z_r_x and e_r_c with zrx and erc accordingly
| * Merge pull request #783 from 0xProject/miscenaleous-fixesFabio Berger2018-06-2931-5088/+1148
|/| | | | | Migration Related Miscellaneous fixes
| * 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 /docs
| * | 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
|\ \ | | | | | | Refactor Blockchain.ts to allow arbitrary provider state changes
| * \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-29134-4139/+4913
| |\ \ | |/ / |/| | | | | feature/website/support-new-metamask
* | | Merge pull request #762 from 0xProject/feature/website/scroll-to-tokenBrandon Millman2018-06-2912-35/+56
|\ \ \ | | | | | | | | Sort wallet tokens by timestamp added and scroll to newly added token
| * | | 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
|\ \ \ | | | | | | | | OrderFill Declarative Testing & Combinatorial Tests [Merge after #760]
| * | | 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
| * | | | 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
| * | | | | 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
| * | | | | | 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
| |\ \ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | | | | 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 ...
| * | | | | | | | | | Add ability for verbose loggingFabio Berger2018-06-201-2/+10
| | | | | | | | | | |
| * | | | | | | | | | Fix typoFabio Berger2018-06-191-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Rename NewOrderFactory to OrderFactoryFromScenario for clarityFabio Berger2018-06-192-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Remove hack in ERC20WrapperFabio Berger2018-06-197-12/+30
| | | | | | | | | | |
| * | | | | | | | | | Cleanup coreCombinatorialUtilsFabio Berger2018-06-191-220/+226
| | | | | | | | | | |
| * | | | | | | | | | Comments and cleanupFabio Berger2018-06-191-20/+8
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1995-581/+1154
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Prettier fix Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility Fix missed merge conflicts Fix additional versions and update yarn.lock Add OrderWatcherConfig type to 0x.js docs page Export OrderWatcherConfig from 0x.js Update all package versions to match latest published to NPM Update CHANGELOG's with publishes performed on development branch Rebase with latest removing PROXY_ID from transfer Split transfer impl and AssetProxyMixin change @0xproject/types to ethereum-types remove mistaken comment workaround for TypeScript trailing comma bug Document contract_templates
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1973-415/+1965
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Increase number of columns in relayer grid for small screens Make isValidSignature public Make batchFill methods return FIllResults struct Remove remove_tags script Small fixes Use semver package instead of getNextPatchVersion Use semver library instead of semverUtils small fixes Show all errors of a given kind at once rather then throwing after the first instance is encountered fix package.json Add more prepublish checks remove remove_tags script Create a shared Image component Adjust version in changelog Update RelayerGridTile render logic to incorportate colors and logos Add max width to top bar Set max-width for LargeLayout Finish last onboarding step Finish set allowance step Add onboarding assets ...
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-158-23/+132
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Run prettify Implement allowance and final flow step Render TokenAllowance Add utilities for getting tokens from tokensByAddress Wrap AllowanceToggle in redux container
| * | | | | | | | | | | | | Add ability to tweak the relevant balances/allowances for the maker and ↵Fabio Berger2018-06-154-78/+380
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | taker for a fillScenario. Convert more of the core tests to the declarative form.
| * | | | | | | | | | | | | - Refactor assetWrapper to contain more of the normalizing logic instead of ↵Fabio Berger2018-06-1510-84/+341
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | erc20Wrapper and erc721Wrapper - Add burn method to DummyERC721Token - Add additional methods to assetWrapper to set balance/allowances on ERC20 and ERC721 tokens - Use approve instead of approveAll for ERC721 tokens
| * | | | | | | | | | | | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert ↵Fabio Berger2018-06-145-60/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generateOrderCombinations to generateFillOrderCombinations
| * | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1429-38/+814
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (27 commits) Add back redirector behind feature flag Update minHeight in Text Use Text components in Values Use spread operator instead of React.createElement Fix issue with positions hash Revert localhost config Use Text in Teams Use Text in OpenPositions Use Text component for HeaderItem Remove FloatingImage Move FilledImage into components/ui Replace FlatButton with Button in Retry Fix incorrect colors Add font family to Button component and use in Join0x component Consolidate jobs page grey colors with shared colors Fix lint errors Remove extra packages Implement small open positions Implement large screen open positions Teams section ...
| * | | | | | | | | | | | | | Use a defaultFillScenario in fillOrder testsFabio Berger2018-06-141-36/+39
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix incorrect string values in enumFabio Berger2018-06-141-2/+2
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix calculation of expFilledTakerAmount and expected values in events emittedFabio Berger2018-06-141-4/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Replace initial set of legacy manually written fillOrder tests with ↵Fabio Berger2018-06-142-434/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | declarative FillScenario tests
| * | | | | | | | | | | | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ↵Fabio Berger2018-06-144-35/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FillScenario
| * | | | | | | | | | | | | | Fix divide by zero bugFabio Berger2018-06-141-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move orderFill combinatorialTests to exchange folderFabio Berger2018-06-131-4/+4
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1364-1015/+1931
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (26 commits) Rename _coverageCollector -> _profilerCollector in TraceCollectionSubprovider Refactor sol-cov to de-duplicate code for coverage and profiling Rename popByte and popAddress Hard code test addresses/bytes32 instead of generating pseudorandom ones Update artifacts Rename computeCoverageAsync -> computeSingleTraceCoverageAsync Fix linter errors Refactor sol-cov to avoid keeping traceInfo in memory Unpop byte rather than making deep copy Pass gas in to marketBuyOrdersNoThrow Looks up the memory location of makerAssetData/takerAssetData Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA Add tests for deepCopyBytes and missing write methods from LibBytes Pop id from assetData before dispatching to AssetProxies Upgrade solidity-parser-entlr 0.2.11 => 0.2.12 Fix import order Fix typos Add CHANGELOGs Speed-up sol-cov Increase delay when sending transactions during devnet startup ...
| * | | | | | | | | | | | | | | Implement initial set of orderFill combinatorial testsFabio Berger2018-06-1313-490/+784
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper ↵Fabio Berger2018-06-134-9/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | superset
| * | | | | | | | | | | | | | | Remaining refactors of order-utils components for V2Fabio Berger2018-06-135-46/+48
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | For some reason order-watcher tests were timeing out so I increased the ↵Fabio Berger2018-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeout limit
| * | | | | | | | | | | | | | | Remove comment since we have added the testsFabio Berger2018-06-131-5/+0
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Variable rename for clarityFabio Berger2018-06-131-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-12176-1101/+3564
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (68 commits) Stop exporting ArtifactWriter Fix no-unused-variable tslint rule to include parameters and fix issues Fix linter exclude rule Validate all signature types rather then only ECSignatures Store the instantiated OrderValidationUtils Remove global hooks from tests and deploy contracts from within the specific tests Add EmitStatement to ASTVisitor Fix tslint issues Add back artifacts file Fix a bug in SolCompilerArtifacts adapter config overriding Move OrderValidationUtils (+ tests) and ExchangeTransferSimulator to order-utils export parseECSignature method Export ArtifactWriter from migrations package Remove unused artifact file Pass in generated contract wrapper to orderValidationUtils at instantiation Refactor orderValidationUtils to use the generated contract wrapper instead of the higher-level one Refactor ExchangeTransferSimulator public interface to accet an AbstractBalanceAndProxyAllowanceLazyStore so that this module could be re-used in different contexts. Increase timeout for contract migrations Remove some copy-paste code Await transactions in migrations ...
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-0845-84/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix linter issue Fix linter issue Fix tslint issues Fix missing paths Fixed path Use source-map-support package to include correct line numbers in mocha move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix/order-utils/remaining-v2-changes' into ↵Fabio Berger2018-06-087-55/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/combinatorial-testing * fix/order-utils/remaining-v2-changes: Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'fix/order-utils/remaining-v2-changes' into ↵Fabio Berger2018-06-085-183/+201
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/combinatorial-testing * fix/order-utils/remaining-v2-changes: Revert to returning orderState on invalid order - Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary.
| * | | | | | | | | | | | | | | | | | | 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 ↵Fabio Berger2018-06-072-0/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an order, generates the actual order.
* | | | | | | | | | | | | | | | | | | | | Merge pull request #766 from perissology/feature/solcov-ignoreFabio Berger2018-06-284-2/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [sol-cov] add ability to ignore covering specific code blocks
| * | | | | | | | | | | | | | | | | | | | | 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 ↵Jacob Evans2018-06-291-5/+26
| | | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/miscellaneous-fixes/v2-exchange-register-assets Register the asset proxies to exchange
| | | | | | | | | | | | | | | | | | | | | | * 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 OrderWatcher uncaught Error
| * | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | |