[secp256r1] Add CU costs

builtins-default-costs/Cargo.toml

@@ -22,6 +22,7 @@ solana-frozen-abi = { workspace = true, optional = true, features = [
 ] }
 solana-loader-v4-program = { workspace = true }
 solana-sdk = { workspace = true }
+solana-sdk-ids = { workspace = true }
 solana-stake-program = { workspace = true }
 solana-system-program = { workspace = true }
 solana-vote-program = { workspace = true }

builtins-default-costs/src/lib.rs

@@ -11,6 +11,7 @@ use {
         pubkey::Pubkey,
         secp256k1_program,
     },
+    solana_sdk_ids::secp256r1_program,
 };
 
 /// DEVELOPER: when a builtin is migrated to sbpf, please add its corresponding
@@ -122,6 +123,13 @@ lazy_static! {
             core_bpf_migration_feature: None,
         },
     ),
+    (
+        secp256r1_program::id(),
+        BuiltinCost {
+            native_cost: 0,
+            core_bpf_migration_feature: None,
+        }
+    )
     // DO NOT ADD MORE ENTRIES TO THIS MAP
     ]
     .iter()

cost-model/src/block_cost_limits.rs

@@ -22,6 +22,8 @@ pub const SECP256K1_VERIFY_COST: u64 = COMPUTE_UNIT_TO_US_RATIO * 223;
 pub const ED25519_VERIFY_COST: u64 = COMPUTE_UNIT_TO_US_RATIO * 76;
 /// Number of compute units for one ed25519 strict signature verification.
 pub const ED25519_VERIFY_STRICT_COST: u64 = COMPUTE_UNIT_TO_US_RATIO * 80;
+/// Number of compute units for one secp256r1 signature verification.
+pub const SECP256R1_VERIFY_COST: u64 = COMPUTE_UNIT_TO_US_RATIO * 160;
 /// Number of compute units for one write lock
 pub const WRITE_LOCK_UNITS: u64 = COMPUTE_UNIT_TO_US_RATIO * 10;
 /// Number of data bytes per compute units

cost-model/src/cost_model.rs

@@ -129,6 +129,11 @@ impl CostModel {
                     .num_ed25519_instruction_signatures()
                     .saturating_mul(ed25519_verify_cost),
             )
+            .saturating_add(
+                signatures_count_detail
+                    .num_secp256r1_instruction_signatures()
+                    .saturating_mul(SECP256R1_VERIFY_COST),
+            )
     }
 
     fn get_writable_accounts(message: &impl SVMMessage) -> impl Iterator<Item = &Pubkey> {

cost-model/src/cost_tracker.rs

@@ -76,6 +76,7 @@ pub struct CostTracker {
     /// the tracker, but are still waiting for an update with actual usage or
     /// removal if the transaction does not end up getting committed.
     in_flight_transaction_count: usize,
+    secp256r1_instruction_signature_count: u64,
 }
 
 impl Default for CostTracker {
@@ -102,6 +103,7 @@ impl Default for CostTracker {
             secp256k1_instruction_signature_count: 0,
             ed25519_instruction_signature_count: 0,
             in_flight_transaction_count: 0,
+            secp256r1_instruction_signature_count: 0,
         }
     }
 }
@@ -256,6 +258,11 @@ impl CostTracker {
                 self.in_flight_transaction_count,
                 i64
             ),
+            (
+                "secp256r1_instruction_signature_count",
+                self.secp256r1_instruction_signature_count,
+                i64
+            )
         );
     }
 
@@ -334,6 +341,10 @@ impl CostTracker {
             self.ed25519_instruction_signature_count,
             tx_cost.num_ed25519_instruction_signatures()
         );
+        saturating_add_assign!(
+            self.secp256r1_instruction_signature_count,
+            tx_cost.num_secp256r1_instruction_signatures()
+        );
         self.add_transaction_execution_cost(tx_cost, tx_cost.sum())
     }
 
@@ -353,6 +364,9 @@ impl CostTracker {
         self.ed25519_instruction_signature_count = self
             .ed25519_instruction_signature_count
             .saturating_sub(tx_cost.num_ed25519_instruction_signatures());
+        self.secp256r1_instruction_signature_count = self
+            .secp256r1_instruction_signature_count
+            .saturating_sub(tx_cost.num_secp256r1_instruction_signatures());
     }
 
     /// Apply additional actual execution units to cost_tracker

cost-model/src/transaction_cost.rs

@@ -132,6 +132,16 @@ impl<'a, Tx: TransactionWithMeta> TransactionCost<'a, Tx> {
                 .num_ed25519_instruction_signatures(),
         }
     }
+
+    pub fn num_secp256r1_instruction_signatures(&self) -> u64 {
+        match self {
+            Self::SimpleVote { .. } => 0,
+            Self::Transaction(usage_cost) => usage_cost
+                .transaction
+                .signature_details()
+                .num_secp256r1_instruction_signatures(),
+        }
+    }
 }
 
 // costs are stored in number of 'compute unit's