Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Initial refactor of order-utils. Move many utils from contracts into this ↵ | Fabio Berger | 2018-05-30 | 1 | -31/+16 |
| | | | | package. | ||||
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 1 | -7/+2 |
|\ | | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress | ||||
| * | Cleanup tests | Amir Bandeali | 2018-05-25 | 1 | -2/+2 |
| | | |||||
| * | Update multisig tests and utils | Amir Bandeali | 2018-05-25 | 1 | -5/+0 |
| | | |||||
* | | Migrate migrations to v2 | Leonid Logvinov | 2018-05-25 | 1 | -2/+2 |
|/ | |||||
* | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 1 | -6/+6 |
| | |||||
* | Fix Tslint error caused by "PromiseLike" value | Fabio Berger | 2018-05-23 | 1 | -0/+6 |
| | |||||
* | Fix import | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | |||||
* | Fix ExchangeWrapper | Fabio Berger | 2018-05-23 | 1 | -7/+1 |
| | |||||
* | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 1 | -20/+48 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | Fix some unhandled promise rejections | Alex Browne | 2018-05-22 | 1 | -2/+6 |
| | | |||||
| * | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 1 | -18/+36 |
| | | |||||
| * | Add missing blockchainLifecycle calls to contracts tests | Alex Browne | 2018-05-22 | 1 | -0/+6 |
| | | |||||
* | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 1 | -25/+26 |
|/ | |||||
* | Merge pull request #572 from 0xProject/feature/contracts/atomicMatching | Greg Hysen | 2018-05-22 | 1 | -14/+14 |
|\ | | | | | Atomic Order Matching | ||||
| * | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 1 | -1/+1 |
| | | |||||
| * | Atomic Order Matching - Tests | Greg Hysen | 2018-05-19 | 1 | -15/+15 |
| | | |||||
* | | merge development | Fabio Berger | 2018-05-22 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 1 | -15/+11 |
|\| | |||||
| * | Fix linter errors | Leonid Logvinov | 2018-05-11 | 1 | -1/+1 |
| | | |||||
| * | Remove unused deployer docs configs | Leonid Logvinov | 2018-05-10 | 1 | -7/+7 |
| | | |||||
| * | Fix linter issues | Leonid Logvinov | 2018-05-10 | 1 | -6/+6 |
| | | |||||
| * | Remove deployer from metacoin and contract tests | Leonid Logvinov | 2018-05-10 | 1 | -17/+45 |
| | | |||||
* | | Fix merge conflict issues | Fabio Berger | 2018-04-24 | 1 | -1/+0 |
| | | |||||
* | | merge v2-prototype | Fabio Berger | 2018-04-24 | 1 | -55/+61 |
|\ \ | |||||
| * | | Rename variables, create private validation methods in token wrappers | Amir Bandeali | 2018-04-24 | 1 | -55/+60 |
| | | | |||||
* | | | Fix tests | Amir Bandeali | 2018-04-24 | 1 | -60/+9 |
|/ / | |||||
* | | Fix and cleanup tests | Amir Bandeali | 2018-04-24 | 1 | -230/+195 |
| | | |||||
* | | Rename proxyUtils => assetProxyUtils | Amir Bandeali | 2018-04-23 | 1 | -20/+20 |
| | | |||||
* | | Rename missed variables | Amir Bandeali | 2018-04-23 | 1 | -146/+146 |
| | | |||||
* | | Add missing async suffix | Amir Bandeali | 2018-04-22 | 1 | -11/+11 |
| | | |||||
* | | Rename token => asset | Amir Bandeali | 2018-04-22 | 1 | -221/+221 |
| | | |||||
* | | Rename DummyToken => DummyERC20Token | Amir Bandeali | 2018-04-22 | 1 | -10/+10 |
| | | |||||
* | | export proxyUtils instead of individual functions | Amir Bandeali | 2018-04-22 | 1 | -20/+20 |
| | | |||||
* | | Remove unused constructor arguments | Amir Bandeali | 2018-04-22 | 1 | -2/+1 |
| | | |||||
* | | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less ↵ | Greg Hysen | 2018-04-21 | 1 | -2/+2 |
| | | | | | | | | confusion. Also updated the function description. | ||||
* | | Miscellaneous style changes to the contracts package; specifically tests | Greg Hysen | 2018-04-21 | 1 | -2/+4 |
| | | |||||
* | | Ran prettier | Greg Hysen | 2018-04-21 | 1 | -10/+2 |
| | | |||||
* | | renaming after tokenTransferProxy was removed | Greg Hysen | 2018-04-21 | 1 | -26/+26 |
| | | |||||
* | | Removed ERC20 V1 Proxy + TokenTransferProxy | Greg Hysen | 2018-04-21 | 1 | -55/+5 |
| | | |||||
* | | switched to constants in default order params. | Greg Hysen | 2018-04-21 | 1 | -2/+2 |
| | | |||||
* | | Removed takerTokenAddress and makerTokenAddress from Order struct. | Greg Hysen | 2018-04-21 | 1 | -82/+70 |
| | | |||||
* | | Moved ERC721 FillOrderNoThrow tests into wrapper | Greg Hysen | 2018-04-21 | 1 | -28/+0 |
| | | |||||
* | | Style improvements to the Asset Proxy tests | Greg Hysen | 2018-04-21 | 1 | -95/+93 |
| | | |||||
* | | Replaced instances of `accounts[0]` with `owner` in contracts test cases | Greg Hysen | 2018-04-21 | 1 | -8/+9 |
| | | |||||
* | | Updated ERC20 v1 proxy names in tests | Greg Hysen | 2018-04-21 | 1 | -2/+2 |
| | | |||||
* | | Ran prettier/linter on new contract tests | Greg Hysen | 2018-04-21 | 1 | -2/+0 |
| | | |||||
* | | TS styles in core contract tests | Greg Hysen | 2018-04-21 | 1 | -91/+38 |
| | | |||||
* | | 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 | 1 | -24/+24 |
| | | |||||
* | | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetData | Greg Hysen | 2018-04-21 | 1 | -20/+20 |
| | | |||||
* | | nilAddress to ZeroEx.NULL_ADDRESS | Greg Hysen | 2018-04-21 | 1 | -4/+3 |
| | | |||||
* | | Removed unnecessary assetProxyManagerAddress | Greg Hysen | 2018-04-21 | 1 | -5/+1 |
| | | |||||
* | | setAssetProxy to addAssetProxy | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
| | | |||||
* | | Renamed TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
| | | |||||
* | | Renaming TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 1 | -12/+12 |
| | | |||||
* | | Asset Proxy Dispatcher | Greg Hysen | 2018-04-21 | 1 | -6/+497 |
| | | |||||
* | | Add back require statements and tests (will move to another PR) | Amir Bandeali | 2018-04-21 | 1 | -0/+42 |
| | | |||||
* | | Revert variable naming | Amir Bandeali | 2018-04-21 | 1 | -126/+128 |
| | | |||||
* | | Update Solidity syntax and comments | Amir Bandeali | 2018-04-21 | 1 | -14/+14 |
| | | |||||
* | | Add marketBuyOrders, rename variables, and fx old tests | Amir Bandeali | 2018-04-21 | 1 | -209/+157 |
| | | |||||
* | | Fix build errors | Amir Bandeali | 2018-04-21 | 1 | -13/+21 |
| | | |||||
* | | Separate filled/cancelled errors | Amir Bandeali | 2018-04-21 | 1 | -2/+2 |
| | | |||||
* | | Remove partial cancels | Amir Bandeali | 2018-04-21 | 1 | -66/+3 |
| | | |||||
* | | 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 | 1 | -23/+27 |
| | | | | | | | | 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 | 1 | -15/+15 |
| | | |||||
* | | Fixed spacing | Greg Hysen | 2018-04-21 | 1 | -51/+51 |
| | | |||||
* | | Implementation and tests in the protocol for cancelling all orders up to a ↵ | Greg Hysen | 2018-04-21 | 1 | -0/+67 |
| | | | | | | | | specific time | ||||
* | | Add private keys for testrpc mnemonic | Amir Bandeali | 2018-04-21 | 1 | -2/+2 |
| | | |||||
* | | Address feedback and lint | Amir Bandeali | 2018-04-21 | 1 | -5/+2 |
| | | |||||
* | | Add tests for fillOrderNoThrow based functions | Amir Bandeali | 2018-04-21 | 1 | -112/+0 |
| | | |||||
* | | Fix package.json | Amir Bandeali | 2018-04-21 | 1 | -1/+0 |
| | | |||||
* | | Modify tests to work with new utils | Amir Bandeali | 2018-04-21 | 1 | -236/+249 |
| | | |||||
* | | Fix log decoding | Amir Bandeali | 2018-04-21 | 1 | -13/+13 |
| | | |||||
* | | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 1 | -13/+14 |
| | | |||||
* | | Fix compile errors | Amir Bandeali | 2018-04-21 | 1 | -4/+4 |
| | | |||||
* | | Move log decoding logic to exchange wrapper | Amir Bandeali | 2018-04-21 | 1 | -10/+9 |
| | | |||||
* | | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 1 | -124/+124 |
| | | |||||
* | | Move utils dir into src | Amir Bandeali | 2018-04-21 | 1 | -6/+6 |
| | | |||||
* | | Merge development | Amir Bandeali | 2018-04-21 | 1 | -10/+7 |
| | | |||||
* | | Run prettier | Amir Bandeali | 2018-04-21 | 1 | -11/+3 |
| | | |||||
* | | Get tests to build | Amir Bandeali | 2018-04-21 | 1 | -118/+95 |
|/ | |||||
* | Move our contract templates to accept Provider instead of Web3Wrapper | Leonid Logvinov | 2018-04-04 | 1 | -7/+7 |
| | |||||
* | Add sol-cover implementation | Leonid Logvinov | 2018-03-12 | 1 | -3/+2 |
| | |||||
* | Remove only | Leonid Logvinov | 2018-02-28 | 1 | -1/+1 |
| | |||||
* | Fix a typo | Leonid Logvinov | 2018-02-28 | 1 | -1/+1 |
| | |||||
* | Improve an error message when an inorrect number of constructor params is passed | Leonid Logvinov | 2018-02-28 | 1 | -4/+4 |
| | |||||
* | Change backend for contracts contracts | Leonid Logvinov | 2018-02-28 | 1 | -4/+4 |
| | |||||
* | Use the same templates as 0x.js | Leonid Logvinov | 2018-02-28 | 1 | -7/+11 |
| | |||||
* | Fix build by using local events types | Leonid Logvinov | 2018-02-28 | 1 | -10/+7 |
| | |||||
* | Use Order and SignedOrder type from 0x.js | Leonid Logvinov | 2018-02-07 | 1 | -151/+150 |
| | |||||
* | Introduce SignedOrder class and remove type assertions | Leonid Logvinov | 2018-02-07 | 1 | -208/+209 |
| | |||||
* | Make orderHashHex a getter instead of a property | Leonid Logvinov | 2018-02-07 | 1 | -25/+36 |
| | |||||
* | Change tests | Leonid Logvinov | 2018-02-07 | 1 | -34/+47 |
| | |||||
* | Update contract versions, fix tests | Amir Bandeali | 2018-02-03 | 1 | -1/+1 |
| | |||||
* | Remove accounts magic from tests | Leonid Logvinov | 2018-01-30 | 1 | -3/+1 |
| | |||||
* | Make an RPC constructor param implicit | Leonid Logvinov | 2018-01-30 | 1 | -1/+1 |
| | |||||
* | Use an enum for contract name | Leonid Logvinov | 2018-01-30 | 1 | -7/+7 |
| | |||||
* | Normalize the dependencies | Leonid Logvinov | 2018-01-30 | 1 | -35/+24 |
| | |||||
* | Remove truffle from tests | Leonid Logvinov | 2018-01-30 | 1 | -57/+66 |
| | |||||
* | Refactor contracts tests to not use injected web3 instance | Leonid Logvinov | 2018-01-30 | 1 | -7/+3 |
| | |||||
* | Remove truffle from Exchange tests | Leonid Logvinov | 2018-01-30 | 1 | -8/+21 |
| | |||||
* | Remove truffle from tokenTransferProxy tests | Leonid Logvinov | 2018-01-30 | 1 | -0/+852 |