diff options
author | Florian Dold <florian@dold.me> | 2022-10-14 23:01:41 +0200 |
---|---|---|
committer | Florian Dold <florian@dold.me> | 2022-10-14 23:01:41 +0200 |
commit | 4d70391f3db386766a516bdecc3d1d265c5d49a1 (patch) | |
tree | 32c0c924cf040d25bc1e8c5d9b942313ceabdd30 /packages/taler-wallet-core/src | |
parent | 3a2b96f3c2dcdf106c989713253a8b3679ae078e (diff) | |
download | wallet-core-4d70391f3db386766a516bdecc3d1d265c5d49a1.tar.xz |
wallet-core: address another DB FIXME
Diffstat (limited to 'packages/taler-wallet-core/src')
-rw-r--r-- | packages/taler-wallet-core/src/db.ts | 11 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/operations/withdraw.ts | 15 |
2 files changed, 10 insertions, 16 deletions
diff --git a/packages/taler-wallet-core/src/db.ts b/packages/taler-wallet-core/src/db.ts index 002db9805..c301ee457 100644 --- a/packages/taler-wallet-core/src/db.ts +++ b/packages/taler-wallet-core/src/db.ts @@ -588,17 +588,6 @@ export interface PlanchetRecord { 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; blindingKey: string; diff --git a/packages/taler-wallet-core/src/operations/withdraw.ts b/packages/taler-wallet-core/src/operations/withdraw.ts index 2932cfa5f..a258c5d76 100644 --- a/packages/taler-wallet-core/src/operations/withdraw.ts +++ b/packages/taler-wallet-core/src/operations/withdraw.ts @@ -431,7 +431,6 @@ async function processPlanchetGenerate( coinPriv: r.coinPriv, coinPub: r.coinPub, denomPubHash: r.denomPubHash, - reservePub: r.reservePub, planchetStatus: PlanchetStatus.Pending, withdrawSig: r.withdrawSig, withdrawalGroupId: withdrawalGroup.withdrawalGroupId, @@ -515,7 +514,7 @@ async function processPlanchetExchangeRequest( coin_ev: planchet.coinEv, }; const reqUrl = new URL( - `reserves/${planchet.reservePub}/withdraw`, + `reserves/${withdrawalGroup.reservePub}/withdraw`, exchange.baseUrl, ).href; @@ -746,7 +745,7 @@ async function processPlanchetVerifyAndStoreCoin( coinSource: { type: CoinSourceType.Withdraw, coinIndex: coinIdx, - reservePub: planchet.reservePub, + reservePub: withdrawalGroup.reservePub, withdrawalGroupId: withdrawalGroup.withdrawalGroupId, }, maxAge: planchet.maxAge, @@ -1858,7 +1857,10 @@ export async function acceptWithdrawalFromUri( return { reservePub: withdrawalGroup.reservePub, confirmTransferUrl: withdrawInfo.confirmTransferUrl, - transactionId: makeTransactionId(TransactionType.Withdrawal, withdrawalGroupId), + transactionId: makeTransactionId( + TransactionType.Withdrawal, + withdrawalGroupId, + ), }; } @@ -1919,6 +1921,9 @@ export async function createManualWithdrawal( return { reservePub: withdrawalGroup.reservePub, exchangePaytoUris: exchangePaytoUris, - transactionId: makeTransactionId(TransactionType.Withdrawal, withdrawalGroupId), + transactionId: makeTransactionId( + TransactionType.Withdrawal, + withdrawalGroupId, + ), }; } |