From 358073a6cb3cffe83e4bb7a3ac3dfb778dc806bc Mon Sep 17 00:00:00 2001 From: Han Tuzun Date: Mon, 6 Feb 2023 03:16:18 +0300 Subject: [PATCH] Upgrade to redb 0.13.0 (#1513) --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/index.rs | 2 +- src/index/updater/inscription_updater.rs | 24 ++++++++++++------------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aaf37e866d..1ca697a04c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2555,9 +2555,9 @@ dependencies = [ [[package]] name = "redb" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104c124eba7be2bc4c2c9f97d1abfdc8d8f3e0fc16fe95c030dcbebd4860a749" +checksum = "78f210bb101d3a0ddba42f67b12a1d7186e584733ad028f119c8d217d867f03d" dependencies = [ "libc", "pyo3-build-config", diff --git a/Cargo.toml b/Cargo.toml index 46fa8f2228..a309164901 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -38,7 +38,7 @@ mime_guess = "2.0.4" miniscript = "9.0.0" mp4 = "0.12.0" ord-bitcoincore-rpc = "0.16.5" -redb = "0.12.1" +redb = "0.13.0" regex = "1.6.0" rss = "2.0.1" rust-embed = "6.4.0" diff --git a/src/index.rs b/src/index.rs index 1a51fdad36..1484e09f68 100644 --- a/src/index.rs +++ b/src/index.rs @@ -862,7 +862,7 @@ impl Index { } fn inscriptions_on_output<'a: 'tx, 'tx>( - satpoint_to_id: &'a impl ReadableTable<&'tx SatPointValue, &'tx InscriptionIdValue>, + satpoint_to_id: &'a impl ReadableTable<&'static SatPointValue, &'static InscriptionIdValue>, outpoint: OutPoint, ) -> Result + 'tx> { let start = SatPoint { diff --git a/src/index/updater/inscription_updater.rs b/src/index/updater/inscription_updater.rs index f0a5f67457..9fe83b13ee 100644 --- a/src/index/updater/inscription_updater.rs +++ b/src/index/updater/inscription_updater.rs @@ -14,16 +14,16 @@ enum Origin { pub(super) struct InscriptionUpdater<'a, 'db, 'tx> { flotsam: Vec, height: u64, - id_to_satpoint: &'a mut Table<'db, 'tx, &'tx InscriptionIdValue, &'tx SatPointValue>, + id_to_satpoint: &'a mut Table<'db, 'tx, &'static InscriptionIdValue, &'static SatPointValue>, index: &'a Index, - id_to_entry: &'a mut Table<'db, 'tx, &'tx InscriptionIdValue, InscriptionEntryValue>, + id_to_entry: &'a mut Table<'db, 'tx, &'static InscriptionIdValue, InscriptionEntryValue>, lost_sats: u64, next_number: u64, - number_to_id: &'a mut Table<'db, 'tx, u64, &'tx InscriptionIdValue>, - outpoint_to_value: &'a mut Table<'db, 'tx, &'tx OutPointValue, u64>, + number_to_id: &'a mut Table<'db, 'tx, u64, &'static InscriptionIdValue>, + outpoint_to_value: &'a mut Table<'db, 'tx, &'static OutPointValue, u64>, reward: u64, - sat_to_inscription_id: &'a mut Table<'db, 'tx, u64, &'tx InscriptionIdValue>, - satpoint_to_id: &'a mut Table<'db, 'tx, &'tx SatPointValue, &'tx InscriptionIdValue>, + sat_to_inscription_id: &'a mut Table<'db, 'tx, u64, &'static InscriptionIdValue>, + satpoint_to_id: &'a mut Table<'db, 'tx, &'static SatPointValue, &'static InscriptionIdValue>, timestamp: u32, value_cache: &'a mut HashMap, } @@ -31,14 +31,14 @@ pub(super) struct InscriptionUpdater<'a, 'db, 'tx> { impl<'a, 'db, 'tx> InscriptionUpdater<'a, 'db, 'tx> { pub(super) fn new( height: u64, - id_to_satpoint: &'a mut Table<'db, 'tx, &'tx InscriptionIdValue, &'tx SatPointValue>, + id_to_satpoint: &'a mut Table<'db, 'tx, &'static InscriptionIdValue, &'static SatPointValue>, index: &'a Index, - id_to_entry: &'a mut Table<'db, 'tx, &'tx InscriptionIdValue, InscriptionEntryValue>, + id_to_entry: &'a mut Table<'db, 'tx, &'static InscriptionIdValue, InscriptionEntryValue>, lost_sats: u64, - number_to_id: &'a mut Table<'db, 'tx, u64, &'tx InscriptionIdValue>, - outpoint_to_value: &'a mut Table<'db, 'tx, &'tx OutPointValue, u64>, - sat_to_inscription_id: &'a mut Table<'db, 'tx, u64, &'tx InscriptionIdValue>, - satpoint_to_id: &'a mut Table<'db, 'tx, &'tx SatPointValue, &'tx InscriptionIdValue>, + number_to_id: &'a mut Table<'db, 'tx, u64, &'static InscriptionIdValue>, + outpoint_to_value: &'a mut Table<'db, 'tx, &'static OutPointValue, u64>, + sat_to_inscription_id: &'a mut Table<'db, 'tx, u64, &'static InscriptionIdValue>, + satpoint_to_id: &'a mut Table<'db, 'tx, &'static SatPointValue, &'static InscriptionIdValue>, timestamp: u32, value_cache: &'a mut HashMap, ) -> Result {