Use 3.0 crates and 2.0 SPL interfaces (#155)

Author: rustopian

Cargo.lock

@@ -21,8 +21,9 @@ edition = "2021"
 version = "0.5.1"
 
 [workspace.dependencies]
-agave-feature-set = "2.3"
-agave-precompiles = "2.3"
+agave-feature-set = "3.0"
+agave-precompiles = "3.0"
+agave-syscalls = "3.0.0"
 bincode = "1.3.3"
 bs58 = "0.5.1"
 chrono = "0.4.38"
@@ -52,44 +53,46 @@ serde = "1.0.203"
 serde_json = "1.0.117"
 serde_yaml = "0.9.34"
 serial_test = "2.0"
-solana-account = "2.2"
-solana-account-info = "2.2"
-solana-bpf-loader-program = "2.3"
-solana-clock = "2.2"
-solana-compute-budget = "2.3"
-solana-cpi = "2.2"
-solana-ed25519-program = "2.2"
-solana-epoch-rewards = "2.2"
-solana-epoch-schedule = "2.2"
-solana-hash = "2.2"
-solana-instruction = "2.2"
-solana-keccak-hasher = "2.2"
-solana-loader-v3-interface = "3.0"
-solana-loader-v4-interface = "2.2"
-solana-log-collector = "2.3"
-solana-logger = "2.3"
-solana-native-token = "2.2"
-solana-precompile-error = "2.2"
-solana-program-entrypoint = "2.2"
-solana-program-error = "2.2"
-solana-program-runtime = "2.3"
-solana-pubkey = "2.2"
-solana-rent = "2.2"
-solana-sdk-ids = "2.2"
-solana-secp256k1-program = "2.2"
-solana-secp256r1-program = "2.2"
-solana-slot-hashes = "2.2"
-solana-stake-interface = "1.0"
-solana-stake-program = "2.3"
-solana-svm-callback = "2.3"
-solana-system-interface = "1.0"
-solana-system-program = "2.3"
-solana-sysvar = "2.2"
-solana-sysvar-id = "2.2"
-solana-timings = "2.3"
-solana-transaction-context = "2.3"
-spl-associated-token-account = "7.0.0"
-spl-token = "8.0.0"
+solana-account = "3.0"
+solana-account-info = "3.0"
+solana-bpf-loader-program = "3.0"
+solana-clock = "3.0"
+solana-compute-budget = "3.0"
+solana-cpi = "3.0"
+solana-ed25519-program = "3.0"
+solana-epoch-rewards = "3.0"
+solana-epoch-schedule = "3.0"
+solana-hash = "3.0"
+solana-instruction = "3.0"
+solana-instruction-error = { version = "2.0", features = ["serde"] }
+solana-keccak-hasher = { version = "3.0", features = ["sha3"] }
+solana-loader-v3-interface = "6.1.0"
+solana-loader-v4-interface = "3.1.0"
+solana-logger = "3.0"
+solana-native-token = "3.0"
+solana-precompile-error = "3.0"
+solana-program-entrypoint = "3.0"
+solana-program-error = "3.0"
+solana-program-pack = "3.0"
+solana-program-runtime = "3.0"
+solana-pubkey = "3.0"
+solana-rent = "3.0"
+solana-sdk-ids = "3.0"
+solana-secp256k1-program = "3.0"
+solana-secp256r1-program = "3.0"
+solana-slot-hashes = "3.0"
+solana-stake-interface = "2.0"
+solana-stake-program = "3.0"
+solana-svm-callback = "3.0"
+solana-svm-log-collector = "3.0"
+solana-svm-timings = "3.0"
+solana-system-interface = "2.0"
+solana-system-program = "3.0"
+solana-sysvar = "3.0"
+solana-sysvar-id = "3.0"
+solana-transaction-context = "3.0"
+spl-associated-token-account-interface = "2.0.0"
+spl-token-interface = "2.0.0"
 thiserror = "1.0.64"
 tokio = "1.37.0"
 which = "=4.4.0"

Cargo.toml

@@ -1,6 +1,6 @@
 SHELL := /usr/bin/env bash
 NIGHTLY_TOOLCHAIN := nightly-2024-11-22
-SOLANA_VERSION := 2.3.0
+SOLANA_VERSION := 3.0.0
 
 .PHONY: audit build-test-programs prepublish publish format format-check \
 	clippy test check-features all-checks nightly-version solana-version

Makefile

@@ -54,7 +54,7 @@ impl From<EpochContext> for ProtoEpochContext {
 }
 
 /// Instruction context fixture.
-#[derive(Clone, Debug, Default, PartialEq)]
+#[derive(Clone, Debug, Default)]
 pub struct Context {
     /// The program ID of the program being invoked.
     pub program_id: Pubkey,

fuzz/fixture-fd/src/context.rs

@@ -12,28 +12,16 @@ impl From<ProtoInstrAccount> for InstructionAccount {
             is_writable,
             is_signer,
         } = value;
-        Self {
-            index_in_transaction: index as u16,
-            index_in_caller: index as u16,
-            index_in_callee: index as u16,
-            is_signer,
-            is_writable,
-        }
+        Self::new(index as u16, is_signer, is_writable)
     }
 }
 
 impl From<InstructionAccount> for ProtoInstrAccount {
     fn from(value: InstructionAccount) -> Self {
-        let InstructionAccount {
-            index_in_transaction,
-            is_signer,
-            is_writable,
-            ..
-        } = value;
         Self {
-            index: index_in_transaction as u32,
-            is_signer,
-            is_writable,
+            index: value.index_in_transaction as u32,
+            is_signer: value.is_signer(),
+            is_writable: value.is_writable(),
         }
     }
 }

fuzz/fixture-fd/src/instr_account.rs

@@ -29,7 +29,7 @@ use {
 
 /// A fixture for invoking a single instruction against a simulated SVM
 /// program runtime environment, for a given program.
-#[derive(Clone, Debug, Default, PartialEq)]
+#[derive(Clone, Debug, Default)]
 pub struct Fixture {
     /// The fixture metadata.
     pub metadata: Option<Metadata>,
@@ -154,13 +154,7 @@ mod tests {
         let instruction_accounts = accounts
             .iter()
             .enumerate()
-            .map(|(i, _)| InstructionAccount {
-                index_in_transaction: i as u16,
-                index_in_caller: i as u16,
-                index_in_callee: i as u16,
-                is_signer: false,
-                is_writable: true,
-            })
+            .map(|(i, _)| InstructionAccount::new(i as u16, false, true))
             .collect::<Vec<_>>();
         let instruction_data = vec![4; 24];
         let slot_context = SlotContext { slot: 42 };

fuzz/fixture-fd/src/lib.rs

@@ -15,37 +15,36 @@ message ComputeBudget {
     uint64 max_call_depth = 10;
     uint64 stack_frame_size = 11;
     uint64 log_pubkey_units = 12;
-    uint64 max_cpi_instruction_size = 13;
-    uint64 cpi_bytes_per_unit = 14;
-    uint64 sysvar_base_cost = 15;
-    uint64 secp256k1_recover_cost = 16;
-    uint64 syscall_base_cost = 17;
-    uint64 curve25519_edwards_validate_point_cost = 18;
-    uint64 curve25519_edwards_add_cost = 19;
-    uint64 curve25519_edwards_subtract_cost = 20;
-    uint64 curve25519_edwards_multiply_cost = 21;
-    uint64 curve25519_edwards_msm_base_cost = 22;
-    uint64 curve25519_edwards_msm_incremental_cost = 23;
-    uint64 curve25519_ristretto_validate_point_cost = 24;
-    uint64 curve25519_ristretto_add_cost = 25;
-    uint64 curve25519_ristretto_subtract_cost = 26;
-    uint64 curve25519_ristretto_multiply_cost = 27;
-    uint64 curve25519_ristretto_msm_base_cost = 28;
-    uint64 curve25519_ristretto_msm_incremental_cost = 29;
-    uint32 heap_size = 30;
-    uint64 heap_cost = 31;
-    uint64 mem_op_base_cost = 32;
-    uint64 alt_bn128_addition_cost = 33;
-    uint64 alt_bn128_multiplication_cost = 34;
-    uint64 alt_bn128_pairing_one_pair_cost_first = 35;
-    uint64 alt_bn128_pairing_one_pair_cost_other = 36;
-    uint64 big_modular_exponentiation_base_cost = 37;
-    uint64 big_modular_exponentiation_cost_divisor = 38;
-    uint64 poseidon_cost_coefficient_a = 39;
-    uint64 poseidon_cost_coefficient_c = 40;
-    uint64 get_remaining_compute_units_cost = 41;
-    uint64 alt_bn128_g1_compress = 42;
-    uint64 alt_bn128_g1_decompress = 43;
-    uint64 alt_bn128_g2_compress = 44;
-    uint64 alt_bn128_g2_decompress = 45;
+    uint64 cpi_bytes_per_unit = 13;
+    uint64 sysvar_base_cost = 14;
+    uint64 secp256k1_recover_cost = 15;
+    uint64 syscall_base_cost = 16;
+    uint64 curve25519_edwards_validate_point_cost = 17;
+    uint64 curve25519_edwards_add_cost = 18;
+    uint64 curve25519_edwards_subtract_cost = 19;
+    uint64 curve25519_edwards_multiply_cost = 20;
+    uint64 curve25519_edwards_msm_base_cost = 21;
+    uint64 curve25519_edwards_msm_incremental_cost = 22;
+    uint64 curve25519_ristretto_validate_point_cost = 23;
+    uint64 curve25519_ristretto_add_cost = 24;
+    uint64 curve25519_ristretto_subtract_cost = 25;
+    uint64 curve25519_ristretto_multiply_cost = 26;
+    uint64 curve25519_ristretto_msm_base_cost = 27;
+    uint64 curve25519_ristretto_msm_incremental_cost = 28;
+    uint32 heap_size = 29;
+    uint64 heap_cost = 30;
+    uint64 mem_op_base_cost = 31;
+    uint64 alt_bn128_addition_cost = 32;
+    uint64 alt_bn128_multiplication_cost = 33;
+    uint64 alt_bn128_pairing_one_pair_cost_first = 34;
+    uint64 alt_bn128_pairing_one_pair_cost_other = 35;
+    uint64 big_modular_exponentiation_base_cost = 36;
+    uint64 big_modular_exponentiation_cost_divisor = 37;
+    uint64 poseidon_cost_coefficient_a = 38;
+    uint64 poseidon_cost_coefficient_c = 39;
+    uint64 get_remaining_compute_units_cost = 40;
+    uint64 alt_bn128_g1_compress = 41;
+    uint64 alt_bn128_g1_decompress = 42;
+    uint64 alt_bn128_g2_compress = 43;
+    uint64 alt_bn128_g2_decompress = 44;
 }

fuzz/fixture/proto/compute_budget.proto

@@ -20,7 +20,6 @@ impl From<ProtoComputeBudget> for ComputeBudget {
             max_call_depth,
             stack_frame_size,
             log_pubkey_units,
-            max_cpi_instruction_size,
             cpi_bytes_per_unit,
             sysvar_base_cost,
             secp256k1_recover_cost,
@@ -68,7 +67,6 @@ impl From<ProtoComputeBudget> for ComputeBudget {
             max_call_depth: max_call_depth as usize,
             stack_frame_size: stack_frame_size as usize,
             log_pubkey_units,
-            max_cpi_instruction_size: max_cpi_instruction_size as usize,
             cpi_bytes_per_unit,
             sysvar_base_cost,
             secp256k1_recover_cost,
@@ -120,7 +118,6 @@ impl From<ComputeBudget> for ProtoComputeBudget {
             max_call_depth,
             stack_frame_size,
             log_pubkey_units,
-            max_cpi_instruction_size,
             cpi_bytes_per_unit,
             sysvar_base_cost,
             secp256k1_recover_cost,
@@ -168,7 +165,6 @@ impl From<ComputeBudget> for ProtoComputeBudget {
             max_call_depth: max_call_depth as u64,
             stack_frame_size: stack_frame_size as u64,
             log_pubkey_units,
-            max_cpi_instruction_size: max_cpi_instruction_size as u64,
             cpi_bytes_per_unit,
             sysvar_base_cost,
             secp256k1_recover_cost,
@@ -218,7 +214,6 @@ pub(crate) fn hash_proto_compute_budget(hasher: &mut Hasher, compute_budget: &Pr
     hasher.hash(&compute_budget.max_call_depth.to_le_bytes());
     hasher.hash(&compute_budget.stack_frame_size.to_le_bytes());
     hasher.hash(&compute_budget.log_pubkey_units.to_le_bytes());
-    hasher.hash(&compute_budget.max_cpi_instruction_size.to_le_bytes());
     hasher.hash(&compute_budget.cpi_bytes_per_unit.to_le_bytes());
     hasher.hash(&compute_budget.sysvar_base_cost.to_le_bytes());
     hasher.hash(&compute_budget.secp256k1_recover_cost.to_le_bytes());

fuzz/fixture/src/compute_budget.rs

@@ -14,7 +14,7 @@ use {
 };
 
 /// Instruction context fixture.
-#[derive(Clone, Debug, Default, PartialEq)]
+#[derive(Clone, Debug, PartialEq)]
 pub struct Context {
     /// The compute budget to use for the simulation.
     pub compute_budget: ComputeBudget,
@@ -63,9 +63,18 @@ impl From<ProtoContext> for Context {
             )
             .collect();
 
+        let feature_set: FeatureSet = value.feature_set.map(Into::into).unwrap_or_default();
+        let simd_0268_active =
+            feature_set.is_active(&agave_feature_set::raise_cpi_nesting_limit_to_8::id());
+
+        let compute_budget = value
+            .compute_budget
+            .map(Into::into)
+            .unwrap_or_else(|| ComputeBudget::new_with_defaults(simd_0268_active));
+
         Self {
-            compute_budget: value.compute_budget.map(Into::into).unwrap_or_default(),
-            feature_set: value.feature_set.map(Into::into).unwrap_or_default(),
+            compute_budget,
+            feature_set,
             sysvars: value.sysvars.map(Into::into).unwrap_or_default(),
             program_id,
             instruction_accounts,
@@ -133,3 +142,71 @@ pub(crate) fn hash_proto_context(hasher: &mut Hasher, context: &ProtoContext) {
     hasher.hash(&context.data);
     crate::account::hash_proto_accounts(hasher, &context.accounts);
 }
+
+#[cfg(test)]
+mod tests {
+    use {
+        super::*,
+        crate::proto::{
+            ComputeBudget as ProtoComputeBudget, FeatureSet as ProtoFeatureSet,
+            InstrContext as ProtoContext,
+        },
+    };
+
+    fn proto_feature_set_with(feature_id: solana_pubkey::Pubkey) -> ProtoFeatureSet {
+        let discr = u64::from_le_bytes(feature_id.to_bytes()[0..8].try_into().unwrap());
+        ProtoFeatureSet {
+            features: vec![discr],
+        }
+    }
+
+    fn empty_proto_context() -> ProtoContext {
+        ProtoContext {
+            compute_budget: None,
+            feature_set: None,
+            sysvars: None,
+            program_id: vec![0u8; 32],
+            instr_accounts: vec![],
+            data: vec![],
+            accounts: vec![],
+        }
+    }
+
+    #[test]
+    fn test_defaults_use_feature_flag_when_active() {
+        let mut proto = empty_proto_context();
+        proto.feature_set = Some(proto_feature_set_with(
+            agave_feature_set::raise_cpi_nesting_limit_to_8::id(),
+        ));
+
+        let ctx: Context = proto.into();
+        let expected = ComputeBudget::new_with_defaults(true);
+        assert_eq!(ctx.compute_budget, expected);
+    }
+
+    #[test]
+    fn test_defaults_use_feature_flag_when_inactive() {
+        let proto = empty_proto_context();
+        let ctx: Context = proto.into();
+        let expected = ComputeBudget::new_with_defaults(false);
+        assert_eq!(ctx.compute_budget, expected);
+    }
+
+    #[test]
+    fn test_present_compute_budget_is_passthrough() {
+        let mut proto = empty_proto_context();
+        let cb = ProtoComputeBudget {
+            compute_unit_limit: 12345,
+            ..Default::default()
+        };
+        proto.compute_budget = Some(cb);
+
+        // Whether the feature is present or not should not affect passthrough
+        proto.feature_set = Some(proto_feature_set_with(
+            agave_feature_set::raise_cpi_nesting_limit_to_8::id(),
+        ));
+
+        let ctx: Context = proto.into();
+        assert_eq!(ctx.compute_budget.compute_unit_limit, 12345);
+    }
+}