From 38fe2a73232277322c7f46efbdb0ebd40c89bb51 Mon Sep 17 00:00:00 2001
From: OliverNChalk <11343499+OliverNChalk@users.noreply.github.com>
Date: Thu, 17 Oct 2024 20:04:38 -0500
Subject: [PATCH] build: remove the need for patching

---
 .../actions/rust-toolchain/action.yml         |    3 +
 Cargo.lock                                    | 1520 ++++++++---------
 Cargo.toml                                    |   27 +-
 crates/svm-test/Cargo.toml                    |    2 +-
 crates/svm-test/src/svm.rs                    |    9 +-
 .../tests/program_integration_test.rs         |    9 +-
 crates/svm-test/tests/program_unit_test.rs    |    9 +-
 solana-toolchain                              |    2 +-
 8 files changed, 734 insertions(+), 847 deletions(-)

diff --git a/.github/workflows/actions/rust-toolchain/action.yml b/.github/workflows/actions/rust-toolchain/action.yml
index cff4c09..4d62f5e 100644
--- a/.github/workflows/actions/rust-toolchain/action.yml
+++ b/.github/workflows/actions/rust-toolchain/action.yml
@@ -7,6 +7,9 @@ inputs:
 runs:
   using: "composite"
   steps:
+    # Remove once we get to solana 2.1
+    - run: sudo apt-get install protobuf-compiler
+      shell: bash
     - id: get-toolchain
       shell: bash
       run: |
diff --git a/Cargo.lock b/Cargo.lock
index 4033815..f11428f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -63,15 +63,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "agave-transaction-view"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "solana-sdk",
- "solana-svm-transaction",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.11"
@@ -124,6 +115,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "anyhow"
 version = "1.0.89"
@@ -304,6 +304,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "assert_matches"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
+
 [[package]]
 name = "async-channel"
 version = "1.9.0"
@@ -311,15 +317,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
- "event-listener 2.5.3",
+ "event-listener",
  "futures-core",
 ]
 
 [[package]]
 name = "async-compression"
-version = "0.4.13"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429"
+checksum = "103db485efc3e41214fe4fda9f3dbeae2eb9082f48fd236e6095627a9422066e"
 dependencies = [
  "brotli",
  "flate2",
@@ -330,14 +336,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "async-lock"
-version = "3.4.0"
+name = "async-mutex"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
+checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e"
 dependencies = [
- "event-listener 5.3.1",
- "event-listener-strategy",
- "pin-project-lite",
+ "event-listener",
 ]
 
 [[package]]
@@ -444,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.4"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
+checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -498,7 +502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed"
 dependencies = [
  "borsh-derive 1.5.1",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
 ]
 
 [[package]]
@@ -598,18 +602,18 @@ dependencies = [
 
 [[package]]
 name = "bytemuck"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d"
 dependencies = [
  "bytemuck_derive",
 ]
 
 [[package]]
 name = "bytemuck_derive"
-version = "1.7.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26"
+checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -640,27 +644,27 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.25"
+version = "1.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8d9e0b4957f635b8d3da819d0db5603620467ecf1f692d22a8c2717ce27e6d8"
+checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
 dependencies = [
  "jobserver",
  "libc",
  "shlex",
 ]
 
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
 [[package]]
 name = "cfg_aliases"
 version = "0.2.1"
@@ -692,6 +696,46 @@ dependencies = [
  "inout",
 ]
 
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags 1.3.2",
+ "strsim 0.8.0",
+ "textwrap 0.11.0",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "clap"
+version = "3.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+dependencies = [
+ "atty",
+ "bitflags 1.3.2",
+ "clap_lex",
+ "indexmap 1.9.3",
+ "once_cell",
+ "strsim 0.10.0",
+ "termcolor",
+ "textwrap 0.16.1",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
+]
+
 [[package]]
 name = "combine"
 version = "3.8.1"
@@ -705,16 +749,6 @@ dependencies = [
  "unreachable",
 ]
 
-[[package]]
-name = "combine"
-version = "4.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
-dependencies = [
- "bytes",
- "memchr",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -870,7 +904,8 @@ dependencies = [
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.1"
-source = "git+https://github.com/OliverNChalk/curve25519-dalek?rev=af1ed144753dfac0ae1e58005688e581a5f2c6b4#af1ed144753dfac0ae1e58005688e581a5f2c6b4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0"
 dependencies = [
  "byteorder",
  "digest 0.9.0",
@@ -880,35 +915,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "curve25519-dalek"
-version = "4.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "curve25519-dalek-derive",
- "digest 0.10.7",
- "fiat-crypto",
- "rand_core 0.6.4",
- "rustc_version",
- "serde",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "curve25519-dalek-derive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.79",
-]
-
 [[package]]
 name = "darling"
 version = "0.20.10"
@@ -929,7 +935,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim",
+ "strsim 0.11.1",
  "syn 2.0.79",
 ]
 
@@ -1018,6 +1024,18 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "dialoguer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87"
+dependencies = [
+ "console",
+ "shell-words",
+ "tempfile",
+ "zeroize",
+]
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -1099,7 +1117,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
 dependencies = [
- "curve25519-dalek 3.2.1",
+ "curve25519-dalek",
  "ed25519",
  "rand 0.7.3",
  "serde",
@@ -1180,31 +1198,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
-name = "event-listener"
-version = "2.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-
-[[package]]
-name = "event-listener"
-version = "5.3.1"
+name = "errno"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite",
+ "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "event-listener-strategy"
-version = "0.5.2"
+name = "event-listener"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
-dependencies = [
- "event-listener 5.3.1",
- "pin-project-lite",
-]
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "expect-test"
@@ -1216,6 +1223,12 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+
 [[package]]
 name = "faucet"
 version = "0.1.0"
@@ -1231,10 +1244,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da"
 
 [[package]]
-name = "fiat-crypto"
-version = "0.2.9"
+name = "fixedbitset"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
@@ -1332,12 +1345,6 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
-[[package]]
-name = "futures-timer"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
-
 [[package]]
 name = "futures-util"
 version = "0.3.31"
@@ -1410,23 +1417,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
-name = "governor"
-version = "0.6.3"
+name = "goblin"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b"
+checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143"
 dependencies = [
- "cfg-if",
- "dashmap 5.5.3",
- "futures",
- "futures-timer",
- "no-std-compat",
- "nonzero_ext",
- "parking_lot",
- "portable-atomic",
- "quanta",
- "rand 0.8.5",
- "smallvec",
- "spinning_top",
+ "log",
+ "plain",
+ "scroll",
 ]
 
 [[package]]
@@ -1484,6 +1482,12 @@ version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
 
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -1541,6 +1545,15 @@ dependencies = [
  "hmac 0.8.1",
 ]
 
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "http"
 version = "0.2.12"
@@ -1583,9 +1596,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.30"
+version = "0.14.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
+checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1614,7 +1627,7 @@ dependencies = [
  "futures-util",
  "http",
  "hyper",
- "rustls 0.21.12",
+ "rustls",
  "tokio",
  "tokio-rustls",
 ]
@@ -1750,26 +1763,6 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
-[[package]]
-name = "jni"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
-dependencies = [
- "cesu8",
- "combine 4.6.7",
- "jni-sys",
- "log",
- "thiserror",
- "walkdir",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
 [[package]]
 name = "jobserver"
 version = "0.1.32"
@@ -1781,9 +1774,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1820,9 +1813,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
 
 [[package]]
 name = "libsecp256k1"
@@ -1884,10 +1877,16 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
 [[package]]
 name = "litesvm"
-version = "0.1.0"
-source = "git+https://github.com/OliverNChalk/litesvm?branch=solana-2#41006d527717f03552ee551f0d2aa1f5b3e3deb0"
+version = "0.3.0"
+source = "git+https://github.com/OliverNChalk/litesvm#0e840791846332b6b8feed109a34094e8be9e639"
 dependencies = [
  "bincode",
  "indexmap 2.6.0",
@@ -1898,18 +1897,14 @@ dependencies = [
  "solana-compute-budget",
  "solana-compute-budget-program",
  "solana-config-program",
- "solana-fee",
  "solana-loader-v4-program",
- "solana-log-collector",
  "solana-program",
  "solana-program-runtime",
  "solana-runtime-transaction",
  "solana-sdk",
  "solana-stake-program",
  "solana-svm",
- "solana-svm-transaction",
  "solana-system-program",
- "solana-timings",
  "solana-vote-program",
  "thiserror",
 ]
@@ -2016,25 +2011,25 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "multimap"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
+
 [[package]]
 name = "nix"
-version = "0.29.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 dependencies = [
  "bitflags 2.6.0",
  "cfg-if",
- "cfg_aliases",
+ "cfg_aliases 0.1.1",
  "libc",
  "memoffset",
 ]
 
-[[package]]
-name = "no-std-compat"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2045,12 +2040,6 @@ dependencies = [
  "minimal-lexical",
 ]
 
-[[package]]
-name = "nonzero_ext"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
-
 [[package]]
 name = "num"
 version = "0.2.1"
@@ -2228,10 +2217,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
-name = "parking"
-version = "2.2.1"
+name = "os_str_bytes"
+version = "6.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
 
 [[package]]
 name = "parking_lot"
@@ -2262,6 +2251,15 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "pbkdf2"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd"
+dependencies = [
+ "crypto-mac",
+]
+
 [[package]]
 name = "pbkdf2"
 version = "0.11.0"
@@ -2295,6 +2293,16 @@ dependencies = [
  "num",
 ]
 
+[[package]]
+name = "petgraph"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.6.0",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.14"
@@ -2313,6 +2321,12 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
+[[package]]
+name = "plain"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
+
 [[package]]
 name = "polyval"
 version = "0.6.2"
@@ -2346,6 +2360,16 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "prettyplease"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
+dependencies = [
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "0.1.5"
@@ -2389,13 +2413,67 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "prost"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
+dependencies = [
+ "bytes",
+ "heck",
+ "itertools 0.10.5",
+ "lazy_static",
+ "log",
+ "multimap",
+ "petgraph",
+ "prettyplease",
+ "prost",
+ "prost-types",
+ "regex",
+ "syn 1.0.109",
+ "tempfile",
+ "which",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+dependencies = [
+ "anyhow",
+ "itertools 0.10.5",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
+dependencies = [
+ "prost",
+]
+
 [[package]]
 name = "qstring"
 version = "0.7.2"
@@ -2406,33 +2484,28 @@ dependencies = [
 ]
 
 [[package]]
-name = "quanta"
-version = "0.12.3"
+name = "qualifier_attr"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
+checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2"
 dependencies = [
- "crossbeam-utils",
- "libc",
- "once_cell",
- "raw-cpuid",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "web-sys",
- "winapi",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "quinn"
-version = "0.11.5"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
+checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75"
 dependencies = [
  "bytes",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.23.14",
- "socket2",
+ "rustls",
  "thiserror",
  "tokio",
  "tracing",
@@ -2440,16 +2513,16 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.8"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
+checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a"
 dependencies = [
  "bytes",
  "rand 0.8.5",
- "ring",
+ "ring 0.16.20",
  "rustc-hash",
- "rustls 0.23.14",
- "rustls-platform-verifier",
+ "rustls",
+ "rustls-native-certs",
  "slab",
  "thiserror",
  "tinyvec",
@@ -2458,15 +2531,15 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
+checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7"
 dependencies = [
+ "bytes",
  "libc",
- "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2549,15 +2622,6 @@ dependencies = [
  "rand_core 0.5.1",
 ]
 
-[[package]]
-name = "raw-cpuid"
-version = "11.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
-dependencies = [
- "bitflags 2.6.0",
-]
-
 [[package]]
 name = "rayon"
 version = "1.10.0"
@@ -2641,8 +2705,8 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.21.12",
- "rustls-pemfile 1.0.4",
+ "rustls",
+ "rustls-pemfile",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -2677,18 +2741,54 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.16.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
 dependencies = [
  "cc",
- "cfg-if",
- "getrandom 0.2.15",
  "libc",
- "spin",
- "untrusted",
- "windows-sys 0.52.0",
-]
+ "once_cell",
+ "spin 0.5.2",
+ "untrusted 0.7.1",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.15",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rpassword"
+version = "7.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f"
+dependencies = [
+ "libc",
+ "rtoolbox",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rtoolbox"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e"
+dependencies = [
+ "libc",
+ "windows-sys 0.48.0",
+]
 
 [[package]]
 name = "rustc-demangle"
@@ -2698,9 +2798,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc_version"
@@ -2721,40 +2821,38 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustls"
-version = "0.21.12"
+name = "rustix"
+version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
- "log",
- "ring",
- "rustls-webpki 0.101.7",
- "sct",
+ "bitflags 2.6.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.14"
+version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
- "once_cell",
- "ring",
- "rustls-pki-types",
- "rustls-webpki 0.102.8",
- "subtle",
- "zeroize",
+ "log",
+ "ring 0.17.8",
+ "rustls-webpki",
+ "sct",
 ]
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.3"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 2.2.0",
- "rustls-pki-types",
+ "rustls-pemfile",
  "schannel",
  "security-framework",
 ]
@@ -2768,68 +2866,21 @@ dependencies = [
  "base64 0.21.7",
 ]
 
-[[package]]
-name = "rustls-pemfile"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55"
-
-[[package]]
-name = "rustls-platform-verifier"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490"
-dependencies = [
- "core-foundation",
- "core-foundation-sys",
- "jni",
- "log",
- "once_cell",
- "rustls 0.23.14",
- "rustls-native-certs",
- "rustls-platform-verifier-android",
- "rustls-webpki 0.102.8",
- "security-framework",
- "security-framework-sys",
- "webpki-roots 0.26.6",
- "winapi",
-]
-
-[[package]]
-name = "rustls-platform-verifier-android"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
-
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.8",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
-name = "rustls-webpki"
-version = "0.102.8"
+name = "rustversion"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
 
 [[package]]
 name = "ryu"
@@ -2837,20 +2888,11 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
  "windows-sys 0.59.0",
 ]
@@ -2866,6 +2908,20 @@ name = "scroll"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
+dependencies = [
+ "scroll_derive",
+]
+
+[[package]]
+name = "scroll_derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+]
 
 [[package]]
 name = "sct"
@@ -2873,8 +2929,8 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.8",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -2887,7 +2943,6 @@ dependencies = [
  "core-foundation",
  "core-foundation-sys",
  "libc",
- "num-bigint 0.4.6",
  "security-framework-sys",
 ]
 
@@ -2938,9 +2993,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.129"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "6dbcf9b78a125ee667ae19388837dd12294b858d101fdd393cb9d5501ef09eb2"
 dependencies = [
  "itoa",
  "memchr",
@@ -2960,6 +3015,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_with"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
+dependencies = [
+ "serde",
+ "serde_with_macros 2.3.3",
+]
+
 [[package]]
 name = "serde_with"
 version = "3.11.0"
@@ -2974,10 +3039,22 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "serde_with_macros",
+ "serde_with_macros 3.11.0",
  "time",
 ]
 
+[[package]]
+name = "serde_with_macros"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+]
+
 [[package]]
 name = "serde_with_macros"
 version = "3.11.0"
@@ -3047,6 +3124,12 @@ dependencies = [
  "keccak",
 ]
 
+[[package]]
+name = "shell-words"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
+
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -3102,7 +3185,8 @@ dependencies = [
 [[package]]
 name = "solana-account-decoder"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d87c6ef8c13eb759fa8d887e12c67afd851799050b6afd501a27726551f52e"
 dependencies = [
  "Inflector",
  "base64 0.22.1",
@@ -3123,107 +3207,68 @@ dependencies = [
  "zstd",
 ]
 
-[[package]]
-name = "solana-account-info"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "bincode",
- "serde",
- "solana-program-error",
- "solana-program-memory",
- "solana-pubkey",
-]
-
 [[package]]
 name = "solana-address-lookup-table-program"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cfb847bf375f662ecad6082eaad747980416de6d74c4137f434a830f935ce7b"
 dependencies = [
  "bincode",
  "bytemuck",
  "log",
  "num-derive",
  "num-traits",
- "solana-feature-set",
- "solana-log-collector",
+ "rustc_version",
  "solana-program",
  "solana-program-runtime",
  "solana-sdk",
  "thiserror",
 ]
 
-[[package]]
-name = "solana-atomic-u64"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "parking_lot",
-]
-
-[[package]]
-name = "solana-bn254"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "ark-bn254",
- "ark-ec",
- "ark-ff",
- "ark-serialize",
- "bytemuck",
- "solana-program",
- "thiserror",
-]
-
 [[package]]
 name = "solana-bpf-loader-program"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d08fcde4e079069484b54aa7f1d2ec10763b1b271a7166f1ce363db318ff8ed2"
 dependencies = [
  "bincode",
  "byteorder",
  "libsecp256k1",
  "log",
  "scopeguard",
- "solana-bn254",
  "solana-compute-budget",
- "solana-curve25519 2.0.13 (git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183)",
- "solana-feature-set",
- "solana-log-collector",
+ "solana-curve25519",
  "solana-measure",
  "solana-poseidon",
- "solana-program-memory",
  "solana-program-runtime",
  "solana-sdk",
- "solana-timings",
  "solana-type-overrides",
  "solana_rbpf",
  "thiserror",
 ]
 
 [[package]]
-name = "solana-builtins-default-costs"
+name = "solana-clap-utils"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f9709683a4d480a0185827292405cad0b6f414abaa479c7d1dfe5e2194aeec8"
 dependencies = [
- "ahash",
- "lazy_static",
- "log",
- "solana-address-lookup-table-program",
- "solana-bpf-loader-program",
- "solana-compute-budget-program",
- "solana-config-program",
- "solana-loader-v4-program",
+ "chrono",
+ "clap 2.34.0",
+ "rpassword",
+ "solana-remote-wallet",
  "solana-sdk",
- "solana-stake-program",
- "solana-system-program",
- "solana-vote-program",
+ "thiserror",
+ "tiny-bip39",
+ "uriparse",
+ "url",
 ]
 
 [[package]]
 name = "solana-client"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67169e4f1faabb717ce81b5ca93960da21e3ac5c9b75cb6792f9b3ce38db459f"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3237,6 +3282,7 @@ dependencies = [
  "rayon",
  "solana-connection-cache",
  "solana-measure",
+ "solana-metrics",
  "solana-pubsub-client",
  "solana-quic-client",
  "solana-rpc-client",
@@ -3251,28 +3297,21 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "solana-clock"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "serde",
- "serde_derive",
- "solana-sdk-macro",
-]
-
 [[package]]
 name = "solana-compute-budget"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5acde49a883ca3e099a8050ad8321ea56b02041995dadcf84b0dab14561cc34a"
 dependencies = [
+ "rustc_version",
  "solana-sdk",
 ]
 
 [[package]]
 name = "solana-compute-budget-program"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d9a4850f254e23a6306a8eafa7bf8ecaf05d907d18b31ff096ea63f4c5ab32"
 dependencies = [
  "solana-program-runtime",
  "solana-sdk",
@@ -3281,22 +3320,22 @@ dependencies = [
 [[package]]
 name = "solana-config-program"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f638e44fb308bdc1ce99eb0fee194b2cb212917b258999cdb4a8b056d48973d4"
 dependencies = [
  "bincode",
  "chrono",
  "serde",
  "serde_derive",
- "solana-log-collector",
  "solana-program-runtime",
  "solana-sdk",
- "solana-short-vec",
 ]
 
 [[package]]
 name = "solana-connection-cache"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fd01a4d43b780996970cb3669946b002f71d34e6a26a19bd6d2a74513ecc0aa"
 dependencies = [
  "async-trait",
  "bincode",
@@ -3321,117 +3360,30 @@ checksum = "44b61d8eda3319deca3627e3eb3970ce2ad179ad39c106d6c003d06c90e3031d"
 dependencies = [
  "bytemuck",
  "bytemuck_derive",
- "curve25519-dalek 3.2.1",
- "solana-program",
- "thiserror",
-]
-
-[[package]]
-name = "solana-curve25519"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "bytemuck",
- "bytemuck_derive",
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "solana-program",
  "thiserror",
 ]
 
-[[package]]
-name = "solana-decode-error"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "solana-define-syscall"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-
-[[package]]
-name = "solana-derivation-path"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "derivation-path",
- "qstring",
- "thiserror",
- "uriparse",
-]
-
-[[package]]
-name = "solana-feature-set"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "lazy_static",
- "solana-program",
-]
-
-[[package]]
-name = "solana-fee"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "solana-sdk",
- "solana-svm-transaction",
-]
-
-[[package]]
-name = "solana-hash"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "borsh 1.5.1",
- "bs58",
- "bytemuck",
- "bytemuck_derive",
- "js-sys",
- "serde",
- "serde_derive",
- "solana-atomic-u64",
- "solana-sanitize",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "solana-inline-spl"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6614014b976112fb6c9bf259f87c6659b8fdea628c656639e02211324d2b34"
 dependencies = [
  "bytemuck",
- "solana-program",
-]
-
-[[package]]
-name = "solana-instruction"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "bincode",
- "borsh 1.5.1",
- "getrandom 0.2.15",
- "js-sys",
- "num-traits",
- "serde",
- "serde_derive",
- "solana-define-syscall",
- "solana-pubkey",
- "wasm-bindgen",
+ "rustc_version",
+ "solana-sdk",
 ]
 
 [[package]]
 name = "solana-loader-v4-program"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7866a1140ceb81de5b82bd779b0c63f888904574da128dd40bc17795be6f084"
 dependencies = [
  "log",
- "solana-bpf-loader-program",
  "solana-compute-budget",
- "solana-log-collector",
  "solana-measure",
  "solana-program-runtime",
  "solana-sdk",
@@ -3439,14 +3391,6 @@ dependencies = [
  "solana_rbpf",
 ]
 
-[[package]]
-name = "solana-log-collector"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "solana-logger"
 version = "2.0.13"
@@ -3461,12 +3405,18 @@ dependencies = [
 [[package]]
 name = "solana-measure"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79d44cdbcf9e1489564cdae1cd92b8806b0ee89d05d36a58fef8c0d293ea7c2a"
+dependencies = [
+ "log",
+ "solana-sdk",
+]
 
 [[package]]
 name = "solana-metrics"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68979964a3a004f1af4f1571814817e7e050ef4c1b2a1bdaa3ff35e980072d69"
 dependencies = [
  "crossbeam-channel",
  "gethostname",
@@ -3477,20 +3427,14 @@ dependencies = [
  "thiserror",
 ]
 
-[[package]]
-name = "solana-msg"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "solana-define-syscall",
-]
-
 [[package]]
 name = "solana-net-utils"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44bb419eb9293a277982cf14a58772e9b9ab30ff6f9421bc4ac0826d40122760"
 dependencies = [
  "bincode",
+ "clap 3.2.25",
  "crossbeam-channel",
  "log",
  "nix",
@@ -3498,7 +3442,10 @@ dependencies = [
  "serde",
  "serde_derive",
  "socket2",
+ "solana-logger",
  "solana-sdk",
+ "solana-version",
+ "static_assertions",
  "tokio",
  "url",
 ]
@@ -3506,13 +3453,14 @@ dependencies = [
 [[package]]
 name = "solana-perf"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00c4128122787a61d8f94fdaa04cb71b3dbb017d9939ac4d632264c55ec345de"
 dependencies = [
  "ahash",
  "bincode",
  "bv",
  "caps",
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "dlopen2",
  "fnv",
  "lazy_static",
@@ -3521,30 +3469,35 @@ dependencies = [
  "nix",
  "rand 0.8.5",
  "rayon",
+ "rustc_version",
  "serde",
  "solana-metrics",
  "solana-rayon-threadlimit",
  "solana-sdk",
- "solana-short-vec",
  "solana-vote-program",
 ]
 
 [[package]]
 name = "solana-poseidon"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16cd1ecbbefa2e160f4c82734c2f38315005e1d8c3ddbdb20bfa50ea92264fdc"
 dependencies = [
  "ark-bn254",
  "light-poseidon",
- "solana-define-syscall",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-program"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29249ce5b5c7bd018013adbb97439b0b1b986f16bb07c54db28f82e97baaa2f1"
 dependencies = [
+ "ark-bn254",
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
  "base64 0.22.1",
  "bincode",
  "bitflags 2.6.0",
@@ -3557,90 +3510,39 @@ dependencies = [
  "bytemuck_derive",
  "console_error_panic_hook",
  "console_log",
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "getrandom 0.2.15",
  "js-sys",
  "lazy_static",
+ "libsecp256k1",
  "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 0.10.8",
- "solana-account-info",
- "solana-atomic-u64",
- "solana-clock",
- "solana-decode-error",
- "solana-define-syscall",
- "solana-hash",
- "solana-instruction",
- "solana-msg",
- "solana-program-error",
- "solana-program-memory",
- "solana-program-option",
- "solana-program-pack",
- "solana-pubkey",
- "solana-sanitize",
- "solana-sdk-macro",
- "solana-secp256k1-recover",
- "solana-serde-varint",
- "solana-serialize-utils",
- "solana-sha256-hasher",
- "solana-short-vec",
- "thiserror",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "solana-program-error"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "borsh 1.5.1",
- "num-traits",
- "serde",
- "serde_derive",
- "solana-decode-error",
- "solana-instruction",
- "solana-msg",
- "solana-pubkey",
-]
-
-[[package]]
-name = "solana-program-memory"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "num-traits",
- "solana-define-syscall",
-]
-
-[[package]]
-name = "solana-program-option"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-
-[[package]]
-name = "solana-program-pack"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "solana-program-error",
+ "parking_lot",
+ "rand 0.8.5",
+ "rustc_version",
+ "rustversion",
+ "serde",
+ "serde_bytes",
+ "serde_derive",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
+ "solana-sdk-macro",
+ "thiserror",
+ "wasm-bindgen",
 ]
 
 [[package]]
 name = "solana-program-runtime"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "948bfeb10ba38b55a8b2db2de8ccfa8f57b44b6d73c98e8e0de8b10f10ce043b"
 dependencies = [
  "base64 0.22.1",
  "bincode",
+ "eager",
  "enum-iterator",
  "itertools 0.12.1",
  "libc",
@@ -3649,48 +3551,23 @@ dependencies = [
  "num-traits",
  "percentage",
  "rand 0.8.5",
+ "rustc_version",
  "serde",
  "solana-compute-budget",
- "solana-feature-set",
- "solana-log-collector",
  "solana-measure",
  "solana-metrics",
  "solana-sdk",
- "solana-timings",
  "solana-type-overrides",
  "solana-vote",
  "solana_rbpf",
  "thiserror",
 ]
 
-[[package]]
-name = "solana-pubkey"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "borsh 0.10.4",
- "borsh 1.5.1",
- "bs58",
- "bytemuck",
- "bytemuck_derive",
- "curve25519-dalek 4.1.3",
- "getrandom 0.2.15",
- "js-sys",
- "num-traits",
- "serde",
- "serde_derive",
- "solana-atomic-u64",
- "solana-decode-error",
- "solana-define-syscall",
- "solana-sanitize",
- "solana-sha256-hasher",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "solana-pubsub-client"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3ce9fa94ef00f7dfec749fc6835a4c36e8cfa2166c4a80736af1b49ef5bcd8e"
 dependencies = [
  "crossbeam-channel",
  "futures-util",
@@ -3714,9 +3591,10 @@ dependencies = [
 [[package]]
 name = "solana-quic-client"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00764a5e5e36a94515d05f771e869c920671f5753cfc71ebf366546c891450b4"
 dependencies = [
- "async-lock",
+ "async-mutex",
  "async-trait",
  "futures",
  "itertools 0.12.1",
@@ -3724,7 +3602,7 @@ dependencies = [
  "log",
  "quinn",
  "quinn-proto",
- "rustls 0.23.14",
+ "rustls",
  "solana-connection-cache",
  "solana-measure",
  "solana-metrics",
@@ -3739,16 +3617,37 @@ dependencies = [
 [[package]]
 name = "solana-rayon-threadlimit"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33119350281687a17a8321f897dfd27009fc862711ee6555c26beb5b84d6c08c"
 dependencies = [
  "lazy_static",
  "num_cpus",
 ]
 
+[[package]]
+name = "solana-remote-wallet"
+version = "2.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aba8725448426110b9ac20d7256f43aad1ea46458fe35c63d174cf962af4a9d0"
+dependencies = [
+ "console",
+ "dialoguer",
+ "log",
+ "num-derive",
+ "num-traits",
+ "parking_lot",
+ "qstring",
+ "semver",
+ "solana-sdk",
+ "thiserror",
+ "uriparse",
+]
+
 [[package]]
 name = "solana-rpc-client"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd96f6a505a492544ee2459b608af3fe07da6c8ffc0bd842489e836ac2c3fce6"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -3765,7 +3664,7 @@ dependencies = [
  "solana-account-decoder",
  "solana-rpc-client-api",
  "solana-sdk",
- "solana-transaction-status-client-types",
+ "solana-transaction-status",
  "solana-version",
  "solana-vote-program",
  "tokio",
@@ -3774,7 +3673,8 @@ dependencies = [
 [[package]]
 name = "solana-rpc-client-api"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d04f79b88c53b675d5d885d498e7a7e6a4fdd60ffe56e543faddb5d94c6094ba"
 dependencies = [
  "anyhow",
  "base64 0.22.1",
@@ -3789,7 +3689,7 @@ dependencies = [
  "solana-account-decoder",
  "solana-inline-spl",
  "solana-sdk",
- "solana-transaction-status-client-types",
+ "solana-transaction-status",
  "solana-version",
  "thiserror",
 ]
@@ -3797,8 +3697,11 @@ dependencies = [
 [[package]]
 name = "solana-rpc-client-nonce-utils"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42d46d162566cbf7d6eb2ae369fbb8a934bc846906cbe959aed9123c1ac92b85"
 dependencies = [
+ "clap 2.34.0",
+ "solana-clap-utils",
  "solana-rpc-client",
  "solana-sdk",
  "thiserror",
@@ -3807,27 +3710,21 @@ dependencies = [
 [[package]]
 name = "solana-runtime-transaction"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "109f2151838ae4b6264857d06b0eaff55392690f24796d4468fbd7126a843a75"
 dependencies = [
- "agave-transaction-view",
  "log",
- "solana-builtins-default-costs",
+ "rustc_version",
  "solana-compute-budget",
- "solana-pubkey",
  "solana-sdk",
- "solana-svm-transaction",
  "thiserror",
 ]
 
-[[package]]
-name = "solana-sanitize"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-
 [[package]]
 name = "solana-sdk"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24dae5bda29858add4df3a6c5eaf71c0d2042ca3317a9fd81d7e9f436278a1fe"
 dependencies = [
  "bincode",
  "bitflags 2.6.0",
@@ -3837,9 +3734,11 @@ dependencies = [
  "bytemuck_derive",
  "byteorder",
  "chrono",
+ "derivation-path",
  "digest 0.10.7",
  "ed25519-dalek",
  "ed25519-dalek-bip32",
+ "generic-array",
  "getrandom 0.1.16",
  "hmac 0.12.1",
  "itertools 0.12.1",
@@ -3848,124 +3747,57 @@ dependencies = [
  "libsecp256k1",
  "log",
  "memmap2",
- "num-derive",
- "num-traits",
  "num_enum",
- "pbkdf2",
+ "pbkdf2 0.11.0",
+ "qstring",
  "rand 0.7.3",
  "rand 0.8.5",
+ "rustc_version",
+ "rustversion",
  "serde",
  "serde_bytes",
  "serde_derive",
  "serde_json",
- "serde_with",
+ "serde_with 2.3.3",
  "sha2 0.10.8",
  "sha3 0.10.8",
  "siphasher",
- "solana-bn254",
- "solana-decode-error",
- "solana-derivation-path",
- "solana-feature-set",
  "solana-program",
- "solana-program-memory",
- "solana-sanitize",
  "solana-sdk-macro",
- "solana-secp256k1-recover",
- "solana-serde-varint",
- "solana-short-vec",
- "solana-signature",
  "thiserror",
+ "uriparse",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "solana-sdk-macro"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "704c9cacc61a5b9b6f717773cf4b3b45a4239dc7fa8c585258fceaf9b8e1cb94"
 dependencies = [
  "bs58",
  "proc-macro2",
  "quote",
+ "rustversion",
  "syn 2.0.79",
 ]
 
-[[package]]
-name = "solana-secp256k1-recover"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "borsh 1.5.1",
- "libsecp256k1",
- "solana-define-syscall",
- "thiserror",
-]
-
 [[package]]
 name = "solana-security-txt"
 version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183"
 
-[[package]]
-name = "solana-serde-varint"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "solana-serialize-utils"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "solana-instruction",
- "solana-pubkey",
- "solana-sanitize",
-]
-
-[[package]]
-name = "solana-sha256-hasher"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "sha2 0.10.8",
- "solana-define-syscall",
- "solana-hash",
-]
-
-[[package]]
-name = "solana-short-vec"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "solana-signature"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "bs58",
- "ed25519-dalek",
- "generic-array",
- "rand 0.8.5",
- "serde",
- "serde_derive",
- "solana-sanitize",
-]
-
 [[package]]
 name = "solana-stake-program"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4601cba95c3aaebc3e3698d69c21fe128dcfb6ed08c98f0a6ee5184f25dd239"
 dependencies = [
  "bincode",
  "log",
+ "rustc_version",
  "solana-config-program",
- "solana-feature-set",
- "solana-log-collector",
  "solana-program-runtime",
  "solana-sdk",
  "solana-type-overrides",
@@ -3975,15 +3807,14 @@ dependencies = [
 [[package]]
 name = "solana-streamer"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cf77ab19483dce4b4307c9e6f195a8c52f0c219026b78af3a9fae1e63ba9222"
 dependencies = [
  "async-channel",
  "bytes",
  "crossbeam-channel",
  "dashmap 5.5.3",
- "futures",
  "futures-util",
- "governor",
  "histogram",
  "indexmap 2.6.0",
  "itertools 0.12.1",
@@ -3995,9 +3826,8 @@ dependencies = [
  "quinn",
  "quinn-proto",
  "rand 0.8.5",
- "rustls 0.23.14",
+ "rustls",
  "smallvec",
- "socket2",
  "solana-measure",
  "solana-metrics",
  "solana-perf",
@@ -4011,58 +3841,39 @@ dependencies = [
 [[package]]
 name = "solana-svm"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3881ad0f09d36146d3eebb625b36f8b823dd9ced9f93e8c72f9fdc8b4b09dc76"
 dependencies = [
  "itertools 0.12.1",
  "log",
  "percentage",
+ "prost-build",
+ "qualifier_attr",
+ "rustc_version",
  "serde",
  "serde_derive",
  "solana-bpf-loader-program",
  "solana-compute-budget",
- "solana-feature-set",
- "solana-fee",
  "solana-loader-v4-program",
- "solana-log-collector",
  "solana-measure",
+ "solana-metrics",
  "solana-program-runtime",
- "solana-runtime-transaction",
  "solana-sdk",
- "solana-svm-rent-collector",
- "solana-svm-transaction",
  "solana-system-program",
- "solana-timings",
  "solana-type-overrides",
  "solana-vote",
- "thiserror",
-]
-
-[[package]]
-name = "solana-svm-rent-collector"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "solana-sdk",
-]
-
-[[package]]
-name = "solana-svm-transaction"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "solana-sdk",
 ]
 
 [[package]]
 name = "solana-system-program"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f582c0c7b64b7ddeac4d0623d793823ff661865af67b2100ad6ad8bdadeb1f5"
 dependencies = [
  "bincode",
  "log",
  "serde",
  "serde_derive",
- "solana-log-collector",
  "solana-program-runtime",
  "solana-sdk",
  "solana-type-overrides",
@@ -4071,7 +3882,8 @@ dependencies = [
 [[package]]
 name = "solana-thin-client"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8c880be4e50ff473b3e82b600162244b6eb28cb5a616dc90ee9232d34998680"
 dependencies = [
  "bincode",
  "log",
@@ -4082,20 +3894,11 @@ dependencies = [
  "solana-sdk",
 ]
 
-[[package]]
-name = "solana-timings"
-version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
-dependencies = [
- "eager",
- "enum-iterator",
- "solana-sdk",
-]
-
 [[package]]
 name = "solana-tpu-client"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e65c01edbca303273e735ae383dde54bd5c5b8a051c51162c0ff886b0939ec6"
 dependencies = [
  "async-trait",
  "bincode",
@@ -4106,6 +3909,7 @@ dependencies = [
  "rayon",
  "solana-connection-cache",
  "solana-measure",
+ "solana-metrics",
  "solana-pubsub-client",
  "solana-rpc-client",
  "solana-rpc-client-api",
@@ -4117,8 +3921,10 @@ dependencies = [
 [[package]]
 name = "solana-transaction-metrics-tracker"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44727bef1f8c57a6ed9a74761d8b7ddfcf4b4e2237cbcc5dc7f8f59985e07755"
 dependencies = [
+ "Inflector",
  "base64 0.22.1",
  "bincode",
  "lazy_static",
@@ -4126,30 +3932,40 @@ dependencies = [
  "rand 0.8.5",
  "solana-perf",
  "solana-sdk",
- "solana-short-vec",
 ]
 
 [[package]]
-name = "solana-transaction-status-client-types"
+name = "solana-transaction-status"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d51d9d4a6004708f9563a29aa87fdf9960c1e7420b69dd82e8b817cf8f02430b"
 dependencies = [
+ "Inflector",
  "base64 0.22.1",
  "bincode",
+ "borsh 1.5.1",
  "bs58",
+ "lazy_static",
+ "log",
  "serde",
  "serde_derive",
  "serde_json",
  "solana-account-decoder",
  "solana-sdk",
- "solana-signature",
+ "spl-associated-token-account 4.0.0",
+ "spl-memo",
+ "spl-token",
+ "spl-token-2022 4.0.0",
+ "spl-token-group-interface 0.3.0",
+ "spl-token-metadata-interface 0.4.0",
  "thiserror",
 ]
 
 [[package]]
 name = "solana-type-overrides"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ab21276d6296965dc7181d785075b20e97b6789c76e8376cf363b3e2f7439b6"
 dependencies = [
  "lazy_static",
  "rand 0.8.5",
@@ -4158,7 +3974,8 @@ dependencies = [
 [[package]]
 name = "solana-udp-client"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10e902d4dc29cafc0794073805a2db1b48b818251480a9fbaec3959df72aec2f"
 dependencies = [
  "async-trait",
  "solana-connection-cache",
@@ -4172,23 +3989,26 @@ dependencies = [
 [[package]]
 name = "solana-version"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bcbc570264e5a61a8f84439dfc254931460769fedfb91ff16253acfc3644c9d"
 dependencies = [
+ "log",
+ "rustc_version",
  "semver",
  "serde",
  "serde_derive",
- "solana-feature-set",
- "solana-sanitize",
- "solana-serde-varint",
+ "solana-sdk",
 ]
 
 [[package]]
 name = "solana-vote"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fa1401a42023379f14af9165954f44ad02888a327dfd2a4abce0f18fa7cfab9"
 dependencies = [
  "itertools 0.12.1",
  "log",
+ "rustc_version",
  "serde",
  "serde_derive",
  "solana-sdk",
@@ -4198,15 +4018,16 @@ dependencies = [
 [[package]]
 name = "solana-vote-program"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfd8e539a9963c2914ff8426dfe92351a902892aea465cd507e36d638ca0b7d6"
 dependencies = [
  "bincode",
  "log",
  "num-derive",
  "num-traits",
+ "rustc_version",
  "serde",
  "serde_derive",
- "solana-feature-set",
  "solana-metrics",
  "solana-program",
  "solana-program-runtime",
@@ -4225,7 +4046,7 @@ dependencies = [
  "bincode",
  "bytemuck",
  "bytemuck_derive",
- "curve25519-dalek 3.2.1",
+ "curve25519-dalek",
  "itertools 0.12.1",
  "lazy_static",
  "merlin",
@@ -4246,7 +4067,8 @@ dependencies = [
 [[package]]
 name = "solana-zk-token-sdk"
 version = "2.0.13"
-source = "git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183#f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1dd7a8d6843cb3de4c13c2cfec1994519735ea4110b7f36b80b41d57bea1c07"
 dependencies = [
  "aes-gcm-siv",
  "base64 0.22.1",
@@ -4254,19 +4076,18 @@ dependencies = [
  "bytemuck",
  "bytemuck_derive",
  "byteorder",
- "curve25519-dalek 4.1.3",
+ "curve25519-dalek",
  "itertools 0.12.1",
  "lazy_static",
  "merlin",
  "num-derive",
  "num-traits",
- "rand 0.8.5",
+ "rand 0.7.3",
  "serde",
  "serde_derive",
  "serde_json",
- "sha3 0.10.8",
- "solana-curve25519 2.0.13 (git+https://github.com/OliverNChalk/agave?rev=f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183)",
- "solana-derivation-path",
+ "sha3 0.9.1",
+ "solana-curve25519",
  "solana-program",
  "solana-sdk",
  "subtle",
@@ -4276,12 +4097,13 @@ dependencies = [
 
 [[package]]
 name = "solana_rbpf"
-version = "0.8.5"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c1941b5ef0c3ce8f2ac5dd984d0fb1a97423c4ff2a02eec81e3913f02e2ac2b"
+checksum = "ff08afd63f70a1ba712fb0017be41e93b017f7e874785b54bb5ec9aa8949781d"
 dependencies = [
  "byteorder",
- "combine 3.8.1",
+ "combine",
+ "goblin",
  "hash32",
  "libc",
  "log",
@@ -4292,6 +4114,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -4299,12 +4127,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
 [[package]]
-name = "spinning_top"
-version = "0.3.0"
+name = "spl-associated-token-account"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
+checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e"
 dependencies = [
- "lock_api",
+ "assert_matches",
+ "borsh 1.5.1",
+ "num-derive",
+ "num-traits",
+ "solana-program",
+ "spl-token",
+ "spl-token-2022 4.0.0",
+ "thiserror",
 ]
 
 [[package]]
@@ -4531,7 +4366,7 @@ checksum = "48df72fb98b4069979aa4806d4a634ad6f08cb0358e732e6fbac231c5dc075bd"
 dependencies = [
  "base64 0.22.1",
  "bytemuck",
- "solana-curve25519 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana-curve25519",
  "solana-zk-sdk",
 ]
 
@@ -4542,7 +4377,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae2ce92a0b9673c44207b21d99526b96d557d5a25752f36c38fae37c49129c3b"
 dependencies = [
  "bytemuck",
- "solana-curve25519 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "solana-curve25519",
  "solana-zk-sdk",
  "thiserror",
 ]
@@ -4553,7 +4388,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "216517cc8cd26dfe768521542f221f91049be102d1eefd8054cde881d1b5d267"
 dependencies = [
- "curve25519-dalek 3.2.1",
+ "curve25519-dalek",
  "solana-zk-sdk",
  "thiserror",
 ]
@@ -4670,6 +4505,24 @@ dependencies = [
  "spl-program-error",
 ]
 
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "strsim"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -4698,12 +4551,12 @@ dependencies = [
  "litesvm",
  "serde",
  "serde_json",
- "serde_with",
+ "serde_with 3.11.0",
  "solana-account-decoder",
  "solana-client",
  "solana-logger",
  "solana-sdk",
- "spl-associated-token-account",
+ "spl-associated-token-account 5.0.1",
  "spl-token",
  "spl-token-2022 5.0.2",
  "tokio",
@@ -4792,6 +4645,19 @@ dependencies = [
  "pin-utils",
 ]
 
+[[package]]
+name = "tempfile"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.4.1"
@@ -4801,6 +4667,21 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
+
 [[package]]
 name = "thiserror"
 version = "1.0.64"
@@ -4852,6 +4733,25 @@ dependencies = [
  "time-core",
 ]
 
+[[package]]
+name = "tiny-bip39"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d"
+dependencies = [
+ "anyhow",
+ "hmac 0.8.1",
+ "once_cell",
+ "pbkdf2 0.4.0",
+ "rand 0.7.3",
+ "rustc-hash",
+ "sha2 0.9.9",
+ "thiserror",
+ "unicode-normalization",
+ "wasm-bindgen",
+ "zeroize",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.8.0"
@@ -4902,7 +4802,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls 0.21.12",
+ "rustls",
  "tokio",
 ]
 
@@ -4925,7 +4825,7 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
 dependencies = [
  "futures-util",
  "log",
- "rustls 0.21.12",
+ "rustls",
  "tokio",
  "tokio-rustls",
  "tungstenite",
@@ -5028,7 +4928,7 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.8.5",
- "rustls 0.21.12",
+ "rustls",
  "sha1",
  "thiserror",
  "url",
@@ -5103,6 +5003,12 @@ dependencies = [
  "void",
 ]
 
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -5136,6 +5042,12 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "vec_map"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
+
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -5148,16 +5060,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -5181,9 +5083,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -5192,9 +5094,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
@@ -5207,9 +5109,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5219,9 +5121,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -5229,9 +5131,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5242,15 +5144,15 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5262,7 +5164,7 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888"
 dependencies = [
- "rustls-webpki 0.101.7",
+ "rustls-webpki",
 ]
 
 [[package]]
@@ -5272,12 +5174,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
-name = "webpki-roots"
-version = "0.26.6"
+name = "which"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
 dependencies = [
- "rustls-pki-types",
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
 ]
 
 [[package]]
@@ -5528,9 +5433,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
 dependencies = [
  "zeroize_derive",
 ]
@@ -5548,19 +5453,20 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.13.2"
+version = "0.11.2+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
+checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "7.2.1"
+version = "5.0.2+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
+checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
 dependencies = [
+ "libc",
  "zstd-sys",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index b609134..573aed3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ members = ["crates/*", "programs/*"]
 [workspace.dependencies]
 auto_impl = "1.2.0"
 faucet = { path = "./programs/faucet" }
-litesvm = { git = "https://github.com/OliverNChalk/litesvm", branch = "solana-2" }
+litesvm = { git = "https://github.com/OliverNChalk/litesvm" }
 solana-account-decoder = "2.0.13"
 solana-client = "2.0.13"
 solana-logger = "2.0.13"
@@ -14,28 +14,3 @@ solana-sdk = "2.0.13"
 spl-associated-token-account = "5.0.1"
 spl-token = { version = "6.0.0", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "5.0.0", features = ["no-entrypoint"] }
-
-[patch.crates-io]
-solana-account-decoder = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-address-lookup-table-program = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-bpf-loader-program = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-client = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-compute-budget = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-compute-budget-program = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-config-program = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-fee = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-loader-v4-program = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-log-collector = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-program = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-program-runtime = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-quic-client = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-runtime-transaction = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-sdk = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-stake-program = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-svm = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-svm-transaction = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-system-program = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-timings = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-vote-program = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-solana-zk-token-sdk = { git = "https://github.com/OliverNChalk/agave", rev = "f5fa2ecbaacdbcbbf9ed691e049b2b1c391ad183" }
-curve25519-dalek = { git = "https://github.com/OliverNChalk/curve25519-dalek", rev = "af1ed144753dfac0ae1e58005688e581a5f2c6b4" }
diff --git a/crates/svm-test/Cargo.toml b/crates/svm-test/Cargo.toml
index cb4151e..6a1c6c0 100644
--- a/crates/svm-test/Cargo.toml
+++ b/crates/svm-test/Cargo.toml
@@ -35,4 +35,4 @@ faucet = { workspace = true }
 
 [[test]]
 name = "program_integration_test"
-required-features = ["spl-token"]
+required-features = ["spl"]
diff --git a/crates/svm-test/src/svm.rs b/crates/svm-test/src/svm.rs
index 59cf4ce..e0d9621 100644
--- a/crates/svm-test/src/svm.rs
+++ b/crates/svm-test/src/svm.rs
@@ -1,7 +1,8 @@
 use std::collections::HashSet;
 
+use litesvm::types::SimulatedTransactionInfo;
 pub use litesvm::types::{FailedTransactionMetadata, TransactionMetadata, TransactionResult};
-use solana_sdk::account::{Account, AccountSharedData};
+use solana_sdk::account::Account;
 use solana_sdk::pubkey::Pubkey;
 use solana_sdk::reserved_account_keys::ReservedAccountKeys;
 use solana_sdk::sysvar::{Sysvar, SysvarId};
@@ -11,6 +12,7 @@ use solana_sdk::{
     secp256k1_program, sysvar,
 };
 
+#[cfg(feature = "spl")]
 use crate::spl::SplProgram;
 use crate::AccountLoader;
 
@@ -46,7 +48,7 @@ where
 
     fn inner() -> litesvm::LiteSVM {
         litesvm::LiteSVM::default()
-            .with_builtins()
+            .with_builtins(None)
             .with_lamports(1_000_000u64.wrapping_mul(10u64.pow(9)))
             .with_sysvars()
             .with_sigverify(true)
@@ -122,8 +124,7 @@ where
     pub fn simulate_transaction(
         &mut self,
         tx: impl Into<VersionedTransaction>,
-    ) -> Result<(TransactionMetadata, Vec<(Pubkey, AccountSharedData)>), FailedTransactionMetadata>
-    {
+    ) -> Result<SimulatedTransactionInfo, FailedTransactionMetadata> {
         let tx = self.sanitize_and_load_accounts(tx.into());
 
         self.inner
diff --git a/crates/svm-test/tests/program_integration_test.rs b/crates/svm-test/tests/program_integration_test.rs
index 40e9c60..ac9f2c0 100644
--- a/crates/svm-test/tests/program_integration_test.rs
+++ b/crates/svm-test/tests/program_integration_test.rs
@@ -2,6 +2,7 @@
 //! programs. This allows for seamless integration testing against already
 //! deployed testnet/mainnet accounts.
 use expect_test::expect;
+use litesvm::types::SimulatedTransactionInfo;
 use solana_sdk::account::{Account, ReadableAccount};
 use solana_sdk::instruction::{AccountMeta, Instruction};
 use solana_sdk::program_pack::Pack;
@@ -44,7 +45,7 @@ fn faucet() {
     );
 
     // Simulate (run without updating state).
-    let (meta, accounts) = svm.simulate_transaction(tx.into()).unwrap();
+    let SimulatedTransactionInfo { meta, post_accounts } = svm.simulate_transaction(tx).unwrap();
 
     // Assert.
     expect![[r#"
@@ -127,14 +128,14 @@ fn faucet() {
                 },
             ),
         ]
-    "#]].assert_debug_eq(&accounts);
+    "#]].assert_debug_eq(&post_accounts);
 
     // TODO: Consider making a helper for this.
     let faucet_before = spl_token::state::Account::unpack(&svm.get(&faucet_usdc).unwrap().data)
         .unwrap()
         .amount;
     let faucet_after = spl_token::state::Account::unpack(
-        accounts
+        post_accounts
             .iter()
             .find(|(key, _)| key == &faucet_usdc)
             .unwrap()
@@ -151,7 +152,7 @@ fn faucet() {
             .unwrap()
             .amount;
     let recipient_after = spl_token::state::Account::unpack(
-        accounts
+        post_accounts
             .iter()
             .find(|(key, _)| key == &recipient_usdc)
             .unwrap()
diff --git a/crates/svm-test/tests/program_unit_test.rs b/crates/svm-test/tests/program_unit_test.rs
index 5e6a42d..515d5f6 100644
--- a/crates/svm-test/tests/program_unit_test.rs
+++ b/crates/svm-test/tests/program_unit_test.rs
@@ -3,6 +3,7 @@
 use std::collections::HashMap;
 
 use expect_test::expect;
+use litesvm::types::SimulatedTransactionInfo;
 use solana_sdk::account::Account;
 use solana_sdk::instruction::Instruction;
 use solana_sdk::pubkey::Pubkey;
@@ -29,7 +30,7 @@ fn memo() {
     );
 
     // Simulate (run without updating state).
-    let (meta, accounts) = svm.simulate_transaction(tx).unwrap();
+    let SimulatedTransactionInfo { meta, post_accounts } = svm.simulate_transaction(tx).unwrap();
 
     // Assert.
     expect![[r#"
@@ -37,13 +38,13 @@ fn memo() {
             signature: 32qrmjZC3XfzvagJHVozcNWnjW24uBrcdGmUP5r31LstZM3nAsH7cENbuWzW29dyQWLoCTBjBYV6xNrPKS7FJPsG,
             logs: [
                 "Program 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi invoke [1]",
-                "Program 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi consumed 33 of 200000 compute units",
+                "Program 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi consumed 36 of 200000 compute units",
                 "Program 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi success",
             ],
             inner_instructions: [
                 [],
             ],
-            compute_units_consumed: 33,
+            compute_units_consumed: 36,
             return_data: TransactionReturnData {
                 program_id: 4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi,
                 data: [],
@@ -64,5 +65,5 @@ fn memo() {
             ),
         ]
     "#]]
-    .assert_debug_eq(&accounts);
+    .assert_debug_eq(&post_accounts);
 }
diff --git a/solana-toolchain b/solana-toolchain
index 5699614..82bd22f 100644
--- a/solana-toolchain
+++ b/solana-toolchain
@@ -1 +1 @@
-1.18.15
+2.0.13