aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contracts
Commit message (Collapse)AuthorAgeFilesLines
* Use source-map-support package to include correct line numbers in mochaAlex Browne2018-06-071-1/+1
|
* 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
|
* Stop running prettier on generated filesLeonid Logvinov2018-06-071-2/+1
|
* 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
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | / Use make-promises-safe to catch unhandled rejections in testsAlex Browne2018-05-1713-1/+14
| | |/ | |/|
* | | Merge pull request #583 from 0xProject/bug/contracts/erc721-encoded-padJacob Evans2018-05-181-1/+2
|\ \ \ | | | | | | | | ERC721Proxy Pad to 32 if asset ids are small
| * | | Pad to 32 if asset ids are smallJacob Evans2018-05-101-1/+2
| | | |
* | | | Merge branch 'development' into v2-prototypeFabio Berger2018-05-166-30/+19
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 pull request #578 from 0xProject/document-node-versionAlex Browne2018-05-161-0/+3
| |\ \ \ | | |_|/ | |/| | Document Node.js version requirement and add it to package.json
| | * | Change minimum Node version to 6.12Alex Browne2018-05-151-1/+1
| | | |
| | * | Document Node.js version requirement and add it to package.jsonAlex Browne2018-05-151-0/+3
| | | |
| * | | Fix sol-compiler binary so it can be called directly from packagesFabio Berger2018-05-151-1/+1
| | | |
| * | | Fix abi-gen binary so it can be called directly from packagesFabio Berger2018-05-151-1/+2
| | | |
| * | | Move from using lerna multi-package commands to wsrun, update README's ↵Fabio Berger2018-05-152-16/+4
| |/ / | | | | | | | | | accordingly
| * | Add missing type definitionsLeonid Logvinov2018-05-146-13/+22
| | |
* | | Merge branch 'development' into v2-prototypeAmir Bandeali2018-05-1629-345/+394
|\| | | |/ |/|
| * Revert "Remove gitkeeps"Fabio Berger2018-05-121-0/+0
| | | | | | | | This reverts commit 3f6876c4199353b597e1b0ebcf3907d6b8cce284.
| * Remove gitkeepsFabio Berger2018-05-111-0/+0
| |
| * Merge branch 'development' into breakUp0xjsFabio Berger2018-05-1117-170/+303
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Fix ganache subprovider config Fix a bug in compiler config precedence Fix linter errors Fix templates Remove unused deployer docs configs Add a legacy endpoint for the deployer Add a check for compiler output Add a comment Put ARTIFACTS_VERSION in a config Improve a comment Remove _applyDefaultsToDeployTxDataAsync Add a HACK comment Fix linter issues Rename deployer to sol-compiler Remove deployer Remove deployer from 0x.js and migrations Configure migrations with a compiler.json Remove deployer from metacoin and contract tests Update wallet footer and add remove token functionality # Conflicts: # .gitignore # packages/0x.js/package.json # packages/0x.js/src/0x.ts # packages/contracts/package.json # packages/contracts/test/multi_sig_with_time_lock.ts # packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts # packages/contracts/util/artifacts.ts # packages/deployer/test/deployer_test.ts # packages/migrations/package.json
| | * Fix linter errorsLeonid Logvinov2018-05-1112-12/+12
| | |
| | * Remove unused deployer docs configsLeonid Logvinov2018-05-1013-50/+50
| | |
| | * Fix linter issuesLeonid Logvinov2018-05-1013-51/+56
| | |
| | * Rename deployer to sol-compilerLeonid Logvinov2018-05-102-3/+3
| | |
| | * Remove deployer from metacoin and contract testsLeonid Logvinov2018-05-1017-176/+303
| | |
| * | Add artifacts to clean commandFabio Berger2018-05-111-1/+1
| | |
| * | Commit v1 artifacts to migrations package and remove compile step from prebuildFabio Berger2018-05-111-1/+1
| | |
| * | Fix tslint errorsFabio Berger2018-05-101-1/+1
| | |
| * | Merge branch 'development' into breakUp0xjsFabio Berger2018-05-106-36/+51
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (38 commits) Add fallback image support to relayer grid tile Clear relayer grid state when fetching Configure the compiler to generate artifacts with deployedBytecode Implement loading and error state for relayer grid Fallback image for relayer grid tile Change relayer grid tile to link on header Display top tokens from backend Remove overflowZ property from portal Suggestions and fix bad merge Fix typo Only show untracked tokens Make wallet scrollable Add token flow Update The Ocean logo Fix artifacts paths Create an artifacts folder Introduce a var Add removeHexPrefix util method CHeck if ABI exists Improve the readability of the check for should compile ... # Conflicts: # .gitignore # packages/contracts/test/multi_sig_with_time_lock.ts # packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts # packages/contracts/util/artifacts.ts
| | * Fix artifacts pathsLeonid Logvinov2018-05-071-2/+2
| | |
| | * Move artifacts from src/artifacts to artifacts/v1Leonid Logvinov2018-05-071-1/+1
| | |
| | * Implement new artifacts formatLeonid Logvinov2018-05-076-35/+50
| | |
| * | Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a ↵Fabio Berger2018-05-105-27/+28
| |/ | | | | | | unifying library with the same interface
| * Publishcontracts@2.1.28@0xproject/website@0.0.32@0xproject/testnet-faucets@1.0.29@0xproject/sra-report@0.0.14@0xproject/sol-resolver@0.0.4@0xproject/react-docs-example@0.0.11@0xproject/migrations@0.0.5@0xproject/metacoin@0.0.6@0xproject/dev-utils@0.4.1@0xproject/base-contract@0.3.1Leonid Logvinov2018-05-051-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.37.2 - @0xproject/abi-gen@0.2.13 - @0xproject/assert@0.2.9 - @0xproject/base-contract@0.3.1 - @0xproject/connect@0.6.12 - contracts@2.1.28 - @0xproject/deployer@0.4.3 - @0xproject/dev-utils@0.4.1 - @0xproject/json-schemas@0.7.23 - @0xproject/metacoin@0.0.6 - @0xproject/migrations@0.0.5 - @0xproject/order-utils@0.0.4 - @0xproject/react-docs-example@0.0.11 - @0xproject/react-docs@0.0.11 - @0xproject/react-shared@0.1.6 - @0xproject/sol-cov@0.0.10 - @0xproject/sol-resolver@0.0.4 - @0xproject/sra-report@0.0.14 - @0xproject/subproviders@0.10.1 - @0xproject/testnet-faucets@1.0.29 - @0xproject/types@0.6.3 - @0xproject/typescript-typings@0.3.1 - @0xproject/utils@0.6.1 - @0xproject/web3-wrapper@0.6.3 - @0xproject/website@0.0.32
| * Publishcontracts@2.1.27@0xproject/website@0.0.30@0xproject/testnet-faucets@1.0.28@0xproject/sra-report@0.0.13Leonid Logvinov2018-05-051-2/+2
| | | | | | | | | | | | | | | | | | - 0x.js@0.37.1 - contracts@2.1.27 - @0xproject/order-utils@0.0.3 - @0xproject/sra-report@0.0.13 - @0xproject/testnet-faucets@1.0.28 - @0xproject/website@0.0.30
| * Publishcontracts@2.1.26@0xproject/website@0.0.29@0xproject/testnet-faucets@1.0.27@0xproject/sra-report@0.0.12@0xproject/sol-resolver@0.0.3@0xproject/react-docs-example@0.0.9@0xproject/monorepo-scripts@0.1.19@0xproject/migrations@0.0.4@0xproject/metacoin@0.0.5@0xproject/dev-utils@0.4.0@0xproject/base-contract@0.3.0Leonid Logvinov2018-05-041-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.37.0 - @0xproject/abi-gen@0.2.12 - @0xproject/assert@0.2.8 - @0xproject/base-contract@0.3.0 - @0xproject/connect@0.6.11 - contracts@2.1.26 - @0xproject/deployer@0.4.2 - @0xproject/dev-utils@0.4.0 - @0xproject/json-schemas@0.7.22 - @0xproject/metacoin@0.0.5 - @0xproject/migrations@0.0.4 - @0xproject/monorepo-scripts@0.1.19 - @0xproject/order-utils@0.0.2 - @0xproject/react-docs-example@0.0.9 - @0xproject/react-docs@0.0.9 - @0xproject/react-shared@0.1.4 - @0xproject/sol-cov@0.0.9 - @0xproject/sol-resolver@0.0.3 - @0xproject/sra-report@0.0.12 - @0xproject/subproviders@0.10.0 - @0xproject/testnet-faucets@1.0.27 - @0xproject/tslint-config@0.4.17 - @0xproject/types@0.6.2 - @0xproject/typescript-typings@0.3.0 - @0xproject/utils@0.6.0 - @0xproject/web3-wrapper@0.6.2 - @0xproject/website@0.0.29
* | Add revert variables, change lib => libs to get around gitignoreAmir Bandeali2018-05-0921-52/+325
| |
* | Move Authorizable to AssetProxy dir, rename to MixinAuthorizableAmir Bandeali2018-05-0810-63/+97
| |
* | Split up mixins and interfacesAmir Bandeali2018-05-0529-745/+508
| |
* | Make LibBytes methods internal, add TestLibBytesAmir Bandeali2018-05-055-33/+180
| |
* | Update contracts with revert reasons and constructor keywordAmir Bandeali2018-05-0342-181/+410
| |
* | Add MixinAssetProxy to reuse redundant codeAmir Bandeali2018-05-034-98/+117
| |
* | Add tests for batchTransferFromAmir Bandeali2018-05-021-151/+296
| |
* | Add batchTransferFrom to asset proxiesAmir Bandeali2018-05-023-9/+111
| |
* | Remove outdated commentAmir Bandeali2018-05-012-4/+2
| |
* | Add hard coded proxyId into each AssetProxyAmir Bandeali2018-05-016-5/+76
| |
* | Move TokenRegistry to 'previous' directoryAmir Bandeali2018-04-272-2/+2
| |
* | Make all lib functions internal, add contracts for testingAmir Bandeali2018-04-2719-271/+448
| |
* | Add LibFillResultsAmir Bandeali2018-04-2711-78/+107
| |
* | Add ERC721 contracts from zeppelin-solidityAmir Bandeali2018-04-276-4/+574
| |
* | Add tests and commentsAmir Bandeali2018-04-275-31/+50
| |
* | Add testsAmir Bandeali2018-04-271-4/+38
| |
* | Update tests and utilsAmir Bandeali2018-04-277-1/+226
| |
* | Implement sender abstractionAmir Bandeali2018-04-276-47/+210
| |
* | Fix prettierFabio Berger2018-04-251-3/+9
| |
* | Fix merge conflict issuesFabio Berger2018-04-242-2/+0
| |
* | merge v2-prototypeFabio Berger2018-04-248-285/+309
|\ \
| * | Rename variables, create private validation methods in token wrappersAmir Bandeali2018-04-248-286/+308
| | |
* | | Fix testsAmir Bandeali2018-04-2410-181/+116
| | |
* | | Combine Exchange with AssetProxyDispatcherAmir Bandeali2018-04-247-67/+58
|/ /
* | Define numbers of dummy tokens to deploy in constantsAmir Bandeali2018-04-243-2/+4
| |
* | Remove type assertionsAmir Bandeali2018-04-241-18/+12
| |
* | Fix and cleanup testsAmir Bandeali2018-04-248-673/+587
| |
* | Add ERC721 wrapperAmir Bandeali2018-04-242-20/+161
| |
* | Add ERC20WrapperAmir Bandeali2018-04-243-32/+127
| |
* | Rename proxyUtils => assetProxyUtilsAmir Bandeali2018-04-236-57/+57
| |
* | Rename missed variablesAmir Bandeali2018-04-237-274/+274
| |
* | Reorder event argsAmir Bandeali2018-04-221-10/+10
| |
* | Add missing async suffixAmir Bandeali2018-04-222-12/+12
| |
* | Rename token => assetAmir Bandeali2018-04-2215-656/+656
| |
* | Rename Token => IERC20TokenAmir Bandeali2018-04-228-156/+48
| |
* | Rename DummyToken => DummyERC20TokenAmir Bandeali2018-04-2214-108/+61
| |
* | export proxyUtils instead of individual functionsAmir Bandeali2018-04-226-85/+83
| |
* | Fix names and visibilities, use address type over contract type for function ↵Amir Bandeali2018-04-225-22/+21
| | | | | | | | args and returns
* | Remove unused constructor argumentsAmir Bandeali2018-04-225-34/+18
| |
* | Add presigned signature typeAmir Bandeali2018-04-211-1/+29
| |
* | Fix zeppelin imports, run prettierAmir Bandeali2018-04-213-4/+3
| |
* | Added tests for (most functions in) LibBytes. The write methods are not ↵Greg Hysen2018-04-213-2/+241
| | | | | | | | currently compatible with our generated contract wrappers.
* | Added description for the DummyERC721Token constructorGreg Hysen2018-04-211-0/+6
| |
* | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less ↵Greg Hysen2018-04-216-29/+33
| | | | | | | | confusion. Also updated the function description.
* | Reverting earlier change: interfaces now inherit from other interfacesGreg Hysen2018-04-212-2/+10
| |
* | Clarified that 0x0 could be passed into AssetProxyDispatcherGreg Hysen2018-04-212-4/+4
| |
* | Inlined decodeMetadata in the proxies and removed encodeMetadata (already ↵Greg Hysen2018-04-213-132/+5
| | | | | | | | exists in Typescript). This simplifies the code.
* | Added @TODO for safeTransferFrom support in ERC721 proxyGreg Hysen2018-04-211-0/+2
| |
* | Removed outdated TODO comment in MixinSettlementProxyGreg Hysen2018-04-211-2/+0
| |
* | Miscellaneous style changes to the contracts package; specifically testsGreg Hysen2018-04-218-23/+38
| |
* | Ran prettierGreg Hysen2018-04-214-58/+15
| |
* | renaming after tokenTransferProxy was removedGreg Hysen2018-04-214-127/+127
| |
* | Removed ERC20 V1 Proxy + TokenTransferProxyGreg Hysen2018-04-2117-631/+82
| |
* | Updated commenting. Noted that transferFrom succeeds or throws on all ↵Greg Hysen2018-04-214-7/+7
| | | | | | | | transferFrom implementations.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 22:56:46 +0800