aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange
Commit message (Collapse)AuthorAgeFilesLines
* Fix ExchangeWrapperFabio Berger2018-05-234-10/+4
|
* Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-237-111/+241
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵Fabio Berger2018-05-237-107/+237
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2-prototype * 'v2-prototype' of github.com:0xProject/0x-monorepo: Rename some variables in multi_sig_with_time_lock.ts Remove extra awaitTransactionMinedAsync calls 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
| | * Apply changes to test/exchange/match_orders.tsAlex Browne2018-05-221-6/+18
| | |
| | * Fix some unhandled promise rejectionsAlex Browne2018-05-221-2/+6
| | |
| | * Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-224-99/+177
| | |
| | * Add missing blockchainLifecycle calls to contracts testsAlex Browne2018-05-226-0/+36
| | |
| * | Fix tslint issuesFabio Berger2018-05-231-4/+4
| |/
* / Remove 0x.js dep from contractsFabio Berger2018-05-237-160/+136
|/
* Merge pull request #572 from 0xProject/feature/contracts/atomicMatchingGreg Hysen2018-05-223-16/+847
|\ | | | | Atomic Order Matching
| * Rebased against v2-prototypeGreg Hysen2018-05-192-9/+11
| |
| * Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ↵Greg Hysen2018-05-191-20/+1
| | | | | | | | we dont need to pass it in on each call.
| * The OrderInfo struct is now returned by the getOrderInfo functionGreg Hysen2018-05-191-64/+41
| |
| * Throw if the left or right orders do not compute the correct fill results. I ↵Greg Hysen2018-05-191-10/+8
| | | | | | | | like this better than just logging an error and failing silently.
| * Style changes to atomic order matchingGreg Hysen2018-05-191-1/+1
| |
| * Atomic Order Matching - TestsGreg Hysen2018-05-193-17/+890
| |
* | merge developmentFabio Berger2018-05-222-1/+2
|\ \ | |/ |/|
| * Use make-promises-safe to catch unhandled rejections in testsAlex Browne2018-05-173-0/+3
| |
* | Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-166-61/+56
|\|
| * Fix linter errorsLeonid Logvinov2018-05-113-3/+3
| |
| * Remove unused deployer docs configsLeonid Logvinov2018-05-103-21/+21
| |
| * Fix linter issuesLeonid Logvinov2018-05-103-18/+22
| |
| * Remove deployer from metacoin and contract testsLeonid Logvinov2018-05-103-46/+135
| |
* | Add hard coded proxyId into each AssetProxyAmir Bandeali2018-05-011-0/+12
| |
* | Make all lib functions internal, add contracts for testingAmir Bandeali2018-04-273-178/+248
| |
* | Add tests and commentsAmir Bandeali2018-04-271-15/+25
| |
* | Add testsAmir Bandeali2018-04-271-4/+38
| |
* | Update tests and utilsAmir Bandeali2018-04-271-0/+161
| |
* | Fix merge conflict issuesFabio Berger2018-04-242-2/+0
| |
* | merge v2-prototypeFabio Berger2018-04-243-158/+183
|\ \
| * | Rename variables, create private validation methods in token wrappersAmir Bandeali2018-04-242-148/+171
| | |
* | | Fix testsAmir Bandeali2018-04-244-95/+286
|/ /
* | Fix and cleanup testsAmir Bandeali2018-04-243-563/+488
| |
* | Rename proxyUtils => assetProxyUtilsAmir Bandeali2018-04-233-37/+37
| |
* | Rename missed variablesAmir Bandeali2018-04-232-246/+246
| |
* | Add missing async suffixAmir Bandeali2018-04-221-11/+11
| |
* | Rename token => assetAmir Bandeali2018-04-223-442/+442
| |
* | Rename DummyToken => DummyERC20TokenAmir Bandeali2018-04-223-23/+23
| |
* | export proxyUtils instead of individual functionsAmir Bandeali2018-04-223-37/+37
| |
* | Remove unused constructor argumentsAmir Bandeali2018-04-223-6/+3
| |
* | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less ↵Greg Hysen2018-04-212-4/+4
| | | | | | | | confusion. Also updated the function description.
* | Miscellaneous style changes to the contracts package; specifically testsGreg Hysen2018-04-212-4/+8
| |
* | Ran prettierGreg Hysen2018-04-212-20/+4
| |
* | renaming after tokenTransferProxy was removedGreg Hysen2018-04-212-54/+54
| |
* | Removed ERC20 V1 Proxy + TokenTransferProxyGreg Hysen2018-04-212-56/+5
| |
* | switched to constants in default order params.Greg Hysen2018-04-212-4/+4
| |
* | Removed takerTokenAddress and makerTokenAddress from Order struct.Greg Hysen2018-04-213-176/+159
| |
* | Removed unnecessary deployments in testGreg Hysen2018-04-211-17/+1
| |
* | Moved ERC721 FillOrderNoThrow tests into wrapperGreg Hysen2018-04-212-45/+60
| |
* | Style improvements to the Asset Proxy testsGreg Hysen2018-04-211-95/+93
| |
* | Replaced instances of `accounts[0]` with `owner` in contracts test casesGreg Hysen2018-04-213-14/+17
| |
* | Updated ERC20 v1 proxy names in testsGreg Hysen2018-04-211-2/+2
| |
* | Ran prettier/linter on new contract testsGreg Hysen2018-04-212-3/+0
| |
* | Added comments around deploying contracts to helper/wrapper testsGreg Hysen2018-04-212-65/+34
| |
* | TS styles in core contract testsGreg Hysen2018-04-211-91/+38
| |
* | Removed some unused ERC721 tokensGreg Hysen2018-04-211-62/+13
| |
* | Minor style improvements to asset proxy utilsGreg Hysen2018-04-213-39/+39
| |
* | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetDataGreg Hysen2018-04-213-28/+28
| |
* | nilAddress to ZeroEx.NULL_ADDRESSGreg Hysen2018-04-213-10/+7
| |
* | Removed unnecessary assetProxyManagerAddressGreg Hysen2018-04-213-15/+3
| |
* | setAssetProxy to addAssetProxyGreg Hysen2018-04-213-7/+7
| |
* | Renamed TransferProxy to ProxyGreg Hysen2018-04-212-5/+7
| |
* | Renaming TransferProxy to ProxyGreg Hysen2018-04-213-22/+22
| |
* | Asset Proxy DispatcherGreg Hysen2018-04-213-20/+620
| |
* | Add back require statements and tests (will move to another PR)Amir Bandeali2018-04-211-0/+42
| |
* | Revert variable namingAmir Bandeali2018-04-213-303/+313
| |
* | Update Solidity syntax and commentsAmir Bandeali2018-04-212-20/+15
| |
* | Add tests for marketBuyOrdersAmir Bandeali2018-04-211-2/+172
| |
* | Add marketBuyOrders, rename variables, and fx old testsAmir Bandeali2018-04-213-419/+355
| |
* | Fix build errorsAmir Bandeali2018-04-211-13/+21
| |
* | Separate filled/cancelled errorsAmir Bandeali2018-04-211-2/+2
| |
* | Remove partial cancelsAmir Bandeali2018-04-212-69/+4
| |
* | updated test name to reflect smart contractsGreg Hysen2018-04-211-1/+1
| |
* | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that ↵Greg Hysen2018-04-211-23/+27
| | | | | | | | orders with salt <= to maker epoch will be cancelled (previously, it was salt < maker epoch)
* | Renamed all instances of timestamp to salt. Clarified test case wording.Greg Hysen2018-04-211-15/+15
| |
* | Fixed spacingGreg Hysen2018-04-211-51/+51
| |
* | Implementation and tests in the protocol for cancelling all orders up to a ↵Greg Hysen2018-04-211-0/+67
| | | | | | | | specific time
* | Add private keys for testrpc mnemonicAmir Bandeali2018-04-213-6/+6
| |
* | Address feedback and lintAmir Bandeali2018-04-212-6/+3
| |
* | Add tests for fillOrderNoThrow based functionsAmir Bandeali2018-04-212-130/+302
| |
* | Fix package.jsonAmir Bandeali2018-04-211-1/+0
| |
* | Add fillOrderNoThrow to exchange wrapper and add testAmir Bandeali2018-04-211-6/+48
| |
* | Modify tests to work with new utilsAmir Bandeali2018-04-213-371/+419
| |
* | Fix log decodingAmir Bandeali2018-04-211-13/+13
| |
* | Add logDecoder, remove outdated testsAmir Bandeali2018-04-211-13/+14
| |
* | Fix compile errorsAmir Bandeali2018-04-211-4/+4
| |
* | Move log decoding logic to exchange wrapperAmir Bandeali2018-04-211-10/+9
| |
* | Add logDecoder, remove outdated testsAmir Bandeali2018-04-211-124/+124
| |
* | Move utils dir into srcAmir Bandeali2018-04-213-21/+16
| |
* | Merge developmentAmir Bandeali2018-04-211-10/+7
| |
* | Run prettierAmir Bandeali2018-04-211-11/+3
| |
* | Get tests to buildAmir Bandeali2018-04-212-173/+150
|/
* Fix testsLeonid Logvinov2018-04-051-1/+0
|
* Move our contract templates to accept Provider instead of Web3WrapperLeonid Logvinov2018-04-043-22/+19
|
* Add sol-cover implementationLeonid Logvinov2018-03-123-9/+6
|
* Remove onlyLeonid Logvinov2018-02-281-1/+1
|
* Fix a typoLeonid Logvinov2018-02-281-1/+1
|
* Improve an error message when an inorrect number of constructor params is passedLeonid Logvinov2018-02-283-10/+10
|
* Change backend for contracts contractsLeonid Logvinov2018-02-281-4/+4
|
* Fix namingsLeonid Logvinov2018-02-281-2/+2
|
* Use the same templates as 0x.jsLeonid Logvinov2018-02-283-14/+26
|
* Fix build by using local events typesLeonid Logvinov2018-02-283-12/+19
|
* Fix namingsLeonid Logvinov2018-02-091-84/+90
|
* Use Order and SignedOrder type from 0x.jsLeonid Logvinov2018-02-073-241/+233
|
* Introduce SignedOrder class and remove type assertionsLeonid Logvinov2018-02-073-220/+223
|
* Make orderHashHex a getter instead of a propertyLeonid Logvinov2018-02-072-26/+37
|
* Change testsLeonid Logvinov2018-02-073-58/+89
|
* Update contract versions, fix testsAmir Bandeali2018-02-031-1/+1
|
* Remove accounts magic from testsLeonid Logvinov2018-01-303-8/+4
|
* Make an RPC constructor param implicitLeonid Logvinov2018-01-303-3/+3
|
* Use an enum for contract nameLeonid Logvinov2018-01-303-20/+21
|
* Normalize the dependenciesLeonid Logvinov2018-01-301-35/+24
|
* Remove truffle from testsLeonid Logvinov2018-01-303-99/+113
|
* Refactor contracts tests to not use injected web3 instanceLeonid Logvinov2018-01-303-20/+9
|
* Remove truffle from Exchange testsLeonid Logvinov2018-01-303-20/+65
|
* Remove truffle from tokenTransferProxy testsLeonid Logvinov2018-01-303-0/+1367
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-18 09:06:58 +0800