Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵ | Greg Hysen | 2018-06-08 | 1 | -1/+1 |
| | | | | This way they can still be used by the forwarding contract. TestAssetDataDecoders inherits them in the same way the forwarding contract would | ||||
* | Test for onReceived erc721 callback | Greg Hysen | 2018-06-08 | 1 | -0/+1 |
| | |||||
* | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 1 | -0/+1 |
| | |||||
* | Tests for libMem | Greg Hysen | 2018-06-08 | 1 | -0/+1 |
| | |||||
* | Linter now passes | fragosti | 2018-06-06 | 1 | -2/+2 |
| | |||||
* | Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵ | Amir Bandeali | 2018-06-05 | 1 | -15/+7 |
| | | | | failures, and remove redundant logic in matchOrders | ||||
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 1 | -1/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | Introduce ethereum-types package | Leonid Logvinov | 2018-06-01 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-01 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | 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 |
| | | |||||
* | | Introduce OrderWithoutExchangeAddress type since this is what get's sent to ↵ | Fabio Berger | 2018-05-31 | 1 | -8/+8 |
| | | | | | | | | the smart contracts | ||||
* | | Initial refactor of order-utils. Move many utils from contracts into this ↵ | Fabio Berger | 2018-05-30 | 1 | -33/+0 |
|/ | | | | package. | ||||
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 1 | -1/+1 |
|\ | | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress | ||||
| * | Address feedback, rename contract to AssetProxyOwner | Amir Bandeali | 2018-05-25 | 1 | -1/+1 |
| | | |||||
* | | Migrate migrations to v2 | Leonid Logvinov | 2018-05-25 | 1 | -31/+8 |
|/ | |||||
* | Add CancelOrder and MatchOrder types | Remco Bloemen | 2018-05-22 | 1 | -0/+12 |
| | |||||
* | 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 | 1 | -0/+17 |
| | | | | should be useful for the forwarding contract code. | ||||
* | The OrderInfo struct is now returned by the getOrderInfo function | Greg Hysen | 2018-05-19 | 1 | -0/+6 |
| | |||||
* | 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 | 1 | -6/+42 |
| | |||||
* | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 1 | -16/+0 |
| | |||||
* | 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 | 1 | -0/+2 |
| | |||||
* | Update tests and utils | Amir Bandeali | 2018-04-27 | 1 | -0/+9 |
| | |||||
* | merge v2-prototype | Fabio Berger | 2018-04-24 | 1 | -1/+1 |
|\ | |||||
| * | Rename variables, create private validation methods in token wrappers | Amir Bandeali | 2018-04-24 | 1 | -1/+1 |
| | | |||||
* | | Fix tests | Amir Bandeali | 2018-04-24 | 1 | -1/+2 |
|/ | |||||
* | Add ERC721 wrapper | Amir Bandeali | 2018-04-24 | 1 | -20/+7 |
| | |||||
* | Rename token => asset | Amir Bandeali | 2018-04-22 | 1 | -9/+9 |
| | |||||
* | Rename DummyToken => DummyERC20Token | Amir Bandeali | 2018-04-22 | 1 | -2/+1 |
| | |||||
* | 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 | 1 | -3/+0 |
| | |||||
* | Removed takerTokenAddress and makerTokenAddress from Order struct. | Greg Hysen | 2018-04-21 | 1 | -2/+0 |
| | |||||
* | Updated ERC20 v1 proxy names in tests | Greg Hysen | 2018-04-21 | 1 | -2/+2 |
| | |||||
* | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetData | Greg Hysen | 2018-04-21 | 1 | -4/+4 |
| | |||||
* | Renaming TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
| | |||||
* | Asset Proxy Dispatcher | Greg Hysen | 2018-04-21 | 1 | -2/+18 |
| | |||||
* | Revert variable naming | Amir Bandeali | 2018-04-21 | 1 | -7/+7 |
| | |||||
* | Add marketBuyOrders, rename variables, and fx old tests | Amir Bandeali | 2018-04-21 | 1 | -11/+17 |
| | |||||
* | Separate filled/cancelled errors | Amir Bandeali | 2018-04-21 | 1 | -1/+2 |
| | |||||
* | Remove partial cancels | Amir Bandeali | 2018-04-21 | 1 | -1/+0 |
| | |||||
* | Renamed all instances of timestamp to salt. Clarified test case wording. | Greg Hysen | 2018-04-21 | 1 | -1/+1 |
| | |||||
* | Implementation and tests in the protocol for cancelling all orders up to a ↵ | Greg Hysen | 2018-04-21 | 1 | -0/+4 |
| | | | | specific time | ||||
* | Address feedback and lint | Amir Bandeali | 2018-04-21 | 1 | -25/+2 |
| | |||||
* | Add utils for hashing and signing orders, update wrappers | Amir Bandeali | 2018-04-21 | 1 | -0/+15 |
| | |||||
* | Modify utils to work with new signature format | Amir Bandeali | 2018-04-21 | 1 | -17/+50 |
| | |||||
* | Move utils dir into src | Amir Bandeali | 2018-04-21 | 1 | -0/+116 |