diff options
| -rw-r--r-- | packages/taler-wallet-core/src/db-utils.ts | 1 | ||||
| -rw-r--r-- | packages/taler-wallet-core/src/operations/backup/state.ts | 4 | ||||
| -rw-r--r-- | packages/taler-wallet-core/src/operations/exchanges.ts | 12 |
3 files changed, 10 insertions, 7 deletions
diff --git a/packages/taler-wallet-core/src/db-utils.ts b/packages/taler-wallet-core/src/db-utils.ts index 88960e6b1..0329ca17a 100644 --- a/packages/taler-wallet-core/src/db-utils.ts +++ b/packages/taler-wallet-core/src/db-utils.ts @@ -193,6 +193,7 @@ export async function openTalerDatabase( case "taler-wallet-main-v3": case "taler-wallet-main-v4": // temporary, we might migrate v4 later case "taler-wallet-main-v5": + case "taler-wallet-main-v6": // We consider this a pre-release // development version, no migration is done. await metaDb diff --git a/packages/taler-wallet-core/src/operations/backup/state.ts b/packages/taler-wallet-core/src/operations/backup/state.ts index b8dbb15c1..fa632f44c 100644 --- a/packages/taler-wallet-core/src/operations/backup/state.ts +++ b/packages/taler-wallet-core/src/operations/backup/state.ts @@ -62,7 +62,9 @@ export async function provideBackupState( }; await tx.config.put(backupStateEntry); } - checkDbInvariant(backupStateEntry.key === ConfigRecordKey.WalletBackupState); + checkDbInvariant( + backupStateEntry.key === ConfigRecordKey.WalletBackupState, + ); return backupStateEntry.value; }); } diff --git a/packages/taler-wallet-core/src/operations/exchanges.ts b/packages/taler-wallet-core/src/operations/exchanges.ts index d0da2e948..a8c4fec10 100644 --- a/packages/taler-wallet-core/src/operations/exchanges.ts +++ b/packages/taler-wallet-core/src/operations/exchanges.ts @@ -674,13 +674,11 @@ export async function updateExchangeFromUrlHandler( logger.warn(`exchange ${exchangeBaseUrl} no longer present`); return; } - let existingDetails = await getExchangeDetails(tx, r.baseUrl); - let acceptedTosEtag: string | undefined = undefined; + const existingDetails = await getExchangeDetails(tx, r.baseUrl); if (!existingDetails) { detailsPointerChanged = true; } if (existingDetails) { - acceptedTosEtag = existingDetails.tosAccepted?.etag; if (existingDetails.masterPublicKey !== keysInfo.masterPublicKey) { detailsPointerChanged = true; } @@ -689,9 +687,8 @@ export async function updateExchangeFromUrlHandler( } // FIXME: We need to do some consistency checks! } - let existingTosAccepted = existingDetails?.tosAccepted; - const newDetails = { - rowId: existingDetails?.rowId, + const existingTosAccepted = existingDetails?.tosAccepted; + const newDetails: ExchangeDetailsRecord = { auditors: keysInfo.auditors, currency: keysInfo.currency, masterPublicKey: keysInfo.masterPublicKey, @@ -703,6 +700,9 @@ export async function updateExchangeFromUrlHandler( tosCurrentEtag: tosDownload.tosEtag, tosAccepted: existingTosAccepted, }; + if (existingDetails?.rowId) { + newDetails.rowId = existingDetails.rowId; + } r.lastUpdate = TalerProtocolTimestamp.now(); r.nextUpdate = keysInfo.expiry; // New denominations might be available. |