From de949412d57557cf4c723c0c8c37a437bd85421a Mon Sep 17 00:00:00 2001 From: ok300 <106775972+ok300@users.noreply.github.com> Date: Mon, 10 Mar 2025 11:17:20 +0100 Subject: [PATCH 1/3] cdk-sqlite: Drop unused table nostr_last_checked --- .../wallet/migrations/20250310111513_drop_nostr_last_checked.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 crates/cdk-sqlite/src/wallet/migrations/20250310111513_drop_nostr_last_checked.sql diff --git a/crates/cdk-sqlite/src/wallet/migrations/20250310111513_drop_nostr_last_checked.sql b/crates/cdk-sqlite/src/wallet/migrations/20250310111513_drop_nostr_last_checked.sql new file mode 100644 index 000000000..85bb406d7 --- /dev/null +++ b/crates/cdk-sqlite/src/wallet/migrations/20250310111513_drop_nostr_last_checked.sql @@ -0,0 +1 @@ +DROP TABLE IF EXISTS nostr_last_checked; \ No newline at end of file From da5adf75b10ddfa6b982e57bab59a37c159f67d1 Mon Sep 17 00:00:00 2001 From: ok300 <106775972+ok300@users.noreply.github.com> Date: Mon, 10 Mar 2025 11:25:47 +0100 Subject: [PATCH 2/3] cdk-rexie: Drop unused object store nostr_last_checked --- crates/cdk-rexie/src/wallet.rs | 54 +--------------------------------- 1 file changed, 1 insertion(+), 53 deletions(-) diff --git a/crates/cdk-rexie/src/wallet.rs b/crates/cdk-rexie/src/wallet.rs index 436ad3277..b5ec623b1 100644 --- a/crates/cdk-rexie/src/wallet.rs +++ b/crates/cdk-rexie/src/wallet.rs @@ -27,9 +27,8 @@ const MELT_QUOTES: &str = "melt_quotes"; const PROOFS: &str = "proofs"; const CONFIG: &str = "config"; const KEYSET_COUNTER: &str = "keyset_counter"; -const NOSTR_LAST_CHECKED: &str = "nostr_last_check"; -const DATABASE_VERSION: u32 = 3; +const DATABASE_VERSION: u32 = 4; /// Rexie Database Error #[derive(Debug, Error)] @@ -98,7 +97,6 @@ impl WalletRexieDatabase { .add_object_store(ObjectStore::new(MELT_QUOTES)) .add_object_store(ObjectStore::new(CONFIG)) .add_object_store(ObjectStore::new(KEYSET_COUNTER)) - .add_object_store(ObjectStore::new(NOSTR_LAST_CHECKED)) // Build the database .build() .await @@ -747,54 +745,4 @@ impl WalletDatabase for WalletRexieDatabase { Ok(current_count) } - - async fn add_nostr_last_checked( - &self, - verifying_key: PublicKey, - last_checked: u32, - ) -> Result<(), Self::Err> { - let rexie = self.db.lock().await; - - let transaction = rexie - .transaction(&[NOSTR_LAST_CHECKED], TransactionMode::ReadWrite) - .map_err(Error::from)?; - - let counter_store = transaction.store(NOSTR_LAST_CHECKED).map_err(Error::from)?; - - let verifying_key = serde_wasm_bindgen::to_value(&verifying_key).map_err(Error::from)?; - - let last_checked = serde_wasm_bindgen::to_value(&last_checked).map_err(Error::from)?; - - counter_store - .put(&last_checked, Some(&verifying_key)) - .await - .map_err(Error::from)?; - - transaction.done().await.map_err(Error::from)?; - - Ok(()) - } - - async fn get_nostr_last_checked( - &self, - verifying_key: &PublicKey, - ) -> Result, Self::Err> { - let rexie = self.db.lock().await; - - let transaction = rexie - .transaction(&[NOSTR_LAST_CHECKED], TransactionMode::ReadOnly) - .map_err(Error::from)?; - - let nostr_last_check_store = transaction.store(NOSTR_LAST_CHECKED).map_err(Error::from)?; - - let verifying_key = serde_wasm_bindgen::to_value(verifying_key).map_err(Error::from)?; - - let last_checked = nostr_last_check_store - .get(verifying_key) - .await - .map_err(Error::from)? - .and_then(|l| serde_wasm_bindgen::from_value(l).ok()); - - Ok(last_checked) - } } From 455c65e4b2f70b431dca7e97daed62bf98ce8b31 Mon Sep 17 00:00:00 2001 From: ok300 <106775972+ok300@users.noreply.github.com> Date: Mon, 10 Mar 2025 11:28:45 +0100 Subject: [PATCH 3/3] cdk-redb: Remove unused table ref nostr_last_checked --- crates/cdk-redb/src/wallet/mod.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/crates/cdk-redb/src/wallet/mod.rs b/crates/cdk-redb/src/wallet/mod.rs index 8f6087463..ff00d8782 100644 --- a/crates/cdk-redb/src/wallet/mod.rs +++ b/crates/cdk-redb/src/wallet/mod.rs @@ -40,7 +40,6 @@ const MINT_KEYS_TABLE: TableDefinition<&str, &str> = TableDefinition::new("mint_ const PROOFS_TABLE: TableDefinition<&[u8], &str> = TableDefinition::new("proofs"); const CONFIG_TABLE: TableDefinition<&str, &str> = TableDefinition::new("config"); const KEYSET_COUNTER: TableDefinition<&str, u32> = TableDefinition::new("keyset_counter"); -const NOSTR_LAST_CHECKED: TableDefinition<&str, u32> = TableDefinition::new("keyset_counter"); const DATABASE_VERSION: u32 = 2; @@ -133,7 +132,6 @@ impl WalletRedbDatabase { let _ = write_txn.open_table(MINT_KEYS_TABLE)?; let _ = write_txn.open_table(PROOFS_TABLE)?; let _ = write_txn.open_table(KEYSET_COUNTER)?; - let _ = write_txn.open_table(NOSTR_LAST_CHECKED)?; table.insert("db_version", DATABASE_VERSION.to_string().as_str())?; }