Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move isTestNetwork into utils and also check it from showing ZRX request button | Fabio Berger | 2018-02-07 | 2 | -9/+13 |
| | |||||
* | Remove stray log | Fabio Berger | 2018-02-07 | 1 | -1/+0 |
| | |||||
* | Use isTestNetwork instead of isKovanTestNetwork on balances page except for ↵ | Fabio Berger | 2018-02-07 | 1 | -7/+15 |
| | | | | Dharma integration | ||||
* | Properly detect Rinkeby and Ropsten TokenRegistry tokens as mintable | Fabio Berger | 2018-02-07 | 2 | -3/+31 |
| | |||||
* | Add networkId to faucet requests so that we can request tokens on Kovan, ↵ | Fabio Berger | 2018-02-07 | 2 | -2/+4 |
| | | | | Rinkeby and Ropsten | ||||
* | Merge branch 'development' of github.com:0xProject/0x.js into development | Fabio Berger | 2018-02-07 | 13 | -82/+186 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x.js: Bump subproviders version Update yarn.lock Change rpcUrls keys back into string literals Add types-bn package to 0x.js and testnet-faucets Prettier Addressed comments and update 0xProject/types-ethereumjs-util deps Prettier Update testnet-faucets README Fix lint errors Add order signing and dispensing ability to faucet | ||||
| * | Merge pull request #352 from 0xProject/feature/testnet-faucets/order-dispenser | Brandon Millman | 2018-02-07 | 13 | -82/+186 |
| |\ | | | | | | | Add order signing and dispensing ability to faucet | ||||
| | * | Bump subproviders version | Brandon Millman | 2018-02-07 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'development' into feature/testnet-faucets/order-dispenser | Brandon Millman | 2018-02-07 | 27 | -33/+351 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Attribute the origins of NonceTracker Move BlockParamLiteral to shared types package Fixes Move BlockParam and BlockParamLiteral to shared types Rename called to something more readable Newline prettier/lint Yarn.lock Refactor tests for reuse of the fixture subprovider Remove re-fetch of transaction count on error Disable linter for multiple class declarations Remove double declaration Enable CIRCLECI and declare web3 Test faucets to use new NonceTracker Update changelog Readability and prettier Prettify Nonce tracker subprovider Caches the nonce when a request to getTransactionCount is made and increments the pending nonce after successful transactions | ||||
| | * | | Change rpcUrls keys back into string literals | Brandon Millman | 2018-02-07 | 1 | -4/+4 |
| | | | | |||||
| | * | | Add types-bn package to 0x.js and testnet-faucets | Brandon Millman | 2018-02-07 | 2 | -0/+2 |
| | | | | |||||
| | * | | Prettier | Brandon Millman | 2018-02-07 | 2 | -2/+3 |
| | | | | |||||
| | * | | Merge branch 'development' into feature/testnet-faucets/order-dispenser | Brandon Millman | 2018-02-07 | 27 | -162/+91 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Update utils in top level package to 0.3.0 Add 0.2.0 back to yarn lock Reword comment on any Link to the wiki article in the README Justify the any usage Publish Revert "Temp" Changelog Change the InjectedWeb3Subprovider to accept Web3.Provider | ||||
| | * | | | Addressed comments and update 0xProject/types-ethereumjs-util deps | Brandon Millman | 2018-02-06 | 12 | -106/+77 |
| | | | | | |||||
| | * | | | Merge branch 'development' into feature/testnet-faucets/order-dispenser | Brandon Millman | 2018-02-06 | 110 | -6927/+6078 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (37 commits) Add dates to CHANGELOGs Change CHANGELOGs Add .editorconfig Fix a typo Temp Use forEach instead of map Add PR number Fix an exception when a signature collision happens Fix prettier Add regression tests Improve the comment and fix an exception Add missing comas Lerna-ignore tslint and tsconfig Update contract versions, fix tests Rename directories Rename previous contracts, fix imports, add nested file structure Move all contracts into a single directory Update import Fix import Get rid of suffixed contract versioning and replace it with a poor-mans package manager. Versions are stored locally, and are generated in a copy-on-write basis as required ... | ||||
| | * | | | | Prettier | Brandon Millman | 2018-02-01 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Update testnet-faucets README | Brandon Millman | 2018-02-01 | 1 | -3/+11 |
| | | | | | | |||||
| | * | | | | Merge branch 'development' into feature/testnet-faucets/order-dispenser | Brandon Millman | 2018-02-01 | 77 | -720/+1306 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (49 commits) Prettier Updated contract generation in 0x to new abi-gen CLI Add PR number to changelog Fix lint errors Removed deprecated CLI options Add protected keyword to underscore lint rule Remove unused prop Fix prettier Uppercase Networks enum values Make default gasPrice more readable Fix prettier mess Fix linter errors Shrink img Fix all setState calls after unmounted errors. Decided to create our own flag rather then using a cancellablePromise since there was little to be gained from this alternative Fix bug where we were return undefined instead of the empty object Default the derivation path to that found in the Ledger subprovider Add browser data to dialog info Add Rinkeby support Pass in whether we want the personal message prefix appended and never append it for Ledger. This fixes signing when Ledger is used and the backing node is not Parity Wholesale replace the tokenByAddress and de-dup properly ... | ||||
| | * | | | | | Fix lint errors | Brandon Millman | 2018-01-31 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Add order signing and dispensing ability to faucet | Brandon Millman | 2018-01-31 | 8 | -39/+159 |
| | | | | | | | |||||
* | | | | | | | Add networkId to event label | Fabio Berger | 2018-02-07 | 4 | -7/+19 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #370 from 0xProject/feature/ga-portal-logging | Tom Schmidt | 2018-02-07 | 7 | -64/+113 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Add GA Logging to Portal | ||||
| * | | | | | Added logging for order filling and order cancelling | Thomas Schmidt | 2018-02-07 | 2 | -1/+26 |
| | | | | | | |||||
| * | | | | | Moved to async await | Thomas Schmidt | 2018-02-06 | 1 | -18/+13 |
| | | | | | | |||||
| * | | | | | Formatting and removed old GA code | Thomas Schmidt | 2018-02-06 | 2 | -80/+77 |
| | | | | | | |||||
| * | | | | | Converted BigNumber to number for GA logging | Thomas Schmidt | 2018-02-06 | 2 | -3/+3 |
| | | | | | | |||||
| * | | | | | GA logging for order creation | Thomas Schmidt | 2018-02-06 | 2 | -4/+21 |
| | | | | | | |||||
| * | | | | | Switch GA to React GA and add logging for Portal | Thomas Schmidt | 2018-02-06 | 5 | -7/+22 |
| | | | | | | |||||
* | | | | | | Attribute the origins of NonceTracker | Jacob Evans | 2018-02-07 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | NonceTrackerSubprovider is inspired from Web3ProviderEngine NonceTracker | ||||
* | | | | | | Move BlockParamLiteral to shared types package | Jacob Evans | 2018-02-07 | 12 | -21/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | Also BlockParam | ||||
* | | | | | | Fixes | Jacob Evans | 2018-02-07 | 2 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename to isFirstGetTransactionCount assign nextPrefixedHexNonce as a const | ||||
* | | | | | | Move BlockParam and BlockParamLiteral to shared types | Jacob Evans | 2018-02-07 | 7 | -21/+19 |
| | | | | | | |||||
* | | | | | | Merge branch 'development' into feature/subproviders/nonce-tracker | Jacob Evans | 2018-02-06 | 4 | -7/+11 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Reword comment on any | Jacob Evans | 2018-02-06 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Merge pull request #363 from ↵ | Jacob Evans | 2018-02-06 | 4 | -7/+13 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/refactor/subproviders/injected-provider-constructor Change the InjectedWeb3Subprovider to accept Web3.Provider | ||||
| | * | | | | | Link to the wiki article in the README | Jacob Evans | 2018-02-06 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Justify the any usage | Jacob Evans | 2018-02-06 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Changelog | Jacob Evans | 2018-02-03 | 1 | -1/+5 |
| | | | | | | | |||||
| | * | | | | | Change the InjectedWeb3Subprovider to accept Web3.Provider | Jacob Evans | 2018-02-03 | 2 | -6/+5 |
| | | | | | | | |||||
* | | | | | | | Rename called to something more readable | Jacob Evans | 2018-02-06 | 1 | -5/+6 |
| | | | | | | | |||||
* | | | | | | | Newline prettier/lint | Jacob Evans | 2018-02-06 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'development' into feature/subproviders/nonce-tracker | Jacob Evans | 2018-02-06 | 102 | -6899/+5946 |
|\| | | | | | | |||||
| * | | | | | | Publish | Leonid Logvinov | 2018-02-06 | 17 | -77/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.32.0 - @0xproject/abi-gen@0.1.7 - @0xproject/assert@0.0.16 - @0xproject/connect@0.5.5 - contracts@2.1.9 - @0xproject/deployer@0.0.6 - @0xproject/dev-utils@0.0.10 - @0xproject/json-schemas@0.7.8 - @0xproject/monorepo-scripts@0.1.9 - @0xproject/subproviders@0.3.6 - @0xproject/testnet-faucets@1.0.10 - @0xproject/tslint-config@0.4.7 - @0xproject/types@0.1.9 - @0xproject/utils@0.3.0 - web3-typescript-typings@0.9.9 - @0xproject/web3-wrapper@0.1.10 - @0xproject/website@0.0.12 | ||||
| * | | | | | | Revert "Temp" | Leonid Logvinov | 2018-02-06 | 6 | -78/+0 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | This reverts commit 881d32e73324b226bdc97f96fb583edb7a5311c1. | ||||
| * | | | | | Add dates to CHANGELOGs | Leonid Logvinov | 2018-02-06 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'development' of github.com:0xProject/0x.js into development | Leonid Logvinov | 2018-02-06 | 6 | -13/+55 |
| |\ \ \ \ \ | |||||
| | * | | | | | Change CHANGELOGs | Leonid Logvinov | 2018-02-06 | 2 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'development' into fix/abi_decoder_colision | Leonid | 2018-02-06 | 4 | -4/+29 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Fix a typo | Leonid Logvinov | 2018-02-06 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Fix prettier | Leonid Logvinov | 2018-02-05 | 1 | -1/+0 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'development' into fix/ether_token_address | Leonid | 2018-02-05 | 238 | -8708/+8247 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Add regression tests | Leonid Logvinov | 2018-02-05 | 1 | -0/+12 |
| | | | | | | | | |||||
| | | * | | | | | Improve the comment and fix an exception | Leonid Logvinov | 2018-02-05 | 1 | -3/+7 |
| | | | | | | | | |||||
| | | * | | | | | Update CHANGELOG | Leonid Logvinov | 2018-01-30 | 1 | -0/+4 |
| | | | | | | | | |||||
| | | * | | | | | Fix linter errors | Leonid Logvinov | 2018-01-30 | 1 | -1/+0 |
| | | | | | | | | |||||
| | | * | | | | | Add zeroEx.etherToken.getContractAddressifExists | Leonid Logvinov | 2018-01-30 | 3 | -2/+11 |
| | | | | | | | | |||||
| | * | | | | | | Use forEach instead of map | Leonid Logvinov | 2018-02-05 | 2 | -4/+8 |
| | | | | | | | | |||||
| | * | | | | | | Add PR number | Leonid Logvinov | 2018-02-05 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Fix an exception when a signature collision happens | Leonid Logvinov | 2018-02-05 | 2 | -5/+18 |
| | | |/ / / / | | |/| | | | | |||||
| * / | | | | | Temp | Leonid Logvinov | 2018-02-06 | 6 | -0/+78 |
| |/ / / / / | |||||
| * | | | | | Add missing comas | Leonid Logvinov | 2018-02-05 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'development' into feature/build_watch | Leonid | 2018-02-05 | 91 | -6894/+5856 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Update contract versions, fix tests | Amir Bandeali | 2018-02-03 | 27 | -88/+90 |
| | | | | | | |||||
| | * | | | | Rename directories | Amir Bandeali | 2018-02-03 | 63 | -6429/+5551 |
| | | | | | | |||||
| | * | | | | Rename previous contracts, fix imports, add nested file structure | Amir Bandeali | 2018-02-03 | 25 | -34/+32 |
| | | | | | | |||||
| | * | | | | Move all contracts into a single directory | Fabio Berger | 2018-02-03 | 24 | -7/+8 |
| | | | | | | |||||
| | * | | | | Update import | Fabio Berger | 2018-02-03 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix import | Fabio Berger | 2018-02-03 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Get rid of suffixed contract versioning and replace it with a poor-mans ↵ | Fabio Berger | 2018-02-03 | 26 | -346/+136 |
| | | | | | | | | | | | | | | | | | | | | | | | | package manager. Versions are stored locally, and are generated in a copy-on-write basis as required | ||||
| | * | | | | Add solc 0.4.19 | Remco Bloemen | 2018-02-02 | 2 | -0/+23 |
| | | | | | | |||||
| * | | | | | Merge pull request #359 from 0xProject/feature/ts-2.7 | Leonid | 2018-02-05 | 18 | -21/+21 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | TS 2.7 | ||||
| | * | | | | | Fix errors after TS upgrade | Leonid Logvinov | 2018-02-01 | 1 | -4/+4 |
| | | | | | | | |||||
| | * | | | | | Upgrade TS to the newest version | Leonid Logvinov | 2018-02-01 | 17 | -17/+17 |
| | | | | | | | |||||
| * | | | | | | Add build:watch to README's | Leonid Logvinov | 2018-02-02 | 9 | -0/+54 |
| |/ / / / / | |||||
| * | | | / | Add build:watch command to all TS packages | Leonid Logvinov | 2018-02-01 | 15 | -0/+15 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Refactor tests for reuse of the fixture subprovider | Jacob Evans | 2018-02-06 | 3 | -107/+61 |
| | | | | | |||||
* | | | | | Remove re-fetch of transaction count on error | Jacob Evans | 2018-02-06 | 5 | -33/+41 |
| | | | | | |||||
* | | | | | Disable linter for multiple class declarations | Jacob Evans | 2018-02-03 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Remove double declaration | Jacob Evans | 2018-02-02 | 1 | -5/+5 |
| | | | | | |||||
* | | | | | Enable CIRCLECI and declare web3 | Jacob Evans | 2018-02-02 | 3 | -0/+14 |
| | | | | | |||||
* | | | | | Test faucets to use new NonceTracker | Jacob Evans | 2018-02-02 | 2 | -2/+3 |
| | | | | | |||||
* | | | | | Update changelog | Jacob Evans | 2018-02-02 | 1 | -1/+5 |
| | | | | | |||||
* | | | | | Readability and prettier | Jacob Evans | 2018-02-02 | 2 | -13/+11 |
| | | | | | |||||
* | | | | | Prettify | Jacob Evans | 2018-02-02 | 3 | -68/+65 |
| | | | | | |||||
* | | | | | Nonce tracker subprovider | Jacob Evans | 2018-02-02 | 4 | -0/+329 |
| |/ / / |/| | | | | | | | | | | | | | | | Caches the nonce when a request to getTransactionCount is made and increments the pending nonce after successful transactions | ||||
* | | | | Publish | Leonid Logvinov | 2018-02-01 | 18 | -107/+124 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.31.1 - @0xproject/abi-gen@0.1.6 - @0xproject/assert@0.0.15 - chai-as-promised-typescript-typings@0.0.8 - @0xproject/connect@0.5.4 - contracts@2.1.8 - @0xproject/deployer@0.0.5 - @0xproject/dev-utils@0.0.9 - @0xproject/json-schemas@0.7.7 - @0xproject/monorepo-scripts@0.1.8 - @0xproject/subproviders@0.3.5 - @0xproject/testnet-faucets@1.0.9 - @0xproject/tslint-config@0.4.6 - @0xproject/types@0.1.8 - @0xproject/utils@0.2.4 - web3-typescript-typings@0.9.8 - @0xproject/web3-wrapper@0.1.9 - @0xproject/website@0.0.11 | ||||
* | | | | Fix linter errors | Leonid Logvinov | 2018-02-01 | 1 | -2/+2 |
| | | | | |||||
* | | | | Update changelog | Leonid Logvinov | 2018-02-01 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge pull request #357 from ERCdEX/luke/zrx_order_watch_cache | Leonid | 2018-02-01 | 1 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | BUGFIX: don't remove maker/zrx order from cache twice | ||||
| * | | | | don't remove maker/zrx order from cache twice | Luke Autry | 2018-02-01 | 1 | -1/+5 |
| |/ / / | |||||
* / / / | Add OrderWatcherConfig to the list of public types | Leonid Logvinov | 2018-02-01 | 1 | -0/+1 |
|/ / / | |||||
* | | | Prettier | Brandon Millman | 2018-02-01 | 2 | -2/+5 |
| | | | |||||
* | | | Merge branch 'development' into ↵ | Brandon Millman | 2018-02-01 | 9 | -18/+39 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/tslint-config/underscore-protected-members * development: Updated contract generation in 0x to new abi-gen CLI Removed deprecated CLI options Added PR # to the changelog of abi-gen Added CLI options for explicit specifying location of partials and main template | ||||
| * \ \ | Merge pull request #346 from joincivil/feature/abi-gen-partials | Leonid | 2018-01-31 | 9 | -18/+39 |
| |\ \ \ | | | | | | | | | | | Added CLI options for explicit specifying location of partials and main template | ||||
| | * | | | Updated contract generation in 0x to new abi-gen CLI | Olaf Tomalka | 2018-01-31 | 7 | -1/+1 |
| | | | | | |||||
| | * | | | Removed deprecated CLI options | Olaf Tomalka | 2018-01-31 | 1 | -19/+2 |
| | | | | | |||||
| | * | | | Added PR # to the changelog of abi-gen | Olaf Tomalka | 2018-01-27 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Added CLI options for explicit specifying location of partials and main template | Olaf Tomalka | 2018-01-27 | 2 | -14/+50 |
| | | | | | |||||
* | | | | | Add PR number to changelog | Brandon Millman | 2018-01-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix lint errors | Brandon Millman | 2018-01-31 | 17 | -55/+54 |
| | | | | | |||||
* | | | | | Add protected keyword to underscore lint rule | Brandon Millman | 2018-01-31 | 3 | -3/+8 |
|/ / / / | |||||
* | | | | Remove unused prop | Fabio Berger | 2018-01-31 | 1 | -1/+0 |
| | | | | |||||
* | | | | Merge pull request #351 from 0xProject/feature/portal-ledger-support | Fabio Berger | 2018-01-31 | 53 | -645/+1204 |
|\ \ \ \ | |_|_|/ |/| | | | Portal Ledger Support, Lazy-loading token balances/allowances | ||||
| * | | | Fix prettier | Fabio Berger | 2018-01-31 | 1 | -9/+1 |
| | | | | |||||
| * | | | Uppercase Networks enum values | Fabio Berger | 2018-01-31 | 7 | -22/+22 |
| | | | | |||||
| * | | | Make default gasPrice more readable | Fabio Berger | 2018-01-31 | 1 | -1/+3 |
| | | | | |||||
| * | | | Fix prettier mess | Fabio Berger | 2018-01-31 | 1 | -6/+3 |
| | | | | |||||
| * | | | Fix linter errors | Fabio Berger | 2018-01-31 | 21 | -72/+20 |
| | | | | |||||
| * | | | Shrink img | Fabio Berger | 2018-01-31 | 1 | -0/+0 |
| | | | | |||||
| * | | | Fix all setState calls after unmounted errors. Decided to create our own ↵ | Fabio Berger | 2018-01-31 | 7 | -43/+90 |
| | | | | | | | | | | | | | | | | flag rather then using a cancellablePromise since there was little to be gained from this alternative | ||||
| * | | | Fix bug where we were return undefined instead of the empty object | Fabio Berger | 2018-01-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | Default the derivation path to that found in the Ledger subprovider | Fabio Berger | 2018-01-31 | 1 | -1/+4 |
| | | | | |||||
| * | | | Add browser data to dialog info | Fabio Berger | 2018-01-31 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add Rinkeby support | Fabio Berger | 2018-01-30 | 2 | -6/+3 |
| | | | | |||||
| * | | | Pass in whether we want the personal message prefix appended and never ↵ | Fabio Berger | 2018-01-30 | 2 | -1/+20 |
| | | | | | | | | | | | | | | | | append it for Ledger. This fixes signing when Ledger is used and the backing node is not Parity | ||||
| * | | | Merge branch 'development' into feature/portal-ledger-support | Fabio Berger | 2018-01-30 | 48 | -214/+334 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Publish Add PR number Add config file specifically in prettier command and fix files Fix prettier Fix prettier Add shouldAddPersonalMessagePrefix param to signOrderHashAsync instead of trying to infer whether to add it or not from the nodeVersion Publish Move @0xproject/types to dependencies Updated web3-typescript-typings changelog Fixed getTransactionReceipt not returning null Run prettier Update changelog Add Rinkeby addresses to artifacts Fix bad merge on package.json Respond to GH comments and add /info endpoint Change package name to @0xproject/testnet-faucets Implement testnet faucets for any testnet available via infura Rename to testnet-faucets Add to the Pull Request Template Create an ISSUE TEMPLATE | ||||
| * | | | Wholesale replace the tokenByAddress and de-dup properly | Fabio Berger | 2018-01-30 | 4 | -26/+31 |
| | | | | |||||
| * | | | Call destroy ealier so that web3Wrapper stops polling for ↵ | Fabio Berger | 2018-01-30 | 2 | -3/+8 |
| | | | | | | | | | | | | | | | | userAddress/networkId updates before we prep for the batchDispatch | ||||
| * | | | Disallow negative amounts | Fabio Berger | 2018-01-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Remove the ability to clear tokenByAddress. It should simply be updated. | Fabio Berger | 2018-01-30 | 4 | -14/+0 |
| | | | | |||||
| * | | | Use live backend on development | Fabio Berger | 2018-01-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fetch default gasPrice from our ethGasStation API mirror and set it for all ↵ | Fabio Berger | 2018-01-29 | 1 | -3/+34 |
| | | | | | | | | | | | | | | | | transactions | ||||
| * | | | remove unused type | Fabio Berger | 2018-01-29 | 1 | -10/+0 |
| | | | | |||||
| * | | | Small improvements | Fabio Berger | 2018-01-29 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fix bug related to balance/allowance fetching being async | Fabio Berger | 2018-01-29 | 1 | -0/+14 |
| | | | | |||||
| * | | | Add missing entries for Ropsten and Rinkeby testnets, added Ropsten to ↵ | Fabio Berger | 2018-01-29 | 6 | -23/+32 |
| | | | | | | | | | | | | | | | | Ledger network dropdown | ||||
| * | | | Re-set Ledger config dialog to connect step if dialog is closed | Fabio Berger | 2018-01-29 | 1 | -0/+1 |
| | | | | |||||
| * | | | Add flash message instructing user to confirm tx on Ledger | Fabio Berger | 2018-01-29 | 1 | -0/+13 |
| | | | | |||||
| * | | | Add the stack trace to help with debugging | Fabio Berger | 2018-01-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make it such that users can switch between Ledger accounts without first ↵ | Fabio Berger | 2018-01-29 | 3 | -9/+12 |
| | | | | | | | | | | | | | | | | switching back to an injected provider | ||||
| * | | | Use colors module and remove in-lined colors | Fabio Berger | 2018-01-29 | 2 | -7/+10 |
| | | | | |||||
| * | | | Replace heavy loading animation with simple circular loader | Fabio Berger | 2018-01-29 | 5 | -41/+14 |
| | | | | |||||
| * | | | Add network name to the select provider | Fabio Berger | 2018-01-29 | 1 | -12/+15 |
| | | | | |||||
| * | | | Fix bug where could not switch to Ledger and back | Fabio Berger | 2018-01-29 | 6 | -31/+65 |
| | | | | |||||
| * | | | Implement just-in-time loading of token balances & allowances | Fabio Berger | 2018-01-28 | 23 | -295/+384 |
| | | | | |||||
| * | | | Initial Ledger support implementation | Fabio Berger | 2018-01-28 | 24 | -163/+559 |
| | | | | |||||
| * | | | Remove unused Ledgerco import | Fabio Berger | 2018-01-28 | 2 | -2/+0 |
| | | | | |||||
| * | | | Add light blue as our accent color | Fabio Berger | 2018-01-28 | 1 | -0/+1 |
| | | | | |||||
| * | | | Properly detect user signing cancellation on Metamask, Parity signer and Ledger | Fabio Berger | 2018-01-28 | 6 | -7/+7 |
| | | | | |||||
* | | | | Change order | Leonid Logvinov | 2018-01-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Separate npm scripts in contracts | Leonid Logvinov | 2018-01-30 | 1 | -2/+3 |
| | | | | |||||
* | | | | Remove a semicolon | Leonid Logvinov | 2018-01-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix glob patterns | Leonid Logvinov | 2018-01-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Remove constructor arg | Leonid Logvinov | 2018-01-30 | 2 | -4/+5 |
| | | | | |||||
* | | | | Remove authorized address magic from tests | Leonid Logvinov | 2018-01-30 | 1 | -8/+1 |
| | | | | |||||
* | | | | Remove accounts magic from tests | Leonid Logvinov | 2018-01-30 | 3 | -8/+4 |
| | | | | |||||
* | | | | Make an RPC constructor param implicit | Leonid Logvinov | 2018-01-30 | 23 | -26/+27 |
| | | | | |||||
* | | | | Remove no-unused-variabe rule | Leonid Logvinov | 2018-01-30 | 1 | -1/+0 |
| | | | | |||||
* | | | | Fix tslint issues | Leonid Logvinov | 2018-01-30 | 3 | -7/+6 |
| | | | | |||||
* | | | | Use an enum for contract name | Leonid Logvinov | 2018-01-30 | 13 | -47/+60 |
| | | | | |||||
* | | | | Remove promisified web3 functions from tests | Leonid Logvinov | 2018-01-30 | 2 | -14/+12 |
| | | | | |||||
* | | | | Remove truffle as a dependency | Leonid Logvinov | 2018-01-30 | 1 | -1/+0 |
| | | | | |||||
* | | | | Fix prettier | Leonid Logvinov | 2018-01-30 | 3 | -23/+11 |
| | | | | |||||
* | | | | Normalize the dependencies | Leonid Logvinov | 2018-01-30 | 20 | -91/+67 |
| | | | | |||||
* | | | | Add --bail to mocha config | Leonid Logvinov | 2018-01-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Make awaitTransactionMinedAsync non-generic again | Leonid Logvinov | 2018-01-30 | 3 | -13/+13 |
| | | | | |||||
* | | | | Add back the artifacts | Leonid Logvinov | 2018-01-30 | 16 | -0/+6408 |
| | | | | |||||
* | | | | Remove duplicate code | Leonid Logvinov | 2018-01-30 | 2 | -55/+0 |
| | | | | |||||
* | | | | Remove truffle from tests | Leonid Logvinov | 2018-01-30 | 72 | -7162/+649 |
| | | | | |||||
* | | | | Refactor contracts tests to not use injected web3 instance | Leonid Logvinov | 2018-01-30 | 37 | -126/+89 |
| | | | | |||||
* | | | | Remove truffle from Exchange tests | Leonid Logvinov | 2018-01-30 | 3 | -20/+65 |
| | | | | |||||
* | | | | Remove truffle from ZRXToken tests | Leonid Logvinov | 2018-01-30 | 1 | -11/+19 |
| | | | | |||||
* | | | | Remove truffle from UnlimitedAllowanceToken tests | Leonid Logvinov | 2018-01-30 | 2 | -5/+26 |
| | | | | |||||
* | | | | Remove truffle from UnlimitedAllowanceTokenV2 tests | Leonid Logvinov | 2018-01-30 | 5 | -14/+22 |
| | | | | |||||
* | | | | Remove truffle from TokenRegistry tests | Leonid Logvinov | 2018-01-30 | 1 | -12/+28 |
| | | | | |||||
* | | | | Remove truffle from MultiSigWalletWithTimeLock tests | Leonid Logvinov | 2018-01-30 | 1 | -4/+10 |
| | | | | |||||
* | | | | Remove truffle from MultiSigWalletWithTimeLockExceptRemoveAuthAddr tests | Leonid Logvinov | 2018-01-30 | 2 | -14/+32 |
| | | | | |||||
* | | | | Remove truffle from Ether Token tests | Leonid Logvinov | 2018-01-30 | 1 | -12/+24 |
| | | | | |||||
* | | | | Remove truffle from tokenTransferProxy tests | Leonid Logvinov | 2018-01-30 | 2 | -39/+37 |
| | | | | |||||
* | | | | Remove truffle from tokenTransferProxy tests | Leonid Logvinov | 2018-01-30 | 14 | -54/+76 |
| |/ / |/| | | |||||
* | | | Publish | Fabio Berger | 2018-01-30 | 18 | -101/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.31.0 - @0xproject/abi-gen@0.1.5 - @0xproject/assert@0.0.14 - chai-as-promised-typescript-typings@0.0.7 - @0xproject/connect@0.5.3 - contracts@2.1.7 - @0xproject/deployer@0.0.4 - @0xproject/dev-utils@0.0.8 - @0xproject/json-schemas@0.7.6 - @0xproject/monorepo-scripts@0.1.7 - @0xproject/subproviders@0.3.4 - @0xproject/testnet-faucets@1.0.8 - @0xproject/tslint-config@0.4.5 - @0xproject/types@0.1.7 - @0xproject/utils@0.2.3 - web3-typescript-typings@0.9.7 - @0xproject/web3-wrapper@0.1.8 - @0xproject/website@0.0.10 | ||||
* | | | Add PR number | Fabio Berger | 2018-01-30 | 1 | -1/+1 |
| | | | |||||
* | | | Add config file specifically in prettier command and fix files | Fabio Berger | 2018-01-30 | 376 | -34256/+34256 |
| | | | |||||
* | | | Fix prettier | Fabio Berger | 2018-01-30 | 376 | -34276/+34256 |
| | | | |||||
* | | | Fix prettier | Fabio Berger | 2018-01-30 | 1 | -3/+6 |
| | | | |||||
* | | | Add shouldAddPersonalMessagePrefix param to signOrderHashAsync instead of ↵ | Fabio Berger | 2018-01-30 | 5 | -21/+44 |
| | | | | | | | | | | | | trying to infer whether to add it or not from the nodeVersion | ||||
* | | | Publish | Leonid Logvinov | 2018-01-30 | 18 | -101/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.30.2 - @0xproject/abi-gen@0.1.4 - @0xproject/assert@0.0.13 - chai-as-promised-typescript-typings@0.0.6 - @0xproject/connect@0.5.2 - contracts@2.1.6 - @0xproject/deployer@0.0.3 - @0xproject/dev-utils@0.0.7 - @0xproject/json-schemas@0.7.5 - @0xproject/monorepo-scripts@0.1.6 - @0xproject/subproviders@0.3.3 - @0xproject/testnet-faucets@1.0.7 - @0xproject/tslint-config@0.4.4 - @0xproject/types@0.1.6 - @0xproject/utils@0.2.2 - web3-typescript-typings@0.9.6 - @0xproject/web3-wrapper@0.1.7 - @0xproject/website@0.0.9 | ||||
* | | | Move @0xproject/types to dependencies | Leonid Logvinov | 2018-01-30 | 1 | -1/+1 |
| | | | |||||
* | | | Updated web3-typescript-typings changelog | Olaf Tomalka | 2018-01-26 | 1 | -0/+1 |
| | | | |||||
* | | | Fixed getTransactionReceipt not returning null | Olaf Tomalka | 2018-01-26 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Run prettier | Amir Bandeali | 2018-01-26 | 8 | -55/+38 |
| | | |||||
* | | Update changelog | Amir Bandeali | 2018-01-26 | 1 | -1/+2 |
| | | |||||
* | | Add Rinkeby addresses to artifacts | Amir Bandeali | 2018-01-26 | 5 | -0/+15 |
| | | |||||
* | | Fix bad merge on package.json | Brandon Millman | 2018-01-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'development' into feature/kovan-faucets/all-testnet-support | Brandon Millman | 2018-01-25 | 22 | -105/+128 |
|\| | | | | | | | | | | | | | | | * development: Publish Update yarn.lock Update the CHANGELOG Fix the bug making it impossible to specify the custom ZRX address | ||||
| * | Publish | Leonid Logvinov | 2018-01-25 | 18 | -104/+121 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.30.1 - @0xproject/abi-gen@0.1.3 - @0xproject/assert@0.0.12 - chai-as-promised-typescript-typings@0.0.5 - @0xproject/connect@0.5.1 - contracts@2.1.5 - @0xproject/deployer@0.0.2 - @0xproject/dev-utils@0.0.6 - @0xproject/json-schemas@0.7.4 - @0xproject/kovan_faucets@1.0.6 - @0xproject/monorepo-scripts@0.1.5 - @0xproject/subproviders@0.3.2 - @0xproject/tslint-config@0.4.3 - @0xproject/types@0.1.5 - @0xproject/utils@0.2.1 - web3-typescript-typings@0.9.5 - @0xproject/web3-wrapper@0.1.6 - @0xproject/website@0.0.8 | ||||
| * | Update the CHANGELOG | Leonid Logvinov | 2018-01-24 | 1 | -0/+1 |
| | | |||||
| * | Fix the bug making it impossible to specify the custom ZRX address | Leonid Logvinov | 2018-01-24 | 3 | -0/+5 |
| | | |||||
* | | Respond to GH comments and add /info endpoint | Brandon Millman | 2018-01-25 | 3 | -5/+64 |
| | | |||||
* | | Change package name to @0xproject/testnet-faucets | Brandon Millman | 2018-01-24 | 2 | -2/+2 |
| | | |||||
* | | Implement testnet faucets for any testnet available via infura | Brandon Millman | 2018-01-24 | 7 | -59/+80 |
| | | |||||
* | | Rename to testnet-faucets | Brandon Millman | 2018-01-24 | 17 | -4/+4 |
|/ | |||||
* | Fix fill/cancel order by looking for NoError instead of empty blockchainErr ↵ | Fabio Berger | 2018-01-22 | 1 | -2/+2 |
| | | | | given the BlockchainErrs type refactor | ||||
* | Merge branch 'development' into feature/separate-deployer | Leonid | 2018-01-19 | 13 | -59/+144 |
|\ | |||||
| * | Add our mainnet and kovan nodes as backups for Portal requests | Fabio Berger | 2018-01-19 | 1 | -2/+2 |
| | | |||||
| * | Fix bug hiding the user info from topBar | Fabio Berger | 2018-01-19 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #328 from 0xProject/fix/website/alphanumeric-token-symbol | Jacob Evans | 2018-01-19 | 1 | -4/+4 |
| |\ | | | | | | | Allow Token symbols to be alphanumeric | ||||
| | * | Allow Token symbols to be alphanumeric | Jacob Evans | 2018-01-19 | 1 | -4/+4 |
| | | | |||||
| * | | Prettier newline | Jacob Evans | 2018-01-19 | 1 | -1/+1 |
| | | | |||||
| * | | Prettier | Jacob Evans | 2018-01-19 | 3 | -3/+8 |
| | | | |||||
| * | | Update CHANGELOG, rebase on development | Jacob Evans | 2018-01-19 | 1 | -0/+3 |
| | | | |||||
| * | | Should not -> cannot | Jacob Evans | 2018-01-19 | 1 | -1/+1 |
| | | | |||||
| * | | Reject negative amounts in isValidBaseUnitAmount | Jacob Evans | 2018-01-19 | 3 | -0/+59 |
| | | | |||||
| * | | Re-add changelog for 0x.js | Fabio Berger | 2018-01-19 | 1 | -1/+1 |
| |/ | |||||
| * | Fix prettier | Leonid Logvinov | 2018-01-18 | 3 | -46/+56 |
| | | |||||
| * | Merge pull request #325 from 0xProject/fix/portal-bugs | Leonid | 2018-01-18 | 7 | -19/+27 |
| |\ | | | | | | | Small Fixes/Additions | ||||
| | * | Use intervalUtils.clearAsyncExcludingInterval instead of calling ↵ | Fabio Berger | 2018-01-18 | 2 | -4/+4 |
| | | | | | | | | | | | | clearInterval directly for grepability | ||||
| | * | Add discourse forum to Community section of website footer | Fabio Berger | 2018-01-18 | 3 | -0/+7 |
| | | | |||||
| | * | Remove dead-code | Fabio Berger | 2018-01-18 | 1 | -5/+0 |
| | | | |||||
| | * | Fix Portal topbar so that it displays the mobile menu | Fabio Berger | 2018-01-18 | 1 | -8/+6 |
| | | | |||||
| | * | Add missing onError callbacks | Fabio Berger | 2018-01-18 | 2 | -2/+10 |
| | | | |||||
| | * | Fix balance page copy to refer to the Wrap ETH tab instead of a "convert" button | Fabio Berger | 2018-01-18 | 1 | -1/+1 |
| | | | |||||
* | | | Add a comment about a yarn bug | Leonid Logvinov | 2018-01-19 | 1 | -1/+3 |
| | | | |||||
* | | | Move tests to a separate folder | Leonid Logvinov | 2018-01-18 | 11 | -12/+13 |
| | | | |||||
* | | | Change file layout | Leonid Logvinov | 2018-01-18 | 13 | -12/+12 |
| | | | |||||
* | | | Add bin definition | Leonid Logvinov | 2018-01-18 | 1 | -0/+3 |
| | | | |||||
* | | | Add postpublish scripts and README | Leonid Logvinov | 2018-01-18 | 2 | -0/+112 |
| | | | |||||
* | | | Fix a link | Leonid Logvinov | 2018-01-18 | 1 | -1/+1 |
| | | | |||||
* | | | Fix merge conflicts | Leonid Logvinov | 2018-01-18 | 1 | -8/+1 |
| | | | |||||
* | | | Fix merge conflicts | Leonid Logvinov | 2018-01-18 | 1 | -6/+0 |
| | | | |||||
* | | | Move deployer to a separate package | Leonid Logvinov | 2018-01-18 | 37 | -16/+122 |
|/ / | |||||
* | | Merge pull request #322 from 0xProject/fix/ci-time | Leonid | 2018-01-18 | 12 | -33/+14 |
|\ \ | | | | | | | Speed-up CI | ||||
| * | | Enable restrict-plus-operands and fix issues detected | Leonid Logvinov | 2018-01-17 | 5 | -4/+5 |
| | | | |||||
| * | | Remove unused dependencies | Leonid Logvinov | 2018-01-17 | 2 | -14/+0 |
| | | | |||||
| * | | Fix a stupid RPC bug which caused the port togo over 65535 | Leonid Logvinov | 2018-01-17 | 1 | -1/+1 |
| | | | |||||
| * | | Remove trailing slash | Leonid Logvinov | 2018-01-17 | 1 | -1/+1 |
| | | | |||||
| * | | Test deployer separately from contracts | Leonid Logvinov | 2018-01-17 | 1 | -1/+2 |
| | | | |||||
| * | | Return is pensing events are undefined | Leonid Logvinov | 2018-01-16 | 1 | -0/+4 |
| | | | |||||
| * | | Remove umd tests | Leonid Logvinov | 2018-01-16 | 2 | -12/+1 |
| | | | |||||
* | | | Run prettier to revert formatting changes made by the lerna publish step | Brandon Millman | 2018-01-18 | 7 | -41/+24 |
| | | | |||||
* | | | Publish | Brandon Millman | 2018-01-18 | 18 | -104/+121 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.30.0 - @0xproject/abi-gen@0.1.2 - @0xproject/assert@0.0.11 - chai-as-promised-typescript-typings@0.0.4 - chai-typescript-typings@0.0.2 - @0xproject/connect@0.5.0 - contracts@2.1.4 - @0xproject/dev-utils@0.0.5 - @0xproject/json-schemas@0.7.3 - @0xproject/kovan_faucets@1.0.5 - @0xproject/monorepo-scripts@0.1.4 - @0xproject/subproviders@0.3.1 - @0xproject/tslint-config@0.4.2 - @0xproject/types@0.1.4 - @0xproject/utils@0.2.0 - web3-typescript-typings@0.9.4 - @0xproject/web3-wrapper@0.1.5 - @0xproject/website@0.0.7 | ||||
* | | | Update CHANGELOG | Brandon Millman | 2018-01-18 | 3 | -4/+4 |
| |/ |/| | |||||
* | | Merge pull request #321 from 0xProject/fix/fill-up-to-validation | Leonid | 2018-01-18 | 3 | -4/+38 |
|\ \ | | | | | | | Fix fillOrdersUpTo validation | ||||
| * | | Fix the typos | Leonid Logvinov | 2018-01-17 | 2 | -5/+5 |
| | | | |||||
| * | | Update the CHANGELOG | Leonid Logvinov | 2018-01-16 | 1 | -0/+1 |
| | | | |||||
| * | | Fix fillOrdersUpTo balances validation | Leonid Logvinov | 2018-01-16 | 2 | -2/+18 |
| | | | |||||
| * | | Add a regression test for fillUpToValidation | Leonid Logvinov | 2018-01-16 | 1 | -1/+18 |
| |/ | |||||
* | | Added PR number to web3 typings changelog | Olaf Tomalka | 2018-01-16 | 1 | -1/+1 |
| | | |||||
* | | Fix web3 typing defaultAccount not allowing `undefined` | Olaf Tomalka | 2018-01-15 | 2 | -1/+2 |
|/ | | | | | | The default value for the defaultAccount property is undefined, this happens in real-life scenarios, and so the type should explicitly warn users about it | ||||
* | Merge pull request #319 from 0xProject/feature/final-monorepo | Leonid | 2018-01-13 | 26 | -41/+1782 |
|\ | | | | | Import last TS packages into the monorepo | ||||
| * | Add postpublish scripts | Leonid Logvinov | 2018-01-13 | 12 | -32/+120 |
| | | |||||
| * | Add chai-as-promised-typescript-typings | Leonid Logvinov | 2018-01-13 | 7 | -5/+1321 |
| | | |||||
| * | Remove redundant type refs | Leonid Logvinov | 2018-01-13 | 5 | -7/+4 |
| | | |||||
| * | Add web3-typescript-typings and chai-as-promised-typescript-typings to the ↵ | Leonid Logvinov | 2018-01-12 | 1 | -3/+3 |
| | | | | | | | | main monorepo | ||||
| * | Import chai-as-promised-typescript-typings | Leonid Logvinov | 2018-01-12 | 5 | -0/+340 |
| | | |||||
* | | Merge pull request #312 from 0xProject/feature/error-reporting-intervals | Leonid | 2018-01-13 | 12 | -62/+116 |
|\ \ | | | | | | | Better error handling on async/sync intervals | ||||
| * | | Return after checking for an error and add an explanatory comment | Leonid Logvinov | 2018-01-13 | 1 | -1/+2 |
| | | | |||||
| * | | Apply prettier | Leonid Logvinov | 2018-01-11 | 6 | -38/+23 |
| | | | |||||
| * | | Update the CHANGELOG | Leonid Logvinov | 2018-01-11 | 2 | -0/+8 |
| | | | |||||
| * | | Make some callbacks failable and add error handling | Leonid Logvinov | 2018-01-11 | 9 | -60/+88 |
| | | |