[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-docs] branch master updated (c1700a2 -> 08608bd)
|
From: |
gnunet |
|
Subject: |
[taler-docs] branch master updated (c1700a2 -> 08608bd) |
|
Date: |
Sat, 29 Apr 2023 17:02:45 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a change to branch master
in repository docs.
from c1700a2 indentation
new b04649e diagrams
new 08608bd -diagrams
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../037-wallet-transactions-lifecycle.rst | 12 --
wallet/wallet-core.md => extract-tsdefs/foo | 196 ++++++++++-----------
transaction-deposit-states.dot | 79 ++++-----
transaction-pull-credit-states.dot | 76 +++-----
transaction-pull-debit-states.dot | 57 ++----
transaction-push-credit-states.dot | 80 +++------
transaction-push-debit-states.dot | 56 ++----
transaction-refresh-states.dot | 35 ++--
transaction-refund-states.dot | 28 +--
transaction-tip-states.dot | 73 ++++----
10 files changed, 263 insertions(+), 429 deletions(-)
copy wallet/wallet-core.md => extract-tsdefs/foo (97%)
diff --git a/design-documents/037-wallet-transactions-lifecycle.rst
b/design-documents/037-wallet-transactions-lifecycle.rst
index 5a26dea..abc6c13 100644
--- a/design-documents/037-wallet-transactions-lifecycle.rst
+++ b/design-documents/037-wallet-transactions-lifecycle.rst
@@ -129,7 +129,6 @@ offered.
.. image:: ../transaction-common-states.png
- :width: 400
Boxed labels indicate an end state in which there is no network activity and
@@ -322,7 +321,6 @@ Transaction Type: Withdrawal
.. image:: ../transaction-withdrawal-states.png
- :width: 800
Transaction Type: Payment to Merchant
@@ -459,7 +457,6 @@ Transaction Type: Payment to Merchant
with it.
.. image:: ../transaction-payment-states.png
- :width: 800
Transaction Type: Refund
@@ -507,7 +504,6 @@ payment transaction.
The refund failed permanently.
.. image:: ../transaction-refund-states.png
- :width: 400
Transaction Type: Refresh
@@ -560,7 +556,6 @@ the same as if the double-spending transaction had been
deleted by the user.
fresh coins are preserved.
.. image:: ../transaction-refresh-states.png
- :width: 250
@@ -637,7 +632,6 @@ Transaction Type: Tip
coins are preserved.
.. image:: ../transaction-tip-states.png
- :width: 600
Transaction Type: Deposit
@@ -741,7 +735,6 @@ Transaction Type: Deposit
All memory of the deposit operation is lost.
.. image:: ../transaction-deposit-states.png
- :width: 800
Transaction Type: Peer Push Debit
@@ -820,7 +813,6 @@ States and transitions:
All memory of the push debit operation is lost.
.. image:: ../transaction-push-debit-states.png
- :width: 800
Transaction Type: Peer Push Credit
@@ -948,7 +940,6 @@ States and transitions:
All memory of the push credit operation is lost.
.. image:: ../transaction-push-credit-states.png
- :width: 800
Transaction Type: Peer Pull Credit
@@ -1056,7 +1047,6 @@ TODO: Also specify variant where account reserve needs to
be created / funded fi
* ``deleted``
.. image:: ../transaction-pull-credit-states.png
- :width: 800
Transaction Type: Peer Pull Debit
@@ -1129,8 +1119,6 @@ Transaction Type: Peer Pull Debit
All information about the invoice has been deleted.
.. image:: ../transaction-pull-debit-states.png
- :width: 800
-
Alternatives
============
diff --git a/wallet/wallet-core.md b/extract-tsdefs/foo
similarity index 97%
copy from wallet/wallet-core.md
copy to extract-tsdefs/foo
index 4fba3c8..ade427c 100644
--- a/wallet/wallet-core.md
+++ b/extract-tsdefs/foo
@@ -43,9 +43,8 @@ This file is auto-generated from
[wallet-core](https://git.taler.net/wallet-core
* [GetExchangeDetailedInfoOp](#getexchangedetailedinfoop)
* [ListCurrenciesOp](#listcurrenciesop)
### Deposits
+* [GenerateDepositGroupTxIdOp](#generatedepositgrouptxidop)
* [CreateDepositGroupOp](#createdepositgroupop)
-* [TrackDepositGroupOp](#trackdepositgroupop)
-* [GetFeeForDepositOp](#getfeefordepositop)
* [PrepareDepositOp](#preparedepositop)
### Backups
* [ExportBackupRecoveryOp](#exportbackuprecoveryop)
@@ -75,7 +74,6 @@ This file is auto-generated from
[wallet-core](https://git.taler.net/wallet-core
* [RecycleOp](#recycleop)
### Testing and Debugging
* [ApplyDevExperimentOp](#applydevexperimentop)
-* [SetDevModeOp](#setdevmodeop)
* [RunIntegrationTestOp](#runintegrationtestop)
* [RunIntegrationTestV2Op](#runintegrationtestv2op)
* [TestCryptoOp](#testcryptoop)
@@ -1161,6 +1159,30 @@ export interface WalletCurrencyInfo {
```
+### GenerateDepositGroupTxIdOp
+```typescript
+/**
+ * Generate a fresh transaction ID for a deposit group.
+ *
+ * The resulting transaction ID can be specified when creating
+ * a deposit group, so that the client can already start waiting for
notifications
+ * on that specific deposit group before the GreateDepositGroup request
returns.
+ */
+export type GenerateDepositGroupTxIdOp = {
+ op: WalletApiOperation.GenerateDepositGroupTxId;
+ request: EmptyObject;
+ response: TxIdResponse;
+};
+// GenerateDepositGroupTxId = "generateDepositGroupTxId"
+
+```
+```typescript
+export interface TxIdResponse {
+ transactionId: string;
+}
+
+```
+
### CreateDepositGroupOp
```typescript
/**
@@ -1179,6 +1201,13 @@ export type CreateDepositGroupOp = {
```
```typescript
export interface CreateDepositGroupRequest {
+ /**
+ * Pre-allocated transaction ID.
+ * Allows clients to easily handle notifications
+ * that occur while the operation has been created but
+ * before the creation request has returned.
+ */
+ transactionId?: string;
depositPaytoUri: string;
amount: AmountString;
}
@@ -1192,86 +1221,6 @@ export interface CreateDepositGroupResponse {
```
-### TrackDepositGroupOp
-```typescript
-/**
- * Track the status of a deposit group by querying the exchange.
- */
-export type TrackDepositGroupOp = {
- op: WalletApiOperation.TrackDepositGroup;
- request: TrackDepositGroupRequest;
- response: TrackDepositGroupResponse;
-};
-// TrackDepositGroup = "trackDepositGroup"
-
-```
-```typescript
-export interface TrackDepositGroupRequest {
- depositGroupId: string;
-}
-
-```
-```typescript
-export interface TrackDepositGroupResponse {
- responses: TrackTransaction[];
-}
-
-```
-```typescript
-export type TrackTransaction =
- | ({
- type: "accepted";
- } & TrackTransactionAccepted)
- | ({
- type: "wired";
- } & TrackTransactionWired);
-
-```
-```typescript
-interface TrackTransactionAccepted {
- requirement_row?: number;
- kyc_ok: boolean;
- execution_time: TalerProtocolTimestamp;
-}
-
-```
-```typescript
-export interface TrackTransactionWired {
- wtid: Base32String;
- execution_time: TalerProtocolTimestamp;
- coin_contribution: AmountString;
- exchange_sig: EddsaSignatureString;
- exchange_pub: EddsaPublicKeyString;
-}
-
-```
-
-### GetFeeForDepositOp
-```typescript
-export type GetFeeForDepositOp = {
- op: WalletApiOperation.GetFeeForDeposit;
- request: GetFeeForDepositRequest;
- response: DepositGroupFees;
-};
-// GetFeeForDeposit = "getFeeForDeposit"
-
-```
-```typescript
-export interface GetFeeForDepositRequest {
- depositPaytoUri: string;
- amount: AmountString;
-}
-
-```
-```typescript
-export interface DepositGroupFees {
- coin: AmountString;
- wire: AmountString;
- refresh: AmountString;
-}
-
-```
-
### PrepareDepositOp
```typescript
export type PrepareDepositOp = {
@@ -1293,6 +1242,15 @@ export interface PrepareDepositRequest {
export interface PrepareDepositResponse {
totalDepositCost: AmountString;
effectiveDepositAmount: AmountString;
+ fees: DepositGroupFees;
+}
+
+```
+```typescript
+export interface DepositGroupFees {
+ coin: AmountString;
+ wire: AmountString;
+ refresh: AmountString;
}
```
@@ -1941,23 +1899,6 @@ export interface ApplyDevExperimentRequest {
```
-### SetDevModeOp
-```typescript
-export type SetDevModeOp = {
- op: WalletApiOperation.SetDevMode;
- request: SetDevModeRequest;
- response: EmptyObject;
-};
-// SetDevMode = "setDevMode"
-
-```
-```typescript
-export interface SetDevModeRequest {
- devModeEnabled: boolean;
-}
-
-```
-
### RunIntegrationTestOp
```typescript
/**
@@ -2019,11 +1960,10 @@ export type WithdrawTestBalanceOp = {
```typescript
export interface WithdrawTestBalanceRequest {
amount: string;
- bankBaseUrl: string;
/**
- * Bank access API base URL. Defaults to the bankBaseUrl.
+ * Bank access API base URL.
*/
- bankAccessApiBaseUrl?: string;
+ bankAccessApiBaseUrl: string;
exchangeBaseUrl: string;
forcedDenomSel?: ForcedDenomSel;
}
@@ -2677,6 +2617,9 @@ export interface WalletCoreVersion {
exchange: string;
merchant: string;
bank: string;
+ /**
+ * @deprecated will be removed
+ */
devMode: boolean;
}
```
@@ -2716,6 +2659,13 @@ export interface TransactionCommon {
transactionId: TransactionIdStr;
type: TransactionType;
timestamp: TalerProtocolTimestamp;
+ /**
+ * Transaction state, as per DD37.
+ */
+ txState: TransactionState;
+ /**
+ * @deprecated in favor of statusMajor and statusMinor
+ */
extendedStatus: ExtendedStatus;
/**
* true if the transaction is still pending, false otherwise
@@ -2763,6 +2713,34 @@ export interface TalerProtocolTimestamp {
}
```
```typescript
+export interface TransactionState {
+ major: TransactionMajorState;
+ minor?: TransactionMinorState;
+}
+```
+```typescript
+export declare enum TransactionMajorState {
+ None = "none",
+ Pending = "pending",
+ Done = "done",
+ Aborting = "aborting",
+ Aborted = "aborted",
+ Suspended = "suspended",
+ Failed = "failed",
+ Deleted = "deleted",
+ Unknown = "unknown",
+}
+```
+```typescript
+export declare enum TransactionMinorState {
+ Unknown = "unknown",
+ Deposit = "deposit",
+ KycRequired = "kyc-required",
+ Track = "track",
+ Refresh = "refresh",
+}
+```
+```typescript
export declare enum ExtendedStatus {
Pending = "pending",
Done = "done",
@@ -2888,6 +2866,10 @@ export interface TransactionPayment extends
TransactionCommon {
* Is the wallet currently checking for a refund?
*/
refundQueryActive: boolean;
+ /**
+ * Does this purchase has an pos validation
+ */
+ posConfirmation: string | undefined;
}
```
```typescript
@@ -3085,6 +3067,7 @@ export declare enum RefreshReason {
PayPeerPull = "pay-peer-pull",
Refund = "refund",
AbortPay = "abort-pay",
+ AbortDeposit = "abort-deposit",
Recoup = "recoup",
BackupRestored = "backup-restored",
Scheduled = "scheduled",
@@ -3120,7 +3103,7 @@ export interface TransactionDeposit extends
TransactionCommon {
wireTransferId: string;
timestampExecuted: TalerProtocolTimestamp;
amountRaw: AmountString;
- amountEffective: AmountString;
+ wireFee: AmountString;
}>;
}
```
@@ -3482,7 +3465,7 @@ export interface PayMerchantInsufficientBalanceDetails {
balanceMerchantDepositable: AmountString;
/**
* If the payment would succeed without fees
- * (i.e. balanceMechantWireable >= amountRequested),
+ * (i.e. balanceMerchantDepositable >= amountRequested),
* this field contains an estimate of the amount that would additionally
* be required to cover the fees.
*
@@ -3570,8 +3553,7 @@ export interface PeerContractTerms {
```typescript
export interface IntegrationTestArgs {
exchangeBaseUrl: string;
- bankBaseUrl: string;
- bankAccessApiBaseUrl?: string;
+ bankAccessApiBaseUrl: string;
merchantBaseUrl: string;
merchantAuthToken?: string;
amountToWithdraw: string;
diff --git a/transaction-deposit-states.dot b/transaction-deposit-states.dot
index a6e7620..fa8d91d 100644
--- a/transaction-deposit-states.dot
+++ b/transaction-deposit-states.dot
@@ -1,59 +1,44 @@
digraph G {
- initial[label="", shape="circle"];
- pending_deposit[label="pending(deposit)"];
- suspended_deposit[label="suspended(deposit)", shape="box"];
- pending_track[label="pending(track)"];
- pending_kyc[label="pending(kyc)"];
- suspended_kyc[label="suspended(kyc)", shape="box"];
- pending_aml[label="pending(aml)"];
- suspended_aml[label="suspended(aml)", shape="box"];
- aborting_refresh[label="aborting(refresh)"];
- aborting_refund[label="aborting(refund)"];
-
+ initial[label="", shape="circle", xlabel="deposit"];
+ pending_deposit[label="deposit"];
+ pending_track[label="track"];
+ pending_kyc[label="kyc"];
+ pending_aml[label="aml"];
+ aborting_refresh[label="refresh", style=dashed];
+ aborting_refund[label="refund", style=dashed];
done[label="done", shape="box"];
- aborted[label="aborted", shape="box"];
- suspended_abort_refund[label="suspended(refund)", shape="box"];
- suspended_abort_refresh[label="suspended(refresh)", shape="box"];
- deleted[label="deleted", shape="box"];
-
- initial->pending_deposit [color="blue", label="deposit form data"];
- aborting_refresh->suspended_abort_refresh [color="blue", label="suspend"];
- aborting_refund->suspended_abort_refund [color="blue", label="suspend"];
- aborting_refund->aborting_refresh;
- aborting_refresh->aborted;
-
- pending_deposit->pending_track;
- pending_deposit->aborting_refund [color="red", label="failure"];
- pending_deposit->suspended_deposit [color="blue", label="suspend"];
-
- pending_track->aborting_refund [color="blue", label="abort"];
- pending_track->done;
- pending_track->pending_kyc;
- pending_track->pending_aml;
-
- pending_kyc->suspended_kyc [color="blue", label="suspend"];
- pending_kyc->done [color="purple", label="long-poll:kyc"];
+ aborted[label="aborted", shape="box", style=dashed];
- suspended_kyc->pending_kyc [color="blue", label="resume"];
- suspended_kyc->deleted [color="blue", label="force-delete"];
+ subgraph {
+ rank=same;
+ done; aborted;
+ }
- pending_aml->suspended_aml [color="blue", label="suspend"];
- pending_aml->done [color="purple", label="long-poll:aml"];
+ subgraph {
+ rank=same;
+ pending_track; aborting_refund;
+ }
- suspended_aml->pending_kyc [color="blue", label="resume"];
- suspended_aml->deleted [color="blue", label="force-delete"];
+ subgraph {
+ rank=same;
+ pending_deposit; pending_kyc; pending_aml;
+ }
- suspended_abort_refund->aborting_refund [color="blue", label="resume"];
- suspended_abort_refresh->aborting_refresh [color="blue", label="resume"];
- suspended_abort_refund->deleted [color="blue", label="force-delete"];
- suspended_abort_refresh->deleted [color="blue", label="force-delete"];
+ initial->pending_deposit;
+ aborting_refund->aborting_refresh [color=green];
+ aborting_refresh->aborted [color=green];
- suspended_deposit->pending_deposit [color="blue", label="resume"];
- suspended_deposit->aborting_refund [color="blue", label="abort"];
+ pending_deposit->pending_track [color=green];
+ pending_deposit->aborting_refund [color="red"];
+ pending_deposit->aborting_refund [color="blue", style=dashed];
- done->deleted [color="blue", label="delete"];
- aborted->deleted [color="blue", label="delete"];
+ pending_track->aborting_refund [color="blue", style=dashed];
+ pending_track->done [color=green];
+ pending_track->pending_kyc [color=red];
+ pending_track->pending_aml [color=red];
+ pending_kyc->pending_track [color="green"];
+ pending_aml->pending_track [color="green"];
}
diff --git a/transaction-pull-credit-states.dot
b/transaction-pull-credit-states.dot
index 7202a37..351c681 100644
--- a/transaction-pull-credit-states.dot
+++ b/transaction-pull-credit-states.dot
@@ -1,65 +1,43 @@
digraph G {
-
initial[label="", shape="circle"];
- pending_create[label="pending(purse-create)"];
- pending_qr[label="pending(qr-ready)", shape="box"];
- aborting_delete[label="aborting(delete-purse)"];
- pending_withdraw[label="pending(withdraw)"];
- suspended_withdraw[label="suspended(withdraw)", shape="box"];
- pending_kyc[label="pending(kyc)"];
- suspended_kyc[label="suspended(kyc)", shape="box"];
- pending_aml[label="pending(aml)"];
- suspended_aml[label="suspended(aml)", shape="box"];
-
- aborted[label="aborted", shape="box"];
- failed[label="failed", shape="box"];
+ pending_create[label="purse-create"];
+ pending_qr[label="qr-ready"];
+ aborting_delete[label="delete-purse", style=dashed];
+ pending_withdraw[label="withdraw"];
+ pending_kyc[label="kyc"];
+ pending_aml[label="aml"];
+
+ aborted[label="aborted", shape="box", style=dashed];
done[label="done", shape="box"];
- deleted[label="deleted", shape="box"];
// subgraph {
// rank = same; pending_withdraw; failed;
// }
- initial->pending_create [color="blue", label="form data"];
-
- pending_create->pending_qr;
- pending_create->deleted [color="red", label="failure"];
- pending_create->deleted [color="blue", label="cancel"];
-
- pending_qr->aborted [label="timeout"];
- pending_qr->aborting_delete [color="blue", label="abort"];
- pending_qr->pending_withdraw;
- pending_qr->aborting_delete [color="red", label="poll-failure"];
+ subgraph {
+ rank=max;
+ aborted; done;
+ }
- aborting_delete->pending_withdraw [color="red",
label="failure:already-merged"];
- aborting_delete->aborted;
- aborting_delete->failed [color="red", label="failure:other"];
- aborting_delete->failed [color="blue", label="force-abort"];
+ subgraph {
+ rank=same;
+ pending_create; pending_qr;
+ }
- aborted->deleted [color="blue", label="delete"];
+ initial->pending_create;
- pending_withdraw->done;
- pending_withdraw->failed [color="red", label="failure"];
- pending_withdraw->pending_kyc [label="kyc-required"];
- pending_withdraw->pending_aml [label="aml-required"];
- pending_withdraw->suspended_withdraw [color="blue", label="suspend"];
-
- suspended_withdraw->pending_withdraw [color="blue", label="resume"];
- suspended_withdraw->deleted [color="blue", label="force-delete"];
-
- pending_kyc->suspended_kyc [color="blue", label="suspend"];
- pending_kyc->pending_withdraw [color="purple", label="poll-success"];
-
- suspended_kyc->pending_kyc [color="blue", label="resume"];
- suspended_kyc->deleted [color="blue", label="force-delete"];
+ pending_create->pending_qr;
- pending_aml->suspended_aml [color="blue", label="suspend"];
- pending_aml->pending_withdraw [color="purple", label="poll-success"];
+ pending_qr->aborting_delete [color="blue", style=dashed];
+ pending_qr->pending_withdraw [color=green];
- suspended_aml->pending_aml [color="blue", label="resume"];
- suspended_aml->deleted [color="blue", label="force-delete"];
+ aborting_delete->pending_withdraw [color="red"];
+ aborting_delete->aborted [color=green];
- failed->deleted [color="blue", label="delete"];
- done->deleted [color="blue", label="delete"];
+ pending_withdraw->done [color=green];
+ pending_withdraw->pending_kyc [color=red];
+ pending_withdraw->pending_aml [color=red];
+ pending_kyc->pending_withdraw [color="green"];
+ pending_aml->pending_withdraw [color="green"];
}
diff --git a/transaction-pull-debit-states.dot
b/transaction-pull-debit-states.dot
index bec08c1..4a3d0dd 100644
--- a/transaction-pull-debit-states.dot
+++ b/transaction-pull-debit-states.dot
@@ -1,53 +1,34 @@
digraph G {
initial[label="", shape="circle"];
- pending_download[label="pending(download)"];
- suspended_download[label="suspended(download)", shape="box"];
- pending_user[label="pending(user)", shape="box"];
+ pending_download[label="download"];
+ pending_user[label="monolog", shape="box"];
- pending_deposit[label="pending(deposit)"];
- suspended_deposit[label="suspended(deposit)", shape="box"];
- aborting_refund[label="aborting(refund)"];
- aborting_refresh[label="aborting(refresh)"];
+ pending_deposit[label="deposit"];
+ aborting_refresh[label="refresh", style=dashed];
- aborted[label="aborted", shape="box"];
- failed[label="failed", shape="box"];
+ aborted[label="aborted", shape="box", style=dashed];
done[label="done", shape="box"];
- deleted[label="deleted", shape="box"];
-// subgraph {
-// rank = same; pending_withdraw; failed;
-// }
+ subgraph {
+ rank=same;
+ done; aborted;
+ }
- initial->pending_download [color="blue", label="URI trigger"];
+ subgraph {
+ rank=same;
+ pending_download;
+ pending_user;
+ }
- pending_download->suspended_download [color="blue", label="suspend"];
- pending_download->pending_user;
+ initial->pending_download;
- suspended_download->pending_download [color="blue", label="resume"];
- suspended_download->deleted [color="blue", label="cancel"];
+ pending_download->pending_user [color=green];
- pending_user->pending_deposit [color="blue", label="confirm-pay"];
- pending_user->deleted [color="blue", label="cancel"];
- pending_user->aborted [label="timeout"];
+ pending_user->pending_deposit [color="blue"];
- pending_deposit->done;
- pending_deposit->suspended_deposit [color="blue", label="suspend"];
- pending_deposit->aborting_refresh [color="red", label="failure:timeout"];
-
- suspended_deposit->pending_deposit [color="blue", label="resume"];
- suspended_deposit->aborting_refund [color="blue", label="abort"];
-
- aborting_refund->aborting_refresh;
- aborting_refund->aborting_refresh [color="red", label="failure"];
- aborting_refund->failed [color="blue", label="force-abort"];
+ pending_deposit->done [color=green];
+ pending_deposit->aborting_refresh [color=red];
aborting_refresh->aborted;
- aborting_refresh->failed [color="red", label="failure"];
- aborting_refresh->failed [color="blue", label="force-abort"];
-
- aborted->deleted [color="blue", label="delete"];
- failed->deleted [color="blue", label="delete"];
- done->deleted [color="blue", label="delete"];
-
}
diff --git a/transaction-push-credit-states.dot
b/transaction-push-credit-states.dot
index 4110699..c51da30 100644
--- a/transaction-push-credit-states.dot
+++ b/transaction-push-credit-states.dot
@@ -1,75 +1,37 @@
digraph G {
- initial[label="", shape="circle"];
+ initial[label="", shape="circle", xlabel="peer-push-credit"];
pending_download[label="pending(download)"];
- suspended_download[label="suspended(download)", shape="box"];
- pending_user[label="pending(user)", shape="box"];
- pending_merge[label="pending(merge)"];
- pending_merge_kyc[label="pending(merge-kyc)"];
- suspended_merge_kyc[label="suspended(merge-kyc)", shape="box"];
- pending_withdraw[label="pending(withdraw)"];
- suspended_withdraw[label="suspended(withdraw)", shape="box"];
- pending_withdraw_kyc[label="pending(withdraw-kyc)"];
- suspended_withdraw_kyc[label="suspended(withdraw-kyc)", shape="box"];
- pending_withdraw_aml[label="pending(withdraw-aml)"];
- suspended_withdraw_aml[label="suspended(withdraw-aml)", shape="box"];
-
- failed[label="failed", shape="box"];
- done[label="done", shape="box"];
- deleted[label="deleted", shape="box"];
+ pending_user[label="dialog", shape="box"];
+ pending_merge[label="merge"];
+ pending_merge_kyc[label="merge-kyc"];
+ pending_withdraw[label="withdraw"];
+ pending_withdraw_kyc[label="withdraw-kyc"];
+ pending_withdraw_aml[label="withdraw-aml"];
subgraph {
- rank = same; pending_withdraw; failed;
+ rank=same;
+ pending_merge; pending_withdraw_kyc; pending_withdraw_aml;
}
- initial->pending_download [color="blue", label="URI trigger"];
-
- pending_download->suspended_download [color="blue", label="suspend"];
- pending_download->pending_user;
-
- suspended_download->pending_download [color="blue", label="resume"];
- suspended_download->deleted [color="blue", label="force-delete"];
-
- pending_user->pending_merge [color="blue", label="accept"];
- pending_user->deleted [color="blue", label="force-delete"];
- pending_user->failed [label="timeout"];
-
- pending_merge->pending_withdraw;
- pending_merge->pending_merge_kyc [label="kyc-required"];
- pending_merge->failed [label="timeout"];
- pending_merge->failed [color="red", label="failure"];
-
- pending_merge_kyc->pending_merge [color="purple", label="poll-success"];
- pending_merge_kyc->suspended_merge_kyc [color="blue", label="suspend"];
- pending_merge_kyc->failed [label="timeout"];
-
- suspended_merge_kyc->pending_merge_kyc [color="blue", label="resume"];
- suspended_merge_kyc->deleted [color="blue", label="force-delete"];
- suspended_merge_kyc->failed [label="timeout"];
-
- pending_withdraw->pending_withdraw_kyc [label="kyc-required"];
- pending_withdraw->pending_withdraw_aml [label="aml-required"];
- pending_withdraw->done;
- pending_withdraw->suspended_withdraw [color="blue", label="suspend"];
- pending_withdraw->failed [color="red", label="failure"];
+ done[label="done", shape="box"];
- suspended_withdraw->pending_withdraw [color="blue", label="resume"];
- suspended_withdraw->deleted [color="blue", label="force-delete"];
+ initial->pending_download;
+ pending_download->pending_user [color=green];
- pending_withdraw_kyc->suspended_withdraw_kyc [color="blue", label="suspend"];
- pending_withdraw_kyc->pending_withdraw [color="purple",
label="poll-success"];
+ pending_user->pending_merge [color="blue", label="OK"];
- suspended_withdraw_kyc->pending_withdraw_kyc [color="blue", label="resume"];
- suspended_withdraw_kyc->deleted [color="blue", label="force-delete"];
+ pending_merge->pending_withdraw [color=green];
+ pending_merge->pending_merge_kyc [color=red];
- pending_withdraw_aml->suspended_withdraw_aml [color="blue", label="suspend"];
- pending_withdraw_aml->pending_withdraw [color="purple",
label="poll-success"];
+ pending_merge_kyc->pending_merge [color="green"];
- suspended_withdraw_aml->pending_withdraw_aml [color="blue", label="resume"];
- suspended_withdraw_aml->deleted [color="blue", label="force-delete"];
+ pending_withdraw->pending_withdraw_kyc [color=red];
+ pending_withdraw->pending_withdraw_aml [color=red];
+ pending_withdraw->done [color=green];
- failed->deleted [color="blue", label="delete"];
- done->deleted [color="blue", label="delete"];
+ pending_withdraw_kyc->pending_withdraw [color="green"];
+ pending_withdraw_aml->pending_withdraw [color="green"];
}
diff --git a/transaction-push-debit-states.dot
b/transaction-push-debit-states.dot
index 4d13c15..47b7bc5 100644
--- a/transaction-push-debit-states.dot
+++ b/transaction-push-debit-states.dot
@@ -1,56 +1,32 @@
digraph G {
- initial[label="", shape="circle"];
- pending_create[label="pending(purse-create)"];
- suspended_create[label="suspended(purse-create)", shape="box"];
- pending_qr[label="pending(qr-ready)"];
- aborting_delete[label="aborting(delete-purse)"];
- aborting_refresh[label="aborting(refresh)"];
- aborting_refund[label="aborting(refund)"];
-
- // FIXME(CG): operation unclear
- // pending_refundable[label="pending(refundable)"];
-
+ initial[label="", shape="circle", xlabel="peer-push-debit"];
+ pending_create[label="purse-create"];
+ pending_qr[label="qr-ready"];
+ aborting_delete[label="delete-purse", style=dashed];
+ aborting_refresh[label="refresh", style=dashed];
done[label="done", shape="box"];
aborted[label="aborted", shape="box"];
- failed[label="failed", shape="box"];
- deleted[label="deleted", shape="box"];
subgraph {
- rank = same; done; aborted; failed;
+ rank = same; done; aborted;
}
- initial->pending_create [color="blue", label="push debit form data"];
-
- pending_create->suspended_create [color="blue", label="suspend"];
- pending_create->aborting_refund [color="red", label="failure"];
- pending_create->pending_qr;
+ subgraph {
+ rank=same; pending_qr;aborting_delete; aborting_refresh;
+ }
- suspended_create->pending_create [color="blue", label="resume"];
- suspended_create->aborting_refund [color="blue", label="abort"];
+ initial->pending_create;
- pending_qr->aborting_delete [color="blue", label="abort"];
- pending_qr->aborting_refresh [label="purse-timeout"];
- pending_qr->done [label="poll-success"];
+ pending_create->pending_qr [color=green];
- // FIXME(CG): or go to delete_purse? Or just retry?
- pending_qr->aborting_refresh [color="red", label="poll-failure"];
+ pending_qr->aborting_delete [color="blue", style=dashed];
+ pending_qr->aborting_refresh [xlabel="timeout"];
+ pending_qr->done [color=green];
aborting_delete->aborting_refresh;
- aborting_delete->done [color="red",
label="processed-failed\n(already-merged)"];
- aborting_delete->aborting_refresh [color="red", label="failed(other)"];
- aborting_delete->failed [color="blue", label="abort-force"];
+ aborting_delete->done [color="red", label="already\nmerged"];
+ aborting_delete->aborting_refresh [color="red"];
aborting_refresh->aborted;
- aborting_refresh->failed [color="red", label="failed"];
- aborting_refresh->failed [color="blue", label="abort-force"];
-
- aborting_refund->aborting_refresh;
- aborting_refund->aborting_refresh [color="red", label="failed"];
- aborting_refund->failed [color="blue", label="abort-force"];
-
- done->deleted [color="blue", label="delete"];
- aborted->deleted [color="blue", label="delete"];
- failed->deleted [color="blue", label="delete"];
-
}
diff --git a/transaction-refresh-states.dot b/transaction-refresh-states.dot
index ab0462b..4b67c88 100644
--- a/transaction-refresh-states.dot
+++ b/transaction-refresh-states.dot
@@ -1,22 +1,27 @@
digraph G {
- initial[label="", shape="circle"];
- pending[label="pending"];
- suspended[label="suspended", shape="box"];
+ initial[label="", shape="circle", xlabel="refresh"];
+ pending[label="refresh"];
+ //aborting[label="refresh", style=dashed];
+ //aborted[style=dashed];
done[label="done", shape="box"];
- failed[label="failed", shape="box"];
- deleted[label="deleted", shape="box"];
- initial->pending [color="blue", label="trigger"];
+ subgraph {
+ rank=same;
+ pending;
+ // aborting;
+ }
+
+ subgraph {
+ rank=same;
+ done;
+ //aborted;
+ }
- pending->done;
- pending->suspended [color="blue", label="suspend"];
- pending->failed [color="red", label="failure"];
-
- suspended->pending [color="blue", label="resume"];
- suspended->deleted [color="blue", label="force-delete"];
-
- failed->deleted [color="blue", label="delete"];
- done->deleted [color="blue", label="delete"];
+ initial->pending;
+
+ //pending -> aborting [color=blue, style=dashed, label="abort"];
+ //aborting->aborted;
+ pending->done [color=green];
}
diff --git a/transaction-refund-states.dot b/transaction-refund-states.dot
index 27aba41..8e01d6e 100644
--- a/transaction-refund-states.dot
+++ b/transaction-refund-states.dot
@@ -3,29 +3,17 @@ digraph G {
initial[label="", shape="circle", xlabel="refund"];
pending_merchant[label="merchant"];
pending_refresh[label="refresh"];
- aborting_merchant[label="merchant", style=dashed];
- aborting_refresh[label="refresh",style=dashed];
- aborted[label="aborted", style=dashed, shape=box];
+ //aborting_merchant[label="merchant", style=dashed];
+ //aborting_refresh[label="refresh",style=dashed];
+ //aborted[label="aborted", style=dashed, shape=box];
done[label="done", shape="box"];
- subgraph {
- rank=same; aborted; done;
- }
-
- subgraph {
- rank=same; pending_merchant; aborting_merchant;
- }
-
- subgraph {
- rank=same; pending_refresh; aborting_refresh;
- }
-
initial->pending_merchant;
pending_merchant->pending_refresh [color=green];
- pending_merchant -> aborting_merchant [color=blue, style=dashed];
- aborting_merchant -> aborted [color=green];
- pending_refresh -> aborting_refresh [color=blue];
- aborting_refresh -> aborted [color=green];
- pending_refresh -> done;
+ //pending_merchant -> aborting_merchant [color=blue, style=dashed];
+ //aborting_merchant -> aborted [color=green];
+ //pending_refresh -> aborting_refresh [color=blue];
+ //aborting_refresh -> aborted [color=green];
+ pending_refresh -> done [color=green];
}
diff --git a/transaction-tip-states.dot b/transaction-tip-states.dot
index 9bf5e87..a4625d8 100644
--- a/transaction-tip-states.dot
+++ b/transaction-tip-states.dot
@@ -1,47 +1,36 @@
digraph G {
initial[label="", shape="circle"];
- pending_query[label="pending(query)"];
- pending_user[label="pending(user)"];
- pending_pickup[label="pending(pickup)"];
- pending_kyc[label="pending(kyc)"];
- suspended_query[label="suspended(query)", shape="box"];
- suspended_pickup[label="suspended(pickup)", shape="box"];
- suspended_kyc[label="suspended(kyc)", shape="box"];
+ pending_query[label="query"];
+ //aborting_query[label="query", style=dashed];
+ //aborted_query[label="aborted", style=dashed, shape=box];
+ monolog_user[label="monolog(user)"];
+ pending_pickup[label="pickup"];
+ //aborting_pickup[label="pickup", style=dashed];
+ //aborted_pickup[label="aborted", style=dashed, shape=box];
done[label="done", shape="box"];
- failed[label="failed", shape="box"];
- deleted[label="deleted", shape="box"];
-
- initial->pending_query [color="blue", label="URI trigger"];
-
- pending_query->pending_user;
- pending_query->suspended_query [color="blue", label="suspend"];
- pending_query->deleted [color="red", label="failure"];
-
- suspended_query->pending_query [color="blue", label="resume"];
- suspended_query->deleted [color="blue", label="force-delete"];
-
- pending_user->pending_pickup [color="blue", label="accept"];
- pending_user->deleted [color="blue", label="force-delete"];
- pending_user->failed [label="expired"];
-
- pending_pickup->pending_kyc [label="kyc required"];
- pending_pickup->suspended_pickup [color="blue", label="suspend"];
- pending_pickup->done;
- pending_pickup->failed [color="red", label="failure"];
-
- suspended_pickup->pending_pickup [color="blue", label="resume"];
- suspended_pickup->failed [color="red", label="expired"];
- suspended_pickup->deleted [color="blue", label="force-delete"];
-
- pending_kyc->suspended_kyc [color="blue", label="suspend"];
-
- pending_kyc->pending_pickup [color="purple", label="long-poll:kyc"];
-
- suspended_kyc->pending_kyc [color="blue", label="resume"];
- suspended_kyc->deleted [color="blue", label="force-delete"];
-
- done->deleted [color="blue", label="delete"];
- failed->deleted [color="blue", label="delete"];
-
+
+ // subgraph {
+ // rank=same;
+ // pending_query; monolog_user;
+ // }
+
+ // subgraph {
+ // rank=same;
+ // done;
+ // //aborted_pickup; aborted_query;
+ // }
+
+ initial -> pending_query;
+
+
+ monolog_user -> pending_pickup [color=blue, label="OK"];
+
+ pending_query -> monolog_user [color=green];
+ //pending_query -> aborting_query;
+ //aborting_query -> aborted_query;
+
+ pending_pickup -> done [color=green];
+ //pending_pickup -> aborting_pickup;
+ //aborting_pickup -> aborted_pickup;
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-docs] branch master updated (c1700a2 -> 08608bd),
gnunet <=