aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange/wrapper.ts
Commit message (Collapse)AuthorAgeFilesLines
* Move packages/contracts to contracts/coreLeonid Logvinov2018-12-031-1452/+0
|
* chore: change package org from 0xproject to 0xJacob Evans2018-10-181-5/+5
|
* Move generated contract wrappers and artifacts into contracts packageAlex Browne2018-10-161-7/+7
|
* Add reentrancy tests for fillOrder and wrapper functionsAmir Bandeali2018-08-251-0/+193
|
* merge v2-prototypeFabio Berger2018-07-181-31/+217
|\
| * Add tests for getOrderInfo and getOrdersInfoAmir Bandeali2018-07-181-3/+187
| |
| * Fix bugs having to do with block timestamps and order expirationTimesAlex Browne2018-07-171-29/+31
| |
* | Rename assetProxyUtils to assetDataUtilsFabio Berger2018-07-171-14/+14
|/
* Make it possible to configure block polling interval in base contract wrapperLeonid Logvinov2018-07-051-4/+4
|
* Improve robustness of revert reason assertionsAlex Browne2018-07-031-6/+6
|
* Update file structureAmir Bandeali2018-06-301-15/+15
|
* Make registerAssetProxy append onlyAmir Bandeali2018-06-301-3/+3
|
* Reduce the userAddresses to the individual addresses actually used by tests, ↵Fabio Berger2018-06-281-2/+3
| | | | as well as only deploy the number of ERC20 tokens needed for each test suite
* Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testingFabio Berger2018-06-271-6/+6
|\ | | | | | | | | | | | | | | | | | | | | * 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
| * Rename RevertReasons to RevertReason since singular enum names are more commonFabio Berger2018-06-261-6/+6
| |
| * Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-261-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts
* | \ Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-261-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts
| * | Fix testsAmir Bandeali2018-06-261-1/+1
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-251-2/+2
|\ \ \ | | |/ | |/|
| * | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-251-2/+2
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-251-10/+17
|\| |
| * | Fix tslintFabio Berger2018-06-231-1/+1
| | |
| * | Fix prettierFabio Berger2018-06-231-3/+1
| | |
| * | Rename ContractLibErrors to RevertReasonsFabio Berger2018-06-231-6/+6
| | |
| * | Add revert reason checks to wrapper testsFabio Berger2018-06-221-10/+19
| |/
* | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-251-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Use make-promises-safe as a preloader instead of manually importingAlex Browne2018-06-221-1/+0
| |
* | Remove hack in ERC20WrapperFabio Berger2018-06-191-1/+4
| |
* | - Refactor assetWrapper to contain more of the normalizing logic instead of ↵Fabio Berger2018-06-151-1/+1
|/ | | | | | | | 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
* 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-131-1/+1
|
* Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-131-18/+81
|
* Converged on naming scheme for asset data: renamed all instances of ↵Greg Hysen2018-06-081-13/+13
| | | | assetMetadata, proxyData, proxyMetadata to assetData
* Fixed pathFabio Berger2018-06-071-5/+5
|
* merge v2-prototypeFabio Berger2018-06-071-25/+51
|\
| * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-071-16/+44
| |\ | | | | | | | | | feature/improve-linting
| | * Apply various fixes based on PR feedbackAlex Browne2018-06-071-0/+18
| | |
| | * Add Async suffix to relevant assertionsAlex Browne2018-06-071-8/+8
| | |
| | * Add additional gas to calls to fillOrderNoThrowAlex Browne2018-06-071-137/+45
| | |
| | * Fix some more test cases, especially those that call increaseTimeAlex Browne2018-06-071-36/+47
| | |
| | * Add more transactions to Geth on init. Skip tests that are failing.Alex Browne2018-06-071-7/+97
| | |
| | * Replace constant.REVERT test assertions with ↵Alex Browne2018-06-071-14/+15
| | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction
| * | Linter now passesfragosti2018-06-061-3/+1
| |/
* / move generated contract wrappers from `contract_wrappers/generated/` to ↵Fabio Berger2018-06-061-6/+6
|/ | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
* Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵Amir Bandeali2018-06-051-1/+1
| | | | failures, and remove redundant logic in matchOrders
* Fix tslint issuesFabio Berger2018-06-021-1/+1
|
* Initial refactor of order-utils. Move many utils from contracts into this ↵Fabio Berger2018-05-301-3/+3
| | | | package.
* Migrate migrations to v2Leonid Logvinov2018-05-251-1/+2
|
* Check transaction receipt status codes where applicableAlex Browne2018-05-241-6/+6
|
* Fix ExchangeWrapperFabio Berger2018-05-231-1/+1
|
* Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-231-18/+42
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Add `are` to boolean naming conventions Fix tslint Fix the tsutils version, fixing ts typings issue Rename some variables in multi_sig_with_time_lock.ts Remove extra awaitTransactionMinedAsync calls Update artifacts Update yarn.lock Fix warnings in Metacoin Upgrade UglifyJS to include ES6 support Add CancelOrder and MatchOrder types Add missing return types Ignore classnames linter rule Apply changes to test/exchange/match_orders.ts Fix some unhandled promise rejections Add awaitTransactionMinedAsync after every sent transaction Add missing blockchainLifecycle calls to contracts tests # Conflicts: # packages/contracts/src/utils/exchange_wrapper.ts # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/dispatcher.ts # packages/contracts/test/multi_sig_with_time_lock.ts
| * Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-221-18/+36
| |
| * Add missing blockchainLifecycle calls to contracts testsAlex Browne2018-05-221-0/+6
| |
* | Remove 0x.js dep from contractsFabio Berger2018-05-231-22/+15
|/
* merge developmentFabio Berger2018-05-221-0/+1
|\
| * Use make-promises-safe to catch unhandled rejections in testsAlex Browne2018-05-171-0/+1
| |
* | Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-161-9/+11
|\|
| * Fix linter errorsLeonid Logvinov2018-05-111-1/+1
| |
| * Remove unused deployer docs configsLeonid Logvinov2018-05-101-7/+7
| |
| * Fix linter issuesLeonid Logvinov2018-05-101-6/+10
| |
| * Remove deployer from metacoin and contract testsLeonid Logvinov2018-05-101-18/+40
| |
* | Fix merge conflict issuesFabio Berger2018-04-241-1/+0
| |
* | merge v2-prototypeFabio Berger2018-04-241-93/+112
|\ \
| * | Rename variables, create private validation methods in token wrappersAmir Bandeali2018-04-241-93/+111
| | |
* | | Fix testsAmir Bandeali2018-04-241-31/+9
|/ /
* | Fix and cleanup testsAmir Bandeali2018-04-241-305/+280
| |
* | Rename proxyUtils => assetProxyUtilsAmir Bandeali2018-04-231-14/+14
| |
* | Rename missed variablesAmir Bandeali2018-04-231-100/+100
| |
* | Rename token => assetAmir Bandeali2018-04-221-219/+219
| |
* | Rename DummyToken => DummyERC20TokenAmir Bandeali2018-04-221-10/+10
| |
* | export proxyUtils instead of individual functionsAmir Bandeali2018-04-221-14/+14
| |
* | Remove unused constructor argumentsAmir Bandeali2018-04-221-2/+1
| |
* | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less ↵Greg Hysen2018-04-211-2/+2
| | | | | | | | confusion. Also updated the function description.
* | Miscellaneous style changes to the contracts package; specifically testsGreg Hysen2018-04-211-2/+4
| |
* | Ran prettierGreg Hysen2018-04-211-10/+2
| |
* | renaming after tokenTransferProxy was removedGreg Hysen2018-04-211-28/+28
| |
* | switched to constants in default order params.Greg Hysen2018-04-211-2/+2
| |
* | Removed takerTokenAddress and makerTokenAddress from Order struct.Greg Hysen2018-04-211-92/+89
| |
* | Moved ERC721 FillOrderNoThrow tests into wrapperGreg Hysen2018-04-211-17/+60
| |
* | Replaced instances of `accounts[0]` with `owner` in contracts test casesGreg Hysen2018-04-211-3/+4
| |
* | Ran prettier/linter on new contract testsGreg Hysen2018-04-211-1/+0
| |
* | Added comments around deploying contracts to helper/wrapper testsGreg Hysen2018-04-211-36/+16
| |
* | Minor style improvements to asset proxy utilsGreg Hysen2018-04-211-10/+10
| |
* | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetDataGreg Hysen2018-04-211-6/+6
| |
* | nilAddress to ZeroEx.NULL_ADDRESSGreg Hysen2018-04-211-3/+2
| |
* | Removed unnecessary assetProxyManagerAddressGreg Hysen2018-04-211-5/+1
| |
* | setAssetProxy to addAssetProxyGreg Hysen2018-04-211-2/+2
| |
* | Renamed TransferProxy to ProxyGreg Hysen2018-04-211-2/+4
| |
* | Renaming TransferProxy to ProxyGreg Hysen2018-04-211-8/+8
| |
* | Asset Proxy DispatcherGreg Hysen2018-04-211-10/+80
| |
* | Revert variable namingAmir Bandeali2018-04-211-175/+183
| |
* | Update Solidity syntax and commentsAmir Bandeali2018-04-211-6/+1
| |
* | Add tests for marketBuyOrdersAmir Bandeali2018-04-211-2/+172
| |
* | Add marketBuyOrders, rename variables, and fx old testsAmir Bandeali2018-04-211-206/+194
| |
* | Remove partial cancelsAmir Bandeali2018-04-211-3/+1
| |
* | Add private keys for testrpc mnemonicAmir Bandeali2018-04-211-2/+2
| |
* | Address feedback and lintAmir Bandeali2018-04-211-1/+1
| |
* | Add tests for fillOrderNoThrow based functionsAmir Bandeali2018-04-211-18/+302
| |
* | Add fillOrderNoThrow to exchange wrapper and add testAmir Bandeali2018-04-211-6/+48
| |
* | Modify tests to work with new utilsAmir Bandeali2018-04-211-113/+145
| |
* | Move utils dir into srcAmir Bandeali2018-04-211-5/+5
| |
* | Get tests to buildAmir Bandeali2018-04-211-55/+55
|/
* Fix testsLeonid Logvinov2018-04-051-1/+0
|
* Move our contract templates to accept Provider instead of Web3WrapperLeonid Logvinov2018-04-041-12/+9
|
* Add sol-cover implementationLeonid Logvinov2018-03-121-3/+2
|
* Improve an error message when an inorrect number of constructor params is passedLeonid Logvinov2018-02-281-3/+3
|
* Use the same templates as 0x.jsLeonid Logvinov2018-02-281-6/+14
|
* Fix build by using local events typesLeonid Logvinov2018-02-281-1/+6
|
* Fix namingsLeonid Logvinov2018-02-091-84/+90
|
* Use Order and SignedOrder type from 0x.jsLeonid Logvinov2018-02-071-81/+73
|
* Introduce SignedOrder class and remove type assertionsLeonid Logvinov2018-02-071-1/+2
|
* Change testsLeonid Logvinov2018-02-071-23/+36
|
* Remove accounts magic from testsLeonid Logvinov2018-01-301-3/+2
|
* Make an RPC constructor param implicitLeonid Logvinov2018-01-301-1/+1
|
* Use an enum for contract nameLeonid Logvinov2018-01-301-7/+7
|
* Remove truffle from testsLeonid Logvinov2018-01-301-30/+30
|
* Refactor contracts tests to not use injected web3 instanceLeonid Logvinov2018-01-301-6/+3
|
* Remove truffle from Exchange testsLeonid Logvinov2018-01-301-7/+24
|
* Remove truffle from tokenTransferProxy testsLeonid Logvinov2018-01-301-0/+348
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-26 14:26:07 +0800