aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts/src/utils/exchange_wrapper.ts
Commit message (Collapse)AuthorAgeFilesLines
* Update file structureAmir Bandeali2018-06-301-242/+0
|
* Make registerAssetProxy append onlyAmir Bandeali2018-06-301-14/+2
|
* Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-251-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (97 commits) Fix typos in comments Add modifier and tests for removeAuthorizedAddressAtIndex Update and add tests Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex Move isFunctionRemoveAuthorizedAddress to test Fix usage of `popLastByte` Fix LibBytes is a library Remove `areBytesEqual` Fix usage of `contentAddress()` Clean low bits in bytes4 Clean high bits in address Refactor LibBytes.readBytes4 for consistency Fix LibBytes.equals Add trailing garbage testcase for LibBytes.equals Rename bytes.equals Add slice and sliceDestructive Rename bytes.rawAddress and add bytes.contentAddress Rename read/writeBytesWithLength Using LibBytes for bytes Make LibBytes a library ... # Conflicts: # packages/contracts/src/utils/constants.ts # packages/contracts/test/exchange/core.ts
| * Add event to setSignatureValidatorApproval, rename signer => signerAddress ↵Amir Bandeali2018-06-221-1/+1
| | | | | | | | accross all contracts
* | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-131-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (26 commits) Rename _coverageCollector -> _profilerCollector in TraceCollectionSubprovider Refactor sol-cov to de-duplicate code for coverage and profiling Rename popByte and popAddress Hard code test addresses/bytes32 instead of generating pseudorandom ones Update artifacts Rename computeCoverageAsync -> computeSingleTraceCoverageAsync Fix linter errors Refactor sol-cov to avoid keeping traceInfo in memory Unpop byte rather than making deep copy Pass gas in to marketBuyOrdersNoThrow Looks up the memory location of makerAssetData/takerAssetData Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA Add tests for deepCopyBytes and missing write methods from LibBytes Pop id from assetData before dispatching to AssetProxies Upgrade solidity-parser-entlr 0.2.11 => 0.2.12 Fix import order Fix typos Add CHANGELOGs Speed-up sol-cov Increase delay when sending transactions during devnet startup ...
| * Pass gas in to marketBuyOrdersNoThrowAmir Bandeali2018-06-131-1/+1
| |
| * Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-131-1/+1
| |
* | Implement initial set of orderFill combinatorial testsFabio Berger2018-06-131-0/+4
| |
* | Variable rename for clarityFabio Berger2018-06-131-2/+2
|/
* merge v2-prototypeFabio Berger2018-06-071-7/+7
|\
| * Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-071-6/+6
| |\ | | | | | | | | | feature/improve-linting
| | * Add additional gas to calls to fillOrderNoThrowAlex Browne2018-06-071-6/+6
| | |
| * | Linter now passesfragosti2018-06-061-1/+1
| |/
* / move generated contract wrappers from `contract_wrappers/generated/` to ↵Fabio Berger2018-06-061-1/+1
|/ | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
* 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-23/+19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Change logDecoder back into class, remove awaitTransactionMined from ↵Amir Bandeali2018-05-311-23/+19
| | | | | | | | multiSigWrapper
* | Initial refactor of order-utils. Move many utils from contracts into this ↵Fabio Berger2018-05-301-2/+2
|/ | | | package.
* Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-251-4/+2
|\ | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress
| * Use web3-wrapper instead of 0x.js, update logDecoderAmir Bandeali2018-05-251-4/+2
| |
* | Migrate migrations to v2Leonid Logvinov2018-05-251-2/+2
|/
* Check transaction receipt status codes where applicableAlex Browne2018-05-241-1/+1
|
* Fix ExchangeWrapperFabio Berger2018-05-231-3/+5
|
* Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-231-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Add missing return typesRemco Bloemen2018-05-221-1/+1
| |
* | Remove 0x.js dep from contractsFabio Berger2018-05-231-6/+5
|/
* Removed redundant log decode callGreg Hysen2018-05-191-2/+0
|
* The OrderInfo struct is now returned by the getOrderInfo functionGreg Hysen2018-05-191-5/+3
|
* Style changes to atomic order matchingGreg Hysen2018-05-191-6/+8
|
* Atomic Order Matching - TestsGreg Hysen2018-05-191-0/+22
|
* Make all lib functions internal, add contracts for testingAmir Bandeali2018-04-271-31/+0
|
* Update tests and utilsAmir Bandeali2018-04-271-1/+15
|
* Fix testsAmir Bandeali2018-04-241-2/+19
|
* Rename missed variablesAmir Bandeali2018-04-231-1/+1
|
* Add missing async suffixAmir Bandeali2018-04-221-1/+1
|
* Rename token => assetAmir Bandeali2018-04-221-30/+30
|
* Revert variable namingAmir Bandeali2018-04-211-31/+31
|
* Add marketBuyOrders, rename variables, and fx old testsAmir Bandeali2018-04-211-29/+59
|
* Fix build errorsAmir Bandeali2018-04-211-8/+2
|
* Remove partial cancelsAmir Bandeali2018-04-211-18/+5
|
* Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that ↵Greg Hysen2018-04-211-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 Hysen2018-04-211-2/+2
|
* Fixed spacingGreg Hysen2018-04-211-2/+2
|
* Implementation and tests in the protocol for cancelling all orders up to a ↵Greg Hysen2018-04-211-0/+12
| | | | specific time
* Address feedback and lintAmir Bandeali2018-04-211-79/+15
|
* Add tests for fillOrderNoThrow based functionsAmir Bandeali2018-04-211-0/+42
|
* Add fillOrderNoThrow to exchange wrapper and add testAmir Bandeali2018-04-211-0/+21
|
* Add utils for hashing and signing orders, update wrappersAmir Bandeali2018-04-211-6/+10
|
* Modify utils to work with new signature formatAmir Bandeali2018-04-211-37/+19
|
* Use new logDecoder interfaceAmir Bandeali2018-04-211-7/+7
|
* Rename variablesAmir Bandeali2018-04-211-21/+21
|
* Move log decoding logic to exchange wrapperAmir Bandeali2018-04-211-11/+39
|
* Add logDecoder, remove outdated testsAmir Bandeali2018-04-211-8/+2
|
* Move utils dir into srcAmir Bandeali2018-04-211-0/+204