aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange/transactions.ts
Commit message (Collapse)AuthorAgeFilesLines
* Revert all changes to the contractsLeonid Logvinov2018-07-051-2/+2
|
* Change import paths from z_r_x and e_r_c to zrx and erc. Also rename event ↵Leonid Logvinov2018-06-291-2/+2
| | | | args after templates change
* Reduce the userAddresses to the individual addresses actually used by tests, ↵Fabio Berger2018-06-281-2/+8
| | | | 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-8/+8
|\ | | | | | | | | | | | | | | | | | | | | * 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-8/+8
| |
| * 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-16/+22
|\| |
| * | Fix tslintFabio Berger2018-06-231-1/+1
| | |
| * | Fix prettierFabio Berger2018-06-231-3/+1
| | |
| * | Rename ContractLibErrors to RevertReasonsFabio Berger2018-06-231-8/+8
| | |
| * | Change Whitelist error messages to conform to rest and added revert reason ↵Fabio Berger2018-06-221-16/+24
| |/ | | | | | | checks to transactions tests
* | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-201-0/+112
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * Rename makerEpoch => orderEpochAmir Bandeali2018-06-201-5/+5
| |
| * Make cancelOrdersUpTo compatible with sender abstractionAmir Bandeali2018-06-201-0/+112
| |
* | Remove hack in ERC20WrapperFabio Berger2018-06-191-1/+4
|/
* Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATAAmir Bandeali2018-06-131-1/+1
|
* Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-081-2/+2
|
* Converged on naming scheme for asset data: renamed all instances of ↵Greg Hysen2018-06-081-3/+3
| | | | assetMetadata, proxyData, proxyMetadata to assetData
* Add missing awaitTransactionSuccessAsync callsAlex Browne2018-06-081-0/+6
|
* merge v2-prototypeFabio Berger2018-06-071-16/+15
|\
| * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-071-12/+13
| |\ | | | | | | | | | feature/improve-linting
| | * Update contracts tests after rebaseAlex Browne2018-06-071-2/+2
| | |
| | * Add Async suffix to relevant assertionsAlex Browne2018-06-071-6/+6
| | |
| | * Update exchange/transactions tests for Geth error messagesAlex Browne2018-06-071-4/+4
| | |
| | * Replace constant.REVERT test assertions with ↵Alex Browne2018-06-071-6/+7
| | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction
| * | Linter now passesfragosti2018-06-061-4/+2
| |/
* / move generated contract wrappers from `contract_wrappers/generated/` to ↵Fabio Berger2018-06-061-4/+4
|/ | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
* Rebase from v2-prototypeJacob Evans2018-06-051-1/+1
|
* Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵Amir Bandeali2018-06-051-3/+3
| | | | failures, and remove redundant logic in matchOrders
* Improve comments and remove unused importsFabio Berger2018-06-021-1/+1
|
* fix method renameFabio Berger2018-06-011-1/+1
|
* Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-011-3/+133
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-311-0/+6
| |
| * Fix formatting and testsAmir Bandeali2018-05-311-9/+4
| |
| * Remove TxOrigin signature type, modify whitelist to use Validator signature typeAmir Bandeali2018-05-311-0/+4
| |
| * Update Whitelist contract with comments, also require maker to be whitelistedAmir Bandeali2018-05-311-4/+29
| |
| * Add example whitelist contract and minimum testsAmir Bandeali2018-05-311-2/+89
| |
* | Introduce OrderWithoutExchangeAddress type since this is what get's sent to ↵Fabio Berger2018-05-311-6/+6
| | | | | | | | the smart contracts
* | Initial refactor of order-utils. Move many utils from contracts into this ↵Fabio Berger2018-05-301-9/+3
|/ | | | package.
* Fix linter issuesLeonid Logvinov2018-05-251-1/+1
|
* Migrate migrations to v2Leonid Logvinov2018-05-251-3/+2
|
* Check transaction receipt status codes where applicableAlex Browne2018-05-241-1/+1
|
* Fix ExchangeWrapperFabio Berger2018-05-231-1/+1
|
* Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-231-1/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1/+4
| |
| * Add missing blockchainLifecycle calls to contracts testsAlex Browne2018-05-221-0/+6
| |
* | Remove 0x.js dep from contractsFabio Berger2018-05-231-10/+2
|/
* Atomic Order Matching - TestsGreg Hysen2018-05-191-2/+2
|
* Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-161-8/+9
|
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-12 22:29:26 +0800