Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMIT | Amir Bandeali | 2018-05-31 | 1 | -1/+1 |
| | | |||||
* | | Make AssetProxyId last byte of assetData | Amir Bandeali | 2018-05-31 | 1 | -8/+8 |
| | | |||||
* | | Add signer to txHash, allow approveValidator to be used with executeTransaction | Amir Bandeali | 2018-05-31 | 1 | -5/+4 |
| | | |||||
* | | Use last byte of signature as signature type | Amir Bandeali | 2018-05-31 | 1 | -2/+2 |
| | | |||||
* | | Remove TxOrigin signature type, modify whitelist to use Validator signature type | Amir Bandeali | 2018-05-31 | 1 | -0/+1 |
| | | |||||
* | | Update Whitelist contract with comments, also require maker to be whitelisted | Amir Bandeali | 2018-05-31 | 1 | -0/+2 |
| | | |||||
* | | Add example whitelist contract and minimum tests | Amir Bandeali | 2018-05-31 | 1 | -0/+1 |
| | | |||||
* | | Add TxOrigin signature type and rearrange order of types | Amir Bandeali | 2018-05-31 | 1 | -3/+5 |
| | | |||||
* | | Change logDecoder back into class, remove awaitTransactionMined from ↵ | Amir Bandeali | 2018-05-31 | 3 | -50/+62 |
|/ | | | | multiSigWrapper | ||||
* | 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 | 7 | -62/+76 |
|\ | | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress | ||||
| * | Use web3-wrapper instead of 0x.js, update logDecoder | Amir Bandeali | 2018-05-25 | 5 | -42/+41 |
| | | |||||
| * | Cleanup tests | Amir Bandeali | 2018-05-25 | 1 | -1/+1 |
| | | |||||
| * | Add old MultiSig to previous contracts, cleanup file structure | Amir Bandeali | 2018-05-25 | 1 | -5/+5 |
| | | |||||
| * | Address feedback, rename contract to AssetProxyOwner | Amir Bandeali | 2018-05-25 | 3 | -8/+5 |
| | | |||||
| * | Update multisig tests and utils | Amir Bandeali | 2018-05-25 | 1 | -25/+43 |
| | | |||||
* | | 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 | 1 | -4/+19 |
| | | |||||
* | | Update order hash to match latest eip712 | Jacob Evans | 2018-05-25 | 1 | -19/+26 |
|/ | |||||
* | 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 |
|/ | |||||
* | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 1 | -1/+1 |
| | |||||
* | 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 | 2 | -5/+9 |
| | |||||
* | Style changes to atomic order matching | Greg Hysen | 2018-05-19 | 1 | -6/+8 |
| | |||||
* | Added require reasons to MixinMatchOrders and cleaned up some comments. | Greg Hysen | 2018-05-19 | 1 | -20/+15 |
| | |||||
* | Atomic Order Matching - Tests | Greg Hysen | 2018-05-19 | 4 | -6/+147 |
| | |||||
* | 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 | 8 | -76/+98 |
|/ | |||||
* | Make LibBytes methods internal, add TestLibBytes | Amir Bandeali | 2018-05-05 | 1 | -1/+1 |
| | |||||
* | Make all lib functions internal, add contracts for testing | Amir Bandeali | 2018-04-27 | 2 | -31/+2 |
| | |||||
* | Add tests and comments | Amir Bandeali | 2018-04-27 | 1 | -2/+0 |
| | |||||
* | Update tests and utils | Amir Bandeali | 2018-04-27 | 6 | -1/+65 |
| | |||||
* | 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 | 2 | -3/+21 |
|/ | |||||
* | 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 | 1 | -1/+1 |
| | |||||
* | Add missing async suffix | Amir Bandeali | 2018-04-22 | 1 | -1/+1 |
| | |||||
* | Rename token => asset | Amir Bandeali | 2018-04-22 | 4 | -57/+57 |
| | |||||
* | Rename Token => IERC20Token | Amir Bandeali | 2018-04-22 | 1 | -2/+0 |
| | |||||
* | Rename DummyToken => DummyERC20Token | Amir Bandeali | 2018-04-22 | 3 | -9/+6 |
| | |||||
* | export proxyUtils instead of individual functions | Amir Bandeali | 2018-04-22 | 1 | -34/+32 |
| | |||||
* | 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. | ||||
* | Miscellaneous style changes to the contracts package; specifically tests | Greg Hysen | 2018-04-21 | 1 | -2/+2 |
| | |||||
* | Removed ERC20 V1 Proxy + TokenTransferProxy | Greg Hysen | 2018-04-21 | 3 | -13/+0 |
| | |||||
* | Removed takerTokenAddress and makerTokenAddress from Order struct. | Greg Hysen | 2018-04-21 | 2 | -8/+0 |
| | |||||
* | toUnsigned -> toBuffer in assetProxyUtils | Greg Hysen | 2018-04-21 | 1 | -1/+1 |
| | |||||
* | Minor changes to typescript tests | Greg Hysen | 2018-04-21 | 2 | -4/+2 |
| | |||||
* | Updated ERC20 v1 proxy names in tests | Greg Hysen | 2018-04-21 | 2 | -3/+3 |
| | |||||
* | 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 |
| | |||||
* | 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 | 2 | -10/+10 |
| | |||||
* | Renaming TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
| | |||||
* | Asset Proxy Dispatcher | Greg Hysen | 2018-04-21 | 5 | -2/+94 |
| | |||||
* | Revert variable naming | Amir Bandeali | 2018-04-21 | 4 | -55/+55 |
| | |||||
* | Add marketBuyOrders, rename variables, and fx old tests | Amir Bandeali | 2018-04-21 | 4 | -104/+121 |
| | |||||
* | Fix build errors | Amir Bandeali | 2018-04-21 | 2 | -12/+5 |
| | |||||
* | Separate filled/cancelled errors | Amir Bandeali | 2018-04-21 | 1 | -1/+2 |
| | |||||
* | Remove partial cancels | Amir Bandeali | 2018-04-21 | 3 | -24/+6 |
| | |||||
* | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that ↵ | Greg Hysen | 2018-04-21 | 1 | -2/+2 |
| | | | | 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 | 1 | -2/+2 |
| | |||||
* | Implementation and tests in the protocol for cancelling all orders up to a ↵ | Greg Hysen | 2018-04-21 | 2 | -0/+16 |
| | | | | specific time | ||||
* | Add private keys for testrpc mnemonic | Amir Bandeali | 2018-04-21 | 1 | -20/+14 |
| | |||||
* | Address feedback and lint | Amir Bandeali | 2018-04-21 | 7 | -121/+36 |
| | |||||
* | Add tests for fillOrderNoThrow based functions | Amir Bandeali | 2018-04-21 | 1 | -0/+42 |
| | |||||
* | Fix package.json | Amir Bandeali | 2018-04-21 | 1 | -5/+5 |
| | |||||
* | Add fillOrderNoThrow to exchange wrapper and add test | Amir Bandeali | 2018-04-21 | 1 | -0/+21 |
| | |||||
* | 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 | 5 | -52/+95 |
| | |||||
* | Modify utils to work with new signature format | Amir Bandeali | 2018-04-21 | 6 | -149/+189 |
| | |||||
* | Use new logDecoder interface | Amir Bandeali | 2018-04-21 | 2 | -10/+13 |
| | |||||
* | Rename variables | Amir Bandeali | 2018-04-21 | 2 | -27/+27 |
| | |||||
* | Move log decoding logic to exchange wrapper | Amir Bandeali | 2018-04-21 | 1 | -11/+39 |
| | |||||
* | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 4 | -16/+77 |
| | |||||
* | Move utils dir into src | Amir Bandeali | 2018-04-21 | 10 | -0/+679 |