| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | 6 | -18/+30 |
| | | | | | 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 | 4 | -216/+45 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 3 | -19/+43 |
| | | | |||||
| | * | Make dispatchTransferFrom revert with reason from AssetProxy on failure | Amir Bandeali | 2018-06-27 | 1 | -2/+2 |
| | | | |||||
| | * | Remove redundant files, hard code function selector in dispatchTransferFrom, ↵ | Amir Bandeali | 2018-06-27 | 2 | -192/+0 |
| | | | | | | | | | and modify revert reason | ||||
| * | | Move combinatorial fillOrder tests into the `fill_ordere` test file | Fabio Berger | 2018-06-27 | 2 | -48/+21 |
| | | | |||||
| * | | Fix tests | Fabio Berger | 2018-06-27 | 1 | -3/+6 |
| | | | |||||
| * | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 10 | -86/+86 |
| |\| | | | | | | | | | | | | | | | | | | | | | * 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 | 10 | -95/+95 |
| | | | |||||
| | * | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-26 | 7 | -60/+34 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | | | Rename to singular | Fabio Berger | 2018-06-26 | 1 | -9/+9 |
| | | | | |||||
| * | | | Fix merge issues | Fabio Berger | 2018-06-26 | 1 | -1/+4 |
| | | | | |||||
| * | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-26 | 7 | -75/+45 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 1 | -2/+4 |
| | | | | |||||
| | * | | Run prettier and fix linting errors | Amir Bandeali | 2018-06-26 | 1 | -18/+6 |
| | | | | |||||
| | * | | Fix tests | Amir Bandeali | 2018-06-26 | 4 | -5/+4 |
| | | | | |||||
| | * | | Update tests | Remco Bloemen | 2018-06-26 | 1 | -2/+2 |
| | | | | |||||
| | * | | Update tests | Remco Bloemen | 2018-06-26 | 2 | -33/+20 |
| | | | | |||||
| | * | | WIP | Remco Bloemen | 2018-06-26 | 1 | -0/+1 |
| | | | | |||||
| | * | | 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 | 10 | -22/+14 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Move RevertReasons to @0xproject/types package | Fabio Berger | 2018-06-25 | 10 | -22/+14 |
| | | | | |||||
| | * | | Add missing import | Fabio Berger | 2018-06-25 | 1 | -1/+4 |
| | | | | |||||
| * | | | Add missing import | Fabio Berger | 2018-06-25 | 1 | -1/+4 |
| | | | | |||||
| * | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 10 | -108/+172 |
| |\| | | |||||
| | * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-25 | 5 | -366/+539 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| | * | | Fix tslint | Fabio Berger | 2018-06-23 | 4 | -4/+4 |
| | | | | |||||
| | * | | Fix prettier | Fabio Berger | 2018-06-23 | 5 | -15/+13 |
| | | | | |||||
| | * | | Rename ContractLibErrors to RevertReasons | Fabio Berger | 2018-06-23 | 10 | -95/+95 |
| | | | | |||||
| | * | | 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 | 3 | -29/+32 |
| | | | | |||||
| | * | | 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 | 11 | -27/+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 unused import | Fabio Berger | 2018-06-22 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Test revert reasons in proxy tests | Fabio Berger | 2018-06-21 | 1 | -11/+23 |
| | | | | | |||||
| | * | | | remove only | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Check revert reasons in Authorizable tests | Fabio Berger | 2018-06-21 | 1 | -6/+14 |
| | | | | | |||||
| | * | | | 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 | 14 | -393/+974 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| | * | | | Add modifier and tests for removeAuthorizedAddressAtIndex | Amir Bandeali | 2018-06-23 | 1 | -0/+69 |
| | | | | | |||||
| | * | | | Update and add tests | Amir Bandeali | 2018-06-23 | 2 | -170/+269 |
| | | | | | |||||
| | * | | | Move isFunctionRemoveAuthorizedAddress to test | Remco Bloemen | 2018-06-23 | 1 | -7/+18 |
| | | | | | |||||
| | * | | | Refactor LibBytes.readBytes4 for consistency | Remco Bloemen | 2018-06-23 | 1 | -3/+7 |
| | | | | | |||||
| | * | | | Add trailing garbage testcase for LibBytes.equals | Remco Bloemen | 2018-06-23 | 1 | -0/+10 |
| | | | | | |||||
| | * | | | Rename bytes.equals | Remco Bloemen | 2018-06-23 | 1 | -13/+13 |
| | | | | | |||||
| | * | | | Rename read/writeBytesWithLength | Remco Bloemen | 2018-06-23 | 1 | -29/+29 |
| | | | | | |||||
| | * | | | Merge LibMem and LibBytes | Remco Bloemen | 2018-06-23 | 3 | -191/+171 |
| | | | | | |||||
| | * | | | Use provided mem in refernce memcpy | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| | | |/ | |/| | |||||
| | * | | Use make-promises-safe as a preloader instead of manually importing | Alex Browne | 2018-06-22 | 10 | -10/+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 | 4 | -20/+140 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 20 | -608/+1380 |
| | | |\ | |||||
| | | * | | 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 |
| | | | | | |||||
| | * | | | ERC721Proxy Always call safeTransferFrom | Jacob Evans | 2018-06-20 | 1 | -2/+6 |
| | | | | | |||||
| | * | | | 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 | 6 | -6/+24 |
| | | | | |||||
| * | | | 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 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -4/+4 |
| | | | | |||||
| * | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-13 | 8 | -140/+332 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 1 | -6/+6 |
| | | | | |||||
| | * | | Hard code test addresses/bytes32 instead of generating pseudorandom ones | Amir Bandeali | 2018-06-13 | 1 | -19/+16 |
| | | | | |||||
| | * | | 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 |
| | | | | |||||
| | * | | Add tests for deepCopyBytes and missing write methods from LibBytes | Amir Bandeali | 2018-06-13 | 1 | -70/+185 |
| | | | | |||||
| | * | | Pop id from assetData before dispatching to AssetProxies | Amir Bandeali | 2018-06-13 | 4 | -60/+136 |
| | | | | |||||
| * | | | Implement initial set of orderFill combinatorial tests | Fabio Berger | 2018-06-13 | 1 | -240/+22 |
| | | | | |||||
| * | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-12 | 13 | -244/+810 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ... | ||||
| | * | | Fix no-unused-variable tslint rule to include parameters and fix issues | Fabio Berger | 2018-06-12 | 1 | -1/+1 |
| | | | | |||||
| | * | | Implement SolidityProfiler & adapt sol-cov to work with Geth | Leonid Logvinov | 2018-06-09 | 1 | -0/+5 |
| | | | | |||||
| | * | | Linter changes to contracts | Greg Hysen | 2018-06-09 | 4 | -21/+6 |
| | | | | |||||
| | * | | Updated LibBytes error messages | Greg Hysen | 2018-06-08 | 1 | -22/+30 |
| | | | | |||||
| | * | | Cleanup after last rebase | Greg Hysen | 2018-06-08 | 4 | -6/+5 |
| | | | | |||||
| | * | | Updated tests to use new revert handler | Greg Hysen | 2018-06-08 | 2 | -13/+13 |
| | | | | |||||
| | * | | Minor fixes after rebase | Greg Hysen | 2018-06-08 | 1 | -14/+6 |
| | | | | |||||
| | * | | Camelcase in memCopy | Greg Hysen | 2018-06-08 | 1 | -1/+1 |
| | | | | |||||
| | * | | Style updates to contracts | Greg Hysen | 2018-06-08 | 3 | -10/+4 |
| | | | | |||||
| | * | | Union types for generalized decodeAssetData | Greg Hysen | 2018-06-08 | 1 | -2/+2 |
| | | | | |||||
| | * | | Removed setting makerAssetData/takerAssetData from tests where values are ↵ | Greg Hysen | 2018-06-08 | 1 | -34/+0 |
| | | | | | | | | | | | | | same as defaultOrderParams. | ||||
| | * | | Style updates to ERC721 onReceiver | Greg Hysen | 2018-06-08 | 2 | -3/+14 |
| | | | | |||||
| | * | | Fixes after rebasing | Greg Hysen | 2018-06-08 | 3 | -8/+6 |
| | | | | |||||
| | * | | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 5 | -34/+21 |
| | | | | |||||
| | * | | Style audit for proxies + libmem + libbytes | Greg Hysen | 2018-06-08 | 2 | -27/+32 |
| | | | | |||||
| | * | | Call safeTransferFrom only when there is receiver data present | Greg Hysen | 2018-06-08 | 2 | -12/+14 |
| | | | | |||||
| | * | | Resolved edge case in Memcpy where where send would eventually turn ↵ | Greg Hysen | 2018-06-08 | 1 | -133/+137 |
| | | | | | | | | | | | | | "negative" and wrap around. | ||||
| | * | | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵ | Greg Hysen | 2018-06-08 | 1 | -5/+5 |
| | | | | | | | | | | | | | 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 | 9 | -223/+190 |
| | | | | | | | | | | | | | assetMetadata, proxyData, proxyMetadata to assetData | ||||
| | * | | proxyData -> assetData | Greg Hysen | 2018-06-08 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add tests for word loop iteration | Remco Bloemen | 2018-06-08 | 1 | -2/+6 |
| | | | | |||||
| | * | | Add test for zero-size overlap | Remco Bloemen | 2018-06-08 | 1 | -1/+3 |
| | | | | |||||
| | * | | Add test cases | Remco Bloemen | 2018-06-08 | 1 | -17/+133 |
| | | | | |||||
| | * | | Cleanup test script | Remco Bloemen | 2018-06-08 | 1 | -16/+1 |
| | | | | |||||
| | * | | Convert Solidity tests to vectors | Remco Bloemen | 2018-06-08 | 1 | -29/+6 |
| | | | | |||||
| | * | | Generate tests from vectors | Remco Bloemen | 2018-06-08 | 1 | -2/+40 |
| | | | | |||||
| | * | | Tests for writing bytes to nested bytes | Greg Hysen | 2018-06-08 | 1 | -9/+91 |
| | | | | |||||
| | * | | Tons of tests around nested byte arrays and ERC721 receiver | Greg Hysen | 2018-06-08 | 3 | -18/+165 |
| | | | | |||||
| | * | | Test for onReceived erc721 callback | Greg Hysen | 2018-06-08 | 2 | -3/+121 |
| | | | | |||||
| | * | | LibAssetProxyDecoder tests | Greg Hysen | 2018-06-08 | 1 | -26/+30 |
| | | | | |||||
| | * | | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 2 | -1/+73 |
| | | | | |||||
| | * | | Tests for libMem | Greg Hysen | 2018-06-08 | 1 | -0/+68 |
| | | | | |||||
| | * | | Add missing awaitTransactionSuccessAsync calls | Alex Browne | 2018-06-08 | 2 | -23/+53 |
| | | | | |||||
| * | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-08 | 17 | -44/+44 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| | * | | Fix tslint issues | Fabio Berger | 2018-06-08 | 2 | -2/+2 |
| | | | | |||||
| | * | | Fix missing paths | Fabio Berger | 2018-06-08 | 1 | -4/+4 |
| | | | | |||||
| | * | | Fixed path | Fabio Berger | 2018-06-07 | 2 | -10/+10 |
| | | | | |||||
| | * | | merge v2-prototype | Fabio Berger | 2018-06-07 | 16 | -290/+303 |
| | |\ \ | |||||
| | * | | | move generated contract wrappers from `contract_wrappers/generated/` to ↵ | Fabio Berger | 2018-06-06 | 17 | -45/+45 |
| | | |/ | |/| | | | | | | | `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 | 2 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+2 |
| | | |/ | |/| | |||||
| * / | | POC: Generates an order from spec, get's the amount fillable | Fabio Berger | 2018-06-08 | 1 | -0/+266 |
| |/ / | |||||
| * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 13 | -206/+263 |
| |\ \ | | | | | | | | | | feature/improve-linting | ||||
| | * | | Apply prettier | Alex Browne | 2018-06-07 | 2 | -3/+10 |
| | | | | |||||
| | * | | 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 | 13 | -103/+103 |
| | | | | |||||
| | * | | Fix linter errors | Alex Browne | 2018-06-07 | 1 | -6/+2 |
| | | | | |||||
| | * | | Update more things to work with both Geth and Ganache | Alex Browne | 2018-06-07 | 2 | -16/+28 |
| | | | | |||||
| | * | | Small fixes and cleanup | Alex Browne | 2018-06-07 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add additional gas to calls to fillOrderNoThrow | Alex Browne | 2018-06-07 | 2 | -146/+49 |
| | | | | |||||
| | * | | Throw in web3-wrapper when rawCallResult is '0x' | Alex Browne | 2018-06-07 | 1 | -6/+4 |
| | | | | |||||
| | * | | Fix some more test cases, especially those that call increaseTime | Alex Browne | 2018-06-07 | 3 | -55/+58 |
| | | | | |||||
| | * | | Update more tests to pass on Geth | Alex Browne | 2018-06-07 | 2 | -21/+15 |
| | | | | |||||
| | * | | Get LibBytes tests working on both Ganache and Geth | Alex Browne | 2018-06-07 | 1 | -24/+28 |
| | | | | |||||
| | * | | Update exchange/transactions tests for Geth error messages | Alex Browne | 2018-06-07 | 1 | -4/+4 |
| | | | | |||||
| | * | | Update some tests after rebase | Alex Browne | 2018-06-07 | 3 | -20/+29 |
| | | | | |||||
| | * | | Add more transactions to Geth on init. Skip tests that are failing. | Alex Browne | 2018-06-07 | 6 | -20/+135 |
| | | | | |||||
| | * | | Replace constant.REVERT test assertions with ↵ | Alex Browne | 2018-06-07 | 11 | -168/+141 |
| | | | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction | ||||
| | * | | Update code after rebase | Alex Browne | 2018-06-07 | 1 | -20/+0 |
| | | | | |||||
| | * | | Use Geth for contract tests | Alex Browne | 2018-06-07 | 1 | -0/+20 |
| | |/ | |||||
| * / | Linter now passes | fragosti | 2018-06-06 | 16 | -70/+26 |
| |/ | |||||
| * | 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 | 5 | -71/+70 |
| | | | | | 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 | 9 | -27/+63 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 2 | -2/+2 |
| | | | |||||
| | * | Introduce ethereum-types package | Leonid Logvinov | 2018-06-01 | 6 | -6/+8 |
| | | | |||||
| | * | Fix build | Amir Bandeali | 2018-06-01 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #640 from 0xProject/await-transaction-success | Alex Browne | 2018-05-31 | 4 | -21/+54 |
| | |\ | | | | | | | Add awaitTransactionSuccess where needed | ||||
| | | * | Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapper | Alex Browne | 2018-05-31 | 1 | -1/+1 |
| | | | | |||||
| | | * | Add awaitTransactionSuccess where needed | Alex Browne | 2018-05-31 | 3 | -20/+53 |
| | | | | |||||
| * | | | 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 | 8 | -13/+185 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 16 | -0/+97 |
| | | | | |||||
| | * | | Fix formatting and tests | Amir Bandeali | 2018-05-31 | 14 | -90/+6 |
| | | | | |||||
| | * | | Update Whitelist | Amir Bandeali | 2018-05-31 | 1 | -0/+1 |
| | | | | |||||
| | * | | Use last byte of signature as signature type | Amir Bandeali | 2018-05-31 | 3 | -32/+28 |
| | | | | |||||
| | * | | Remove TxOrigin signature type, modify whitelist to use Validator signature type | Amir Bandeali | 2018-05-31 | 2 | -4/+7 |
| | | | | |||||
| | * | | 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 |
| | | | | |||||
| | * | | Add Validator signature type | Amir Bandeali | 2018-05-31 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add deepCopyBytes method to LibBytes | Amir Bandeali | 2018-05-31 | 1 | -0/+34 |
| | |/ | |||||
| * | | 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 | 9 | -65/+38 |
| |/ | | | | package. | ||||
| * | Remove contracts -> @0xproject/order-utils dependency | Leonid Logvinov | 2018-05-26 | 3 | -102/+85 |
| | | |||||
| * | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 5 | -319/+404 |
| |\ | | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress | ||||
| | * | Use web3-wrapper instead of 0x.js, update logDecoder | Amir Bandeali | 2018-05-25 | 1 | -5/+4 |
| | | | |||||
| | * | Cleanup tests | Amir Bandeali | 2018-05-25 | 3 | -5/+11 |
| | | | |||||
| | * | Move readFirst4 to LibBytes | Amir Bandeali | 2018-05-25 | 2 | -19/+11 |
| | | | |||||
| | * | Add old MultiSig to previous contracts, cleanup file structure | Amir Bandeali | 2018-05-25 | 2 | -7/+7 |
| | | | |||||
| | * | Fix build | Amir Bandeali | 2018-05-25 | 1 | -2/+6 |
| | | | |||||
| | * | Address feedback, rename contract to AssetProxyOwner | Amir Bandeali | 2018-05-25 | 1 | -17/+17 |
| | | | |||||
| | * | Update multisig tests and utils | Amir Bandeali | 2018-05-25 | 3 | -228/+312 |
| | | | |||||
| * | | 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 | 11 | -60/+84 |
| | | |||||
| * | Move contract utils | Leonid Logvinov | 2018-05-24 | 4 | -379/+2 |
| | | |||||
| * | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-24 | 16 | -267/+251 |
| |\ | |||||
| | * | 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 await calls | Fabio Berger | 2018-05-23 | 1 | -12/+3 |
| | | | |||||
| | * | Refactor etherToken test to use contract-wrappers | Fabio Berger | 2018-05-23 | 1 | -22/+36 |
| | | | |||||
| | * | Fix ExchangeWrapper | Fabio Berger | 2018-05-23 | 5 | -11/+5 |
| | | | |||||
| | * | Fix imports | Fabio Berger | 2018-05-23 | 1 | -1/+0 |
| | | | |||||
| | * | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 16 | -189/+447 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| | * | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 16 | -240/+208 |
| | | | | |||||
| * | | | Parse compiler.json in SolCompilerArtifactsAdapter | Leonid Logvinov | 2018-05-23 | 1 | -3/+1 |
| | | | | |||||
| * | | | Fix a bug in CALL-like opcode handling | Leonid Logvinov | 2018-05-23 | 1 | -3/+3 |
| | | | | |||||
| * | | | Rename ZeroExArtifactAdapter to SolCompilerArtifactAdapter | Leonid Logvinov | 2018-05-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Assign then return | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
| | | | | |||||
| * | | | Introduce CONFIG_FILE | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
| | | | | |||||
| * | | | Remove web3Factory.create and remove dev-tools dependency on sol-cov | Leonid Logvinov | 2018-05-23 | 2 | -1/+24 |
| | |/ |/| | |||||
| * | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵ | Fabio Berger | 2018-05-23 | 15 | -175/+418 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * \ | Merge pull request #601 from 0xProject/contracts-test-fixes | Alex Browne | 2018-05-23 | 15 | -175/+418 |
| | |\ \ | | | | | | | | | Contracts test fixes | ||||
| | | * | | Rename some variables in multi_sig_with_time_lock.ts | Alex Browne | 2018-05-23 | 1 | -10/+10 |
| | | | | | |||||
| | | * | | Remove extra awaitTransactionMinedAsync calls | Alex Browne | 2018-05-23 | 1 | -4/+2 |
| | | | | | |||||
| | | * | | 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 | 2 | -4/+8 |
| | | | | | |||||
| | | * | | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 9 | -155/+293 |
| | | | | | |||||
| | | * | | Add missing blockchainLifecycle calls to contracts tests | Alex Browne | 2018-05-22 | 14 | -0/+91 |
| | | | | | |||||
| * | | | | Fix tslint issues | Fabio Berger | 2018-05-23 | 2 | -10/+13 |
| |/ / / | |||||
| * | | | Merge pull request #605 from 0xProject/fix/multiple/build-errors | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| |\ \ \ | |_|/ |/| | | Fix build/lint errors and warnings | ||||
| | * | | Add missing return types | Remco Bloemen | 2018-05-22 | 1 | -1/+1 |
| | |/ | |||||
| * | | merge development | Fabio Berger | 2018-05-23 | 2 | -4/+4 |
| |\ \ | |/ |/| | |||||
| | * | Merge pull request #594 from 0xProject/improvement/addCustomTslintRules | Fabio Berger | 2018-05-23 | 3 | -8/+8 |
| | |\ | | | | | | | Add more tslint rules | ||||
| | | * | Fix TSLint rules | Fabio Berger | 2018-05-16 | 3 | -8/+8 |
| | | | | |||||
| * | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatching | Greg Hysen | 2018-05-22 | 4 | -16/+1200 |
| |\ \ \ | | | | | | | | | Atomic Order Matching | ||||
| | * | | | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 1 | -12/+12 |
| | | | | | |||||
| | * | | | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 3 | -11/+13 |
| | | | | | |||||
| | * | | | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ↵ | Greg Hysen | 2018-05-19 | 2 | -138/+126 |
| | | | | | | | | | | | | | | | | | we dont need to pass it in on each call. | ||||
| | * | | | Cleaned up interface for decoding proxy data. Added a general decoder, which ↵ | Greg Hysen | 2018-05-19 | 1 | -12/+10 |
| | | | | | | | | | | | | | | | | | should be useful for the forwarding contract code. | ||||
| | * | | | Style improvements to the match orders typescript test class | Greg Hysen | 2018-05-19 | 1 | -18/+14 |
| | | | | | |||||
| | * | | | 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 | 2 | -2/+1 |
| | | | | | |||||
| | * | | | Atomic Order Matching - Tests | Greg Hysen | 2018-05-19 | 4 | -17/+1243 |
| | | | | | |||||
| * | | | | merge development | Fabio Berger | 2018-05-22 | 10 | -1/+10 |
| |\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| | * / | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 12 | -0/+12 |
| | |/ | |||||
| | * | Add missing type definitions | Leonid Logvinov | 2018-05-14 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 19 | -267/+250 |
| |\| | |||||
| | * | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-11 | 14 | -159/+285 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Fix ganache subprovider config Fix a bug in compiler config precedence Fix linter errors Fix templates Remove unused deployer docs configs Add a legacy endpoint for the deployer Add a check for compiler output Add a comment Put ARTIFACTS_VERSION in a config Improve a comment Remove _applyDefaultsToDeployTxDataAsync Add a HACK comment Fix linter issues Rename deployer to sol-compiler Remove deployer Remove deployer from 0x.js and migrations Configure migrations with a compiler.json Remove deployer from metacoin and contract tests Update wallet footer and add remove token functionality # Conflicts: # .gitignore # packages/0x.js/package.json # packages/0x.js/src/0x.ts # packages/contracts/package.json # packages/contracts/test/multi_sig_with_time_lock.ts # packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts # packages/contracts/util/artifacts.ts # packages/deployer/test/deployer_test.ts # packages/migrations/package.json | ||||
| | | * | Fix linter errors | Leonid Logvinov | 2018-05-11 | 12 | -12/+12 |
| | | | | |||||
| | | * | Remove unused deployer docs configs | Leonid Logvinov | 2018-05-10 | 13 | -50/+50 |
| | | | | |||||
| | | * | Fix linter issues | Leonid Logvinov | 2018-05-10 | 12 | -49/+53 |
| | | | | |||||
| | | * | Remove deployer from metacoin and contract tests | Leonid Logvinov | 2018-05-10 | 14 | -150/+271 |
| | | | | |||||
| | * | | Fix tslint errors | Fabio Berger | 2018-05-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-10 | 2 | -4/+3 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (38 commits) Add fallback image support to relayer grid tile Clear relayer grid state when fetching Configure the compiler to generate artifacts with deployedBytecode Implement loading and error state for relayer grid Fallback image for relayer grid tile Change relayer grid tile to link on header Display top tokens from backend Remove overflowZ property from portal Suggestions and fix bad merge Fix typo Only show untracked tokens Make wallet scrollable Add token flow Update The Ocean logo Fix artifacts paths Create an artifacts folder Introduce a var Add removeHexPrefix util method CHeck if ABI exists Improve the readability of the check for should compile ... # Conflicts: # .gitignore # packages/contracts/test/multi_sig_with_time_lock.ts # packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts # packages/contracts/util/artifacts.ts | ||||
 |
index : dexon-sol-tools | |
| DEXON fork of Solidity development tools originated from 0x-monorepo (https://github.com/dexon-foundation/sol-tools) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |