addressed comments

clients/js/jito_tip_router/accounts/operatorSnapshot.ts

@@ -56,6 +56,7 @@ export type OperatorSnapshot = {
   slotCreated: bigint;
   slotFinalized: bigint;
   isActive: number;
+  ncnOperatorIndex: bigint;
   operatorIndex: bigint;
   operatorFeeBps: number;
   vaultOperatorDelegationCount: bigint;
@@ -75,6 +76,7 @@ export type OperatorSnapshotArgs = {
   slotCreated: number | bigint;
   slotFinalized: number | bigint;
   isActive: number;
+  ncnOperatorIndex: number | bigint;
   operatorIndex: number | bigint;
   operatorFeeBps: number;
   vaultOperatorDelegationCount: number | bigint;
@@ -95,6 +97,7 @@ export function getOperatorSnapshotEncoder(): Encoder<OperatorSnapshotArgs> {
     ['slotCreated', getU64Encoder()],
     ['slotFinalized', getU64Encoder()],
     ['isActive', getBoolEncoder()],
+    ['ncnOperatorIndex', getU64Encoder()],
     ['operatorIndex', getU64Encoder()],
     ['operatorFeeBps', getU16Encoder()],
     ['vaultOperatorDelegationCount', getU64Encoder()],
@@ -119,6 +122,7 @@ export function getOperatorSnapshotDecoder(): Decoder<OperatorSnapshot> {
     ['slotCreated', getU64Decoder()],
     ['slotFinalized', getU64Decoder()],
     ['isActive', getBoolDecoder()],
+    ['ncnOperatorIndex', getU64Decoder()],
     ['operatorIndex', getU64Decoder()],
     ['operatorFeeBps', getU16Decoder()],
     ['vaultOperatorDelegationCount', getU64Decoder()],

clients/js/jito_tip_router/types/ballot.ts

@@ -10,8 +10,6 @@ import {
   combineCodec,
   fixDecoderSize,
   fixEncoderSize,
-  getBoolDecoder,
-  getBoolEncoder,
   getBytesDecoder,
   getBytesEncoder,
   getStructDecoder,
@@ -24,7 +22,6 @@ import {
 
 export type Ballot = {
   merkleRoot: ReadonlyUint8Array;
-  isCast: number;
   reserved: ReadonlyUint8Array;
 };
 
@@ -33,15 +30,13 @@ export type BallotArgs = Ballot;
 export function getBallotEncoder(): Encoder<BallotArgs> {
   return getStructEncoder([
     ['merkleRoot', fixEncoderSize(getBytesEncoder(), 32)],
-    ['isCast', getBoolEncoder()],
     ['reserved', fixEncoderSize(getBytesEncoder(), 64)],
   ]);
 }
 
 export function getBallotDecoder(): Decoder<Ballot> {
   return getStructDecoder([
     ['merkleRoot', fixDecoderSize(getBytesDecoder(), 32)],
-    ['isCast', getBoolDecoder()],
     ['reserved', fixDecoderSize(getBytesDecoder(), 64)],
   ]);
 }

clients/rust/jito_tip_router/src/generated/accounts/operator_snapshot.rs

@@ -28,6 +28,7 @@ pub struct OperatorSnapshot {
     pub slot_created: u64,
     pub slot_finalized: u64,
     pub is_active: bool,
+    pub ncn_operator_index: u64,
     pub operator_index: u64,
     pub operator_fee_bps: u16,
     pub vault_operator_delegation_count: u64,

clients/rust/jito_tip_router/src/generated/types/ballot.rs

@@ -10,7 +10,6 @@ use borsh::{BorshDeserialize, BorshSerialize};
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Ballot {
     pub merkle_root: [u8; 32],
-    pub is_cast: bool,
     #[cfg_attr(feature = "serde", serde(with = "serde_with::As::<serde_with::Bytes>"))]
     pub reserved: [u8; 64],
 }

core/src/ballot_box.rs

@@ -1,6 +1,6 @@
 use bytemuck::{Pod, Zeroable};
 use jito_bytemuck::{
-    types::{PodBool, PodU128, PodU16, PodU64},
+    types::{PodU128, PodU16, PodU64},
     AccountDeserialize, Discriminator,
 };
 use shank::{ShankAccount, ShankType};
@@ -13,25 +13,22 @@ use crate::{constants::PRECISE_CONSENSUS, discriminators::Discriminators, error:
 #[repr(C)]
 pub struct Ballot {
     merkle_root: [u8; 32],
-    is_cast: PodBool,
     reserved: [u8; 64],
 }
 
 impl Default for Ballot {
     fn default() -> Self {
         Self {
             merkle_root: [0; 32],
-            is_cast: PodBool::from(false),
             reserved: [0; 64],
         }
     }
 }
 
 impl Ballot {
-    pub fn new(root: [u8; 32]) -> Self {
+    pub const fn new(root: [u8; 32]) -> Self {
         Self {
             merkle_root: root,
-            is_cast: PodBool::from(true),
             reserved: [0; 64],
         }
     }
@@ -40,8 +37,8 @@ impl Ballot {
         self.merkle_root
     }
 
-    pub fn is_cast(&self) -> bool {
-        self.is_cast.into()
+    pub fn is_valid(&self) -> bool {
+        self.merkle_root.iter().any(|&b| b != 0)
     }
 }
 
@@ -282,11 +279,11 @@ impl BallotBox {
     }
 
     pub fn is_consensus_reached(&self) -> bool {
-        self.slot_consensus_reached() == 0
+        self.slot_consensus_reached() > 0
     }
 
     pub fn get_winning_ballot(&self) -> Result<Ballot, TipRouterError> {
-        if self.winning_ballot.is_cast() {
+        if self.winning_ballot.is_valid() {
             Ok(self.winning_ballot)
         } else {
             Err(TipRouterError::ConsensusNotReached)

core/src/epoch_snapshot.rs

@@ -205,6 +205,7 @@ pub struct OperatorSnapshot {
 
     is_active: PodBool,
 
+    ncn_operator_index: PodU64,
     operator_index: PodU64,
     operator_fee_bps: PodU16,
 
@@ -277,6 +278,7 @@ impl OperatorSnapshot {
         bump: u8,
         current_slot: u64,
         is_active: bool,
+        ncn_operator_index: u64,
         operator_index: u64,
         operator_fee_bps: u16,
         vault_operator_delegation_count: u64,
@@ -293,6 +295,7 @@ impl OperatorSnapshot {
             slot_created: PodU64::from(current_slot),
             slot_finalized: PodU64::from(0),
             is_active: PodBool::from(is_active),
+            ncn_operator_index: PodU64::from(ncn_operator_index),
             operator_index: PodU64::from(operator_index),
             operator_fee_bps: PodU16::from(operator_fee_bps),
             vault_operator_delegation_count: PodU64::from(vault_operator_delegation_count),
@@ -311,6 +314,7 @@ impl OperatorSnapshot {
         ncn_epoch: u64,
         bump: u8,
         current_slot: u64,
+        ncn_operator_index: u64,
         operator_index: u64,
         operator_fee_bps: u16,
         vault_count: u64,
@@ -322,6 +326,7 @@ impl OperatorSnapshot {
             bump,
             current_slot,
             true,
+            ncn_operator_index,
             operator_index,
             operator_fee_bps,
             vault_count,
@@ -334,6 +339,7 @@ impl OperatorSnapshot {
         ncn_epoch: u64,
         bump: u8,
         current_slot: u64,
+        ncn_operator_index: u64,
         operator_index: u64,
     ) -> Result<Self, TipRouterError> {
         let mut snapshot = Self::new(
@@ -343,6 +349,7 @@ impl OperatorSnapshot {
             bump,
             current_slot,
             false,
+            ncn_operator_index,
             operator_index,
             0,
             0,

idl/jito_tip_router.json

@@ -769,6 +769,12 @@
               "defined": "PodBool"
             }
           },
+          {
+            "name": "ncnOperatorIndex",
+            "type": {
+              "defined": "PodU64"
+            }
+          },
           {
             "name": "operatorIndex",
             "type": {
@@ -967,12 +973,6 @@
               ]
             }
           },
-          {
-            "name": "isCast",
-            "type": {
-              "defined": "PodBool"
-            }
-          },
           {
             "name": "reserved",
             "type": {

program/src/initialize_operator_snapshot.rs

@@ -84,7 +84,7 @@ pub fn process_initialize_operator_snapshot(
     )?;
 
     //TODO move to helper function
-    let is_active: bool = {
+    let (is_active, ncn_operator_index): (bool, u64) = {
         let ncn_operator_state_data = ncn_operator_state.data.borrow();
         let ncn_operator_state_account =
             NcnOperatorState::try_from_slice_unchecked(&ncn_operator_state_data)?;
@@ -97,7 +97,9 @@ pub fn process_initialize_operator_snapshot(
             .operator_opt_in_state
             .is_active(current_slot, ncn_epoch_length);
 
-        ncn_operator_okay && operator_ncn_okay
+        let ncn_operator_index = ncn_operator_state_account.index();
+
+        (ncn_operator_okay && operator_ncn_okay, ncn_operator_index)
     };
 
     let vault_count = {
@@ -128,6 +130,7 @@ pub fn process_initialize_operator_snapshot(
             ncn_epoch,
             operator_snapshot_bump,
             current_slot,
+            ncn_operator_index,
             operator_index,
             operator_fee_bps,
             vault_count,
@@ -139,6 +142,7 @@ pub fn process_initialize_operator_snapshot(
             ncn_epoch,
             operator_snapshot_bump,
             current_slot,
+            ncn_operator_index,
             operator_index,
         )?
     };