| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | * | | 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 | 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 |
|\| | | | |
|
| * | | | | Merge pull request #659 from 0xProject/feature/contracts/split-proxy-internal... | Jacob Evans | 2018-06-19 | 6 | -129/+206 |
| |\ \ \ \ |
|
| | * | | | | 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 |
|\| | | | |
|
| * | | | | 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 | 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 taker... | Fabio Berger | 2018-06-15 | 2 | -35/+323 |
* | | | | - Refactor assetWrapper to contain more of the normalizing logic instead of e... | Fabio Berger | 2018-06-15 | 6 | -72/+311 |
* | | | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert generateOr... | Fabio Berger | 2018-06-14 | 3 | -43/+48 |
* | | | | 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 |
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-13 | 19 | -205/+200 |
|\| | | |
|
| * | | | 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 t... | Alex Browne | 2018-06-12 | 1 | -1/+4 |
* | | | | 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 supe... | Fabio Berger | 2018-06-13 | 4 | -9/+95 |
* | | | | 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 |
|\| | | |
|
| * | | | 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 list... | Greg Hysen | 2018-06-08 | 8 | -31/+62 |
| * | | 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 "negative... | Greg Hysen | 2018-06-08 | 1 | -11/+17 |
| * | | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. T... | Greg Hysen | 2018-06-08 | 6 | -88/+57 |
| * | | Converged on naming scheme for asset data: renamed all instances of assetMeta... | Greg Hysen | 2018-06-08 | 13 | -67/+67 |
| * | | 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 |
|\| | |
|
| * | | Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changes | Fabio Berger | 2018-06-08 | 1 | -0/+1 |
| |\ \ |
|
| * \ \ | merge v2-prototype | Fabio Berger | 2018-06-07 | 14 | -42/+151 |
| |\ \ \ |
|
| * | | | | move generated contract wrappers from `contract_wrappers/generated/` to `gene... | Fabio Berger | 2018-06-06 | 6 | -13/+13 |
| | |_|/
| |/| | |
|
* | | | | Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria... | Fabio Berger | 2018-06-08 | 1 | -0/+1 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | 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 | 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 |
| |\| | |
|
| | * | | 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 expectRevertOrAlwaysFailingTrans... | Alex Browne | 2018-06-07 | 1 | -2/+2 |
| | * | | 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 a... | Fabio Berger | 2018-06-07 | 2 | -0/+244 |
|/ |
|
* | rename GT to GREATER_THAN | Jacob Evans | 2018-06-05 | 3 | -3/+3 |
* | Update Exchange statuses, revert instead of emmitting event on fill/cancel fa... | Amir Bandeali | 2018-06-05 | 24 | -630/+420 |
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 3 | -55/+52 |
|\ |
|
| * | 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 |
|\| |
|
| * | 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 |
| |\ |
|
| | * | 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 |
|\| | |
|
| * | | Check length before accessing indices, add awaitTransactionSuccess where need... | Amir Bandeali | 2018-05-31 | 4 | -12/+16 |
| * | | 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 |
| * | | Use last byte of signature as signature type | Amir Bandeali | 2018-05-31 | 5 | -74/+75 |
| * | | Remove TxOrigin signature type, modify whitelist to use Validator signature type | Amir Bandeali | 2018-05-31 | 5 | -31/+28 |
| * | | Update Whitelist contract with comments, also require maker to be whitelisted | Amir Bandeali | 2018-05-31 | 4 | -12/+43 |
| * | | Fix build | Amir Bandeali | 2018-05-31 | 3 | -19/+24 |
| * | | Add example whitelist contract and minimum tests | Amir Bandeali | 2018-05-31 | 2 | -9/+32 |
| * | | Add sample whitelist contract | Amir Bandeali | 2018-05-31 | 1 | -0/+58 |
| * | | Add TxOrigin signature type and rearrange order of types | Amir Bandeali | 2018-05-31 | 3 | -63/+77 |
| * | | Add approveValidator function | Amir Bandeali | 2018-05-31 | 2 | -2/+17 |
| * | | Add Validator signature type | Amir Bandeali | 2018-05-31 | 3 | -2/+68 |
| * | | Add deepCopyBytes method to LibBytes | Amir Bandeali | 2018-05-31 | 2 | -0/+58 |
| * | | Change logDecoder back into class, remove awaitTransactionMined from multiSig... | Amir Bandeali | 2018-05-31 | 3 | -50/+62 |
| |/ |
|
* | | Introduce OrderWithoutExchangeAddress type since this is what get's sent to t... | Fabio Berger | 2018-05-31 | 3 | -26/+22 |
* | | Initial refactor of order-utils. Move many utils from contracts into this pac... | Fabio Berger | 2018-05-30 | 11 | -317/+26 |
|/ |
|
* | Remove contracts -> @0xproject/order-utils dependency | Leonid Logvinov | 2018-05-26 | 1 | -0/+1 |
* | Fix imports in order_utils | Leonid Logvinov | 2018-05-25 | 1 | -1/+1 |
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 13 | -65/+221 |
|\ |
|
| * | Use web3-wrapper instead of 0x.js, update logDecoder | Amir Bandeali | 2018-05-25 | 6 | -44/+44 |
| * | Cleanup tests | Amir Bandeali | 2018-05-25 | 1 | -1/+1 |
| * | Move readFirst4 to LibBytes | Amir Bandeali | 2018-05-25 | 3 | -20/+42 |
| * | Add old MultiSig to previous contracts, cleanup file structure | Amir Bandeali | 2018-05-25 | 5 | -9/+9 |
| * | Fix build | Amir Bandeali | 2018-05-25 | 1 | -0/+82 |
| * | Address feedback, rename contract to AssetProxyOwner | Amir Bandeali | 2018-05-25 | 4 | -15/+19 |
| * | Update multisig tests and utils | Amir Bandeali | 2018-05-25 | 1 | -25/+43 |
| * | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress to use a mappi... | Amir Bandeali | 2018-05-25 | 1 | -18/+48 |
* | | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash | Fabio Berger | 2018-05-25 | 6 | -38/+17 |
|\ \ |
|
| * | | Fix linter issues | Leonid Logvinov | 2018-05-25 | 1 | -1/+1 |
| * | | Migrate migrations to v2 | Leonid Logvinov | 2018-05-25 | 6 | -39/+18 |
| |/ |
|
* | | Use domain separator for exchange address | Jacob Evans | 2018-05-25 | 3 | -6/+33 |
* | | publicGetOrderSchemaHash -> getOrderSchemaHash | Jacob Evans | 2018-05-25 | 1 | -1/+1 |
* | | Update order hash to match latest eip712 | Jacob Evans | 2018-05-25 | 3 | -34/+51 |
|/ |
|
* | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 1 | -1/+1 |
* | Move contract utils | Leonid Logvinov | 2018-05-24 | 2 | -0/+377 |
* | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-24 | 6 | -23/+26 |
|\ |
|
| * | Fix ExchangeWrapper | Fabio Berger | 2018-05-23 | 1 | -3/+5 |
| * | Fix imports | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| * | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 7 | -18/+31 |
| |\ |
|
| * | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 6 | -23/+24 |
* | | | Fix a bug in CALL-like opcode handling | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
* | | | Remove web3Factory.create and remove dev-tools dependency on sol-cov | Leonid Logvinov | 2018-05-23 | 1 | -3/+9 |
| |/
|/| |
|
* | | Merge pull request #601 from 0xProject/contracts-test-fixes | Alex Browne | 2018-05-23 | 1 | -0/+1 |
|\ \ |
|
| * | | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 1 | -0/+1 |
| |/ |
|
* | | Add CancelOrder and MatchOrder types | Remco Bloemen | 2018-05-22 | 2 | -3/+15 |
* | | Add missing return types | Remco Bloemen | 2018-05-22 | 4 | -14/+14 |
|/ |
|
* | Added getNullFillResults | Greg Hysen | 2018-05-19 | 2 | -1/+16 |
* | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 6 | -29/+29 |
* | Style improvements to order matching | Greg Hysen | 2018-05-19 | 4 | -28/+17 |
* | Upgraded to Solidity 0.4.24 | Greg Hysen | 2018-05-19 | 52 | -56/+56 |
* | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 1 | -0/+1 |
* | Changed calculateFillResults to public visibility so that it can be used by t... | Greg Hysen | 2018-05-19 | 3 | -131/+131 |
* | Wording of calculateMatchedFillResults | Greg Hysen | 2018-05-19 | 1 | -9/+11 |
* | Cleaned up interface for decoding proxy data. Added a general decoder, which ... | Greg Hysen | 2018-05-19 | 2 | -5/+53 |
* | Removed redundant log decode call | Greg Hysen | 2018-05-19 | 1 | -2/+0 |
* | The OrderInfo struct is now returned by the getOrderInfo function | Greg Hysen | 2018-05-19 | 7 | -77/+57 |
* | Updated order of settleMatchedOrders to align with settleOrder | Greg Hysen | 2018-05-19 | 3 | -8/+8 |
* | IExchange inherits from all other interfaces (in the same order as Exchange i... | Greg Hysen | 2018-05-19 | 1 | -6/+10 |
* | Renamed takerAssetFilledAmount to orderFilledAmount to more easily distinguis... | Greg Hysen | 2018-05-19 | 3 | -37/+37 |
* | Comments for readability in exchange core and mixin match orders | Greg Hysen | 2018-05-19 | 5 | -4/+11 |
* | Renamed "validate" functions to "assert" in mixin match. | Greg Hysen | 2018-05-19 | 5 | -21/+21 |
* | Throw if the left or right orders do not compute the correct fill results. I ... | Greg Hysen | 2018-05-19 | 4 | -27/+19 |
* | Removed redundant status checks in matchOrders. Saves gas, plus follows patte... | Greg Hysen | 2018-05-19 | 1 | -8/+0 |
* | Token -> Asset in fillOrder spec | Greg Hysen | 2018-05-19 | 1 | -1/+1 |
* | Reordered functions in mixin exchange core -- getOrderInfo is at the bottom | Greg Hysen | 2018-05-19 | 2 | -77/+77 |
* | Changes based on style guidelines put out by Amir | Greg Hysen | 2018-05-19 | 9 | -172/+210 |
* | Reordered fund transfers for matched orders, plus added an extra sanity check... | Greg Hysen | 2018-05-19 | 3 | -35/+49 |
* | Style changes to atomic order matching | Greg Hysen | 2018-05-19 | 9 | -304/+287 |
* | Added require reasons to MixinMatchOrders and cleaned up some comments. | Greg Hysen | 2018-05-19 | 6 | -40/+75 |
* | Updated remaining contracts to v0.4.23 | Greg Hysen | 2018-05-19 | 4 | -4/+4 |
* | Removed isRoundingError from mixin header | Greg Hysen | 2018-05-19 | 1 | -10/+1 |
* | Atomic Order Matching - Tests | Greg Hysen | 2018-05-19 | 4 | -6/+147 |
* | Atomic Order Matching - Smart Contracts. | Greg Hysen | 2018-05-19 | 13 | -114/+957 |
* | Merge pull request #583 from 0xProject/bug/contracts/erc721-encoded-pad | Jacob Evans | 2018-05-18 | 1 | -1/+2 |
|\ |
|
| * | Pad to 32 if asset ids are small | Jacob Evans | 2018-05-10 | 1 | -1/+2 |
* | | Merge branch 'development' into v2-prototype | Fabio Berger | 2018-05-16 | 4 | -8/+8 |
|\ \ |
|
* | | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 9 | -77/+99 |
|\| |
| |/
|/| |
|
* | | Add revert variables, change lib => libs to get around gitignore | Amir Bandeali | 2018-05-09 | 21 | -52/+325 |
* | | Move Authorizable to AssetProxy dir, rename to MixinAuthorizable | Amir Bandeali | 2018-05-08 | 8 | -58/+92 |
* | | Split up mixins and interfaces | Amir Bandeali | 2018-05-05 | 29 | -745/+508 |
* | | Make LibBytes methods internal, add TestLibBytes | Amir Bandeali | 2018-05-05 | 3 | -9/+148 |
* | | Update contracts with revert reasons and constructor keyword | Amir Bandeali | 2018-05-03 | 41 | -180/+409 |
* | | Add MixinAssetProxy to reuse redundant code | Amir Bandeali | 2018-05-03 | 4 | -98/+117 |
* | | Add batchTransferFrom to asset proxies | Amir Bandeali | 2018-05-02 | 3 | -9/+111 |
* | | Remove outdated comment | Amir Bandeali | 2018-05-01 | 2 | -4/+2 |
* | | Add hard coded proxyId into each AssetProxy | Amir Bandeali | 2018-05-01 | 4 | -5/+54 |
* | | Move TokenRegistry to 'previous' directory | Amir Bandeali | 2018-04-27 | 2 | -2/+2 |
* | | Make all lib functions internal, add contracts for testing | Amir Bandeali | 2018-04-27 | 15 | -91/+198 |
* | | Add LibFillResults | Amir Bandeali | 2018-04-27 | 11 | -78/+107 |
* | | Add ERC721 contracts from zeppelin-solidity | Amir Bandeali | 2018-04-27 | 5 | -2/+573 |
* | | Add tests and comments | Amir Bandeali | 2018-04-27 | 4 | -16/+25 |
* | | Update tests and utils | Amir Bandeali | 2018-04-27 | 6 | -1/+65 |
* | | Implement sender abstraction | Amir Bandeali | 2018-04-27 | 6 | -47/+210 |
* | | merge v2-prototype | Fabio Berger | 2018-04-24 | 3 | -97/+96 |
|\ \ |
|
| * | | Rename variables, create private validation methods in token wrappers | Amir Bandeali | 2018-04-24 | 3 | -97/+96 |
* | | | Fix tests | Amir Bandeali | 2018-04-24 | 3 | -3/+54 |
* | | | Combine Exchange with AssetProxyDispatcher | Amir Bandeali | 2018-04-24 | 7 | -67/+58 |
|/ / |
|
* | | Define numbers of dummy tokens to deploy in constants | Amir Bandeali | 2018-04-24 | 3 | -2/+4 |
* | | Remove type assertions | Amir Bandeali | 2018-04-24 | 1 | -18/+12 |
* | | Fix and cleanup tests | Amir Bandeali | 2018-04-24 | 2 | -1/+13 |
* | | Add ERC721 wrapper | Amir Bandeali | 2018-04-24 | 2 | -20/+161 |
* | | Add ERC20Wrapper | Amir Bandeali | 2018-04-24 | 3 | -32/+127 |
* | | Rename proxyUtils => assetProxyUtils | Amir Bandeali | 2018-04-23 | 1 | -6/+6 |
* | | Rename missed variables | Amir Bandeali | 2018-04-23 | 4 | -20/+20 |
* | | Reorder event args | Amir Bandeali | 2018-04-22 | 1 | -10/+10 |
* | | Add missing async suffix | Amir Bandeali | 2018-04-22 | 1 | -1/+1 |
* | | Rename token => asset | Amir Bandeali | 2018-04-22 | 11 | -203/+203 |
* | | Rename Token => IERC20Token | Amir Bandeali | 2018-04-22 | 7 | -155/+47 |
* | | Rename DummyToken => DummyERC20Token | Amir Bandeali | 2018-04-22 | 6 | -66/+14 |
* | | export proxyUtils instead of individual functions | Amir Bandeali | 2018-04-22 | 1 | -34/+32 |
* | | Fix names and visibilities, use address type over contract type for function ... | Amir Bandeali | 2018-04-22 | 5 | -22/+21 |
* | | Remove unused constructor arguments | Amir Bandeali | 2018-04-22 | 2 | -28/+15 |
* | | Add presigned signature type | Amir Bandeali | 2018-04-21 | 1 | -1/+29 |
* | | Fix zeppelin imports, run prettier | Amir Bandeali | 2018-04-21 | 2 | -2/+2 |
* | | Added tests for (most functions in) LibBytes. The write methods are not curre... | Greg Hysen | 2018-04-21 | 1 | -0/+1 |
* | | Added description for the DummyERC721Token constructor | Greg Hysen | 2018-04-21 | 1 | -0/+6 |
* | | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less c... | Greg Hysen | 2018-04-21 | 3 | -11/+15 |
* | | Reverting earlier change: interfaces now inherit from other interfaces | Greg Hysen | 2018-04-21 | 2 | -2/+10 |
* | | Clarified that 0x0 could be passed into AssetProxyDispatcher | Greg Hysen | 2018-04-21 | 2 | -4/+4 |
* | | Inlined decodeMetadata in the proxies and removed encodeMetadata (already exi... | Greg Hysen | 2018-04-21 | 2 | -72/+5 |
* | | Added @TODO for safeTransferFrom support in ERC721 proxy | Greg Hysen | 2018-04-21 | 1 | -0/+2 |
* | | Removed outdated TODO comment in MixinSettlementProxy | Greg Hysen | 2018-04-21 | 1 | -2/+0 |
* | | Miscellaneous style changes to the contracts package; specifically tests | Greg Hysen | 2018-04-21 | 2 | -3/+3 |
* | | Removed ERC20 V1 Proxy + TokenTransferProxy | Greg Hysen | 2018-04-21 | 9 | -296/+0 |
* | | Updated commenting. Noted that transferFrom succeeds or throws on all transfe... | Greg Hysen | 2018-04-21 | 4 | -7/+7 |
* | | Reverted change that allowed ERC721 transfer proxy to be called with amount 0... | Greg Hysen | 2018-04-21 | 1 | -3/+0 |