Fix inactive-share delete writing shares table as parent_table_handle

Dockerfile

@@ -2,41 +2,53 @@
 
 # Stage 1: Build the binary
 
-FROM rust:slim-bullseye as builder
+FROM rust:slim-bookworm AS builder
 
 WORKDIR /app
 
 COPY --link . /app
 
-RUN for i in 1 2 3; do apt-get update && apt-get install --fix-missing -y cmake curl clang git pkg-config libssl-dev libdw-dev libpq-dev lld && break || sleep 10; done
+RUN apt-get update \
+    && apt-get install --no-install-recommends --fix-missing -y \
+        cmake \
+        curl \
+        clang \
+        make \
+        git \
+        pkg-config \
+        libssl-dev \
+        libdw-dev \
+        libpq-dev \
+        lld \
+    && rm -rf /var/lib/apt/lists/*
 ENV CARGO_NET_GIT_FETCH_WITH_CLI true
 # TODO: Fix this with real processors.
 RUN cargo build --locked --release -p processor && ls -lah target/release/
 RUN cp target/release/processor /usr/local/bin
 
 # add build info
 ARG GIT_TAG
 ENV GIT_TAG ${GIT_TAG}
 ARG GIT_BRANCH
 ENV GIT_BRANCH ${GIT_BRANCH}
 ARG GIT_SHA
 ENV GIT_SHA ${GIT_SHA}
 
 # Stage 2: Create the final image
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 COPY --from=builder /usr/local/bin/processor /usr/local/bin
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
     apt-get update && apt-get install --no-install-recommends --fix-missing -y \
-        libssl1.1 \
+        libssl3 \
         ca-certificates \
         net-tools \
         tcpdump \
         iproute2 \
-        netcat \
+        netcat-openbsd \
         libdw-dev \
         libpq-dev \
         curl
@@ -45,11 +57,11 @@
 
 # add build info
 ARG GIT_TAG
 ENV GIT_TAG ${GIT_TAG}
 ARG GIT_BRANCH
 ENV GIT_BRANCH ${GIT_BRANCH}
 ARG GIT_SHA
 ENV GIT_SHA ${GIT_SHA}
 
 # The health check port
 EXPOSE 8084

Dockerfile.address-reputation-api

@@ -2,40 +2,52 @@
 
 # Stage 1: Build the binary
 
-FROM rust:slim-bullseye as builder
+FROM rust:slim-bookworm AS builder
 
 WORKDIR /app
 
 COPY --link . /app
 
-RUN for i in 1 2 3; do apt-get update && apt-get install --fix-missing -y cmake curl clang git pkg-config libssl-dev libdw-dev libpq-dev lld && break || sleep 10; done
+RUN apt-get update \
+    && apt-get install --no-install-recommends --fix-missing -y \
+        cmake \
+        curl \
+        clang \
+        make \
+        git \
+        pkg-config \
+        libssl-dev \
+        libdw-dev \
+        libpq-dev \
+        lld \
+    && rm -rf /var/lib/apt/lists/*
 ENV CARGO_NET_GIT_FETCH_WITH_CLI true
 RUN cargo build --locked --release -p address-reputation-api && ls -lah target/release/
 RUN cp target/release/address-reputation-api /usr/local/bin
 
 # add build info
 ARG GIT_TAG
 ENV GIT_TAG ${GIT_TAG}
 ARG GIT_BRANCH
 ENV GIT_BRANCH ${GIT_BRANCH}
 ARG GIT_SHA
 ENV GIT_SHA ${GIT_SHA}
 
 # Stage 2: Create the final image
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 COPY --from=builder /usr/local/bin/address-reputation-api /usr/local/bin
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
     apt-get update && apt-get install --no-install-recommends --fix-missing -y \
-        libssl1.1 \
+        libssl3 \
         ca-certificates \
         net-tools \
         tcpdump \
         iproute2 \
-        netcat \
+        netcat-openbsd \
         libdw-dev \
         libpq-dev \
         curl
@@ -44,11 +56,11 @@
 
 # add build info
 ARG GIT_TAG
 ENV GIT_TAG ${GIT_TAG}
 ARG GIT_BRANCH
 ENV GIT_BRANCH ${GIT_BRANCH}
 ARG GIT_SHA
 ENV GIT_SHA ${GIT_SHA}
 
 # API server port (matches ServerConfig default; override via config file)
 EXPOSE 8080

processor/src/processors/stake/models/delegator_balances.rs

@@ -216,28 +216,15 @@ impl CurrentDelegatorBalance {
                     txn_version
                 ))?;
             let shares = shares / &pool_balance.scaling_factor;
-            Ok(Some((
-                DelegatorBalance {
-                    transaction_version: txn_version,
-                    write_set_change_index,
-                    delegator_address: delegator_address.clone(),
-                    pool_address: pool_address.clone(),
-                    pool_type: "inactive_shares".to_string(),
-                    table_handle: table_handle.clone(),
-                    shares: shares.clone(),
-                    parent_table_handle: inactive_pool_handle.clone(),
-                    block_timestamp,
-                },
-                Self {
-                    delegator_address,
-                    pool_address,
-                    pool_type: "inactive_shares".to_string(),
-                    table_handle: table_handle.clone(),
-                    last_transaction_version: txn_version,
-                    shares,
-                    parent_table_handle: inactive_pool_handle,
-                    block_timestamp,
-                },
+            Ok(Some(Self::inactive_share_rows(
+                txn_version,
+                write_set_change_index,
+                delegator_address,
+                pool_address,
+                table_handle,
+                inactive_pool_handle,
+                shares,
+                block_timestamp,
             )))
         } else {
             Ok(None)
@@ -321,33 +308,59 @@ impl CurrentDelegatorBalance {
             };
             let delegator_address = standardize_address(&delete_table_item.key.to_string());
 
-            return Ok(Some((
-                DelegatorBalance {
-                    transaction_version: txn_version,
-                    write_set_change_index,
-                    delegator_address: delegator_address.clone(),
-                    pool_address: pool_address.clone(),
-                    pool_type: "inactive_shares".to_string(),
-                    table_handle: table_handle.clone(),
-                    shares: BigDecimal::zero(),
-                    parent_table_handle: inactive_pool_handle.clone(),
-                    block_timestamp,
-                },
-                Self {
-                    delegator_address,
-                    pool_address,
-                    pool_type: "inactive_shares".to_string(),
-                    table_handle: table_handle.clone(),
-                    last_transaction_version: txn_version,
-                    shares: BigDecimal::zero(),
-                    parent_table_handle: table_handle,
-                    block_timestamp,
-                },
+            return Ok(Some(Self::inactive_share_rows(
+                txn_version,
+                write_set_change_index,
+                delegator_address,
+                pool_address,
+                table_handle,
+                inactive_pool_handle,
+                BigDecimal::zero(),
+                block_timestamp,
             )));
         }
         Ok(None)
     }
 
+    /// History and current inactive-share rows both store the inactive-pool
+    /// table handle as `parent_table_handle`. That is the key
+    /// `get_staking_pool_from_inactive_share_handle` looks up later.
+    /// The shares table handle stays on `table_handle`.
+    fn inactive_share_rows(
+        txn_version: i64,
+        write_set_change_index: i64,
+        delegator_address: String,
+        pool_address: String,
+        table_handle: String,
+        inactive_pool_handle: String,
+        shares: BigDecimal,
+        block_timestamp: NaiveDateTime,
+    ) -> (DelegatorBalance, Self) {
+        (
+            DelegatorBalance {
+                transaction_version: txn_version,
+                write_set_change_index,
+                delegator_address: delegator_address.clone(),
+                pool_address: pool_address.clone(),
+                pool_type: "inactive_shares".to_string(),
+                table_handle: table_handle.clone(),
+                shares: shares.clone(),
+                parent_table_handle: inactive_pool_handle.clone(),
+                block_timestamp,
+            },
+            Self {
+                delegator_address,
+                pool_address,
+                pool_type: "inactive_shares".to_string(),
+                table_handle,
+                last_transaction_version: txn_version,
+                shares,
+                parent_table_handle: inactive_pool_handle,
+                block_timestamp,
+            },
+        )
+    }
+
     /// Key is the inactive share table handle obtained from 0x1::delegation_pool::DelegationPool
     /// Value is the same metadata although it's not really used
     pub fn get_active_pool_to_staking_pool_mapping(
@@ -702,3 +715,70 @@ impl From<DelegatorBalance> for PostgresDelegatorBalance {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use chrono::NaiveDateTime;
+
+    fn block_timestamp() -> NaiveDateTime {
+        NaiveDateTime::parse_from_str("2024-01-01 00:00:00", "%Y-%m-%d %H:%M:%S").unwrap()
+    }
+
+    fn sample_inactive_share_rows(
+        shares: BigDecimal,
+    ) -> (String, String, DelegatorBalance, CurrentDelegatorBalance) {
+        let shares_table_handle =
+            "0x00000000000000000000000000000000000000000000000000000000000000aa".to_string();
+        let inactive_pool_handle =
+            "0x00000000000000000000000000000000000000000000000000000000000000bb".to_string();
+        let (history, current) = CurrentDelegatorBalance::inactive_share_rows(
+            42,
+            3,
+            "0x00000000000000000000000000000000000000000000000000000000000000cc".to_string(),
+            "0x00000000000000000000000000000000000000000000000000000000000000dd".to_string(),
+            shares_table_handle.clone(),
+            inactive_pool_handle.clone(),
+            shares,
+            block_timestamp(),
+        );
+        (shares_table_handle, inactive_pool_handle, history, current)
+    }
+
+    #[test]
+    fn delete_current_row_uses_inactive_pool_parent_handle() {
+        let (shares_table_handle, inactive_pool_handle, history, current) =
+            sample_inactive_share_rows(BigDecimal::zero());
+
+        assert_ne!(shares_table_handle, inactive_pool_handle);
+        assert_eq!(history.table_handle, shares_table_handle);
+        assert_eq!(current.table_handle, shares_table_handle);
+        assert_eq!(history.parent_table_handle, inactive_pool_handle);
+        // Regression: delete used to copy `table_handle` (shares table) into
+        // current.parent_table_handle, breaking get_by_inactive_share_handle.
+        assert_eq!(current.parent_table_handle, inactive_pool_handle);
+        assert_ne!(current.parent_table_handle, shares_table_handle);
+        assert!(history.shares.is_zero());
+        assert!(current.shares.is_zero());
+        assert_eq!(current.pool_type, "inactive_shares");
+        assert_eq!(history.pool_type, "inactive_shares");
+    }
+
+    #[test]
+    fn write_and_delete_agree_on_parent_table_handle() {
+        let (_, inactive_pool_handle, write_history, write_current) =
+            sample_inactive_share_rows(BigDecimal::from(10));
+        let (_, _, delete_history, delete_current) = sample_inactive_share_rows(BigDecimal::zero());
+
+        assert_eq!(write_history.parent_table_handle, inactive_pool_handle);
+        assert_eq!(write_current.parent_table_handle, inactive_pool_handle);
+        assert_eq!(
+            write_current.parent_table_handle,
+            delete_current.parent_table_handle
+        );
+        assert_eq!(
+            write_history.parent_table_handle,
+            delete_history.parent_table_handle
+        );
+    }
+}

scripts/rust_lint.sh

@@ -25,7 +25,10 @@ fi
 set -e
 set -x
 
-cargo +nightly xclippy
+# Run clippy on the pinned STABLE toolchain (from rust-toolchain.toml), NOT
+# nightly. Latest nightly makes Infallible an alias of !, which breaks
+# allocative (impl Allocative for both). Stable clippy matches the build toolchain.
+cargo xclippy
 
 # We require the nightly build of cargo fmt
 # to provide stricter rust formatting.