aboutsummaryrefslogtreecommitdiffstats
path: root/src/contract_wrappers/exchange_wrapper.ts
Commit message (Expand)AuthorAgeFilesLines
* Remove And's from namesLeonid Logvinov2017-08-241-17/+17
* Move order validation functions to orderValidationUtils and make isRoundingEr...Leonid Logvinov2017-08-241-51/+26
* Add initial implementation for public order validation functionsLeonid Logvinov2017-08-241-48/+77
* Return variable instead of expressionFabio Berger2017-08-231-1/+2
* Fix the docs for shouldThrowOnInsufficientBalanceOrAllowanceLeonid Logvinov2017-08-221-4/+6
* Merge pull request #118 from 0xProject/artifacts-updateFabio Berger2017-08-211-2/+2
|\
| * Update Exchange artifacts and adjust ExchangeWrapperLeonid Logvinov2017-08-151-2/+2
* | remove unneeded assertion from _isRoundingErrorAsync since one can make stati...Fabio Berger2017-08-171-1/+0
|/
* Store tokenWrapper inside of OrdervalidationUtilsLeonid Logvinov2017-07-261-2/+4
* Remove and from namesLeonid Logvinov2017-07-261-1/+1
* Remove unused importsLeonid Logvinov2017-07-261-6/+0
* Refactor OrderValidationUtils to check for the case when ZRX is one of the to...Leonid Logvinov2017-07-261-2/+2
* Pass tokenWrapper to validateFillOrderBalancesAndAllowancesAndThrowIfInvalidA...Leonid Logvinov2017-07-261-1/+1
* Move _validateFillOrderBalancesAndAllowancesAndThrowIfInvalidAsync to orderVa...Leonid Logvinov2017-07-261-63/+4
* Add forgotten meger conflict resolutionLeonid Logvinov2017-07-121-19/+0
* Use PascalCase names as string enum keysLeonid Logvinov2017-07-121-26/+54
* Fix the commentLeonid Logvinov2017-07-121-1/+3
* Migrate to using a single Exchange contractLeonid Logvinov2017-07-121-69/+39
* Fix a typoLeonid Logvinov2017-07-111-4/+4
* Fix a typo in commentLeonid Logvinov2017-07-111-2/+2
* Rename shouldCheckTransfer to shouldThrowOnInsufficientBalanceOrAllowanceLeonid Logvinov2017-07-111-10/+11
* Change arguments order at isRoundingErrorLeonid Logvinov2017-07-111-3/+3
* Migrate eventsLeonid Logvinov2017-07-111-3/+4
* Migrate fillOrKillOrderLeonid Logvinov2017-07-111-9/+9
* Migrate ZRX_TOKEN_AMOUNTLeonid Logvinov2017-07-111-1/+1
* Migrate getUnavailableTakerTokenAmountLeonid Logvinov2017-07-111-3/+3
* Migrate batchFillOrKillOrdersLeonid Logvinov2017-07-111-5/+5
* Migrate batchFillOrdersLeonid Logvinov2017-07-111-16/+20
* Migrate fillOrderLeonid Logvinov2017-07-111-20/+23
* Migrate fillOrdersUpTo and remove minLeonid Logvinov2017-07-111-13/+14
* Migrate batchCancelOrdersLeonid Logvinov2017-07-111-5/+5
* Migrate cencelOrderLeonid Logvinov2017-07-111-9/+9
* Revert "Migrate isRoundingError parameter changes"Leonid Logvinov2017-07-111-5/+5
* Revert "Rename ZRX to ZRX_TOKEN_CONTRACT"Leonid Logvinov2017-07-111-1/+1
* Migrate isRoundingError parameter changesLeonid Logvinov2017-07-111-5/+5
* Rename ZRX to ZRX_TOKEN_CONTRACTLeonid Logvinov2017-07-111-1/+1
* Rename batchCancelOrderAsync to batchCancelOrdersAsyncLeonid Logvinov2017-07-081-1/+1
* Rename batchFillOrderAsync to batchFillOrdersAsyncLeonid Logvinov2017-07-081-2/+2
* Move zeroEx.exchange.getAvailableContractAddressesAsync to zeroEx.getAvailabl...Leonid Logvinov2017-07-061-45/+2
* move order hash schema to a separate fileLeonid Logvinov2017-07-051-1/+2
* Make invalidateContractInstancesAsync private on exchange and tokenLeonid Logvinov2017-07-051-4/+4
* Add parameter validation for subscribeAsyncLeonid Logvinov2017-07-051-0/+6
* Use orderHashSchema to validate order hashLeonid Logvinov2017-07-051-4/+4
* Merge branch 'master' into subscribe-tokenLeonid2017-07-041-4/+4
|\
| * Merge pull request #89 from 0xProject/proxyLeonid2017-07-041-4/+4
| |\
| | * Use call instead of use in the commentsLeonid Logvinov2017-07-041-4/+4
* | | Add initial implementation and tests for zeroEx.token.subscribeAsyncLeonid Logvinov2017-07-041-32/+2
|/ /
* | Rename _wrapEventCallback to _getBigNumberWrappingEventCallbackLeonid Logvinov2017-07-041-2/+2
* | Merge branch 'master' into wrap-log-bignumberLeonid2017-07-041-61/+145
|\|
| * Stop passing exchangeContractAddress to utils.getOrderHashHexLeonid Logvinov2017-07-041-7/+2
| * Await ZRX callLeonid Logvinov2017-07-041-1/+1
| * Fix the commentLeonid Logvinov2017-07-041-1/+1
| * Rename invalidateContractInstanceAsync to invalidateContractInstancesAsyncLeonid Logvinov2017-07-041-1/+1
| * Fix namingLeonid Logvinov2017-07-011-2/+3
| * Fix a typo in authorizedLeonid Logvinov2017-07-011-3/+3
| * Fix a bug in getProxyAuthorizedContractAddressesAsyncLeonid Logvinov2017-07-011-2/+7
| * Move schema assertion up to prevent the _.map failureLeonid Logvinov2017-07-011-1/+1
| * Implement getProxyAuthorizedContractAddressesAsyncLeonid Logvinov2017-06-301-0/+16
| * Store ProxyWrapper instance in ExchangeWrapperLeonid Logvinov2017-06-301-1/+4
| * Factor out ZRXtokenAddress variableLeonid Logvinov2017-06-301-1/+2
| * Rename ZeroExError.CONTRACT_DOES_NOT_EXIST to ZeroExError.EXCHANGE_CONTRACT_D...Leonid Logvinov2017-06-301-1/+1
| * Fix a typo in a nameLeonid Logvinov2017-06-301-2/+2
| * Factor out exchangeArtifacts variableLeonid Logvinov2017-06-301-1/+2
| * Check that artefacts by networkId are not undefined before getting the addressLeonid Logvinov2017-06-301-2/+5
| * Fix a typo in a nameLeonid Logvinov2017-06-301-1/+1
| * Fix a typo in a nameLeonid Logvinov2017-06-301-1/+1
| * Move schema assertion up to prevent the _.map failureLeonid Logvinov2017-06-301-2/+2
| * Move schema assertion up to prevent the _.map failureLeonid Logvinov2017-06-301-1/+1
| * Mve schema assertion up to prevent the _.map failureLeonid Logvinov2017-06-301-1/+1
| * Allow multiple exchange versions t be functional at the same timeLeonid Logvinov2017-06-271-48/+107
| * Move exchange artifacts to an exchange subfolderLeonid Logvinov2017-06-271-1/+1
* | Check for a BigNumber instanceLeonid Logvinov2017-07-041-1/+8
* | Use _.isString instead of instanceofLeonid Logvinov2017-07-041-1/+1
* | Wrap all event args in a newer version of BigNumber and test itLeonid Logvinov2017-07-021-1/+19
|/
* Fix incorrect merge consequencesLeonid Logvinov2017-06-231-3/+3
* Merge branch 'master' into fill-order-amuontLeonid2017-06-231-27/+22
|\
| * Revert "Use different lodash import syntax which allows to include only used ...Leonid2017-06-221-26/+22
* | Return filledTakerTokenAmount from fillOrdersUpToAsyncLeonid Logvinov2017-06-221-3/+10
* | Return cancelledAmount from cancelOrderAsyncLeonid Logvinov2017-06-221-1/+6
* | Fix return commentLeonid Logvinov2017-06-221-1/+1
* | Return filledAmount from fillOrderAsyncLeonid Logvinov2017-06-211-1/+6
|/
* Fall back to import x = require() syntaxLeonid Logvinov2017-06-211-5/+5
* Use different lodash import syntax which allows to include only used functionsLeonid Logvinov2017-06-211-22/+26
* Add missing semi-colonFabio Berger2017-06-201-1/+1
* Improve commentFabio Berger2017-06-201-3/+3
* Merge branch 'master' of github.com:0xProject/0x.jsFabio Berger2017-06-191-1/+2
|\
| * Rename LogErrorArgs to LogErrorEventArgs and EventArgs to ContractEventArgsLeonid Logvinov2017-06-191-2/+2
| * Add actual type for contract event argumentsLeonid Logvinov2017-06-151-1/+2
* | Add and improve commentsFabio Berger2017-06-161-7/+11
|/
* Remove types that are not used in public interface from export and rename Eve...Leonid Logvinov2017-06-141-7/+7
* Rename ZeroExEvent to EventEmitterLeonid Logvinov2017-06-131-12/+12
* Bind watch function on an eventLeonid Logvinov2017-06-131-1/+1
* Refactor subscription to return zeroExSignature objectLeonid Logvinov2017-06-131-16/+27
* Add getContractAddressAsync and testsLeonid Logvinov2017-06-131-0/+9
* Merge branch 'master' into privateLeonid2017-06-111-14/+22
|\
| * Merge pull request #60 from 0xProject/error-decoratorFabio Berger2017-06-111-0/+8
| |\
| | * Merge branch 'master' into error-decoratorLeonid2017-06-101-11/+61
| | |\
| | * | Add initial error handling decorator implementationLeonid Logvinov2017-06-101-0/+8
| * | | Remove Hex suffix from public functions parameters namesLeonid Logvinov2017-06-101-14/+14
| | |/ | |/|
* | | Fix last testsLeonid Logvinov2017-06-111-8/+8
* | | Prefix private vars with _Leonid Logvinov2017-06-101-91/+92
|/ /
* | Align all param comments so that they are more readableFabio Berger2017-06-101-38/+48
* | Add param & return comments to all public methods and add comments to some pu...Fabio Berger2017-06-101-11/+51
|/
* Address feedbackLeonid Logvinov2017-06-101-1/+1
* Fix testLeonid Logvinov2017-06-101-8/+5
* Merge branch 'master' into json-schemaLeonid2017-06-101-5/+4
|\
| * Merge branch 'master' into async-bugLeonid2017-06-091-20/+83
| |\
| * | Use for ofLeonid Logvinov2017-06-091-2/+2
| * | Fix the bug of not awaiting an async functionLeonid Logvinov2017-06-091-4/+3
* | | Merge branch 'master' into json-schemaLeonid2017-06-091-4/+71
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-091-16/+12
| |\ \
| * | | Address feedbackLeonid Logvinov2017-06-091-5/+2
| * | | Add signedOrdersScxhemaLeonid Logvinov2017-06-091-0/+4
| * | | Address feedbackLeonid Logvinov2017-06-091-1/+1
| * | | Add assert.hashAtMostOneUniqueValueLeonid Logvinov2017-06-091-6/+6
| * | | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-091-24/+89
| |\ \ \ | | | |/ | | |/|
| * | | Add tests for fillOrdersUpToLeonid Logvinov2017-06-091-7/+7
| * | | Implement fillOrderUpToAsyncLeonid Logvinov2017-06-081-0/+66
* | | | Fix tests one moreLeonid Logvinov2017-06-091-1/+1
* | | | Fix testsLeonid Logvinov2017-06-091-1/+1
* | | | Merge branch 'master' into json-schemaLeonid2017-06-091-12/+7
|\ \ \ \ | | |_|/ | |/| |
| * | | Add orderCancelrequestsSchema and orderFillRequestsSchemaLeonid Logvinov2017-06-091-16/+12
| | |/ | |/|
* | | Make static function publicLeonid Logvinov2017-06-091-1/+0
* | | Convert to JSON schema compatible object by defaultLeonid Logvinov2017-06-091-19/+7
|/ /
* | fix indentationFabio Berger2017-06-091-13/+13
* | add comment explaining the use of anyFabio Berger2017-06-091-0/+1
* | Improve commentFabio Berger2017-06-091-1/+1
* | Add orderFillOrKillRequestsSchema and validate using it instead of looping ov...Fabio Berger2017-06-091-4/+5
* | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-091-25/+91
|\|
| * Merge pull request #47 from 0xProject/is-valid-signature-contractLeonid2017-06-081-2/+2
| |\
| | * Merge branch 'master' into is-valid-signature-contractLeonid2017-06-081-0/+6
| | |\
| | * | Refactor isValidSignatureLeonid Logvinov2017-06-081-2/+2
| * | | Merge branch 'master' into batchFillAsyncLeonid2017-06-081-0/+6
| |\ \ \ | | | |/ | | |/|
| * | | Address feedbackLeonid Logvinov2017-06-081-9/+12
| * | | Use isSenderAddressAsyncLeonid Logvinov2017-06-081-2/+2
| * | | Address old feedbackLeonid Logvinov2017-06-081-2/+3
| * | | Fix spacingLeonid Logvinov2017-06-081-2/+2
| * | | Merge branch 'master' into batchFillAsyncLeonid Logvinov2017-06-081-25/+106
| |\ \ \ | | | |/ | | |/|
| * | | Don't use batchFillOrderAsync for fillOrderAsyncLeonid Logvinov2017-06-081-3/+37
| * | | Add no-op testLeonid Logvinov2017-06-081-1/+3
| * | | Remove old commentLeonid Logvinov2017-06-081-1/+0
| * | | Refactor to use OrderFillRequestLeonid Logvinov2017-06-071-22/+26
| * | | Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-071-27/+3
| |\ \ \
| * \ \ \ Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-071-17/+19
| |\ \ \ \
| * | | | | Add assertion for empty batchLeonid Logvinov2017-06-071-0/+1
| * | | | | Fix linter errorsLeonid Logvinov2017-06-071-1/+2
| * | | | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-071-1/+1
| * | | | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-071-0/+45
| * | | | | Remove assertions from utils methodsLeonid Logvinov2017-06-071-4/+1
| * | | | | Add initial implementation of batchCancelAsyncLeonid Logvinov2017-06-071-21/+43
* | | | | | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-081-0/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Add getOrderHashHexUsingContractCallAsyncLeonid Logvinov2017-06-081-0/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-081-2/+56
|\| | | |
| * | | | Address feedbackLeonid Logvinov2017-06-081-6/+9
| * | | | Address feedbackLeonid Logvinov2017-06-081-5/+6
| * | | | Don't use batch function for normal oneLeonid Logvinov2017-06-081-3/+27
| * | | | Merge branch 'master' into batchCancelAsyncLeonid2017-06-081-7/+57
| |\ \ \ \
| * | | | | Address feedbackLeonid Logvinov2017-06-071-8/+11
| | |_|_|/ | |/| | |
| * | | | Use batchCancel for normal cancelLeonid Logvinov2017-06-071-28/+5
| | |_|/ | |/| |
| * | | Refactor to use OrderCancellationRequestLeonid Logvinov2017-06-071-17/+19
| * | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-071-1/+1
| * | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-071-0/+45
* | | | Implement batchFillOrKill and testsFabio Berger2017-06-081-7/+70
| |/ / |/| |
* | | Remove catch of invalid jump throws since there are many reasons the contract...Fabio Berger2017-06-071-24/+14
* | | add `hex` to function and variable name for clarityFabio Berger2017-06-071-4/+4
* | | remove unused argFabio Berger2017-06-071-2/+1
* | | merge masterFabio Berger2017-06-071-31/+79
|\| |
| * | Remove assertions from utils methodsLeonid Logvinov2017-06-071-4/+1
| |/
| * Use union type Order|SignedOrderLeonid Logvinov2017-06-071-2/+2
| * Address feedbackLeonid Logvinov2017-06-071-16/+15
| * Add test when the order was already cancelled or filledLeonid Logvinov2017-06-061-31/+35
| * Add checks and tests for expired order and zero fill amountLeonid Logvinov2017-06-061-1/+7
| * Fix testsLeonid Logvinov2017-06-061-1/+1
| * Add initial implementation with success testLeonid Logvinov2017-06-061-1/+52
* | Implement fillOrKill & testsFabio Berger2017-06-071-17/+88
|/
* Address feedbackLeonid Logvinov2017-06-061-1/+1
* Add isAnyAddressAvailableAsyncLeonid Logvinov2017-06-061-0/+1
* Rename isSenderAddressHexAsync to isSenderAddressAsyncLeonid Logvinov2017-06-061-1/+1
* Rename senderAccount to senderAddressLeonid Logvinov2017-06-061-8/+8
* Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsyncLeonid Logvinov2017-06-061-1/+1
* Rename senderAccount to takerAddressLeonid Logvinov2017-06-061-5/+5
* Add variableName to isSenderAddcountHexAsyncLeonid Logvinov2017-06-061-1/+1
* Make methods accept senderAccountLeonid Logvinov2017-06-051-21/+14
* Run stopWatching in parallelFabio Berger2017-06-031-3/+4
* Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-031-31/+98
|\
| * Address feedbackLeonid Logvinov2017-06-031-12/+12
| * Allign argumentsLeonid Logvinov2017-06-031-3/+3
| * Rewrite commentLeonid Logvinov2017-06-031-5/+11
| * Move FillOrderValidatinErrs to ExchangeContractErrsLeonid Logvinov2017-06-031-13/+12
| * Assign wouldRoundingErrorOccur to a variableLeonid Logvinov2017-06-021-2/+4
| * Rename EXPIRED to FILL_ORDER_EXPIREDLeonid Logvinov2017-06-021-1/+1
| * Assign timestamp to a variableLeonid Logvinov2017-06-021-1/+2
| * Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKERLeonid Logvinov2017-06-021-1/+1
| * Don't pass zrxTokenAsignLeonid Logvinov2017-06-021-6/+7
| * Rename validation functionsLeonid Logvinov2017-06-021-8/+8
| * Add getZRXTokenAddressAsyncLeonid Logvinov2017-06-021-1/+4
| * rename fillTakerAmountInBaseUnits to fillTakerAmountFabio Berger2017-06-021-15/+15
| * Improve fillOrderAsync commentFabio Berger2017-06-021-3/+6
| * Improve error names and remove duplicate importFabio Berger2017-06-021-5/+5
| * Add tests and checks for fees balances and allowancesLeonid Logvinov2017-06-021-9/+45
| * Add check for ROUNDING_ERROR and test for itLeonid Logvinov2017-06-021-0/+16
* | Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-021-4/+14
|\|
| * Validate maker balance and allowance & testsLeonid Logvinov2017-06-021-4/+14
* | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ...Fabio Berger2017-06-021-1/+45
* | Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-021-0/+3
|\|
| * Add test for insufficient balance and make all async tests asyncLeonid Logvinov2017-06-021-0/+3
* | Always wrap BigNumbers returned by web3 with our own version and add commentFabio Berger2017-06-021-3/+9
* | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-3/+4
|\|
| * Create a FillsScenario utils module and use it in the fillOrder testsFabio Berger2017-06-021-4/+6
* | fix tslint errorFabio Berger2017-06-021-1/+2
* | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-3/+15
|\|
| * Make validateFillOrder asyncronousLeonid Logvinov2017-06-021-2/+2
| * Add not enough taker balance testsLeonid Logvinov2017-06-021-2/+14
* | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-7/+106
|\|
| * remove superfluous paramFabio Berger2017-06-011-1/+1
| * remove unused argFabio Berger2017-06-011-2/+1
| * remove unneeded methodFabio Berger2017-06-011-5/+1
| * improve commentFabio Berger2017-06-011-2/+2
| * Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-0/+3
| |\
| | * Add expired checkLeonid Logvinov2017-06-011-0/+3
| * | Add comment for fillOrderAsync method, rename fillAmount to fillTakerAmountIn...Fabio Berger2017-06-011-6/+11
| |/
| * Revert "Add EXPIRED test"Leonid Logvinov2017-06-011-3/+0
| * Add ExchangeContractErrs string enumFabio Berger2017-06-011-8/+9
| * Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-0/+15
| |\
| | * Add EXPIRED testLeonid Logvinov2017-06-011-0/+3
| | * Add NOT_A_TAKER checkLeonid Logvinov2017-06-011-0/+3
| | * Add FILL_AMOUNT_IS_ZERO checkLeonid Logvinov2017-06-011-0/+9
| * | Rename ExchangeContractErrs to ExchangeContractErrCodesFabio Berger2017-06-011-9/+9
| |/
| * Make taker required on Order object and expect NULL_ADDRESS from 0x.jsFabio Berger2017-06-011-3/+1
| * rename signed_order_schema to order_schemasFabio Berger2017-06-011-1/+1
| * Add convertToJSONSchemaCompatibleObject methodFabio Berger2017-06-011-1/+4
| * Temporarily fix gas extimationLeonid Logvinov2017-06-011-0/+13
| * Don't return contract responseLeonid Logvinov2017-05-311-2/+1
| * Add isBigNumber argument assertionLeonid Logvinov2017-05-301-0/+1
| * Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-05-301-1/+13
| |\
| * | Add throwErrorLogsAsErrorsLeonid Logvinov2017-05-301-6/+10
| * | Add fillAmount parameterLeonid Logvinov2017-05-301-2/+3
| * | Make fillOrderAsync accept signedOrder instead of a shit-ton of paramsLeonid Logvinov2017-05-301-35/+21
| * | Finish ecSignature renamingLeonid Logvinov2017-05-301-3/+3
| * | Add assertions for parametersLeonid Logvinov2017-05-301-1/+15
| * | Move field declaration to the begining of the classLeonid Logvinov2017-05-301-8/+8
| * | Add initial implementation of fillOrderAsyncLeonid Logvinov2017-05-301-1/+63
| * | Add getExchangeInstanceOrThrowAsync && getSenderAddressOrThrowAsyncLeonid Logvinov2017-05-301-6/+7
* | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCa...Fabio Berger2017-06-011-0/+33
| |/ |/|
* | Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter that...Fabio Berger2017-05-301-6/+7
* | remove unused importFabio Berger2017-05-301-1/+0
* | rename invalidateExchangeContract to invalidateContractInstanceFabio Berger2017-05-301-1/+1
* | Lazily instantiate exchangeContract and store as instance variable instead of...Fabio Berger2017-05-301-3/+14
|/
* Lowercase schema namesFabio Berger2017-05-301-2/+2
* Fix importsLeonid Logvinov2017-05-291-1/+1