aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/utils/types.ts
Commit message (Collapse)AuthorAgeFilesLines
* Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵Greg Hysen2018-06-081-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 callbackGreg Hysen2018-06-081-0/+1
|
* Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-081-0/+1
|
* Tests for libMemGreg Hysen2018-06-081-0/+1
|
* Linter now passesfragosti2018-06-061-2/+2
|
* Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵Amir Bandeali2018-06-051-15/+7
| | | | failures, and remove redundant logic in matchOrders
* Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-021-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 packageLeonid Logvinov2018-06-011-1/+2
| |
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-011-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 testsAmir Bandeali2018-05-311-0/+1
| |
| * Add TxOrigin signature type and rearrange order of typesAmir Bandeali2018-05-311-3/+5
| |
* | Introduce OrderWithoutExchangeAddress type since this is what get's sent to ↵Fabio Berger2018-05-311-8/+8
| | | | | | | | the smart contracts
* | Initial refactor of order-utils. Move many utils from contracts into this ↵Fabio Berger2018-05-301-33/+0
|/ | | | package.
* Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-251-1/+1
|\ | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress
| * Address feedback, rename contract to AssetProxyOwnerAmir Bandeali2018-05-251-1/+1
| |
* | Migrate migrations to v2Leonid Logvinov2018-05-251-31/+8
|/
* Add CancelOrder and MatchOrder typesRemco Bloemen2018-05-221-0/+12
|
* orderFilledAmount -> orderTakerAssetFilledAmountGreg Hysen2018-05-191-1/+1
|
* Cleaned up interface for decoding proxy data. Added a general decoder, which ↵Greg Hysen2018-05-191-0/+17
| | | | should be useful for the forwarding contract code.
* The OrderInfo struct is now returned by the getOrderInfo functionGreg Hysen2018-05-191-0/+6
|
* Added require reasons to MixinMatchOrders and cleaned up some comments.Greg Hysen2018-05-191-20/+15
|
* Atomic Order Matching - TestsGreg Hysen2018-05-191-6/+42
|
* Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-161-16/+0
|
* Make LibBytes methods internal, add TestLibBytesAmir Bandeali2018-05-051-1/+1
|
* Make all lib functions internal, add contracts for testingAmir Bandeali2018-04-271-0/+2
|
* Update tests and utilsAmir Bandeali2018-04-271-0/+9
|
* merge v2-prototypeFabio Berger2018-04-241-1/+1
|\
| * Rename variables, create private validation methods in token wrappersAmir Bandeali2018-04-241-1/+1
| |
* | Fix testsAmir Bandeali2018-04-241-1/+2
|/
* Add ERC721 wrapperAmir Bandeali2018-04-241-20/+7
|
* Rename token => assetAmir Bandeali2018-04-221-9/+9
|
* Rename DummyToken => DummyERC20TokenAmir Bandeali2018-04-221-2/+1
|
* Added tests for (most functions in) LibBytes. The write methods are not ↵Greg Hysen2018-04-211-0/+1
| | | | currently compatible with our generated contract wrappers.
* Miscellaneous style changes to the contracts package; specifically testsGreg Hysen2018-04-211-2/+2
|
* Removed ERC20 V1 Proxy + TokenTransferProxyGreg Hysen2018-04-211-3/+0
|
* Removed takerTokenAddress and makerTokenAddress from Order struct.Greg Hysen2018-04-211-2/+0
|
* Updated ERC20 v1 proxy names in testsGreg Hysen2018-04-211-2/+2
|
* makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetDataGreg Hysen2018-04-211-4/+4
|
* Renaming TransferProxy to ProxyGreg Hysen2018-04-211-3/+3
|
* Asset Proxy DispatcherGreg Hysen2018-04-211-2/+18
|
* Revert variable namingAmir Bandeali2018-04-211-7/+7
|
* Add marketBuyOrders, rename variables, and fx old testsAmir Bandeali2018-04-211-11/+17
|
* Separate filled/cancelled errorsAmir Bandeali2018-04-211-1/+2
|
* Remove partial cancelsAmir Bandeali2018-04-211-1/+0
|
* Renamed all instances of timestamp to salt. Clarified test case wording.Greg Hysen2018-04-211-1/+1
|
* Implementation and tests in the protocol for cancelling all orders up to a ↵Greg Hysen2018-04-211-0/+4
| | | | specific time
* Address feedback and lintAmir Bandeali2018-04-211-25/+2
|
* Add utils for hashing and signing orders, update wrappersAmir Bandeali2018-04-211-0/+15
|
* Modify utils to work with new signature formatAmir Bandeali2018-04-211-17/+50
|
* Move utils dir into srcAmir Bandeali2018-04-211-0/+116