TransactionView::num_requested_write_locks (solana-labs#4500)

brooksprumo · Jan 16, 2025 · de6b198 · de6b198
1 parent d3305e3
commit de6b198
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/transaction-view/src/resolved_transaction_view.rs b/transaction-view/src/resolved_transaction_view.rs
@@ -146,14 +146,6 @@ impl<D: TransactionData> ResolvedTransactionView<D> {
         is_writable_cache
     }
 
-    fn num_readonly_accounts(&self) -> usize {
-        usize::from(self.view.total_readonly_lookup_accounts())
-            .wrapping_add(usize::from(self.view.num_readonly_signed_static_accounts()))
-            .wrapping_add(usize::from(
-                self.view.num_readonly_unsigned_static_accounts(),
-            ))
-    }
-
     pub fn loaded_addresses(&self) -> Option<&LoadedAddresses> {
         self.resolved_addresses.as_ref()
     }
@@ -165,9 +157,7 @@ impl<D: TransactionData> SVMMessage for ResolvedTransactionView<D> {
     }
 
     fn num_write_locks(&self) -> u64 {
-        self.account_keys()
-            .len()
-            .wrapping_sub(self.num_readonly_accounts()) as u64
+        self.view.num_requested_write_locks()
     }
 
     fn recent_blockhash(&self) -> &Hash {

diff --git a/transaction-view/src/transaction_view.rs b/transaction-view/src/transaction_view.rs
@@ -209,6 +209,19 @@ impl<D: TransactionData> TransactionView<true, D> {
             .wrapping_add(self.total_writable_lookup_accounts())
             .wrapping_add(self.total_readonly_lookup_accounts())
     }
+
+    /// Return the number of requested writable keys.
+    #[inline]
+    pub fn num_requested_write_locks(&self) -> u64 {
+        u64::from(
+            u16::from(
+                (self.num_static_account_keys())
+                    .wrapping_sub(self.num_readonly_signed_static_accounts())
+                    .wrapping_sub(self.num_readonly_unsigned_static_accounts()),
+            )
+            .wrapping_add(self.total_writable_lookup_accounts()),
+        )
+    }
 }
 
 // Manual implementation of `Debug` - avoids bound on `D`.