aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test
Commit message (Collapse)AuthorAgeFilesLines
* Add getBalancesAndAllowancesAmir Bandeali2018-08-221-0/+50
|
* Add ZRX balances and allowances to TraderInfoAmir Bandeali2018-08-221-3/+106
|
* Add testsAmir Bandeali2018-08-223-0/+449
|
* Remove redundant constructor argsAmir Bandeali2018-08-221-2/+0
|
* Fix typos, run prettier, and allow anyone to call on DummyERC721TokenAmir Bandeali2018-08-171-8/+8
|
* Fix Geth testsAmir Bandeali2018-08-171-9/+9
|
* Fix linting errorsAmir Bandeali2018-08-178-11/+10
|
* Fix tests that assumed logs were being filteredAmir Bandeali2018-08-174-4/+11
|
* Add tests for ERC721TokenAmir Bandeali2018-08-174-2/+281
|
* Add tests for ERC20 token with no return valuesAmir Bandeali2018-08-173-1/+136
|
* Add constructor back to DummyERC721TokenAmir Bandeali2018-08-171-0/+2
|
* Update checking for erc721 existenceAmir Bandeali2018-08-171-3/+2
|
* [Order-utils] Order is valid when maker amount is very smallJacob Evans2018-08-154-1/+43
| | | | | | | Previously our min fillable calculation would throw a rounding error when encountering a valid order (with a small maker amount). This was inconsistent with the on-chain logic which allowed this order to be filled.
* Merge pull request #914 from 0xProject/feature/0x.js/ec-signature-stringJacob Evans2018-08-141-6/+6
|\ | | | | 0x.js Return signature as a hex encoded string
| * Rename from SignerProviderType.EthSign to SignerType.DefaultJacob Evans2018-08-111-5/+5
| |
| * Introduce SignerProviderTypeJacob Evans2018-08-091-6/+6
| | | | | | | | This allows the developer to indicate the nuanced signer provider. Some have different implementations (trezor, ledger) and others have different implementations (metamask). Breaking the abstraction of eth_sign. EthSign assumes a spec compliant implementation and can be used as a default
* | Change withdrawERC20 => withdrawAsset, reuse transfer logicAmir Bandeali2018-08-102-4/+25
| |
* | Make marketBuy functions revert if entire amount not filledAmir Bandeali2018-08-101-43/+15
| |
* | Merge pull request #941 from 0xProject/feature/contracts/returnValuesTestsAmir Bandeali2018-08-102-11/+69
|\ \ | |/ |/| [contracts] Test fillOrder return values and abiEncodeFillOrder
| * Test abiEncodeFillOrder as part of combinatorial follOrder testsAmir Bandeali2018-08-092-5/+23
| |
| * Add return values to combinatorial fillOrder testsAmir Bandeali2018-08-092-11/+51
| |
* | Add strictArgumentEncodingCheck to BaseContract and use it in contract templatesAlex Browne2018-08-091-3/+3
|/
* Update TypeScript to version 2.9.2Alex Browne2018-08-091-4/+19
|
* Add combinatorial tests for internal Exchange functions (#807)Alex Browne2018-07-278-125/+631
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Use != instead of > in loops, add sanity checks to market fill functionsAmir Bandeali2018-07-231-1/+1
|
* Add more tests and fixesAmir Bandeali2018-07-232-406/+475
|
* Get actual gasPrice from transaction instead of setting defaultAmir Bandeali2018-07-231-35/+34
|
* Use transferFrom instead of safeTransferFromAmir Bandeali2018-07-231-1/+0
|
* Fix minimal testsAmir Bandeali2018-07-233-729/+747
|
* Add tests to verify ZRX_ASSET_DATAAmir Bandeali2018-07-232-0/+18
|
* Move example contracts into new examples dirAmir Bandeali2018-07-232-12/+12
|
* Merge pull request #877 from 0xProject/feature/contracts/removeERC721CallbackAmir Bandeali2018-07-232-109/+6
|\ | | | | Removed receiverData and `onReceive` callback from ERC721 proxy.
| * Fixed merge errorsGreg Hysen2018-07-181-2/+0
| |
| * Fixed merge errorGreg Hysen2018-07-181-11/+11
| |
| * Ran prettierGreg Hysen2018-07-181-11/+11
| |
| * Removed receiverData from ERC721 Proxy Id generationGreg Hysen2018-07-181-2/+2
| |
| * Removed receiverData and `onReceive` callback from ERC721 proxy.Greg Hysen2018-07-182-105/+4
| |
* | Merge branch 'v2-prototype' into feature/order-watcher-v2Leonid Logvinov2018-07-1818-182/+201
|\|
| * Merge pull request #884 from 0xProject/export-more-0x.jsFabio Berger2018-07-1818-182/+201
| |\ | | | | | | Export missing V2 pieces from 0x.js
| | * Fix prettierFabio Berger2018-07-182-9/+3
| | |
| | * Fix linterFabio Berger2018-07-181-1/+1
| | |
| | * merge v2-prototypeFabio Berger2018-07-1812-131/+451
| | |\
| | * | Rename decodeAssetDataId to decodeAssetProxyId for consistencyFabio Berger2018-07-184-11/+11
| | | |
| | * | Move encodeUint256 & decodeUint256 out of assetDataUtils since we don't want ↵Fabio Berger2018-07-184-6/+31
| | | | | | | | | | | | | | | | them exported
| | * | Rename assetProxyUtils to assetDataUtilsFabio Berger2018-07-1716-176/+176
| | | |
* | | | MergeLeonid Logvinov2018-07-181-1/+1
|/ / /
* | | Merge pull request #883 from 0xProject/feature/tslint-improvementsLeonid Logvinov2018-07-1815-47/+49
|\ \ \ | |_|/ |/| | New tslint rules
| * | Fix tslint issuesLeonid Logvinov2018-07-1715-47/+49
| |/
* | Add tests for getOrderInfo and getOrdersInfoAmir Bandeali2018-07-183-5/+311
| |
* | Fix bugs having to do with block timestamps and order expirationTimesAlex Browne2018-07-1711-128/+142
|/
* Remove extra ERC20ProxyId from Forwarder constructorJacob Evans2018-07-111-2/+1
|
* Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytesAmir Bandeali2018-07-114-7/+33
|
* Fix importsLeonid Logvinov2018-07-061-2/+2
|
* Merge pull request #822 from 0xProject/v2-contract-wrappers-WIPLeonid Logvinov2018-07-0614-66/+68
|\ | | | | V2 contract wrappers
| * Make it possible to configure block polling interval in base contract wrapperLeonid Logvinov2018-07-0514-66/+68
| |
* | Types: Move Forwarder Revert Reason into types packageJacob Evans2018-07-061-13/+6
| |
* | Forwarder specify the revert reasonsJacob Evans2018-07-061-21/+31
| |
* | Forwarder fix linter errorJacob Evans2018-07-061-1/+1
| |
* | Update to new assertionsJacob Evans2018-07-061-18/+16
| |
* | Merge pull request #522 from 0xProject/feature/contracts/forwarderJacob Evans2018-07-065-0/+1056
|\ \ | |/ |/| Forwarding contract
| * Forwarding contract (squashed commits)Jacob Evans2018-07-065-0/+1056
| |
* | Move NodeType caching out of web3-wrapper and into our internal codeAlex Browne2018-07-041-2/+8
| |
* | Add TransactionReceiptStatus type to ethereum-typesAlex Browne2018-07-041-2/+2
| |
* | Improve robustness of revert reason assertionsAlex Browne2018-07-0317-185/+228
| |
* | 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-0247-397/+3793
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * Fix buildAmir Bandeali2018-06-306-30/+30
| |
| * Update file structureAmir Bandeali2018-06-3046-162/+3532
| |
| * Make registerAssetProxy append onlyAmir Bandeali2018-06-305-141/+42
| |
| * Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codesAlex Browne2018-06-301-21/+3
| |
| * Fix deployment to gethAmir Bandeali2018-06-301-6/+5
| |
| * Fix testsAmir Bandeali2018-06-301-71/+134
| |
* | Print out entire orderFill scenarioFabio Berger2018-07-021-7/+1
|/
* Reduce the userAddresses to the individual addresses actually used by tests, ↵Fabio Berger2018-06-286-18/+30
| | | | as well as only deploy the number of ERC20 tokens needed for each test suite
* Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-274-216/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Add more revert reasons to testsAmir Bandeali2018-06-273-19/+43
| |
| * Make dispatchTransferFrom revert with reason from AssetProxy on failureAmir Bandeali2018-06-271-2/+2
| |
| * Remove redundant files, hard code function selector in dispatchTransferFrom, ↵Amir Bandeali2018-06-272-192/+0
| | | | | | | | and modify revert reason
* | Move combinatorial fillOrder tests into the `fill_ordere` test fileFabio Berger2018-06-272-48/+21
| |
* | Fix testsFabio Berger2018-06-271-3/+6
| |
* | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testingFabio Berger2018-06-2710-86/+86
|\| | | | | | | | | | | | | | | | | | | | | * refactor/check-revert-reasons: Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed` Expect RevertReason be passed in, not string Rename RevertReasons to RevertReason since singular enum names are more common # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/core.ts
| * Temporarily switch revert reasons to `TransferFailed`. Should be ↵Fabio Berger2018-06-271-2/+2
| | | | | | | | `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed`
| * Rename RevertReasons to RevertReason since singular enum names are more commonFabio Berger2018-06-2610-95/+95
| |
| * Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-267-60/+34
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | Rename to singularFabio Berger2018-06-261-9/+9
| | |
* | | Fix merge issuesFabio Berger2018-06-261-1/+4
| | |
* | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-267-75/+45
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-261-2/+4
| | |
| * | Run prettier and fix linting errorsAmir Bandeali2018-06-261-18/+6
| | |
| * | Fix testsAmir Bandeali2018-06-264-5/+4
| | |
| * | Update testsRemco Bloemen2018-06-261-2/+2
| | |
| * | Update testsRemco Bloemen2018-06-262-33/+20
| | |
| * | WIPRemco Bloemen2018-06-261-0/+1
| | |
| * | Remove proxyId argument from dispatchTransferFromRemco Bloemen2018-06-262-7/+4
| | |
* | | Fix inconsistency between contract and reference implementation of order ↵Fabio Berger2018-06-261-0/+2
| | | | | | | | | | | | validation logic
* | | Prettier fixesFabio Berger2018-06-261-4/+1
| | |
* | | Fix tslint issuesFabio Berger2018-06-263-4/+1
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-2510-22/+14
|\ \ \ | | |/ | |/|
| * | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-2510-22/+14
| | |
| * | Add missing importFabio Berger2018-06-251-1/+4
| | |
* | | Add missing importFabio Berger2018-06-251-1/+4
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-2510-108/+172
|\| |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-255-366/+539
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (48 commits) Fix typos in comments Add modifier and tests for removeAuthorizedAddressAtIndex Update and add tests Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex Move isFunctionRemoveAuthorizedAddress to test Fix usage of `popLastByte` Fix LibBytes is a library Remove `areBytesEqual` Fix usage of `contentAddress()` Clean low bits in bytes4 Clean high bits in address Refactor LibBytes.readBytes4 for consistency Fix LibBytes.equals Add trailing garbage testcase for LibBytes.equals Rename bytes.equals Add slice and sliceDestructive Rename bytes.rawAddress and add bytes.contentAddress Rename read/writeBytesWithLength Using LibBytes for bytes Make LibBytes a library ... # Conflicts: # packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol # packages/contracts/test/libraries/lib_bytes.ts
| * | Fix tslintFabio Berger2018-06-234-4/+4
| | |
| * | Fix prettierFabio Berger2018-06-235-15/+13
| | |
| * | Rename ContractLibErrors to RevertReasonsFabio Berger2018-06-2310-95/+95
| | |
| * | Remove revert reason 'Exchange' prefixFabio Berger2018-06-231-1/+1
| | |
| * | Move constants over to ContractLibError enum and update all testsFabio Berger2018-06-233-29/+32
| | |
| * | Fix test now that contract reverts with messageFabio Berger2018-06-221-5/+3
| | |
| * | Add revert reason checks to wrapper testsFabio Berger2018-06-221-10/+19
| | |
| * | Fix testsFabio Berger2018-06-221-2/+2
| | |
| * | Change Whitelist error messages to conform to rest and added revert reason ↵Fabio Berger2018-06-221-16/+24
| | | | | | | | | | | | checks to transactions tests
| * | Add revert reason checks to match_orders testsFabio Berger2018-06-221-7/+18
| | |
| * | Fix testsFabio Berger2018-06-221-2/+2
| | |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-2211-27/+435
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Use make-promises-safe as a preloader instead of manually importing Updated compiler runs to be 1,000,000 Add event to setSignatureValidatorApproval, rename signer => signerAddress accross all contracts Add senderAddress to Fill and Cancel logs, add comments to events and types Fix Island component Add missing image assets for Chris and Mel Fix some bugs in sol-cov Remove unreachable PreSigned check Fix linting Buttons look hella disabled now Remove border radius, fix width issue for unlock step Add Chris and Mel to about page fix linter issues only call getLocationByOffset if source if defined Set settleOrder and settleMatchedOrders to private Prevent prettier issue Support mobile friendly onboarding flows Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `settleMatchedOrders` into `MixinMatchOrders` Migrations after rebasing Linter ...
| * | | Check revert reason in dispatcher testsFabio Berger2018-06-222-5/+13
| | | |
| * | | remove unused importFabio Berger2018-06-221-1/+0
| | | |
| * | | Test revert reasons in proxy testsFabio Berger2018-06-211-11/+23
| | | |
| * | | remove onlyFabio Berger2018-06-211-1/+1
| | | |
| * | | Check revert reasons in Authorizable testsFabio Berger2018-06-211-6/+14
| | | |
| * | | remove .onlyFabio Berger2018-06-211-1/+1
| | | |
| * | | Update core tests to actually check revert messageFabio Berger2018-06-211-34/+53
| | | |
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-2514-393/+974
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 modifier and tests for removeAuthorizedAddressAtIndexAmir Bandeali2018-06-231-0/+69
| | | |
| * | | Update and add testsAmir Bandeali2018-06-232-170/+269
| | | |
| * | | Move isFunctionRemoveAuthorizedAddress to testRemco Bloemen2018-06-231-7/+18
| | | |
| * | | Refactor LibBytes.readBytes4 for consistencyRemco Bloemen2018-06-231-3/+7
| | | |
| * | | Add trailing garbage testcase for LibBytes.equalsRemco Bloemen2018-06-231-0/+10
| | | |
| * | | Rename bytes.equalsRemco Bloemen2018-06-231-13/+13
| | | |
| * | | Rename read/writeBytesWithLengthRemco Bloemen2018-06-231-29/+29
| | | |
| * | | Merge LibMem and LibBytesRemco Bloemen2018-06-233-191/+171
| | | |
| * | | Use provided mem in refernce memcpyRemco Bloemen2018-06-231-2/+2
| | |/ | |/|
| * | Use make-promises-safe as a preloader instead of manually importingAlex Browne2018-06-2210-10/+0
| | |
| * | Add event to setSignatureValidatorApproval, rename signer => signerAddress ↵Amir Bandeali2018-06-221-2/+50
| | | | | | | | | | | | accross all contracts
| * | Add senderAddress to Fill and Cancel logs, add comments to events and typesAmir Bandeali2018-06-221-0/+2
| | |
| * | LinterGreg Hysen2018-06-211-2/+1
| | |
| * | Changed wording of two tests #nitGreg Hysen2018-06-211-2/+2
| | |
| * | Minor improvements to MixinSignatureValidator testsGreg Hysen2018-06-211-14/+8
| | |
| * | Remove .onlyGreg Hysen2018-06-211-1/+1
| | |
| * | Fixed two mislabelled revert reasons + Signature Validator revert tests ↵Greg Hysen2018-06-211-6/+10
| | | | | | | | | | | | working on Geth
| * | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported ↵Greg Hysen2018-06-211-15/+386
| |/ | | | | | | types. Fixed trezor prefix.
* | Add support for approveAll in assetWrapper and fillOrderScenariosFabio Berger2018-06-211-1/+39
| |
* | Split balance and allowance amount types in prep of adding the "unlimited" ↵Fabio Berger2018-06-201-13/+14
| | | | | | | | allowance enum value
* | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-204-20/+140
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-201-3/+7
| |\ | | | | | | Add missing EIP191 prefix for EIP712 and Execute Transaction
| | * Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefixJacob Evans2018-06-1820-608/+1380
| | |\
| | * | Update Order utils to use eip712Jacob Evans2018-06-062-8/+6
| | | |
| | * | Add missing EIP191 prefix for EIP712Jacob Evans2018-06-051-2/+7
| | | |
| * | | ERC721Proxy Always call safeTransferFromJacob Evans2018-06-201-2/+6
| | | |
| * | | Rename makerEpoch => orderEpochAmir Bandeali2018-06-202-20/+20
| | | |
| * | | Make cancelOrdersUpTo compatible with sender abstractionAmir Bandeali2018-06-201-0/+112
| | |/ | |/|
* | | Remove hack in ERC20WrapperFabio Berger2018-06-196-6/+24
| | |
* | | Add ability to tweak the relevant balances/allowances for the maker and ↵Fabio Berger2018-06-152-43/+57
| | | | | | | | | | | | 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-152-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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-142-17/+11
| | | | | | | | | | | | generateOrderCombinations to generateFillOrderCombinations
* | | Use a defaultFillScenario in fillOrder testsFabio Berger2018-06-141-36/+39
| | |
* | | 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-141-6/+12
| | | | | | | | | | | | FillScenario
* | | Move orderFill combinatorialTests to exchange folderFabio Berger2018-06-131-4/+4
| | |
* | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-138-140/+332
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-131-6/+6
| | |
| * | Hard code test addresses/bytes32 instead of generating pseudorandom onesAmir Bandeali2018-06-131-19/+16
| | |
| * | Unpop byte rather than making deep copyAmir Bandeali2018-06-131-0/+4
| | |
| * | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATAAmir Bandeali2018-06-134-4/+4
| | |
| * | Add tests for deepCopyBytes and missing write methods from LibBytesAmir Bandeali2018-06-131-70/+185
| | |
| * | Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-134-60/+136
| | |
* | | Implement initial set of orderFill combinatorial testsFabio Berger2018-06-131-240/+22
| | |
* | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1213-244/+810
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * | Fix no-unused-variable tslint rule to include parameters and fix issuesFabio Berger2018-06-121-1/+1
| | |
| * | Implement SolidityProfiler & adapt sol-cov to work with GethLeonid Logvinov2018-06-091-0/+5
| | |
| * | Linter changes to contractsGreg Hysen2018-06-094-21/+6
| | |
| * | Updated LibBytes error messagesGreg Hysen2018-06-081-22/+30
| | |
| * | Cleanup after last rebaseGreg Hysen2018-06-084-6/+5
| | |
| * | Updated tests to use new revert handlerGreg Hysen2018-06-082-13/+13
| | |
| * | Minor fixes after rebaseGreg Hysen2018-06-081-14/+6
| | |
| * | Camelcase in memCopyGreg Hysen2018-06-081-1/+1
| | |
| * | Style updates to contractsGreg Hysen2018-06-083-10/+4
| | |
| * | Union types for generalized decodeAssetDataGreg Hysen2018-06-081-2/+2
| | |
| * | Removed setting makerAssetData/takerAssetData from tests where values are ↵Greg Hysen2018-06-081-34/+0
| | | | | | | | | | | | same as defaultOrderParams.
| * | Style updates to ERC721 onReceiverGreg Hysen2018-06-082-3/+14
| | |
| * | Fixes after rebasingGreg Hysen2018-06-083-8/+6
| | |
| * | Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-085-34/+21
| | |
| * | Style audit for proxies + libmem + libbytesGreg Hysen2018-06-082-27/+32
| | |
| * | Call safeTransferFrom only when there is receiver data presentGreg Hysen2018-06-082-12/+14
| | |
| * | Resolved edge case in Memcpy where where send would eventually turn ↵Greg Hysen2018-06-081-133/+137
| | | | | | | | | | | | "negative" and wrap around.
| * | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵Greg Hysen2018-06-081-5/+5
| | | | | | | | | | | | 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-089-223/+190
| | | | | | | | | | | | assetMetadata, proxyData, proxyMetadata to assetData
| * | proxyData -> assetDataGreg Hysen2018-06-081-1/+1
| | |
| * | Add tests for word loop iterationRemco Bloemen2018-06-081-2/+6
| | |
| * | Add test for zero-size overlapRemco Bloemen2018-06-081-1/+3
| | |
| * | Add test casesRemco Bloemen2018-06-081-17/+133
| | |
| * | Cleanup test scriptRemco Bloemen2018-06-081-16/+1
| | |
| * | Convert Solidity tests to vectorsRemco Bloemen2018-06-081-29/+6
| | |
| * | Generate tests from vectorsRemco Bloemen2018-06-081-2/+40
| | |
| * | Tests for writing bytes to nested bytesGreg Hysen2018-06-081-9/+91
| | |
| * | Tons of tests around nested byte arrays and ERC721 receiverGreg Hysen2018-06-083-18/+165
| | |
| * | Test for onReceived erc721 callbackGreg Hysen2018-06-082-3/+121
| | |
| * | LibAssetProxyDecoder testsGreg Hysen2018-06-081-26/+30
| | |
| * | Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-082-1/+73
| | |
| * | Tests for libMemGreg Hysen2018-06-081-0/+68
| | |
| * | Add missing awaitTransactionSuccessAsync callsAlex Browne2018-06-082-23/+53
| | |
* | | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-0817-44/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Fix tslint issuesFabio Berger2018-06-082-2/+2
| | |
| * | Fix missing pathsFabio Berger2018-06-081-4/+4
| | |
| * | Fixed pathFabio Berger2018-06-072-10/+10
| | |
| * | merge v2-prototypeFabio Berger2018-06-0716-290/+303
| |\ \
| * | | move generated contract wrappers from `contract_wrappers/generated/` to ↵Fabio Berger2018-06-0617-45/+45
| | |/ | |/| | | | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
* | | Merge branch 'fix/order-utils/remaining-v2-changes' into ↵Fabio Berger2018-06-082-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-082-2/+2
| | |/ | |/|
* / | POC: Generates an order from spec, get's the amount fillableFabio Berger2018-06-081-0/+266
|/ /
* | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-0713-206/+263
|\ \ | | | | | | | | | feature/improve-linting
| * | Apply prettierAlex Browne2018-06-072-3/+10
| | |
| * | Update contracts tests after rebaseAlex Browne2018-06-072-14/+14
| | |
| * | Apply various fixes based on PR feedbackAlex Browne2018-06-072-11/+54
| | |
| * | Add Async suffix to relevant assertionsAlex Browne2018-06-0713-103/+103
| | |
| * | Fix linter errorsAlex Browne2018-06-071-6/+2
| | |
| * | Update more things to work with both Geth and GanacheAlex Browne2018-06-072-16/+28
| | |
| * | Small fixes and cleanupAlex Browne2018-06-071-2/+2
| | |
| * | Add additional gas to calls to fillOrderNoThrowAlex Browne2018-06-072-146/+49
| | |
| * | Throw in web3-wrapper when rawCallResult is '0x'Alex Browne2018-06-071-6/+4
| | |
| * | Fix some more test cases, especially those that call increaseTimeAlex Browne2018-06-073-55/+58
| | |
| * | Update more tests to pass on GethAlex Browne2018-06-072-21/+15
| | |
| * | Get LibBytes tests working on both Ganache and GethAlex Browne2018-06-071-24/+28
| | |
| * | Update exchange/transactions tests for Geth error messagesAlex Browne2018-06-071-4/+4
| | |
| * | Update some tests after rebaseAlex Browne2018-06-073-20/+29
| | |
| * | Add more transactions to Geth on init. Skip tests that are failing.Alex Browne2018-06-076-20/+135
| | |
| * | Replace constant.REVERT test assertions with ↵Alex Browne2018-06-0711-168/+141
| | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction
| * | Update code after rebaseAlex Browne2018-06-071-20/+0
| | |
| * | Use Geth for contract testsAlex Browne2018-06-071-0/+20
| |/
* / Linter now passesfragosti2018-06-0616-70/+26
|/
* Rebase from v2-prototypeJacob Evans2018-06-052-38/+2
|
* Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵Amir Bandeali2018-06-055-71/+70
| | | | failures, and remove redundant logic in matchOrders
* Improve comments and remove unused importsFabio Berger2018-06-021-1/+1
|
* Fix tslint issuesFabio Berger2018-06-022-3/+2
|
* Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-029-27/+63
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (33 commits) Only show ProviderDisplay in portal Improve sol-cov docs Remove old parse code Refactor order parser and add shared order support to new portal Add generate and fill order routes Address feedback Override ethereumjs-tx version Fix missing key Update placeholder param ordering Change userEtherBalanceInWei to optional so we can know if its loading Add loading state to ProviderDisplay Tweaks Add Placeholder component Add StandardIconRow Split render into loading and loaaded Fix linter errors Fix linter errors Add ethereum-types to extraFileIncludes Introduce ethereum-types package Remove merge conflicts from yarn.lock ... # Conflicts: # packages/contracts/src/utils/exchange_wrapper.ts # packages/contracts/src/utils/match_order_tester.ts # packages/contracts/src/utils/types.ts # packages/contracts/test/exchange/core.ts # packages/contracts/test/exchange/match_orders.ts # packages/contracts/test/libraries/lib_bytes.ts # packages/sol-cov/package.json
| * Fix linter errorsLeonid Logvinov2018-06-012-2/+2
| |
| * Introduce ethereum-types packageLeonid Logvinov2018-06-016-6/+8
| |
| * Fix buildAmir Bandeali2018-06-011-1/+1
| |
| * Merge pull request #640 from 0xProject/await-transaction-successAlex Browne2018-05-314-21/+54
| |\ | | | | | | Add awaitTransactionSuccess where needed
| | * Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapperAlex Browne2018-05-311-1/+1
| | |
| | * Add awaitTransactionSuccess where neededAlex Browne2018-05-313-20/+53
| | |
* | | fix method renameFabio Berger2018-06-011-1/+1
| | |
* | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-018-13/+185
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (45 commits) Check length before accessing indices, add awaitTransactionSuccess where needed, and rename function Add back before/after snapshots for each test Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMIT Make preSigned and allowedValidators mappings public Change names of signature types Fix formatting and tests Make AssetProxyId last byte of assetData Add signer to txHash, allow approveValidator to be used with executeTransaction Update Whitelist Fix Exchange interface Increase block gas limit Use last byte of signature as signature type Remove TxOrigin signature type, modify whitelist to use Validator signature type Update Whitelist contract with comments, also require maker to be whitelisted Fix build Add example whitelist contract and minimum tests Add sample whitelist contract Add TxOrigin signature type and rearrange order of types Add approveValidator function Add Validator signature type ... # Conflicts: # packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol # packages/contracts/src/utils/types.ts # packages/contracts/test/exchange/transactions.ts # packages/order-utils/src/asset_proxy_utils.ts
| * | Check length before accessing indices, add awaitTransactionSuccess where ↵Amir Bandeali2018-05-311-13/+27
| | | | | | | | | | | | needed, and rename function
| * | Add back before/after snapshots for each testAmir Bandeali2018-05-3116-0/+97
| | |
| * | Fix formatting and testsAmir Bandeali2018-05-3114-90/+6
| | |
| * | Update WhitelistAmir Bandeali2018-05-311-0/+1
| | |
| * | Use last byte of signature as signature typeAmir Bandeali2018-05-313-32/+28
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-21 17:21:14 +0800