feat: Batch deletions from Utreexo accumulator

Scarb.lock

@@ -23,3 +23,6 @@ version = "0.1.0"
 [[package]]
 name = "utreexo"
 version = "0.1.0"
+dependencies = [
+ "utils",
+]

packages/utils/src/bits.cairo

@@ -0,0 +1,37 @@
+use crate::bit_shifts::shr;
+
+pub fn bit_len(n: u64) -> u64 {
+    let mut x = n | shr(n, 1_u64);
+    x = x | shr(x, 2_u64);
+    x = x | shr(x, 4_u64);
+    x = x | shr(x, 8_u64);
+    x = x | shr(x, 16_u64);
+    x = x | shr(x, 32_u64);
+    x -= shr(x, 1_u64) & 0x5555555555555555_u64;
+    x = (shr(x, 2_u64) & 0x3333333333333333_u64) + (x & 0x3333333333333333_u64);
+    x = (shr(x, 4_u64) + x) & 0x0f0f0f0f0f0f0f0f_u64;
+    x += shr(x, 8_u64);
+    x += shr(x, 16_u64);
+    x += shr(x, 32_u64);
+    x & 0x7f_u64
+}
+
+#[cfg(test)]
+mod tests {
+    use super::bit_len;
+
+    #[test]
+    fn test_bit_len() {
+        assert_eq!(bit_len(0), 0);
+        assert_eq!(bit_len(1), 1);
+        assert_eq!(bit_len(2), 2);
+        assert_eq!(bit_len(3), 2);
+        assert_eq!(bit_len(4), 3);
+        assert_eq!(bit_len(7), 3);
+        assert_eq!(bit_len(8), 4);
+        assert_eq!(bit_len(9), 4);
+        assert_eq!(bit_len(0x4000000000000000), 63);
+        assert_eq!(bit_len(0x8000000000000000), 64);
+        assert_eq!(bit_len(0xffffffffffffffff), 64);
+    }
+}

packages/utils/src/lib.cairo

@@ -1,10 +1,12 @@
 pub mod bit_shifts;
+pub mod bits;
 pub mod bytearray;
 pub mod double_sha256;
 pub mod hash;
 pub mod merkle_tree;
 pub mod numeric;
 pub mod sha256;
+pub mod sort;
 
 #[cfg(target: 'test')]
 pub mod hex;

packages/utils/src/sort.cairo

@@ -0,0 +1,39 @@
+/// Bubble sort from
+/// https://github.com/keep-starknet-strange/alexandria/blob/main/packages/sorting/src/bubble_sort.cairo
+pub fn bubble_sort<T, +Copy<T>, +Drop<T>, +PartialOrd<T>>(mut array: Span<T>) -> Array<T> {
+    if array.len() == 0 {
+        return array![];
+    }
+    if array.len() == 1 {
+        return array![*array[0]];
+    }
+    let mut idx1 = 0;
+    let mut idx2 = 1;
+    let mut sorted_iteration = true;
+    let mut sorted_array = array![];
+
+    loop {
+        if idx2 == array.len() {
+            sorted_array.append(*array[idx1]);
+            if sorted_iteration {
+                break;
+            }
+            array = sorted_array.span();
+            sorted_array = array![];
+            idx1 = 0;
+            idx2 = 1;
+            sorted_iteration = true;
+        } else {
+            if *array[idx1] <= *array[idx2] {
+                sorted_array.append(*array[idx1]);
+                idx1 = idx2;
+                idx2 += 1;
+            } else {
+                sorted_array.append(*array[idx2]);
+                idx2 += 1;
+                sorted_iteration = false;
+            }
+        };
+    };
+    sorted_array
+}

packages/utreexo/Scarb.toml

@@ -3,6 +3,9 @@ name = "utreexo"
 version = "0.1.0"
 edition = "2024_07"
 
+[dependencies]
+utils = { path = "../utils" }
+
 [dev-dependencies]
 cairo_test.workspace = true