Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 7 | -18/+30 |
|\ | | | | | Fix build/lint errors and warnings | ||||
| * | Add CancelOrder and MatchOrder types | Remco Bloemen | 2018-05-22 | 2 | -3/+15 |
| | | |||||
| * | Add missing return types | Remco Bloemen | 2018-05-22 | 5 | -15/+15 |
| | | |||||
* | | merge development | Fabio Berger | 2018-05-23 | 3 | -5/+8 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #594 from 0xProject/improvement/addCustomTslintRules | Fabio Berger | 2018-05-23 | 4 | -9/+12 |
| |\ | | | | | | | Add more tslint rules | ||||
| | * | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-16 | 1 | -0/+3 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: fix style errors Fix circular dependency Add my profile image to images Add myself to about page Add dogfood configs to website Change minimum Node version to 6.12 Document Node.js version requirement and add it to package.json | ||||
| | * | | Fix TSLint rules | Fabio Berger | 2018-05-16 | 4 | -9/+12 |
| | | | | |||||
* | | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatching | Greg Hysen | 2018-05-22 | 62 | -243/+2500 |
|\ \ \ \ | | | | | | | | | | | Atomic Order Matching | ||||
| * | | | | Added getNullFillResults | Greg Hysen | 2018-05-19 | 2 | -1/+16 |
| | | | | | |||||
| * | | | | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 7 | -41/+41 |
| | | | | | |||||
| * | | | | Style improvements to order matching | Greg Hysen | 2018-05-19 | 4 | -28/+17 |
| | | | | | |||||
| * | | | | Upgraded to Solidity 0.4.24 | Greg Hysen | 2018-05-19 | 53 | -57/+57 |
| | | | | | |||||
| * | | | | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 6 | -13/+16 |
| | | | | | |||||
| * | | | | Changed calculateFillResults to public visibility so that it can be used by ↵ | Greg Hysen | 2018-05-19 | 3 | -131/+131 |
| | | | | | | | | | | | | | | | | | | | | the Forwarding Contract. | ||||
| * | | | | 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. | ||||
| * | | | | 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 | 3 | -17/+63 |
| | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | |||||
| * | | | | 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 | 8 | -141/+98 |
| | | | | | |||||
| * | | | | 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 | 5 | -37/+27 |
| | | | | | | | | | | | | | | | | | | | | 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 | 11 | -306/+288 |
| | | | | | |||||
| * | | | | 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 | 8 | -23/+1390 |
| | | | | | |||||
| * | | | | Atomic Order Matching - Smart Contracts. | Greg Hysen | 2018-05-19 | 13 | -114/+957 |
| | | | | | |||||
* | | | | | merge development | Fabio Berger | 2018-05-22 | 11 | -2/+12 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | / | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 13 | -1/+14 |
| | |/ | |/| | |||||
* | | | 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 | 6 | -30/+19 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 pull request #578 from 0xProject/document-node-version | Alex Browne | 2018-05-16 | 1 | -0/+3 |
| |\ \ \ | | |_|/ | |/| | | Document Node.js version requirement and add it to package.json | ||||
| | * | | Change minimum Node version to 6.12 | Alex Browne | 2018-05-15 | 1 | -1/+1 |
| | | | | |||||
| | * | | Document Node.js version requirement and add it to package.json | Alex Browne | 2018-05-15 | 1 | -0/+3 |
| | | | | |||||
| * | | | Fix sol-compiler binary so it can be called directly from packages | Fabio Berger | 2018-05-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix abi-gen binary so it can be called directly from packages | Fabio Berger | 2018-05-15 | 1 | -1/+2 |
| | | | | |||||
| * | | | Move from using lerna multi-package commands to wsrun, update README's ↵ | Fabio Berger | 2018-05-15 | 2 | -16/+4 |
| |/ / | | | | | | | | | | accordingly | ||||
| * | | Add missing type definitions | Leonid Logvinov | 2018-05-14 | 6 | -13/+22 |
| | | | |||||
* | | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 29 | -345/+394 |
|\| | | |/ |/| | |||||
| * | Revert "Remove gitkeeps" | Fabio Berger | 2018-05-12 | 1 | -0/+0 |
| | | | | | | | | This reverts commit 3f6876c4199353b597e1b0ebcf3907d6b8cce284. | ||||
| * | Remove gitkeeps | Fabio Berger | 2018-05-11 | 1 | -0/+0 |
| | | |||||
| * | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-11 | 17 | -170/+303 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 13 | -51/+56 |
| | | | |||||
| | * | Rename deployer to sol-compiler | Leonid Logvinov | 2018-05-10 | 2 | -3/+3 |
| | | | |||||
| | * | Remove deployer from metacoin and contract tests | Leonid Logvinov | 2018-05-10 | 17 | -176/+303 |
| | | | |||||
| * | | Add artifacts to clean command | Fabio Berger | 2018-05-11 | 1 | -1/+1 |
| | | | |||||
| * | | Commit v1 artifacts to migrations package and remove compile step from prebuild | Fabio Berger | 2018-05-11 | 1 | -1/+1 |
| | | | |||||
| * | | Fix tslint errors | Fabio Berger | 2018-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-10 | 6 | -36/+51 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| | * | Fix artifacts paths | Leonid Logvinov | 2018-05-07 | 1 | -2/+2 |
| | | | |||||
| | * | Move artifacts from src/artifacts to artifacts/v1 | Leonid Logvinov | 2018-05-07 | 1 | -1/+1 |
| | | | |||||
| | * | Implement new artifacts format | Leonid Logvinov | 2018-05-07 | 6 | -35/+50 |
| | | | |||||
| * | | Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a ↵ | Fabio Berger | 2018-05-10 | 5 | -27/+28 |
| |/ | | | | | | | unifying library with the same interface | ||||
| * | Publishcontracts@2.1.28@0xproject/website@0.0.32@0xproject/testnet-faucets@1.0.29@0xproject/sra-report@0.0.14@0xproject/sol-resolver@0.0.4@0xproject/react-docs-example@0.0.11@0xproject/migrations@0.0.5@0xproject/metacoin@0.0.6@0xproject/dev-utils@0.4.1@0xproject/base-contract@0.3.1 | Leonid Logvinov | 2018-05-05 | 1 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.37.2 - @0xproject/abi-gen@0.2.13 - @0xproject/assert@0.2.9 - @0xproject/base-contract@0.3.1 - @0xproject/connect@0.6.12 - contracts@2.1.28 - @0xproject/deployer@0.4.3 - @0xproject/dev-utils@0.4.1 - @0xproject/json-schemas@0.7.23 - @0xproject/metacoin@0.0.6 - @0xproject/migrations@0.0.5 - @0xproject/order-utils@0.0.4 - @0xproject/react-docs-example@0.0.11 - @0xproject/react-docs@0.0.11 - @0xproject/react-shared@0.1.6 - @0xproject/sol-cov@0.0.10 - @0xproject/sol-resolver@0.0.4 - @0xproject/sra-report@0.0.14 - @0xproject/subproviders@0.10.1 - @0xproject/testnet-faucets@1.0.29 - @0xproject/types@0.6.3 - @0xproject/typescript-typings@0.3.1 - @0xproject/utils@0.6.1 - @0xproject/web3-wrapper@0.6.3 - @0xproject/website@0.0.32 | ||||
| * | Publishcontracts@2.1.27@0xproject/website@0.0.30@0xproject/testnet-faucets@1.0.28@0xproject/sra-report@0.0.13 | Leonid Logvinov | 2018-05-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | - 0x.js@0.37.1 - contracts@2.1.27 - @0xproject/order-utils@0.0.3 - @0xproject/sra-report@0.0.13 - @0xproject/testnet-faucets@1.0.28 - @0xproject/website@0.0.30 | ||||
| * | Publishcontracts@2.1.26@0xproject/website@0.0.29@0xproject/testnet-faucets@1.0.27@0xproject/sra-report@0.0.12@0xproject/sol-resolver@0.0.3@0xproject/react-docs-example@0.0.9@0xproject/monorepo-scripts@0.1.19@0xproject/migrations@0.0.4@0xproject/metacoin@0.0.5@0xproject/dev-utils@0.4.0@0xproject/base-contract@0.3.0 | Leonid Logvinov | 2018-05-04 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.37.0 - @0xproject/abi-gen@0.2.12 - @0xproject/assert@0.2.8 - @0xproject/base-contract@0.3.0 - @0xproject/connect@0.6.11 - contracts@2.1.26 - @0xproject/deployer@0.4.2 - @0xproject/dev-utils@0.4.0 - @0xproject/json-schemas@0.7.22 - @0xproject/metacoin@0.0.5 - @0xproject/migrations@0.0.4 - @0xproject/monorepo-scripts@0.1.19 - @0xproject/order-utils@0.0.2 - @0xproject/react-docs-example@0.0.9 - @0xproject/react-docs@0.0.9 - @0xproject/react-shared@0.1.4 - @0xproject/sol-cov@0.0.9 - @0xproject/sol-resolver@0.0.3 - @0xproject/sra-report@0.0.12 - @0xproject/subproviders@0.10.0 - @0xproject/testnet-faucets@1.0.27 - @0xproject/tslint-config@0.4.17 - @0xproject/types@0.6.2 - @0xproject/typescript-typings@0.3.0 - @0xproject/utils@0.6.0 - @0xproject/web3-wrapper@0.6.2 - @0xproject/website@0.0.29 | ||||
* | | 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 | 10 | -63/+97 |
| | | |||||
* | | Split up mixins and interfaces | Amir Bandeali | 2018-05-05 | 29 | -745/+508 |
| | | |||||
* | | Make LibBytes methods internal, add TestLibBytes | Amir Bandeali | 2018-05-05 | 5 | -33/+180 |
| | | |||||
* | | Update contracts with revert reasons and constructor keyword | Amir Bandeali | 2018-05-03 | 42 | -181/+410 |
| | | |||||
* | | Add MixinAssetProxy to reuse redundant code | Amir Bandeali | 2018-05-03 | 4 | -98/+117 |
| | | |||||
* | | Add tests for batchTransferFrom | Amir Bandeali | 2018-05-02 | 1 | -151/+296 |
| | | |||||
* | | 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 | 6 | -5/+76 |
| | | |||||
* | | 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 | 19 | -271/+448 |
| | | |||||
* | | Add LibFillResults | Amir Bandeali | 2018-04-27 | 11 | -78/+107 |
| | | |||||
* | | Add ERC721 contracts from zeppelin-solidity | Amir Bandeali | 2018-04-27 | 6 | -4/+574 |
| | | |||||
* | | Add tests and comments | Amir Bandeali | 2018-04-27 | 5 | -31/+50 |
| | | |||||
* | | Add tests | Amir Bandeali | 2018-04-27 | 1 | -4/+38 |
| | | |||||
* | | Update tests and utils | Amir Bandeali | 2018-04-27 | 7 | -1/+226 |
| | | |||||
* | | Implement sender abstraction | Amir Bandeali | 2018-04-27 | 6 | -47/+210 |
| | | |||||
* | | Fix prettier | Fabio Berger | 2018-04-25 | 1 | -3/+9 |
| | | |||||
* | | Fix merge conflict issues | Fabio Berger | 2018-04-24 | 2 | -2/+0 |
| | | |||||
* | | merge v2-prototype | Fabio Berger | 2018-04-24 | 8 | -285/+309 |
|\ \ | |||||
| * | | Rename variables, create private validation methods in token wrappers | Amir Bandeali | 2018-04-24 | 8 | -286/+308 |
| | | | |||||
* | | | Fix tests | Amir Bandeali | 2018-04-24 | 10 | -181/+116 |
| | | | |||||
* | | | 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 | 8 | -673/+587 |
| | | |||||
* | | 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 | 6 | -57/+57 |
| | | |||||
* | | Rename missed variables | Amir Bandeali | 2018-04-23 | 7 | -274/+274 |
| | | |||||
* | | Reorder event args | Amir Bandeali | 2018-04-22 | 1 | -10/+10 |
| | | |||||
* | | Add missing async suffix | Amir Bandeali | 2018-04-22 | 2 | -12/+12 |
| | | |||||
* | | Rename token => asset | Amir Bandeali | 2018-04-22 | 15 | -656/+656 |
| | | |||||
* | | Rename Token => IERC20Token | Amir Bandeali | 2018-04-22 | 8 | -156/+48 |
| | | |||||
* | | Rename DummyToken => DummyERC20Token | Amir Bandeali | 2018-04-22 | 14 | -108/+61 |
| | | |||||
* | | export proxyUtils instead of individual functions | Amir Bandeali | 2018-04-22 | 6 | -85/+83 |
| | | |||||
* | | 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 | 5 | -34/+18 |
| | | |||||
* | | Add presigned signature type | Amir Bandeali | 2018-04-21 | 1 | -1/+29 |
| | | |||||
* | | Fix zeppelin imports, run prettier | Amir Bandeali | 2018-04-21 | 3 | -4/+3 |
| | | |||||
* | | Added tests for (most functions in) LibBytes. The write methods are not ↵ | Greg Hysen | 2018-04-21 | 3 | -2/+241 |
| | | | | | | | | 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 | 6 | -29/+33 |
| | | | | | | | | 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 | 3 | -132/+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 | 8 | -23/+38 |
| | | |||||
* | | Ran prettier | Greg Hysen | 2018-04-21 | 4 | -58/+15 |
| | | |||||
* | | renaming after tokenTransferProxy was removed | Greg Hysen | 2018-04-21 | 4 | -127/+127 |
| | | |||||
* | | Removed ERC20 V1 Proxy + TokenTransferProxy | Greg Hysen | 2018-04-21 | 17 | -631/+82 |
| | | |||||
* | | Updated commenting. Noted that transferFrom succeeds or throws on all ↵ | Greg Hysen | 2018-04-21 | 4 | -7/+7 |
| | | | | | | | | transferFrom implementations. | ||||
* | | switched to constants in default order params. | Greg Hysen | 2018-04-21 | 2 | -4/+4 |
| | | |||||
* | | Reverted change that allowed ERC721 transfer proxy to be called with amount ↵ | Greg Hysen | 2018-04-21 | 2 | -14/+10 |
| | | | | | | | | 0. This now throws. | ||||
* | | Removed takerTokenAddress and makerTokenAddress from Order struct. | Greg Hysen | 2018-04-21 | 10 | -239/+237 |
| | | |||||
* | | Added clarity to not-authorized test case in dispatcher | Greg Hysen | 2018-04-21 | 1 | -3/+4 |
| | | |||||
* | | 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 |
| | | |||||
* | | More testing of common functionality across proxies | Greg Hysen | 2018-04-21 | 1 | -19/+58 |
| | | |||||
* | | Updates to proxy tests. | Greg Hysen | 2018-04-21 | 1 | -13/+13 |
| | | |||||
* | | More authorized -> owner in test comments | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
| | | |||||
* | | Removed unnecessary deployments in test | Greg Hysen | 2018-04-21 | 1 | -17/+1 |
| | | |||||
* | | Moved ERC721 FillOrderNoThrow tests into wrapper | Greg Hysen | 2018-04-21 | 2 | -45/+60 |
| | | |||||
* | | Style improvements to the Asset Proxy tests | Greg Hysen | 2018-04-21 | 2 | -134/+140 |
| | | |||||
* | | Replaced instances of `accounts[0]` with `owner` in contracts test cases | Greg Hysen | 2018-04-21 | 5 | -23/+26 |
| | | |||||
* | | Minor changes to typescript tests | Greg Hysen | 2018-04-21 | 3 | -8/+6 |
| | | |||||
* | | 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 | 5 | -10/+10 |
| | | |||||
* | | Ran prettier/linter on new contract tests | Greg Hysen | 2018-04-21 | 3 | -4/+0 |
| | | |||||
* | | Added comments around deploying contracts to helper/wrapper tests | Greg Hysen | 2018-04-21 | 2 | -65/+34 |
| | | |||||
* | | TS styles in core contract tests | Greg Hysen | 2018-04-21 | 1 | -91/+38 |
| | | |||||
* | | Added more comments to proxy tests | Greg Hysen | 2018-04-21 | 1 | -52/+25 |
| | | |||||
* | | Cleaned up TS in dispatcher tests | Greg Hysen | 2018-04-21 | 1 | -44/+36 |
| | | |||||
* | | Proxy Metadata -> Data | Greg Hysen | 2018-04-21 | 2 | -9/+9 |
| | | |||||
* | | Cleaning up some wording | Greg Hysen | 2018-04-21 | 5 | -28/+26 |
| | | |||||
* | | Removed some unused ERC721 tokens | Greg Hysen | 2018-04-21 | 1 | -62/+13 |
| | | |||||
* | | Minor style improvements to asset proxy utils | Greg Hysen | 2018-04-21 | 6 | -72/+65 |
| | | |||||
* | | 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 | 7 | -46/+46 |
| | | |||||
* | | nilAddress to ZeroEx.NULL_ADDRESS | Greg Hysen | 2018-04-21 | 5 | -27/+22 |
| | | |||||
* | | 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 assetProxyManagerAddress | Greg Hysen | 2018-04-21 | 5 | -29/+17 |
| | | |||||
* | | removed unnecessary import | Greg Hysen | 2018-04-21 | 1 | -2/+0 |
| | | |||||
* | | setAssetProxy to addAssetProxy | Greg Hysen | 2018-04-21 | 6 | -23/+23 |
| | | |||||
* | | Renamed TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 5 | -13/+14 |
| | | |||||
* | | Renaming TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 10 | -56/+56 |
| | | |||||
* | | 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 | 29 | -145/+2459 |
| | | |||||
* | | Fix merge | Fabio Berger | 2018-04-21 | 1 | -2/+2 |
| | | |||||
* | | 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 | 2 | -3/+50 |
| | | |||||
* | | Revert variable naming | Amir Bandeali | 2018-04-21 | 13 | -444/+454 |
| | | |||||
* | | Update Solidity syntax and comments | Amir Bandeali | 2018-04-21 | 5 | -70/+67 |
| | | |||||
* | | Return all amounts traded and fees paid | Amir Bandeali | 2018-04-21 | 7 | -106/+115 |
| | | |||||
* | | Add tests for marketBuyOrders | Amir Bandeali | 2018-04-21 | 2 | -4/+174 |
| | | |||||
* | | Add marketBuyOrders, rename variables, and fx old tests | Amir Bandeali | 2018-04-21 | 11 | -645/+681 |
| | | |||||
* | | Fix build errors | Amir Bandeali | 2018-04-21 | 4 | -26/+27 |
| | | |||||
* | | Separate filled/cancelled errors | Amir Bandeali | 2018-04-21 | 4 | -6/+8 |
| | | |||||
* | | Remove partial cancels | Amir Bandeali | 2018-04-21 | 8 | -141/+35 |
| | | |||||
* | | updated test name to reflect smart contracts | Greg Hysen | 2018-04-21 | 1 | -1/+1 |
| | | |||||
* | | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that ↵ | Greg Hysen | 2018-04-21 | 5 | -35/+40 |
| | | | | | | | | 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 | 3 | -18/+18 |
| | | |||||
* | | Fixed spacing | Greg Hysen | 2018-04-21 | 4 | -56/+56 |
| | | |||||
* | | Implementation and tests in the protocol for cancelling all orders up to a ↵ | Greg Hysen | 2018-04-21 | 7 | -16/+134 |
| | | | | | | | | specific time | ||||
* | | Update copyright headers | Amir Bandeali | 2018-04-21 | 30 | -24/+150 |
| | | |||||
* | | Add private keys for testrpc mnemonic | Amir Bandeali | 2018-04-21 | 5 | -70/+20 |
| | | |||||
* | | Address feedback and lint | Amir Bandeali | 2018-04-21 | 19 | -176/+92 |
| | | |||||
* | | Add tests for fillOrderNoThrow based functions | Amir Bandeali | 2018-04-21 | 3 | -130/+344 |
| | | |||||
* | | Fix fillOrderNoThrow | Amir Bandeali | 2018-04-21 | 1 | -29/+15 |
| | | |||||
* | | Add logging to testrpc script | Amir Bandeali | 2018-04-21 | 1 | -0/+1 |
| | | |||||
* | | Fix package.json | Amir Bandeali | 2018-04-21 | 2 | -6/+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 | 2 | -6/+69 |
| | | |||||
* | | 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 |
| | | |||||
* | | Modify tests to work with new utils | Amir Bandeali | 2018-04-21 | 4 | -584/+632 |
| | | |||||
* | | Add script for starting testrpc with preconfigured private keys | Amir Bandeali | 2018-04-21 | 3 | -0/+72 |
| | | |||||
* | | 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 |
| | | |||||
* | | Fix log decoding | Amir Bandeali | 2018-04-21 | 1 | -13/+13 |
| | | |||||
* | | 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 |
| | | |||||
* | | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 1 | -13/+14 |
| | | |||||
* | | Merge development | Amir Bandeali | 2018-04-21 | 1 | -105/+0 |
| | | |||||
* | | Run prettier | Amir Bandeali | 2018-04-21 | 1 | -1/+1 |
| | | |||||
* | | Fix utils to work with new ABI | Amir Bandeali | 2018-04-21 | 1 | -0/+105 |
| | | |||||
* | | Add fillOrderNoThrow and wrapper functions | Amir Bandeali | 2018-04-21 | 1 | -1/+1 |
| | | |||||
* | | Fix compile errors | Amir Bandeali | 2018-04-21 | 6 | -22/+22 |
| | | |||||
* | | 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 |
| | | |||||
* | | Spelling fixes | Remco Bloemen | 2018-04-21 | 1 | -7/+8 |
| | | |||||
* | | Add documentation | Remco Bloemen | 2018-04-21 | 1 | -2/+16 |
| | | |||||
* | | Make wrappers external again | Remco Bloemen | 2018-04-21 | 1 | -2/+2 |
| | | |||||
* | | Explicit returns | Remco Bloemen | 2018-04-21 | 1 | -5/+6 |
| | | |||||
* | | Revert cancel order signature abstraction | Remco Bloemen | 2018-04-21 | 1 | -7/+2 |
| | | |||||
* | | Fix hash argument name | Remco Bloemen | 2018-04-21 | 1 | -2/+2 |
| | | |||||
* | | Fix batchFillOrdersNoThrow name | Remco Bloemen | 2018-04-21 | 1 | -1/+1 |
| | | |||||
* | | Fix input length in fillOrderNoThrow | Remco Bloemen | 2018-04-21 | 1 | -6/+11 |
| | | |||||
* | | Add SignatureType.Invalid and documentation | Remco Bloemen | 2018-04-21 | 1 | -0/+21 |
| | | |||||
* | | Make first value illegal | Remco Bloemen | 2018-04-21 | 1 | -6/+4 |
| | | |||||
* | | Implement EIP712 at verify-signature call site | Remco Bloemen | 2018-04-21 | 3 | -25/+19 |
| | | |||||
* | | Cancel signature abstraction | Remco Bloemen | 2018-04-21 | 1 | -3/+10 |
| | | |||||
* | | Cache order maker signature (ZEIP-15) | Remco Bloemen | 2018-04-21 | 1 | -8/+10 |
| | | |||||
* | | Add EIP712 signatures (implements ZEIP-17) | Remco Bloemen | 2018-04-21 | 1 | -4/+40 |
| | | |||||
* | | Add external contract call signatures (relates to ZEIP 1 and 7) | Remco Bloemen | 2018-04-21 | 2 | -1/+36 |
| | | |||||
* | | Revert after cascade | Remco Bloemen | 2018-04-21 | 1 | -6/+7 |
| | | |||||
* | | Add 'caller' signature type | Remco Bloemen | 2018-04-21 | 1 | -17/+35 |
| | | |||||
* | | Abstract signature to opaque bytearray | Remco Bloemen | 2018-04-21 | 7 | -161/+148 |
| | | |||||
* | | Use interfaces for contract types | Remco Bloemen | 2018-04-21 | 3 | -36/+33 |
| | | |||||
* | | Use new logDecoder interface | Amir Bandeali | 2018-04-21 | 2 | -10/+13 |
| | |