aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
Commit message (Collapse)AuthorAgeFilesLines
* Rename OrderAmountScenario to OrderAssetAmountScenario and convert ↵Fabio Berger2018-06-145-60/+59
| | | | generateOrderCombinations to generateFillOrderCombinations
* Use a defaultFillScenario in fillOrder testsFabio Berger2018-06-141-36/+39
|
* Fix incorrect string values in enumFabio Berger2018-06-141-2/+2
|
* Fix calculation of expFilledTakerAmount and expected values in events emittedFabio Berger2018-06-141-4/+7
|
* Replace initial set of legacy manually written fillOrder tests with ↵Fabio Berger2018-06-142-434/+186
| | | | declarative FillScenario tests
* Add ability to specify takerAssetFillAmount and taker scenarios as part of a ↵Fabio Berger2018-06-144-35/+153
| | | | FillScenario
* Move orderFill combinatorialTests to exchange folderFabio Berger2018-06-131-4/+4
|
* Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1327-345/+532
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ...
| * Rename popByte and popAddressAmir Bandeali2018-06-135-18/+18
| |
| * Hard code test addresses/bytes32 instead of generating pseudorandom onesAmir Bandeali2018-06-131-19/+16
| |
| * Unpop byte rather than making deep copyAmir Bandeali2018-06-134-90/+95
| |
| * Pass gas in to marketBuyOrdersNoThrowAmir Bandeali2018-06-131-1/+1
| |
| * Looks up the memory location of makerAssetData/takerAssetDataGreg Hysen2018-06-131-0/+2
| |
| * Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATAAmir Bandeali2018-06-135-23/+13
| |
| * Add tests for deepCopyBytes and missing write methods from LibBytesAmir Bandeali2018-06-133-70/+201
| |
| * Pop id from assetData before dispatching to AssetProxiesAmir Bandeali2018-06-1320-209/+268
| |
| * Speedup awaitTransactionMinedAsync and reduce polling interval in contracts ↵Alex Browne2018-06-121-1/+4
| | | | | | | | tests
* | Implement initial set of orderFill combinatorial testsFabio Berger2018-06-1311-427/+575
| |
* | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper ↵Fabio Berger2018-06-134-9/+95
| | | | | | | | superset
* | Variable rename for clarityFabio Berger2018-06-131-2/+2
| |
* | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-1246-387/+1541
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (68 commits) Stop exporting ArtifactWriter Fix no-unused-variable tslint rule to include parameters and fix issues Fix linter exclude rule Validate all signature types rather then only ECSignatures Store the instantiated OrderValidationUtils Remove global hooks from tests and deploy contracts from within the specific tests Add EmitStatement to ASTVisitor Fix tslint issues Add back artifacts file Fix a bug in SolCompilerArtifacts adapter config overriding Move OrderValidationUtils (+ tests) and ExchangeTransferSimulator to order-utils export parseECSignature method Export ArtifactWriter from migrations package Remove unused artifact file Pass in generated contract wrapper to orderValidationUtils at instantiation Refactor orderValidationUtils to use the generated contract wrapper instead of the higher-level one Refactor ExchangeTransferSimulator public interface to accet an AbstractBalanceAndProxyAllowanceLazyStore so that this module could be re-used in different contexts. Increase timeout for contract migrations Remove some copy-paste code Await transactions in migrations ...
| * Fix no-unused-variable tslint rule to include parameters and fix issuesFabio Berger2018-06-122-2/+2
| |
| * Implement SolidityProfiler & adapt sol-cov to work with GethLeonid Logvinov2018-06-096-1/+58
| |
| * Linter changes to contractsGreg Hysen2018-06-094-21/+6
| |
| * Updated LibBytes error messagesGreg Hysen2018-06-083-28/+36
| |
| * Cleanup after last rebaseGreg Hysen2018-06-084-6/+5
| |
| * Updated tests to use new revert handlerGreg Hysen2018-06-082-13/+13
| |
| * Minor fixes after rebaseGreg Hysen2018-06-081-14/+6
| |
| * Camelcase in memCopyGreg Hysen2018-06-084-23/+23
| |
| * Style updates to contractsGreg Hysen2018-06-086-26/+20
| |
| * Union types for generalized decodeAssetDataGreg Hysen2018-06-081-2/+2
| |
| * Fixed a styling throughout contracts. Moved closing parenthesis for long ↵Greg Hysen2018-06-088-31/+62
| | | | | | | | list of function parameters to next line.
| * Removed setting makerAssetData/takerAssetData from tests where values are ↵Greg Hysen2018-06-081-34/+0
| | | | | | | | same as defaultOrderParams.
| * Fixed merge error when rebasing wrt length variable in asset data decodersGreg Hysen2018-06-082-4/+4
| |
| * Style updates to ERC721 onReceiverGreg Hysen2018-06-086-12/+21
| |
| * Fixed after rebaseGreg Hysen2018-06-083-5/+5
| |
| * Fixes after rebasingGreg Hysen2018-06-083-8/+6
| |
| * Fixed up after rebasing. Contracts build and tests passGreg Hysen2018-06-087-50/+30
| |
| * Style audit for proxies + libmem + libbytesGreg Hysen2018-06-088-50/+72
| |
| * Style audit proxiesGreg Hysen2018-06-083-20/+64
| |
| * Call safeTransferFrom only when there is receiver data presentGreg Hysen2018-06-083-13/+20
| |
| * Fixed formatting in memory layoutGreg Hysen2018-06-081-6/+6
| |
| * Resolved edge case in Memcpy where where send would eventually turn ↵Greg Hysen2018-06-082-144/+154
| | | | | | | | "negative" and wrap around.
| * Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵Greg Hysen2018-06-089-95/+64
| | | | | | | | This way they can still be used by the forwarding contract. TestAssetDataDecoders inherits them in the same way the forwarding contract would
| * Converged on naming scheme for asset data: renamed all instances of ↵Greg Hysen2018-06-0822-290/+257
| | | | | | | | assetMetadata, proxyData, proxyMetadata to assetData
| * proxyData -> assetDataGreg Hysen2018-06-082-12/+12
| |
| * Implement memcpy using masking and end-aligned wordsRemco Bloemen2018-06-081-59/+85
| |
| * Add tests for word loop iterationRemco Bloemen2018-06-081-2/+6
| |
| * Add test for zero-size overlapRemco Bloemen2018-06-081-1/+3
| |
| * Add test casesRemco Bloemen2018-06-081-17/+133
| |
| * Cleanup test scriptRemco Bloemen2018-06-081-16/+1
| |
| * Convert Solidity tests to vectorsRemco Bloemen2018-06-082-232/+6
| |
| * Generate tests from vectorsRemco Bloemen2018-06-082-5/+64
| |
| * Tests for writing bytes to nested bytesGreg Hysen2018-06-081-9/+91
| |
| * Fixed up wording in memcpyGreg Hysen2018-06-081-3/+3
| |
| * Tons of tests around nested byte arrays and ERC721 receiverGreg Hysen2018-06-085-28/+197
| |
| * Test for onReceived erc721 callbackGreg Hysen2018-06-086-5/+126
| |
| * LibAssetProxyDecoder testsGreg Hysen2018-06-082-27/+31
| |
| * Foundation for TestLibAssetProxyDecoderGreg Hysen2018-06-087-2/+128
| |
| * Tests for libMemGreg Hysen2018-06-085-16/+80
| |
| * LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721ReceiverGreg Hysen2018-06-088-27/+581
| |
| * Add missing awaitTransactionSuccessAsync callsAlex Browne2018-06-082-23/+53
| |
* | Merge branch 'v2-prototype' into feature/combinatorial-testingFabio Berger2018-06-0823-55/+55
|\| | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix linter issue Fix linter issue Fix tslint issues Fix missing paths Fixed path Use source-map-support package to include correct line numbers in mocha move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers
| * Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changesFabio Berger2018-06-081-0/+1
| |\ | | | | | | Remaining Order-utils V2 Changes
| * \ Merge pull request #670 from 0xProject/fix/generated-nestingFabio Berger2018-06-0823-56/+56
| |\ \ | | | | | | | | Remove unnecessary folder nesting
| | * | Fix tslint issuesFabio Berger2018-06-082-2/+2
| | | |
| | * | Fix missing pathsFabio Berger2018-06-081-4/+4
| | | |
| | * | Fixed pathFabio Berger2018-06-073-11/+11
| | | |
| | * | merge v2-prototypeFabio Berger2018-06-0732-335/+465
| | |\ \
| | * | | move generated contract wrappers from `contract_wrappers/generated/` to ↵Fabio Berger2018-06-0624-60/+60
| | | | | | | | | | | | | | | | | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers
| * | | | Merge pull request #676 from 0xProject/feature/mocha-source-mapsAlex Browne2018-06-081-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | Use source-map-support package to include correct line numbers in mocha
| | * | | Use source-map-support package to include correct line numbers in mochaAlex Browne2018-06-071-1/+1
| | | | |
* | | | | Merge branch 'fix/order-utils/remaining-v2-changes' into ↵Fabio Berger2018-06-083-2/+3
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/combinatorial-testing * fix/order-utils/remaining-v2-changes: Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder
| * | | | Fix tslint failureFabio Berger2018-06-083-2/+3
| |/ / /
* | | | POC: Generates an order from spec, get's the amount fillableFabio Berger2018-06-087-32/+462
| | | |
* | | | merge v2-prototypeFabio Berger2018-06-0732-321/+451
|\| | |
| * | | Merge pull request #673 from mohoff/patch-1Fabio Berger2018-06-071-1/+1
| |\ \ \ | | | | | | | | | | typo
| | * | | typomohoff2018-06-071-1/+1
| | |/ /
| * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-0719-214/+416
| |\| | | | | | | | | | | | | | feature/improve-linting
| | * | Apply prettierAlex Browne2018-06-072-3/+10
| | | |
| | * | Update contracts tests after rebaseAlex Browne2018-06-072-14/+14
| | | |
| | * | Apply various fixes based on PR feedbackAlex Browne2018-06-073-12/+55
| | | |
| | * | Use an enum for ProviderType in contracts/src/utils/web3_wrapperAlex Browne2018-06-071-4/+21
| | | |
| | * | Update contracts package READMEAlex Browne2018-06-071-0/+9
| | | |
| | * | Add Async suffix to relevant assertionsAlex Browne2018-06-0714-112/+112
| | | |
| | * | Fix linter errorsAlex Browne2018-06-073-8/+38
| | | |
| | * | Update more things to work with both Geth and GanacheAlex Browne2018-06-073-38/+42
| | | |
| | * | Small fixes and cleanupAlex Browne2018-06-073-8/+4
| | | |
| | * | Add additional gas to calls to fillOrderNoThrowAlex Browne2018-06-073-152/+55
| | | |
| | * | Throw in web3-wrapper when rawCallResult is '0x'Alex Browne2018-06-073-6/+17
| | | |
| | * | Fix some more test cases, especially those that call increaseTimeAlex Browne2018-06-074-55/+84
| | | |
| | * | Add support for TEST_PROVIDER env varAlex Browne2018-06-071-3/+4
| | | |
| | * | Update more tests to pass on GethAlex Browne2018-06-074-21/+29
| | | |
| | * | Get LibBytes tests working on both Ganache and GethAlex Browne2018-06-073-25/+34
| | | |
| | * | Add ability to quickly switch between Geth and Ganache by changing a constAlex Browne2018-06-071-3/+16
| | | |
| | * | Update exchange/transactions tests for Geth error messagesAlex Browne2018-06-071-4/+4
| | | |
| | * | Update some tests after rebaseAlex Browne2018-06-073-20/+29
| | | |
| | * | Add more transactions to Geth on init. Skip tests that are failing.Alex Browne2018-06-076-20/+135
| | | |
| | * | Replace constant.REVERT test assertions with ↵Alex Browne2018-06-0712-170/+143
| | | | | | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction
| | * | Update code after rebaseAlex Browne2018-06-073-3/+8
| | | |
| | * | Use Geth for contract testsAlex Browne2018-06-071-0/+20
| | | |
| * | | Get build and tests to passfragosti2018-06-071-1/+2
| | | |
| * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-071-2/+1
| |\| | | | | | | | | | | | | | feature/improve-linting
| | * | Stop running prettier on generated filesLeonid Logvinov2018-06-071-2/+1
| | |/
| * | Use CLI for excludefragosti2018-06-072-4/+1
| | |
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-071-3/+3
| |\| | | | | | | | | | feature/improve-linting
| * | merge v2-prototypeFabio Berger2018-06-061-1/+2
| |\ \
| * | | Linter now passesfragosti2018-06-0627-104/+35
| | | |
* | | | Implement initial generateOrder function that given the scenario values for ↵Fabio Berger2018-06-072-0/+244
| |_|/ |/| | | | | | | | an order, generates the actual order.
* | | Merge v2-prototypeFabio Berger2018-06-061-1/+1
|\ \ \ | | |/ | |/|
| * | Replace `-` with `_` in yarn script name so that we are consistent across ↵Fabio Berger2018-06-051-1/+1
| | | | | | | | | | | | yarn script names
* | | - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ↵Fabio Berger2018-06-051-3/+3
|/ / | | | | | | | | | | | | running watch from root dir, with sub-package dir - stop using special prebuild script name and run pre_build steps for `watch` and `build` commands - Remove `clean` step from `build`/`watch`
* | Merge pull request #658 from 0xProject/dont-automatically-rebuild-for-testsAlex Browne2018-06-051-1/+2
|\ \ | |/ |/| Don't automatically rebuild when running yarn test
| * Don't automatically rebuild when running yarn testAlex Browne2018-06-051-1/+2
| |
* | rename GT to GREATER_THANJacob Evans2018-06-053-3/+3
| |
* | Rebase from v2-prototypeJacob Evans2018-06-052-38/+2
| |
* | Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵Amir Bandeali2018-06-0530-702/+491
|/ | | | failures, and remove redundant logic in matchOrders
* Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-023-55/+52
|\ | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Set contract expiration time to a constant 10 minutes Remove unused promises array Make erc20_wrapper and erc721_wrapper serial Rename changelogs to changelog Add CHANGELOG entry Check that git branch is up to date before publishing Move prepublish checks before building packages for publishing Refactor changelog utils to a separate module
| * Set contract expiration time to a constant 10 minutesAlex Browne2018-06-021-1/+2
| |
| * Remove unused promises arrayAlex Browne2018-06-022-6/+0
| |
| * Make erc20_wrapper and erc721_wrapper serialAlex Browne2018-06-022-48/+50
| |
* | Improve comments and remove unused importsFabio Berger2018-06-021-1/+1
| |
* | Fix tslint issuesFabio Berger2018-06-023-5/+3
| |
* | Fix types versionFabio Berger2018-06-021-1/+1
| |
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-0219-42/+91
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Fix linter errorsLeonid Logvinov2018-06-016-6/+6
| |
| * Add ethereum-types to extraFileIncludesLeonid Logvinov2018-06-011-2/+9
| |
| * Introduce ethereum-types packageLeonid Logvinov2018-06-0115-20/+20
| |
| * Merge pull request #641 from 0xProject/feature/remove-typesLeonid Logvinov2018-06-011-0/+2
| |\ | | | | | | Remove types
| | * Remove some typesLeonid Logvinov2018-06-011-0/+2
| | |
| * | Fix buildAmir Bandeali2018-06-011-1/+1
| |/
| * Merge pull request #640 from 0xProject/await-transaction-successAlex Browne2018-05-315-25/+64
| |\ | | | | | | Add awaitTransactionSuccess where needed
| | * Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapperAlex Browne2018-05-312-5/+7
| | |
| | * Add awaitTransactionSuccess where neededAlex Browne2018-05-314-22/+59
| | |
* | | fix method renameFabio Berger2018-06-011-1/+1
| | |
* | | Rename Ecrecover to EthSignFabio Berger2018-06-013-6/+3
| | |
* | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-0142-188/+717
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | Check length before accessing indices, add awaitTransactionSuccess where ↵Amir Bandeali2018-05-315-25/+43
| | | | | | | | | | | | needed, and rename function
| * | Add back before/after snapshots for each testAmir Bandeali2018-05-3116-0/+97
| | |
| * | Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMITAmir Bandeali2018-05-313-4/+4
| | |
| * | Make preSigned and allowedValidators mappings publicAmir Bandeali2018-05-311-2/+2
| | |
| * | Change names of signature typesAmir Bandeali2018-05-312-6/+6
| | |
| * | Fix formatting and testsAmir Bandeali2018-05-3118-94/+16
| | |
| * | Make AssetProxyId last byte of assetDataAmir Bandeali2018-05-3118-37/+74
| | |
| * | Add signer to txHash, allow approveValidator to be used with executeTransactionAmir Bandeali2018-05-313-7/+10
| | |
| * | Update WhitelistAmir Bandeali2018-05-316-24/+55
| | |
| * | Fix Exchange interfaceAmir Bandeali2018-05-311-7/+5
| | |
| * | Use last byte of signature as signature typeAmir Bandeali2018-05-318-106/+103
| | |
| * | Remove TxOrigin signature type, modify whitelist to use Validator signature typeAmir Bandeali2018-05-317-35/+35
| | |
| * | Update Whitelist contract with comments, also require maker to be whitelistedAmir Bandeali2018-05-315-16/+72
| | |
| * | Fix buildAmir Bandeali2018-05-313-19/+24
| | |
| * | Add example whitelist contract and minimum testsAmir Bandeali2018-05-313-11/+121
| | |
| * | Add sample whitelist contractAmir Bandeali2018-05-313-1/+60
| | |
| * | Add TxOrigin signature type and rearrange order of typesAmir Bandeali2018-05-313-63/+77
| | |
| * | Add approveValidator functionAmir Bandeali2018-05-312-2/+17
| | |
| * | Add Validator signature typeAmir Bandeali2018-05-314-3/+69
| | |
| * | Add deepCopyBytes method to LibBytesAmir Bandeali2018-05-313-0/+92
| | |
| * | Change logDecoder back into class, remove awaitTransactionMined from ↵Amir Bandeali2018-05-313-50/+62
| |/ | | | | | | multiSigWrapper
* | Introduce OrderWithoutExchangeAddress type since this is what get's sent to ↵Fabio Berger2018-05-314-32/+28
| | | | | | | | the smart contracts
* | Initial refactor of order-utils. Move many utils from contracts into this ↵Fabio Berger2018-05-3020-382/+64
| | | | | | | | package.
* | Freeze order-utils at 0.0.5 for all packages except contractsFabio Berger2018-05-301-1/+1
|/
* Remove contracts -> @0xproject/order-utils dependencyLeonid Logvinov2018-05-265-103/+86
|
* Fix imports in order_utilsLeonid Logvinov2018-05-251-1/+1
|
* Merge pull request #571 from 0xProject/feature/contracts/proxyOwnerAmir Bandeali2018-05-2520-387/+629
|\ | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress
| * Use web3-wrapper instead of 0x.js, update logDecoderAmir Bandeali2018-05-257-49/+48
| |
| * Cleanup testsAmir Bandeali2018-05-254-6/+12
| |
| * Move readFirst4 to LibBytesAmir Bandeali2018-05-255-39/+53
| |
| * Add old MultiSig to previous contracts, cleanup file structureAmir Bandeali2018-05-257-16/+16
| |
| * Fix buildAmir Bandeali2018-05-254-4/+91
| |
| * Address feedback, rename contract to AssetProxyOwnerAmir Bandeali2018-05-256-33/+37
| |
| * Update multisig tests and utilsAmir Bandeali2018-05-254-253/+355
| |
| * Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress to use a ↵Amir Bandeali2018-05-251-18/+48
| | | | | | | | mapping of registered proxies
* | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hashFabio Berger2018-05-2512-48/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * \ Merge pull request #618 from 0xProject/feature/v2-migrationsLeonid Logvinov2018-05-2512-49/+27
| |\ \ | | |/ | |/| Migrate migrations, types to v2
| | * Fix linter issuesLeonid Logvinov2018-05-253-3/+3
| | |
| | * Migrate migrations to v2Leonid Logvinov2018-05-2512-49/+27
| | |
* | | Use domain separator for exchange addressJacob Evans2018-05-254-8/+41
| | |
* | | publicGetOrderSchemaHash -> getOrderSchemaHashJacob Evans2018-05-252-2/+2
| | |
* | | Update order hash to match latest eip712Jacob Evans2018-05-254-34/+57
|/ /
* / Disable contracts coverage on CILeonid Logvinov2018-05-251-1/+1
|/
* Check transaction receipt status codes where applicableAlex Browne2018-05-2412-61/+85
|
* Move contract utilsLeonid Logvinov2018-05-245-19/+19
|
* Merge branch 'v2-prototype' into feature/truffle-sol-covLeonid Logvinov2018-05-2423-293/+280
|\
| * Fix Tslint error caused by "PromiseLike" valueFabio Berger2018-05-231-0/+6
| |
| * fix contract-wrappers versionFabio Berger2018-05-231-1/+1
| |
| * merge v2-prototypeFabio Berger2018-05-231-11/+11
| |\
| | * Merge branch 'development' into v2-prototypeLeonid Logvinov2018-05-231-11/+11
| | |\
| | | * PublishLeonid Logvinov2018-05-231-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.38.0 - @0xproject/abi-gen@0.3.0 - @0xproject/assert@0.2.10 - @0xproject/base-contract@0.3.2 - @0xproject/connect@0.6.13 - @0xproject/contract-wrappers@0.0.2 - contracts@2.1.29 - @0xproject/dev-utils@0.4.2 - @0xproject/fill-scenarios@0.0.2 - @0xproject/json-schemas@0.7.24 - @0xproject/metacoin@0.0.7 - @0xproject/migrations@0.0.6 - @0xproject/monorepo-scripts@0.1.20 - @0xproject/order-utils@0.0.5 - @0xproject/order-watcher@0.0.2 - @0xproject/react-docs-example@0.0.12 - @0xproject/react-docs@0.0.12 - @0xproject/react-shared@0.1.7 - @0xproject/sol-compiler@0.5.0 - @0xproject/sol-cov@0.0.11 - @0xproject/sol-resolver@0.0.5 - @0xproject/sra-report@0.1.0 - @0xproject/subproviders@0.10.2 - @0xproject/testnet-faucets@1.0.30 - @0xproject/tslint-config@0.4.18 - @0xproject/types@0.7.0 - @0xproject/typescript-typings@0.3.2 - @0xproject/utils@0.6.2 - @0xproject/web3-wrapper@0.6.4 - @0xproject/website@0.0.33
| * | | Fix dep versionFabio Berger2018-05-231-1/+1
| | | |
| * | | Fix importFabio Berger2018-05-231-1/+1
| | | |
| * | | Fix await callsFabio Berger2018-05-231-12/+3
| | | |
| * | | Refactor etherToken test to use contract-wrappersFabio Berger2018-05-231-22/+36
| | | |
| * | | Fix ExchangeWrapperFabio Berger2018-05-236-14/+10
| | | |
| * | | Fix importsFabio Berger2018-05-232-2/+1
| | | |
| * | | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDepFabio Berger2018-05-2323-207/+478
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 contractsFabio Berger2018-05-2323-266/+235
| | | |
* | | | Parse compiler.json in SolCompilerArtifactsAdapterLeonid Logvinov2018-05-231-3/+1
| | | |
* | | | Fix a bug in CALL-like opcode handlingLeonid Logvinov2018-05-232-4/+5
| | | |
* | | | PublishLeonid Logvinov2018-05-231-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.38.0 - @0xproject/abi-gen@0.3.0 - @0xproject/assert@0.2.10 - @0xproject/base-contract@0.3.2 - @0xproject/connect@0.6.13 - @0xproject/contract-wrappers@0.0.2 - contracts@2.1.29 - @0xproject/dev-utils@0.4.2 - @0xproject/fill-scenarios@0.0.2 - @0xproject/json-schemas@0.7.24 - @0xproject/metacoin@0.0.7 - @0xproject/migrations@0.0.6 - @0xproject/monorepo-scripts@0.1.20 - @0xproject/order-utils@0.0.5 - @0xproject/order-watcher@0.0.2 - @0xproject/react-docs-example@0.0.12 - @0xproject/react-docs@0.0.12 - @0xproject/react-shared@0.1.7 - @0xproject/sol-compiler@0.5.0 - @0xproject/sol-cov@0.0.11 - @0xproject/sol-resolver@0.0.5 - @0xproject/sra-report@0.1.0 - @0xproject/subproviders@0.10.2 - @0xproject/testnet-faucets@1.0.30 - @0xproject/tslint-config@0.4.18 - @0xproject/types@0.7.0 - @0xproject/typescript-typings@0.3.2 - @0xproject/utils@0.6.2 - @0xproject/web3-wrapper@0.6.4 - @0xproject/website@0.0.33
* | | | Rename ZeroExArtifactAdapter to SolCompilerArtifactAdapterLeonid Logvinov2018-05-231-2/+2
| | | |
* | | | Assign then returnLeonid Logvinov2018-05-231-1/+2
| | | |
* | | | Introduce CONFIG_FILELeonid Logvinov2018-05-231-1/+2
| | | |
* | | | Remove web3Factory.create and remove dev-tools dependency on sol-covLeonid Logvinov2018-05-234-4/+35
| |/ / |/| |
* | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into ↵Fabio Berger2018-05-2316-175/+419
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2-prototype * 'v2-prototype' of github.com:0xProject/0x-monorepo: Rename some variables in multi_sig_with_time_lock.ts Remove extra awaitTransactionMinedAsync calls 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
| * \ \ Merge pull request #601 from 0xProject/contracts-test-fixesAlex Browne2018-05-2316-175/+419
| |\ \ \ | | | | | | | | | | Contracts test fixes
| | * | | Rename some variables in multi_sig_with_time_lock.tsAlex Browne2018-05-231-10/+10
| | | | |
| | * | | Remove extra awaitTransactionMinedAsync callsAlex Browne2018-05-231-4/+2
| | | | |
| | * | | Apply changes to test/exchange/match_orders.tsAlex Browne2018-05-221-6/+18
| | | | |
| | * | | Fix some unhandled promise rejectionsAlex Browne2018-05-222-4/+8
| | | | |
| | * | | Add awaitTransactionMinedAsync after every sent transactionAlex Browne2018-05-2210-155/+294
| | | | |
| | * | | Add missing blockchainLifecycle calls to contracts testsAlex Browne2018-05-2214-0/+91
| | | | |
* | | | | Fix tslint issuesFabio Berger2018-05-232-10/+13
|/ / / /
* | | | Merge pull request #605 from 0xProject/fix/multiple/build-errorsFabio Berger2018-05-237-18/+30
|\ \ \ \ | |_|/ / |/| | | Fix build/lint errors and warnings
| * | | Add CancelOrder and MatchOrder typesRemco Bloemen2018-05-222-3/+15
| | | |
| * | | Add missing return typesRemco Bloemen2018-05-225-15/+15
| |/ /
* | | merge developmentFabio Berger2018-05-233-5/+8
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #594 from 0xProject/improvement/addCustomTslintRulesFabio Berger2018-05-234-9/+12
| |\ | | | | | | Add more tslint rules
| | * Merge branch 'development' into improvement/addCustomTslintRulesFabio Berger2018-05-161-0/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: fix style errors Fix circular dependency Add my profile image to images Add myself to about page Add dogfood configs to website Change minimum Node version to 6.12 Document Node.js version requirement and add it to package.json
| | * | Fix TSLint rulesFabio Berger2018-05-164-9/+12
| | | |
* | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatchingGreg Hysen2018-05-2262-243/+2500
|\ \ \ \ | | | | | | | | | | Atomic Order Matching
| * | | | Added getNullFillResultsGreg Hysen2018-05-192-1/+16
| | | | |
| * | | | orderFilledAmount -> orderTakerAssetFilledAmountGreg Hysen2018-05-197-41/+41
| | | | |
| * | | | Style improvements to order matchingGreg Hysen2018-05-194-28/+17
| | | | |
| * | | | Upgraded to Solidity 0.4.24Greg Hysen2018-05-1953-57/+57
| | | | |
| * | | | Rebased against v2-prototypeGreg Hysen2018-05-196-13/+16
| | | | |
| * | | | Changed calculateFillResults to public visibility so that it can be used by ↵Greg Hysen2018-05-193-131/+131
| | | | | | | | | | | | | | | | | | | | the Forwarding Contract.
| * | | | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ↵Greg Hysen2018-05-192-138/+126
| | | | | | | | | | | | | | | | | | | | we dont need to pass it in on each call.
| * | | | Wording of calculateMatchedFillResultsGreg Hysen2018-05-191-9/+11
| | | | |
| * | | | Cleaned up interface for decoding proxy data. Added a general decoder, which ↵Greg Hysen2018-05-193-17/+63
| | | | | | | | | | | | | | | | | | | | should be useful for the forwarding contract code.
| * | | | Style improvements to the match orders typescript test classGreg Hysen2018-05-191-18/+14
| | | | |
| * | | | Removed redundant log decode callGreg Hysen2018-05-191-2/+0
| | | | |
| * | | | The OrderInfo struct is now returned by the getOrderInfo functionGreg Hysen2018-05-198-141/+98
| | | | |
| * | | | Updated order of settleMatchedOrders to align with settleOrderGreg Hysen2018-05-193-8/+8
| | | | |
| * | | | IExchange inherits from all other interfaces (in the same order as Exchange ↵Greg Hysen2018-05-191-6/+10
| | | | | | | | | | | | | | | | | | | | inherits Mixins)
| * | | | Renamed takerAssetFilledAmount to orderFilledAmount to more easily ↵Greg Hysen2018-05-193-37/+37
| | | | | | | | | | | | | | | | | | | | distinguish between fill results and order state
| * | | | Comments for readability in exchange core and mixin match ordersGreg Hysen2018-05-195-4/+11
| | | | |
| * | | | Renamed "validate" functions to "assert" in mixin match.Greg Hysen2018-05-195-21/+21
| | | | |
| * | | | Throw if the left or right orders do not compute the correct fill results. I ↵Greg Hysen2018-05-195-37/+27
| | | | | | | | | | | | | | | | | | | | like this better than just logging an error and failing silently.
| * | | | Removed redundant status checks in matchOrders. Saves gas, plus follows ↵Greg Hysen2018-05-191-8/+0
| | | | | | | | | | | | | | | | | | | | pattern of fillOrder more closely.
| * | | | Token -> Asset in fillOrder specGreg Hysen2018-05-191-1/+1
| | | | |
| * | | | Reordered functions in mixin exchange core -- getOrderInfo is at the bottomGreg Hysen2018-05-192-77/+77
| | | | |
| * | | | Changes based on style guidelines put out by AmirGreg Hysen2018-05-199-172/+210
| | | | |
| * | | | Reordered fund transfers for matched orders, plus added an extra sanity ↵Greg Hysen2018-05-193-35/+49
| | | | | | | | | | | | | | | | | | | | check to order matching calculations
| * | | | Style changes to atomic order matchingGreg Hysen2018-05-1911-306/+288
| | | | |
| * | | | Added require reasons to MixinMatchOrders and cleaned up some comments.Greg Hysen2018-05-196-40/+75
| | | | |
| * | | | Updated remaining contracts to v0.4.23Greg Hysen2018-05-194-4/+4
| | | | |
| * | | | Removed isRoundingError from mixin headerGreg Hysen2018-05-191-10/+1
| | | | |
| * | | | Atomic Order Matching - TestsGreg Hysen2018-05-198-23/+1390
| | | | |
| * | | | Atomic Order Matching - Smart Contracts.Greg Hysen2018-05-1913-114/+957
| | | | |
* | | | | merge developmentFabio Berger2018-05-2211-2/+12
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
generated by cgit (git 2.34.1) at 2024-10-04 05:29:13 +0800