aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/test/exchange
Commit message (Collapse)AuthorAgeFilesLines
* Make it possible to configure block polling interval in base contract wrapperLeonid Logvinov2018-07-056-24/+24
|
* Improve robustness of revert reason assertionsAlex Browne2018-07-036-47/+47
|
* Remove unused variableFabio Berger2018-07-021-1/+0
|
* Merge branch 'v2-prototype' into fix/five_decimal_scenarioFabio Berger2018-07-028-257/+139
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-302-5/+5
| |
| * Update file structureAmir Bandeali2018-06-307-92/+91
| |
| * Make registerAssetProxy append onlyAmir Bandeali2018-06-305-141/+42
| |
| * Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codesAlex Browne2018-06-301-21/+3
| |
* | Print out entire orderFill scenarioFabio Berger2018-07-021-7/+1
|/
* Reduce the userAddresses to the individual addresses actually used by tests, ↵Fabio Berger2018-06-285-13/+22
| | | | 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-271-8/+33
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-271-6/+31
| |
| * Make dispatchTransferFrom revert with reason from AssetProxy on failureAmir Bandeali2018-06-271-2/+2
| |
* | Move combinatorial fillOrder tests into the `fill_ordere` test fileFabio Berger2018-06-272-48/+21
| |
* | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testingFabio Berger2018-06-276-45/+45
|\| | | | | | | | | | | | | | | | | | | | | * 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-266-54/+54
| |
| * Merge branch 'v2-prototype' into refactor/check-revert-reasonsFabio Berger2018-06-265-10/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-265-10/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-263-3/+3
| | |
| * | 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-256-18/+10
|\ \ \ | | |/ | |/|
| * | Move RevertReasons to @0xproject/types packageFabio Berger2018-06-256-18/+10
| | |
* | | merge check-revert-reasonsFabio Berger2018-06-256-67/+112
|\| |
| * | Fix tslintFabio Berger2018-06-234-4/+4
| | |
| * | Fix prettierFabio Berger2018-06-233-10/+10
| | |
| * | Rename ContractLibErrors to RevertReasonsFabio Berger2018-06-236-54/+54
| | |
| * | Remove revert reason 'Exchange' prefixFabio Berger2018-06-231-1/+1
| | |
| * | Move constants over to ContractLibError enum and update all testsFabio Berger2018-06-231-4/+5
| | |
| * | 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-223-19/+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 .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-253-19/+435
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-222-2/+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-203-18/+134
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-187-305/+356
| | |\
| | * | Update Order utils to use eip712Jacob Evans2018-06-062-8/+6
| | | |
| | * | Add missing EIP191 prefix for EIP712Jacob Evans2018-06-051-2/+7
| | | |
| * | | 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-195-5/+20
| | |
* | | 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-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
* | | 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-0/+48
|/ /
* | 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
| |
* | Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-132-20/+87
| |
* | Removed setting makerAssetData/takerAssetData from tests where values are ↵Greg Hysen2018-06-081-34/+0
| | | | | | | | same as defaultOrderParams.
* | Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-082-4/+4
| |
* | Converged on naming scheme for asset data: renamed all instances of ↵Greg Hysen2018-06-087-128/+128
| | | | | | | | assetMetadata, proxyData, proxyMetadata to assetData
* | Add missing awaitTransactionSuccessAsync callsAlex Browne2018-06-081-0/+6
| |
* | Fixed pathFabio Berger2018-06-072-10/+10
| |
* | merge v2-prototypeFabio Berger2018-06-077-151/+158
|\ \
| * \ Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-075-104/+134
| |\ \ | | | | | | | | | | | | feature/improve-linting
| | * | 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-075-45/+45
| | | |
| | * | Fix linter errorsAlex Browne2018-06-071-6/+2
| | | |
| | * | Add additional gas to calls to fillOrderNoThrowAlex Browne2018-06-072-146/+49
| | | |
| | * | Fix some more test cases, especially those that call increaseTimeAlex Browne2018-06-071-36/+47
| | | |
| | * | Update exchange/transactions tests for Geth error messagesAlex Browne2018-06-071-4/+4
| | | |
| | * | Add more transactions to Geth on init. Skip tests that are failing.Alex Browne2018-06-073-9/+106
| | | |
| | * | Replace constant.REVERT test assertions with ↵Alex Browne2018-06-075-90/+70
| | |/ | | | | | | | | | expectRevertOrAlwaysFailingTransaction
| * / Linter now passesfragosti2018-06-067-37/+14
| |/
* / move generated contract wrappers from `contract_wrappers/generated/` to ↵Fabio Berger2018-06-067-26/+26
|/ | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
* Rebase from v2-prototypeJacob Evans2018-06-052-38/+2
|
* Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵Amir Bandeali2018-06-054-71/+69
| | | | 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-022-2/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Introduce ethereum-types packageLeonid Logvinov2018-06-012-2/+4
| |
| * Fix buildAmir Bandeali2018-06-011-1/+1
| |
* | fix method renameFabio Berger2018-06-011-1/+1
| |
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-014-13/+141
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-317-0/+42
| |
| * Fix formatting and testsAmir Bandeali2018-05-317-48/+6
| |
| * Use last byte of signature as signature typeAmir Bandeali2018-05-312-7/+6
| |
| * 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-307-61/+35
|/ | | | package.
* Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-251-7/+2
|\ | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress
| * Cleanup testsAmir Bandeali2018-05-251-2/+2
| |
| * Update multisig tests and utilsAmir Bandeali2018-05-251-5/+0
| |
* | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hashFabio Berger2018-05-256-10/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Temporarily disable installation tests Pin connect in sra-report Fix a typo Pin types in sra-report Fix linter issues Unpin types version in @0xproject/connect Pin types version in website Do a fake version bump on types so that yarn doesn't try to install updated version for not yet migrated packages Migrate migrations to v2 # Conflicts: # packages/contracts/src/utils/order_utils.ts
| * | Fix linter issuesLeonid Logvinov2018-05-252-2/+2
| | |
| * | Migrate migrations to v2Leonid Logvinov2018-05-256-10/+9
| |/
* | Use domain separator for exchange addressJacob Evans2018-05-251-2/+8
| |
* | publicGetOrderSchemaHash -> getOrderSchemaHashJacob Evans2018-05-251-1/+1
| |
* | Update order hash to match latest eip712Jacob Evans2018-05-251-0/+6
|/
* Check transaction receipt status codes where applicableAlex Browne2018-05-245-28/+28
|
* Move contract utilsLeonid Logvinov2018-05-241-1/+1
|
* Fix Tslint error caused by "PromiseLike" valueFabio Berger2018-05-231-0/+6
|
* Fix importFabio Berger2018-05-231-1/+1
|
* 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 2024-09-07 19:56:32 +0800