Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make it possible to configure block polling interval in base contract wrapper | Leonid Logvinov | 2018-07-05 | 6 | -24/+24 |
| | |||||
* | Improve robustness of revert reason assertions | Alex Browne | 2018-07-03 | 6 | -47/+47 |
| | |||||
* | Remove unused variable | Fabio Berger | 2018-07-02 | 1 | -1/+0 |
| | |||||
* | Merge branch 'v2-prototype' into fix/five_decimal_scenario | Fabio Berger | 2018-07-02 | 8 | -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 build | Amir Bandeali | 2018-06-30 | 2 | -5/+5 |
| | | |||||
| * | Update file structure | Amir Bandeali | 2018-06-30 | 7 | -92/+91 |
| | | |||||
| * | Make registerAssetProxy append only | Amir Bandeali | 2018-06-30 | 5 | -141/+42 |
| | | |||||
| * | Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes | Alex Browne | 2018-06-30 | 1 | -21/+3 |
| | | |||||
* | | Print out entire orderFill scenario | Fabio Berger | 2018-07-02 | 1 | -7/+1 |
|/ | |||||
* | Reduce the userAddresses to the individual addresses actually used by tests, ↵ | Fabio Berger | 2018-06-28 | 5 | -13/+22 |
| | | | | as well as only deploy the number of ERC20 tokens needed for each test suite | ||||
* | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 1 | -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 tests | Amir Bandeali | 2018-06-27 | 1 | -6/+31 |
| | | |||||
| * | Make dispatchTransferFrom revert with reason from AssetProxy on failure | Amir Bandeali | 2018-06-27 | 1 | -2/+2 |
| | | |||||
* | | Move combinatorial fillOrder tests into the `fill_ordere` test file | Fabio Berger | 2018-06-27 | 2 | -48/+21 |
| | | |||||
* | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 6 | -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 Berger | 2018-06-27 | 1 | -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 common | Fabio Berger | 2018-06-26 | 6 | -54/+54 |
| | | |||||
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-26 | 5 | -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-testing | Fabio Berger | 2018-06-26 | 5 | -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 tests | Amir Bandeali | 2018-06-26 | 3 | -3/+3 |
| | | | |||||
| * | | Remove proxyId argument from dispatchTransferFrom | Remco Bloemen | 2018-06-26 | 2 | -7/+4 |
| | | | |||||
* | | | Fix inconsistency between contract and reference implementation of order ↵ | Fabio Berger | 2018-06-26 | 1 | -0/+2 |
| | | | | | | | | | | | | validation logic | ||||
* | | | Prettier fixes | Fabio Berger | 2018-06-26 | 1 | -4/+1 |
| | | | |||||
* | | | Fix tslint issues | Fabio Berger | 2018-06-26 | 3 | -4/+1 |
| | | | |||||
* | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 6 | -18/+10 |
|\ \ \ | | |/ | |/| | |||||
| * | | Move RevertReasons to @0xproject/types package | Fabio Berger | 2018-06-25 | 6 | -18/+10 |
| | | | |||||
* | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 6 | -67/+112 |
|\| | | |||||
| * | | Fix tslint | Fabio Berger | 2018-06-23 | 4 | -4/+4 |
| | | | |||||
| * | | Fix prettier | Fabio Berger | 2018-06-23 | 3 | -10/+10 |
| | | | |||||
| * | | Rename ContractLibErrors to RevertReasons | Fabio Berger | 2018-06-23 | 6 | -54/+54 |
| | | | |||||
| * | | Remove revert reason 'Exchange' prefix | Fabio Berger | 2018-06-23 | 1 | -1/+1 |
| | | | |||||
| * | | Move constants over to ContractLibError enum and update all tests | Fabio Berger | 2018-06-23 | 1 | -4/+5 |
| | | | |||||
| * | | Fix test now that contract reverts with message | Fabio Berger | 2018-06-22 | 1 | -5/+3 |
| | | | |||||
| * | | Add revert reason checks to wrapper tests | Fabio Berger | 2018-06-22 | 1 | -10/+19 |
| | | | |||||
| * | | Fix tests | Fabio Berger | 2018-06-22 | 1 | -2/+2 |
| | | | |||||
| * | | Change Whitelist error messages to conform to rest and added revert reason ↵ | Fabio Berger | 2018-06-22 | 1 | -16/+24 |
| | | | | | | | | | | | | checks to transactions tests | ||||
| * | | Add revert reason checks to match_orders tests | Fabio Berger | 2018-06-22 | 1 | -7/+18 |
| | | | |||||
| * | | Fix tests | Fabio Berger | 2018-06-22 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-22 | 3 | -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 tests | Fabio Berger | 2018-06-22 | 2 | -5/+13 |
| | | | |||||
| * | | remove .only | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| | | | |||||
| * | | Update core tests to actually check revert message | Fabio Berger | 2018-06-21 | 1 | -34/+53 |
| | | | |||||
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-25 | 3 | -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 importing | Alex Browne | 2018-06-22 | 2 | -2/+0 |
| | | | |||||
| * | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ↵ | Amir Bandeali | 2018-06-22 | 1 | -2/+50 |
| | | | | | | | | | | | | accross all contracts | ||||
| * | | Add senderAddress to Fill and Cancel logs, add comments to events and types | Amir Bandeali | 2018-06-22 | 1 | -0/+2 |
| | | | |||||
| * | | Linter | Greg Hysen | 2018-06-21 | 1 | -2/+1 |
| | | | |||||
| * | | Changed wording of two tests #nit | Greg Hysen | 2018-06-21 | 1 | -2/+2 |
| | | | |||||
| * | | Minor improvements to MixinSignatureValidator tests | Greg Hysen | 2018-06-21 | 1 | -14/+8 |
| | | | |||||
| * | | Remove .only | Greg Hysen | 2018-06-21 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed two mislabelled revert reasons + Signature Validator revert tests ↵ | Greg Hysen | 2018-06-21 | 1 | -6/+10 |
| | | | | | | | | | | | | working on Geth | ||||
| * | | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported ↵ | Greg Hysen | 2018-06-21 | 1 | -15/+386 |
| |/ | | | | | | | types. Fixed trezor prefix. | ||||
* | | Add support for approveAll in assetWrapper and fillOrderScenarios | Fabio Berger | 2018-06-21 | 1 | -1/+39 |
| | | |||||
* | | Split balance and allowance amount types in prep of adding the "unlimited" ↵ | Fabio Berger | 2018-06-20 | 1 | -13/+14 |
| | | | | | | | | allowance enum value | ||||
* | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-20 | 3 | -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-prefix | Jacob Evans | 2018-06-20 | 1 | -3/+7 |
| |\ | | | | | | | Add missing EIP191 prefix for EIP712 and Execute Transaction | ||||
| | * | Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefix | Jacob Evans | 2018-06-18 | 7 | -305/+356 |
| | |\ | |||||
| | * | | Update Order utils to use eip712 | Jacob Evans | 2018-06-06 | 2 | -8/+6 |
| | | | | |||||
| | * | | Add missing EIP191 prefix for EIP712 | Jacob Evans | 2018-06-05 | 1 | -2/+7 |
| | | | | |||||
| * | | | Rename makerEpoch => orderEpoch | Amir Bandeali | 2018-06-20 | 2 | -20/+20 |
| | | | | |||||
| * | | | Make cancelOrdersUpTo compatible with sender abstraction | Amir Bandeali | 2018-06-20 | 1 | -0/+112 |
| | |/ | |/| | |||||
* | | | Remove hack in ERC20Wrapper | Fabio Berger | 2018-06-19 | 5 | -5/+20 |
| | | | |||||
* | | | Add ability to tweak the relevant balances/allowances for the maker and ↵ | Fabio Berger | 2018-06-15 | 2 | -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 Berger | 2018-06-15 | 1 | -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 Berger | 2018-06-14 | 2 | -17/+11 |
| | | | | | | | | | | | | generateOrderCombinations to generateFillOrderCombinations | ||||
* | | | Use a defaultFillScenario in fillOrder tests | Fabio Berger | 2018-06-14 | 1 | -36/+39 |
| | | | |||||
* | | | Replace initial set of legacy manually written fillOrder tests with ↵ | Fabio Berger | 2018-06-14 | 2 | -434/+186 |
| | | | | | | | | | | | | declarative FillScenario tests | ||||
* | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ↵ | Fabio Berger | 2018-06-14 | 1 | -6/+12 |
| | | | | | | | | | | | | FillScenario | ||||
* | | | Move orderFill combinatorialTests to exchange folder | Fabio Berger | 2018-06-13 | 1 | -0/+48 |
|/ / | |||||
* | | Unpop byte rather than making deep copy | Amir Bandeali | 2018-06-13 | 1 | -0/+4 |
| | | |||||
* | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA | Amir Bandeali | 2018-06-13 | 4 | -4/+4 |
| | | |||||
* | | Pop id from assetData before dispatching to AssetProxies | Amir Bandeali | 2018-06-13 | 2 | -20/+87 |
| | | |||||
* | | Removed setting makerAssetData/takerAssetData from tests where values are ↵ | Greg Hysen | 2018-06-08 | 1 | -34/+0 |
| | | | | | | | | same as defaultOrderParams. | ||||
* | | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 2 | -4/+4 |
| | | |||||
* | | Converged on naming scheme for asset data: renamed all instances of ↵ | Greg Hysen | 2018-06-08 | 7 | -128/+128 |
| | | | | | | | | assetMetadata, proxyData, proxyMetadata to assetData | ||||
* | | Add missing awaitTransactionSuccessAsync calls | Alex Browne | 2018-06-08 | 1 | -0/+6 |
| | | |||||
* | | Fixed path | Fabio Berger | 2018-06-07 | 2 | -10/+10 |
| | | |||||
* | | merge v2-prototype | Fabio Berger | 2018-06-07 | 7 | -151/+158 |
|\ \ | |||||
| * \ | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 5 | -104/+134 |
| |\ \ | | | | | | | | | | | | | feature/improve-linting | ||||
| | * | | Update contracts tests after rebase | Alex Browne | 2018-06-07 | 2 | -14/+14 |
| | | | | |||||
| | * | | Apply various fixes based on PR feedback | Alex Browne | 2018-06-07 | 2 | -11/+54 |
| | | | | |||||
| | * | | Add Async suffix to relevant assertions | Alex Browne | 2018-06-07 | 5 | -45/+45 |
| | | | | |||||
| | * | | Fix linter errors | Alex Browne | 2018-06-07 | 1 | -6/+2 |
| | | | | |||||
| | * | | Add additional gas to calls to fillOrderNoThrow | Alex Browne | 2018-06-07 | 2 | -146/+49 |
| | | | | |||||
| | * | | Fix some more test cases, especially those that call increaseTime | Alex Browne | 2018-06-07 | 1 | -36/+47 |
| | | | | |||||
| | * | | Update exchange/transactions tests for Geth error messages | Alex Browne | 2018-06-07 | 1 | -4/+4 |
| | | | | |||||
| | * | | Add more transactions to Geth on init. Skip tests that are failing. | Alex Browne | 2018-06-07 | 3 | -9/+106 |
| | | | | |||||
| | * | | Replace constant.REVERT test assertions with ↵ | Alex Browne | 2018-06-07 | 5 | -90/+70 |
| | |/ | | | | | | | | | | expectRevertOrAlwaysFailingTransaction | ||||
| * / | Linter now passes | fragosti | 2018-06-06 | 7 | -37/+14 |
| |/ | |||||
* / | move generated contract wrappers from `contract_wrappers/generated/` to ↵ | Fabio Berger | 2018-06-06 | 7 | -26/+26 |
|/ | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
* | Rebase from v2-prototype | Jacob Evans | 2018-06-05 | 2 | -38/+2 |
| | |||||
* | Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵ | Amir Bandeali | 2018-06-05 | 4 | -71/+69 |
| | | | | failures, and remove redundant logic in matchOrders | ||||
* | Improve comments and remove unused imports | Fabio Berger | 2018-06-02 | 1 | -1/+1 |
| | |||||
* | Fix tslint issues | Fabio Berger | 2018-06-02 | 2 | -3/+2 |
| | |||||
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 2 | -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 package | Leonid Logvinov | 2018-06-01 | 2 | -2/+4 |
| | | |||||
| * | Fix build | Amir Bandeali | 2018-06-01 | 1 | -1/+1 |
| | | |||||
* | | fix method rename | Fabio Berger | 2018-06-01 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-01 | 4 | -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 Bandeali | 2018-05-31 | 1 | -13/+27 |
| | | | | | | | | needed, and rename function | ||||
| * | Add back before/after snapshots for each test | Amir Bandeali | 2018-05-31 | 7 | -0/+42 |
| | | |||||
| * | Fix formatting and tests | Amir Bandeali | 2018-05-31 | 7 | -48/+6 |
| | | |||||
| * | Use last byte of signature as signature type | Amir Bandeali | 2018-05-31 | 2 | -7/+6 |
| | | |||||
| * | Remove TxOrigin signature type, modify whitelist to use Validator signature type | Amir Bandeali | 2018-05-31 | 1 | -0/+4 |
| | | |||||
| * | Update Whitelist contract with comments, also require maker to be whitelisted | Amir Bandeali | 2018-05-31 | 1 | -4/+29 |
| | | |||||
| * | Add example whitelist contract and minimum tests | Amir Bandeali | 2018-05-31 | 1 | -2/+89 |
| | | |||||
* | | Introduce OrderWithoutExchangeAddress type since this is what get's sent to ↵ | Fabio Berger | 2018-05-31 | 1 | -6/+6 |
| | | | | | | | | the smart contracts | ||||
* | | Initial refactor of order-utils. Move many utils from contracts into this ↵ | Fabio Berger | 2018-05-30 | 7 | -61/+35 |
|/ | | | | package. | ||||
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 1 | -7/+2 |
|\ | | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress | ||||
| * | Cleanup tests | Amir Bandeali | 2018-05-25 | 1 | -2/+2 |
| | | |||||
| * | Update multisig tests and utils | Amir Bandeali | 2018-05-25 | 1 | -5/+0 |
| | | |||||
* | | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash | Fabio Berger | 2018-05-25 | 6 | -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 issues | Leonid Logvinov | 2018-05-25 | 2 | -2/+2 |
| | | | |||||
| * | | Migrate migrations to v2 | Leonid Logvinov | 2018-05-25 | 6 | -10/+9 |
| |/ | |||||
* | | Use domain separator for exchange address | Jacob Evans | 2018-05-25 | 1 | -2/+8 |
| | | |||||
* | | publicGetOrderSchemaHash -> getOrderSchemaHash | Jacob Evans | 2018-05-25 | 1 | -1/+1 |
| | | |||||
* | | Update order hash to match latest eip712 | Jacob Evans | 2018-05-25 | 1 | -0/+6 |
|/ | |||||
* | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 5 | -28/+28 |
| | |||||
* | Move contract utils | Leonid Logvinov | 2018-05-24 | 1 | -1/+1 |
| | |||||
* | Fix Tslint error caused by "PromiseLike" value | Fabio Berger | 2018-05-23 | 1 | -0/+6 |
| | |||||
* | Fix import | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | |||||
* | Fix ExchangeWrapper | Fabio Berger | 2018-05-23 | 4 | -10/+4 |
| | |||||
* | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 7 | -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 Berger | 2018-05-23 | 7 | -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.ts | Alex Browne | 2018-05-22 | 1 | -6/+18 |
| | | | |||||
| | * | Fix some unhandled promise rejections | Alex Browne | 2018-05-22 | 1 | -2/+6 |
| | | | |||||
| | * | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 4 | -99/+177 |
| | | | |||||
| | * | Add missing blockchainLifecycle calls to contracts tests | Alex Browne | 2018-05-22 | 6 | -0/+36 |
| | | | |||||
| * | | Fix tslint issues | Fabio Berger | 2018-05-23 | 1 | -4/+4 |
| |/ | |||||
* / | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 7 | -160/+136 |
|/ | |||||
* | Merge pull request #572 from 0xProject/feature/contracts/atomicMatching | Greg Hysen | 2018-05-22 | 3 | -16/+847 |
|\ | | | | | Atomic Order Matching | ||||
| * | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 2 | -9/+11 |
| | | |||||
| * | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ↵ | Greg Hysen | 2018-05-19 | 1 | -20/+1 |
| | | | | | | | | we dont need to pass it in on each call. | ||||
| * | The OrderInfo struct is now returned by the getOrderInfo function | Greg Hysen | 2018-05-19 | 1 | -64/+41 |
| | | |||||
| * | Throw if the left or right orders do not compute the correct fill results. I ↵ | Greg Hysen | 2018-05-19 | 1 | -10/+8 |
| | | | | | | | | like this better than just logging an error and failing silently. | ||||
| * | Style changes to atomic order matching | Greg Hysen | 2018-05-19 | 1 | -1/+1 |
| | | |||||
| * | Atomic Order Matching - Tests | Greg Hysen | 2018-05-19 | 3 | -17/+890 |
| | | |||||
* | | merge development | Fabio Berger | 2018-05-22 | 2 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 3 | -0/+3 |
| | | |||||
* | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 6 | -61/+56 |
|\| | |||||
| * | Fix linter errors | Leonid Logvinov | 2018-05-11 | 3 | -3/+3 |
| | | |||||
| * | Remove unused deployer docs configs | Leonid Logvinov | 2018-05-10 | 3 | -21/+21 |
| | | |||||
| * | Fix linter issues | Leonid Logvinov | 2018-05-10 | 3 | -18/+22 |
| | | |||||
| * | Remove deployer from metacoin and contract tests | Leonid Logvinov | 2018-05-10 | 3 | -46/+135 |
| | | |||||
* | | Add hard coded proxyId into each AssetProxy | Amir Bandeali | 2018-05-01 | 1 | -0/+12 |
| | | |||||
* | | Make all lib functions internal, add contracts for testing | Amir Bandeali | 2018-04-27 | 3 | -178/+248 |
| | | |||||
* | | Add tests and comments | Amir Bandeali | 2018-04-27 | 1 | -15/+25 |
| | | |||||
* | | Add tests | Amir Bandeali | 2018-04-27 | 1 | -4/+38 |
| | | |||||
* | | Update tests and utils | Amir Bandeali | 2018-04-27 | 1 | -0/+161 |
| | | |||||
* | | Fix merge conflict issues | Fabio Berger | 2018-04-24 | 2 | -2/+0 |
| | | |||||
* | | merge v2-prototype | Fabio Berger | 2018-04-24 | 3 | -158/+183 |
|\ \ | |||||
| * | | Rename variables, create private validation methods in token wrappers | Amir Bandeali | 2018-04-24 | 2 | -148/+171 |
| | | | |||||
* | | | Fix tests | Amir Bandeali | 2018-04-24 | 4 | -95/+286 |
|/ / | |||||
* | | Fix and cleanup tests | Amir Bandeali | 2018-04-24 | 3 | -563/+488 |
| | | |||||
* | | Rename proxyUtils => assetProxyUtils | Amir Bandeali | 2018-04-23 | 3 | -37/+37 |
| | | |||||
* | | Rename missed variables | Amir Bandeali | 2018-04-23 | 2 | -246/+246 |
| | | |||||
* | | Add missing async suffix | Amir Bandeali | 2018-04-22 | 1 | -11/+11 |
| | | |||||
* | | Rename token => asset | Amir Bandeali | 2018-04-22 | 3 | -442/+442 |
| | | |||||
* | | Rename DummyToken => DummyERC20Token | Amir Bandeali | 2018-04-22 | 3 | -23/+23 |
| | | |||||
* | | export proxyUtils instead of individual functions | Amir Bandeali | 2018-04-22 | 3 | -37/+37 |
| | | |||||
* | | Remove unused constructor arguments | Amir Bandeali | 2018-04-22 | 3 | -6/+3 |
| | | |||||
* | | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less ↵ | Greg Hysen | 2018-04-21 | 2 | -4/+4 |
| | | | | | | | | confusion. Also updated the function description. | ||||
* | | Miscellaneous style changes to the contracts package; specifically tests | Greg Hysen | 2018-04-21 | 2 | -4/+8 |
| | | |||||
* | | Ran prettier | Greg Hysen | 2018-04-21 | 2 | -20/+4 |
| | | |||||
* | | renaming after tokenTransferProxy was removed | Greg Hysen | 2018-04-21 | 2 | -54/+54 |
| | | |||||
* | | Removed ERC20 V1 Proxy + TokenTransferProxy | Greg Hysen | 2018-04-21 | 2 | -56/+5 |
| | | |||||
* | | switched to constants in default order params. | Greg Hysen | 2018-04-21 | 2 | -4/+4 |
| | | |||||
* | | Removed takerTokenAddress and makerTokenAddress from Order struct. | Greg Hysen | 2018-04-21 | 3 | -176/+159 |
| | | |||||
* | | Removed unnecessary deployments in test | Greg Hysen | 2018-04-21 | 1 | -17/+1 |
| | | |||||
* | | Moved ERC721 FillOrderNoThrow tests into wrapper | Greg Hysen | 2018-04-21 | 2 | -45/+60 |
| | | |||||
* | | Style improvements to the Asset Proxy tests | Greg Hysen | 2018-04-21 | 1 | -95/+93 |
| | | |||||
* | | Replaced instances of `accounts[0]` with `owner` in contracts test cases | Greg Hysen | 2018-04-21 | 3 | -14/+17 |
| | | |||||
* | | Updated ERC20 v1 proxy names in tests | Greg Hysen | 2018-04-21 | 1 | -2/+2 |
| | | |||||
* | | Ran prettier/linter on new contract tests | Greg Hysen | 2018-04-21 | 2 | -3/+0 |
| | | |||||
* | | Added comments around deploying contracts to helper/wrapper tests | Greg Hysen | 2018-04-21 | 2 | -65/+34 |
| | | |||||
* | | TS styles in core contract tests | Greg Hysen | 2018-04-21 | 1 | -91/+38 |
| | | |||||
* | | Removed some unused ERC721 tokens | Greg Hysen | 2018-04-21 | 1 | -62/+13 |
| | | |||||
* | | Minor style improvements to asset proxy utils | Greg Hysen | 2018-04-21 | 3 | -39/+39 |
| | | |||||
* | | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetData | Greg Hysen | 2018-04-21 | 3 | -28/+28 |
| | | |||||
* | | nilAddress to ZeroEx.NULL_ADDRESS | Greg Hysen | 2018-04-21 | 3 | -10/+7 |
| | | |||||
* | | Removed unnecessary assetProxyManagerAddress | Greg Hysen | 2018-04-21 | 3 | -15/+3 |
| | | |||||
* | | setAssetProxy to addAssetProxy | Greg Hysen | 2018-04-21 | 3 | -7/+7 |
| | | |||||
* | | Renamed TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 2 | -5/+7 |
| | | |||||
* | | Renaming TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 3 | -22/+22 |
| | | |||||
* | | Asset Proxy Dispatcher | Greg Hysen | 2018-04-21 | 3 | -20/+620 |
| | | |||||
* | | Add back require statements and tests (will move to another PR) | Amir Bandeali | 2018-04-21 | 1 | -0/+42 |
| | | |||||
* | | Revert variable naming | Amir Bandeali | 2018-04-21 | 3 | -303/+313 |
| | | |||||
* | | Update Solidity syntax and comments | Amir Bandeali | 2018-04-21 | 2 | -20/+15 |
| | | |||||
* | | Add tests for marketBuyOrders | Amir Bandeali | 2018-04-21 | 1 | -2/+172 |
| | | |||||
* | | Add marketBuyOrders, rename variables, and fx old tests | Amir Bandeali | 2018-04-21 | 3 | -419/+355 |
| | | |||||
* | | Fix build errors | Amir Bandeali | 2018-04-21 | 1 | -13/+21 |
| | | |||||
* | | Separate filled/cancelled errors | Amir Bandeali | 2018-04-21 | 1 | -2/+2 |
| | | |||||
* | | Remove partial cancels | Amir Bandeali | 2018-04-21 | 2 | -69/+4 |
| | | |||||
* | | updated test name to reflect smart contracts | Greg Hysen | 2018-04-21 | 1 | -1/+1 |
| | | |||||
* | | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that ↵ | Greg Hysen | 2018-04-21 | 1 | -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 Hysen | 2018-04-21 | 1 | -15/+15 |
| | | |||||
* | | Fixed spacing | Greg Hysen | 2018-04-21 | 1 | -51/+51 |
| | | |||||
* | | Implementation and tests in the protocol for cancelling all orders up to a ↵ | Greg Hysen | 2018-04-21 | 1 | -0/+67 |
| | | | | | | | | specific time | ||||
* | | Add private keys for testrpc mnemonic | Amir Bandeali | 2018-04-21 | 3 | -6/+6 |
| | | |||||
* | | Address feedback and lint | Amir Bandeali | 2018-04-21 | 2 | -6/+3 |
| | | |||||
* | | Add tests for fillOrderNoThrow based functions | Amir Bandeali | 2018-04-21 | 2 | -130/+302 |
| | | |||||
* | | Fix package.json | Amir Bandeali | 2018-04-21 | 1 | -1/+0 |
| | | |||||
* | | Add fillOrderNoThrow to exchange wrapper and add test | Amir Bandeali | 2018-04-21 | 1 | -6/+48 |
| | | |||||
* | | Modify tests to work with new utils | Amir Bandeali | 2018-04-21 | 3 | -371/+419 |
| | | |||||
* | | Fix log decoding | Amir Bandeali | 2018-04-21 | 1 | -13/+13 |
| | | |||||
* | | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 1 | -13/+14 |
| | | |||||
* | | Fix compile errors | Amir Bandeali | 2018-04-21 | 1 | -4/+4 |
| | | |||||
* | | Move log decoding logic to exchange wrapper | Amir Bandeali | 2018-04-21 | 1 | -10/+9 |
| | | |||||
* | | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 1 | -124/+124 |
| | | |||||
* | | Move utils dir into src | Amir Bandeali | 2018-04-21 | 3 | -21/+16 |
| | | |||||
* | | Merge development | Amir Bandeali | 2018-04-21 | 1 | -10/+7 |
| | | |||||
* | | Run prettier | Amir Bandeali | 2018-04-21 | 1 | -11/+3 |
| | | |||||
* | | Get tests to build | Amir Bandeali | 2018-04-21 | 2 | -173/+150 |
|/ | |||||
* | Fix tests | Leonid Logvinov | 2018-04-05 | 1 | -1/+0 |
| | |||||
* | Move our contract templates to accept Provider instead of Web3Wrapper | Leonid Logvinov | 2018-04-04 | 3 | -22/+19 |
| | |||||
* | Add sol-cover implementation | Leonid Logvinov | 2018-03-12 | 3 | -9/+6 |
| | |||||
* | Remove only | Leonid Logvinov | 2018-02-28 | 1 | -1/+1 |
| | |||||
* | Fix a typo | Leonid Logvinov | 2018-02-28 | 1 | -1/+1 |
| | |||||
* | Improve an error message when an inorrect number of constructor params is passed | Leonid Logvinov | 2018-02-28 | 3 | -10/+10 |
| | |||||
* | Change backend for contracts contracts | Leonid Logvinov | 2018-02-28 | 1 | -4/+4 |
| | |||||
* | Fix namings | Leonid Logvinov | 2018-02-28 | 1 | -2/+2 |
| | |||||
* | Use the same templates as 0x.js | Leonid Logvinov | 2018-02-28 | 3 | -14/+26 |
| | |||||
* | Fix build by using local events types | Leonid Logvinov | 2018-02-28 | 3 | -12/+19 |
| | |||||
* | Fix namings | Leonid Logvinov | 2018-02-09 | 1 | -84/+90 |
| | |||||
* | Use Order and SignedOrder type from 0x.js | Leonid Logvinov | 2018-02-07 | 3 | -241/+233 |
| | |||||
* | Introduce SignedOrder class and remove type assertions | Leonid Logvinov | 2018-02-07 | 3 | -220/+223 |
| | |||||
* | Make orderHashHex a getter instead of a property | Leonid Logvinov | 2018-02-07 | 2 | -26/+37 |
| | |||||
* | Change tests | Leonid Logvinov | 2018-02-07 | 3 | -58/+89 |
| | |||||
* | Update contract versions, fix tests | Amir Bandeali | 2018-02-03 | 1 | -1/+1 |
| | |||||
* | Remove accounts magic from tests | Leonid Logvinov | 2018-01-30 | 3 | -8/+4 |
| | |||||
* | Make an RPC constructor param implicit | Leonid Logvinov | 2018-01-30 | 3 | -3/+3 |
| | |||||
* | Use an enum for contract name | Leonid Logvinov | 2018-01-30 | 3 | -20/+21 |
| | |||||
* | Normalize the dependencies | Leonid Logvinov | 2018-01-30 | 1 | -35/+24 |
| | |||||
* | Remove truffle from tests | Leonid Logvinov | 2018-01-30 | 3 | -99/+113 |
| | |||||
* | Refactor contracts tests to not use injected web3 instance | Leonid Logvinov | 2018-01-30 | 3 | -20/+9 |
| | |||||
* | Remove truffle from Exchange tests | Leonid Logvinov | 2018-01-30 | 3 | -20/+65 |
| | |||||
* | Remove truffle from tokenTransferProxy tests | Leonid Logvinov | 2018-01-30 | 3 | -0/+1367 |