svm repo split: rename type overrides (#7431)

svm repo split: rename `type-overrides` to `svm-type-overrides`

Cargo.lock

@@ -265,11 +265,11 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-transaction",
  "solana-transaction-context",
  "solana-transaction-status",
- "solana-type-overrides",
  "solana-unified-scheduler-pool",
  "solana-version",
  "solana-vote",
@@ -380,11 +380,11 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-type-overrides",
  "solana-sysvar",
  "solana-sysvar-id",
  "solana-timings",
  "solana-transaction-context",
- "solana-type-overrides",
  "static_assertions",
  "test-case",
  "thiserror 2.0.12",
@@ -7299,9 +7299,9 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-transaction-context",
- "solana-type-overrides",
  "static_assertions",
  "test-case",
 ]
@@ -9053,9 +9053,9 @@ dependencies = [
  "solana-sbpf",
  "solana-sdk-ids",
  "solana-svm-log-collector",
+ "solana-svm-type-overrides",
  "solana-sysvar",
  "solana-transaction-context",
- "solana-type-overrides",
 ]
 
 [[package]]
@@ -9670,13 +9670,13 @@ dependencies = [
  "solana-svm-feature-set",
  "solana-svm-log-collector",
  "solana-svm-transaction",
+ "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-sysvar",
  "solana-sysvar-id",
  "solana-timings",
  "solana-transaction",
  "solana-transaction-context",
- "solana-type-overrides",
  "test-case",
 ]
 
@@ -10713,10 +10713,10 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-type-overrides",
  "solana-sysvar",
  "solana-sysvar-id",
  "solana-transaction-context",
- "solana-type-overrides",
  "solana-vote-interface",
  "solana-vote-program",
  "test-case",
@@ -10927,6 +10927,7 @@ dependencies = [
  "solana-svm-feature-set",
  "solana-svm-log-collector",
  "solana-svm-transaction",
+ "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-system-program",
  "solana-system-transaction",
@@ -10936,7 +10937,6 @@ dependencies = [
  "solana-transaction",
  "solana-transaction-context",
  "solana-transaction-error",
- "solana-type-overrides",
  "spl-generic-token",
  "spl-token-interface",
  "test-case",
@@ -10980,6 +10980,15 @@ dependencies = [
  "test-case",
 ]
 
+[[package]]
+name = "solana-svm-type-overrides"
+version = "3.0.0"
+dependencies = [
+ "futures 0.3.31",
+ "rand 0.8.5",
+ "shuttle",
+]
+
 [[package]]
 name = "solana-system-interface"
 version = "1.0.0"
@@ -11024,10 +11033,10 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-sysvar",
  "solana-transaction-context",
- "solana-type-overrides",
 ]
 
 [[package]]
@@ -11556,15 +11565,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "solana-type-overrides"
-version = "3.0.0"
-dependencies = [
- "futures 0.3.31",
- "rand 0.8.5",
- "shuttle",
-]
-
 [[package]]
 name = "solana-udp-client"
 version = "3.0.0"

Cargo.toml

@@ -106,6 +106,7 @@ members = [
     "svm-feature-set",
     "svm-log-collector",
     "svm-transaction",
+    "svm-type-overrides",
     "syscalls",
     "syscalls/gen-syscall-list",
     "test-validator",
@@ -123,7 +124,6 @@ members = [
     "transaction-status-client-types",
     "transaction-view",
     "turbine",
-    "type-overrides",
     "udp-client",
     "unified-scheduler-logic",
     "unified-scheduler-pool",
@@ -524,6 +524,7 @@ solana-svm-callback = { path = "svm-callback", version = "=3.0.0" }
 solana-svm-feature-set = { path = "svm-feature-set", version = "=3.0.0" }
 solana-svm-log-collector = { path = "svm-log-collector", version = "=3.0.0" }
 solana-svm-transaction = { path = "svm-transaction", version = "=3.0.0" }
+solana-svm-type-overrides = { path = "svm-type-overrides", version = "=3.0.0" }
 solana-system-interface = "1.0"
 solana-system-program = { path = "programs/system", version = "=3.0.0" }
 solana-system-transaction = "2.2.1"
@@ -543,7 +544,6 @@ solana-transaction-metrics-tracker = { path = "transaction-metrics-tracker", ver
 solana-transaction-status = { path = "transaction-status", version = "=3.0.0" }
 solana-transaction-status-client-types = { path = "transaction-status-client-types", version = "=3.0.0" }
 solana-turbine = { path = "turbine", version = "=3.0.0" }
-solana-type-overrides = { path = "type-overrides", version = "=3.0.0" }
 solana-udp-client = { path = "udp-client", version = "=3.0.0" }
 solana-unified-scheduler-logic = { path = "unified-scheduler-logic", version = "=3.0.0" }
 solana-unified-scheduler-pool = { path = "unified-scheduler-pool", version = "=3.0.0" }

ledger-tool/Cargo.toml

@@ -79,11 +79,11 @@ solana-streamer = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 solana-svm-log-collector = { workspace = true }
+solana-svm-type-overrides = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-transaction = { workspace = true }
 solana-transaction-context = { workspace = true }
 solana-transaction-status = { workspace = true }
-solana-type-overrides = { workspace = true }
 solana-unified-scheduler-pool = { workspace = true }
 solana-version = { workspace = true }
 solana-vote = { workspace = true }

program-runtime/Cargo.toml

@@ -21,7 +21,7 @@ dev-context-only-utils = []
 dummy-for-ci-check = ["metrics"]
 frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
 metrics = ["dep:solana-metrics"]
-shuttle-test = ["solana-type-overrides/shuttle-test", "solana-sbpf/shuttle-test"]
+shuttle-test = ["solana-sbpf/shuttle-test", "solana-svm-type-overrides/shuttle-test"]
 
 [dependencies]
 base64 = { workspace = true }
@@ -57,12 +57,12 @@ solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 solana-svm-log-collector = { workspace = true }
 solana-svm-transaction = { workspace = true }
+solana-svm-type-overrides = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-sysvar-id = { workspace = true }
 solana-timings = { workspace = true }
 solana-transaction-context = { workspace = true }
-solana-type-overrides = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }

program-runtime/src/invoke_context.rs

@@ -29,12 +29,12 @@ use {
     solana_svm_feature_set::SVMFeatureSet,
     solana_svm_log_collector::{ic_msg, LogCollector},
     solana_svm_transaction::{instruction::SVMInstruction, svm_message::SVMMessage},
+    solana_svm_type_overrides::sync::Arc,
     solana_timings::{ExecuteDetailsTimings, ExecuteTimings},
     solana_transaction_context::{
         IndexOfAccount, InstructionAccount, TransactionAccount, TransactionContext,
         MAX_ACCOUNTS_PER_TRANSACTION,
     },
-    solana_type_overrides::sync::Arc,
     std::{
         alloc::Layout,
         cell::RefCell,

program-runtime/src/loaded_programs.rs

@@ -10,7 +10,7 @@ use {
     solana_sdk_ids::{
         bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable, loader_v4, native_loader,
     },
-    solana_type_overrides::{
+    solana_svm_type_overrides::{
         rand::{thread_rng, Rng},
         sync::{
             atomic::{AtomicU64, Ordering},

program-runtime/src/sysvar_cache.rs

@@ -12,10 +12,10 @@ use {
     solana_rent::Rent,
     solana_sdk_ids::sysvar,
     solana_slot_hashes::SlotHashes,
+    solana_svm_type_overrides::sync::Arc,
     solana_sysvar::{stake_history::StakeHistory, Sysvar},
     solana_sysvar_id::SysvarId,
     solana_transaction_context::{IndexOfAccount, InstructionContext, TransactionContext},
-    solana_type_overrides::sync::Arc,
 };
 
 #[cfg(feature = "frozen-abi")]

programs/bpf_loader/Cargo.toml

@@ -20,9 +20,9 @@ name = "solana_bpf_loader_program"
 default = ["metrics"]
 metrics = ["solana-program-runtime/metrics"]
 shuttle-test = [
-    "solana-type-overrides/shuttle-test",
     "solana-program-runtime/shuttle-test",
     "solana-sbpf/shuttle-test",
+    "solana-svm-type-overrides/shuttle-test",
 ]
 svm-internal = []
 
@@ -45,9 +45,9 @@ solana-sbpf = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 solana-svm-log-collector = { workspace = true }
+solana-svm-type-overrides = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-transaction-context = { workspace = true, features = ["bincode"] }
-solana-type-overrides = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }

programs/bpf_loader/src/lib.rs

@@ -38,9 +38,9 @@ use {
         bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable, loader_v4, native_loader,
     },
     solana_svm_log_collector::{ic_logger_msg, ic_msg, LogCollector},
+    solana_svm_type_overrides::sync::{atomic::Ordering, Arc},
     solana_system_interface::{instruction as system_instruction, MAX_PERMITTED_DATA_LENGTH},
     solana_transaction_context::{IndexOfAccount, InstructionContext, TransactionContext},
-    solana_type_overrides::sync::{atomic::Ordering, Arc},
     std::{cell::RefCell, mem, rc::Rc},
 };
 

programs/loader-v4/Cargo.toml

@@ -18,9 +18,9 @@ name = "solana_loader_v4_program"
 [features]
 agave-unstable-api = []
 shuttle-test = [
-    "solana-type-overrides/shuttle-test",
     "solana-program-runtime/shuttle-test",
     "solana-sbpf/shuttle-test",
+    "solana-svm-type-overrides/shuttle-test",
 ]
 svm-internal = []
 
@@ -40,8 +40,8 @@ solana-pubkey = { workspace = true }
 solana-sbpf = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-svm-log-collector = { workspace = true }
+solana-svm-type-overrides = { workspace = true }
 solana-transaction-context = { workspace = true }
-solana-type-overrides = { workspace = true }
 
 [dev-dependencies]
 bincode = { workspace = true }

programs/loader-v4/src/lib.rs

@@ -19,8 +19,8 @@ use {
     solana_sbpf::{declare_builtin_function, memory_region::MemoryMapping},
     solana_sdk_ids::{bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable, loader_v4},
     solana_svm_log_collector::{ic_logger_msg, LogCollector},
+    solana_svm_type_overrides::sync::Arc,
     solana_transaction_context::{BorrowedAccount, InstructionContext},
-    solana_type_overrides::sync::Arc,
     std::{cell::RefCell, rc::Rc},
 };
 

programs/sbf/Cargo.lock

@@ -168,11 +168,11 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-type-overrides",
  "solana-sysvar",
  "solana-sysvar-id",
  "solana-timings",
  "solana-transaction-context",
- "solana-type-overrides",
  "thiserror 2.0.12",
 ]
 
@@ -5846,9 +5846,9 @@ dependencies = [
  "solana-sdk-ids",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-transaction-context",
- "solana-type-overrides",
 ]
 
 [[package]]
@@ -7072,8 +7072,8 @@ dependencies = [
  "solana-sbpf",
  "solana-sdk-ids",
  "solana-svm-log-collector",
+ "solana-svm-type-overrides",
  "solana-transaction-context",
- "solana-type-overrides",
 ]
 
 [[package]]
@@ -7505,12 +7505,12 @@ dependencies = [
  "solana-svm-feature-set",
  "solana-svm-log-collector",
  "solana-svm-transaction",
+ "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-sysvar",
  "solana-sysvar-id",
  "solana-timings",
  "solana-transaction-context",
- "solana-type-overrides",
 ]
 
 [[package]]
@@ -8132,6 +8132,7 @@ dependencies = [
  "solana-svm-feature-set",
  "solana-svm-log-collector",
  "solana-svm-transaction",
+ "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-sysvar",
  "solana-timings",
@@ -8139,7 +8140,6 @@ dependencies = [
  "solana-transaction-context",
  "solana-transaction-error",
  "solana-transaction-status",
- "solana-type-overrides",
  "solana-vote",
  "solana-vote-program",
 ]
@@ -9106,9 +9106,9 @@ dependencies = [
  "solana-sdk-ids",
  "solana-stake-interface",
  "solana-svm-log-collector",
+ "solana-svm-type-overrides",
  "solana-sysvar",
  "solana-transaction-context",
- "solana-type-overrides",
  "solana-vote-interface",
 ]
 
@@ -9256,12 +9256,12 @@ dependencies = [
  "solana-svm-feature-set",
  "solana-svm-log-collector",
  "solana-svm-transaction",
+ "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-sysvar-id",
  "solana-timings",
  "solana-transaction-context",
  "solana-transaction-error",
- "solana-type-overrides",
  "spl-generic-token",
  "thiserror 2.0.12",
 ]
@@ -9299,6 +9299,13 @@ dependencies = [
  "solana-transaction",
 ]
 
+[[package]]
+name = "solana-svm-type-overrides"
+version = "3.0.0"
+dependencies = [
+ "rand 0.8.5",
+]
+
 [[package]]
 name = "solana-system-interface"
 version = "1.0.0"
@@ -9334,10 +9341,10 @@ dependencies = [
  "solana-pubkey",
  "solana-sdk-ids",
  "solana-svm-log-collector",
+ "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-sysvar",
  "solana-transaction-context",
- "solana-type-overrides",
 ]
 
 [[package]]
@@ -9717,13 +9724,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "solana-type-overrides"
-version = "3.0.0"
-dependencies = [
- "rand 0.8.5",
-]
-
 [[package]]
 name = "solana-udp-client"
 version = "3.0.0"

programs/sbf/Cargo.toml

@@ -161,12 +161,12 @@ solana-svm-callback = { path = "../../svm-callback", version = "=3.0.0" }
 solana-svm-feature-set = { path = "../../svm-feature-set", version = "=3.0.0" }
 solana-svm-log-collector = { path = "../../svm-log-collector", version = "=3.0.0" }
 solana-svm-transaction = { path = "../../svm-transaction", version = "=3.0.0" }
+solana-svm-type-overrides = { path = "../../svm-type-overrides", version = "=3.0.0" }
 solana-system-interface = { version = "=1.0", features = ["bincode"] }
 solana-sysvar = "=2.2.2"
 solana-timings = { path = "../../timings", version = "=3.0.0" }
 solana-transaction-context = { path = "../../transaction-context", version = "=3.0.0" }
 solana-transaction-status = { path = "../../transaction-status", version = "=3.0.0" }
-solana-type-overrides = { path = "../../type-overrides", version = "=3.0.0" }
 solana-vote = { path = "../../vote", version = "=3.0.0" }
 solana-vote-program = { path = "../../programs/vote", version = "=3.0.0" }
 thiserror = "1.0"
@@ -239,6 +239,7 @@ solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 solana-svm-log-collector = { workspace = true }
 solana-svm-transaction = { workspace = true }
+solana-svm-type-overrides = { workspace = true }
 solana-system-interface = "1.0"
 solana-sysvar = "2.2.1"
 solana-timings = { workspace = true }
@@ -246,7 +247,6 @@ solana-transaction = "2.2.2"
 solana-transaction-context = { workspace = true, features = ["dev-context-only-utils"] }
 solana-transaction-error = "2.2.1"
 solana-transaction-status = { workspace = true }
-solana-type-overrides = { workspace = true }
 solana-vote = { workspace = true }
 solana-vote-program = { workspace = true }
 

programs/sbf/tests/programs.rs

@@ -59,11 +59,11 @@ use {
         transaction_processor::ExecutionRecordingConfig,
     },
     solana_svm_transaction::svm_message::SVMMessage,
+    solana_svm_type_overrides::rand,
     solana_system_interface::{program as system_program, MAX_PERMITTED_DATA_LENGTH},
     solana_timings::ExecuteTimings,
     solana_transaction::Transaction,
     solana_transaction_error::TransactionError,
-    solana_type_overrides::rand,
     std::{
         assert_eq,
         cell::RefCell,

programs/stake/Cargo.toml

@@ -34,9 +34,9 @@ solana-rent = { workspace = true }
 solana-sdk-ids = { workspace = true }
 solana-stake-interface = { workspace = true }
 solana-svm-log-collector = { workspace = true }
+solana-svm-type-overrides = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-transaction-context = { workspace = true, features = ["bincode"] }
-solana-type-overrides = { workspace = true }
 solana-vote-interface = { workspace = true, features = ["bincode"] }
 
 [dev-dependencies]

programs/system/Cargo.toml

@@ -32,10 +32,10 @@ solana-program-runtime = { workspace = true }
 solana-pubkey = { workspace = true, features = ["sha2"] }
 solana-sdk-ids = { workspace = true }
 solana-svm-log-collector = { workspace = true }
+solana-svm-type-overrides = { workspace = true }
 solana-system-interface = { workspace = true, features = ["serde"] }
 solana-sysvar = { workspace = true }
 solana-transaction-context = { workspace = true, features = ["bincode"] }
-solana-type-overrides = { workspace = true }
 
 [dev-dependencies]
 agave-feature-set = { workspace = true }

type-overrides/Cargo.toml → svm-type-overrides/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "solana-type-overrides"
+name = "solana-svm-type-overrides"
 description = "Type overrides for specialized testing"
 version = { workspace = true }
 authors = { workspace = true }

svm/Cargo.toml

@@ -27,10 +27,10 @@ frozen-abi = [
     "solana-program-runtime/frozen-abi",
 ]
 shuttle-test = [
-    "solana-type-overrides/shuttle-test",
-    "solana-program-runtime/shuttle-test",
     "solana-bpf-loader-program/shuttle-test",
     "solana-loader-v4-program/shuttle-test",
+    "solana-program-runtime/shuttle-test",
+    "solana-svm-type-overrides/shuttle-test",
 ]
 svm-internal = []
 
@@ -71,12 +71,12 @@ solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 solana-svm-log-collector = { workspace = true }
 solana-svm-transaction = { workspace = true }
+solana-svm-type-overrides = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar-id = { workspace = true }
 solana-timings = { workspace = true }
 solana-transaction-context = { workspace = true }
 solana-transaction-error = { workspace = true }
-solana-type-overrides = { workspace = true }
 spl-generic-token = { workspace = true }
 thiserror = { workspace = true }
 

svm/src/program_loader.rs

@@ -11,9 +11,9 @@ use {
     solana_pubkey::Pubkey,
     solana_sdk_ids::{bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable, loader_v4},
     solana_svm_callback::TransactionProcessingCallback,
+    solana_svm_type_overrides::sync::Arc,
     solana_timings::ExecuteTimings,
     solana_transaction_error::{TransactionError, TransactionResult},
-    solana_type_overrides::sync::Arc,
 };
 
 #[derive(Debug)]

svm/src/transaction_processor.rs

@@ -50,10 +50,10 @@ use {
     solana_svm_feature_set::SVMFeatureSet,
     solana_svm_log_collector::LogCollector,
     solana_svm_transaction::{svm_message::SVMMessage, svm_transaction::SVMTransaction},
+    solana_svm_type_overrides::sync::{atomic::Ordering, Arc, RwLock, RwLockReadGuard},
     solana_timings::{ExecuteTimingType, ExecuteTimings},
     solana_transaction_context::{ExecutionRecord, TransactionContext},
     solana_transaction_error::{TransactionError, TransactionResult},
-    solana_type_overrides::sync::{atomic::Ordering, Arc, RwLock, RwLockReadGuard},
     std::{
         collections::HashSet,
         fmt::{Debug, Formatter},

svm/tests/integration_test.rs

@@ -42,13 +42,13 @@ use {
         },
     },
     solana_svm_transaction::svm_message::SVMMessage,
+    solana_svm_type_overrides::sync::{Arc, RwLock},
     solana_system_interface::{instruction as system_instruction, program as system_program},
     solana_system_transaction as system_transaction,
     solana_sysvar::rent::Rent,
     solana_transaction::{sanitized::SanitizedTransaction, Transaction},
     solana_transaction_context::TransactionReturnData,
     solana_transaction_error::TransactionError,
-    solana_type_overrides::sync::{Arc, RwLock},
     std::{collections::HashMap, sync::atomic::Ordering},
     test_case::test_case,
 };

svm/tests/mock_bank.rs

@@ -29,8 +29,8 @@ use {
     solana_svm_callback::{AccountState, InvokeContextCallback, TransactionProcessingCallback},
     solana_svm_feature_set::SVMFeatureSet,
     solana_svm_transaction::svm_message::SVMMessage,
+    solana_svm_type_overrides::sync::{Arc, RwLock},
     solana_sysvar_id::SysvarId,
-    solana_type_overrides::sync::{Arc, RwLock},
     std::{
         cmp::Ordering,
         collections::HashMap,

syscalls/Cargo.toml

@@ -16,9 +16,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 default = ["metrics"]
 metrics = ["solana-program-runtime/metrics"]
 shuttle-test = [
-    "solana-type-overrides/shuttle-test",
     "solana-program-runtime/shuttle-test",
     "solana-sbpf/shuttle-test",
+    "solana-svm-type-overrides/shuttle-test",
 ]
 svm-internal = []
 
@@ -51,11 +51,11 @@ solana-stable-layout = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 solana-svm-log-collector = { workspace = true }
+solana-svm-type-overrides = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-sysvar-id = { workspace = true }
 solana-timings = { workspace = true }
 solana-transaction-context = { workspace = true, features = ["bincode"] }
-solana-type-overrides = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]

syscalls/src/lib.rs

@@ -46,11 +46,11 @@ use {
     solana_sha256_hasher::Hasher,
     solana_svm_feature_set::SVMFeatureSet,
     solana_svm_log_collector::{ic_logger_msg, ic_msg},
+    solana_svm_type_overrides::sync::Arc,
     solana_sysvar::Sysvar,
     solana_sysvar_id::SysvarId,
     solana_timings::ExecuteTimings,
     solana_transaction_context::IndexOfAccount,
-    solana_type_overrides::sync::Arc,
     std::{
         alloc::Layout,
         marker::PhantomData,