[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-wallet-core] branch master updated (32937795c -> 77849fdf5)
|
From: |
gnunet |
|
Subject: |
[taler-wallet-core] branch master updated (32937795c -> 77849fdf5) |
|
Date: |
Tue, 20 Jun 2023 19:43:43 +0200 |
This is an automated email from the git hooks/post-receive script.
dold pushed a change to branch master
in repository wallet-core.
from 32937795c added txactions into transaction mocks
add 8d20ab87f wallet-core: consistently rename to failTransaction
add 98a351aa4 repo: bump to 0.9.3-dev.16
new 77849fdf5 -minor rename
The 1 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:
packages/taler-harness/package.json | 4 ++--
packages/taler-util/package.json | 4 ++--
packages/taler-util/src/wallet-types.ts | 18 +++++++++---------
packages/taler-wallet-cli/package.json | 4 ++--
packages/taler-wallet-cli/src/index.ts | 11 +++++------
packages/taler-wallet-core/package.json | 8 +++++---
.../src/operations/pay-peer-push-credit.ts | 4 ++--
packages/taler-wallet-core/src/wallet-api-types.ts | 20 ++++++++++----------
packages/taler-wallet-core/src/wallet.ts | 6 +++---
packages/taler-wallet-embedded/package.json | 2 +-
.../taler-wallet-webextension/manifest-common.json | 4 ++--
packages/taler-wallet-webextension/package.json | 4 ++--
.../src/wallet/Transaction.tsx | 2 +-
packages/web-util/package.json | 2 +-
14 files changed, 47 insertions(+), 46 deletions(-)
diff --git a/packages/taler-harness/package.json
b/packages/taler-harness/package.json
index 76e7d6fd2..18658ea64 100644
--- a/packages/taler-harness/package.json
+++ b/packages/taler-harness/package.json
@@ -1,6 +1,6 @@
{
"name": "@gnu-taler/taler-harness",
- "version": "0.9.3-dev.13",
+ "version": "0.9.3-dev.16",
"description": "",
"engines": {
"node": ">=0.12.0"
@@ -43,4 +43,4 @@
"axios": "^0.27.2",
"tslib": "^2.5.3"
}
-}
+}
\ No newline at end of file
diff --git a/packages/taler-util/package.json b/packages/taler-util/package.json
index 256511f31..c543b33e2 100644
--- a/packages/taler-util/package.json
+++ b/packages/taler-util/package.json
@@ -1,6 +1,6 @@
{
"name": "@gnu-taler/taler-util",
- "version": "0.9.3-dev.13",
+ "version": "0.9.3-dev.16",
"description": "Generic helper functionality for GNU Taler",
"type": "module",
"types": "./lib/index.node.d.ts",
@@ -76,4 +76,4 @@
"lib/**/*test.js"
]
}
-}
+}
\ No newline at end of file
diff --git a/packages/taler-util/src/wallet-types.ts
b/packages/taler-util/src/wallet-types.ts
index 5a87864fc..cff7637c6 100644
--- a/packages/taler-util/src/wallet-types.ts
+++ b/packages/taler-util/src/wallet-types.ts
@@ -1920,15 +1920,15 @@ export const codecForAcceptTipRequest = ():
Codec<AcceptTipRequest> =>
.property("walletTipId", codecForString())
.build("AcceptTipRequest");
-export interface CancelAbortingTransactionRequest {
+export interface FailTransactionRequest {
transactionId: TransactionIdStr;
}
-export const codecForCancelAbortingTransactionRequest =
- (): Codec<CancelAbortingTransactionRequest> =>
- buildCodecForObject<CancelAbortingTransactionRequest>()
+export const codecForFailTransactionRequest =
+ (): Codec<FailTransactionRequest> =>
+ buildCodecForObject<FailTransactionRequest>()
.property("transactionId", codecForTransactionIdStr())
- .build("CancelAbortingTransactionRequest");
+ .build("FailTransactionRequest");
export interface SuspendTransactionRequest {
transactionId: TransactionIdStr;
@@ -1953,7 +1953,7 @@ export interface AbortTransactionRequest {
transactionId: TransactionIdStr;
}
-export interface CancelAbortingTransactionRequest {
+export interface FailTransactionRequest {
transactionId: TransactionIdStr;
}
@@ -2358,7 +2358,7 @@ export const codecForInitiatePeerPushDebitRequest =
.property("partialContractTerms", codecForPeerContractTerms())
.build("InitiatePeerPushDebitRequest");
-export interface PreparePeerPushCredit {
+export interface PreparePeerPushCreditRequest {
talerUri: string;
}
@@ -2395,8 +2395,8 @@ export interface PreparePeerPullDebitResponse {
}
export const codecForPreparePeerPushCreditRequest =
- (): Codec<PreparePeerPushCredit> =>
- buildCodecForObject<PreparePeerPushCredit>()
+ (): Codec<PreparePeerPushCreditRequest> =>
+ buildCodecForObject<PreparePeerPushCreditRequest>()
.property("talerUri", codecForString())
.build("CheckPeerPushPaymentRequest");
diff --git a/packages/taler-wallet-cli/package.json
b/packages/taler-wallet-cli/package.json
index aaf921ef6..74247a482 100644
--- a/packages/taler-wallet-cli/package.json
+++ b/packages/taler-wallet-cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@gnu-taler/taler-wallet-cli",
- "version": "0.9.3-dev.13",
+ "version": "0.9.3-dev.16",
"description": "",
"engines": {
"node": ">=0.18.0"
@@ -41,4 +41,4 @@
"@gnu-taler/taler-wallet-core": "workspace:*",
"tslib": "^2.5.3"
}
-}
+}
\ No newline at end of file
diff --git a/packages/taler-wallet-cli/src/index.ts
b/packages/taler-wallet-cli/src/index.ts
index 99882addd..4e56a40f4 100644
--- a/packages/taler-wallet-cli/src/index.ts
+++ b/packages/taler-wallet-cli/src/index.ts
@@ -446,17 +446,16 @@ transactionsCli
});
transactionsCli
- .subcommand("cancelAbortingTransaction", "cancel-aborting", {
- help: "Cancel the attempt of properly aborting a transaction.",
+ .subcommand("fail", "fail", {
+ help: "Fail a transaction (when it can't be aborted).",
})
.requiredArgument("transactionId", clk.STRING, {
- help: "Identifier of the transaction to cancel aborting.",
+ help: "Identifier of the transaction to fail.",
})
.action(async (args) => {
await withWallet(args, async (wallet) => {
- await wallet.client.call(WalletApiOperation.CancelAbortingTransaction, {
- transactionId: args.cancelAbortingTransaction
- .transactionId as TransactionIdStr,
+ await wallet.client.call(WalletApiOperation.FailTransaction, {
+ transactionId: args.fail.transactionId as TransactionIdStr,
});
});
});
diff --git a/packages/taler-wallet-core/package.json
b/packages/taler-wallet-core/package.json
index ee1c63996..e749970c6 100644
--- a/packages/taler-wallet-core/package.json
+++ b/packages/taler-wallet-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@gnu-taler/taler-wallet-core",
- "version": "0.9.3-dev.13",
+ "version": "0.9.3-dev.16",
"description": "",
"engines": {
"node": ">=0.18.0"
@@ -78,9 +78,11 @@
"tslib": "^2.5.3"
},
"ava": {
- "ignoredByWatcher": ["src/**/*"],
+ "ignoredByWatcher": [
+ "src/**/*"
+ ],
"files": [
"lib/**/*test.*"
]
}
-}
+}
\ No newline at end of file
diff --git a/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts
b/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts
index cf698d512..53a569a92 100644
--- a/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts
+++ b/packages/taler-wallet-core/src/operations/pay-peer-push-credit.ts
@@ -23,7 +23,7 @@ import {
HttpStatusCode,
Logger,
PeerContractTerms,
- PreparePeerPushCredit,
+ PreparePeerPushCreditRequest,
PreparePeerPushCreditResponse,
TalerErrorCode,
TalerPreciseTimestamp,
@@ -83,7 +83,7 @@ const logger = new Logger("pay-peer-push-credit.ts");
export async function preparePeerPushCredit(
ws: InternalWalletState,
- req: PreparePeerPushCredit,
+ req: PreparePeerPushCreditRequest,
): Promise<PreparePeerPushCreditResponse> {
const uri = parsePayPushUri(req.talerUri);
diff --git a/packages/taler-wallet-core/src/wallet-api-types.ts
b/packages/taler-wallet-core/src/wallet-api-types.ts
index c58ced045..6bcee0299 100644
--- a/packages/taler-wallet-core/src/wallet-api-types.ts
+++ b/packages/taler-wallet-core/src/wallet-api-types.ts
@@ -38,7 +38,7 @@ import {
ApplyDevExperimentRequest,
BackupRecovery,
BalancesResponse,
- CancelAbortingTransactionRequest,
+ FailTransactionRequest,
CheckPeerPullCreditRequest,
CheckPeerPullCreditResponse,
CheckPeerPushDebitRequest,
@@ -82,7 +82,7 @@ import {
PreparePayTemplateRequest,
PreparePeerPullDebitRequest,
PreparePeerPullDebitResponse,
- PreparePeerPushCredit,
+ PreparePeerPushCreditRequest,
PreparePeerPushCreditResponse,
PrepareRefundRequest,
PrepareTipRequest,
@@ -166,9 +166,11 @@ export enum WalletApiOperation {
GetExchangeDetailedInfo = "getExchangeDetailedInfo",
RetryPendingNow = "retryPendingNow",
AbortTransaction = "abortTransaction",
- CancelAbortingTransaction = "cancelAbortingTransaction",
+ FailTransaction = "failTransaction",
SuspendTransaction = "suspendTransaction",
ResumeTransaction = "resumeTransaction",
+ DeleteTransaction = "deleteTransaction",
+ RetryTransaction = "retryTransaction",
ConfirmPay = "confirmPay",
DumpCoins = "dumpCoins",
SetCoinSuspended = "setCoinSuspended",
@@ -184,8 +186,6 @@ export enum WalletApiOperation {
GetBackupInfo = "getBackupInfo",
PrepareDeposit = "prepareDeposit",
GetVersion = "getVersion",
- DeleteTransaction = "deleteTransaction",
- RetryTransaction = "retryTransaction",
ListCurrencies = "listCurrencies",
GenerateDepositGroupTxId = "generateDepositGroupTxId",
CreateDepositGroup = "createDepositGroup",
@@ -384,9 +384,9 @@ export type AbortTransactionOp = {
*
* For payment transactions, it puts the payment into an "aborting" state.
*/
-export type CancelAbortingTransactionOp = {
- op: WalletApiOperation.CancelAbortingTransaction;
- request: CancelAbortingTransactionRequest;
+export type FailTransactionOp = {
+ op: WalletApiOperation.FailTransaction;
+ request: FailTransactionRequest;
response: EmptyObject;
};
@@ -729,7 +729,7 @@ export type InitiatePeerPushDebitOp = {
*/
export type PreparePeerPushCreditOp = {
op: WalletApiOperation.PreparePeerPushCredit;
- request: PreparePeerPushCredit;
+ request: PreparePeerPushCreditRequest;
response: PreparePeerPushCreditResponse;
};
@@ -979,7 +979,7 @@ export type WalletOperations = {
[WalletApiOperation.WithdrawTestkudos]: WithdrawTestkudosOp;
[WalletApiOperation.ConfirmPay]: ConfirmPayOp;
[WalletApiOperation.AbortTransaction]: AbortTransactionOp;
- [WalletApiOperation.CancelAbortingTransaction]: CancelAbortingTransactionOp;
+ [WalletApiOperation.FailTransaction]: FailTransactionOp;
[WalletApiOperation.SuspendTransaction]: SuspendTransactionOp;
[WalletApiOperation.ResumeTransaction]: ResumeTransactionOp;
[WalletApiOperation.GetBalances]: GetBalancesOp;
diff --git a/packages/taler-wallet-core/src/wallet.ts
b/packages/taler-wallet-core/src/wallet.ts
index af6bb4d62..3ceb6b069 100644
--- a/packages/taler-wallet-core/src/wallet.ts
+++ b/packages/taler-wallet-core/src/wallet.ts
@@ -64,7 +64,7 @@ import {
codecForAddKnownBankAccounts,
codecForAny,
codecForApplyDevExperiment,
- codecForCancelAbortingTransactionRequest,
+ codecForFailTransactionRequest,
codecForCheckPeerPullPaymentRequest,
codecForCheckPeerPushDebitRequest,
codecForConfirmPayRequest,
@@ -1237,8 +1237,8 @@ async function dispatchRequestInternal<Op extends
WalletApiOperation>(
await suspendTransaction(ws, req.transactionId);
return {};
}
- case WalletApiOperation.CancelAbortingTransaction: {
- const req = codecForCancelAbortingTransactionRequest().decode(payload);
+ case WalletApiOperation.FailTransaction: {
+ const req = codecForFailTransactionRequest().decode(payload);
await failTransaction(ws, req.transactionId);
return {};
}
diff --git a/packages/taler-wallet-embedded/package.json
b/packages/taler-wallet-embedded/package.json
index b65a6d164..a1d23e0ed 100644
--- a/packages/taler-wallet-embedded/package.json
+++ b/packages/taler-wallet-embedded/package.json
@@ -1,6 +1,6 @@
{
"name": "@gnu-taler/taler-wallet-embedded",
- "version": "0.9.3-dev.13",
+ "version": "0.9.3-dev.16",
"description": "",
"engines": {
"node": ">=0.18.0"
diff --git a/packages/taler-wallet-webextension/manifest-common.json
b/packages/taler-wallet-webextension/manifest-common.json
index 843483027..c59d4f6e2 100644
--- a/packages/taler-wallet-webextension/manifest-common.json
+++ b/packages/taler-wallet-webextension/manifest-common.json
@@ -2,8 +2,8 @@
"name": "GNU Taler Wallet (git)",
"description": "Privacy preserving and transparent payments",
"author": "GNU Taler Developers",
- "version": "0.9.3.13",
- "version_name": "0.9.3-dev.13",
+ "version": "0.9.3.16",
+ "version_name": "0.9.3-dev.16",
"icons": {
"16": "static/img/taler-logo-16.png",
"19": "static/img/taler-logo-19.png",
diff --git a/packages/taler-wallet-webextension/package.json
b/packages/taler-wallet-webextension/package.json
index 002d888a2..470b6d663 100644
--- a/packages/taler-wallet-webextension/package.json
+++ b/packages/taler-wallet-webextension/package.json
@@ -1,6 +1,6 @@
{
"name": "@gnu-taler/taler-wallet-webextension",
- "version": "0.9.3-dev.13",
+ "version": "0.9.3-dev.16",
"description": "GNU Taler Wallet browser extension",
"main": "./build/index.js",
"types": "./build/index.d.ts",
@@ -75,4 +75,4 @@
"pogen": {
"domain": "taler-wallet-webex"
}
-}
+}
\ No newline at end of file
diff --git a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
index 80f0479c8..9ed41c5de 100644
--- a/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
+++ b/packages/taler-wallet-webextension/src/wallet/Transaction.tsx
@@ -121,7 +121,7 @@ export function TransactionPage({ tid, goToWalletHistory }:
Props): VNode {
<TransactionView
transaction={state.response}
onCancel={async () => {
- await api.wallet.call(WalletApiOperation.CancelAbortingTransaction, {
+ await api.wallet.call(WalletApiOperation.FailTransaction, {
transactionId,
});
goToWalletHistory(currency);
diff --git a/packages/web-util/package.json b/packages/web-util/package.json
index 0fc76c0d6..3c785eaec 100644
--- a/packages/web-util/package.json
+++ b/packages/web-util/package.json
@@ -1,6 +1,6 @@
{
"name": "@gnu-taler/web-util",
- "version": "0.9.3-dev.13",
+ "version": "0.9.3-dev.16",
"description": "Generic helper functionality for GNU Taler Web Apps",
"type": "module",
"types": "./lib/index.node.d.ts",
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-wallet-core] branch master updated (32937795c -> 77849fdf5),
gnunet <=