Merge branch 'develop' into zhangsoledad/rpc-bump

Author: zhangsoledad

deny.toml

@@ -75,6 +75,12 @@ ignore = [
   "RUSTSEC-2024-0370",
   # instant's maintainer no longer maintained, use web-time instead
   "RUSTSEC-2024-0384",
+  # humantime's maintainer no longer maintained
+  "RUSTSEC-2025-0014",
+  # paste's maintainer no longer maintained
+  "RUSTSEC-2024-0436",
+  # wait https://github.com/tikv/rust-prometheus/issues/538
+  "RUSTSEC-2024-0437",
   #"RUSTSEC-0000-0000",
   #{ id = "RUSTSEC-0000-0000", reason = "you can specify a reason the advisory is ignored" },
   #"[email protected]", # you can also ignore yanked crate versions if you wish
@@ -103,7 +109,7 @@ allow = [
   "ISC",
   "CC0-1.0",
   "Unicode-3.0",
-  "Zlib"
+  "Zlib",
   #"Apache-2.0 WITH LLVM-exception",
 ]
 # The confidence threshold for detecting a license from license text.

devtools/smoking_test/check-migrate.sh

@@ -11,7 +11,7 @@ if [ ${EXIT_CODE} == 0 ]; then
   EXIT_CODE="${PIPESTATUS[0]}"
   echo "migrate exit code is "${EXIT_CODE}
   if [ ${EXIT_CODE} != 0 ]; then
-    echo "migrate faile,please try again"
+    echo "migrate failed,please try again"
     exit ${EXIT_CODE}
   else
     echo "DB migrate done"

script/src/scheduler.rs

@@ -882,9 +882,6 @@ where
 
     // Create a new VM instance with syscalls attached
     fn create_dummy_vm(&self, id: &VmId) -> Result<(VmContext<DL>, Machine), Error> {
-        // The code here looks slightly weird, since I don't want to copy over all syscall
-        // impls here again. Ideally, this scheduler package should be merged with ckb-script,
-        // or simply replace ckb-script. That way, the quirks here will be eliminated.
         let version = &self.sg_data.sg_info.script_version;
         let core_machine = CoreMachineType::new(
             version.vm_isa(),

util/fee-estimator/src/estimator/confirmation_fraction.rs

@@ -72,7 +72,7 @@ struct TxRecord {
 /// In inner, we group samples by predefined fee_rate buckets.
 /// To estimator fee_rate for a confirm target(how many blocks that a tx can get committed),
 /// we travel through fee_rate buckets, try to find a fee_rate X to let a tx get committed
-/// with high probilities within confirm target blocks.
+/// with high probabilities within confirm target blocks.
 ///
 #[derive(Clone)]
 pub struct Algorithm {