Browse Source

chore: updated sled-overlay to new version

skoupidi 6 months ago
parent
commit
7914422d8b

+ 2 - 2
Cargo.lock

@@ -6579,9 +6579,9 @@ dependencies = [
 
 [[package]]
 name = "sled-overlay"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84cfae62f52cad8adbf36565bd86225f8e432b2cb1be2db7cb21567b2063e01"
+checksum = "a5fc614ea0955880dfc4382bdf55cb5b93e501664be05c5a4ffd181cadec907e"
 dependencies = [
  "sled",
 ]

+ 1 - 1
Cargo.toml

@@ -114,7 +114,7 @@ wasmer-compiler-singlepass = {version = "6.1.0", optional = true}
 wasmer-middlewares = {version = "6.1.0", optional = true}
 
 # Blockchain store
-sled-overlay = {version = "0.1.15", optional = true}
+sled-overlay = {version = "0.1.16", optional = true}
 
 # Miner
 randomx = {git = "https://codeberg.org/darkrenaissance/RandomX", rev = "0e31d5a", optional = true}

+ 2 - 2
bin/app/Cargo.lock

@@ -5508,9 +5508,9 @@ dependencies = [
 
 [[package]]
 name = "sled-overlay"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84cfae62f52cad8adbf36565bd86225f8e432b2cb1be2db7cb21567b2063e01"
+checksum = "a5fc614ea0955880dfc4382bdf55cb5b93e501664be05c5a4ffd181cadec907e"
 dependencies = [
  "sled",
 ]

+ 1 - 1
bin/app/Cargo.toml

@@ -36,7 +36,7 @@ futures = "0.3.31"
 async-recursion = "1.1.1"
 colored = "3.0.0"
 #rustpython-vm = "0.3.1"
-sled-overlay = "0.1.15"
+sled-overlay = "0.1.16"
 url = "2.5.7"
 semver = "1.0.27"
 chrono = "0.4.42"

+ 1 - 1
bin/darkfid/Cargo.toml

@@ -22,7 +22,7 @@ bs58 = "0.5.1"
 tracing = "0.1.44"
 num-bigint = "0.4.6"
 rand = "0.8.5"
-sled-overlay = "0.1.15"
+sled-overlay = "0.1.16"
 toml = "0.9.8"
 
 # JSON-RPC

+ 1 - 1
bin/darkirc/Cargo.toml

@@ -24,7 +24,7 @@ darkfi-serial = {path = "../../src/serial", features = ["async"]}
 libc = "0.2.178"
 
 # Event Graph DB
-sled-overlay = "0.1.15"
+sled-overlay = "0.1.16"
 
 # TLS
 async-trait = "0.1.89"

+ 1 - 1
bin/drk/Cargo.toml

@@ -29,7 +29,7 @@ prettytable-rs = "0.10.0"
 rand = "0.8.5"
 rodio = {version = "0.21.1", default-features = false, features = ["playback", "mp3"]}
 rusqlite = {version = "0.37.0", features = ["sqlcipher"]}
-sled-overlay = "0.1.15"
+sled-overlay = "0.1.16"
 toml = "0.9.8"
 tracing = "0.1.44"
 url = "2.5.7"

+ 1 - 1
bin/fud/fud/Cargo.toml

@@ -48,7 +48,7 @@ blake2 = "0.10.6"
 equix = "0.5.1"
 
 # Database
-sled-overlay = "0.1.15"
+sled-overlay = "0.1.16"
 
 # Argument parsing
 serde = {version = "1.0.228", features = ["derive"]}

+ 1 - 1
bin/genev/genevd/Cargo.toml

@@ -28,7 +28,7 @@ darkfi-serial = {path = "../../../src/serial"}
 blake3 = "1.8.2"
 
 # Event Graph DB
-sled-overlay = "0.1.15"
+sled-overlay = "0.1.16"
 
 # Misc
 async-trait = "0.1.89"

+ 1 - 1
bin/tau/taud/Cargo.toml

@@ -28,7 +28,7 @@ darkfi-sdk = {path = "../../../src/sdk", features = ["async"]}
 darkfi-serial = {path = "../../../src/serial"}
 
 # Event Graph DB
-sled-overlay = "0.1.15"
+sled-overlay = "0.1.16"
 
 # Crypto
 blake3 = "1.8.2"

+ 1 - 1
script/evgrd/Cargo.toml

@@ -26,7 +26,7 @@ darkfi = {path = "../../", features = ["event-graph"]}
 darkfi-serial = {path = "../../src/serial", features = ["async"]}
 
 # Event Graph DB
-sled-overlay = "0.1.15"
+sled-overlay = "0.1.16"
 
 # Crypto
 blake3 = "1.8.2"

+ 1 - 1
script/research/gg/Cargo.toml

@@ -23,7 +23,7 @@ darkfi-serial = {path = "../../../src/serial"}
 # Misc
 bs58 = "0.5.1"
 clap = {version = "4.4.11", features = ["derive"]}
-sled-overlay = "0.1.15"
+sled-overlay = "0.1.16"
 smol = "2.0.2"
 
 [patch.crates-io]

+ 1 - 1
script/research/rlnd/rlnd/Cargo.toml

@@ -17,7 +17,7 @@ darkfi-serial = {path = "../../../../src/serial"}
 
 # Misc
 bs58 = "0.5.1"
-sled-overlay = "0.1.15"
+sled-overlay = "0.1.16"
 tracing = "0.1.44"
 
 # JSON-RPC

+ 1 - 1
script/research/tx-replayer/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2024"
 darkfi = {path = "../../../", features = ["validator"]}
 darkfi-sdk = {path = "../../../src/sdk"}
 darkfi-serial = {path = "../../../src/serial"}
-sled-overlay = {version = "0.1.10"}
+sled-overlay = {version = "0.1.16"}
 smol = {version = "2.0.2"}
 clap = {version = "4.4.11", features = ["derive"]}
 

+ 2 - 4
src/blockchain/mod.rs

@@ -702,10 +702,8 @@ impl BlockchainOverlay {
     }
 
     /// Revert to current overlay checkpoint.
-    pub fn revert_to_checkpoint(&self) -> Result<()> {
-        self.overlay.lock().unwrap().revert_to_checkpoint()?;
-
-        Ok(())
+    pub fn revert_to_checkpoint(&self) {
+        self.overlay.lock().unwrap().revert_to_checkpoint();
     }
 
     /// Auxiliary function to create a full clone using SledDbOverlay::clone,

+ 1 - 1
src/contract/test-harness/Cargo.toml

@@ -19,7 +19,7 @@ blake3 = "1.8.2"
 tracing = "0.1.44"
 tracing-subscriber = { version = "0.3.22", default-features = false, features = ["fmt"] }
 rand = "0.8.5"
-sled-overlay = "0.1.15"
+sled-overlay = "0.1.16"
 
 [lints]
 workspace = true

+ 1 - 1
src/sdk/Cargo.toml

@@ -46,7 +46,7 @@ subtle = "2.6.1"
 hashbrown = "0.16.1"
 
 # Storage
-sled-overlay = "0.1.15"
+sled-overlay = "0.1.16"
 
 [dev-dependencies]
 halo2_proofs = {version = "0.3.2", features = ["circuit-params", "dev-graph", "sanity-checks"]}

+ 1 - 1
src/serial/Cargo.toml

@@ -21,7 +21,7 @@ pasta_curves = {version = "0.5", optional = true}
 semver = {version = "1", optional = true}
 url = {version = "2", optional = true}
 num-bigint = {version = "0.4", optional = true}
-sled-overlay = {version = "0.1.15", optional = true}
+sled-overlay = {version = "0.1.16", optional = true}
 
 [features]
 default = ["derive", "semver"]

+ 2 - 2
src/validator/consensus.rs

@@ -884,7 +884,7 @@ impl Fork {
                 Ok(gas_values) => gas_values,
                 Err(e) => {
                     debug!(target: "validator::consensus::unproposed_txs", "Transaction verification failed: {e}");
-                    self.overlay.lock().unwrap().revert_to_checkpoint()?;
+                    self.overlay.lock().unwrap().revert_to_checkpoint();
                     continue
                 }
             };
@@ -901,7 +901,7 @@ impl Fork {
                     target: "validator::consensus::unproposed_txs",
                     "Retrieving transaction {tx} would exceed configured unproposed transaction gas limit: {accumulated_gas_usage} - {BLOCK_GAS_LIMIT}"
                 );
-                self.overlay.lock().unwrap().revert_to_checkpoint()?;
+                self.overlay.lock().unwrap().revert_to_checkpoint();
                 break
             }
 

+ 3 - 3
src/validator/verification.rs

@@ -1019,7 +1019,7 @@ pub async fn verify_transactions(
             Err(e) => {
                 warn!(target: "validator::verification::verify_transactions", "Transaction verification failed: {e}");
                 erroneous_txs.push(tx.clone());
-                overlay.lock().unwrap().revert_to_checkpoint()?;
+                overlay.lock().unwrap().revert_to_checkpoint();
                 continue
             }
         };
@@ -1038,7 +1038,7 @@ pub async fn verify_transactions(
                 tx.hash()
             );
             erroneous_txs.push(tx.clone());
-            overlay.lock().unwrap().revert_to_checkpoint()?;
+            overlay.lock().unwrap().revert_to_checkpoint();
             break
         }
 
@@ -1080,7 +1080,7 @@ async fn apply_transactions(
         {
             warn!(target: "validator::verification::apply_transactions", "Transaction apply failed: {e}");
             erroneous_txs.push(tx.clone());
-            overlay.lock().unwrap().revert_to_checkpoint()?;
+            overlay.lock().unwrap().revert_to_checkpoint();
         };
     }