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

wallet-core: address another DB FIXME

Browse Source
This commit is contained in:
Florian Dold 2022-10-14 23:01:41 +02:00
parent 3a2b96f3c2
commit 4d70391f3d
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -588,17 +588,6 @@ export interface PlanchetRecord {
lastError: TalerErrorDetail | undefined; lastError: TalerErrorDetail | undefined;
/**
* Public key of the reserve that this planchet
* is being withdrawn from.
*
* Can be the empty string (non-null/undefined for DB indexing)
* if this is a tipping reserve.
*
* FIXME: Where is this used?
*/
reservePub: string;
denomPubHash: string; denomPubHash: string;
blindingKey: string; blindingKey: string;

15
packages/taler-wallet-core/src/operations/withdraw.ts
View File

@ -431,7 +431,6 @@ async function processPlanchetGenerate(
coinPriv: r.coinPriv, coinPriv: r.coinPriv,
coinPub: r.coinPub, coinPub: r.coinPub,
denomPubHash: r.denomPubHash, denomPubHash: r.denomPubHash,
reservePub: r.reservePub,
planchetStatus: PlanchetStatus.Pending, planchetStatus: PlanchetStatus.Pending,
withdrawSig: r.withdrawSig, withdrawSig: r.withdrawSig,
withdrawalGroupId: withdrawalGroup.withdrawalGroupId, withdrawalGroupId: withdrawalGroup.withdrawalGroupId,
@ -515,7 +514,7 @@ async function processPlanchetExchangeRequest(
coin_ev: planchet.coinEv, coin_ev: planchet.coinEv,
}; };
const reqUrl = new URL( const reqUrl = new URL(
`reserves/${planchet.reservePub}/withdraw`, `reserves/${withdrawalGroup.reservePub}/withdraw`,
exchange.baseUrl, exchange.baseUrl,
).href; ).href;
@ -746,7 +745,7 @@ async function processPlanchetVerifyAndStoreCoin(
coinSource: { coinSource: {
type: CoinSourceType.Withdraw, type: CoinSourceType.Withdraw,
coinIndex: coinIdx, coinIndex: coinIdx,
reservePub: planchet.reservePub, reservePub: withdrawalGroup.reservePub,
withdrawalGroupId: withdrawalGroup.withdrawalGroupId, withdrawalGroupId: withdrawalGroup.withdrawalGroupId,
}, },
maxAge: planchet.maxAge, maxAge: planchet.maxAge,
@ -1858,7 +1857,10 @@ export async function acceptWithdrawalFromUri(
return { return {
reservePub: withdrawalGroup.reservePub, reservePub: withdrawalGroup.reservePub,
confirmTransferUrl: withdrawInfo.confirmTransferUrl, confirmTransferUrl: withdrawInfo.confirmTransferUrl,
transactionId: makeTransactionId(TransactionType.Withdrawal, withdrawalGroupId), transactionId: makeTransactionId(
TransactionType.Withdrawal,
withdrawalGroupId,
),
}; };
} }
@ -1919,6 +1921,9 @@ export async function createManualWithdrawal(
return { return {
reservePub: withdrawalGroup.reservePub, reservePub: withdrawalGroup.reservePub,
exchangePaytoUris: exchangePaytoUris, exchangePaytoUris: exchangePaytoUris,
transactionId: makeTransactionId(TransactionType.Withdrawal, withdrawalGroupId), transactionId: makeTransactionId(
TransactionType.Withdrawal,
withdrawalGroupId,
),
}; };
} }