taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

make tipping work with latest merchant protocol

Browse Source
This commit is contained in:
Florian Dold 2022-01-24 20:51:44 +01:00
parent ee492b2552
commit 171d070a83
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/taler-util/src/talerTypes.ts
View File

@ -1654,3 +1654,14 @@ export enum ExchangeProtocolVersion {
V9 = 9,
V12 = 12,
}
export enum MerchantProtocolVersion {
/**
* Legacy version that is still supported.
*/
V1 = 1,
/**
* Current version supported by the wallet.
*/
V3 = 3,
}

11
packages/taler-wallet-core/src/operations/tip.ts
View File

@ -33,6 +33,7 @@ import {
DenomKeyType,
BlindedDenominationSignature,
codecForMerchantTipResponseV2,
MerchantProtocolVersion,
} from "@gnu-taler/taler-util";
import { DerivedTipPlanchet } from "../crypto/cryptoTypes.js";
import {
@ -314,13 +315,15 @@ async function processTipImpl(
let blindedSigs: BlindedDenominationSignature[] = [];
if (merchantInfo.protocolVersionCurrent === 2) {
if (merchantInfo.protocolVersionCurrent === MerchantProtocolVersion.V3) {
const response = await readSuccessResponseJsonOrThrow(
merchantResp,
codecForMerchantTipResponseV2(),
);
blindedSigs = response.blind_sigs.map((x) => x.blind_sig);
} else if (merchantInfo.protocolVersionCurrent === 1) {
} else if (
merchantInfo.protocolVersionCurrent === MerchantProtocolVersion.V1
) {
const response = await readSuccessResponseJsonOrThrow(
merchantResp,
codecForMerchantTipResponseV1(),
@ -330,7 +333,9 @@ async function processTipImpl(
blinded_rsa_signature: x.blind_sig,
}));
} else {
throw Error("unsupported merchant protocol version");
throw Error(
`unsupported merchant protocol version (${merchantInfo.protocolVersionCurrent})`,
);
}
if (blindedSigs.length !== planchets.length) {