aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test
Commit message (Collapse)AuthorAgeFilesLines
* Don't load assetProxy if currentProxyid is equal to the last seen proxyidAmir Bandeali2018-11-281-0/+1
|
* Add Exchange tests with MultiAsset ordersAmir Bandeali2018-11-282-23/+362
|
* Fix linting errorsAmir Bandeali2018-11-281-0/+2
|
* Add more tests for MAPAmir Bandeali2018-11-281-14/+341
|
* Add initial MultiAssetProxy testsAmir Bandeali2018-11-281-189/+478
|
* Fix async loops in erc721WrapperAmir Bandeali2018-11-282-3/+3
|
* fix: remove getApproved check from OrderValidator since approval is removed ↵Amir Bandeali2018-11-271-5/+8
| | | | after a single transfer
* Remove unnecessary conversion to BigNumberFabio Berger2018-11-121-2/+2
|
* rename paramFabio Berger2018-11-121-2/+2
|
* Move signature validation into ↵Fabio Berger2018-11-101-1/+1
| | | | OrderValidationUtils.validateOrderFillableOrThrowAsync
* Fix validateOrderFillableOrThrowAsync method so it also checks order ↵Fabio Berger2018-11-092-3/+14
| | | | signature, cancelled, cancelledUpTo, and throws helpful error messages
* Run prettier and linterAmir Bandeali2018-10-241-2/+0
|
* Round up for Market Buys in Forwarding Contract. Includes new test cases + ↵Greg Hysen2018-10-242-4/+272
| | | | regression testing.
* chore: change package org from 0xproject to 0xJacob Evans2018-10-1849-141/+141
|
* Move generated contract wrappers and artifacts into contracts packageAlex Browne2018-10-1630-499/+107
|
* Throw and handle errors from Providers.Jacob Evans2018-10-091-1/+1
| | | | | | | In web3 wrapper when a response contains an error field we throw this rather than return response.result which is often undefined. In Signature Utils we handle the error thrown when a user rejects the signing dialogue to prevent double signing. Exposed the ZeroExTransaction JSON schema. In Website only use the MetamaskSubprovider if we can detect the provider is Metamask
* Return SignedOrder from signing utils.Jacob Evans2018-10-051-30/+4
| | | | | Create a helper back in EIP712Utils for code cleanup. Moved constants in order-utils into the constants object
* Add eth_signTypedData support to our wallet subprovidersJacob Evans2018-10-052-29/+29
|
* Introduce Metamask Subprovider.Jacob Evans2018-10-051-9/+3
| | | | MM has a number of inconsistencies with other providers when implementing the JSON RPC interface. This subprovider wraps those nuances so they do not leak into the rest of our code
* Fix bug where if block wasn't found, getBlockAsync would throw. Now it ↵Fabio Berger2018-09-242-3/+9
| | | | returns `undefined`
* Fix bug in contracts testsAlex Browne2018-09-051-1/+1
|
* Fix geth testsAmir Bandeali2018-09-042-6/+12
|
* Add test for external_call visibilityAmir Bandeali2018-09-041-0/+15
|
* Add MultiSigWalletWithTimeLock revert reasons to testsAmir Bandeali2018-09-042-15/+31
|
* Add more tests for MultiSigWalletWithTimeLockAmir Bandeali2018-09-042-1/+152
|
* Add test for executeRemoveAuthorizedAddressAtIndex when called by non-ownerAmir Bandeali2018-09-041-4/+40
|
* Revert in Forwarder constructor if ERC20 proxy isn't registeredAmir Bandeali2018-09-041-4/+29
|
* Merge pull request #1047 from 0xProject/feature/re-add-no-unused-variablesFrancesco Agosti2018-08-312-5/+2
|\ | | | | Re-add no-unused-variable tslint rule
| * run prettierfragosti2018-08-311-3/+1
| |
| * Fix unused vars for react-shared and websitefragosti2018-08-312-2/+1
| |
* | Merge pull request #1046 from ↵Greg Hysen2018-08-311-0/+94
|\ \ | | | | | | | | | | | | 0xProject/fix/contracts/roundingFeeTestsMatchOrders Test cases for rounding fees in matchOrders
| * | Test cases for rounding fees in matchOrdersGreg Hysen2018-08-311-0/+94
| | |
* | | Merge pull request #1045 from 0xProject/feature/contracts/cancelOrderInternalAmir Bandeali2018-08-311-0/+1
|\ \ \ | | | | | | | | Add cancelOrderInternal, use within batchCancelOrders
| * | | Add cancelOrderInternal, use within batchCancelOrdersAmir Bandeali2018-08-311-0/+1
| | |/ | |/|
* | | Add tests for token that returns >32 bytesAmir Bandeali2018-08-312-0/+55
| | |
* | | Add more proxy testsAmir Bandeali2018-08-311-8/+176
| | |
* | | Update used addresses for authorizable testsAmir Bandeali2018-08-311-2/+2
| | |
* | | Add test for fillOrder and dispatchTransferFrom where maker == takerAmir Bandeali2018-08-312-1/+92
|/ /
* | Fix geth testsAmir Bandeali2018-08-305-46/+67
| |
* | Update AssetProxyOwner to 0.4.24Amir Bandeali2018-08-301-19/+0
| |
* | Merge pull request #1039 from 0xProject/fix/contracts/audit2FixesGreg Hysen2018-08-301-6/+43
|\| | | | | Fixes as-per Audit for LibBytes + ERC20 Proxy Comments
| * Typos in LibBytes testsGreg Hysen2018-08-301-6/+6
| |
| * More tests for LibBytesGreg Hysen2018-08-301-3/+16
| |
| * Updated readBytes4 to match spec + added unit tests. These are 3.5/3.6 from ↵Greg Hysen2018-08-301-1/+25
| | | | | | | | audit
* | feat: Add support for TypeScript project references (#991)Alex Browne2018-08-301-2/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update all package.json and tsconfig.json * fix(contracts): Make test/utils/web3_wrapper.ts compatible with project refs * Fix webpack config for 0x.js * Fix linter errors by adding rootDir to tsconfig.json as needed * Add build:ts and watch:ts commands to package.json * Update sra-spec to work with project references * Update tsconfig.json with latest new/removed packages * Add TypeScript as devDependency at root * Add missing rootDir to forwarder-helper package * Use a separate tsconfig file for typedoc * Fix linter errors * Apply PR feedback (add comments) * Fix 0x.js tsconfig
* Making rounding consistent in calculateFillResultsAmir Bandeali2018-08-291-7/+10
|
* safeGetPartialAmount (#1035)Amir Bandeali2018-08-292-87/+314
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added Test "Should transfer correct amounts when left order is fully filled and values pass isRoundingErrorCeil but fail isRoundingErrorFloor" * Added RoundingError exception to reference function for getPartialAmount * Added RoundingError exception to reference function for getPartialAmount * Added isRoundingErrorCeil to getPartialAmountCeil reference funtion * Computed new values for "Should give right maker a better buy price when correct price is not integral" that does not have a rounding error * Almost all tests for match orders are passing after adding isRoundingErrorCeil check * WIP commit: Added rounding error checks to getPartialAmount * WIP commit: Added rounding error checks to getPartialAmount * Use safe versions of getPartialAmount * Update Exchange internals tests * Run linter * Found new values for "Should transfer correct amounts when right order fill amount deviates from amount derived by `Exchange.fillOrder`" * Fixed merge conflicts * Run all tests * Cleaned up some comments on match Orders tests * Fix tests for geth
* fix(contracts): Catch cases where the actual error differs from the expected ↵Alex Browne2018-08-282-26/+109
| | | | | | | | | | error (#1032) * Catch cases where the actual error differs from the expected error * Add tests for testWithReferenceFuncAsync * Small style and comment fixes
* fix(contracts): Use correct error message for division by zeroAlex Browne2018-08-281-3/+1
|
* Run all testsGreg Hysen2018-08-251-1/+1
|
* Give right maker better price when correct value is not integralGreg Hysen2018-08-251-10/+14
|
* Extract only `fill` event logsGreg Hysen2018-08-251-4/+5
|
* Addressed linter errors in match order tessterGreg Hysen2018-08-251-9/+2
|
* Tests for matchOrders edge casesGreg Hysen2018-08-251-13/+71
|
* Swapped direction of `expect` values to match output in failure casesGreg Hysen2018-08-251-37/+26
|
* Renaming verify -> assert in order matchingGreg Hysen2018-08-252-53/+52
|
* Fixed a function commentGreg Hysen2018-08-251-1/+2
|
* Added function signature commentsGreg Hysen2018-08-253-239/+233
|
* Added `expect` messages for checking left/right order statesGreg Hysen2018-08-251-2/+6
|
* Ran prettier and linterGreg Hysen2018-08-253-224/+317
|
* Updated all existing match order tests to use new formatGreg Hysen2018-08-252-128/+301
|
* Passes comprehensive testGreg Hysen2018-08-251-191/+141
|
* Verify logsGreg Hysen2018-08-251-72/+44
|
* First balance test with intentional valuesGreg Hysen2018-08-252-59/+95
|
* Ironing out the new set of test cases for order matchubngGreg Hysen2018-08-252-11/+102
|
* Rounding for fees in match orders addressed, plus exampleGreg Hysen2018-08-251-5/+79
|
* All existing tests pass.Greg Hysen2018-08-252-21/+137
|
* Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow ↵Amir Bandeali2018-08-251-4/+0
| | | | variations
* Add tests for matchOrdersAmir Bandeali2018-08-252-122/+53
|
* Add reentrancy tests for fillOrder and wrapper functionsAmir Bandeali2018-08-254-0/+239
|
* Merge pull request #1003 from 0xProject/feature/contracts/roundupAmir Bandeali2018-08-254-65/+179
|\ | | | | [contracts] Add getPartialAmountCeil and isRoundingErrorCeil
| * Fix linting errorsAmir Bandeali2018-08-251-2/+2
| |
| * Append -Floor to getPartialAmount and isRoundingErrorRemco Bloemen2018-08-254-20/+20
| |
| * Add testsRemco Bloemen2018-08-252-22/+93
| |
| * Add DIVISION_BY_ZERO to getPartialAmount for consistencyRemco Bloemen2018-08-251-16/+15
| |
| * Remove .onlyRemco Bloemen2018-08-251-1/+1
| |
| * Add tests for getPartialAmountCeilRemco Bloemen2018-08-251-0/+40
| |
| * Update testsRemco Bloemen2018-08-252-13/+17
| |
* | SignatureType.Trezor -> SignatureType.EthSign in Signature Validator testsGreg Hysen2018-08-251-1/+1
| |
* | Test case for Trezor Model T signatureGreg Hysen2018-08-251-0/+18
| |
* | Fixed trezor personal message in client+contracts; added a test using ↵Greg Hysen2018-08-251-0/+18
| | | | | | | | message signed by Trezor One (firmware v1.6.2)
* | Remove Trezor SignatureTypeAmir Bandeali2018-08-251-47/+0
| |
* | Remove SignatureType.CallerAmir Bandeali2018-08-251-26/+0
| |
* | Rethrow Wallet and Validator errorsAmir Bandeali2018-08-252-18/+14
| |
* | Rename TestStaticCall => TestStaticCallReceiverAmir Bandeali2018-08-253-12/+12
| |
* | Revert if undefined function called in AssetProxiesAmir Bandeali2018-08-251-1/+23
| |
* | Remove pragma experimental v0.5.0 and use staticcall is assemblyAmir Bandeali2018-08-252-11/+70
| |
* | Add pragma experimental v0.5.0 to SignatureValidator and add testsAmir Bandeali2018-08-252-1/+54
|/
* Fix many linter errors that showed up upon upgrading tsutilFabio Berger2018-08-233-4/+4
|
* Merge development branchFabio Berger2018-08-2217-19/+1040
|\
| * 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
| |
* | Move types from sol-compiler to types so they can be used in other places ↵Fabio Berger2018-08-222-2/+2
| | | | | | | | without requiring sol-compiler as a dep
* | Fix commentFabio Berger2018-08-171-1/+2
| |
* | Merge developmentFabio Berger2018-08-174-1/+43
|\|
| * [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 developmentFabio Berger2018-08-156-77/+137
|\|
| * 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
| |
* | Rename EIP712Utils to eip712Utils since objectLiterals shouldn't start with capsFabio Berger2018-08-042-5/+5
| |
* | Stop exporting cryptoFabio Berger2018-08-031-1/+2
| |
* | Make signature_util into an object literal so related functions are rendered ↵Fabio Berger2018-08-031-5/+17
| | | | | | | | together in the docs
* | Add missing doc commentsFabio Berger2018-08-031-0/+6
|/
* 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 21:18:26 +0800