aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src
Commit message (Collapse)AuthorAgeFilesLines
* Change withdrawERC20 => withdrawAsset, reuse transfer logicAmir Bandeali2018-08-104-18/+15
|
* Make marketBuy functions revert if entire amount not filledAmir Bandeali2018-08-105-98/+29
|
* Revert incrementing memory ptr in dispatchTransferFromAmir Bandeali2018-08-093-9/+3
|
* Test abiEncodeFillOrder as part of combinatorial follOrder testsAmir Bandeali2018-08-091-0/+1
|
* Increment free memory pointer for internal Exchange functions that use asmAmir Bandeali2018-08-093-12/+34
|
* fix comments and styling for MixinSignatureValidatorAmir Bandeali2018-08-091-4/+9
|
* Use asm for hashEIP712Message, increment free memory pointer after asm ↵Amir Bandeali2018-08-092-9/+28
| | | | hashing functions
* Fix comments, styling, and optimize hashOrderAmir Bandeali2018-08-083-25/+33
|
* Add combinatorial tests for internal Exchange functions (#807)Alex Browne2018-07-272-1/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP add combinatorial tests for internal Exchange functions * Change combinitorial testing strategy based on feedback * Check value of filled[orderHash] in updateFilledState tests * Add combinatorial tests for addFillResults * Add combinatorial tests for getPartialAmount * Implement generic `testWithReferenceFuncAsync` * Implement generic `testCombinatoriallyWithReferenceFuncAsync` * Add combinatorial tests for isRoundingError * Add combinatorial tests for calculateFillResults * Add support for Geth in internal contract tests * Fix contract artifacts * Change DECIMAL_PLACES to 78 and add a note. * Document new functions in utils * Optimize tests by only reseting state when needed * Rename/move some files * Print parameter names on failure in testWithReferenceFuncAsync * Add to changelog for utils package * Appease various linters * Rename some more things related to FillOrderCombinatorialUtils * Remove .only from test/exchange/internal.ts * Remove old test for isRoundingError and getPartialAmount * Appease linters again * Remove old todos * Fix typos, add comments, rename some things * Re-add some LibMath tests * Update contract internal tests to use new SafeMath revert reasons * Apply PR feedback from Amir * Apply PR feedback from Remco * Re-add networks to ZRXToken artifact * Remove duplicate Whitelist in compiler.json
* Modify WETH9 event arg names to be identical to ERC20 standard suggested namesFabio Berger2018-07-261-4/+4
|
* Update orderEpoch commentsAmir Bandeali2018-07-252-2/+2
|
* Remove ERC721 callback functionsAmir Bandeali2018-07-234-49/+3
|
* Use != instead of > in loops, add sanity checks to market fill functionsAmir Bandeali2018-07-232-18/+18
|
* Add more tests and fixesAmir Bandeali2018-07-235-5/+8
|
* Remove MConstants and MixinConstants for LibConstantsAmir Bandeali2018-07-238-57/+23
|
* Remove redundant external call by reimplementing fillOrderNoThrowAmir Bandeali2018-07-236-166/+355
|
* Remove orders length checkAmir Bandeali2018-07-232-11/+0
|
* Add assertValidFillResultsAmir Bandeali2018-07-231-61/+88
|
* Store orders length in varible before looping over ordersAmir Bandeali2018-07-232-14/+25
|
* Use transferFrom instead of safeTransferFromAmir Bandeali2018-07-231-5/+2
|
* Fix rounding error issues, use different logic when makerAsset is ZRXAmir Bandeali2018-07-236-52/+95
|
* Rename marketSellEth => marketSellWethAmir Bandeali2018-07-232-3/+3
|
* Update percentage constantsAmir Bandeali2018-07-233-17/+18
|
* Update transferEthFeeAndRefund, add check to ERC721 transferAmir Bandeali2018-07-236-26/+54
|
* Refactor forwarding contract architecture, remove batch functionsAmir Bandeali2018-07-2320-1038/+572
|
* Add tests to verify ZRX_ASSET_DATAAmir Bandeali2018-07-231-0/+57
|
* Add comments for deploying with constant ZRX_ASSET_DATAAmir Bandeali2018-07-232-2/+15
|
* Move example contracts into new examples dirAmir Bandeali2018-07-236-6/+11
|
* Merge pull request #877 from 0xProject/feature/contracts/removeERC721CallbackAmir Bandeali2018-07-233-79/+25
|\ | | | | Removed receiverData and `onReceive` callback from ERC721 proxy.
| * Removed receiverData from ERC721 Proxy Id generationGreg Hysen2018-07-183-6/+4
| |
| * Removed receiverData and `onReceive` callback from ERC721 proxy.Greg Hysen2018-07-181-73/+21
| |
* | Hard code fillOrder selector into abiEncodeFillOrderAmir Bandeali2018-07-201-7/+4
| |
* | Returns byte array instead of memory range for encoding fillOrder calldataGreg Hysen2018-07-202-24/+26
| |
* | Created LibAbiEncoder with `fillOrderNoThrow`Greg Hysen2018-07-202-170/+235
|/
* Reorder checks in getOrderInfoAmir Bandeali2018-07-181-7/+9
|
* Add getOrdersInfo functionAmir Bandeali2018-07-182-0/+24
|
* Remove extra ERC20ProxyId from Forwarder constructorJacob Evans2018-07-111-1/+0
|
* Add Migrations for ForwarderJacob Evans2018-07-111-2/+2
|
* Add revert reasons and optimization to safeMathAmir Bandeali2018-07-111-3/+15
|
* Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytesAmir Bandeali2018-07-113-10/+43
|
* Move functions out of Forwarder.solAmir Bandeali2018-07-0812-42/+35
|
* Add interfaces and mixinsAmir Bandeali2018-07-0816-61/+573
|
* Combine mixinsAmir Bandeali2018-07-086-284/+218
|
* Use interfaces instead of full contractsAmir Bandeali2018-07-084-7/+39
|
* Remove TODOs that won't be addressedAmir Bandeali2018-07-074-10/+3
|
* Remove AbiV2 where unusedAmir Bandeali2018-07-0723-38/+27
|
* Only reset currentContextAddress if it was previously updatedAmir Bandeali2018-07-071-8/+11
|
* Change uint => uint256Amir Bandeali2018-07-071-8/+7
|
* Apply new linter rulesAmir Bandeali2018-07-0773-298/+350
|
* Merge pull request #522 from 0xProject/feature/contracts/forwarderJacob Evans2018-07-0611-1/+1102
|\ | | | | Forwarding contract
| * Forwarding contract (squashed commits)Jacob Evans2018-07-0611-1/+1102
| |
* | Contracts 2.0.0 were linted with solhintAlex Shafranovich2018-07-0660-1/+78
|/
* Update file structureAmir Bandeali2018-06-30107-3375/+1
|
* Make registerAssetProxy append onlyAmir Bandeali2018-06-306-60/+25
|
* Change getTransactionReceipt to awaitTransactionMinedAmir Bandeali2018-06-301-1/+1
|
* Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codesAlex Browne2018-06-301-6/+35
|
* Fix deployment to gethAmir Bandeali2018-06-301-1/+1
|
* Fix testsAmir Bandeali2018-06-303-7/+10
|
* Remove transferFrom, implement in fallback functionAmir Bandeali2018-06-306-290/+267
|
* 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
| |
* | Remove unused constantsFabio Berger2018-06-281-2/+0
| |
* | Reduce the userAddresses to the individual addresses actually used by tests, ↵Fabio Berger2018-06-281-1/+2
| | | | | | | | 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-2712-517/+312
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Make dispatchTransferFrom revert with reason from AssetProxy on failureAmir Bandeali2018-06-271-5/+4
| | |
| * | Remove redundant files, hard code function selector in dispatchTransferFrom, ↵Amir Bandeali2018-06-2713-701/+198
| | | | | | | | | | | | 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
| | |
* | | Fix type issueFabio Berger2018-06-271-2/+2
| | |
* | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testingFabio Berger2018-06-271-1/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Expect RevertReason be passed in, not stringFabio Berger2018-06-261-1/+5
| | |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2623-202/+370
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts
* | | | Update AbstractAssetWrapperFabio Berger2018-06-261-1/+1
| | | |
* | | | Fix merge issuesFabio Berger2018-06-264-16/+17
| | | |
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2623-202/+370
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-2613-84/+82
| | | |
| * | | 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
| | | |
| * | | Fix testsAmir Bandeali2018-06-261-16/+0
| | | |
| * | | Fix ERC721Proxy TokenIdRemco Bloemen2018-06-261-1/+1
| | | |
| * | | WIPRemco Bloemen2018-06-262-2/+2
| | | |
| * | | ABI encoded asset dataRemco Bloemen2018-06-269-29/+51
| | | |
| * | | Remove proxyId argument from dispatchTransferFromRemco Bloemen2018-06-266-34/+16
| | |/ | |/|
* | | Prettier fixesFabio Berger2018-06-261-4/+1
| | |
* | | Fix tslint issuesFabio Berger2018-06-264-18/+3
| | |
* | | Check revert reasons in declarative and combinatorial testsFabio Berger2018-06-251-7/+8
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-251-44/+0
|\ \ \ | | |/ | |/|
| * | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-251-44/+0
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-255-21/+63
|\| |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2519-340/+424
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Rename ContractLibErrors to RevertReasonsFabio Berger2018-06-231-1/+1
| | |
| * | Remove revert reason 'Exchange' prefixFabio Berger2018-06-231-2/+2
| | |
| * | Move constants over to ContractLibError enum and update all testsFabio Berger2018-06-232-15/+10
| | |
| * | Standardize ERC20 error strings given conventionFabio Berger2018-06-231-3/+2
| | |
| * | Fix test now that contract reverts with messageFabio Berger2018-06-221-0/+1
| | |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-223-27/+48
| |\ \ | | | | | | | | | | | | | | | | * v2-prototype: Check that assetProxy exists before attempting transfer
| * | | Change Whitelist error messages to conform to rest and added revert reason ↵Fabio Berger2018-06-222-5/+7
| | | | | | | | | | | | | | | | checks to transactions tests
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2226-352/+454
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Use make-promises-safe as a preloader instead of manually importing Updated compiler runs to be 1,000,000 Add event to setSignatureValidatorApproval, rename signer => signerAddress accross all contracts Add senderAddress to Fill and Cancel logs, add comments to events and types Fix Island component Add missing image assets for Chris and Mel Fix some bugs in sol-cov Remove unreachable PreSigned check Fix linting Buttons look hella disabled now Remove border radius, fix width issue for unlock step Add Chris and Mel to about page fix linter issues only call getLocationByOffset if source if defined Set settleOrder and settleMatchedOrders to private Prevent prettier issue Support mobile friendly onboarding flows Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `settleMatchedOrders` into `MixinMatchOrders` Migrations after rebasing Linter ...
| * | | | Check revert reasons in Authorizable testsFabio Berger2018-06-211-0/+1
| | | | |
| * | | | Change revert reason in ownable to be similar to all other revert reasonsFabio Berger2018-06-211-1/+1
| | | | |
| * | | | Update core tests to actually check revert messageFabio Berger2018-06-212-0/+44
| | | | |
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2538-703/+910
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | Fix typos in commentsRemco Bloemen2018-06-231-2/+2
| | | | |
| * | | | Add modifier and tests for removeAuthorizedAddressAtIndexAmir Bandeali2018-06-232-2/+10
| | | | |
| * | | | Update and add testsAmir Bandeali2018-06-232-3/+5
| | | | |
| * | | | Change removeAuthorizedAddress => removeAuthorizedAddressAtIndexAmir Bandeali2018-06-232-13/+22
| | | | |
| * | | | Move isFunctionRemoveAuthorizedAddress to testRemco Bloemen2018-06-233-14/+50
| | | | |
| * | | | 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-233-11/+18
| | | | |
| * | | | Fix LibBytes.equalsRemco Bloemen2018-06-231-21/+4
| | | | |
| * | | | Add trailing garbage testcase for LibBytes.equalsRemco Bloemen2018-06-231-0/+11
| | | | |
| * | | | Rename bytes.equalsRemco Bloemen2018-06-232-2/+37
| | | | |
| * | | | Add slice and sliceDestructiveRemco Bloemen2018-06-231-0/+46
| | | | |
| * | | | Rename bytes.rawAddress and add bytes.contentAddressRemco Bloemen2018-06-232-8/+25
| | | | |
| * | | | Rename read/writeBytesWithLengthRemco Bloemen2018-06-233-7/+7
| | | | |
| * | | | Using LibBytes for bytesRemco Bloemen2018-06-236-26/+38
| | | | |
| * | | | Make LibBytes a libraryRemco Bloemen2018-06-236-35/+30
| | | | |
| * | | | Merge LibMem and LibBytesRemco Bloemen2018-06-236-206/+150
| | | | |
| * | | | Merge pull request #749 from 0xProject/feature/contracts/transactionHashAsmAmir Bandeali2018-06-231-8/+18
| |\ \ \ \ | | |_|_|/ | |/| | | Converted `hashZeroExTransaction` to assembly. Saves 1k gas
| | * | | Apply mask to address to zero-out unused bytes.Greg Hysen2018-06-231-1/+1
| | | | |
| | * | | Converted `hashZeroExTransaction` to assembly. Saves 1k gasGreg Hysen2018-06-221-8/+18
| | | |/ | | |/|
| * | | Merge pull request #748 from 0xProject/fix/contracts/nullAssetProxyFabio Berger2018-06-223-27/+48
| |\ \ \ | | |/ / | |/| | Check that assetProxy exists before attempting transfer
| | * | Check that assetProxy exists before attempting transferAmir Bandeali2018-06-223-27/+48
| | | |
| * | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ↵Amir Bandeali2018-06-2214-68/+94
| | | | | | | | | | | | | | | | accross all contracts
| * | | Add senderAddress to Fill and Cancel logs, add comments to events and typesAmir Bandeali2018-06-224-44/+45
| |/ /
| * | Remove unreachable PreSigned checkAustin Roberts2018-06-221-4/+0
| | | | | | | | | | | | This code was unreachable, as it had the exact same condition as line 206.
| * | Set settleOrder and settleMatchedOrders to privateGreg Hysen2018-06-214-25/+2
| | |
| * | Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and ↵Greg Hysen2018-06-218-238/+205
| | | | | | | | | | | | `settleMatchedOrders` into `MixinMatchOrders`
| * | Renamed constants in test wallet/validatorGreg Hysen2018-06-212-11/+11
| | |
| * | Few more minor #nit wording changesGreg Hysen2018-06-212-5/+5
| | |
| * | Fixed two mislabelled revert reasons + Signature Validator revert tests ↵Greg Hysen2018-06-212-2/+7
| | | | | | | | | | | | working on Geth
| * | Minor style tweaksGreg Hysen2018-06-213-8/+8
| | |
| * | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported ↵Greg Hysen2018-06-216-11/+141
| |/ | | | | | | types. Fixed trezor prefix.
* | Add support for approveAll in assetWrapper and fillOrderScenariosFabio Berger2018-06-213-4/+41
| |
* | 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-202-38/+45
| | | | | | | | 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-2015-82/+301
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (22 commits) Fix closing parens in liborder Update after rebase ERC721Proxy Always call safeTransferFrom Rename makerEpoch => orderEpoch Make cancelOrdersUpTo compatible with sender abstraction Update PR template Use Image component instead of img tag Assembler orderHash function Optimize and remove redundant encodePacked Fix linting issue Fix bug where we do fetch balances on wallet login Check network state immediately instead of waiting for delay Fix onboarding persisting when changing routes Consolidate account state messaging logic Only elevate wallet zIndex when onboarding is in progress Rebase and update feedback Run linter Add Portal v2 logging Simplified handling of source < 32 edge case Basic EIP712 encoder ...
| * Merge pull request #637 from 0xProject/bug/contracts/eip712-191-prefixJacob Evans2018-06-206-42/+159
| |\ | | | | | | Add missing EIP191 prefix for EIP712 and Execute Transaction
| | * Fix closing parens in liborderJacob Evans2018-06-201-16/+15
| | |
| | * Assembler orderHash functionRemco Bloemen2018-06-191-18/+22
| | |
| | * Optimize and remove redundant encodePackedJacob Evans2018-06-194-13/+23
| | |
| | * Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefixJacob Evans2018-06-1846-311/+1056
| | |\
| | * | Rebase and update feedbackJacob Evans2018-06-184-81/+85
| | | | | | | | | | | | | | | | | | | | | | | | Cache the domain separator data with address this Use the EIP712Types enum for types everywhere Rename EIP712 struct ExecuteTransaction to ZeroExTransaction
| | * | Basic EIP712 encoderJacob Evans2018-06-081-10/+11
| | | |
| | * | Update Order utils to use eip712Jacob Evans2018-06-067-170/+44
| | | |
| | * | Add missing EIP191 prefix for EIP712Jacob Evans2018-06-059-48/+272
| | | |
| * | | Update after rebaseJacob Evans2018-06-201-7/+1
| | | |
| * | | Rename makerEpoch => orderEpochAmir Bandeali2018-06-205-26/+29
| | | |
| * | | Make cancelOrdersUpTo compatible with sender abstractionAmir Bandeali2018-06-205-7/+110
| | | |
| * | | Merge pull request #683 from 0xProject/fix/contracts/memcpyRemco Bloemen2018-06-191-10/+12
| |\ \ \ | | | | | | | | | | Simplified handling of source < 32 edge case
| | * | | Simplified handling of source < 32 edge caseRemco Bloemen2018-06-111-10/+12
| | | | |
* | | | | 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-191-6/+6
| | | | |
* | | | | 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-196-129/+206
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 pull request #659 from ↵Jacob Evans2018-06-196-129/+206
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/contracts/split-proxy-internal-logic Split transfer implementation and AssetProxyMixin
| | * | | | Rebase with latest removing PROXY_ID from transferJacob Evans2018-06-185-95/+111
| | | | | |
| | * | | | Split transfer impl and AssetProxyMixinJacob Evans2018-06-184-95/+156
| | | |_|/ | | |/| |
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-198-30/+104
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | | Make isValidSignature publicAmir Bandeali2018-06-193-15/+15
| | | | |
| * | | | Make batchFill methods return FIllResults structAmir Bandeali2018-06-192-10/+28
| |/ / /
| * | | Merge pull request #700 from 0xProject/fix/contracts/tokenbugsRemco Bloemen2018-06-161-1/+29
| |\ \ \ | | | | | | | | | | Handle tokens that do not return bool
| | * | | Handle tokens that do not return boolRemco Bloemen2018-06-141-1/+29
| | | | |
| * | | | Change wording of error message when you try to use more than one subproviderAlex Browne2018-06-151-1/+1
| | | | |
| * | | | Fix linter errors and remove coverage.jsonAlex Browne2018-06-151-2/+1
| | | | |
| * | | | Remove unused variables and other small fixesAlex Browne2018-06-151-5/+6
| | | | |
| * | | | Fix a bug in revert_trace.tsAlex Browne2018-06-151-23/+23
| | | | |
| * | | | Introduce subprovider for printing revert stack tracesAlex Browne2018-06-152-22/+50
| |/ / /
* | | | Add ability to tweak the relevant balances/allowances for the maker and ↵Fabio Berger2018-06-152-35/+323
| | | | | | | | | | | | | | | | 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-156-72/+311
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-143-43/+48
| | | | | | | | | | | | | | | | generateOrderCombinations to generateFillOrderCombinations
* | | | 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
| | | |
* | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ↵Fabio Berger2018-06-143-29/+141
| | | | | | | | | | | | | | | | FillScenario
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1319-205/+200
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | Rename popByte and popAddressAmir Bandeali2018-06-134-12/+12
| | | |
| * | | Unpop byte rather than making deep copyAmir Bandeali2018-06-133-90/+91
| | | |
| * | | Pass gas in to marketBuyOrdersNoThrowAmir Bandeali2018-06-131-1/+1
| | | |
| * | | Looks up the memory location of makerAssetData/takerAssetDataGreg Hysen2018-06-131-0/+2
| | | |
| * | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATAAmir Bandeali2018-06-131-19/+9
| | | |
| * | | Add tests for deepCopyBytes and missing write methods from LibBytesAmir Bandeali2018-06-132-0/+16
| | | |
| * | | Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-1316-149/+132
| | | |
| * | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts ↵Alex Browne2018-06-121-1/+4
| | | | | | | | | | | | | | | | tests
* | | | Implement initial set of orderFill combinatorial testsFabio Berger2018-06-1310-187/+553
| | | |
* | | | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper ↵Fabio Berger2018-06-134-9/+95
| | | | | | | | | | | | | | | | superset
* | | | Variable rename for clarityFabio Berger2018-06-131-2/+2
| | | |
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1230-141/+724
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | | Implement SolidityProfiler & adapt sol-cov to work with GethLeonid Logvinov2018-06-093-1/+51
| |/ /
| * | Updated LibBytes error messagesGreg Hysen2018-06-082-6/+6
| | |
| * | Camelcase in memCopyGreg Hysen2018-06-083-22/+22
| | |
| * | Style updates to contractsGreg Hysen2018-06-083-16/+16
| | |
| * | Fixed a styling throughout contracts. Moved closing parenthesis for long ↵Greg Hysen2018-06-088-31/+62
| | | | | | | | | | | | list of function parameters to next line.
| * | Fixed merge error when rebasing wrt length variable in asset data decodersGreg Hysen2018-06-082-4/+4
| | |
| * | Style updates to ERC721 onReceiverGreg Hysen2018-06-083-8/+6
| | |
| * | Fixed after rebaseGreg Hysen2018-06-083-5/+5
| | |
| * | Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-082-16/+9
| | |
| * | Style audit for proxies + libmem + libbytesGreg Hysen2018-06-086-23/+40
| | |
| * | Style audit proxiesGreg Hysen2018-06-083-20/+64
| | |
| * | Call safeTransferFrom only when there is receiver data presentGreg Hysen2018-06-081-1/+6
| | |
| * | Fixed formatting in memory layoutGreg Hysen2018-06-081-6/+6
| | |
| * | Resolved edge case in Memcpy where where send would eventually turn ↵Greg Hysen2018-06-081-11/+17
| | | | | | | | | | | | "negative" and wrap around.
| * | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵Greg Hysen2018-06-086-88/+57
| | | | | | | | | | | | This way they can still be used by the forwarding contract. TestAssetDataDecoders inherits them in the same way the forwarding contract would
| * | Converged on naming scheme for asset data: renamed all instances of ↵Greg Hysen2018-06-0813-67/+67
| | | | | | | | | | | | assetMetadata, proxyData, proxyMetadata to assetData
| * | proxyData -> assetDataGreg Hysen2018-06-081-11/+11
| | |
| * | Implement memcpy using masking and end-aligned wordsRemco Bloemen2018-06-081-59/+85
| | |
| * | Convert Solidity tests to vectorsRemco Bloemen2018-06-081-203/+0
| | |
| * | Generate tests from vectorsRemco Bloemen2018-06-081-3/+24
| | |
| * | Fixed up wording in memcpyGreg Hysen2018-06-081-3/+3
| | |
| * | Tons of tests around nested byte arrays and ERC721 receiverGreg Hysen2018-06-082-10/+32
| | |
| * | Test for onReceived erc721 callbackGreg Hysen2018-06-082-0/+3
| | |
| * | LibAssetProxyDecoder testsGreg Hysen2018-06-081-1/+1
| | |
| * | Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-083-0/+53
| | |
| * | Tests for libMemGreg Hysen2018-06-083-15/+11
| | |
| * | LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721ReceiverGreg Hysen2018-06-087-27/+579
| | |
* | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-085-8/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 pull request #678 from 0xProject/fix/order-utils/remaining-v2-changesFabio Berger2018-06-081-0/+1
| |\ \ | | | | | | | | Remaining Order-utils V2 Changes
| * \ \ merge v2-prototypeFabio Berger2018-06-0714-42/+151
| |\ \ \
| * | | | move generated contract wrappers from `contract_wrappers/generated/` to ↵Fabio Berger2018-06-066-13/+13
| | |_|/ | |/| | | | | | | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
* | | | Merge branch 'fix/order-utils/remaining-v2-changes' into ↵Fabio Berger2018-06-081-0/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | feature/combinatorial-testing * fix/order-utils/remaining-v2-changes: Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder
| * | | Fix tslint failureFabio Berger2018-06-081-0/+1
| | |/ | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 01:07:08 +0800