From 83834c31ef6b32443bef6c579b0b389205f90980 Mon Sep 17 00:00:00 2001
From: John Sloboda <john@helius.xyz>
Date: Mon, 25 Nov 2024 17:05:46 -0700
Subject: [PATCH] manual fixes for yellowstone v4

---
 Cargo.lock                            | 1741 +++++--------------------
 Cargo.toml                            |   22 +-
 yellowstone-grpc-geyser/src/plugin.rs |    6 +-
 3 files changed, 333 insertions(+), 1436 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6a102cd8..2af3c9c1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -65,13 +65,13 @@ dependencies = [
 
 [[package]]
 name = "agave-geyser-plugin-interface"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "log",
- "solana-sdk 2.2.0",
+ "solana-sdk",
  "solana-transaction-status",
- "thiserror 2.0.3",
+ "thiserror",
 ]
 
 [[package]]
@@ -81,7 +81,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.15",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -322,6 +321,12 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e"
 
+[[package]]
+name = "assert_matches"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
+
 [[package]]
 name = "async-compression"
 version = "0.4.18"
@@ -2737,7 +2742,7 @@ dependencies = [
  "memchr",
  "parking_lot",
  "protobuf",
- "thiserror 1.0.69",
+ "thiserror",
 ]
 
 [[package]]
@@ -3272,15 +3277,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde-big-array"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_bytes"
 version = "0.11.15"
@@ -3437,38 +3433,20 @@ dependencies = [
 [[package]]
 name = "solana-account"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57cb0cf41b565741b350665918b1000324991029cbb56dd31f1bce75a509310b"
-dependencies = [
- "bincode",
- "serde",
- "serde_bytes",
- "serde_derive",
- "solana-instruction 2.1.2",
- "solana-program 2.1.2",
-]
-
-[[package]]
-name = "solana-account"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "bincode",
  "serde",
  "serde_bytes",
  "serde_derive",
- "solana-account-info 2.2.0",
- "solana-clock 2.2.0",
- "solana-instruction 2.2.0",
- "solana-pubkey 2.2.0",
- "solana-sdk-ids",
- "solana-sysvar",
+ "solana-instruction",
+ "solana-program",
 ]
 
 [[package]]
 name = "solana-account-decoder"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "Inflector",
  "base64 0.22.1",
@@ -3481,68 +3459,46 @@ dependencies = [
  "serde_json",
  "solana-account-decoder-client-types",
  "solana-config-program",
- "solana-sdk 2.2.0",
+ "solana-sdk",
  "spl-token",
  "spl-token-2022",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
- "thiserror 2.0.3",
+ "thiserror",
  "zstd",
 ]
 
 [[package]]
 name = "solana-account-decoder-client-types"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "base64 0.22.1",
  "bs58",
  "serde",
  "serde_derive",
  "serde_json",
- "solana-account 2.2.0",
- "solana-pubkey 2.2.0",
+ "solana-account",
+ "solana-pubkey",
  "zstd",
 ]
 
 [[package]]
 name = "solana-account-info"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e085851110dc6a38f55a78c238cf005e239ada61450a88713995022f7bbaf7"
-dependencies = [
- "bincode",
- "serde",
- "solana-program-error 2.1.2",
- "solana-program-memory 2.1.2",
- "solana-pubkey 2.1.2",
-]
-
-[[package]]
-name = "solana-account-info"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "bincode",
  "serde",
- "solana-program-error 2.2.0",
- "solana-program-memory 2.2.0",
- "solana-pubkey 2.2.0",
+ "solana-program-error",
+ "solana-program-memory",
+ "solana-pubkey",
 ]
 
 [[package]]
 name = "solana-atomic-u64"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cfea2176602dcad41dc19578bcb82f8ad7c57a0ec4a51b5dcc91fce0dbe16d"
-dependencies = [
- "parking_lot",
-]
-
-[[package]]
-name = "solana-atomic-u64"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "parking_lot",
 ]
@@ -3550,67 +3506,31 @@ dependencies = [
 [[package]]
 name = "solana-bincode"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3023f6d059845d3879307b6cd76f47155dfe39b3842820aaed59599bcc0d996"
-dependencies = [
- "bincode",
- "serde",
- "solana-instruction 2.1.2",
-]
-
-[[package]]
-name = "solana-bincode"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "bincode",
  "serde",
- "solana-instruction 2.2.0",
+ "solana-instruction",
 ]
 
 [[package]]
 name = "solana-bn254"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206e710f6146b416042fecf325b37b0418b91e5d6926e87cb879da908236075"
-dependencies = [
- "ark-bn254",
- "ark-ec",
- "ark-ff",
- "ark-serialize",
- "bytemuck",
- "solana-program 2.1.2",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "solana-bn254"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "ark-bn254",
  "ark-ec",
  "ark-ff",
  "ark-serialize",
  "bytemuck",
- "solana-define-syscall 2.2.0",
- "thiserror 2.0.3",
+ "solana-program",
+ "thiserror",
 ]
 
 [[package]]
 name = "solana-borsh"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9d146d0c485d8a2e363aa9b47f3e6b127d1603e1cafc12b4b958f25afd3082"
-dependencies = [
- "borsh 0.10.4",
- "borsh 1.5.3",
-]
-
-[[package]]
-name = "solana-borsh"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "borsh 0.10.4",
  "borsh 1.5.3",
@@ -3619,71 +3539,26 @@ dependencies = [
 [[package]]
 name = "solana-clock"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f7b4b20b02b938d791e537a08b82044d985a7764d289d7b405b762bc006cd61"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-sdk-macro 2.1.2",
- "solana-sysvar-id 2.1.2",
-]
-
-[[package]]
-name = "solana-clock"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-sdk-ids",
- "solana-sdk-macro 2.2.0",
- "solana-sysvar-id 2.2.0",
-]
-
-[[package]]
-name = "solana-cluster-type"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-hash 2.2.0",
-]
-
-[[package]]
-name = "solana-commitment-config"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "serde",
  "serde_derive",
+ "solana-sdk-macro",
+ "solana-sysvar-id",
 ]
 
 [[package]]
 name = "solana-compute-budget"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "solana-fee-structure",
- "solana-program-entrypoint 2.2.0",
-]
-
-[[package]]
-name = "solana-compute-budget-interface"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
- "borsh 1.5.3",
- "serde",
- "serde_derive",
- "solana-instruction 2.2.0",
- "solana-sdk-ids",
+ "solana-sdk",
 ]
 
 [[package]]
 name = "solana-config-program"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "bincode",
  "chrono",
@@ -3691,35 +3566,21 @@ dependencies = [
  "serde_derive",
  "solana-log-collector",
  "solana-program-runtime",
- "solana-sdk 2.2.0",
- "solana-short-vec 2.2.0",
+ "solana-sdk",
+ "solana-short-vec",
 ]
 
 [[package]]
 name = "solana-cpi"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d70d2d4fa6f1ecadc5293100f0a46e9a60abd63e2c2966f22c363b0972155395"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
- "solana-account-info 2.1.2",
- "solana-define-syscall 2.1.2",
- "solana-instruction 2.1.2",
- "solana-program-error 2.1.2",
- "solana-pubkey 2.1.2",
- "solana-stable-layout 2.1.2",
-]
-
-[[package]]
-name = "solana-cpi"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "solana-account-info 2.2.0",
- "solana-define-syscall 2.2.0",
- "solana-instruction 2.2.0",
- "solana-program-error 2.2.0",
- "solana-pubkey 2.2.0",
- "solana-stable-layout 2.2.0",
+ "solana-account-info",
+ "solana-define-syscall",
+ "solana-instruction",
+ "solana-program-error",
+ "solana-pubkey",
+ "solana-stable-layout",
 ]
 
 [[package]]
@@ -3731,23 +3592,14 @@ dependencies = [
  "bytemuck",
  "bytemuck_derive",
  "curve25519-dalek 4.1.3",
- "solana-program 2.1.2",
- "thiserror 1.0.69",
+ "solana-program",
+ "thiserror",
 ]
 
 [[package]]
 name = "solana-decode-error"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "987e69c94af8de7094a304e79a35643f9d02956845b16924403c08dcdc60f54a"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "solana-decode-error"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "num-traits",
 ]
@@ -3755,176 +3607,56 @@ dependencies = [
 [[package]]
 name = "solana-define-syscall"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "debfb6b4d3b263112fd001e6102cba148674807ef9c6cd7a80c3883137881032"
-
-[[package]]
-name = "solana-define-syscall"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 
 [[package]]
 name = "solana-derivation-path"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985ff15cae72e90dabfc50547b5edfb85e91deae64b0df650037dd770075384"
-dependencies = [
- "derivation-path",
- "qstring",
- "uriparse",
-]
-
-[[package]]
-name = "solana-derivation-path"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "derivation-path",
  "qstring",
  "uriparse",
 ]
 
-[[package]]
-name = "solana-ed25519-program"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "bytemuck",
- "bytemuck_derive",
- "ed25519-dalek",
- "solana-feature-set 2.2.0",
- "solana-instruction 2.2.0",
- "solana-precompile-error 2.2.0",
- "solana-sdk-ids",
-]
-
-[[package]]
-name = "solana-epoch-info"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "serde",
- "serde_derive",
-]
-
-[[package]]
-name = "solana-epoch-rewards"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-hash 2.2.0",
- "solana-sdk-ids",
- "solana-sdk-macro 2.2.0",
- "solana-sysvar-id 2.2.0",
-]
-
 [[package]]
 name = "solana-epoch-schedule"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf4eb069a4bb1c762fb59d1a3759bd496b2d275c3bb706e514c8cbafe02a24d"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-sdk-macro 2.1.2",
- "solana-sysvar-id 2.1.2",
-]
-
-[[package]]
-name = "solana-epoch-schedule"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "serde",
  "serde_derive",
- "solana-sdk-ids",
- "solana-sdk-macro 2.2.0",
- "solana-sysvar-id 2.2.0",
+ "solana-sdk-macro",
+ "solana-sysvar-id",
 ]
 
 [[package]]
 name = "solana-feature-set"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2296db31c609b7b88ad71c31e33fd541ad6e756fb40827ba0efecc7a647702"
-dependencies = [
- "lazy_static",
- "solana-clock 2.1.2",
- "solana-epoch-schedule 2.1.2",
- "solana-hash 2.1.2",
- "solana-pubkey 2.1.2",
- "solana-sha256-hasher 2.1.2",
-]
-
-[[package]]
-name = "solana-feature-set"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
- "ahash",
  "lazy_static",
- "solana-epoch-schedule 2.2.0",
- "solana-hash 2.2.0",
- "solana-pubkey 2.2.0",
- "solana-sha256-hasher 2.2.0",
+ "solana-clock",
+ "solana-epoch-schedule",
+ "solana-hash",
+ "solana-pubkey",
+ "solana-sha256-hasher",
 ]
 
 [[package]]
 name = "solana-fee-calculator"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0db9a84d00a6186b8900913caac51b35ef69c484c1cdf2569bfea31798351c28"
-dependencies = [
- "log",
- "serde",
- "serde_derive",
-]
-
-[[package]]
-name = "solana-fee-calculator"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "log",
  "serde",
  "serde_derive",
 ]
 
-[[package]]
-name = "solana-fee-structure"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-native-token 2.2.0",
- "solana-program 2.2.0",
-]
-
 [[package]]
 name = "solana-hash"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4adcc124a76786a090639440387ccc68fbf9477103489de107b73d90ce60ba"
-dependencies = [
- "borsh 1.5.3",
- "bs58",
- "bytemuck",
- "bytemuck_derive",
- "js-sys",
- "serde",
- "serde_derive",
- "solana-atomic-u64 2.1.2",
- "solana-sanitize 2.1.2",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "solana-hash"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "borsh 1.5.3",
  "bs58",
@@ -3933,25 +3665,15 @@ dependencies = [
  "js-sys",
  "serde",
  "serde_derive",
- "solana-atomic-u64 2.2.0",
- "solana-sanitize 2.2.0",
+ "solana-atomic-u64",
+ "solana-sanitize",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "solana-inflation"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2139d4e67a310f3a4e09034ba0e1d567bf7419420254be0e87e1f74f2b7e9217"
-dependencies = [
- "serde",
- "serde_derive",
-]
-
-[[package]]
-name = "solana-inflation"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "serde",
  "serde_derive",
@@ -3960,8 +3682,7 @@ dependencies = [
 [[package]]
 name = "solana-instruction"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ece5fc0c0a4a12ec8b505dffbc5e48ab7897e2dec9b335c977456223e94963"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "bincode",
  "borsh 1.5.3",
@@ -3970,180 +3691,76 @@ dependencies = [
  "num-traits",
  "serde",
  "serde_derive",
- "solana-define-syscall 2.1.2",
- "solana-pubkey 2.1.2",
+ "solana-define-syscall",
+ "solana-pubkey",
  "wasm-bindgen",
 ]
 
 [[package]]
-name = "solana-instruction"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+name = "solana-last-restart-slot"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
- "bincode",
- "borsh 1.5.3",
- "getrandom 0.2.15",
- "js-sys",
- "num-traits",
  "serde",
  "serde_derive",
- "solana-define-syscall 2.2.0",
- "solana-pubkey 2.2.0",
- "wasm-bindgen",
+ "solana-sdk-macro",
+ "solana-sysvar-id",
 ]
 
 [[package]]
-name = "solana-keccak-hasher"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+name = "solana-log-collector"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
- "sha3",
- "solana-define-syscall 2.2.0",
- "solana-hash 2.2.0",
- "solana-sanitize 2.2.0",
+ "log",
 ]
 
 [[package]]
-name = "solana-keypair"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+name = "solana-logger"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
- "bs58",
- "ed25519-dalek",
- "ed25519-dalek-bip32",
- "rand 0.7.3",
- "solana-derivation-path 2.2.0",
- "solana-pubkey 2.2.0",
- "solana-seed-derivable",
- "solana-seed-phrase",
- "solana-signature 2.2.0",
- "solana-signer",
- "wasm-bindgen",
+ "env_logger",
+ "lazy_static",
+ "log",
 ]
 
 [[package]]
-name = "solana-last-restart-slot"
+name = "solana-measure"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206b52fdd6eab6d3a190b50841288d534390b4528b1e63f984ced72b6d1c7a61"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-sdk-macro 2.1.2",
- "solana-sysvar-id 2.1.2",
-]
-
-[[package]]
-name = "solana-last-restart-slot"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-sdk-ids",
- "solana-sdk-macro 2.2.0",
- "solana-sysvar-id 2.2.0",
-]
-
-[[package]]
-name = "solana-log-collector"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "log",
-]
-
-[[package]]
-name = "solana-logger"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "env_logger",
- "lazy_static",
- "log",
-]
-
-[[package]]
-name = "solana-measure"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 
 [[package]]
 name = "solana-metrics"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "crossbeam-channel",
  "gethostname",
  "lazy_static",
  "log",
  "reqwest",
- "solana-clock 2.2.0",
- "solana-cluster-type",
- "solana-sha256-hasher 2.2.0",
- "solana-time-utils",
- "thiserror 2.0.3",
+ "solana-sdk",
+ "thiserror",
 ]
 
 [[package]]
 name = "solana-msg"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7a6f57e2e4ffe12cd4fee1e717c0f2ba6336ff2439cd5738d9843458a53da0"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
- "solana-define-syscall 2.1.2",
-]
-
-[[package]]
-name = "solana-msg"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "solana-define-syscall 2.2.0",
+ "solana-define-syscall",
 ]
 
 [[package]]
 name = "solana-native-token"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02dc51c820c41b965a94a00e0939fa2683652c3da6ab8eaaeee194c9a526fae9"
-
-[[package]]
-name = "solana-native-token"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-
-[[package]]
-name = "solana-nonce"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-fee-calculator 2.2.0",
- "solana-hash 2.2.0",
- "solana-pubkey 2.2.0",
- "solana-sha256-hasher 2.2.0",
-]
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 
 [[package]]
 name = "solana-packet"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32ed935e9f2d99d2ec0944012b2f9b8afdee5af39a7693faeda68c6a77aa64d0"
-dependencies = [
- "bincode",
- "bitflags 2.6.0",
- "cfg_eval",
- "serde",
- "serde_derive",
- "serde_with",
-]
-
-[[package]]
-name = "solana-packet"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "bincode",
  "bitflags 2.6.0",
@@ -4156,53 +3773,16 @@ dependencies = [
 [[package]]
 name = "solana-precompile-error"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b44197151afc9e96260228ec173fefea84e7b52d1e14c3b6dbbe0df739e878a9"
-dependencies = [
- "num-traits",
- "solana-decode-error 2.1.2",
-]
-
-[[package]]
-name = "solana-precompile-error"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "num-traits",
- "solana-decode-error 2.2.0",
-]
-
-[[package]]
-name = "solana-precompiles"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "lazy_static",
- "solana-ed25519-program",
- "solana-feature-set 2.2.0",
- "solana-precompile-error 2.2.0",
- "solana-program 2.2.0",
- "solana-pubkey 2.2.0",
- "solana-sdk-ids",
- "solana-secp256k1-program",
- "solana-secp256r1-program 2.2.0",
-]
-
-[[package]]
-name = "solana-presigner"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "solana-pubkey 2.2.0",
- "solana-signature 2.2.0",
- "solana-signer",
+ "solana-decode-error",
 ]
 
 [[package]]
 name = "solana-program"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eee1043f1a069817b5a96dbade9e37566ff92d6663a747550b942520b2bb289"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "base64 0.22.1",
  "bincode",
@@ -4233,226 +3813,96 @@ dependencies = [
  "serde_derive",
  "sha2 0.10.8",
  "sha3",
- "solana-account-info 2.1.2",
- "solana-atomic-u64 2.1.2",
- "solana-bincode 2.1.2",
- "solana-borsh 2.1.2",
- "solana-clock 2.1.2",
- "solana-cpi 2.1.2",
- "solana-decode-error 2.1.2",
- "solana-define-syscall 2.1.2",
- "solana-epoch-schedule 2.1.2",
- "solana-fee-calculator 2.1.2",
- "solana-hash 2.1.2",
- "solana-instruction 2.1.2",
- "solana-last-restart-slot 2.1.2",
- "solana-msg 2.1.2",
- "solana-native-token 2.1.2",
- "solana-program-entrypoint 2.1.2",
- "solana-program-error 2.1.2",
- "solana-program-memory 2.1.2",
- "solana-program-option 2.1.2",
- "solana-program-pack 2.1.2",
- "solana-pubkey 2.1.2",
- "solana-rent 2.1.2",
- "solana-sanitize 2.1.2",
- "solana-sdk-macro 2.1.2",
- "solana-secp256k1-recover 2.1.2",
- "solana-serde-varint 2.1.2",
- "solana-serialize-utils 2.1.2",
- "solana-sha256-hasher 2.1.2",
- "solana-short-vec 2.1.2",
- "solana-slot-hashes 2.1.2",
- "solana-slot-history 2.1.2",
- "solana-stable-layout 2.1.2",
- "solana-sysvar-id 2.1.2",
- "solana-transaction-error 2.1.2",
- "thiserror 1.0.69",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "solana-program"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "base64 0.22.1",
- "bincode",
- "bitflags 2.6.0",
- "blake3",
- "borsh 0.10.4",
- "borsh 1.5.3",
- "bs58",
- "bv",
- "bytemuck",
- "bytemuck_derive",
- "console_error_panic_hook",
- "console_log",
- "curve25519-dalek 4.1.3",
- "five8_const",
- "getrandom 0.2.15",
- "js-sys",
- "lazy_static",
- "log",
- "memoffset",
- "num-bigint 0.4.6",
- "num-derive",
- "num-traits",
- "parking_lot",
- "rand 0.8.5",
- "serde",
- "serde_bytes",
- "serde_derive",
- "sha2 0.10.8",
- "sha3",
- "solana-account-info 2.2.0",
- "solana-atomic-u64 2.2.0",
- "solana-bincode 2.2.0",
- "solana-borsh 2.2.0",
- "solana-clock 2.2.0",
- "solana-cpi 2.2.0",
- "solana-decode-error 2.2.0",
- "solana-define-syscall 2.2.0",
- "solana-epoch-rewards",
- "solana-epoch-schedule 2.2.0",
- "solana-fee-calculator 2.2.0",
- "solana-hash 2.2.0",
- "solana-instruction 2.2.0",
- "solana-keccak-hasher",
- "solana-last-restart-slot 2.2.0",
- "solana-msg 2.2.0",
- "solana-native-token 2.2.0",
- "solana-nonce",
- "solana-program-entrypoint 2.2.0",
- "solana-program-error 2.2.0",
- "solana-program-memory 2.2.0",
- "solana-program-option 2.2.0",
- "solana-program-pack 2.2.0",
- "solana-pubkey 2.2.0",
- "solana-rent 2.2.0",
- "solana-sanitize 2.2.0",
- "solana-sdk-ids",
- "solana-sdk-macro 2.2.0",
- "solana-secp256k1-recover 2.2.0",
- "solana-serde-varint 2.2.0",
- "solana-serialize-utils 2.2.0",
- "solana-sha256-hasher 2.2.0",
- "solana-short-vec 2.2.0",
- "solana-slot-hashes 2.2.0",
- "solana-slot-history 2.2.0",
- "solana-stable-layout 2.2.0",
- "solana-sysvar",
- "solana-sysvar-id 2.2.0",
- "solana-transaction-error 2.2.0",
- "thiserror 2.0.3",
+ "solana-account-info",
+ "solana-atomic-u64",
+ "solana-bincode",
+ "solana-borsh",
+ "solana-clock",
+ "solana-cpi",
+ "solana-decode-error",
+ "solana-define-syscall",
+ "solana-epoch-schedule",
+ "solana-fee-calculator",
+ "solana-hash",
+ "solana-instruction",
+ "solana-last-restart-slot",
+ "solana-msg",
+ "solana-native-token",
+ "solana-program-entrypoint",
+ "solana-program-error",
+ "solana-program-memory",
+ "solana-program-option",
+ "solana-program-pack",
+ "solana-pubkey",
+ "solana-rent",
+ "solana-sanitize",
+ "solana-sdk-macro",
+ "solana-secp256k1-recover",
+ "solana-serde-varint",
+ "solana-serialize-utils",
+ "solana-sha256-hasher",
+ "solana-short-vec",
+ "solana-slot-hashes",
+ "solana-slot-history",
+ "solana-stable-layout",
+ "solana-sysvar-id",
+ "solana-transaction-error",
+ "thiserror",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "solana-program-entrypoint"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d51f5d76edb8b45d3d47874367a859905c57aee5ca483460d1cd7ecb94d09bf"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
- "solana-account-info 2.1.2",
- "solana-msg 2.1.2",
- "solana-program-error 2.1.2",
- "solana-pubkey 2.1.2",
-]
-
-[[package]]
-name = "solana-program-entrypoint"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "solana-account-info 2.2.0",
- "solana-msg 2.2.0",
- "solana-program-error 2.2.0",
- "solana-pubkey 2.2.0",
+ "solana-account-info",
+ "solana-msg",
+ "solana-program-error",
+ "solana-pubkey",
 ]
 
 [[package]]
 name = "solana-program-error"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8672853ff2835c5ddf711b876711c89033f0fa72b48e427a8cff05268be790de"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "borsh 1.5.3",
  "num-traits",
  "serde",
  "serde_derive",
- "solana-decode-error 2.1.2",
- "solana-instruction 2.1.2",
- "solana-msg 2.1.2",
- "solana-pubkey 2.1.2",
-]
-
-[[package]]
-name = "solana-program-error"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "borsh 1.5.3",
- "num-traits",
- "serde",
- "serde_derive",
- "solana-decode-error 2.2.0",
- "solana-instruction 2.2.0",
- "solana-msg 2.2.0",
- "solana-pubkey 2.2.0",
+ "solana-decode-error",
+ "solana-instruction",
+ "solana-msg",
+ "solana-pubkey",
 ]
 
 [[package]]
 name = "solana-program-memory"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "203924f5631f04eb2a426bea7ceb3d10b92218735f5339af097897b6ae2d0a79"
-dependencies = [
- "num-traits",
- "solana-define-syscall 2.1.2",
-]
-
-[[package]]
-name = "solana-program-memory"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "num-traits",
- "solana-define-syscall 2.2.0",
+ "solana-define-syscall",
 ]
 
 [[package]]
 name = "solana-program-option"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef419526ea1e1d80259f04c24f2cede67db2a18a42d34ca1c6c16784b97fd21b"
-
-[[package]]
-name = "solana-program-option"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 
 [[package]]
 name = "solana-program-pack"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4af037dcb6b4c1c7a6f609868502bc198c969ffbcf628a72b0cbb6948b8c490"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
- "solana-program-error 2.1.2",
-]
-
-[[package]]
-name = "solana-program-pack"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "solana-program-error 2.2.0",
+ "solana-program-error",
 ]
 
 [[package]]
 name = "solana-program-runtime"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "base64 0.22.1",
  "bincode",
@@ -4466,48 +3916,22 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "solana-compute-budget",
- "solana-feature-set 2.2.0",
+ "solana-feature-set",
  "solana-log-collector",
  "solana-measure",
  "solana-metrics",
- "solana-sdk 2.2.0",
+ "solana-sdk",
  "solana-timings",
  "solana-type-overrides",
+ "solana-vote",
  "solana_rbpf",
- "thiserror 2.0.3",
+ "thiserror",
 ]
 
 [[package]]
 name = "solana-pubkey"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc969903363ac8bb619009815083c86da1e78e136cf4e924fee2071042fe528"
-dependencies = [
- "borsh 0.10.4",
- "borsh 1.5.3",
- "bs58",
- "bytemuck",
- "bytemuck_derive",
- "curve25519-dalek 4.1.3",
- "five8_const",
- "getrandom 0.2.15",
- "js-sys",
- "num-traits",
- "rand 0.8.5",
- "serde",
- "serde_derive",
- "solana-atomic-u64 2.1.2",
- "solana-decode-error 2.1.2",
- "solana-define-syscall 2.1.2",
- "solana-sanitize 2.1.2",
- "solana-sha256-hasher 2.1.2",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "solana-pubkey"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "borsh 0.10.4",
  "borsh 1.5.3",
@@ -4522,91 +3946,34 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_derive",
- "solana-atomic-u64 2.2.0",
- "solana-decode-error 2.2.0",
- "solana-define-syscall 2.2.0",
- "solana-sanitize 2.2.0",
- "solana-sha256-hasher 2.2.0",
+ "solana-atomic-u64",
+ "solana-decode-error",
+ "solana-define-syscall",
+ "solana-sanitize",
+ "solana-sha256-hasher",
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "solana-quic-definitions"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "solana-keypair",
-]
-
 [[package]]
 name = "solana-rent"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904df8e9692d80f8f86cbccbe11b59c7b6a3d9b945d84a8a73115e36c9e2f2cd"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-sdk-macro 2.1.2",
- "solana-sysvar-id 2.1.2",
-]
-
-[[package]]
-name = "solana-rent"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-sdk-ids",
- "solana-sdk-macro 2.2.0",
- "solana-sysvar-id 2.2.0",
-]
-
-[[package]]
-name = "solana-rent-debits"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "solana-pubkey 2.2.0",
- "solana-reward-info",
-]
-
-[[package]]
-name = "solana-reserved-account-keys"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "lazy_static",
- "solana-feature-set 2.2.0",
- "solana-pubkey 2.2.0",
- "solana-sdk-ids",
-]
-
-[[package]]
-name = "solana-reward-info"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "serde",
  "serde_derive",
+ "solana-sdk-macro",
+ "solana-sysvar-id",
 ]
 
 [[package]]
 name = "solana-sanitize"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080d4769742f6468906e59f61c3f72d30059ba027cb8028d6cfbb5e4ce02082b"
-
-[[package]]
-name = "solana-sanitize"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 
 [[package]]
 name = "solana-sdk"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c599e773875c0f78e4868a9b75027d9e9abfb1561c84ddc2db5f9dc9e06ddda"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "bincode",
  "bitflags 2.6.0",
@@ -4641,136 +4008,35 @@ dependencies = [
  "sha2 0.10.8",
  "sha3",
  "siphasher",
- "solana-account 2.1.2",
- "solana-bn254 2.1.2",
- "solana-decode-error 2.1.2",
- "solana-derivation-path 2.1.2",
- "solana-feature-set 2.1.2",
- "solana-inflation 2.1.2",
- "solana-instruction 2.1.2",
- "solana-native-token 2.1.2",
- "solana-packet 2.1.2",
- "solana-precompile-error 2.1.2",
- "solana-program 2.1.2",
- "solana-program-memory 2.1.2",
- "solana-pubkey 2.1.2",
- "solana-sanitize 2.1.2",
- "solana-sdk-macro 2.1.2",
- "solana-secp256k1-recover 2.1.2",
- "solana-secp256r1-program 2.1.2",
- "solana-serde-varint 2.1.2",
- "solana-short-vec 2.1.2",
- "solana-signature 2.1.2",
- "solana-transaction-error 2.1.2",
- "thiserror 1.0.69",
+ "solana-account",
+ "solana-bn254",
+ "solana-decode-error",
+ "solana-derivation-path",
+ "solana-feature-set",
+ "solana-inflation",
+ "solana-instruction",
+ "solana-native-token",
+ "solana-packet",
+ "solana-precompile-error",
+ "solana-program",
+ "solana-program-memory",
+ "solana-pubkey",
+ "solana-sanitize",
+ "solana-sdk-macro",
+ "solana-secp256k1-recover",
+ "solana-secp256r1-program",
+ "solana-serde-varint",
+ "solana-short-vec",
+ "solana-signature",
+ "solana-transaction-error",
+ "thiserror",
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "solana-sdk"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "bincode",
- "bitflags 2.6.0",
- "borsh 1.5.3",
- "bs58",
- "bytemuck",
- "bytemuck_derive",
- "byteorder",
- "chrono",
- "digest 0.10.7",
- "ed25519-dalek",
- "getrandom 0.1.16",
- "itertools 0.12.1",
- "js-sys",
- "lazy_static",
- "libsecp256k1",
- "log",
- "memmap2",
- "num-derive",
- "num-traits",
- "num_enum",
- "rand 0.7.3",
- "rand 0.8.5",
- "serde",
- "serde_bytes",
- "serde_derive",
- "serde_json",
- "serde_with",
- "sha2 0.10.8",
- "sha3",
- "siphasher",
- "solana-account 2.2.0",
- "solana-bn254 2.2.0",
- "solana-cluster-type",
- "solana-commitment-config",
- "solana-compute-budget-interface",
- "solana-decode-error 2.2.0",
- "solana-derivation-path 2.2.0",
- "solana-ed25519-program",
- "solana-epoch-info",
- "solana-feature-set 2.2.0",
- "solana-fee-structure",
- "solana-inflation 2.2.0",
- "solana-instruction 2.2.0",
- "solana-keypair",
- "solana-native-token 2.2.0",
- "solana-packet 2.2.0",
- "solana-precompile-error 2.2.0",
- "solana-precompiles",
- "solana-presigner",
- "solana-program 2.2.0",
- "solana-program-memory 2.2.0",
- "solana-pubkey 2.2.0",
- "solana-quic-definitions",
- "solana-rent-debits",
- "solana-reserved-account-keys",
- "solana-reward-info",
- "solana-sanitize 2.2.0",
- "solana-sdk-ids",
- "solana-sdk-macro 2.2.0",
- "solana-secp256k1-program",
- "solana-secp256k1-recover 2.2.0",
- "solana-secp256r1-program 2.2.0",
- "solana-seed-derivable",
- "solana-seed-phrase",
- "solana-serde",
- "solana-serde-varint 2.2.0",
- "solana-short-vec 2.2.0",
- "solana-signature 2.2.0",
- "solana-signer",
- "solana-time-utils",
- "solana-transaction-context",
- "solana-transaction-error 2.2.0",
- "thiserror 2.0.3",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "solana-sdk-ids"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "solana-pubkey 2.2.0",
-]
-
 [[package]]
 name = "solana-sdk-macro"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b446159601e9d157f21e50673fd5ad4d1d4ac599b3e5c715ab9dcd48e2334b2a"
-dependencies = [
- "bs58",
- "proc-macro2",
- "quote",
- "syn 2.0.89",
-]
-
-[[package]]
-name = "solana-sdk-macro"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "bs58",
  "proc-macro2",
@@ -4778,71 +4044,28 @@ dependencies = [
  "syn 2.0.89",
 ]
 
-[[package]]
-name = "solana-secp256k1-program"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "bincode",
- "digest 0.10.7",
- "libsecp256k1",
- "serde",
- "serde_derive",
- "sha3",
- "solana-feature-set 2.2.0",
- "solana-instruction 2.2.0",
- "solana-precompile-error 2.2.0",
- "solana-sdk-ids",
-]
-
 [[package]]
 name = "solana-secp256k1-recover"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f47faa50f6c257b852165da9771b89df3611620db17e9547ae6c19261ed5ac60"
-dependencies = [
- "borsh 1.5.3",
- "libsecp256k1",
- "solana-define-syscall 2.1.2",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "solana-secp256k1-recover"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "borsh 1.5.3",
  "libsecp256k1",
- "solana-define-syscall 2.2.0",
- "thiserror 2.0.3",
-]
-
-[[package]]
-name = "solana-secp256r1-program"
-version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21ecb017f075447c509907096989bacf688ed2abbd333094caeabe59db63cd2"
-dependencies = [
- "bytemuck",
- "openssl",
- "solana-feature-set 2.1.2",
- "solana-instruction 2.1.2",
- "solana-precompile-error 2.1.2",
- "solana-pubkey 2.1.2",
+ "solana-define-syscall",
+ "thiserror",
 ]
 
 [[package]]
 name = "solana-secp256r1-program"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "bytemuck",
  "openssl",
- "solana-feature-set 2.2.0",
- "solana-instruction 2.2.0",
- "solana-precompile-error 2.2.0",
- "solana-sdk-ids",
+ "solana-feature-set",
+ "solana-instruction",
+ "solana-precompile-error",
+ "solana-pubkey",
 ]
 
 [[package]]
@@ -4851,45 +4074,10 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183"
 
-[[package]]
-name = "solana-seed-derivable"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "solana-derivation-path 2.2.0",
-]
-
-[[package]]
-name = "solana-seed-phrase"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "hmac 0.12.1",
- "pbkdf2",
- "sha2 0.10.8",
-]
-
-[[package]]
-name = "solana-serde"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "solana-serde-varint"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "954f961bbea4d6c727b9d345827463b932b4b15772ca8b4e3b1ee1d1dd71c503"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "solana-serde-varint"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "serde",
 ]
@@ -4897,58 +4085,27 @@ dependencies = [
 [[package]]
 name = "solana-serialize-utils"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd562dab1702685450c786a22785141bd86b6bd26eb84594645da4802002c21"
-dependencies = [
- "solana-instruction 2.1.2",
- "solana-pubkey 2.1.2",
- "solana-sanitize 2.1.2",
-]
-
-[[package]]
-name = "solana-serialize-utils"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
- "solana-instruction 2.2.0",
- "solana-pubkey 2.2.0",
- "solana-sanitize 2.2.0",
+ "solana-instruction",
+ "solana-pubkey",
+ "solana-sanitize",
 ]
 
 [[package]]
 name = "solana-sha256-hasher"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "215d1d82b57a61b973ac693a0e0a241ab3af87a133baf38879685b29bb16438d"
-dependencies = [
- "sha2 0.10.8",
- "solana-define-syscall 2.1.2",
- "solana-hash 2.1.2",
-]
-
-[[package]]
-name = "solana-sha256-hasher"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "sha2 0.10.8",
- "solana-define-syscall 2.2.0",
- "solana-hash 2.2.0",
+ "solana-define-syscall",
+ "solana-hash",
 ]
 
 [[package]]
 name = "solana-short-vec"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac2f7bd6150c630bb13e8822e58f18dcf0a487f5225e9d6b25e2a9333e81a067"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "solana-short-vec"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "serde",
 ]
@@ -4956,8 +4113,7 @@ dependencies = [
 [[package]]
 name = "solana-signature"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90fbb85f263f88d62667abf3cfd9928c4f9b8b62b81b9b4e46987501bcf696"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "bs58",
  "ed25519-dalek",
@@ -4965,104 +4121,44 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_derive",
- "solana-sanitize 2.1.2",
-]
-
-[[package]]
-name = "solana-signature"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "bs58",
- "ed25519-dalek",
- "rand 0.8.5",
- "serde",
- "serde-big-array",
- "serde_derive",
- "solana-sanitize 2.2.0",
-]
-
-[[package]]
-name = "solana-signer"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "solana-pubkey 2.2.0",
- "solana-signature 2.2.0",
- "solana-transaction-error 2.2.0",
+ "solana-sanitize",
 ]
 
 [[package]]
 name = "solana-slot-hashes"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c2a5eea7c7d98232935c446926a1d436507e481a7fb7dff6f7c2d5dd588c569"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-hash 2.1.2",
- "solana-sysvar-id 2.1.2",
-]
-
-[[package]]
-name = "solana-slot-hashes"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "serde",
  "serde_derive",
- "solana-hash 2.2.0",
- "solana-sdk-ids",
- "solana-sysvar-id 2.2.0",
+ "solana-hash",
+ "solana-sysvar-id",
 ]
 
 [[package]]
 name = "solana-slot-history"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc4fedafbdd7587c2895dd1e6e129d9d32f4f86d41575bad8ae0f8b69afa472c"
-dependencies = [
- "bv",
- "serde",
- "serde_derive",
- "solana-sysvar-id 2.1.2",
-]
-
-[[package]]
-name = "solana-slot-history"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "bv",
  "serde",
  "serde_derive",
- "solana-sdk-ids",
- "solana-sysvar-id 2.2.0",
+ "solana-sysvar-id",
 ]
 
 [[package]]
 name = "solana-stable-layout"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e233a8a3df7a03190dc6d1612224157d016a0f1d59c690464da3efbb1cf4f394"
-dependencies = [
- "solana-instruction 2.1.2",
- "solana-pubkey 2.1.2",
-]
-
-[[package]]
-name = "solana-stable-layout"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
- "solana-instruction 2.2.0",
- "solana-pubkey 2.2.0",
+ "solana-instruction",
+ "solana-pubkey",
 ]
 
 [[package]]
 name = "solana-storage-proto"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "bincode",
  "bs58",
@@ -5070,122 +4166,44 @@ dependencies = [
  "protobuf-src",
  "serde",
  "solana-account-decoder",
- "solana-sdk 2.2.0",
+ "solana-sdk",
  "solana-transaction-status",
  "tonic-build 0.9.2",
 ]
 
-[[package]]
-name = "solana-sysvar"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "base64 0.22.1",
- "bincode",
- "bitflags 2.6.0",
- "bytemuck",
- "bytemuck_derive",
- "lazy_static",
- "serde",
- "serde_derive",
- "solana-account-info 2.2.0",
- "solana-clock 2.2.0",
- "solana-define-syscall 2.2.0",
- "solana-epoch-rewards",
- "solana-epoch-schedule 2.2.0",
- "solana-fee-calculator 2.2.0",
- "solana-hash 2.2.0",
- "solana-instruction 2.2.0",
- "solana-last-restart-slot 2.2.0",
- "solana-program-entrypoint 2.2.0",
- "solana-program-error 2.2.0",
- "solana-program-memory 2.2.0",
- "solana-pubkey 2.2.0",
- "solana-rent 2.2.0",
- "solana-sanitize 2.2.0",
- "solana-sdk-ids",
- "solana-sdk-macro 2.2.0",
- "solana-serialize-utils 2.2.0",
- "solana-slot-hashes 2.2.0",
- "solana-slot-history 2.2.0",
- "solana-sysvar-id 2.2.0",
-]
-
 [[package]]
 name = "solana-sysvar-id"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aeae93327e408717b0e7812f11324d75297d48a330e3419eebd36ad7e14efe0"
-dependencies = [
- "solana-pubkey 2.1.2",
-]
-
-[[package]]
-name = "solana-sysvar-id"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
- "solana-pubkey 2.2.0",
- "solana-sdk-ids",
+ "solana-pubkey",
 ]
 
-[[package]]
-name = "solana-time-utils"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-
 [[package]]
 name = "solana-timings"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "eager",
  "enum-iterator",
- "solana-sdk 2.2.0",
-]
-
-[[package]]
-name = "solana-transaction-context"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
-dependencies = [
- "bincode",
- "serde",
- "serde_derive",
- "solana-account 2.2.0",
- "solana-instruction 2.2.0",
- "solana-pubkey 2.2.0",
- "solana-rent 2.2.0",
- "solana-signature 2.2.0",
+ "solana-sdk",
 ]
 
 [[package]]
 name = "solana-transaction-error"
 version = "2.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe272d53725e15e66449fac0987f162d41cefc2f985d293e5ac05f98f82528da"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-instruction 2.1.2",
- "solana-sanitize 2.1.2",
-]
-
-[[package]]
-name = "solana-transaction-error"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "serde",
  "serde_derive",
- "solana-instruction 2.2.0",
- "solana-sanitize 2.2.0",
+ "solana-instruction",
+ "solana-sanitize",
 ]
 
 [[package]]
 name = "solana-transaction-status"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "Inflector",
  "base64 0.22.1",
@@ -5198,7 +4216,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "solana-account-decoder",
- "solana-sdk 2.2.0",
+ "solana-sdk",
  "solana-transaction-status-client-types",
  "spl-associated-token-account",
  "spl-memo",
@@ -5206,13 +4224,13 @@ dependencies = [
  "spl-token-2022",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
- "thiserror 2.0.3",
+ "thiserror",
 ]
 
 [[package]]
 name = "solana-transaction-status-client-types"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "base64 0.22.1",
  "bincode",
@@ -5221,34 +4239,47 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "solana-account-decoder-client-types",
- "solana-sdk 2.2.0",
- "solana-signature 2.2.0",
- "thiserror 2.0.3",
+ "solana-sdk",
+ "solana-signature",
+ "thiserror",
 ]
 
 [[package]]
 name = "solana-type-overrides"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
 dependencies = [
  "lazy_static",
  "rand 0.8.5",
 ]
 
 [[package]]
-name = "solana-zk-sdk"
+name = "solana-vote"
+version = "2.1.2"
+source = "git+https://github.com/helius-labs/agave?tag=v2.1.2#cefd3f13a2b8c1f3f8332ebeea3d7bf44d547a9a"
+dependencies = [
+ "itertools 0.12.1",
+ "log",
+ "serde",
+ "serde_derive",
+ "solana-sdk",
+ "thiserror",
+]
+
+[[package]]
+name = "solana-zk-token-sdk"
 version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3861c1921163d384415a5204c0602d4bfa740148b98bf9f71ad00f413dc2de05"
+checksum = "d209c7b3dd10e70370ddeb7356385ce774bfa21428a5030e767288e0ea4cca1c"
 dependencies = [
  "aes-gcm-siv",
  "base64 0.22.1",
  "bincode",
  "bytemuck",
  "bytemuck_derive",
+ "byteorder",
  "curve25519-dalek 4.1.3",
  "itertools 0.12.1",
- "js-sys",
  "lazy_static",
  "merlin",
  "num-derive",
@@ -5258,12 +4289,12 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "sha3",
- "solana-derivation-path 2.1.2",
- "solana-program 2.1.2",
- "solana-sdk 2.1.2",
+ "solana-curve25519",
+ "solana-derivation-path",
+ "solana-program",
+ "solana-sdk",
  "subtle",
- "thiserror 1.0.69",
- "wasm-bindgen",
+ "thiserror",
  "zeroize",
 ]
 
@@ -5281,7 +4312,7 @@ dependencies = [
  "rand 0.8.5",
  "rustc-demangle",
  "scroll",
- "thiserror 1.0.69",
+ "thiserror",
  "winapi",
 ]
 
@@ -5293,39 +4324,28 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
 name = "spl-associated-token-account"
-version = "6.0.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76fee7d65013667032d499adc3c895e286197a35a0d3a4643c80e7fd3e9969e3"
+checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e"
 dependencies = [
+ "assert_matches",
  "borsh 1.5.3",
  "num-derive",
  "num-traits",
- "solana-program 2.2.0",
- "spl-associated-token-account-client",
+ "solana-program",
  "spl-token",
  "spl-token-2022",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "spl-associated-token-account-client"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6f8349dbcbe575f354f9a533a21f272f3eb3808a49e2fdc1c34393b88ba76cb"
-dependencies = [
- "solana-instruction 2.1.2",
- "solana-pubkey 2.1.2",
+ "thiserror",
 ]
 
 [[package]]
 name = "spl-discriminator"
-version = "0.4.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a20542d4c8264856d205c0090512f374dbf7b3124479a3d93ab6184ae3631aa"
+checksum = "a38ea8b6dedb7065887f12d62ed62c1743aa70749e8558f963609793f6fb12bc"
 dependencies = [
  "bytemuck",
- "solana-program-error 2.1.2",
- "solana-sha256-hasher 2.1.2",
+ "solana-program",
  "spl-discriminator-derive",
 ]
 
@@ -5350,67 +4370,43 @@ dependencies = [
  "quote",
  "sha2 0.10.8",
  "syn 2.0.89",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "spl-elgamal-registry"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a157622a63a4d12fbd8b347fd75ee442cb913137fa98647824c992fb049a15b"
-dependencies = [
- "bytemuck",
- "solana-program 2.2.0",
- "solana-zk-sdk",
- "spl-pod",
- "spl-token-confidential-transfer-proof-extraction",
+ "thiserror",
 ]
 
 [[package]]
 name = "spl-memo"
-version = "6.0.0"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f09647c0974e33366efeb83b8e2daebb329f0420149e74d3a4bd2c08cf9f7cb"
+checksum = "a0dba2f2bb6419523405d21c301a32c9f9568354d4742552e7972af801f4bdb3"
 dependencies = [
- "solana-account-info 2.1.2",
- "solana-instruction 2.1.2",
- "solana-msg 2.1.2",
- "solana-program-entrypoint 2.1.2",
- "solana-program-error 2.1.2",
- "solana-pubkey 2.1.2",
+ "solana-program",
 ]
 
 [[package]]
 name = "spl-pod"
-version = "0.5.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41a7d5950993e1ff2680bd989df298eeb169367fb2f9deeef1f132de6e4e8016"
+checksum = "c704c88fc457fa649ba3aabe195c79d885c3f26709efaddc453c8de352c90b87"
 dependencies = [
  "borsh 1.5.3",
  "bytemuck",
  "bytemuck_derive",
- "num-derive",
- "num-traits",
- "solana-decode-error 2.1.2",
- "solana-msg 2.1.2",
- "solana-program-error 2.1.2",
- "solana-program-option 2.1.2",
- "solana-pubkey 2.1.2",
- "solana-zk-sdk",
- "thiserror 1.0.69",
+ "solana-program",
+ "solana-zk-token-sdk",
+ "spl-program-error",
 ]
 
 [[package]]
 name = "spl-program-error"
-version = "0.6.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d39b5186f42b2b50168029d81e58e800b690877ef0b30580d107659250da1d1"
+checksum = "d7b28bed65356558133751cc32b48a7a5ddfc59ac4e941314630bbed1ac10532"
 dependencies = [
  "num-derive",
  "num-traits",
- "solana-program 2.2.0",
+ "solana-program",
  "spl-program-error-derive",
- "thiserror 1.0.69",
+ "thiserror",
 ]
 
 [[package]]
@@ -5427,187 +4423,111 @@ dependencies = [
 
 [[package]]
 name = "spl-tlv-account-resolution"
-version = "0.9.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd99ff1e9ed2ab86e3fd582850d47a739fec1be9f4661cba1782d3a0f26805f3"
+checksum = "37a75a5f0fcc58126693ed78a17042e9dc53f07e357d6be91789f7d62aff61a4"
 dependencies = [
  "bytemuck",
- "num-derive",
- "num-traits",
- "solana-account-info 2.1.2",
- "solana-decode-error 2.1.2",
- "solana-instruction 2.1.2",
- "solana-msg 2.1.2",
- "solana-program-error 2.1.2",
- "solana-pubkey 2.1.2",
+ "solana-program",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error",
  "spl-type-length-value",
- "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "spl-token"
-version = "7.0.0"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed320a6c934128d4f7e54fe00e16b8aeaecf215799d060ae14f93378da6dc834"
+checksum = "70a0f06ac7f23dc0984931b1fe309468f14ea58e32660439c1cef19456f5d0e3"
 dependencies = [
  "arrayref",
  "bytemuck",
  "num-derive",
  "num-traits",
  "num_enum",
- "solana-program 2.2.0",
- "thiserror 1.0.69",
+ "solana-program",
+ "thiserror",
 ]
 
 [[package]]
 name = "spl-token-2022"
-version = "6.0.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b27f7405010ef816587c944536b0eafbcc35206ab6ba0f2ca79f1d28e488f4f"
+checksum = "d9c10f3483e48679619c76598d4e4aebb955bc49b0a5cc63323afbf44135c9bf"
 dependencies = [
  "arrayref",
  "bytemuck",
  "num-derive",
  "num-traits",
  "num_enum",
- "solana-program 2.2.0",
+ "solana-program",
  "solana-security-txt",
- "solana-zk-sdk",
- "spl-elgamal-registry",
+ "solana-zk-token-sdk",
  "spl-memo",
  "spl-pod",
  "spl-token",
- "spl-token-confidential-transfer-ciphertext-arithmetic",
- "spl-token-confidential-transfer-proof-extraction",
- "spl-token-confidential-transfer-proof-generation",
  "spl-token-group-interface",
  "spl-token-metadata-interface",
  "spl-transfer-hook-interface",
  "spl-type-length-value",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "spl-token-confidential-transfer-ciphertext-arithmetic"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1f1bf731fc65546330a7929a9735679add70f828dd076a4e69b59d3afb5423c"
-dependencies = [
- "base64 0.22.1",
- "bytemuck",
- "solana-curve25519",
- "solana-zk-sdk",
-]
-
-[[package]]
-name = "spl-token-confidential-transfer-proof-extraction"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "383937e637ccbe546f736d5115344351ebd4d2a076907582335261da58236816"
-dependencies = [
- "bytemuck",
- "solana-curve25519",
- "solana-program 2.2.0",
- "solana-zk-sdk",
- "spl-pod",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "spl-token-confidential-transfer-proof-generation"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8627184782eec1894de8ea26129c61303f1f0adeed65c20e0b10bc584f09356d"
-dependencies = [
- "curve25519-dalek 4.1.3",
- "solana-zk-sdk",
- "thiserror 1.0.69",
+ "thiserror",
 ]
 
 [[package]]
 name = "spl-token-group-interface"
-version = "0.5.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d595667ed72dbfed8c251708f406d7c2814a3fa6879893b323d56a10bedfc799"
+checksum = "df8752b85a5ecc1d9f3a43bce3dd9a6a053673aacf5deb513d1cbb88d3534ffd"
 dependencies = [
  "bytemuck",
- "num-derive",
- "num-traits",
- "solana-decode-error 2.1.2",
- "solana-instruction 2.1.2",
- "solana-msg 2.1.2",
- "solana-program-error 2.1.2",
- "solana-pubkey 2.1.2",
+ "solana-program",
  "spl-discriminator",
  "spl-pod",
- "thiserror 1.0.69",
+ "spl-program-error",
 ]
 
 [[package]]
 name = "spl-token-metadata-interface"
-version = "0.6.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb9c89dbc877abd735f05547dcf9e6e12c00c11d6d74d8817506cab4c99fdbb"
+checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc"
 dependencies = [
  "borsh 1.5.3",
- "num-derive",
- "num-traits",
- "solana-borsh 2.1.2",
- "solana-decode-error 2.1.2",
- "solana-instruction 2.1.2",
- "solana-msg 2.1.2",
- "solana-program-error 2.1.2",
- "solana-pubkey 2.1.2",
+ "solana-program",
  "spl-discriminator",
  "spl-pod",
+ "spl-program-error",
  "spl-type-length-value",
- "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "spl-transfer-hook-interface"
-version = "0.9.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4aa7503d52107c33c88e845e1351565050362c2314036ddf19a36cd25137c043"
+checksum = "a110f33d941275d9f868b96daaa993f1e73b6806cc8836e43075b4d3ad8338a7"
 dependencies = [
  "arrayref",
  "bytemuck",
- "num-derive",
- "num-traits",
- "solana-account-info 2.1.2",
- "solana-cpi 2.1.2",
- "solana-decode-error 2.1.2",
- "solana-instruction 2.1.2",
- "solana-msg 2.1.2",
- "solana-program-error 2.1.2",
- "solana-pubkey 2.1.2",
+ "solana-program",
  "spl-discriminator",
  "spl-pod",
  "spl-program-error",
  "spl-tlv-account-resolution",
  "spl-type-length-value",
- "thiserror 1.0.69",
 ]
 
 [[package]]
 name = "spl-type-length-value"
-version = "0.7.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba70ef09b13af616a4c987797870122863cba03acc4284f226a4473b043923f9"
+checksum = "bdcd73ec187bc409464c60759232e309f83b52a18a9c5610bf281c9c6432918c"
 dependencies = [
  "bytemuck",
- "num-derive",
- "num-traits",
- "solana-account-info 2.1.2",
- "solana-decode-error 2.1.2",
- "solana-msg 2.1.2",
- "solana-program-error 2.1.2",
+ "solana-program",
  "spl-discriminator",
  "spl-pod",
- "thiserror 1.0.69",
+ "spl-program-error",
 ]
 
 [[package]]
@@ -5722,16 +4642,7 @@ version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl 1.0.69",
-]
-
-[[package]]
-name = "thiserror"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
-dependencies = [
- "thiserror-impl 2.0.3",
+ "thiserror-impl",
 ]
 
 [[package]]
@@ -5745,17 +4656,6 @@ dependencies = [
  "syn 2.0.89",
 ]
 
-[[package]]
-name = "thiserror-impl"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.89",
-]
-
 [[package]]
 name = "time"
 version = "0.3.36"
@@ -6084,9 +4984,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
 ]
@@ -6577,7 +5477,7 @@ version = "4.0.0"
 dependencies = [
  "bytes",
  "futures",
- "thiserror 1.0.69",
+ "thiserror",
  "tokio",
  "tonic",
  "tonic-health",
@@ -6610,10 +5510,10 @@ dependencies = [
  "serde",
  "serde_json",
  "solana-logger",
- "solana-sdk 2.2.0",
+ "solana-sdk",
  "solana-transaction-status",
  "spl-token-2022",
- "thiserror 1.0.69",
+ "thiserror",
  "tokio",
  "tokio-stream",
  "tonic",
@@ -6639,11 +5539,11 @@ dependencies = [
  "serde",
  "smallvec",
  "solana-account-decoder",
- "solana-sdk 2.2.0",
+ "solana-sdk",
  "solana-storage-proto",
  "solana-transaction-status",
  "spl-token-2022",
- "thiserror 1.0.69",
+ "thiserror",
  "tonic",
  "tonic-build 0.12.3",
 ]
@@ -6783,8 +5683,3 @@ dependencies = [
  "cc",
  "pkg-config",
 ]
-
-[[patch.unused]]
-name = "solana-zk-token-sdk"
-version = "2.2.0"
-source = "git+https://github.com/helius-labs/agave?branch=master#7a2dcc2c014760fee09e71a0108928b0de5e928a"
diff --git a/Cargo.toml b/Cargo.toml
index e20c0c9b..86c9a83e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ keywords = ["solana"]
 publish = false
 
 [workspace.dependencies]
-agave-geyser-plugin-interface = { git = "https://github.com/helius-labs/agave", branch = "master" }
+agave-geyser-plugin-interface = { git = "https://github.com/helius-labs/agave", tag = "v2.1.2" }
 anyhow = "1.0.62"
 backoff = "0.4.0"
 base64 = "0.22.1"
@@ -50,13 +50,13 @@ prost_011 = { package = "prost", version = "0.11.9" }
 protobuf-src = "1.1.0"
 serde = "1.0.145"
 serde_json = "1.0.86"
-solana-account-decoder = { git = "https://github.com/helius-labs/agave", branch = "master" }
-solana-logger = { git = "https://github.com/helius-labs/agave", branch = "master" }
-solana-sdk = { git = "https://github.com/helius-labs/agave", branch = "master" }
-solana-storage-proto = { git = "https://github.com/helius-labs/agave", branch = "master" }
-solana-transaction-status = { git = "https://github.com/helius-labs/agave", branch = "master" }
+solana-account-decoder = { git = "https://github.com/helius-labs/agave", tag = "v2.1.2" }
+solana-logger = { git = "https://github.com/helius-labs/agave", tag = "v2.1.2" }
+solana-sdk = { git = "https://github.com/helius-labs/agave", tag = "v2.1.2" }
+solana-storage-proto = { git = "https://github.com/helius-labs/agave", tag = "v2.1.2" }
+solana-transaction-status = { git = "https://github.com/helius-labs/agave", tag = "v2.1.2" }
 smallvec = "1.13.2"
-spl-token-2022 = "6.0.0"
+spl-token-2022 = "4.0.0"
 thiserror = "1.0.69"
 tokio = "1.21.2"
 tokio-stream = "0.1.11"
@@ -77,5 +77,9 @@ lto = true
 codegen-units = 1
 
 [patch.crates-io]
-solana-program = { git = "https://github.com/helius-labs/agave", branch = "master" }
-solana-zk-token-sdk = { git = "https://github.com/helius-labs/agave", branch = "master" }
+solana-derivation-path = { git = "https://github.com/helius-labs/agave", tag = "v2.1.2" }
+solana-instruction = { git = "https://github.com/helius-labs/agave", tag = "v2.1.2" }
+solana-program = { git = "https://github.com/helius-labs/agave", tag = "v2.1.2" }
+solana-program-error = { git = "https://github.com/helius-labs/agave", tag = "v2.1.2" }
+solana-pubkey = { git = "https://github.com/helius-labs/agave", tag = "v2.1.2" }
+solana-sdk = { git = "https://github.com/helius-labs/agave", tag = "v2.1.2" }
diff --git a/yellowstone-grpc-geyser/src/plugin.rs b/yellowstone-grpc-geyser/src/plugin.rs
index 2dd73a4e..b32f7bb6 100644
--- a/yellowstone-grpc-geyser/src/plugin.rs
+++ b/yellowstone-grpc-geyser/src/plugin.rs
@@ -178,10 +178,8 @@ impl GeyserPlugin for Plugin {
         status: &SlotStatus,
     ) -> PluginResult<()> {
         self.with_inner(|inner| {
-            let message = Message::Slot(MessageSlot::maybe_from_geyser(slot, parent, status));
-            if let Some(message) = message {
-                inner.send_message(Message::Slot(message));
-            }
+            let message = Message::Slot(MessageSlot::from_geyser(slot, parent, status));
+            inner.send_message(message);
             metrics::update_slot_status(status, slot);
             Ok(())
         })