| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 20 | -387/+629 |
|\ |
|
| * | Use web3-wrapper instead of 0x.js, update logDecoder | Amir Bandeali | 2018-05-25 | 7 | -49/+48 |
| * | Cleanup tests | Amir Bandeali | 2018-05-25 | 4 | -6/+12 |
| * | Move readFirst4 to LibBytes | Amir Bandeali | 2018-05-25 | 5 | -39/+53 |
| * | Add old MultiSig to previous contracts, cleanup file structure | Amir Bandeali | 2018-05-25 | 7 | -16/+16 |
| * | Fix build | Amir Bandeali | 2018-05-25 | 4 | -4/+91 |
| * | Address feedback, rename contract to AssetProxyOwner | Amir Bandeali | 2018-05-25 | 6 | -33/+37 |
| * | Update multisig tests and utils | Amir Bandeali | 2018-05-25 | 4 | -253/+355 |
| * | 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 | 12 | -48/+26 |
|\ \ |
|
| * \ | Merge pull request #618 from 0xProject/feature/v2-migrations | Leonid Logvinov | 2018-05-25 | 12 | -49/+27 |
| |\ \
| | |/
| |/| |
|
| | * | Fix linter issues | Leonid Logvinov | 2018-05-25 | 3 | -3/+3 |
| | * | Migrate migrations to v2 | Leonid Logvinov | 2018-05-25 | 12 | -49/+27 |
* | | | Use domain separator for exchange address | Jacob Evans | 2018-05-25 | 4 | -8/+41 |
* | | | publicGetOrderSchemaHash -> getOrderSchemaHash | Jacob Evans | 2018-05-25 | 2 | -2/+2 |
* | | | Update order hash to match latest eip712 | Jacob Evans | 2018-05-25 | 4 | -34/+57 |
|/ / |
|
* / | Disable contracts coverage on CI | Leonid Logvinov | 2018-05-25 | 1 | -1/+1 |
|/ |
|
* | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 12 | -61/+85 |
* | Move contract utils | Leonid Logvinov | 2018-05-24 | 5 | -19/+19 |
* | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-24 | 23 | -293/+280 |
|\ |
|
| * | Fix Tslint error caused by "PromiseLike" value | Fabio Berger | 2018-05-23 | 1 | -0/+6 |
| * | fix contract-wrappers version | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| * | merge v2-prototype | Fabio Berger | 2018-05-23 | 1 | -11/+11 |
| |\ |
|
| | * | Merge branch 'development' into v2-prototype | Leonid Logvinov | 2018-05-23 | 1 | -11/+11 |
| | |\ |
|
| | | * | Publish | Leonid Logvinov | 2018-05-23 | 1 | -11/+11 |
| * | | | Fix dep version | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| * | | | Fix import | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| * | | | Fix await calls | Fabio Berger | 2018-05-23 | 1 | -12/+3 |
| * | | | Refactor etherToken test to use contract-wrappers | Fabio Berger | 2018-05-23 | 1 | -22/+36 |
| * | | | Fix ExchangeWrapper | Fabio Berger | 2018-05-23 | 6 | -14/+10 |
| * | | | Fix imports | Fabio Berger | 2018-05-23 | 2 | -2/+1 |
| * | | | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 23 | -207/+478 |
| |\| | |
|
| * | | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 23 | -266/+235 |
* | | | | Parse compiler.json in SolCompilerArtifactsAdapter | Leonid Logvinov | 2018-05-23 | 1 | -3/+1 |
* | | | | Fix a bug in CALL-like opcode handling | Leonid Logvinov | 2018-05-23 | 2 | -4/+5 |
* | | | | Publish | Leonid Logvinov | 2018-05-23 | 1 | -11/+11 |
* | | | | Rename ZeroExArtifactAdapter to SolCompilerArtifactAdapter | Leonid Logvinov | 2018-05-23 | 1 | -2/+2 |
* | | | | Assign then return | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
* | | | | Introduce CONFIG_FILE | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
* | | | | Remove web3Factory.create and remove dev-tools dependency on sol-cov | Leonid Logvinov | 2018-05-23 | 4 | -4/+35 |
| |/ /
|/| | |
|
* | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto... | Fabio Berger | 2018-05-23 | 16 | -175/+419 |
|\ \ \ |
|
| * \ \ | Merge pull request #601 from 0xProject/contracts-test-fixes | Alex Browne | 2018-05-23 | 16 | -175/+419 |
| |\ \ \ |
|
| | * | | | Rename some variables in multi_sig_with_time_lock.ts | Alex Browne | 2018-05-23 | 1 | -10/+10 |
| | * | | | Remove extra awaitTransactionMinedAsync calls | Alex Browne | 2018-05-23 | 1 | -4/+2 |
| | * | | | Apply changes to test/exchange/match_orders.ts | Alex Browne | 2018-05-22 | 1 | -6/+18 |
| | * | | | Fix some unhandled promise rejections | Alex Browne | 2018-05-22 | 2 | -4/+8 |
| | * | | | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 10 | -155/+294 |
| | * | | | Add missing blockchainLifecycle calls to contracts tests | Alex Browne | 2018-05-22 | 14 | -0/+91 |
* | | | | | Fix tslint issues | Fabio Berger | 2018-05-23 | 2 | -10/+13 |
|/ / / / |
|
* | | | | Merge pull request #605 from 0xProject/fix/multiple/build-errors | Fabio Berger | 2018-05-23 | 7 | -18/+30 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | 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 |
| |\ |
|
| | * | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-16 | 1 | -0/+3 |
| | |\ |
|
| | * | | 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 |
|\ \ \ \ |
|
| * | | | | 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 t... | Greg Hysen | 2018-05-19 | 3 | -131/+131 |
| * | | | | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ... | Greg Hysen | 2018-05-19 | 2 | -138/+126 |
| * | | | | 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 |
| * | | | | 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 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 | 5 | -37/+27 |
| * | | | | 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 | 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 |
|\ \ \ |
|
| * | | | 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 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge pull request #578 from 0xProject/document-node-version | Alex Browne | 2018-05-16 | 1 | -0/+3 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | 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 accord... | Fabio Berger | 2018-05-15 | 2 | -16/+4 |
| |/ / |
|
| * | | 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 |
| * | Remove gitkeeps | Fabio Berger | 2018-05-11 | 1 | -0/+0 |
| * | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-11 | 17 | -170/+303 |
| |\ |
|
| | * | 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 |
| |\| |
|
| | * | 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 unifyin... | Fabio Berger | 2018-05-10 | 5 | -27/+28 |
| |/ |
|
| * | 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 |
| * | 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 |
| * | 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 |
* | | 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 |
* | | 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 curre... | Greg Hysen | 2018-04-21 | 3 | -2/+241 |
* | | 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 | 6 | -29/+33 |
* | | 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 | 3 | -132/+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 | 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 transfe... | Greg Hysen | 2018-04-21 | 4 | -7/+7 |
* | | 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 0... | Greg Hysen | 2018-04-21 | 2 | -14/+10 |
* | | 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 900... | Greg Hysen | 2018-04-21 | 1 | -5/+17 |
* | | 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 0-co... | Greg Hysen | 2018-04-21 | 3 | -7/+8 |
* | | 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 generalize... | Greg Hysen | 2018-04-21 | 4 | -10/+10 |
* | | 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 orders... | Greg Hysen | 2018-04-21 | 5 | -35/+40 |
* | | 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 sp... | Greg Hysen | 2018-04-21 | 7 | -16/+134 |
* | | 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 |