aboutsummaryrefslogtreecommitdiffstats
path: root/packages
Commit message (Collapse)AuthorAgeFilesLines
* combine changelog entries since we haven't published yetFabio Berger2018-07-022-10/+5
|
* version outdatedFabio Berger2018-07-021-1/+1
|
* Throw if changelog version is below package.json versionFabio Berger2018-07-021-0/+3
|
* Update outdated changelogsFabio Berger2018-07-024-2/+23
|
* Fix bug where 18 decimal tokens instead of 5 decimal tokens createdFabio Berger2018-07-021-1/+1
|
* Disable custom-no-magic-number for blockFabio Berger2018-07-021-0/+2
|
* Remove unused variableFabio Berger2018-07-021-1/+0
|
* Merge branch 'v2-prototype' into fix/five_decimal_scenarioFabio Berger2018-07-02201-1991/+5671
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (75 commits) Update relayer grid tiles to use Text Fix build Update file structure Update 2.0.0 artifacts Move ledgerhq module declarations to typescript-typings Export LedgerEthereumClient type in subproviders Update artifacts Add logging and updated artifacts Fix migrations Run prettier Add Kovan artifacts Use ledger subprovider Add Kovan migrations Remove state variable from Link component in Portal Make registerAssetProxy append only Update staging api link Change getTransactionReceipt to awaitTransactionMined Move /docs route to the end Remove extra call to scrollIntoView for wallet in onboarding Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes ...
| * Update relayer grid tiles to use TextBrandon Millman2018-07-012-50/+17
| |
| * Fix buildAmir Bandeali2018-06-307-31/+31
| |
| * Update file structureAmir Bandeali2018-06-30125-199/+195
| |
| * Merge pull request #770 from 0xProject/feature/migrations/kovan-deployAmir Bandeali2018-06-3025-227/+3803
| |\ | | | | | | Add Kovan migrations
| | * Update 2.0.0 artifactsAmir Bandeali2018-06-305-149/+99
| | |
| | * Move ledgerhq module declarations to typescript-typingsAmir Bandeali2018-06-307-79/+59
| | |
| | * Export LedgerEthereumClient type in subprovidersAmir Bandeali2018-06-304-49/+19
| | |
| | * Update artifactsAmir Bandeali2018-06-304-12/+26
| | |
| | * Add logging and updated artifactsAmir Bandeali2018-06-305-32/+45
| | |
| | * Fix migrationsAmir Bandeali2018-06-307-3451/+3402
| | |
| | * Run prettierAmir Bandeali2018-06-304-3369/+3442
| | |
| | * Add Kovan artifactsAmir Bandeali2018-06-304-0/+3373
| | |
| | * Use ledger subproviderAmir Bandeali2018-06-3013-46/+159
| | |
| | * Add Kovan migrationsAmir Bandeali2018-06-3010-13/+152
| | |
| * | Merge pull request #787 from 0xProject/feature/website/portal-onboarding-polishFrancesco Agosti2018-06-3019-360/+354
| |\ \ | | |/ | |/| Portal v2 onboarding polish
| | * Remove state variable from Link component in Portalfragosti2018-06-301-4/+1
| | |
| | * Remove extra call to scrollIntoView for wallet in onboardingfragosti2018-06-301-4/+0
| | |
| | * Bump automatic show onborading delay by 1000msfragosti2018-06-301-1/+1
| | |
| | * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-3058-5503/+1792
| | |\ | | | | | | | | | | | | feature/website/portal-onboarding-polish
| | * | Fix onboarding always startingfragosti2018-06-301-1/+2
| | | |
| | * | Rename userHasAllowances bool to follow proper conventionfragosti2018-06-302-6/+6
| | | |
| | * | Allow you to continue the onboarding flow once youve installed metamask and ↵fragosti2018-06-305-17/+18
| | | | | | | | | | | | | | | | refreshed the page
| | * | Use Image component where relevant and add back tracked token timestamp logicfragosti2018-06-303-8/+24
| | | |
| | * | Bold all balances in onboardingfragosti2018-06-292-6/+8
| | | |
| | * | Customize allowance setting onboarding step if you have your allowances setfragosti2018-06-292-0/+4
| | | |
| | * | Re-center react-popper on every stepfragosti2018-06-292-16/+4
| | | |
| | * | Fix button hover and active hover statefragosti2018-06-291-1/+1
| | | |
| | * | Show eth balance in add eth balance onboarding stepfragosti2018-06-293-11/+16
| | | |
| | * | Change onboarding flow to communicate 3 stepsfragosti2018-06-292-6/+10
| | | |
| | * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-2948-1012/+2580
| | |\ \ | | | | | | | | | | | | | | | feature/website/portal-onboarding-polish
| | * | | Scroll to top when going to relayers page from onboardingfragosti2018-06-281-0/+1
| | | | |
| | * | | Bring you directly to relayers page once you finish onboardingfragosti2018-06-283-1/+14
| | | | |
| | * | | Remove period in title from last stepfragosti2018-06-281-1/+1
| | | | |
| | * | | Always restart onboarding from 0 and other small improvementsfragosti2018-06-282-3/+5
| | | | |
| | * | | Customize flow depending on what steps you've completedfragosti2018-06-284-20/+43
| | | | |
| | * | | Break wrapping ETH into a 3rd stepfragosti2018-06-282-5/+24
| | | | |
| | * | | Fix animation when coming from bottomfragosti2018-06-281-0/+6
| | | | |
| | * | | Fix width issue with onboarding card on mobilefragosti2018-06-282-1/+3
| | | | |
| | * | | Clicking overlay closes onboardingfragosti2018-06-284-6/+12
| | | | |
| | * | | Fix z index issue with wrap buttons and onboarding cardsfragosti2018-06-282-1/+2
| | | | |
| | * | | Break wrath ETH step into 2fragosti2018-06-283-70/+72
| | | | |
| | * | | Fix skip button position on first stepfragosti2018-06-281-11/+15
| | | | |
| | * | | Make onboarding bounce around lessfragosti2018-06-282-13/+5
| | | | |
| | * | | Scroll to wallet when onboarding automatically starts as wellfragosti2018-06-281-1/+4
| | | | |
| | * | | Change asset for final onboarding stepfragosti2018-06-281-217/+122
| | | | |
| * | | | Make registerAssetProxy append onlyAmir Bandeali2018-06-3012-203/+68
| | | | |
| * | | | Update staging api linkBrandon Millman2018-06-301-1/+1
| | | | |
| * | | | Merge pull request #793 from 0xProject/feature/contracts/transferFromFallbackAmir Bandeali2018-06-3012-383/+437
| |\ \ \ \ | | | | | | | | | | | | Optimize transferFrom (saves ~2000 gas /fill)
| | * | | | Change getTransactionReceipt to awaitTransactionMinedAmir Bandeali2018-06-301-1/+1
| | | | | |
| | * | | | Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codesAlex Browne2018-06-302-27/+38
| | | | | |
| | * | | | Fix deployment to gethAmir Bandeali2018-06-302-7/+6
| | | | | |
| | * | | | Fix testsAmir Bandeali2018-06-306-79/+146
| | | | | |
| | * | | | Remove transferFrom, implement in fallback functionAmir Bandeali2018-06-306-290/+267
| | | |_|/ | | |/| |
| * / | | Move /docs route to the endBrandon Millman2018-06-301-1/+1
| |/ / /
| * | | Merge pull request #792 from 0xProject/feature/website/wallet-polishBrandon Millman2018-06-3024-397/+585
| |\ \ \ | | | | | | | | | | Various wallet polish items
| | * | | Change function to a constBrandon Millman2018-06-301-2/+2
| | | | |
| | * | | Move wallet scrollIntoView into PortalOnboardingFlowBrandon Millman2018-06-302-7/+7
| | | | |
| | * | | Add dollar sign to NullTokenRowBrandon Millman2018-06-291-1/+1
| | | | |
| | * | | Remove unused imports and variablesBrandon Millman2018-06-295-20/+1
| | | | |
| | * | | Refactor inline styles out of WalletBrandon Millman2018-06-296-132/+139
| | | | |
| | * | | Remove some hardcoded MetaMask colorsBrandon Millman2018-06-292-3/+5
| | | | |
| | * | | Create AccountConnection componentBrandon Millman2018-06-293-31/+61
| | | | |
| | * | | Fix scrollbar bugBrandon Millman2018-06-291-1/+1
| | | | |
| | * | | Start onboarding from relayer indexBrandon Millman2018-06-291-6/+20
| | | | |
| | * | | Fix learn how to set up account layoutBrandon Millman2018-06-292-11/+13
| | | | |
| | * | | Fix typoBrandon Millman2018-06-291-1/+1
| | | | |
| | * | | Get rid of unused stuff in walletBrandon Millman2018-06-291-65/+1
| | | | |
| | * | | Fix body overlay on mobileBrandon Millman2018-06-292-3/+3
| | | | |
| | * | | Change learn how to update your account stylingBrandon Millman2018-06-291-27/+17
| | | | |
| | * | | Fix key issue and remove WalletDisconnectedItemBrandon Millman2018-06-292-112/+1
| | | | |
| | * | | Implement new locked and uninstalled statesBrandon Millman2018-06-297-7/+178
| | | | |
| | * | | Fix off center icon in walletBrandon Millman2018-06-291-4/+7
| | | | |
| | * | | Change wallet margin based on hover to prevent re-layoutBrandon Millman2018-06-291-0/+1
| | | | |
| | * | | Update ProviderDisplay with new designBrandon Millman2018-06-295-37/+118
| | | | |
| | * | | Implement provider name in headerBrandon Millman2018-06-292-4/+18
| | | | |
| | * | | Implement loading body rowsBrandon Millman2018-06-294-28/+80
| | | | |
| | * | | Added Circle componentBrandon Millman2018-06-293-6/+21
| | | | |
| * | | | Merge pull request #774 from 0xProject/style/contracts/abiEncodeAsmCommentsAmir Bandeali2018-06-302-0/+22
| |\ \ \ \ | | | | | | | | | | | | Added some comments for ASM hashing
| | * | | | Updated hashing comments as-per PRGreg Hysen2018-06-291-9/+4
| | | | | |
| | * | | | Comments for ASM hashingGreg Hysen2018-06-262-0/+27
| | | | | |
| * | | | | Merge pull request #794 from 0xProject/fix/devnet-minimum-blocksAlex Browne2018-06-303-22/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | Improve reliability of the minimum block number hack for devnet/geth
| | * | | | | Add @0xproject/utils as dependency to dev-utils/package.jsonAlex Browne2018-06-291-0/+1
| | | | | | |
| | * | | | | Improve reliability of the minimum block number hack for the devnet/gethAlex Browne2018-06-292-22/+39
| | | |/ / / | | |/| | |
* | | | | | Add commented out scenarios not run by defaultFabio Berger2018-07-021-16/+82
| | | | | |
* | | | | | Fix commentFabio Berger2018-07-021-2/+1
| | | | | |
* | | | | | Fix validation logic by checking for 0 maker/taker amount before 0 ↵Fabio Berger2018-07-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | fillTakerAssetAmount since one causes the other during combinatorial testing
* | | | | | Print out entire orderFill scenarioFabio Berger2018-07-021-7/+1
| | | | | |
* | | | | | Transfer ERC721 token instead of burning, so we can still set an allowance ↵Fabio Berger2018-07-021-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | to it in tests
* | | | | | Fix bug where using nullAddress for order instead of actual taker addressFabio Berger2018-07-021-11/+3
| | | | | |
* | | | | | Add maker and taker balance/allowance scenarios to generateFillOrderCombinationFabio Berger2018-07-021-8/+24
|/ / / / /
* | | | | Merge v2-prototypeFabio Berger2018-06-2952-1014/+2684
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix NotFound component and render 0x.js docs for /docsBrandon Millman2018-06-293-3/+5
| |/ / /
| * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-29132-4133/+4839
| |\ \ \ | | | | | | | | | | | | | | | feature/website/support-new-metamask
| | * | | 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-2761-3136/+1866
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | | | | | | |
| | | * | | | | 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-2515-129/+235
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-25177-1732/+3341
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-2047-350/+1165
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1994-492/+1087
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1363-1012/+1928
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-12175-1082/+3542
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0841-79/+80
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-07286-2348/+2687
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Fix tslintFabio Berger2018-06-271-2/+2
| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'v2-prototype' into invalid-argument-errorFabio Berger2018-06-27113-4252/+3537
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Improve 'web3-provider-engine' typingsNikita Galkin2018-06-272-1/+18
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix buildAmir Bandeali2018-06-274-0/+389
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | 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-275-14/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change metamask install link based on browser
| | * | | | | | | | | | | | | | | | | | | | Change metamask install link based on browserBrandon Millman2018-06-265-14/+57
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #776 from 0xProject/ethereum-js-tx-1.3.5Alex Browne2018-06-272-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Use ethereumjs-tx@1.3.5 instead of our fork
| | * | | | | | | | | | | | | | | | | | | Use ethereumjs-tx@1.3.5 instead of our forkAlex Browne2018-06-262-2/+2
| | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | / / Document all the contract test options in READMEFabio Berger2018-06-251-3/+43
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-2512-66/+58
| | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 22:47:28 +0800