aboutsummaryrefslogtreecommitdiffstats
path: root/packages/asset-buyer
Commit message (Collapse)AuthorAgeFilesLines
* chore(asset-buyer): fix lint errorsBrandon Millman2018-10-241-3/+3
|
* feat(asset-buyer): update buyQuoteCalculator to match rounding behavior in ↵Brandon Millman2018-10-247-69/+155
| | | | contracts
* feat(asset-buyer): throw SignatureRequestDenied and TransactionValueTooLow ↵Brandon Millman2018-10-243-16/+33
| | | | errors when executing buy
* Publishethereum-types@1.1.1contracts@2.1.50@0x/website@0.0.55@0x/web3-wrapper@3.1.0@0x/utils@2.0.3@0x/typescript-typings@3.0.3@0x/types@1.2.0@0x/tslint-config@1.0.9@0x/testnet-faucets@1.0.52@0x/subproviders@2.1.0@0x/sra-spec@1.0.7@0x/sol-resolver@1.0.15@0x/sol-doc@1.0.3@0x/sol-cov@2.1.8@0x/sol-compiler@1.1.8@0x/react-shared@1.0.17@0x/react-docs@1.0.14@0x/order-watcher@2.2.0@0x/order-utils@2.0.0@0x/monorepo-scripts@1.0.12@0x/migrations@2.0.0@0x/metacoin@0.0.24@0x/json-schemas@2.0.0@0x/instant@0.0.3@0x/fill-scenarios@1.0.8@0x/dev-utils@1.0.13@0x/dev-tools-pages@0.0.2@0x/contract-wrappers@3.0.0@0x/contract-artifacts@1.0.1@0x/contract-addresses@1.0.1@0x/connect@3.0.2@0x/base-contract@3.0.2@0x/asset-buyer@2.1.0@0x/assert@1.0.14@0x/abi-gen@1.0.14@0x/abi-gen-wrappers@1.0.10x.js@2.0.0Leonid Logvinov2018-10-181-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@2.0.0 - @0x/abi-gen@1.0.14 - @0x/abi-gen-wrappers@1.0.1 - @0x/assert@1.0.14 - @0x/asset-buyer@2.1.0 - @0x/base-contract@3.0.2 - @0x/connect@3.0.2 - @0x/contract-addresses@1.0.1 - @0x/contract-artifacts@1.0.1 - @0x/contract-wrappers@3.0.0 - contracts@2.1.50 - @0x/dev-tools-pages@0.0.2 - @0x/dev-utils@1.0.13 - ethereum-types@1.1.1 - @0x/fill-scenarios@1.0.8 - @0x/instant@0.0.3 - @0x/json-schemas@2.0.0 - @0x/metacoin@0.0.24 - @0x/migrations@2.0.0 - @0x/monorepo-scripts@1.0.12 - @0x/order-utils@2.0.0 - @0x/order-watcher@2.2.0 - @0x/react-docs@1.0.14 - @0x/react-shared@1.0.17 - @0x/sol-compiler@1.1.8 - @0x/sol-cov@2.1.8 - @0x/sol-doc@1.0.3 - @0x/sol-resolver@1.0.15 - @0x/sra-spec@1.0.7 - @0x/subproviders@2.1.0 - @0x/testnet-faucets@1.0.52 - @0x/tslint-config@1.0.9 - @0x/types@1.2.0 - @0x/typescript-typings@3.0.3 - @0x/utils@2.0.3 - @0x/web3-wrapper@3.1.0 - @0x/website@0.0.55
* Updated CHANGELOGSLeonid Logvinov2018-10-182-1/+11
|
* Fix ethereum-types versionsLeonid Logvinov2018-10-181-1/+1
|
* chore: change README.md from 0xproject to 0xJacob Evans2018-10-181-7/+7
|
* chore: change tslint.json from 0xproject to 0xJacob Evans2018-10-181-1/+1
|
* chore: change package org from 0xproject to 0xJacob Evans2018-10-1813-43/+43
|
* Merge pull request #1145 from 0xProject/refactorSchemasToJSONKadinsky2018-10-181-1/+1
|\ | | | | Move json-schema schemas to JSON files
| * chore: Update TypeDoc to 0.13.0 (supports TS v3.1)Fabio Berger2018-10-171-1/+1
| |
* | Fix duplicate BuyQuoteInfoBrandon Millman2018-10-181-1/+0
| |
* | Merge branch 'development' into feature/website/asset-buyer-docsBrandon Millman2018-10-182-0/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (31 commits) Update CODEOWNERS Update CODEOWNERS Update CODEOWNERS Add leo to CODEOWNERS on some packages fix(monorepo-scripts): Format date as UTC not local time. Bump max bundle size for instant fix: dont use enum string as type as typedoc gets confused feat: export AssetData from order-utils feat: export AssetData from utils chore: temporarily increase the bundle size for instant Remove order-utils from dependencies Run tests on circle CI Add tests for format and use toFixed instead of round for usd Remove expiry buffer seconds option from AssetBuyer init Add ts-optchain and use it instead of lodash get Hide USD price when ETH-USD price is not available Rename OrderDetailsRow to EthAmountRow fix: add Steve's github account to about page, and capitalize AppFolio correctly Put boundNoop in a util file Add tnxHash to buy button callbacks ...
| * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-10-174-25/+13
| |\ | | | | | | | | | feature/instant/move-features-over-from-zrx-buyer
| * | feat: add changelog entries for changed packagesfragosti2018-10-161-0/+4
| | |
| * | fix: export BuyQuoteInfo from asset-buyerfragosti2018-10-121-0/+1
| | |
* | | feat(asset-buyer): add missing types to public interfaceBrandon Millman2018-10-172-1/+12
| | |
* | | feat(asset-buyer): add hooks for documentationBrandon Millman2018-10-172-1/+10
| |/ |/|
* | Update CHANGELOG.json for all changed packagesAlex Browne2018-10-161-0/+5
| |
* | Apply various PR feedbackAlex Browne2018-10-162-3/+0
| |
* | Introduce new contract-addresses package and use it everywhereAlex Browne2018-10-162-11/+3
| |
* | Remove unused copyfiles dependenciesAlex Browne2018-10-161-1/+0
| |
* | update asset-buyer to use new artifacts and abi-gen wrappers packagesAlex Browne2018-10-163-24/+19
|/
* Update the CHANGELOGBrandon Millman2018-10-101-0/+8
|
* Add comments for expiryBufferBrandon Millman2018-10-102-2/+2
|
* Fix incorrect affiliate fee calculations and associated testsBrandon Millman2018-10-062-14/+20
|
* Increase default expiryBufferSeconds from 15 to 300 (5 minutes)Brandon Millman2018-10-061-1/+1
|
* Add comments for gasPrice and gasLimitBrandon Millman2018-10-061-0/+2
|
* Fix order expiration calc bug and expose gas options to executeBuyQuotefragosti2018-10-063-2/+8
|
* Publishethereum-types@1.0.11contracts@2.1.49@0xproject/website@0.0.54@0xproject/web3-wrapper@3.0.3@0xproject/utils@2.0.2@0xproject/typescript-typings@3.0.2@0xproject/types@1.1.4@0xproject/tslint-config@1.0.8@0xproject/testnet-faucets@1.0.51@0xproject/subproviders@2.0.7@0xproject/sra-spec@1.0.6@0xproject/sra-report@1.0.13@0xproject/sol-resolver@1.0.14@0xproject/sol-doc@1.0.2@0xproject/sol-cov@2.1.7@0xproject/sol-compiler@1.1.7@0xproject/react-shared@1.0.15@0xproject/react-docs@1.0.13@0xproject/order-watcher@2.1.1@0xproject/order-utils@1.0.7@0xproject/monorepo-scripts@1.0.11@0xproject/migrations@1.0.14@0xproject/metacoin@0.0.23@0xproject/json-schemas@1.0.7@0xproject/instant@0.0.2@0xproject/fill-scenarios@1.0.7@0xproject/dev-utils@1.0.12@0xproject/contract-wrappers@2.0.2@0xproject/connect@3.0.1@0xproject/base-contract@3.0.1@0xproject/asset-buyer@2.0.0@0xproject/assert@1.0.13@0xproject/abi-gen@1.0.130x.js@1.0.8Brandon Millman2018-10-051-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.8 - @0xproject/abi-gen@1.0.13 - @0xproject/assert@1.0.13 - @0xproject/asset-buyer@2.0.0 - @0xproject/base-contract@3.0.1 - @0xproject/connect@3.0.1 - @0xproject/contract-wrappers@2.0.2 - contracts@2.1.49 - @0xproject/dev-utils@1.0.12 - ethereum-types@1.0.11 - @0xproject/fill-scenarios@1.0.7 - @0xproject/instant@0.0.2 - @0xproject/json-schemas@1.0.7 - @0xproject/metacoin@0.0.23 - @0xproject/migrations@1.0.14 - @0xproject/monorepo-scripts@1.0.11 - @0xproject/order-utils@1.0.7 - @0xproject/order-watcher@2.1.1 - @0xproject/react-docs@1.0.13 - @0xproject/react-shared@1.0.15 - @0xproject/sol-compiler@1.1.7 - @0xproject/sol-cov@2.1.7 - @0xproject/sol-doc@1.0.2 - @0xproject/sol-resolver@1.0.14 - @0xproject/sra-report@1.0.13 - @0xproject/sra-spec@1.0.6 - @0xproject/subproviders@2.0.7 - @0xproject/testnet-faucets@1.0.51 - @0xproject/tslint-config@1.0.8 - @0xproject/types@1.1.4 - @0xproject/typescript-typings@3.0.2 - @0xproject/utils@2.0.2 - @0xproject/web3-wrapper@3.0.3 - @0xproject/website@0.0.54
* Updated CHANGELOGSBrandon Millman2018-10-052-1/+7
|
* Update BuyQuote interfaceBrandon Millman2018-10-055-40/+73
|
* Add missing default optionsBrandon Millman2018-10-041-3/+6
|
* Remove unused constantsBrandon Millman2018-10-041-3/+0
|
* Add fee order with a takerFeeBrandon Millman2018-10-041-2/+6
|
* Add additional order factory methods and refactor test to use themBrandon Millman2018-10-041-60/+23
|
* Add comments about buy quote calculationBrandon Millman2018-10-041-0/+2
|
* Update CHANGELOGBrandon Millman2018-10-041-0/+4
|
* Fix linterBrandon Millman2018-10-041-2/+0
|
* Add additional test for slippageBrandon Millman2018-10-042-18/+70
|
* Add buy_quote_calculator_testBrandon Millman2018-10-042-31/+246
|
* Update READMEBrandon Millman2018-10-031-14/+0
|
* Fix linter errorsBrandon Millman2018-10-031-1/+1
|
* Merge branch 'development' into feature/asset-buyer/improve-asset-buyer-managerBrandon Millman2018-10-033-13/+53
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (178 commits) Change cache key back to repo from repo-built Change the lint command back Merge build & install Remove deps cache all together Cache all nested node_modules directories Explicitly specify yarn cache folder Ignore linter issues Fix linter issue Separate deps and built caches Build tslint rules before running linter Cache yarn cache directory without node modules Run linter before prettier as it fails more often Add yarn cache path Split CI install and build steps Move bundle-size out of static tests and don't wait for a build with static tests Introduce a build:ci command that doesn't build webpack bundles Measure only one bundle size as they're the same Fix linter errors Fix no_website CI builds Check bundle size on CI ...
| * Introduce a build:ci command that doesn't build webpack bundlesLeonid Logvinov2018-10-021-0/+1
| |
| * Updated CHANGELOGSLeonid Logvinov2018-10-022-0/+13
| |
| * Publishethereum-types@1.0.9contracts@2.1.48@0xproject/website@0.0.53@0xproject/web3-wrapper@3.0.2@0xproject/utils@2.0.0@0xproject/typescript-typings@3.0.0@0xproject/types@1.1.2@0xproject/testnet-faucets@1.0.50@0xproject/subproviders@2.0.6@0xproject/sra-spec@1.0.5@0xproject/sra-report@1.0.12@0xproject/sol-resolver@1.0.12@0xproject/sol-doc@1.0.1@0xproject/sol-cov@2.1.6@0xproject/sol-compiler@1.1.6@0xproject/react-shared@1.0.13@0xproject/react-docs@1.0.12@0xproject/order-watcher@2.1.0@0xproject/order-utils@1.0.6@0xproject/monorepo-scripts@1.0.10@0xproject/migrations@1.0.13@0xproject/metacoin@0.0.22@0xproject/json-schemas@1.0.5@0xproject/fill-scenarios@1.0.6@0xproject/dev-utils@1.0.11@0xproject/contract-wrappers@2.0.1@0xproject/connect@3.0.0@0xproject/base-contract@3.0.0@0xproject/asset-buyer@1.0.2@0xproject/assert@1.0.12@0xproject/abi-gen@1.0.120x.js@1.0.7Fabio Berger2018-09-291-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.7 - @0xproject/abi-gen@1.0.12 - @0xproject/assert@1.0.12 - @0xproject/asset-buyer@1.0.2 - @0xproject/base-contract@3.0.0 - @0xproject/connect@3.0.0 - @0xproject/contract-wrappers@2.0.1 - contracts@2.1.48 - @0xproject/dev-utils@1.0.11 - ethereum-types@1.0.9 - @0xproject/fill-scenarios@1.0.6 - @0xproject/json-schemas@1.0.5 - @0xproject/metacoin@0.0.22 - @0xproject/migrations@1.0.13 - @0xproject/monorepo-scripts@1.0.10 - @0xproject/order-utils@1.0.6 - @0xproject/order-watcher@2.1.0 - @0xproject/react-docs@1.0.12 - @0xproject/react-shared@1.0.13 - @0xproject/sol-compiler@1.1.6 - @0xproject/sol-cov@2.1.6 - @0xproject/sol-doc@1.0.1 - @0xproject/sol-resolver@1.0.12 - @0xproject/sra-report@1.0.12 - @0xproject/sra-spec@1.0.5 - @0xproject/subproviders@2.0.6 - @0xproject/testnet-faucets@1.0.50 - @0xproject/types@1.1.2 - @0xproject/typescript-typings@3.0.0 - @0xproject/utils@2.0.0 - @0xproject/web3-wrapper@3.0.2 - @0xproject/website@0.0.53
| * Updated CHANGELOGSFabio Berger2018-09-292-0/+13
| |
| * Publishethereum-types@1.0.8contracts@2.1.47@0xproject/website@0.0.52@0xproject/web3-wrapper@3.0.1@0xproject/utils@1.0.11@0xproject/typescript-typings@2.0.2@0xproject/types@1.1.1@0xproject/testnet-faucets@1.0.49@0xproject/subproviders@2.0.5@0xproject/sra-spec@1.0.4@0xproject/sra-report@1.0.11@0xproject/sol-resolver@1.0.11@0xproject/sol-cov@2.1.5@0xproject/sol-compiler@1.1.5@0xproject/react-shared@1.0.12@0xproject/react-docs@1.0.11@0xproject/order-watcher@2.0.0@0xproject/order-utils@1.0.5@0xproject/migrations@1.0.12@0xproject/metacoin@0.0.21@0xproject/json-schemas@1.0.4@0xproject/fill-scenarios@1.0.5@0xproject/dev-utils@1.0.10@0xproject/contract-wrappers@2.0.0@0xproject/connect@2.0.4@0xproject/base-contract@2.0.5@0xproject/asset-buyer@1.0.1@0xproject/assert@1.0.11@0xproject/abi-gen@1.0.110x.js@1.0.6Fabio Berger2018-09-261-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.6 - @0xproject/abi-gen@1.0.11 - @0xproject/assert@1.0.11 - @0xproject/asset-buyer@1.0.1 - @0xproject/base-contract@2.0.5 - @0xproject/connect@2.0.4 - @0xproject/contract-wrappers@2.0.0 - contracts@2.1.47 - @0xproject/dev-utils@1.0.10 - ethereum-types@1.0.8 - @0xproject/fill-scenarios@1.0.5 - @0xproject/json-schemas@1.0.4 - @0xproject/metacoin@0.0.21 - @0xproject/migrations@1.0.12 - @0xproject/order-utils@1.0.5 - @0xproject/order-watcher@2.0.0 - @0xproject/react-docs@1.0.11 - @0xproject/react-shared@1.0.12 - @0xproject/sol-compiler@1.1.5 - @0xproject/sol-cov@2.1.5 - @0xproject/sol-resolver@1.0.11 - @0xproject/sra-report@1.0.11 - @0xproject/sra-spec@1.0.4 - @0xproject/subproviders@2.0.5 - @0xproject/testnet-faucets@1.0.49 - @0xproject/types@1.1.1 - @0xproject/typescript-typings@2.0.2 - @0xproject/utils@1.0.11 - @0xproject/web3-wrapper@3.0.1 - @0xproject/website@0.0.52
| * Updated CHANGELOGSFabio Berger2018-09-262-0/+13
| |
* | Clean up interfaces and exportsBrandon Millman2018-10-032-40/+38
| |
* | Remove static methods to retrieve assetDatas from SRABrandon Millman2018-10-031-19/+0
| |
* | Add AssetUnavailable errorBrandon Millman2018-10-032-7/+4
| |
* | Merge AssetBuyer and AssetBuyerManagerBrandon Millman2018-10-035-326/+148
| |
* | Add to CHANGELOGfragosti2018-09-251-0/+9
| |
* | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-09-254-11/+34
|\| | | | | | | feature/asset-buyer/improve-asset-buyer-manager
| * Publishcontracts@2.1.46@0xproject/website@0.0.51@0xproject/web3-wrapper@3.0.0@0xproject/utils@1.0.10@0xproject/types@1.1.0@0xproject/testnet-faucets@1.0.48@0xproject/subproviders@2.0.4@0xproject/sra-spec@1.0.3@0xproject/sra-report@1.0.10@0xproject/sol-resolver@1.0.10@0xproject/sol-cov@2.1.4@0xproject/sol-compiler@1.1.4@0xproject/react-shared@1.0.11@0xproject/react-docs@1.0.10@0xproject/order-watcher@1.0.5@0xproject/order-utils@1.0.4@0xproject/migrations@1.0.11@0xproject/metacoin@0.0.20@0xproject/json-schemas@1.0.3@0xproject/fill-scenarios@1.0.4@0xproject/dev-utils@1.0.9@0xproject/contract-wrappers@1.0.5@0xproject/connect@2.0.3@0xproject/base-contract@2.0.4@0xproject/asset-buyer@1.0.0@0xproject/assert@1.0.10@0xproject/abi-gen@1.0.100x.js@1.0.5Leonid Logvinov2018-09-251-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.5 - @0xproject/abi-gen@1.0.10 - @0xproject/assert@1.0.10 - @0xproject/asset-buyer@1.0.0 - @0xproject/base-contract@2.0.4 - @0xproject/connect@2.0.3 - @0xproject/contract-wrappers@1.0.5 - contracts@2.1.46 - @0xproject/dev-utils@1.0.9 - @0xproject/fill-scenarios@1.0.4 - @0xproject/json-schemas@1.0.3 - @0xproject/metacoin@0.0.20 - @0xproject/migrations@1.0.11 - @0xproject/order-utils@1.0.4 - @0xproject/order-watcher@1.0.5 - @0xproject/react-docs@1.0.10 - @0xproject/react-shared@1.0.11 - @0xproject/sol-compiler@1.1.4 - @0xproject/sol-cov@2.1.4 - @0xproject/sol-resolver@1.0.10 - @0xproject/sra-report@1.0.10 - @0xproject/sra-spec@1.0.3 - @0xproject/subproviders@2.0.4 - @0xproject/testnet-faucets@1.0.48 - @0xproject/types@1.1.0 - @0xproject/utils@1.0.10 - @0xproject/web3-wrapper@3.0.0 - @0xproject/website@0.0.51
| * Updated CHANGELOGSLeonid Logvinov2018-09-252-0/+22
| |
| * Move SRA types from @0xproject/connect to @0xproject/sra-typesLeonid Logvinov2018-09-251-1/+2
| |
* | Make package public again, but add warningfragosti2018-09-252-1/+3
| |
* | Add AssetBuyerManager to READMEfragosti2018-09-251-0/+14
| |
* | Use options object convention everywhere, and make package privatefragosti2018-09-257-142/+106
| |
* | Provide convenience methods on AssetBuyerManagerfragosti2018-09-252-1/+43
| |
* | Rename StandardRelayerAPIAssetBuyerManager to just AssetBuyerManager and ↵fragosti2018-09-253-25/+58
|/ | | | generalize it
* Upgrade all depsfragosti2018-09-241-8/+8
|
* Improve READMEfragosti2018-09-241-3/+1
|
* Add expiry bufferfragosti2018-09-244-14/+51
|
* Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-09-211-1/+1
| | | | feature/forwarder-helper/sra-and-rpc
* Small typosfragosti2018-09-212-2/+2
|
* Add order provider response validationfragosti2018-09-213-0/+15
|
* Make asset buyer map privatefragosti2018-09-211-4/+4
|
* More renamingfragosti2018-09-218-67/+68
|
* Renamed orderFetcherResponseProcessor to orderProviderResponseProcessoerfragosti2018-09-212-7/+7
|
* Add labels to TODOsfragosti2018-09-212-4/+5
|
* Move some logic to order utilsfragosti2018-09-212-8/+16
|
* Add utility to get assetDatasfragosti2018-09-211-1/+8
|
* Rename OrderFetcher to OrderProvider and other small improvementsfragosti2018-09-209-49/+48
|
* Update descriptions for methods on AssetBuyerfragosti2018-09-201-3/+3
|
* Add better description to READMEfragosti2018-09-201-1/+3
|
* Implement StandardRelayerAPIAssetBuyerManagerfragosti2018-09-207-14/+166
|
* Rename forceOrderRefresh to shouldForceOrderRefreshfragosti2018-09-193-5/+5
|
* Calculate min and max rates in buy quotefragosti2018-09-191-19/+43
|
* Add isValidPercentage assertfragosti2018-09-192-13/+14
|
* make the slippage percentage customizable by integratorfragosti2018-09-183-7/+20
|
* Restrict orders field of AssetBuyerOrdersAndFillableAmounts to SignedOrder ↵fragosti2018-09-181-2/+2
| | | | for consistency
* Fix order expired bugfragosti2018-09-181-1/+1
|
* Move all constants to own filefragosti2018-09-182-12/+11
|
* Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵fragosti2018-09-181-4/+1
| | | | feature/forwarder-helper/sra-and-rpc
* Add factory method for specific assetData to buy and add commentsBrandon Millman2018-09-152-3/+54
|
* Add factory method on AssetBuyer for specific token addressBrandon Millman2018-09-151-1/+20
|
* Add factory method on AssetBuyer for provided ordersBrandon Millman2018-09-152-1/+39
|
* Export the order fetchersBrandon Millman2018-09-151-0/+2
|
* Fix lint errorsBrandon Millman2018-09-153-18/+5
|
* Delete old testBrandon Millman2018-09-151-136/+0
|
* Implement ProvidedOrderFetcherBrandon Millman2018-09-153-1/+48
|
* Implement StandardRelayerAPIOrderFetcherBrandon Millman2018-09-153-262/+84
|
* Flesh out the AssetBuyer classBrandon Millman2018-09-159-233/+544
|
* Create initial AssetBuyer classBrandon Millman2018-09-159-573/+634
|
* Update readme, changelog, and package.json with renameBrandon Millman2018-09-154-51/+14
|
* Move packages/forwarder-helper into packages/asset-buyerBrandon Millman2018-09-1518-0/+882