Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | feat(sra_client.py) | F. Eugene Aumson | 2018-12-12 | 51 | -3/+6866 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Code generation scripts * Generated code * Change test config to hit 0x-launch-kit * Ran prettier on generated code * First test case, of get_asset_pairs() * Use launch kit docker image to faciliate CI tests * Fix markdown rendering for GitHub and PyPI * Add URL for PyPI to link back to GitHub * Add one-line package description to README.md * Remove git_push.sh * Remove unimplemented tests * Add sra_client to top-level README package list * Remove repeated-everywhere long description * Add shorcuts for publishing * Remove TypeScript examples | ||||
* | Remove accidentally commited files | Leonid Logvinov | 2018-12-12 | 36 | -27884/+0 |
| | |||||
* | track idex orderbook snapshots (#1397) | zkao | 2018-12-12 | 14 | -34/+690 |
| | | | * Track Idex and Oasis Orderbook Snapshots | ||||
* | Publishethereum-types@1.1.3@0x/website@0.0.62@0x/web3-wrapper@3.2.0@0x/utils@2.0.7@0x/typescript-typings@3.0.5@0x/types@1.4.0@0x/testnet-faucets@1.0.59@0x/subproviders@2.1.7@0x/sra-spec@1.0.12@0x/sol-resolver@1.1.0@0x/sol-doc@1.0.10@0x/sol-cov@2.1.15@0x/sol-compiler@1.1.15@0x/react-shared@1.0.24@0x/react-docs@1.0.21@0x/pipeline@1.0.1@0x/order-watcher@2.2.7@0x/order-utils@3.0.6@0x/monorepo-scripts@1.0.15@0x/migrations@2.2.1@0x/metacoin@0.0.31@0x/json-schemas@2.1.3@0x/instant@1.0.3@0x/fill-scenarios@1.0.15@0x/dev-utils@1.0.20@0x/dev-tools-pages@0.0.9@0x/contracts-test-utils@1.0.1@0x/contracts-protocol@2.1.57@0x/contract-wrappers@4.1.2@0x/connect@3.0.9@0x/base-contract@3.0.9@0x/asset-buyer@3.0.3@0x/assert@1.0.19@0x/abi-gen@1.0.18@0x/abi-gen-wrappers@2.0.10x.js@2.0.7 | Fabio Berger | 2018-12-12 | 43 | -404/+402 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@2.0.7 - @0x/abi-gen@1.0.18 - @0x/abi-gen-wrappers@2.0.1 - @0x/assert@1.0.19 - @0x/asset-buyer@3.0.3 - @0x/base-contract@3.0.9 - @0x/connect@3.0.9 - @0x/contract-wrappers@4.1.2 - @0x/dev-tools-pages@0.0.9 - @0x/dev-utils@1.0.20 - ethereum-types@1.1.3 - @0x/fill-scenarios@1.0.15 - @0x/instant@1.0.3 - @0x/json-schemas@2.1.3 - @0x/metacoin@0.0.31 - @0x/migrations@2.2.1 - @0x/monorepo-scripts@1.0.15 - @0x/order-utils@3.0.6 - @0x/order-watcher@2.2.7 - @0x/pipeline@1.0.1 - @0x/react-docs@1.0.21 - @0x/react-shared@1.0.24 - @0x/sol-compiler@1.1.15 - @0x/sol-cov@2.1.15 - @0x/sol-doc@1.0.10 - @0x/sol-resolver@1.1.0 - @0x/sra-spec@1.0.12 - @0x/subproviders@2.1.7 - @0x/testnet-faucets@1.0.59 - @0x/types@1.4.0 - @0x/typescript-typings@3.0.5 - @0x/utils@2.0.7 - @0x/web3-wrapper@3.2.0 - @0x/website@0.0.62 - @0x/contracts-examples@1.0.1 - @0x/contracts-extensions@1.0.1 - @0x/contracts-interfaces@1.0.1 - @0x/contracts-libs@1.0.1 - @0x/contracts-multisig@1.0.1 - @0x/contracts-protocol@2.1.57 - @0x/contracts-test-utils@1.0.1 - @0x/contracts-tokens@1.0.1 - @0x/contracts-utils@1.0.1 | ||||
* | Updated CHANGELOGS | Fabio Berger | 2018-12-12 | 92 | -77/+27966 |
| | |||||
* | Refactor event scraping and add support for scraping ERC20 approval events ↵ | Alex Browne | 2018-12-12 | 19 | -196/+641 |
| | | | | | | | | (#1401) * Refactor event scraping and add support for scraping ERC20 approval events * Add tests for data_sources/contract-wrappers/utils | ||||
* | fix(order_utils.py): Remove stale comment | F. Eugene Aumson | 2018-12-12 | 1 | -2/+0 |
| | |||||
* | Merge pull request #1413 from 0xProject/feature/contracts-monorepo-7 | Leonid Logvinov | 2018-12-12 | 112 | -451/+519 |
|\ | | | | | Contracts monorepo 7 | ||||
| * | Move OrderValidator to the protocol package | Leonid Logvinov | 2018-12-12 | 12 | -23/+20 |
| | | |||||
| * | Revert accidental change | Leonid Logvinov | 2018-12-12 | 1 | -1/+1 |
| | | |||||
| * | Update contracts/examples/README.md | Fabio B | 2018-12-12 | 1 | -1/+1 |
| | | | | | | Co-Authored-By: LogvinovLeon <logvinov.leon@gmail.com> | ||||
| * | Merge branch 'development' into feature/contracts-monorepo-7 | Leonid Logvinov | 2018-12-11 | 207 | -311/+6663 |
| |\ | |||||
| * | | Revert access changes | Leonid Logvinov | 2018-12-11 | 10 | -10/+10 |
| | | | |||||
| * | | Upgrade solhint version | Leonid Logvinov | 2018-12-11 | 1 | -3/+3 |
| | | | |||||
| * | | Re-use solhint configuration | Leonid Logvinov | 2018-12-11 | 16 | -156/+16 |
| | | | |||||
| * | | Change contracts publish config | Leonid Logvinov | 2018-12-11 | 9 | -9/+9 |
| | | | |||||
| * | | Rename core package to protocol | Leonid Logvinov | 2018-12-11 | 67 | -26/+32 |
| | | | |||||
| * | | Add coreArtifacts to forwarder wrapper | Leonid Logvinov | 2018-12-11 | 1 | -1/+2 |
| | | | |||||
| * | | Combine duplicate imports | Leonid Logvinov | 2018-12-11 | 1 | -2/+1 |
| | | | |||||
| * | | Refactor our extensions package | Leonid Logvinov | 2018-12-11 | 42 | -304/+304 |
| | | | |||||
| * | | Refactor out examples | Leonid Logvinov | 2018-12-11 | 21 | -25/+230 |
| | | | |||||
* | | | Merge pull request #1414 from 0xProject/fix/signature-utils/walletSignature | Fabio B | 2018-12-11 | 2 | -1/+10 |
|\ \ \ | | | | | | | | | [order-utils] Fix Wallet Signature Verification | ||||
| * | | | Add CHANGELOG entry | Fabio Berger | 2018-12-11 | 1 | -0/+9 |
| | | | | |||||
| * | | | Actually pass the signature, not the signature index to a wallet contract's ↵ | Fabio Berger | 2018-12-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | `isValidSignature` call | ||||
* | | | | Add link to rexrelay integration example in instant README | Brandon Millman | 2018-12-11 | 1 | -0/+2 |
| |_|/ |/| | | |||||
* | | | chore: fix typo in instant README | Brandon Millman | 2018-12-11 | 1 | -1/+1 |
| | | | |||||
* | | | chore: remove extra newline | Brandon Millman | 2018-12-11 | 1 | -1/+0 |
| | | | |||||
* | | | Update instant README with more integration links | Brandon Millman | 2018-12-11 | 1 | -1/+1 |
| | | | |||||
* | | | Fix typo in top level README | Brandon Millman | 2018-12-11 | 1 | -7/+6 |
| | | | |||||
* | | | Update top level README packages list with instant | Brandon Millman | 2018-12-11 | 1 | -0/+2 |
| | | | |||||
* | | | Update instant README | Brandon Millman | 2018-12-11 | 1 | -0/+5 |
|/ / | |||||
* | | perform null check on token metadata (#1412) | Xianny | 2018-12-11 | 1 | -1/+1 |
| | | |||||
* | | Updated CHANGELOGS | Leonid Logvinov | 2018-12-11 | 55 | -5/+329 |
| | | |||||
* | | Merge pull request #1404 from 0xProject/feature/instant/better-provider-fallback | Francesco Agosti | 2018-12-11 | 6 | -6/+40 |
|\ \ | | | | | | | [instant] Refactor provider name and provider display name logic, log the display name | ||||
| * | | feat: only use display name from provider in ui | fragosti | 2018-12-08 | 1 | -1/+1 |
| | | | |||||
| * | | feat: refactor provider name and displayName logic | fragosti | 2018-12-08 | 5 | -9/+39 |
| | | | |||||
| * | | feat: log walletDisplayName to Heap | fragosti | 2018-12-08 | 2 | -0/+4 |
| | | | |||||
* | | | Fix/pipeline/ohlcv ratelimit (#1403) | Xianny | 2018-12-11 | 5 | -23/+26 |
|\ \ \ | | | | | | | | | | | | | Use time-based throttling and increase batch size of CC query | ||||
| * | | | change to camelCase | xianny | 2018-12-11 | 2 | -3/+3 |
| | | | | |||||
| * | | | lint: remove unused variable | xianny | 2018-12-08 | 1 | -1/+0 |
| | | | | |||||
| * | | | refresh rate limit every second instead of every minute | xianny | 2018-12-08 | 1 | -3/+3 |
| | | | | |||||
| * | | | cleanup: stray import, rename variable | xianny | 2018-12-08 | 2 | -5/+3 |
| | | | | |||||
| * | | | Merge branch 'fix/pipeline/ohlcv-ratelimit' of ↵ | xianny | 2018-12-08 | 0 | -0/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:0xProject/0x-monorepo into fix/pipeline/ohlcv-ratelimit Rebased onto development | ||||
| | * | | | rename variable and define default in only 1 location | xianny | 2018-12-07 | 3 | -5/+11 |
| | | | | | |||||
| | * | | | upgrade throttling code | xianny | 2018-12-07 | 2 | -14/+12 |
| | | | | | |||||
| * | | | | query CC with larger batch size | xianny | 2018-12-08 | 3 | -5/+7 |
| | | | | | |||||
| * | | | | rename variable and define default in only 1 location | xianny | 2018-12-08 | 3 | -5/+11 |
| | | | | | |||||
| * | | | | upgrade throttling code | xianny | 2018-12-08 | 2 | -14/+12 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1411 from 0xProject/fix/instant/hide-loaders | Brandon Millman | 2018-12-11 | 2 | -44/+14 |
|\ \ \ \ | | | | | | | | | | | [instant] Hide loaders when no token or buy amount is chosen | ||||
| * | | | | fix(instant): hide loaders when no token or buy amount is chosen | Brandon Millman | 2018-12-11 | 2 | -44/+14 |
| | | | | | |||||
* | | | | | Merge pull request #1405 from 0xProject/tslint-changes | Fabio B | 2018-12-11 | 12 | -17/+18 |
|\ \ \ \ \ | |/ / / / |/| | | | | Implement prefer-template tslint rule | ||||
| * | | | | Implement prefer-template tslint rule | kao | 2018-12-08 | 12 | -17/+18 |
| |/ / / | |||||
* | | | | Merge pull request #1409 from 0xProject/fix/instant/custom-erc20 | Steve Klebanoff | 2018-12-11 | 1 | -2/+11 |
|\ \ \ \ | | | | | | | | | | | [instant] Don't throw error if can't find icon for token | ||||
| * | | | | Don't throw error if can't find icon for token | Steve Klebanoff | 2018-12-11 | 1 | -2/+11 |
| | | | | | |||||
* | | | | | Merge pull request #1388 from 0xProject/feature/contracts-monorepo-6 | Leonid Logvinov | 2018-12-11 | 69 | -147/+473 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | Contracts monorepo 6 | ||||
| * | | | | Refactor out tokens from core contracts package | Leonid Logvinov | 2018-12-05 | 69 | -147/+473 |
| | | | | | |||||
* | | | | | Merge pull request #1385 from 0xProject/feature/contracts-monorepo-5 | Leonid Logvinov | 2018-12-11 | 47 | -44/+287 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Refactor our protocol interfaces into `@0x/contracts-interfaces` | ||||
| * | | | | Update contracts/interfaces/README.md | Fabio B | 2018-12-07 | 1 | -1/+1 |
| |/ / / | | | | | | | | | Co-Authored-By: LogvinovLeon <logvinov.leon@gmail.com> | ||||
| * | | | Refactor our protocol interfaces into @0x/contracts-interfaces | Leonid Logvinov | 2018-12-05 | 47 | -44/+287 |
| | | | | |||||
* | | | | Merge pull request #1402 from 0xProject/web3-wrapper/numberBigNumberMixup | Fabio B | 2018-12-09 | 3 | -4/+52 |
|\ \ \ \ | |_|/ / |/| | | | Fix `value` and `gasPrice` precision bug by returning them as BigNumbers | ||||
| * | | | Fix linter | Fabio Berger | 2018-12-08 | 1 | -2/+4 |
| | | | | |||||
| * | | | Add PR number | Fabio Berger | 2018-12-07 | 1 | -1/+2 |
| | | | | |||||
| * | | | Remove excess commas | Fabio Berger | 2018-12-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix: txData returned so that `value` and `gasPrice` are BigNumbers to avoid ↵ | Fabio Berger | 2018-12-07 | 2 | -4/+12 |
| | | | | | | | | | | | | | | | | precision errors | ||||
| * | | | Update yarn.lock | Fabio Berger | 2018-12-07 | 1 | -2/+39 |
| | |/ | |/| | |||||
* | | | Merge pull request #1399 from ↵ | Francesco Agosti | 2018-12-07 | 3 | -1/+11 |
|\ \ \ | |/ / |/| | | | | | | | | 0xProject/feature/website/disable-slider-if-no-address-configurator [website] Disable slider when no affiliate info | ||||
| * | | feat: change color of doctype tag in configurator | fragosti | 2018-12-07 | 1 | -1/+1 |
| | | | |||||
| * | | feat: disable slider when no affiliate info | fragosti | 2018-12-06 | 2 | -0/+10 |
| | | | |||||
* | | | Switch out whitepaper with 0x protocol specification | Fabio Berger | 2018-12-06 | 9 | -3/+10 |
| | | | |||||
* | | | Switch out RocketChat icon with Discord icon | Fabio Berger | 2018-12-06 | 3 | -1/+1 |
|/ / | |||||
* | | fix: add comma to affiliateInfo config in configurator | fragosti | 2018-12-06 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1398 from 0xProject/feature/instant/more-error-reporting | Steve Klebanoff | 2018-12-06 | 1 | -5/+2 |
|\ \ | | | | | | | [instant] More aggressive error reporting | ||||
| * | | feat(instant): More aggressive error reporting | Steve Klebanoff | 2018-12-06 | 1 | -5/+2 |
|/ / | |||||
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-12-06 | 2 | -31/+43 |
|\ \ | | | | | | | | | | development | ||||
| * | | Fix/pipeline/ohlcv (#1393) | Xianny | 2018-12-06 | 2 | -31/+43 |
| | | | | | | | | | The OHLCV script in data pipeline quits early when we get no data from Crypto Compare. Sometimes Crypto Compare gives us a valid empty response (e.g. when we query for way back in time) and we need to just continue. This adds better filtering for the types of Crypto Compare responses to detect when we should continue and when we should really quit. | ||||
* | | | fix: remove target=_blank from instant link | fragosti | 2018-12-06 | 2 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1369 from 0xProject/feature/website/instant-configurator | Francesco Agosti | 2018-12-06 | 21 | -176/+1449 |
|\ \ | | | | | | | [website][instant] Instant configurator | ||||
| * | | feat: change New notification to point to instant | fragosti | 2018-12-06 | 1 | -2/+2 |
| | | | |||||
| * | | chore: run prettier | fragosti | 2018-12-06 | 1 | -6/+1 |
| | | | |||||
| * | | fix: ensure copy button is above code | fragosti | 2018-12-06 | 1 | -1/+2 |
| | | | |||||
| * | | feat: notify user they've copied to clipboard on copy | fragosti | 2018-12-06 | 1 | -14/+29 |
| | | | |||||
| * | | chore: make default fee percentage in configurator 0 | fragosti | 2018-12-06 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-12-06 | 280 | -607/+6484 |
| |\ \ | | | | | | | | | | | | | feature/website/instant-configurator | ||||
| * | | | chore: run linter | fragosti | 2018-12-05 | 2 | -2/+1 |
| | | | | |||||
| * | | | feat: add copy code feature | fragosti | 2018-12-05 | 2 | -3/+18 |
| | | | | |||||
| * | | | fix: instant linting issues | fragosti | 2018-12-05 | 1 | -4/+0 |
| | | | | |||||
| * | | | chore: fix linter issues | fragosti | 2018-12-05 | 3 | -12/+3 |
| | | | | |||||
| * | | | chore: remove shark relay from possible SRA endpoints | fragosti | 2018-12-05 | 1 | -5/+1 |
| | | | | |||||
| * | | | hack: make min-height of line-number container 98% to prevent scrollbar from ↵ | fragosti | 2018-12-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | appearing in code demo | ||||
| * | | | fix: use WebsitePaths type and update wiki link to new link | fragosti | 2018-12-05 | 5 | -11/+16 |
| | | | | |||||
| * | | | fix: reset available tokens when sra endpoint is changed | fragosti | 2018-12-05 | 2 | -3/+8 |
| | | | | |||||
| * | | | fix: make select box-shadow darker | fragosti | 2018-12-05 | 1 | -2/+4 |
| | | | | |||||
| * | | | fix: do not show select all if no tokens are available | fragosti | 2018-12-05 | 1 | -0/+5 |
| | | | | |||||
| * | | | feat: update configurator snippet to actually work if copy and pasted | fragosti | 2018-12-05 | 1 | -17/+23 |
| | | | | |||||
| * | | | fix: change liquiditySource to orderSource | fragosti | 2018-12-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-12-04 | 19 | -14/+744 |
| |\ \ \ | | | | | | | | | | | | | | | | feature/website/instant-configurator | ||||
| * | | | | feat: update relayer list | fragosti | 2018-12-04 | 1 | -1/+19 |
| | | | | | |||||
| * | | | | polish: make configurator inputs look more like mocks | fragosti | 2018-12-04 | 3 | -3/+6 |
| | | | | | |||||
| * | | | | feat: fetch asset meta data from the asset meta data map | fragosti | 2018-12-04 | 1 | -31/+23 |
| | | | | | |||||
| * | | | | fix: address to lowercase and explore the docs leads to correct wiki | fragosti | 2018-12-04 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | feat: create more dank slider | fragosti | 2018-12-04 | 4 | -13/+199 |
| | | | | | |||||
| * | | | | feat: make (optional) label inline | fragosti | 2018-12-04 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-12-04 | 0 | -0/+0 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | feature/website/instant-configurator | ||||
| * \ \ \ \ | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-12-04 | 264 | -1061/+7795 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | feature/website/instant-configurator | ||||
| * | | | | | | feat: add fee percentage slider | fragosti | 2018-12-04 | 4 | -31/+44 |
| | | | | | | | |||||
| * | | | | | | feat: add fee percentage slier | fragosti | 2018-12-04 | 3 | -2/+30 |
| | | | | | | | |||||
| * | | | | | | feat: implement basic feeRecipient address in config generator | fragosti | 2018-12-04 | 4 | -11/+96 |
| | | | | | | | |||||
| * | | | | | | fix: use correct styles even when syntax highlighter component removes ↵ | fragosti | 2018-12-01 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | classnames on second render | ||||
| * | | | | | | feat: implement code generation | fragosti | 2018-12-01 | 3 | -27/+49 |
| | | | | | | | |||||
| * | | | | | | feat: implement multi token select component | fragosti | 2018-12-01 | 8 | -46/+156 |
| | | | | | | | |||||
| * | | | | | | feat: implement available token fetching | fragosti | 2018-11-30 | 3 | -6/+116 |
| | | | | | | | |||||
| * | | | | | | feat: add MultiSelect component skeleton | fragosti | 2018-11-30 | 2 | -1/+80 |
| | | | | | | | |||||
| * | | | | | | feat: add Select component and use for configurator | fragosti | 2018-11-30 | 7 | -31/+285 |
| | | | | | | | |||||
| * | | | | | | feat: move instant base config to types file | fragosti | 2018-11-30 | 2 | -18/+19 |
| | | | | | | | |||||
| * | | | | | | feat: implement configurator layout | fragosti | 2018-11-30 | 2 | -4/+29 |
| | | | | | | | |||||
| * | | | | | | feat: factor out ActionLink component from features | fragosti | 2018-11-30 | 2 | -37/+54 |
| | | | | | | | |||||
| * | | | | | | feat: improve styling of code demo component | fragosti | 2018-11-30 | 2 | -12/+126 |
| | | | | | | | |||||
| * | | | | | | feat: have basic code syntax highlighting working | fragosti | 2018-11-30 | 6 | -95/+308 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1389 from 0xProject/fix/instant-rollbar-localhost | Steve Klebanoff | 2018-12-06 | 4 | -14/+27 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [instant] Don't report localhost errors to Rollbar | ||||
| * | | | | | | | Takeout console.log | Steve Klebanoff | 2018-12-06 | 1 | -1/+0 |
| | | | | | | | | |||||
| * | | | | | | | Only include localhost in host domains if in development mode | Steve Klebanoff | 2018-12-06 | 3 | -9/+26 |
| | | | | | | | | |||||
| * | | | | | | | Use dotenv in development | Steve Klebanoff | 2018-12-06 | 1 | -5/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1392 from 0xProject/fix/instant/pre-release-hotfixes | Francesco Agosti | 2018-12-06 | 4 | -5/+10 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | [instant] CSS leakage and non-lowercase defaultAssetData fix | ||||
| * | | | | | | | feat: lowercase keys in additionalAssetMetaDataMap | fragosti | 2018-12-06 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | chore: add coingecko css example to externall.css | fragosti | 2018-12-06 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | fix: call toLowerCase in asset creation logic | fragosti | 2018-12-06 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | fix: input placeholder css specificity increase | fragosti | 2018-12-06 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Fix RadarRelay timestamps (#1391) | Alex Browne | 2018-12-06 | 2 | -4/+8 |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixing rr timestamps * Apply prettier | ||||
* | | | | | | | Merge pull request #1377 from 0xProject/feature/pipeline-cleanup-mega-rebase | Alex Browne | 2018-12-06 | 91 | -54/+4691 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Merge all pipeline code into development | ||||
| * | | | | | | Change type of transactions.gas_used and gas_price to BigNumber/numeric | Alex Browne | 2018-12-05 | 4 | -9/+31 |
| | | | | | | | |||||
| * | | | | | | Fix prettier | Alex Browne | 2018-12-05 | 2 | -25/+18 |
| | | | | | | | |||||
| * | | | | | | Address PR feedback | Alex Browne | 2018-12-05 | 21 | -81/+96 |
| | | | | | | | |||||
| * | | | | | | Use a string template in packages/pipeline/src/scripts/pull_missing_events.ts | Fabio B | 2018-12-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: albrow <stephenalexbrowne@gmail.com> | ||||
| * | | | | | | Fix typo in packages/pipeline/src/parsers/bloxy/index.ts | Fabio B | 2018-12-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: albrow <stephenalexbrowne@gmail.com> | ||||
| * | | | | | | Fix linter | Alex Browne | 2018-12-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | pull OHLCV records from Crypto Compare (#1349) | Xianny | 2018-12-05 | 13 | -17/+500 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [WIP] pull OHLCV records from Crypto Compare * lint * refactor to pull logic out of script and into modules * add entity test for ohlcv_external entity * implement rate limit and chronological backfill for ohlcv * add unit tests; cleanup variable names * Fetch OHLCV pairs params from events table * better method names * fix outdated test * lint * Clean up after review * oops * fix failing test * better filtering of most recent records * fix bug when generating pairs * fix default earliest backfill date * fix bug with retrieving backfill time * prettier | ||||
| * | | | | | | Token_orderbook_snapshots for Ddex and Paradex(#1354) | zkao | 2018-12-05 | 14 | -0/+669 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implements the TokenOrderbookSnapshot Table * Scripts, Data Sources and Entities to pull Ddex and Paradex API data. | ||||
| * | | | | | | Add script for parsing competing dex trades from Bloxy (#1355) | Alex Browne | 2018-12-05 | 9 | -4/+498 |
| | | | | | | | |||||
| * | | | | | | Introduce framework for running basic tests for entities (#1344) | Alex Browne | 2018-12-05 | 27 | -54/+766 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduce framework for running basic tests for entities * Add pipeline tests to CircleCI config * Make pipeline tests more configurable and fix CircleCI config * Add coverage dir to pipeline package * Add basic tests for all exchange event entities * Add tests for remaining entities * Create separate test scripts in package.json and add new info to README * Update db_setup.ts to revert migrations even if you are using docker * Automatically pull the postgres image if needed * Add comment about why NumberToBigIntTransformer is needed | ||||
| * | | | | | | [pipeline] Add additional documentation to the README (#1328) | Alex Browne | 2018-12-05 | 1 | -0/+113 |
| | | | | | | | |||||
| * | | | | | | Reduce number of blocks per query in pull_missing_events | Alex Browne | 2018-12-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | updating comment for 0x trusted tokens | Jake Ellowitz | 2018-12-05 | 4 | -13/+8 |
| | | | | | | | |||||
| * | | | | | | metadata and trusted sources in same raw table | Jake Ellowitz | 2018-12-05 | 10 | -55/+75 |
| | | | | | | | |||||
| * | | | | | | Pull token metadata re trusted tokens | Jake Ellowitz | 2018-12-05 | 12 | -2/+208 |
| | | | | | | | |||||
| * | | | | | | Add script for pulling missing block data | Alex Browne | 2018-12-05 | 5 | -4/+95 |
| | | | | | | | |||||
| * | | | | | | Check for special characters in table name in pull_missing_events | Alex Browne | 2018-12-05 | 1 | -3/+7 |
| | | | | | | | |||||
| * | | | | | | Add support for pulling Cancel and CancelUpTo events | Alex Browne | 2018-12-05 | 6 | -90/+170 |
| | | | | | | | |||||
| * | | | | | | Add transactionHash to CancelUpToEvent and CancelEvent entities | Alex Browne | 2018-12-05 | 3 | -1/+6 |
| | | | | | | | |||||
| * | | | | | | Optimize database operations in pull_missing_events script | Alex Browne | 2018-12-05 | 1 | -9/+26 |
| | | | | | | | |||||
| * | | | | | | Add homepage_url to relayers | Alex Browne | 2018-12-05 | 3 | -7/+22 |
| | | | | | | | |||||
| * | | | | | | Add workaround for broken save method | Alex Browne | 2018-12-05 | 2 | -2/+22 |
| | | | | | | | |||||
| * | | | | | | Fix chunk size in pull_missing_events | Alex Browne | 2018-12-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Use built-in chunk feature of TypeORM save method | Alex Browne | 2018-12-05 | 1 | -7/+2 |
| | | | | | | | |||||
| * | | | | | | Change some column types from varchar to numeric | Alex Browne | 2018-12-05 | 11 | -46/+121 |
| | | | | | | | |||||
| * | | | | | | Add raw schema prefix to query in pull_missing_events | Alex Browne | 2018-12-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Rename taker and maker amounts in sra_orders | Alex Browne | 2018-12-05 | 2 | -2/+15 |
| | | | | | | | |||||
| * | | | | | | Implement scraping sra orders from radar relay | Alex Browne | 2018-12-05 | 7 | -24/+52 |
| | | | | | | | |||||
| * | | | | | | Preliminary work for adding RR order book scraping | Alex Browne | 2018-12-05 | 1 | -0/+52 |
| | | | | | | | |||||
| * | | | | | | Update schema for sra_orders | Alex Browne | 2018-12-05 | 2 | -6/+49 |
| | | | | | | | |||||
| * | | | | | | Pointing entities to raw schema | Jake Ellowitz | 2018-12-05 | 10 | -132/+129 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix linter issues | ||||
| * | | | | | | Mapping dev schema to initial migration | Jake Ellowitz | 2018-12-05 | 4 | -1/+208 |
| | | | | | | | |||||
| * | | | | | | Configure linter with --format stylish and fix linter errors | Alex Browne | 2018-12-05 | 12 | -7/+81 |
| | | | | | | | |||||
| * | | | | | | Configure TypeORM for migrations. Add new package.json scripts. | Alex Browne | 2018-12-05 | 6 | -30/+21 |
| | | | | | | | |||||
| * | | | | | | Rename Transaction.ts to transaction.ts | Alex Browne | 2018-12-05 | 3 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Relayer.ts to relayer.ts Rename Block.ts to block.ts | ||||
| * | | | | | | Add better error handling for immediately invoked async functions | Alex Browne | 2018-12-05 | 4 | -85/+20 |
| | | | | | | | |||||
| * | | | | | | Rename table and column names | Alex Browne | 2018-12-05 | 10 | -98/+172 |
| | | | | | | | |||||
| * | | | | | | Reorganize entities. Make scripts work from any directory. | Alex Browne | 2018-12-05 | 15 | -14/+38 |
| | | | | | | | |||||
| * | | | | | | Split index.ts into multiple scripts in scripts/ and detect last known block ↵ | Alex Browne | 2018-12-05 | 4 | -92/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | when pulling events | ||||
| * | | | | | | Remove unused function parameter in index.ts script | Alex Browne | 2018-12-05 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Use bigint for gasUsed and gasPrice in Transaction | Alex Browne | 2018-12-05 | 2 | -5/+7 |
| | | | | | | | |||||
| * | | | | | | Update relayer code to use new relayer-registry format | Alex Browne | 2018-12-05 | 4 | -6/+14 |
| | | | | | | | |||||
| * | | | | | | Remove outdated info from README | Alex Browne | 2018-12-05 | 1 | -21/+0 |
| | | | | | | | |||||
| * | | | | | | Add build:ci to pipeline package.json | Alex Browne | 2018-12-05 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Implement fetching and parsing relayer info | Alex Browne | 2018-12-05 | 6 | -7/+114 |
| | | | | | | | |||||
| * | | | | | | Implement support for getting and parsing blocks and transactions | Alex Browne | 2018-12-05 | 5 | -0/+149 |
| | | | | | | | |||||
| * | | | | | | chore: Fix tslint config. | Alex Browne | 2018-12-05 | 2 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Fix bugs in merge_v2_events script and disable verbose logging | Alex Browne | 2018-12-05 | 2 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | Enable verbose logging | Alex Browne | 2018-12-05 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Rename index.ts -> merge_v2_events | Alex Browne | 2018-12-05 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | Update script to work with existing v1 pipeline data | Alex Browne | 2018-12-05 | 11 | -40/+155 |
| | | | | | | | |||||
| * | | | | | | Update pipeline to use new @0x npm org for imports | Alex Browne | 2018-12-05 | 7 | -16/+16 |
| | | | | | | | |||||
| * | | | | | | Update to use ContractWrappers + Infura instead of Etherscan | Alex Browne | 2018-12-05 | 11 | -600/+138 |
| | | | | | | | |||||
| * | | | | | | Rebase and update to use new modularized artifacts | Alex Browne | 2018-12-05 | 6 | -2289/+8 |
| | | | | | | | |||||
| * | | | | | | Add tests for SRA order conversion | Alex Browne | 2018-12-05 | 3 | -4/+83 |
| | | | | | | | |||||
| * | | | | | | Re-add missing tests | Alex Browne | 2018-12-05 | 3 | -90/+164 |
| | | | | | | | |||||
| * | | | | | | Add soruceUrl to SraOrder entity | Alex Browne | 2018-12-05 | 2 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | Add preliminary support for scraping orders from SRA endpoints (no ↵ | Alex Browne | 2018-12-05 | 9 | -30/+255 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | pagination, only RR support for now) | ||||
| * | | | | | | For event entities, rename address -> contractAddress and make it a primary key | Alex Browne | 2018-12-05 | 5 | -11/+19 |
| | | | | | | | |||||
| * | | | | | | Implement scraping and parsing exchange CancelUpTo events | Alex Browne | 2018-12-05 | 3 | -9/+45 |
| | | | | | | | |||||
| * | | | | | | Use multi-primary keys for event and filter null logIndexes | Alex Browne | 2018-12-05 | 4 | -6/+15 |
| | | | | | | | |||||
| * | | | | | | Implement scraping and parsing exchange cancel events | Alex Browne | 2018-12-05 | 5 | -10/+81 |
| | | | | | | | |||||
| * | | | | | | Make event parsing more functional and less class-based | Alex Browne | 2018-12-05 | 3 | -65/+21 |
| | | | | | | | |||||
| * | | | | | | Re-organize event parsing and decoding | Alex Browne | 2018-12-05 | 7 | -175/+206 |
| | | | | | | | |||||
| * | | | | | | Add support for decoding asset data | Alex Browne | 2018-12-05 | 6 | -39/+97 |
| | | | | | | | |||||
| * | | | | | | Add typeorm and begin inserting database records | Alex Browne | 2018-12-05 | 8 | -22/+166 |
| | | | | | | | |||||
| * | | | | | | Make contractAbi a parameter of getContractEventsAsync | Alex Browne | 2018-12-05 | 4 | -11/+29 |
| | | | | | | | |||||
| * | | | | | | Add tests for etherscan events | Alex Browne | 2018-12-05 | 6 | -11/+125 |
| | | | | | | | |||||
| * | | | | | | Restructure pipeline package. Create data-sources dir | Alex Browne | 2018-12-05 | 4 | -75/+96 |
| | | | | | | | |||||
| * | | | | | | Remove old code. Create function for getting contract events via etherscan | Alex Browne | 2018-12-05 | 26 | -2529/+2634 |
| | | | | | | | |||||
| * | | | | | | Rebase pipeline branch off development | Alex Browne | 2018-12-05 | 26 | -67/+2666 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1387 from 0xProject/switchRocketChatForDiscord | Fabio B | 2018-12-05 | 9 | -16/+16 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Switch all website links from RocketChat for Discord | ||||
| * | | | | | | Replace Rocket.chat with Discord | Fabio Berger | 2018-12-05 | 9 | -14/+14 |
| | | | | | | | |||||
| * | | | | | | Fix mixed up chinese translations | Fabio Berger | 2018-12-05 | 1 | -3/+3 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1384 from 0xProject/feature/contracts-monorepo-3 | Leonid Logvinov | 2018-12-05 | 50 | -56/+332 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Contracts monorepo 4 feat | ||||
| * \ \ \ \ \ | Merge pull request #1374 from 0xProject/feature/contracts-monorepo-4 | Leonid Logvinov | 2018-12-05 | 50 | -56/+332 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Contracts monorepo 4 | ||||
| | * | | | | | | De-nest libs contracts | Leonid Logvinov | 2018-12-05 | 31 | -50/+50 |
| | | | | | | | | |||||
| | * | | | | | | Enable libs tests on CI | Leonid Logvinov | 2018-12-04 | 1 | -0/+2 |
| | | | | | | | | |||||
| | * | | | | | | Import TestLibs contract from @0x/contracts-libs | Leonid Logvinov | 2018-12-04 | 1 | -2/+1 |
| | | | | | | | | |||||
| | * | | | | | | Refactor out libs into @0x/contracts-libs | Leonid Logvinov | 2018-12-04 | 49 | -51/+326 |
| |/ / / / / / | |||||
* | | | | | | | chore: Remove increaseTimeAsync from DutchAuction. | Jacob Evans | 2018-12-05 | 1 | -39/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dutch auctions can be made in the past so we do not need to artificially increase time | ||||
* | | | | | | | Merge pull request #1382 from 0xProject/fix/instant/center-powered-by | Steve Klebanoff | 2018-12-05 | 4 | -7/+11 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [instant] Center powered by and change to text to Connect | ||||
| * | | | | | | | Wallet prompt tweaks per Chris's comment | Steve Klebanoff | 2018-12-05 | 3 | -6/+10 |
| | | | | | | | | |||||
| * | | | | | | | Please unlock -> Click to connect | Steve Klebanoff | 2018-12-05 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | fix(instant): center powered by 0x svg | Steve Klebanoff | 2018-12-05 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1379 from 0xProject/fix/instant/overlay-color | Brandon Millman | 2018-12-05 | 3 | -3/+10 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [instant] add stable class name to overlay close button and adjust overlay color | ||||
| * | | | | | | | | fix(instant): remove extra container around the button | Brandon Millman | 2018-12-05 | 1 | -11/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | feat(instant): give a stable class name to the close button on the overlay | Brandon Millman | 2018-12-05 | 2 | -9/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | fix(instant): lighten the overlay color to 0.7 opacity from 0.9 | Brandon Millman | 2018-12-05 | 1 | -1/+1 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #1381 from 0xProject/feature/magic-input-error | Steve Klebanoff | 2018-12-05 | 5 | -8/+23 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [instant] Magic input to trigger error for production Rollbar testing | ||||
| * | | | | | | | | Use git sha and npm version from constants | Steve Klebanoff | 2018-12-05 | 1 | -3/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | Add GIT_SHA and NPM_VERSION constants, report git and npm version in error | Steve Klebanoff | 2018-12-05 | 4 | -8/+11 |
| | | | | | | | | | |||||
| * | | | | | | | | feat(instant): input to trigger error for rollbar testing | Steve Klebanoff | 2018-12-05 | 2 | -0/+6 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #1371 from ↵ | Steve Klebanoff | 2018-12-05 | 3 | -5/+19 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/instant/log-decimals-and-add-event-properties feat(instant): More event properties for tracking | ||||
| * | | | | | | | | ethBalanceInUnitAmount -> lastEthBalanceInUnitAmount | Steve Klebanoff | 2018-12-05 | 3 | -2/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | feat(instant): Add eth balance, eth address, token symbol and decimals to ↵ | Steve Klebanoff | 2018-12-04 | 2 | -4/+18 |
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | event properties | ||||
* | | | | | | | | Merge pull request #1380 from 0xProject/instant/fix/heap-analytics-id-prod | Steve Klebanoff | 2018-12-05 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | [instant] Ensure build process receives build arguments | ||||
| * | | | | | | | Ensure build process receives build arguments | Steve Klebanoff | 2018-12-05 | 3 | -3/+3 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | See https://github.com/entropitor/dotenv-cli/issues/8 | ||||
* | | | | | | | Merge pull request #1376 from 0xProject/feature/instant/padding-spacing-polish | Francesco Agosti | 2018-12-05 | 4 | -4/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | [instant] Reduce vertical padding in instant | ||||
| * | | | | | | polish: reduce vertical padding in instant | fragosti | 2018-12-05 | 4 | -4/+4 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1373 from 0xProject/feature/contracts-monorepo-3 | Leonid Logvinov | 2018-12-05 | 50 | -55/+337 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | Contracts monorepo III | ||||
| * | | | | | Add missing dependency | Leonid Logvinov | 2018-12-04 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Fix homepage link | Leonid Logvinov | 2018-12-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Enable contract utils tests | Leonid Logvinov | 2018-12-04 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Refactor @0x/contracts-utils from @0x/contracts-core | Leonid Logvinov | 2018-12-04 | 49 | -55/+334 |
|/ / / / / | |||||
* | | | | | Merge pull request #1311 from 0xProject/feature/contracts-monorepo-2 | Leonid Logvinov | 2018-12-04 | 95 | -359/+1036 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Contracts monorepo II | ||||
| * | | | | Fix calldata related linter errors | Leonid Logvinov | 2018-12-04 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | Add missing dependency | Leonid Logvinov | 2018-12-04 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fix merge conflict | Leonid Logvinov | 2018-12-04 | 1 | -7/+12 |
| | | | | | |||||
| * | | | | Merge branch 'development' into feature/contracts-monorepo-2 | Leonid Logvinov | 2018-12-04 | 69 | -84/+1752 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #1225 from 0xProject/feature/contracts/dutch-auction | Jacob Evans | 2018-12-04 | 10 | -1/+708 |
|\ \ \ \ \ | | | | | | | | | | | | | Implement Basic Dutch Auction | ||||
| * | | | | | chore: Move to new structure | Jacob Evans | 2018-12-04 | 2 | -0/+0 |
| | | | | | | |||||
| * | | | | | chore: SafeMath and if statement in getAuctionDetails | Jacob Evans | 2018-12-04 | 1 | -10/+18 |
| | | | | | | |||||
| * | | | | | chore: Add RevertReasons for DutchAuction. Test revert reasons | Jacob Evans | 2018-12-04 | 4 | -14/+51 |
| | | | | | | |||||
| * | | | | | chore: Use SafeMath where possible | Jacob Evans | 2018-12-04 | 1 | -15/+34 |
| | | | | | | |||||
| * | | | | | chore: Clean up documentation | Jacob Evans | 2018-12-04 | 2 | -30/+58 |
| | | | | | | |||||
| * | | | | | chore: Work around for Ganache timestamp bug | Jacob Evans | 2018-12-04 | 1 | -17/+14 |
| | | | | | | |||||
| * | | | | | chore: Return excess to buyer | Jacob Evans | 2018-12-04 | 2 | -29/+58 |
| | | | | | | |||||
| * | | | | | chore: update documentation | Jacob Evans | 2018-12-04 | 2 | -14/+25 |
| | | | | | | |||||
| * | | | | | chore: taker address and zrx fee test | Jacob Evans | 2018-12-04 | 1 | -1/+46 |
| | | | | | | |||||
| * | | | | | chore: Rename price to amount. Encode parameters in makerAssetData | Jacob Evans | 2018-12-04 | 2 | -134/+149 |
| | | | | | |