Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| * | | 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 ↵ | Amir Bandeali | 2018-05-31 | 3 | -50/+62 |
| |/ | | | | | | | multiSigWrapper | ||||
* | | Introduce OrderWithoutExchangeAddress type since this is what get's sent to ↵ | Fabio Berger | 2018-05-31 | 3 | -26/+22 |
| | | | | | | | | the smart contracts | ||||
* | | Initial refactor of order-utils. Move many utils from contracts into this ↵ | Fabio Berger | 2018-05-30 | 11 | -317/+26 |
|/ | | | | package. | ||||
* | 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 |
|\ | | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress | ||||
| * | 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 ↵ | Amir Bandeali | 2018-05-25 | 1 | -18/+48 |
| | | | | | | | | mapping of registered proxies | ||||
* | | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash | Fabio Berger | 2018-05-25 | 6 | -38/+17 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 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 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 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 |
|\ \ | | | | | | | Contracts test fixes | ||||
| * | | 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 ↵ | Greg Hysen | 2018-05-19 | 3 | -131/+131 |
| | | | | the Forwarding Contract. | ||||
* | 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 |
| | | | | should be useful for the forwarding contract code. | ||||
* | 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 ↵ | Greg Hysen | 2018-05-19 | 1 | -6/+10 |
| | | | | inherits Mixins) | ||||
* | Renamed takerAssetFilledAmount to orderFilledAmount to more easily ↵ | Greg Hysen | 2018-05-19 | 3 | -37/+37 |
| | | | | distinguish between fill results and order state | ||||
* | 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 |
| | | | | like this better than just logging an error and failing silently. | ||||
* | Removed redundant status checks in matchOrders. Saves gas, plus follows ↵ | Greg Hysen | 2018-05-19 | 1 | -8/+0 |
| | | | | pattern of fillOrder more closely. | ||||
* | 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 ↵ | Greg Hysen | 2018-05-19 | 3 | -35/+49 |
| | | | | check to order matching calculations | ||||
* | 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 |
|\ | | | | | ERC721Proxy Pad to 32 if asset ids are small | ||||
| * | 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 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (29 commits) Do not remove artifacts when running `clean` fix style errors Fix circular dependency Add my profile image to images Add myself to about page Add dogfood configs to website Revert to lerna:run lint Do lint sequentially Exclude monorepo-scripts from tslint as test Fix prettier Add hover state to top tokens Change to weekly txn volume Change minimum Node version to 6.12 Document Node.js version requirement and add it to package.json Apply prettier to some files which were not formatted correctly Fix TSLint issues Fix TSLint issues Update ethereeumjs-testrpc to ganache-cli Fix infinite loop Add changelog entries for packages where executable binary exporting fixed ... # Conflicts: # packages/contracts/package.json # packages/contracts/util/formatters.ts # packages/contracts/util/signed_order_utils.ts # packages/migrations/package.json # yarn.lock | ||||
* | | | 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 |
| | | | | | | | | args and returns | ||||
* | | 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 ↵ | Greg Hysen | 2018-04-21 | 1 | -0/+1 |
| | | | | | | | | currently compatible with our generated contract wrappers. | ||||
* | | Added description for the DummyERC721Token constructor | Greg Hysen | 2018-04-21 | 1 | -0/+6 |
| | | |||||
* | | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less ↵ | Greg Hysen | 2018-04-21 | 3 | -11/+15 |
| | | | | | | | | confusion. Also updated the function description. | ||||
* | | 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 ↵ | Greg Hysen | 2018-04-21 | 2 | -72/+5 |
| | | | | | | | | exists in Typescript). This simplifies the code. | ||||
* | | 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 ↵ | Greg Hysen | 2018-04-21 | 4 | -7/+7 |
| | | | | | | | | transferFrom implementations. | ||||
* | | Reverted change that allowed ERC721 transfer proxy to be called with amount ↵ | Greg Hysen | 2018-04-21 | 1 | -3/+0 |
| | | | | | | | | 0. This now throws. | ||||
* | | Removed takerTokenAddress and makerTokenAddress from Order struct. | Greg Hysen | 2018-04-21 | 7 | -63/+78 |
| | | |||||
* | | toUnsigned -> toBuffer in assetProxyUtils | Greg Hysen | 2018-04-21 | 1 | -1/+1 |
| | | |||||
* | | Unrolled the loop that copies the Order struct in FillOrderNoThrow. Saves ↵ | Greg Hysen | 2018-04-21 | 1 | -5/+17 |
| | | | | | | | | 900 gas | ||||
* | | address -> IAssetProxy where possible for clarity | Greg Hysen | 2018-04-21 | 2 | -13/+13 |
| | | |||||
* | | Reverted to calling read/write uint256 | Greg Hysen | 2018-04-21 | 2 | -2/+28 |
| | | |||||
* | | Minor changes to typescript tests | Greg Hysen | 2018-04-21 | 2 | -4/+2 |
| | | |||||
* | | Minor fixes to the contracts | Greg Hysen | 2018-04-21 | 3 | -2/+5 |
| | | |||||
* | | Rearranged preconditions in ERC721 proxy | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
| | | |||||
* | | Changed order of encode/decode functions in token proxies | Greg Hysen | 2018-04-21 | 3 | -36/+36 |
| | | |||||
* | | Updated name of AssetProxyChanged -> AssetProxySet | Greg Hysen | 2018-04-21 | 3 | -3/+4 |
| | | |||||
* | | Explicity declare `memory` for complex types, where possible | Greg Hysen | 2018-04-21 | 3 | -5/+5 |
| | | |||||
* | | Improved readability of FillOrderNoThrow II | Greg Hysen | 2018-04-21 | 1 | -15/+15 |
| | | |||||
* | | Improved readability of FillOrderNoThrow | Greg Hysen | 2018-04-21 | 1 | -4/+4 |
| | | |||||
* | | Updated ERC20 v1 proxy names in tests | Greg Hysen | 2018-04-21 | 2 | -3/+3 |
| | | |||||
* | | Proxy Metadata -> Data | Greg Hysen | 2018-04-21 | 2 | -9/+9 |
| | | |||||
* | | Cleaning up some wording | Greg Hysen | 2018-04-21 | 5 | -28/+26 |
| | | |||||
* | | Minor style improvements to asset proxy utils | Greg Hysen | 2018-04-21 | 1 | -10/+3 |
| | | |||||
* | | ethereum-js for encoding/decoding asset proxy data | Greg Hysen | 2018-04-21 | 1 | -41/+32 |
| | | |||||
* | | Added memory to bytes arrays, where possible | Greg Hysen | 2018-04-21 | 4 | -7/+7 |
| | | |||||
* | | Replaced read/write Uint256 with generic bytes32, plus casting | Greg Hysen | 2018-04-21 | 4 | -16/+16 |
| | | |||||
* | | Updated public -> external | Greg Hysen | 2018-04-21 | 6 | -9/+9 |
| | | |||||
* | | Removed unused dependency | Greg Hysen | 2018-04-21 | 1 | -1/+0 |
| | | |||||
* | | snake case to camel case | Greg Hysen | 2018-04-21 | 1 | -25/+25 |
| | | |||||
* | | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetData | Greg Hysen | 2018-04-21 | 4 | -18/+18 |
| | | |||||
* | | IAssetProxyDispatcher to IAssetProxy in MixinSettlement layer + allowing ↵ | Greg Hysen | 2018-04-21 | 3 | -7/+8 |
| | | | | | | | | 0-condition in ERC721 transfer | ||||
* | | Removed Log prefix from events | Greg Hysen | 2018-04-21 | 2 | -5/+5 |
| | | |||||
* | | removed unnecessary import | Greg Hysen | 2018-04-21 | 1 | -2/+0 |
| | | |||||
* | | setAssetProxy to addAssetProxy | Greg Hysen | 2018-04-21 | 2 | -2/+2 |
| | | |||||
* | | Renamed TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 1 | -2/+1 |
| | | |||||
* | | Renaming TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 4 | -6/+6 |
| | | |||||
* | | ERC20 V1 proxy compiling | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
| | | |||||
* | | Changed order of write parameters in LibBytes. Now ordered by most ↵ | Greg Hysen | 2018-04-21 | 4 | -10/+10 |
| | | | | | | | | generalized to most specific | ||||
* | | Asset Proxy Dispatcher | Greg Hysen | 2018-04-21 | 23 | -122/+1088 |
| | | |||||
* | | Use addFillResults function and add comments to all marketFill functions | Amir Bandeali | 2018-04-21 | 1 | -36/+84 |
| | | |||||
* | | Fix EtherDelta imports | Amir Bandeali | 2018-04-21 | 1 | -2/+2 |
| | | |||||
* | | Add back require statements and tests (will move to another PR) | Amir Bandeali | 2018-04-21 | 1 | -3/+8 |
| | | |||||
* | | Revert variable naming | Amir Bandeali | 2018-04-21 | 10 | -141/+141 |
| | | |||||
* | | Update Solidity syntax and comments | Amir Bandeali | 2018-04-21 | 3 | -50/+52 |
| | | |||||
* | | Return all amounts traded and fees paid | Amir Bandeali | 2018-04-21 | 7 | -106/+115 |
| | | |||||
* | | Add tests for marketBuyOrders | Amir Bandeali | 2018-04-21 | 1 | -2/+2 |
| | | |||||
* | | Add marketBuyOrders, rename variables, and fx old tests | Amir Bandeali | 2018-04-21 | 8 | -226/+326 |
| | | |||||
* | | Fix build errors | Amir Bandeali | 2018-04-21 | 3 | -13/+6 |
| | | |||||
* | | Separate filled/cancelled errors | Amir Bandeali | 2018-04-21 | 3 | -4/+6 |
| | | |||||
* | | Remove partial cancels | Amir Bandeali | 2018-04-21 | 6 | -72/+31 |
| | | |||||
* | | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that ↵ | Greg Hysen | 2018-04-21 | 4 | -12/+13 |
| | | | | | | | | orders with salt <= to maker epoch will be cancelled (previously, it was salt < maker epoch) | ||||
* | | Renamed all instances of timestamp to salt. Clarified test case wording. | Greg Hysen | 2018-04-21 | 2 | -3/+3 |
| | | |||||
* | | Fixed spacing | Greg Hysen | 2018-04-21 | 3 | -5/+5 |
| | | |||||
* | | Implementation and tests in the protocol for cancelling all orders up to a ↵ | Greg Hysen | 2018-04-21 | 6 | -16/+67 |
| | | | | | | | | specific time | ||||
* | | Update copyright headers | Amir Bandeali | 2018-04-21 | 30 | -24/+150 |
| | | |||||
* | | Add private keys for testrpc mnemonic | Amir Bandeali | 2018-04-21 | 1 | -20/+14 |
| | | |||||
* | | Address feedback and lint | Amir Bandeali | 2018-04-21 | 17 | -170/+89 |
| | | |||||
* | | Add tests for fillOrderNoThrow based functions | Amir Bandeali | 2018-04-21 | 1 | -0/+42 |
| | | |||||
* | | Fix fillOrderNoThrow | Amir Bandeali | 2018-04-21 | 1 | -29/+15 |
| | | |||||
* | | Fix package.json | Amir Bandeali | 2018-04-21 | 1 | -5/+5 |
| | | |||||
* | | Bump Solidity version to 0.4.21 | Amir Bandeali | 2018-04-21 | 20 | -30/+29 |
| | | |||||
* | | Add fillOrderNoThrow to exchange wrapper and add test | Amir Bandeali | 2018-04-21 | 1 | -0/+21 |
| | | |||||
* | | Update formatting | Amir Bandeali | 2018-04-21 | 4 | -34/+40 |
| | | |||||
* | | Update fillOrderNoThrow | Amir Bandeali | 2018-04-21 | 1 | -111/+103 |
| | | |||||
* | | Update order utils | Amir Bandeali | 2018-04-21 | 1 | -5/+5 |
| | | |||||
* | | Add script for starting testrpc with preconfigured private keys | Amir Bandeali | 2018-04-21 | 2 | -0/+29 |
| | | |||||
* | | Add utils for hashing and signing orders, update wrappers | Amir Bandeali | 2018-04-21 | 6 | -53/+96 |
| | | |||||
* | | Modify utils to work with new signature format | Amir Bandeali | 2018-04-21 | 7 | -150/+189 |
| | | |||||
* | | Change order field names | Amir Bandeali | 2018-04-21 | 5 | -74/+73 |
| | | |||||
* | | Revert getOrderHash to old logic | Amir Bandeali | 2018-04-21 | 1 | -2/+16 |
| | | |||||
* | | Fix compile errors | Amir Bandeali | 2018-04-21 | 11 | -30/+54 |
| | | |||||
* | | Update fillOrderNoThrow | Remco Bloemen | 2018-04-21 | 1 | -39/+45 |
| | | |||||
* | | Use ABIv2 exchange core in wrapper functions | Remco Bloemen | 2018-04-21 | 1 | -55/+34 |
| | | |||||
* | | Implement ABIv2 in ExchangeCore | Remco Bloemen | 2018-04-21 | 2 | -60/+33 |
| | | |||||
* | | Implement EIP712 and ABIv2 in LibOrder | Remco Bloemen | 2018-04-21 | 1 | -20/+12 |
| | | |||||
* | | Run prettier | Amir Bandeali | 2018-04-21 | 1 | -1/+1 |
| | | |||||
* | | Add fillOrderNoThrow and wrapper functions | Amir Bandeali | 2018-04-21 | 1 | -1/+1 |
| | | |||||
* | | Fix compile errors | Amir Bandeali | 2018-04-21 | 4 | -12/+12 |
| | | |||||
* | | Fix spelling of latter | Remco Bloemen | 2018-04-21 | 1 | -1/+1 |
| | | |||||
* | | Add offset to signature | Remco Bloemen | 2018-04-21 | 1 | -11/+13 |
| | | |||||
* | | Document noThrow wrapper and correct fixed array offset | Remco Bloemen | 2018-04-21 | 1 | -39/+81 |
| | | |||||
* | | Add Trezor signatures | Remco Bloemen | 2018-04-21 | 1 | -0/+23 |
| | | |||||
* | | Add Todos | Remco Bloemen | 2018-04-21 | 2 | -0/+3 |
| | | |||||
* | | Fix documentation | Remco Bloemen | 2018-04-21 | 1 | -3/+3 |
| | | |||||
* | | Verify length on EIP712 signatures | Remco Bloemen | 2018-04-21 | 1 | -1/+2 |
| | | |||||
* | | Remove unused return value | Remco Bloemen | 2018-04-21 | 1 | -3/+0 |
| | |