From c05b1239ac6fea4ea0a0fdfaf630c0a73c321ea5 Mon Sep 17 00:00:00 2001
From: lukacan <andrej.lukacovic98@gmail.com>
Date: Thu, 11 Jul 2024 10:10:29 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Remove=20trident-fuzzing=20featu?=
 =?UTF-8?q?re=20for=20now?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/templates/trident-tests/test_fuzz.rs  |   4 +
 crates/fuzz/src/trident_accounts_struct.rs    |   2 +-
 .../arbitrary-custom-types-4/Cargo.lock       | 147 ++++--------------
 .../arbitrary-limit-inputs-5/Cargo.lock       |   3 +-
 .../arbitrary-limit-inputs-5/Cargo.toml       |   5 +-
 examples/fuzz-tests/hello_world/Cargo.lock    | 147 ++++--------------
 .../incorrect-integer-arithmetic-3/Cargo.lock |  74 ++++-----
 .../incorrect-ix-sequence-1/Cargo.lock        | 147 ++++--------------
 .../unauthorized-access-2/Cargo.lock          | 147 ++++--------------
 9 files changed, 169 insertions(+), 507 deletions(-)

diff --git a/crates/client/src/templates/trident-tests/test_fuzz.rs b/crates/client/src/templates/trident-tests/test_fuzz.rs
index 5940f3e5..83e3bcae 100644
--- a/crates/client/src/templates/trident-tests/test_fuzz.rs
+++ b/crates/client/src/templates/trident-tests/test_fuzz.rs
@@ -1,6 +1,10 @@
 use trident_client::fuzzing::*;
 mod fuzz_instructions;
 
+// TODO: In case of using file extension for AccountsSnapshots
+// uncomment the line below
+// mod accounts_snapshots;
+
 const PROGRAM_NAME: &str = "###PROGRAM_NAME###";
 
 struct MyFuzzData;
diff --git a/crates/fuzz/src/trident_accounts_struct.rs b/crates/fuzz/src/trident_accounts_struct.rs
index f60efd64..1df93289 100644
--- a/crates/fuzz/src/trident_accounts_struct.rs
+++ b/crates/fuzz/src/trident_accounts_struct.rs
@@ -714,7 +714,7 @@ fn generate(accs: &TridentAccountsStruct) -> proc_macro2::TokenStream {
     });
 
     quote! {
-        #[cfg(feature = "trident-fuzzing")]
+        // #[cfg(feature = "trident-fuzzing")]
         pub mod #module_name{
             #[cfg(target_os = "solana")]
             compile_error!("Do not use fuzzing with Production Code");
diff --git a/examples/fuzz-tests/arbitrary-custom-types-4/Cargo.lock b/examples/fuzz-tests/arbitrary-custom-types-4/Cargo.lock
index bf55e703..504a5c95 100644
--- a/examples/fuzz-tests/arbitrary-custom-types-4/Cargo.lock
+++ b/examples/fuzz-tests/arbitrary-custom-types-4/Cargo.lock
@@ -266,19 +266,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "anchor-spl"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c4fd6e43b2ca6220d2ef1641539e678bfc31b6cc393cf892b373b5997b6a39a"
-dependencies = [
- "anchor-lang",
- "solana-program",
- "spl-associated-token-account",
- "spl-token 4.0.0",
- "spl-token-2022 0.9.0",
-]
-
 [[package]]
 name = "anchor-syn"
 version = "0.29.0"
@@ -1134,6 +1121,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -2793,15 +2789,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive 0.5.11",
-]
-
 [[package]]
 name = "num_enum"
 version = "0.6.1"
@@ -2820,18 +2807,6 @@ dependencies = [
  "num_enum_derive 0.7.2",
 ]
 
-[[package]]
-name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "num_enum_derive"
 version = "0.6.1"
@@ -4061,8 +4036,8 @@ dependencies = [
  "serde_json",
  "solana-config-program",
  "solana-sdk",
- "spl-token 4.0.0",
- "spl-token-2022 1.0.0",
+ "spl-token",
+ "spl-token-2022",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
  "thiserror",
@@ -4780,7 +4755,7 @@ dependencies = [
  "solana-sdk",
  "solana-transaction-status",
  "solana-version",
- "spl-token-2022 1.0.0",
+ "spl-token-2022",
  "thiserror",
 ]
 
@@ -5085,8 +5060,8 @@ dependencies = [
  "solana-sdk",
  "spl-associated-token-account",
  "spl-memo",
- "spl-token 4.0.0",
- "spl-token-2022 1.0.0",
+ "spl-token",
+ "spl-token-2022",
  "thiserror",
 ]
 
@@ -5257,8 +5232,8 @@ dependencies = [
  "num-derive 0.4.2",
  "num-traits",
  "solana-program",
- "spl-token 4.0.0",
- "spl-token-2022 1.0.0",
+ "spl-token",
+ "spl-token-2022",
  "thiserror",
 ]
 
@@ -5344,20 +5319,6 @@ dependencies = [
  "syn 2.0.60",
 ]
 
-[[package]]
-name = "spl-tlv-account-resolution"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9"
-dependencies = [
- "bytemuck",
- "solana-program",
- "spl-discriminator",
- "spl-pod",
- "spl-program-error",
- "spl-type-length-value",
-]
-
 [[package]]
 name = "spl-tlv-account-resolution"
 version = "0.5.2"
@@ -5372,21 +5333,6 @@ dependencies = [
  "spl-type-length-value",
 ]
 
-[[package]]
-name = "spl-token"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d"
-dependencies = [
- "arrayref",
- "bytemuck",
- "num-derive 0.3.3",
- "num-traits",
- "num_enum 0.5.11",
- "solana-program",
- "thiserror",
-]
-
 [[package]]
 name = "spl-token"
 version = "4.0.0"
@@ -5402,28 +5348,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "spl-token-2022"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86"
-dependencies = [
- "arrayref",
- "bytemuck",
- "num-derive 0.4.2",
- "num-traits",
- "num_enum 0.7.2",
- "solana-program",
- "solana-zk-token-sdk",
- "spl-memo",
- "spl-pod",
- "spl-token 4.0.0",
- "spl-token-metadata-interface",
- "spl-transfer-hook-interface 0.3.0",
- "spl-type-length-value",
- "thiserror",
-]
-
 [[package]]
 name = "spl-token-2022"
 version = "1.0.0"
@@ -5440,10 +5364,10 @@ dependencies = [
  "solana-zk-token-sdk",
  "spl-memo",
  "spl-pod",
- "spl-token 4.0.0",
+ "spl-token",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
- "spl-transfer-hook-interface 0.4.1",
+ "spl-transfer-hook-interface",
  "spl-type-length-value",
  "thiserror",
 ]
@@ -5475,22 +5399,6 @@ dependencies = [
  "spl-type-length-value",
 ]
 
-[[package]]
-name = "spl-transfer-hook-interface"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b"
-dependencies = [
- "arrayref",
- "bytemuck",
- "solana-program",
- "spl-discriminator",
- "spl-pod",
- "spl-program-error",
- "spl-tlv-account-resolution 0.4.0",
- "spl-type-length-value",
-]
-
 [[package]]
 name = "spl-transfer-hook-interface"
 version = "0.4.1"
@@ -5503,7 +5411,7 @@ dependencies = [
  "spl-discriminator",
  "spl-pod",
  "spl-program-error",
- "spl-tlv-account-resolution 0.5.2",
+ "spl-tlv-account-resolution",
  "spl-type-length-value",
 ]
 
@@ -6090,7 +5998,6 @@ version = "0.6.0"
 dependencies = [
  "anchor-client",
  "anchor-lang",
- "anchor-spl",
  "anchor-syn",
  "anyhow",
  "arbitrary",
@@ -6120,11 +6027,12 @@ dependencies = [
  "solana-sdk",
  "solana-transaction-status",
  "spl-associated-token-account",
- "spl-token 3.5.0",
+ "spl-token",
  "syn 1.0.109",
  "thiserror",
  "tokio",
  "toml",
+ "trident-derive-accounts-snapshots",
  "trident-derive-displayix",
  "trident-derive-fuzz-deserialize",
  "trident-derive-fuzz-test-executor",
@@ -6132,6 +6040,16 @@ dependencies = [
  "trident-test",
 ]
 
+[[package]]
+name = "trident-derive-accounts-snapshots"
+version = "0.0.1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "trident-fuzz",
+]
+
 [[package]]
 name = "trident-derive-displayix"
 version = "0.0.1"
@@ -6166,6 +6084,7 @@ dependencies = [
  "anchor-lang",
  "anchor-syn",
  "arbitrary",
+ "convert_case",
  "heck 0.4.1",
  "prettytable",
  "proc-macro2",
@@ -6177,7 +6096,7 @@ dependencies = [
  "solana-program-runtime",
  "solana-program-test",
  "solana-sdk",
- "spl-token 3.5.0",
+ "spl-token",
  "syn 1.0.109",
  "thiserror",
  "tokio",
diff --git a/examples/fuzz-tests/arbitrary-limit-inputs-5/Cargo.lock b/examples/fuzz-tests/arbitrary-limit-inputs-5/Cargo.lock
index 5bc89c18..52b14861 100644
--- a/examples/fuzz-tests/arbitrary-limit-inputs-5/Cargo.lock
+++ b/examples/fuzz-tests/arbitrary-limit-inputs-5/Cargo.lock
@@ -6283,7 +6283,6 @@ version = "0.6.0"
 dependencies = [
  "anchor-client",
  "anchor-lang",
- "anchor-spl",
  "anchor-syn",
  "anyhow",
  "arbitrary",
@@ -6312,7 +6311,7 @@ dependencies = [
  "solana-program-test",
  "solana-sdk",
  "solana-transaction-status",
- "spl-associated-token-account 3.0.2",
+ "spl-associated-token-account 2.3.0",
  "spl-token",
  "syn 1.0.109",
  "thiserror",
diff --git a/examples/fuzz-tests/arbitrary-limit-inputs-5/programs/arbitrary-limit-inputs-5/Cargo.toml b/examples/fuzz-tests/arbitrary-limit-inputs-5/programs/arbitrary-limit-inputs-5/Cargo.toml
index ad9259e6..71385d4f 100644
--- a/examples/fuzz-tests/arbitrary-limit-inputs-5/programs/arbitrary-limit-inputs-5/Cargo.toml
+++ b/examples/fuzz-tests/arbitrary-limit-inputs-5/programs/arbitrary-limit-inputs-5/Cargo.toml
@@ -9,15 +9,14 @@ crate-type = ["cdylib", "lib"]
 name = "arbitrary_limit_inputs_5"
 
 [features]
-default = ["trident-fuzzing"]
+default = []
 cpi = ["no-entrypoint"]
 no-entrypoint = []
 no-idl = []
 no-log-ix-name = []
 idl-build = ["anchor-lang/idl-build", "anchor-spl/idl-build"]
-trident-fuzzing = ["trident-client"]
 
 [dependencies]
 anchor-lang = "0.30.1"
 anchor-spl = "0.30.1"
-trident-client = { path = "../../../../../crates/client", optional = true }
+trident-client = { path = "../../../../../crates/client" }
diff --git a/examples/fuzz-tests/hello_world/Cargo.lock b/examples/fuzz-tests/hello_world/Cargo.lock
index cc3414db..010ab490 100644
--- a/examples/fuzz-tests/hello_world/Cargo.lock
+++ b/examples/fuzz-tests/hello_world/Cargo.lock
@@ -266,19 +266,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "anchor-spl"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c4fd6e43b2ca6220d2ef1641539e678bfc31b6cc393cf892b373b5997b6a39a"
-dependencies = [
- "anchor-lang",
- "solana-program",
- "spl-associated-token-account",
- "spl-token 4.0.0",
- "spl-token-2022 0.9.0",
-]
-
 [[package]]
 name = "anchor-syn"
 version = "0.29.0"
@@ -1127,6 +1114,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -2793,15 +2789,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive 0.5.11",
-]
-
 [[package]]
 name = "num_enum"
 version = "0.6.1"
@@ -2820,18 +2807,6 @@ dependencies = [
  "num_enum_derive 0.7.2",
 ]
 
-[[package]]
-name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "num_enum_derive"
 version = "0.6.1"
@@ -4061,8 +4036,8 @@ dependencies = [
  "serde_json",
  "solana-config-program",
  "solana-sdk",
- "spl-token 4.0.0",
- "spl-token-2022 1.0.0",
+ "spl-token",
+ "spl-token-2022",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
  "thiserror",
@@ -4780,7 +4755,7 @@ dependencies = [
  "solana-sdk",
  "solana-transaction-status",
  "solana-version",
- "spl-token-2022 1.0.0",
+ "spl-token-2022",
  "thiserror",
 ]
 
@@ -5085,8 +5060,8 @@ dependencies = [
  "solana-sdk",
  "spl-associated-token-account",
  "spl-memo",
- "spl-token 4.0.0",
- "spl-token-2022 1.0.0",
+ "spl-token",
+ "spl-token-2022",
  "thiserror",
 ]
 
@@ -5257,8 +5232,8 @@ dependencies = [
  "num-derive 0.4.2",
  "num-traits",
  "solana-program",
- "spl-token 4.0.0",
- "spl-token-2022 1.0.0",
+ "spl-token",
+ "spl-token-2022",
  "thiserror",
 ]
 
@@ -5344,20 +5319,6 @@ dependencies = [
  "syn 2.0.60",
 ]
 
-[[package]]
-name = "spl-tlv-account-resolution"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9"
-dependencies = [
- "bytemuck",
- "solana-program",
- "spl-discriminator",
- "spl-pod",
- "spl-program-error",
- "spl-type-length-value",
-]
-
 [[package]]
 name = "spl-tlv-account-resolution"
 version = "0.5.2"
@@ -5372,21 +5333,6 @@ dependencies = [
  "spl-type-length-value",
 ]
 
-[[package]]
-name = "spl-token"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d"
-dependencies = [
- "arrayref",
- "bytemuck",
- "num-derive 0.3.3",
- "num-traits",
- "num_enum 0.5.11",
- "solana-program",
- "thiserror",
-]
-
 [[package]]
 name = "spl-token"
 version = "4.0.0"
@@ -5402,28 +5348,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "spl-token-2022"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86"
-dependencies = [
- "arrayref",
- "bytemuck",
- "num-derive 0.4.2",
- "num-traits",
- "num_enum 0.7.2",
- "solana-program",
- "solana-zk-token-sdk",
- "spl-memo",
- "spl-pod",
- "spl-token 4.0.0",
- "spl-token-metadata-interface",
- "spl-transfer-hook-interface 0.3.0",
- "spl-type-length-value",
- "thiserror",
-]
-
 [[package]]
 name = "spl-token-2022"
 version = "1.0.0"
@@ -5440,10 +5364,10 @@ dependencies = [
  "solana-zk-token-sdk",
  "spl-memo",
  "spl-pod",
- "spl-token 4.0.0",
+ "spl-token",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
- "spl-transfer-hook-interface 0.4.1",
+ "spl-transfer-hook-interface",
  "spl-type-length-value",
  "thiserror",
 ]
@@ -5475,22 +5399,6 @@ dependencies = [
  "spl-type-length-value",
 ]
 
-[[package]]
-name = "spl-transfer-hook-interface"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b"
-dependencies = [
- "arrayref",
- "bytemuck",
- "solana-program",
- "spl-discriminator",
- "spl-pod",
- "spl-program-error",
- "spl-tlv-account-resolution 0.4.0",
- "spl-type-length-value",
-]
-
 [[package]]
 name = "spl-transfer-hook-interface"
 version = "0.4.1"
@@ -5503,7 +5411,7 @@ dependencies = [
  "spl-discriminator",
  "spl-pod",
  "spl-program-error",
- "spl-tlv-account-resolution 0.5.2",
+ "spl-tlv-account-resolution",
  "spl-type-length-value",
 ]
 
@@ -6090,7 +5998,6 @@ version = "0.6.0"
 dependencies = [
  "anchor-client",
  "anchor-lang",
- "anchor-spl",
  "anchor-syn",
  "anyhow",
  "arbitrary",
@@ -6120,11 +6027,12 @@ dependencies = [
  "solana-sdk",
  "solana-transaction-status",
  "spl-associated-token-account",
- "spl-token 3.5.0",
+ "spl-token",
  "syn 1.0.109",
  "thiserror",
  "tokio",
  "toml",
+ "trident-derive-accounts-snapshots",
  "trident-derive-displayix",
  "trident-derive-fuzz-deserialize",
  "trident-derive-fuzz-test-executor",
@@ -6132,6 +6040,16 @@ dependencies = [
  "trident-test",
 ]
 
+[[package]]
+name = "trident-derive-accounts-snapshots"
+version = "0.0.1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "trident-fuzz",
+]
+
 [[package]]
 name = "trident-derive-displayix"
 version = "0.0.1"
@@ -6166,6 +6084,7 @@ dependencies = [
  "anchor-lang",
  "anchor-syn",
  "arbitrary",
+ "convert_case",
  "heck 0.4.1",
  "prettytable",
  "proc-macro2",
@@ -6177,7 +6096,7 @@ dependencies = [
  "solana-program-runtime",
  "solana-program-test",
  "solana-sdk",
- "spl-token 3.5.0",
+ "spl-token",
  "syn 1.0.109",
  "thiserror",
  "tokio",
diff --git a/examples/fuzz-tests/incorrect-integer-arithmetic-3/Cargo.lock b/examples/fuzz-tests/incorrect-integer-arithmetic-3/Cargo.lock
index 6f768dd0..3970c6d8 100644
--- a/examples/fuzz-tests/incorrect-integer-arithmetic-3/Cargo.lock
+++ b/examples/fuzz-tests/incorrect-integer-arithmetic-3/Cargo.lock
@@ -275,7 +275,7 @@ dependencies = [
  "anchor-lang",
  "solana-program",
  "spl-associated-token-account",
- "spl-token 4.0.0",
+ "spl-token",
  "spl-token-2022 0.9.0",
 ]
 
@@ -1127,6 +1127,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -2795,15 +2804,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive 0.5.11",
-]
-
 [[package]]
 name = "num_enum"
 version = "0.6.1"
@@ -2822,18 +2822,6 @@ dependencies = [
  "num_enum_derive 0.7.2",
 ]
 
-[[package]]
-name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "num_enum_derive"
 version = "0.6.1"
@@ -4063,7 +4051,7 @@ dependencies = [
  "serde_json",
  "solana-config-program",
  "solana-sdk",
- "spl-token 4.0.0",
+ "spl-token",
  "spl-token-2022 1.0.0",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
@@ -5087,7 +5075,7 @@ dependencies = [
  "solana-sdk",
  "spl-associated-token-account",
  "spl-memo",
- "spl-token 4.0.0",
+ "spl-token",
  "spl-token-2022 1.0.0",
  "thiserror",
 ]
@@ -5259,7 +5247,7 @@ dependencies = [
  "num-derive 0.4.2",
  "num-traits",
  "solana-program",
- "spl-token 4.0.0",
+ "spl-token",
  "spl-token-2022 1.0.0",
  "thiserror",
 ]
@@ -5374,21 +5362,6 @@ dependencies = [
  "spl-type-length-value",
 ]
 
-[[package]]
-name = "spl-token"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d"
-dependencies = [
- "arrayref",
- "bytemuck",
- "num-derive 0.3.3",
- "num-traits",
- "num_enum 0.5.11",
- "solana-program",
- "thiserror",
-]
-
 [[package]]
 name = "spl-token"
 version = "4.0.0"
@@ -5419,7 +5392,7 @@ dependencies = [
  "solana-zk-token-sdk",
  "spl-memo",
  "spl-pod",
- "spl-token 4.0.0",
+ "spl-token",
  "spl-token-metadata-interface",
  "spl-transfer-hook-interface 0.3.0",
  "spl-type-length-value",
@@ -5442,7 +5415,7 @@ dependencies = [
  "solana-zk-token-sdk",
  "spl-memo",
  "spl-pod",
- "spl-token 4.0.0",
+ "spl-token",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
  "spl-transfer-hook-interface 0.4.1",
@@ -6092,7 +6065,6 @@ version = "0.6.0"
 dependencies = [
  "anchor-client",
  "anchor-lang",
- "anchor-spl",
  "anchor-syn",
  "anyhow",
  "arbitrary",
@@ -6122,11 +6094,12 @@ dependencies = [
  "solana-sdk",
  "solana-transaction-status",
  "spl-associated-token-account",
- "spl-token 3.5.0",
+ "spl-token",
  "syn 1.0.109",
  "thiserror",
  "tokio",
  "toml",
+ "trident-derive-accounts-snapshots",
  "trident-derive-displayix",
  "trident-derive-fuzz-deserialize",
  "trident-derive-fuzz-test-executor",
@@ -6134,6 +6107,16 @@ dependencies = [
  "trident-test",
 ]
 
+[[package]]
+name = "trident-derive-accounts-snapshots"
+version = "0.0.1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "trident-fuzz",
+]
+
 [[package]]
 name = "trident-derive-displayix"
 version = "0.0.1"
@@ -6168,6 +6151,7 @@ dependencies = [
  "anchor-lang",
  "anchor-syn",
  "arbitrary",
+ "convert_case",
  "heck 0.4.1",
  "prettytable",
  "proc-macro2",
@@ -6179,7 +6163,7 @@ dependencies = [
  "solana-program-runtime",
  "solana-program-test",
  "solana-sdk",
- "spl-token 3.5.0",
+ "spl-token",
  "syn 1.0.109",
  "thiserror",
  "tokio",
diff --git a/examples/fuzz-tests/incorrect-ix-sequence-1/Cargo.lock b/examples/fuzz-tests/incorrect-ix-sequence-1/Cargo.lock
index 043a55b9..dac85b13 100644
--- a/examples/fuzz-tests/incorrect-ix-sequence-1/Cargo.lock
+++ b/examples/fuzz-tests/incorrect-ix-sequence-1/Cargo.lock
@@ -266,19 +266,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "anchor-spl"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c4fd6e43b2ca6220d2ef1641539e678bfc31b6cc393cf892b373b5997b6a39a"
-dependencies = [
- "anchor-lang",
- "solana-program",
- "spl-associated-token-account",
- "spl-token 4.0.0",
- "spl-token-2022 0.9.0",
-]
-
 [[package]]
 name = "anchor-syn"
 version = "0.29.0"
@@ -1127,6 +1114,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -2793,15 +2789,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive 0.5.11",
-]
-
 [[package]]
 name = "num_enum"
 version = "0.6.1"
@@ -2820,18 +2807,6 @@ dependencies = [
  "num_enum_derive 0.7.2",
 ]
 
-[[package]]
-name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "num_enum_derive"
 version = "0.6.1"
@@ -4061,8 +4036,8 @@ dependencies = [
  "serde_json",
  "solana-config-program",
  "solana-sdk",
- "spl-token 4.0.0",
- "spl-token-2022 1.0.0",
+ "spl-token",
+ "spl-token-2022",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
  "thiserror",
@@ -4780,7 +4755,7 @@ dependencies = [
  "solana-sdk",
  "solana-transaction-status",
  "solana-version",
- "spl-token-2022 1.0.0",
+ "spl-token-2022",
  "thiserror",
 ]
 
@@ -5085,8 +5060,8 @@ dependencies = [
  "solana-sdk",
  "spl-associated-token-account",
  "spl-memo",
- "spl-token 4.0.0",
- "spl-token-2022 1.0.0",
+ "spl-token",
+ "spl-token-2022",
  "thiserror",
 ]
 
@@ -5257,8 +5232,8 @@ dependencies = [
  "num-derive 0.4.2",
  "num-traits",
  "solana-program",
- "spl-token 4.0.0",
- "spl-token-2022 1.0.0",
+ "spl-token",
+ "spl-token-2022",
  "thiserror",
 ]
 
@@ -5344,20 +5319,6 @@ dependencies = [
  "syn 2.0.60",
 ]
 
-[[package]]
-name = "spl-tlv-account-resolution"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9"
-dependencies = [
- "bytemuck",
- "solana-program",
- "spl-discriminator",
- "spl-pod",
- "spl-program-error",
- "spl-type-length-value",
-]
-
 [[package]]
 name = "spl-tlv-account-resolution"
 version = "0.5.2"
@@ -5372,21 +5333,6 @@ dependencies = [
  "spl-type-length-value",
 ]
 
-[[package]]
-name = "spl-token"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d"
-dependencies = [
- "arrayref",
- "bytemuck",
- "num-derive 0.3.3",
- "num-traits",
- "num_enum 0.5.11",
- "solana-program",
- "thiserror",
-]
-
 [[package]]
 name = "spl-token"
 version = "4.0.0"
@@ -5402,28 +5348,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "spl-token-2022"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86"
-dependencies = [
- "arrayref",
- "bytemuck",
- "num-derive 0.4.2",
- "num-traits",
- "num_enum 0.7.2",
- "solana-program",
- "solana-zk-token-sdk",
- "spl-memo",
- "spl-pod",
- "spl-token 4.0.0",
- "spl-token-metadata-interface",
- "spl-transfer-hook-interface 0.3.0",
- "spl-type-length-value",
- "thiserror",
-]
-
 [[package]]
 name = "spl-token-2022"
 version = "1.0.0"
@@ -5440,10 +5364,10 @@ dependencies = [
  "solana-zk-token-sdk",
  "spl-memo",
  "spl-pod",
- "spl-token 4.0.0",
+ "spl-token",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
- "spl-transfer-hook-interface 0.4.1",
+ "spl-transfer-hook-interface",
  "spl-type-length-value",
  "thiserror",
 ]
@@ -5475,22 +5399,6 @@ dependencies = [
  "spl-type-length-value",
 ]
 
-[[package]]
-name = "spl-transfer-hook-interface"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b"
-dependencies = [
- "arrayref",
- "bytemuck",
- "solana-program",
- "spl-discriminator",
- "spl-pod",
- "spl-program-error",
- "spl-tlv-account-resolution 0.4.0",
- "spl-type-length-value",
-]
-
 [[package]]
 name = "spl-transfer-hook-interface"
 version = "0.4.1"
@@ -5503,7 +5411,7 @@ dependencies = [
  "spl-discriminator",
  "spl-pod",
  "spl-program-error",
- "spl-tlv-account-resolution 0.5.2",
+ "spl-tlv-account-resolution",
  "spl-type-length-value",
 ]
 
@@ -6090,7 +5998,6 @@ version = "0.6.0"
 dependencies = [
  "anchor-client",
  "anchor-lang",
- "anchor-spl",
  "anchor-syn",
  "anyhow",
  "arbitrary",
@@ -6120,11 +6027,12 @@ dependencies = [
  "solana-sdk",
  "solana-transaction-status",
  "spl-associated-token-account",
- "spl-token 3.5.0",
+ "spl-token",
  "syn 1.0.109",
  "thiserror",
  "tokio",
  "toml",
+ "trident-derive-accounts-snapshots",
  "trident-derive-displayix",
  "trident-derive-fuzz-deserialize",
  "trident-derive-fuzz-test-executor",
@@ -6132,6 +6040,16 @@ dependencies = [
  "trident-test",
 ]
 
+[[package]]
+name = "trident-derive-accounts-snapshots"
+version = "0.0.1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "trident-fuzz",
+]
+
 [[package]]
 name = "trident-derive-displayix"
 version = "0.0.1"
@@ -6166,6 +6084,7 @@ dependencies = [
  "anchor-lang",
  "anchor-syn",
  "arbitrary",
+ "convert_case",
  "heck 0.4.1",
  "prettytable",
  "proc-macro2",
@@ -6177,7 +6096,7 @@ dependencies = [
  "solana-program-runtime",
  "solana-program-test",
  "solana-sdk",
- "spl-token 3.5.0",
+ "spl-token",
  "syn 1.0.109",
  "thiserror",
  "tokio",
diff --git a/examples/fuzz-tests/unauthorized-access-2/Cargo.lock b/examples/fuzz-tests/unauthorized-access-2/Cargo.lock
index 11b32513..f0ed46fd 100644
--- a/examples/fuzz-tests/unauthorized-access-2/Cargo.lock
+++ b/examples/fuzz-tests/unauthorized-access-2/Cargo.lock
@@ -266,19 +266,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "anchor-spl"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c4fd6e43b2ca6220d2ef1641539e678bfc31b6cc393cf892b373b5997b6a39a"
-dependencies = [
- "anchor-lang",
- "solana-program",
- "spl-associated-token-account",
- "spl-token 4.0.0",
- "spl-token-2022 0.9.0",
-]
-
 [[package]]
 name = "anchor-syn"
 version = "0.29.0"
@@ -1127,6 +1114,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -2786,15 +2782,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive 0.5.11",
-]
-
 [[package]]
 name = "num_enum"
 version = "0.6.1"
@@ -2813,18 +2800,6 @@ dependencies = [
  "num_enum_derive 0.7.2",
 ]
 
-[[package]]
-name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "num_enum_derive"
 version = "0.6.1"
@@ -4054,8 +4029,8 @@ dependencies = [
  "serde_json",
  "solana-config-program",
  "solana-sdk",
- "spl-token 4.0.0",
- "spl-token-2022 1.0.0",
+ "spl-token",
+ "spl-token-2022",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
  "thiserror",
@@ -4773,7 +4748,7 @@ dependencies = [
  "solana-sdk",
  "solana-transaction-status",
  "solana-version",
- "spl-token-2022 1.0.0",
+ "spl-token-2022",
  "thiserror",
 ]
 
@@ -5078,8 +5053,8 @@ dependencies = [
  "solana-sdk",
  "spl-associated-token-account",
  "spl-memo",
- "spl-token 4.0.0",
- "spl-token-2022 1.0.0",
+ "spl-token",
+ "spl-token-2022",
  "thiserror",
 ]
 
@@ -5250,8 +5225,8 @@ dependencies = [
  "num-derive 0.4.2",
  "num-traits",
  "solana-program",
- "spl-token 4.0.0",
- "spl-token-2022 1.0.0",
+ "spl-token",
+ "spl-token-2022",
  "thiserror",
 ]
 
@@ -5337,20 +5312,6 @@ dependencies = [
  "syn 2.0.60",
 ]
 
-[[package]]
-name = "spl-tlv-account-resolution"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "062e148d3eab7b165582757453632ffeef490c02c86a48bfdb4988f63eefb3b9"
-dependencies = [
- "bytemuck",
- "solana-program",
- "spl-discriminator",
- "spl-pod",
- "spl-program-error",
- "spl-type-length-value",
-]
-
 [[package]]
 name = "spl-tlv-account-resolution"
 version = "0.5.2"
@@ -5365,21 +5326,6 @@ dependencies = [
  "spl-type-length-value",
 ]
 
-[[package]]
-name = "spl-token"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e85e168a785e82564160dcb87b2a8e04cee9bfd1f4d488c729d53d6a4bd300d"
-dependencies = [
- "arrayref",
- "bytemuck",
- "num-derive 0.3.3",
- "num-traits",
- "num_enum 0.5.11",
- "solana-program",
- "thiserror",
-]
-
 [[package]]
 name = "spl-token"
 version = "4.0.0"
@@ -5395,28 +5341,6 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "spl-token-2022"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4abf34a65ba420584a0c35f3903f8d727d1f13ababbdc3f714c6b065a686e86"
-dependencies = [
- "arrayref",
- "bytemuck",
- "num-derive 0.4.2",
- "num-traits",
- "num_enum 0.7.2",
- "solana-program",
- "solana-zk-token-sdk",
- "spl-memo",
- "spl-pod",
- "spl-token 4.0.0",
- "spl-token-metadata-interface",
- "spl-transfer-hook-interface 0.3.0",
- "spl-type-length-value",
- "thiserror",
-]
-
 [[package]]
 name = "spl-token-2022"
 version = "1.0.0"
@@ -5433,10 +5357,10 @@ dependencies = [
  "solana-zk-token-sdk",
  "spl-memo",
  "spl-pod",
- "spl-token 4.0.0",
+ "spl-token",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
- "spl-transfer-hook-interface 0.4.1",
+ "spl-transfer-hook-interface",
  "spl-type-length-value",
  "thiserror",
 ]
@@ -5468,22 +5392,6 @@ dependencies = [
  "spl-type-length-value",
 ]
 
-[[package]]
-name = "spl-transfer-hook-interface"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "051d31803f873cabe71aec3c1b849f35248beae5d19a347d93a5c9cccc5d5a9b"
-dependencies = [
- "arrayref",
- "bytemuck",
- "solana-program",
- "spl-discriminator",
- "spl-pod",
- "spl-program-error",
- "spl-tlv-account-resolution 0.4.0",
- "spl-type-length-value",
-]
-
 [[package]]
 name = "spl-transfer-hook-interface"
 version = "0.4.1"
@@ -5496,7 +5404,7 @@ dependencies = [
  "spl-discriminator",
  "spl-pod",
  "spl-program-error",
- "spl-tlv-account-resolution 0.5.2",
+ "spl-tlv-account-resolution",
  "spl-type-length-value",
 ]
 
@@ -6083,7 +5991,6 @@ version = "0.6.0"
 dependencies = [
  "anchor-client",
  "anchor-lang",
- "anchor-spl",
  "anchor-syn",
  "anyhow",
  "arbitrary",
@@ -6113,11 +6020,12 @@ dependencies = [
  "solana-sdk",
  "solana-transaction-status",
  "spl-associated-token-account",
- "spl-token 3.5.0",
+ "spl-token",
  "syn 1.0.109",
  "thiserror",
  "tokio",
  "toml",
+ "trident-derive-accounts-snapshots",
  "trident-derive-displayix",
  "trident-derive-fuzz-deserialize",
  "trident-derive-fuzz-test-executor",
@@ -6125,6 +6033,16 @@ dependencies = [
  "trident-test",
 ]
 
+[[package]]
+name = "trident-derive-accounts-snapshots"
+version = "0.0.1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "trident-fuzz",
+]
+
 [[package]]
 name = "trident-derive-displayix"
 version = "0.0.1"
@@ -6159,6 +6077,7 @@ dependencies = [
  "anchor-lang",
  "anchor-syn",
  "arbitrary",
+ "convert_case",
  "heck 0.4.1",
  "prettytable",
  "proc-macro2",
@@ -6170,7 +6089,7 @@ dependencies = [
  "solana-program-runtime",
  "solana-program-test",
  "solana-sdk",
- "spl-token 3.5.0",
+ "spl-token",
  "syn 1.0.109",
  "thiserror",
  "tokio",