diff options
author | Florian Dold <florian@dold.me> | 2023-01-04 15:44:29 +0100 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2023-01-04 15:44:36 +0100 |
commit | f4e1e8e6e7ca6dcb9ac7d1c5f3b64130e99e325b (patch) | |
tree | 0564038fa7fbe074596b4de5104146b165457ca8 | |
parent | 24cac493dded00ef40e0e30a0d2263e4f35c3e29 (diff) |
-minor insufficient balance tweaks
-rw-r--r-- | packages/taler-util/src/wallet-types.ts | 47 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/operations/balance.ts | 2 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/operations/pay-merchant.ts | 45 |
3 files changed, 48 insertions, 46 deletions
diff --git a/packages/taler-util/src/wallet-types.ts b/packages/taler-util/src/wallet-types.ts index 402a9ed95..d7685fa6e 100644 --- a/packages/taler-util/src/wallet-types.ts +++ b/packages/taler-util/src/wallet-types.ts @@ -2081,3 +2081,50 @@ export interface InitiatePeerPullPaymentResponse { transactionId: string; } + + +/** + * Detailed reason for why the wallet's balance is insufficient. + */ +export interface PayMerchantInsufficientBalanceDetails { + /** + * Amount requested by the merchant. + */ + amountRequested: AmountJson; + + /** + * Balance of type "available" (see balance.ts for definition). + */ + balanceAvailable: AmountJson; + + /** + * Balance of type "material" (see balance.ts for definition). + */ + balanceMaterial: AmountJson; + + /** + * Balance of type "age-acceptable" (see balance.ts for definition). + */ + balanceAgeAcceptable: AmountJson; + + /** + * Balance of type "merchant-acceptable" (see balance.ts for definition). + */ + balanceMechantAcceptable: AmountJson; + + /** + * Balance of type "merchant-depositable" (see balance.ts for definition). + */ + balanceMechantDepositable: AmountJson; + + /** + * If the payment would succeed without fees + * (i.e. balanceMechantWireable >= amountRequested), + * this field contains an estimate of the amount that would additionally + * be required to cover the fees. + * + * It is not possible to give an exact value here, since it depends + * on the coin selection for the amount that would be additionally withdrawn. + */ + feeGapEstimate: AmountJson; +}
\ No newline at end of file diff --git a/packages/taler-wallet-core/src/operations/balance.ts b/packages/taler-wallet-core/src/operations/balance.ts index d2a029d53..95ade1cb4 100644 --- a/packages/taler-wallet-core/src/operations/balance.ts +++ b/packages/taler-wallet-core/src/operations/balance.ts @@ -39,7 +39,7 @@ * - "merchant-acceptable": Subset of the material balance that can be spent with a particular * merchant (restricted via min age, exchange, auditor, wire_method). * - * - "merchant-wireable": Subset of the merchant-acceptable balance that the merchant + * - "merchant-depositable": Subset of the merchant-acceptable balance that the merchant * can accept via their supported wire methods. */ diff --git a/packages/taler-wallet-core/src/operations/pay-merchant.ts b/packages/taler-wallet-core/src/operations/pay-merchant.ts index 49b9a6559..05da0a020 100644 --- a/packages/taler-wallet-core/src/operations/pay-merchant.ts +++ b/packages/taler-wallet-core/src/operations/pay-merchant.ts @@ -875,51 +875,6 @@ async function unblockBackup( }); } -/** - * Detailed reason for why the wallet's balance is insufficient. - */ -export interface PayMerchantInsufficientBalanceDetails { - /** - * Amount requested by the merchant. - */ - amountRequested: AmountJson; - - /** - * Balance of type "available" (see balance.ts for definition). - */ - balanceAvailable: AmountJson; - - /** - * Balance of type "material" (see balance.ts for definition). - */ - balanceMaterial: AmountJson; - - /** - * Balance of type "age-acceptable" (see balance.ts for definition). - */ - balanceAgeAcceptable: AmountJson; - - /** - * Balance of type "merchant-acceptable" (see balance.ts for definition). - */ - balanceMechantAcceptable: AmountJson; - - /** - * Balance of type "merchant-wireable" (see balance.ts for definition). - */ - balanceMechantWireable: AmountJson; - - /** - * If the payment would succeed without fees, - * this field contains an estimate of the amount that would additionally - * be required to cover the fees. - * - * It is not possible to give an exact value here, since it depends - * on the coin selection for the amount that would be additionally withdrawn. - */ - feeGapEstimate: AmountJson -} - export interface SelectPayCoinRequestNg { exchanges: AllowedExchangeInfo[]; auditors: AllowedAuditorInfo[]; |