aboutsummaryrefslogtreecommitdiffstats
path: root/packages/contract-wrappers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utilsFabio Berger2018-06-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder Fix missing paths Revert to returning orderState on invalid order - Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary. 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 #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 'v2-prototype' into refactor/move-spawn-switch-to-utilsFabio Berger2018-06-0722-33/+26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (66 commits) Run prettier Remove unused variable Fix linting issues Change shouldRenderHeader prop to shouldHideHeader Get build and tests to pass typo Apply prettier Update contracts tests after rebase Apply various fixes based on PR feedback Document debug_increaseTime method and fix typo in devnet README Use an enum for ProviderType in contracts/src/utils/web3_wrapper Update contracts package README Update relevant changelogs Remove global gas estimate buffer Add Async suffix to relevant assertions Fix linter errors Update package.json and yarn.lock Update more things to work with both Geth and Ganache Small fixes and cleanup Add additional gas to calls to fillOrderNoThrow ... # Conflicts: # packages/order-watcher/src/order_watcher/order_watcher.ts # packages/react-docs/src/components/type.tsx # packages/website/ts/components/ui/lifecycle_raised_button.tsx # packages/website/ts/components/wallet/wallet.tsx
| * | Get build and tests to passfragosti2018-06-073-3/+9
| | |
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-071-1/+0
| |\| | | | | | | | | | feature/improve-linting
| | * Stop running prettier on generated filesLeonid Logvinov2018-06-071-2/+1
| | |
| * | Use CLI for excludefragosti2018-06-072-5/+2
| | |
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-06-071-4/+5
| |\| | | | | | | | | | feature/improve-linting
| * | merge v2-prototypeFabio Berger2018-06-062-2/+3
| |\ \
| * | | Linter now passesfragosti2018-06-068-3/+11
| | | |
| * | | Try enabling no-unused-variable...fragosti2018-06-0519-31/+14
| | | |
* | | | Move spawnSwitchErr to @0xproject/utilsFabio Berger2018-06-061-3/+0
| |_|/ |/| |
* | | Merge v2-prototypeFabio Berger2018-06-062-2/+2
|\ \ \ | | |/ | |/|
| * | Mention the gasLimit until in the doc commentFabio Berger2018-06-051-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-4/+5
|/ / | | | | | | | | | | | | 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`
* | Remove duplicate cleans in package.json when clean is called in prebuildAlex Browne2018-06-051-1/+1
| |
* | Don't automatically rebuild when running yarn testAlex Browne2018-06-051-1/+2
|/
* Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-021-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-011-0/+1
| |
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2Fabio Berger2018-06-011-1/+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
| * Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMITAmir Bandeali2018-05-311-1/+1
| |
* | Freeze order-utils at 0.0.5 for all packages except contractsFabio Berger2018-05-301-1/+1
|/
* Migrate migrations to v2Leonid Logvinov2018-05-252-3/+3
|
* Merge pull request #615 from 0xProject/refactor/json-schemas/for-v2Fabio Berger2018-05-251-1/+1
|\ | | | | Refactor order schemas in json-schemas for v2
| * Revert to an earlier version that worksFabio Berger2018-05-241-1/+1
| |
| * Remove the caret so it actually installs this versionFabio Berger2018-05-241-1/+1
| |
| * Bump all dependencies on json-schemas down a patch version so that they ↵Fabio Berger2018-05-241-1/+1
| | | | | | | | don't auto-magically get upgraded to the next version during the next publish
* | Check transaction receipt status codes where applicableAlex Browne2018-05-244-27/+27
|/
* Merge branch 'v2-prototype' into feature/truffle-sol-covLeonid Logvinov2018-05-241-1/+1
|\
| * Fix TokenTransferProxy artifact name since it's now suffixed with _v1Fabio Berger2018-05-231-1/+1
| |
| * PublishLeonid Logvinov2018-05-231-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * Updated CHANGELOGSLeonid Logvinov2018-05-232-0/+18
| |
* | PublishLeonid Logvinov2018-05-231-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | Updated CHANGELOGSLeonid Logvinov2018-05-232-0/+18
| |
* | Remove web3Factory.create and remove dev-tools dependency on sol-covLeonid Logvinov2018-05-232-5/+4
|/
* Merge pull request #594 from 0xProject/improvement/addCustomTslintRulesFabio Berger2018-05-237-9/+33
|\ | | | | Add more tslint rules
| * Disable magic number rule in more places where it isn't helping code readabilityFabio Berger2018-05-171-10/+10
| |
| * Fix TSLint rulesFabio Berger2018-05-167-14/+38
| |
* | Use make-promises-safe to catch unhandled rejections in testsAlex Browne2018-05-1710-1/+11
|/
* Fix prettierFabio Berger2018-05-151-2/+0
|
* Fix TSLint issuesFabio Berger2018-05-152-2/+2
|
* 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-6/+6
| | | | accordingly
* Add missing type definitionsLeonid Logvinov2018-05-143-5/+5
|
* Add missing .gitkeepsFabio Berger2018-05-121-0/+0
|
* Remove unused methods and importsFabio Berger2018-05-112-31/+1
|
* Fix versionFabio Berger2018-05-111-1/+1
|
* remove unused modulesFabio Berger2018-05-111-18/+0
|
* Fix depsFabio Berger2018-05-111-1/+1
|
* Fix prettierFabio Berger2018-05-114-10/+8
|
* Update global_hooksFabio Berger2018-05-111-3/+14
|
* Merge branch 'development' into breakUp0xjsFabio Berger2018-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Add missing version directory to pathFabio Berger2018-05-111-1/+1
|
* Add artifacts to clean commandFabio Berger2018-05-111-1/+1
|
* Fix path to artifactsFabio Berger2018-05-111-1/+1
|
* Add missing uuid typesFabio Berger2018-05-101-0/+1
|
* Rename zeroExContract... to contractWrappers...Fabio Berger2018-05-106-14/+14
|
* Add var returnsFabio Berger2018-05-102-6/+10
|
* Remove unneeded tslint disableFabio Berger2018-05-101-1/+0
|
* Remove generated contract wrappersFabio Berger2018-05-106-3842/+0
|
* Remove unnecessary tslint configFabio Berger2018-05-101-1/+1
|
* Add pr number to changelogsFabio Berger2018-05-101-1/+2
|
* Remove last artifactFabio Berger2018-05-101-39/+0
|
* Remove artifactsFabio Berger2018-05-1013-5490/+0
|
* Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a ↵Fabio Berger2018-05-1075-0/+18017
unifying library with the same interface