Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion harness/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@ fuzz-fd = [
"dep:mollusk-svm-fuzz-fs",
]
invocation-inspect-callback = []
precompiles = ["dep:agave-precompiles"]
serde = [
"dep:serde",
"mollusk-svm-result/serde",
]

[dependencies]
agave-feature-set = { workspace = true }
agave-precompiles = { workspace = true }
agave-precompiles = { workspace = true, optional = true }
agave-syscalls = { workspace = true }
bincode = { workspace = true }
serde = { workspace = true, features = ["derive"], optional = true }
Expand Down
21 changes: 20 additions & 1 deletion harness/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,8 @@ pub mod sysvar;
pub use mollusk_svm_result as result;
#[cfg(any(feature = "fuzz", feature = "fuzz-fd"))]
use mollusk_svm_result::Compare;
#[cfg(feature = "precompiles")]
use solana_precompile_error::PrecompileError;
#[cfg(feature = "invocation-inspect-callback")]
use solana_transaction_context::InstructionAccount;
use {
Expand All @@ -466,7 +468,6 @@ use {
solana_compute_budget::compute_budget::ComputeBudget,
solana_hash::Hash,
solana_instruction::{AccountMeta, Instruction},
solana_precompile_error::PrecompileError,
solana_program_runtime::invoke_context::{EnvironmentConfig, InvokeContext},
solana_pubkey::Pubkey,
solana_svm_callback::InvokeContextCallback,
Expand Down Expand Up @@ -579,6 +580,7 @@ impl CheckContext for Mollusk {
}

struct MolluskInvokeContextCallback<'a> {
#[cfg_attr(not(feature = "precompiles"), allow(dead_code))]
feature_set: &'a FeatureSet,
epoch_stake: &'a EpochStake,
}
Expand All @@ -592,12 +594,19 @@ impl InvokeContextCallback for MolluskInvokeContextCallback<'_> {
self.epoch_stake.get(vote_address).copied().unwrap_or(0)
}

#[cfg(feature = "precompiles")]
fn is_precompile(&self, program_id: &Pubkey) -> bool {
agave_precompiles::is_precompile(program_id, |feature_id| {
self.feature_set.is_active(feature_id)
})
}

#[cfg(not(feature = "precompiles"))]
fn is_precompile(&self, _program_id: &Pubkey) -> bool {
false
}

#[cfg(feature = "precompiles")]
fn process_precompile(
&self,
program_id: &Pubkey,
Expand All @@ -612,6 +621,16 @@ impl InvokeContextCallback for MolluskInvokeContextCallback<'_> {
Err(PrecompileError::InvalidPublicKey)
}
}

#[cfg(not(feature = "precompiles"))]
fn process_precompile(
&self,
_program_id: &Pubkey,
_data: &[u8],
_instruction_datas: Vec<&[u8]>,
) -> Result<(), solana_precompile_error::PrecompileError> {
panic!("precompiles feature not enabled");
}
}

impl Mollusk {
Expand Down
10 changes: 10 additions & 0 deletions harness/src/program.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ pub mod loader_keys {
};
}

#[cfg(feature = "precompiles")]
pub mod precompile_keys {
use solana_pubkey::Pubkey;
pub use solana_sdk_ids::{
Expand All @@ -46,6 +47,15 @@ pub mod precompile_keys {
}
}

#[cfg(not(feature = "precompiles"))]
pub mod precompile_keys {
use solana_pubkey::Pubkey;

pub(crate) fn is_precompile(_program_id: &Pubkey) -> bool {
false
}
}

pub struct ProgramCache {
cache: Rc<RefCell<ProgramCacheForTxBatch>>,
// This stinks, but the `ProgramCacheForTxBatch` doesn't offer a way to
Expand Down