Pull in latest agave-v3.0.3 commits into agave-v3.1.0-beta.0 (#396)

* bump protosol crate version in gen cargo script (#390)

* README: Include note on local Agave setup (#391)

* elf: move to flatbuffers (#392)

* elf: fix conversion script (#394)

---------

Co-authored-by: ravyu-jump <[email protected]>
Co-authored-by: mjain-jump <[email protected]>

README: Include note on local Agave setup (#391)

elf: move to flatbuffers (#392)

elf: fix conversion script (#394)

Agave v3.1 bump

PR comments round one

Add extra variable hint

PR feedback

adjust cargo toml to pull in dev feature

add back tracing

syscalls: fix mapping with custom memory module (#393)

Agave v3.1 bump

PR comments round one

Add extra variable hint

PR feedback

adjust cargo toml to pull in dev feature

add back tracing

syscalls: fix mapping with custom memory module (#393)

bump protosol crate version in gen cargo script (#390)

README: Include note on local Agave setup (#391)

Pull in latest agave-v3.0.3 commits into agave-v3.1.0-beta.0 (#396)

* bump protosol crate version in gen cargo script (#390)

* README: Include note on local Agave setup (#391)

* elf: move to flatbuffers (#392)

* elf: fix conversion script (#394)

---------

Co-authored-by: ravyu-jump <[email protected]>
Co-authored-by: mjain-jump <[email protected]>

README: Include note on local Agave setup (#391)

elf: move to flatbuffers (#392)

elf: fix conversion script (#394)

Agave v3.1 bump

PR comments round one

Add extra variable hint

PR feedback

adjust cargo toml to pull in dev feature

add back tracing

syscalls: fix mapping with custom memory module (#393)

Agave v3.1 bump

PR comments round one

Add extra variable hint

PR feedback

adjust cargo toml to pull in dev feature

add back tracing

syscalls: fix mapping with custom memory module (#393)

bump protosol crate version in gen cargo script (#390)

README: Include note on local Agave setup (#391)

Author: cmoyes-jump

Cargo.lock

@@ -2,5 +2,5 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-docker build --platform=linux/amd64 -t agave-v3.0.3-patches .
-docker run -it -v $DIR:/app -w /app agave-v3.0.3-patches
+docker build --platform=linux/amd64 -t agave-v3.1.0-beta.0-patches .
+docker run -it -v $DIR:/app -w /app agave-v3.1.0-beta.0-patches

Cargo.toml

@@ -24,16 +24,22 @@
 def replace_path_with_git_rev(toml_data, git_url, rev):
     """
     Recursively process the TOML data to replace path with git and rev,
-    while keeping all other lines intact.
+    while preserving all other fields including features.
     """
     if isinstance(toml_data, dict):
         for key, value in list(toml_data.items()):
             if isinstance(value, dict):
                 if "path" in value:
-                    # Replace path with git and rev
+                    # Replace path with git and rev, preserve other fields
                     new_table = inline_table()
                     new_table["git"] = git_url
                     new_table["rev"] = rev
+                    # Preserve version if present
+                    if "version" in value:
+                        new_table["version"] = value["version"]
+                    # Preserve features as-is (don't add or modify)
+                    if "features" in value:
+                        new_table["features"] = value["features"]
                     toml_data[key] = new_table
                 else:
                     replace_path_with_git_rev(value, git_url, rev)
@@ -46,16 +52,22 @@ def replace_path_with_git_rev(toml_data, git_url, rev):
 
 def replace_path_with_local(toml_data, local_path):
     """
-    Recursively process the TOML data to replace path with git and rev,
-    while keeping all other lines intact.
+    Recursively process the TOML data to replace path with local path,
+    while preserving all other fields including features.
     """
     if isinstance(toml_data, dict):
         for key, value in list(toml_data.items()):
             if isinstance(value, dict):
                 if "path" in value:
-                    # Replace path with local path
+                    # Replace path with local path, preserve other fields
                     new_table = inline_table()
                     new_table["path"] = os.path.join(local_path, value["path"])
+                    # Preserve version if present
+                    if "version" in value:
+                        new_table["version"] = value["version"]
+                    # Preserve features as-is (don't add or modify)
+                    if "features" in value:
+                        new_table["features"] = value["features"]
                     toml_data[key] = new_table
                 else:
                     replace_path_with_local(value, local_path)
@@ -283,7 +295,33 @@ def main():
         if hasattr(values, 'items'):
             # It's a dictionary/table
             for k, v in values.items():
-                toml_data[section][k] = v
+                # Special handling for dependencies section: merge features
+                if section == "dependencies" and k in toml_data[section]:
+                    existing_dep = toml_data[section][k]
+                    # If both are dicts (dependency specs), merge them
+                    if isinstance(existing_dep, dict) and isinstance(v, dict):
+                        # Preserve path/git/version from existing
+                        merged_dep = inline_table()
+                        for key in ["path", "git", "rev", "version"]:
+                            if key in existing_dep:
+                                merged_dep[key] = existing_dep[key]
+                        # Merge features from both
+                        merged_features = []
+                        if "features" in existing_dep:
+                            merged_features.extend(existing_dep["features"])
+                        if "features" in v:
+                            for feat in v["features"]:
+                                if feat not in merged_features:
+                                    merged_features.append(feat)
+                        if merged_features:
+                            merged_dep["features"] = merged_features
+                        toml_data[section][k] = merged_dep
+                    else:
+                        # Not both dicts, just use the solfuzz_agave.toml value
+                        toml_data[section][k] = v
+                else:
+                    # Not a dependency or not present in existing, just assign
+                    toml_data[section][k] = v
         else:
             # It's likely an Array of Tables or other non-dict type
             # Assign the entire values object directly

docker

@@ -1 +1 @@
-f09a63f6b309e3d1407744d7f752874ab8bd5da4
+9bb89344a4dc427614fb3084946176170ea5313a

scripts/generate_cargo.py

@@ -15,6 +15,19 @@ lazy_static = "1.5.0"
 home = "0.5.11"
 flatbuffers = "25.9.23"
 
+# Enable dev-context-only-utils for Agave dependencies that need it
+solana-runtime = { features = ["dev-context-only-utils"] }
+solana-accounts-db = { features = ["dev-context-only-utils"] }
+solana-svm = { features = ["dev-context-only-utils"] }
+solana-runtime-transaction = { features = ["dev-context-only-utils"] }
+solana-vote = { features = ["dev-context-only-utils"] }
+solana-transaction-context = { features = ["dev-context-only-utils"] }
+solana-vote-program = { features = ["dev-context-only-utils"] }
+solana-compute-budget-instruction = { features = ["dev-context-only-utils"] }
+solana-core = { features = ["dev-context-only-utils"] }
+solana-ledger = { features = ["dev-context-only-utils"] }
+solana-perf = { features = ["dev-context-only-utils"] }
+
 [lib]
 crate-type = ["cdylib", "rlib"]
 

scripts/test-vectors-commit-sha.txt

@@ -405,23 +405,23 @@ pub fn execute_block(context: BlockContext) -> Option<BlockEffects> {
     ancestors.insert(current_slot.saturating_sub(1), 1);
     ancestors.insert(current_slot, 1);
 
-    /* Accounts DB config and initialization */
+    /* Accounts DB config and initialization. Agave v3.1 uses a new Accounts
+    interface, which is not compatible with the old one. */
     let index = Some(AccountsIndexConfig {
         bins: Some(2),
         num_flush_threads: Some(NonZeroUsize::new(1).unwrap()),
         index_limit_mb: IndexLimitMb::InMemOnly,
         ..AccountsIndexConfig::default()
     });
-    let accounts_db_config = Some(AccountsDbConfig {
+    let accounts_db_config = AccountsDbConfig {
         index,
         storage_access: StorageAccess::File,
         skip_initial_hash_calc: true,
-        num_hash_threads: Some(NonZeroUsize::new(1).unwrap()),
         ..AccountsDbConfig::default()
-    });
+    };
     let accounts_db = AccountsDb::new_with_config(
         vec![],
-        accounts_db_config,
+        accounts_db_config.clone(),
         None,
         Arc::new(AtomicBool::new(false)),
     );
@@ -435,10 +435,16 @@ pub fn execute_block(context: BlockContext) -> Option<BlockEffects> {
             (pubkey, account_data)
         })
         .collect::<Vec<_>>();
-    accounts.store_accounts_seq(
-        (current_slot.saturating_sub(1), &accounts_to_store[..]),
-        None,
-    );
+
+    let storage_slot = slot_ctx.prev_slot;
+    accounts.store_accounts_seq((storage_slot, &accounts_to_store[..]), None);
+    // Add the root slot to the accounts DB
+    // Now needed when calling Bank::new_from_snapshot() in Agave v3.1
+    accounts.accounts_db.add_root(storage_slot);
+    let accounts_data_size_initial: u64 = accounts_to_store
+        .iter()
+        .map(|(_, account)| account.data().len() as u64)
+        .sum();
 
     /* Build the stakes separately */
     let current_epoch = epoch_schedule.get_epoch(current_slot);
@@ -543,23 +549,19 @@ pub fn execute_block(context: BlockContext) -> Option<BlockEffects> {
     };
 
     let bank_rc = BankRc::new(accounts);
-    let mut bank = Bank::new_from_fields(
+    let mut bank = Bank::new_from_snapshot(
         bank_rc,
         &genesis_config,
         Arc::new(RuntimeConfig::default()),
         bank_fields,
         None,
-        None,
-        false,
-        0,
+        accounts_data_size_initial, // precomputed above
         Some(feature_set),
     );
 
-    // Seed initial accounts into the bank
-    for account in &context.acct_states {
-        let pubkey = Pubkey::new_from_array(account.address.clone().try_into().unwrap());
-        let account_data = AccountSharedData::from(account);
-        bank.store_account(&pubkey, &account_data);
+    // Store the accounts in the bank using the new interface.
+    for (pubkey, account_data) in &accounts_to_store {
+        bank.store_account(pubkey, account_data);
     }
 
     let leader_schedule = LeaderScheduleCache::new_from_bank(&bank);
@@ -581,6 +583,7 @@ pub fn execute_block(context: BlockContext) -> Option<BlockEffects> {
     bank.distribute_partitioned_epoch_rewards();
 
     bank.get_transaction_processor().reset_sysvar_cache();
+
     bank.update_slot_hashes();
     bank.update_stake_history(Some(parent_epoch));
     bank.update_clock(Some(parent_epoch));

solfuzz_agave.toml

@@ -18,7 +18,9 @@ pub fn load_elf(
     let feature_set = FeatureSet::from(features.unwrap_or(&proto::FeatureSet::default()));
     let program_runtime_environment_v1 = create_program_runtime_environment_v1(
         &feature_set.runtime_features(),
-        &SVMTransactionExecutionBudget::default(),
+        &SVMTransactionExecutionBudget::new_with_defaults(
+            feature_set.runtime_features().raise_cpi_nesting_limit_to_8, // simd_0268_active
+        ),
         deploy_checks,
         std::env::var("ENABLE_VM_TRACING").is_ok(),
     )