Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Apply new linter rules | Amir Bandeali | 2018-07-07 | 73 | -298/+350 |
| | |||||
* | Merge pull request #522 from 0xProject/feature/contracts/forwarder | Jacob Evans | 2018-07-06 | 11 | -1/+1102 |
|\ | | | | | Forwarding contract | ||||
| * | Forwarding contract (squashed commits) | Jacob Evans | 2018-07-06 | 11 | -1/+1102 |
| | | |||||
* | | Contracts 2.0.0 were linted with solhint | Alex Shafranovich | 2018-07-06 | 60 | -1/+78 |
|/ | |||||
* | Update file structure | Amir Bandeali | 2018-06-30 | 107 | -3375/+1 |
| | |||||
* | Make registerAssetProxy append only | Amir Bandeali | 2018-06-30 | 6 | -60/+25 |
| | |||||
* | Change getTransactionReceipt to awaitTransactionMined | Amir Bandeali | 2018-06-30 | 1 | -1/+1 |
| | |||||
* | Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes | Alex Browne | 2018-06-30 | 1 | -6/+35 |
| | |||||
* | Fix deployment to geth | Amir Bandeali | 2018-06-30 | 1 | -1/+1 |
| | |||||
* | Fix tests | Amir Bandeali | 2018-06-30 | 3 | -7/+10 |
| | |||||
* | Remove transferFrom, implement in fallback function | Amir Bandeali | 2018-06-30 | 6 | -290/+267 |
| | |||||
* | Merge pull request #774 from 0xProject/style/contracts/abiEncodeAsmComments | Amir Bandeali | 2018-06-30 | 2 | -0/+22 |
|\ | | | | | Added some comments for ASM hashing | ||||
| * | Updated hashing comments as-per PR | Greg Hysen | 2018-06-29 | 1 | -9/+4 |
| | | |||||
| * | Comments for ASM hashing | Greg Hysen | 2018-06-26 | 2 | -0/+27 |
| | | |||||
* | | Remove unused constants | Fabio Berger | 2018-06-28 | 1 | -2/+0 |
| | | |||||
* | | Reduce the userAddresses to the individual addresses actually used by tests, ↵ | Fabio Berger | 2018-06-28 | 1 | -1/+2 |
| | | | | | | | | as well as only deploy the number of ERC20 tokens needed for each test suite | ||||
* | | Add await time constant | Fabio Berger | 2018-06-28 | 1 | -0/+2 |
| | | |||||
* | | Add missing awaitTransactionSuccessAsync calls | Fabio Berger | 2018-06-28 | 1 | -6/+10 |
| | | |||||
* | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 12 | -517/+312 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | Make dispatchTransferFrom revert with reason from AssetProxy on failure | Amir Bandeali | 2018-06-27 | 1 | -5/+4 |
| | | | |||||
| * | | Remove redundant files, hard code function selector in dispatchTransferFrom, ↵ | Amir Bandeali | 2018-06-27 | 13 | -701/+198 |
| | | | | | | | | | | | | and modify revert reason | ||||
| * | | Updated offset of receiverData length to reflect new assetData encoding. | Greg Hysen | 2018-06-27 | 1 | -2/+2 |
| | | | |||||
| * | | ERC20 Custom storage layout | Remco Bloemen | 2018-06-27 | 2 | -3/+5 |
| | | | |||||
| * | | Golf the authorization check | Remco Bloemen | 2018-06-27 | 2 | -122/+132 |
| | | | |||||
| * | | ERC20 manual memory layout | Remco Bloemen | 2018-06-27 | 1 | -11/+6 |
| | | | |||||
| * | | ERC20 inline return | Remco Bloemen | 2018-06-27 | 1 | -6/+11 |
| | | | |||||
| * | | ERC721 inline return | Remco Bloemen | 2018-06-27 | 1 | -8/+9 |
| | | | |||||
| * | | Golf ERC721 transferFrom | Remco Bloemen | 2018-06-27 | 2 | -3/+166 |
| | | | |||||
| * | | Inline ERC20 tranferFrom selector constant | Remco Bloemen | 2018-06-27 | 1 | -4/+3 |
| | | | |||||
| * | | Optimize ERC20 transferFrom | Remco Bloemen | 2018-06-27 | 1 | -2/+126 |
| | | | |||||
* | | | Fix type issue | Fabio Berger | 2018-06-27 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 1 | -1/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | Expect RevertReason be passed in, not string | Fabio Berger | 2018-06-26 | 1 | -1/+5 |
| | | | |||||
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-26 | 23 | -202/+370 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | | Update AbstractAssetWrapper | Fabio Berger | 2018-06-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix merge issues | Fabio Berger | 2018-06-26 | 4 | -16/+17 |
| | | | | |||||
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-26 | 23 | -202/+370 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | | Don't use variables for revert reasons | Amir Bandeali | 2018-06-26 | 13 | -84/+82 |
| | | | | |||||
| * | | | Add comments to dispatchTransferFrom | Amir Bandeali | 2018-06-26 | 1 | -30/+56 |
| | | | | |||||
| * | | | Document IAssetData | Remco Bloemen | 2018-06-26 | 1 | -0/+3 |
| | | | | |||||
| * | | | Compute bytes4 proxyid constants | Remco Bloemen | 2018-06-26 | 2 | -2/+2 |
| | | | | |||||
| * | | | Return inplace bytes in LibBytes.readBytesWithLength | Remco Bloemen | 2018-06-26 | 1 | -9/+7 |
| | | | | |||||
| * | | | Add Greg's documentation to MixinErc721Transfer | Remco Bloemen | 2018-06-26 | 1 | -33/+44 |
| | | | | |||||
| * | | | Add Greg's documentation to MixinErc20Transfer | Remco Bloemen | 2018-06-26 | 1 | -13/+35 |
| | | | | |||||
| * | | | Gas golf the transfer success logic | Remco Bloemen | 2018-06-26 | 1 | -11/+10 |
| | | | | |||||
| * | | | Optimize like in PR #767 | Remco Bloemen | 2018-06-26 | 3 | -34/+157 |
| | | | | |||||
| * | | | Fix tests | Amir Bandeali | 2018-06-26 | 1 | -16/+0 |
| | | | | |||||
| * | | | Fix ERC721Proxy TokenId | Remco Bloemen | 2018-06-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | WIP | Remco Bloemen | 2018-06-26 | 2 | -2/+2 |
| | | | | |||||
| * | | | ABI encoded asset data | Remco Bloemen | 2018-06-26 | 9 | -29/+51 |
| | | | | |||||
| * | | | Remove proxyId argument from dispatchTransferFrom | Remco Bloemen | 2018-06-26 | 6 | -34/+16 |
| | |/ | |/| | |||||
* | | | Prettier fixes | Fabio Berger | 2018-06-26 | 1 | -4/+1 |
| | | | |||||
* | | | Fix tslint issues | Fabio Berger | 2018-06-26 | 4 | -18/+3 |
| | | | |||||
* | | | Check revert reasons in declarative and combinatorial tests | Fabio Berger | 2018-06-25 | 1 | -7/+8 |
| | | | |||||
* | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 1 | -44/+0 |
|\ \ \ | | |/ | |/| | |||||
| * | | Move RevertReasons to @0xproject/types package | Fabio Berger | 2018-06-25 | 1 | -44/+0 |
| | | | |||||
* | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 5 | -21/+63 |
|\| | | |||||
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-25 | 19 | -340/+424 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (48 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/contracts/current/utils/Ownable/Ownable.sol # packages/contracts/test/libraries/lib_bytes.ts | ||||
| * | | Rename ContractLibErrors to RevertReasons | Fabio Berger | 2018-06-23 | 1 | -1/+1 |
| | | | |||||
| * | | Remove revert reason 'Exchange' prefix | Fabio Berger | 2018-06-23 | 1 | -2/+2 |
| | | | |||||
| * | | Move constants over to ContractLibError enum and update all tests | Fabio Berger | 2018-06-23 | 2 | -15/+10 |
| | | | |||||
| * | | Standardize ERC20 error strings given convention | Fabio Berger | 2018-06-23 | 1 | -3/+2 |
| | | | |||||
| * | | Fix test now that contract reverts with message | Fabio Berger | 2018-06-22 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-22 | 3 | -27/+48 |
| |\ \ | | | | | | | | | | | | | | | | | * v2-prototype: Check that assetProxy exists before attempting transfer | ||||
| * | | | Change Whitelist error messages to conform to rest and added revert reason ↵ | Fabio Berger | 2018-06-22 | 2 | -5/+7 |
| | | | | | | | | | | | | | | | | checks to transactions tests | ||||
| * | | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-22 | 26 | -352/+454 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 reasons in Authorizable tests | Fabio Berger | 2018-06-21 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Change revert reason in ownable to be similar to all other revert reasons | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update core tests to actually check revert message | Fabio Berger | 2018-06-21 | 2 | -0/+44 |
| | | | | | |||||
* | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-25 | 38 | -703/+910 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | | | Fix typos in comments | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add modifier and tests for removeAuthorizedAddressAtIndex | Amir Bandeali | 2018-06-23 | 2 | -2/+10 |
| | | | | | |||||
| * | | | | Update and add tests | Amir Bandeali | 2018-06-23 | 2 | -3/+5 |
| | | | | | |||||
| * | | | | Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex | Amir Bandeali | 2018-06-23 | 2 | -13/+22 |
| | | | | | |||||
| * | | | | Move isFunctionRemoveAuthorizedAddress to test | Remco Bloemen | 2018-06-23 | 3 | -14/+50 |
| | | | | | |||||
| * | | | | Fix usage of `popLastByte` | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Fix LibBytes is a library | Remco Bloemen | 2018-06-23 | 6 | -15/+12 |
| | | | | | |||||
| * | | | | Remove `areBytesEqual` | Remco Bloemen | 2018-06-23 | 1 | -35/+0 |
| | | | | | |||||
| * | | | | Fix usage of `contentAddress()` | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Clean low bits in bytes4 | Remco Bloemen | 2018-06-23 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Clean high bits in address | Remco Bloemen | 2018-06-23 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Refactor LibBytes.readBytes4 for consistency | Remco Bloemen | 2018-06-23 | 3 | -11/+18 |
| | | | | | |||||
| * | | | | Fix LibBytes.equals | Remco Bloemen | 2018-06-23 | 1 | -21/+4 |
| | | | | | |||||
| * | | | | Add trailing garbage testcase for LibBytes.equals | Remco Bloemen | 2018-06-23 | 1 | -0/+11 |
| | | | | | |||||
| * | | | | Rename bytes.equals | Remco Bloemen | 2018-06-23 | 2 | -2/+37 |
| | | | | | |||||
| * | | | | Add slice and sliceDestructive | Remco Bloemen | 2018-06-23 | 1 | -0/+46 |
| | | | | | |||||
| * | | | | Rename bytes.rawAddress and add bytes.contentAddress | Remco Bloemen | 2018-06-23 | 2 | -8/+25 |
| | | | | | |||||
| * | | | | Rename read/writeBytesWithLength | Remco Bloemen | 2018-06-23 | 3 | -7/+7 |
| | | | | | |||||
| * | | | | Using LibBytes for bytes | Remco Bloemen | 2018-06-23 | 6 | -26/+38 |
| | | | | | |||||
| * | | | | Make LibBytes a library | Remco Bloemen | 2018-06-23 | 6 | -35/+30 |
| | | | | | |||||
| * | | | | Merge LibMem and LibBytes | Remco Bloemen | 2018-06-23 | 6 | -206/+150 |
| | | | | | |||||
| * | | | | Merge pull request #749 from 0xProject/feature/contracts/transactionHashAsm | Amir Bandeali | 2018-06-23 | 1 | -8/+18 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Converted `hashZeroExTransaction` to assembly. Saves 1k gas | ||||
| | * | | | Apply mask to address to zero-out unused bytes. | Greg Hysen | 2018-06-23 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Converted `hashZeroExTransaction` to assembly. Saves 1k gas | Greg Hysen | 2018-06-22 | 1 | -8/+18 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #748 from 0xProject/fix/contracts/nullAssetProxy | Fabio Berger | 2018-06-22 | 3 | -27/+48 |
| |\ \ \ | | |/ / | |/| | | Check that assetProxy exists before attempting transfer | ||||
| | * | | Check that assetProxy exists before attempting transfer | Amir Bandeali | 2018-06-22 | 3 | -27/+48 |
| | | | | |||||
| * | | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ↵ | Amir Bandeali | 2018-06-22 | 14 | -68/+94 |
| | | | | | | | | | | | | | | | | accross all contracts | ||||
| * | | | Add senderAddress to Fill and Cancel logs, add comments to events and types | Amir Bandeali | 2018-06-22 | 4 | -44/+45 |
| |/ / | |||||
| * | | Remove unreachable PreSigned check | Austin Roberts | 2018-06-22 | 1 | -4/+0 |
| | | | | | | | | | | | | This code was unreachable, as it had the exact same condition as line 206. | ||||
| * | | Set settleOrder and settleMatchedOrders to private | Greg Hysen | 2018-06-21 | 4 | -25/+2 |
| | | | |||||
| * | | Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and ↵ | Greg Hysen | 2018-06-21 | 8 | -238/+205 |
| | | | | | | | | | | | | `settleMatchedOrders` into `MixinMatchOrders` | ||||
| * | | Renamed constants in test wallet/validator | Greg Hysen | 2018-06-21 | 2 | -11/+11 |
| | | | |||||
| * | | Few more minor #nit wording changes | Greg Hysen | 2018-06-21 | 2 | -5/+5 |
| | | | |||||
| * | | Fixed two mislabelled revert reasons + Signature Validator revert tests ↵ | Greg Hysen | 2018-06-21 | 2 | -2/+7 |
| | | | | | | | | | | | | working on Geth | ||||
| * | | Minor style tweaks | Greg Hysen | 2018-06-21 | 3 | -8/+8 |
| | | | |||||
| * | | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported ↵ | Greg Hysen | 2018-06-21 | 6 | -11/+141 |
| |/ | | | | | | | types. Fixed trezor prefix. | ||||
* | | Add support for approveAll in assetWrapper and fillOrderScenarios | Fabio Berger | 2018-06-21 | 3 | -4/+41 |
| | | |||||
* | | Improve verbose logging | Fabio Berger | 2018-06-21 | 1 | -2/+5 |
| | | |||||
* | | Fix merge variable name issue | Fabio Berger | 2018-06-20 | 1 | -1/+1 |
| | | |||||
* | | Add support for setting allowance to unlimited | Fabio Berger | 2018-06-20 | 2 | -7/+35 |
| | | |||||
* | | Add noop conditionals for clarity | Fabio Berger | 2018-06-20 | 1 | -0/+10 |
| | | |||||
* | | Rename for clarity | Fabio Berger | 2018-06-20 | 1 | -8/+8 |
| | | |||||
* | | Split balance and allowance amount types in prep of adding the "unlimited" ↵ | Fabio Berger | 2018-06-20 | 2 | -38/+45 |
| | | | | | | | | allowance enum value | ||||
* | | Remove unneeded explicit type def | Fabio Berger | 2018-06-20 | 1 | -1/+1 |
| | | |||||
* | | Add TS 2.7 numeric separators to improve readability | Fabio Berger | 2018-06-20 | 1 | -6/+6 |
| | | |||||
* | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-20 | 15 | -82/+301 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 6 | -42/+159 |
| |\ | | | | | | | Add missing EIP191 prefix for EIP712 and Execute Transaction | ||||
| | * | Fix closing parens in liborder | Jacob Evans | 2018-06-20 | 1 | -16/+15 |
| | | | |||||
| | * | Assembler orderHash function | Remco Bloemen | 2018-06-19 | 1 | -18/+22 |
| | | | |||||
| | * | Optimize and remove redundant encodePacked | Jacob Evans | 2018-06-19 | 4 | -13/+23 |
| | | | |||||
| | * | Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefix | Jacob Evans | 2018-06-18 | 46 | -311/+1056 |
| | |\ | |||||
| | * | | Rebase and update feedback | Jacob Evans | 2018-06-18 | 4 | -81/+85 |
| | | | | | | | | | | | | | | | | | | | | | | | | Cache the domain separator data with address this Use the EIP712Types enum for types everywhere Rename EIP712 struct ExecuteTransaction to ZeroExTransaction | ||||
| | * | | Basic EIP712 encoder | Jacob Evans | 2018-06-08 | 1 | -10/+11 |
| | | | | |||||
| | * | | Update Order utils to use eip712 | Jacob Evans | 2018-06-06 | 7 | -170/+44 |
| | | | | |||||
| | * | | Add missing EIP191 prefix for EIP712 | Jacob Evans | 2018-06-05 | 9 | -48/+272 |
| | | | | |||||
| * | | | Update after rebase | Jacob Evans | 2018-06-20 | 1 | -7/+1 |
| | | | | |||||
| * | | | Rename makerEpoch => orderEpoch | Amir Bandeali | 2018-06-20 | 5 | -26/+29 |
| | | | | |||||
| * | | | Make cancelOrdersUpTo compatible with sender abstraction | Amir Bandeali | 2018-06-20 | 5 | -7/+110 |
| | | | | |||||
| * | | | Merge pull request #683 from 0xProject/fix/contracts/memcpy | Remco Bloemen | 2018-06-19 | 1 | -10/+12 |
| |\ \ \ | | | | | | | | | | | Simplified handling of source < 32 edge case | ||||
| | * | | | Simplified handling of source < 32 edge case | Remco Bloemen | 2018-06-11 | 1 | -10/+12 |
| | | | | | |||||
* | | | | | Add ability for verbose logging | Fabio Berger | 2018-06-20 | 1 | -2/+10 |
| | | | | | |||||
* | | | | | Fix typo | Fabio Berger | 2018-06-19 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Rename NewOrderFactory to OrderFactoryFromScenario for clarity | Fabio Berger | 2018-06-19 | 2 | -5/+5 |
| | | | | | |||||
* | | | | | Remove hack in ERC20Wrapper | Fabio Berger | 2018-06-19 | 1 | -6/+6 |
| | | | | | |||||
* | | | | | Cleanup coreCombinatorialUtils | Fabio Berger | 2018-06-19 | 1 | -220/+226 |
| | | | | | |||||
* | | | | | Comments and cleanup | Fabio Berger | 2018-06-19 | 1 | -20/+8 |
| | | | | | |||||
* | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 6 | -129/+206 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Prettier fix Update default params in sendRawPaylodAsync for improved JSON-RPC compatibility Fix missed merge conflicts Fix additional versions and update yarn.lock Add OrderWatcherConfig type to 0x.js docs page Export OrderWatcherConfig from 0x.js Update all package versions to match latest published to NPM Update CHANGELOG's with publishes performed on development branch Rebase with latest removing PROXY_ID from transfer Split transfer impl and AssetProxyMixin change @0xproject/types to ethereum-types remove mistaken comment workaround for TypeScript trailing comma bug Document contract_templates | ||||
| * | | | | Merge pull request #659 from ↵ | Jacob Evans | 2018-06-19 | 6 | -129/+206 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/contracts/split-proxy-internal-logic Split transfer implementation and AssetProxyMixin | ||||
| | * | | | | Rebase with latest removing PROXY_ID from transfer | Jacob Evans | 2018-06-18 | 5 | -95/+111 |
| | | | | | | |||||
| | * | | | | Split transfer impl and AssetProxyMixin | Jacob Evans | 2018-06-18 | 4 | -95/+156 |
| | | |_|/ | | |/| | | |||||
* | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 8 | -30/+104 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Increase number of columns in relayer grid for small screens Make isValidSignature public Make batchFill methods return FIllResults struct Remove remove_tags script Small fixes Use semver package instead of getNextPatchVersion Use semver library instead of semverUtils small fixes Show all errors of a given kind at once rather then throwing after the first instance is encountered fix package.json Add more prepublish checks remove remove_tags script Create a shared Image component Adjust version in changelog Update RelayerGridTile render logic to incorportate colors and logos Add max width to top bar Set max-width for LargeLayout Finish last onboarding step Finish set allowance step Add onboarding assets ... | ||||
| * | | | | Make isValidSignature public | Amir Bandeali | 2018-06-19 | 3 | -15/+15 |
| | | | | | |||||
| * | | | | Make batchFill methods return FIllResults struct | Amir Bandeali | 2018-06-19 | 2 | -10/+28 |
| |/ / / | |||||
| * | | | Merge pull request #700 from 0xProject/fix/contracts/tokenbugs | Remco Bloemen | 2018-06-16 | 1 | -1/+29 |
| |\ \ \ | | | | | | | | | | | Handle tokens that do not return bool | ||||
| | * | | | Handle tokens that do not return bool | Remco Bloemen | 2018-06-14 | 1 | -1/+29 |
| | | | | | |||||
| * | | | | Change wording of error message when you try to use more than one subprovider | Alex Browne | 2018-06-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix linter errors and remove coverage.json | Alex Browne | 2018-06-15 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Remove unused variables and other small fixes | Alex Browne | 2018-06-15 | 1 | -5/+6 |
| | | | | | |||||
| * | | | | Fix a bug in revert_trace.ts | Alex Browne | 2018-06-15 | 1 | -23/+23 |
| | | | | | |||||
| * | | | | Introduce subprovider for printing revert stack traces | Alex Browne | 2018-06-15 | 2 | -22/+50 |
| |/ / / | |||||
* | | | | Add ability to tweak the relevant balances/allowances for the maker and ↵ | Fabio Berger | 2018-06-15 | 2 | -35/+323 |
| | | | | | | | | | | | | | | | | 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 | 6 | -72/+311 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -43/+48 |
| | | | | | | | | | | | | | | | | generateOrderCombinations to generateFillOrderCombinations | ||||
* | | | | Fix incorrect string values in enum | Fabio Berger | 2018-06-14 | 1 | -2/+2 |
| | | | | |||||
* | | | | Fix calculation of expFilledTakerAmount and expected values in events emitted | Fabio Berger | 2018-06-14 | 1 | -4/+7 |
| | | | | |||||
* | | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ↵ | Fabio Berger | 2018-06-14 | 3 | -29/+141 |
| | | | | | | | | | | | | | | | | FillScenario | ||||
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-13 | 19 | -205/+200 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (26 commits) Rename _coverageCollector -> _profilerCollector in TraceCollectionSubprovider Refactor sol-cov to de-duplicate code for coverage and profiling Rename popByte and popAddress Hard code test addresses/bytes32 instead of generating pseudorandom ones Update artifacts Rename computeCoverageAsync -> computeSingleTraceCoverageAsync Fix linter errors Refactor sol-cov to avoid keeping traceInfo in memory Unpop byte rather than making deep copy Pass gas in to marketBuyOrdersNoThrow Looks up the memory location of makerAssetData/takerAssetData Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA Add tests for deepCopyBytes and missing write methods from LibBytes Pop id from assetData before dispatching to AssetProxies Upgrade solidity-parser-entlr 0.2.11 => 0.2.12 Fix import order Fix typos Add CHANGELOGs Speed-up sol-cov Increase delay when sending transactions during devnet startup ... | ||||
| * | | | Rename popByte and popAddress | Amir Bandeali | 2018-06-13 | 4 | -12/+12 |
| | | | | |||||
| * | | | Unpop byte rather than making deep copy | Amir Bandeali | 2018-06-13 | 3 | -90/+91 |
| | | | | |||||
| * | | | Pass gas in to marketBuyOrdersNoThrow | Amir Bandeali | 2018-06-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Looks up the memory location of makerAssetData/takerAssetData | Greg Hysen | 2018-06-13 | 1 | -0/+2 |
| | | | | |||||
| * | | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA | Amir Bandeali | 2018-06-13 | 1 | -19/+9 |
| | | | | |||||
| * | | | Add tests for deepCopyBytes and missing write methods from LibBytes | Amir Bandeali | 2018-06-13 | 2 | -0/+16 |
| | | | | |||||
| * | | | Pop id from assetData before dispatching to AssetProxies | Amir Bandeali | 2018-06-13 | 16 | -149/+132 |
| | | | | |||||
| * | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts ↵ | Alex Browne | 2018-06-12 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | tests | ||||
* | | | | Implement initial set of orderFill combinatorial tests | Fabio Berger | 2018-06-13 | 10 | -187/+553 |
| | | | | |||||
* | | | | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper ↵ | Fabio Berger | 2018-06-13 | 4 | -9/+95 |
| | | | | | | | | | | | | | | | | superset | ||||
* | | | | Variable rename for clarity | Fabio Berger | 2018-06-13 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-12 | 30 | -141/+724 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (68 commits) Stop exporting ArtifactWriter Fix no-unused-variable tslint rule to include parameters and fix issues Fix linter exclude rule Validate all signature types rather then only ECSignatures Store the instantiated OrderValidationUtils Remove global hooks from tests and deploy contracts from within the specific tests Add EmitStatement to ASTVisitor Fix tslint issues Add back artifacts file Fix a bug in SolCompilerArtifacts adapter config overriding Move OrderValidationUtils (+ tests) and ExchangeTransferSimulator to order-utils export parseECSignature method Export ArtifactWriter from migrations package Remove unused artifact file Pass in generated contract wrapper to orderValidationUtils at instantiation Refactor orderValidationUtils to use the generated contract wrapper instead of the higher-level one Refactor ExchangeTransferSimulator public interface to accet an AbstractBalanceAndProxyAllowanceLazyStore so that this module could be re-used in different contexts. Increase timeout for contract migrations Remove some copy-paste code Await transactions in migrations ... | ||||
| * | | | Implement SolidityProfiler & adapt sol-cov to work with Geth | Leonid Logvinov | 2018-06-09 | 3 | -1/+51 |
| |/ / | |||||
| * | | Updated LibBytes error messages | Greg Hysen | 2018-06-08 | 2 | -6/+6 |
| | | | |||||
| * | | Camelcase in memCopy | Greg Hysen | 2018-06-08 | 3 | -22/+22 |
| | | | |||||
| * | | Style updates to contracts | Greg Hysen | 2018-06-08 | 3 | -16/+16 |
| | | | |||||
| * | | Fixed a styling throughout contracts. Moved closing parenthesis for long ↵ | Greg Hysen | 2018-06-08 | 8 | -31/+62 |
| | | | | | | | | | | | | list of function parameters to next line. | ||||
| * | | Fixed merge error when rebasing wrt length variable in asset data decoders | Greg Hysen | 2018-06-08 | 2 | -4/+4 |
| | | | |||||
| * | | Style updates to ERC721 onReceiver | Greg Hysen | 2018-06-08 | 3 | -8/+6 |
| | | | |||||
| * | | Fixed after rebase | Greg Hysen | 2018-06-08 | 3 | -5/+5 |
| | | | |||||
| * | | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 2 | -16/+9 |
| | | | |||||
| * | | Style audit for proxies + libmem + libbytes | Greg Hysen | 2018-06-08 | 6 | -23/+40 |
| | | | |||||
| * | | Style audit proxies | Greg Hysen | 2018-06-08 | 3 | -20/+64 |
| | | | |||||
| * | | Call safeTransferFrom only when there is receiver data present | Greg Hysen | 2018-06-08 | 1 | -1/+6 |
| | | | |||||
| * | | Fixed formatting in memory layout | Greg Hysen | 2018-06-08 | 1 | -6/+6 |
| | | | |||||
| * | | Resolved edge case in Memcpy where where send would eventually turn ↵ | Greg Hysen | 2018-06-08 | 1 | -11/+17 |
| | | | | | | | | | | | | "negative" and wrap around. | ||||
| * | | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵ | Greg Hysen | 2018-06-08 | 6 | -88/+57 |
| | | | | | | | | | | | | This way they can still be used by the forwarding contract. TestAssetDataDecoders inherits them in the same way the forwarding contract would | ||||
| * | | Converged on naming scheme for asset data: renamed all instances of ↵ | Greg Hysen | 2018-06-08 | 13 | -67/+67 |
| | | | | | | | | | | | | assetMetadata, proxyData, proxyMetadata to assetData | ||||
| * | | proxyData -> assetData | Greg Hysen | 2018-06-08 | 1 | -11/+11 |
| | | | |||||
| * | | Implement memcpy using masking and end-aligned words | Remco Bloemen | 2018-06-08 | 1 | -59/+85 |
| | | | |||||
| * | | Convert Solidity tests to vectors | Remco Bloemen | 2018-06-08 | 1 | -203/+0 |
| | | | |||||
| * | | Generate tests from vectors | Remco Bloemen | 2018-06-08 | 1 | -3/+24 |
| | | | |||||
| * | | Fixed up wording in memcpy | Greg Hysen | 2018-06-08 | 1 | -3/+3 |
| | | | |||||
| * | | Tons of tests around nested byte arrays and ERC721 receiver | Greg Hysen | 2018-06-08 | 2 | -10/+32 |
| | | | |||||
| * | | Test for onReceived erc721 callback | Greg Hysen | 2018-06-08 | 2 | -0/+3 |
| | | | |||||
| * | | LibAssetProxyDecoder tests | Greg Hysen | 2018-06-08 | 1 | -1/+1 |
| | | | |||||
| * | | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 3 | -0/+53 |
| | | | |||||
| * | | Tests for libMem | Greg Hysen | 2018-06-08 | 3 | -15/+11 |
| | | | |||||
| * | | LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721Receiver | Greg Hysen | 2018-06-08 | 7 | -27/+579 |
| | | | |||||
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-08 | 5 | -8/+8 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix linter issue Fix linter issue Fix tslint issues Fix missing paths Fixed path Use source-map-support package to include correct line numbers in mocha move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
| * | | Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changes | Fabio Berger | 2018-06-08 | 1 | -0/+1 |
| |\ \ | | | | | | | | | Remaining Order-utils V2 Changes | ||||
| * \ \ | merge v2-prototype | Fabio Berger | 2018-06-07 | 14 | -42/+151 |
| |\ \ \ | |||||
| * | | | | move generated contract wrappers from `contract_wrappers/generated/` to ↵ | Fabio Berger | 2018-06-06 | 6 | -13/+13 |
| | |_|/ | |/| | | | | | | | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
* | | | | Merge branch 'fix/order-utils/remaining-v2-changes' into ↵ | Fabio Berger | 2018-06-08 | 1 | -0/+1 |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | feature/combinatorial-testing * fix/order-utils/remaining-v2-changes: Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder | ||||
| * | | | Fix tslint failure | Fabio Berger | 2018-06-08 | 1 | -0/+1 |
| | |/ | |/| | |||||
* | | | POC: Generates an order from spec, get's the amount fillable | Fabio Berger | 2018-06-08 | 6 | -32/+196 |
| | | | |||||
* | | | merge v2-prototype | Fabio Berger | 2018-06-07 | 14 | -42/+151 |
|\| | | |||||
| * | | Merge pull request #673 from mohoff/patch-1 | Fabio Berger | 2018-06-07 | 1 | -1/+1 |
| |\ \ | | | | | | | | | typo | ||||
| | * | | typo | mohoff | 2018-06-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 5 | -8/+144 |
| |\| | | | | | | | | | | | | | | feature/improve-linting | ||||
| | * | | Apply various fixes based on PR feedback | Alex Browne | 2018-06-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Use an enum for ProviderType in contracts/src/utils/web3_wrapper | Alex Browne | 2018-06-07 | 1 | -4/+21 |
| | | | | |||||
| | * | | Add Async suffix to relevant assertions | Alex Browne | 2018-06-07 | 1 | -9/+9 |
| | | | | |||||
| | * | | Fix linter errors | Alex Browne | 2018-06-07 | 2 | -2/+36 |
| | | | | |||||
| | * | | Update more things to work with both Geth and Ganache | Alex Browne | 2018-06-07 | 1 | -22/+14 |
| | | | | |||||
| | * | | Small fixes and cleanup | Alex Browne | 2018-06-07 | 2 | -6/+2 |
| | | | | |||||
| | * | | Add additional gas to calls to fillOrderNoThrow | Alex Browne | 2018-06-07 | 1 | -6/+6 |
| | | | | |||||
| | * | | Throw in web3-wrapper when rawCallResult is '0x' | Alex Browne | 2018-06-07 | 2 | -0/+13 |
| | | | | |||||
| | * | | Fix some more test cases, especially those that call increaseTime | Alex Browne | 2018-06-07 | 1 | -0/+26 |
| | | | | |||||
| | * | | Add support for TEST_PROVIDER env var | Alex Browne | 2018-06-07 | 1 | -3/+4 |
| | | | | |||||
| | * | | Update more tests to pass on Geth | Alex Browne | 2018-06-07 | 2 | -0/+14 |
| | | | | |||||
| | * | | Get LibBytes tests working on both Ganache and Geth | Alex Browne | 2018-06-07 | 2 | -1/+6 |
| | | | | |||||
| | * | | Add ability to quickly switch between Geth and Ganache by changing a const | Alex Browne | 2018-06-07 | 1 | -3/+16 |
| | | | | |||||
| | * | | Replace constant.REVERT test assertions with ↵ | Alex Browne | 2018-06-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction | ||||
| | * | | Update code after rebase | Alex Browne | 2018-06-07 | 3 | -2/+27 |
| | |/ | |||||
| * | | Get build and tests to pass | fragosti | 2018-06-07 | 1 | -1/+2 |
| | | | |||||
| * | | Linter now passes | fragosti | 2018-06-06 | 10 | -34/+6 |
| |/ | |||||
* / | Implement initial generateOrder function that given the scenario values for ↵ | Fabio Berger | 2018-06-07 | 2 | -0/+244 |
|/ | | | | an order, generates the actual order. | ||||
* | rename GT to GREATER_THAN | Jacob Evans | 2018-06-05 | 3 | -3/+3 |
| | |||||
* | Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵ | Amir Bandeali | 2018-06-05 | 24 | -630/+420 |
| | | | | failures, and remove redundant logic in matchOrders | ||||
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 3 | -55/+52 |
|\ | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Set contract expiration time to a constant 10 minutes Remove unused promises array Make erc20_wrapper and erc721_wrapper serial Rename changelogs to changelog Add CHANGELOG entry Check that git branch is up to date before publishing Move prepublish checks before building packages for publishing Refactor changelog utils to a separate module | ||||
| * | Set contract expiration time to a constant 10 minutes | Alex Browne | 2018-06-02 | 1 | -1/+2 |
| | | |||||
| * | Remove unused promises array | Alex Browne | 2018-06-02 | 2 | -6/+0 |
| | | |||||
| * | Make erc20_wrapper and erc721_wrapper serial | Alex Browne | 2018-06-02 | 2 | -48/+50 |
| | | |||||
* | | Fix tslint issues | Fabio Berger | 2018-06-02 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 9 | -15/+25 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | Fix linter errors | Leonid Logvinov | 2018-06-01 | 4 | -4/+4 |
| | | |||||
| * | Add ethereum-types to extraFileIncludes | Leonid Logvinov | 2018-06-01 | 1 | -2/+9 |
| | | |||||
| * | Introduce ethereum-types package | Leonid Logvinov | 2018-06-01 | 8 | -14/+11 |
| | | |||||
| * | Merge pull request #640 from 0xProject/await-transaction-success | Alex Browne | 2018-05-31 | 1 | -4/+10 |
| |\ | | | | | | | Add awaitTransactionSuccess where needed | ||||
| | * | Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapper | Alex Browne | 2018-05-31 | 1 | -4/+6 |
| | | | |||||
| | * | Add awaitTransactionSuccess where needed | Alex Browne | 2018-05-31 | 1 | -2/+6 |
| | | | |||||
* | | | Rename Ecrecover to EthSign | Fabio Berger | 2018-06-01 | 3 | -6/+3 |
| | | | |||||
* | | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-01 | 32 | -174/+530 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 4 | -12/+16 |
| | | | | | | | | | | | | needed, and rename function | ||||
| * | | Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMIT | Amir Bandeali | 2018-05-31 | 3 | -4/+4 |
| | | | |||||
| * | | Make preSigned and allowedValidators mappings public | Amir Bandeali | 2018-05-31 | 1 | -2/+2 |
| | | | |||||
| * | | Change names of signature types | Amir Bandeali | 2018-05-31 | 2 | -6/+6 |
| | | | |||||
| * | | Fix formatting and tests | Amir Bandeali | 2018-05-31 | 4 | -4/+10 |
| | | | |||||
| * | | Make AssetProxyId last byte of assetData | Amir Bandeali | 2018-05-31 | 18 | -37/+74 |
| | | | |||||
| * | | Add signer to txHash, allow approveValidator to be used with executeTransaction | Amir Bandeali | 2018-05-31 | 3 | -7/+10 |
| | | | |||||
| * | | Update Whitelist | Amir Bandeali | 2018-05-31 | 5 | -24/+54 |
| | | | |||||
| * | | Fix Exchange interface | Amir Bandeali | 2018-05-31 | 1 | -7/+5 |
| | | |