diff --git a/Cargo.lock b/Cargo.lock index 324a3028..2f0f14e0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -60,6 +60,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -308,9 +309,6 @@ name = "bitflags" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" -dependencies = [ - "serde", -] [[package]] name = "blake3" @@ -511,26 +509,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "cfg_eval" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45565fc9416b9896014f5732ac776f810ee53a66730c17e4020c3ec064a8f88f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.98", -] - -[[package]] -name = "chrono" -version = "0.4.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" -dependencies = [ - "num-traits", -] - [[package]] name = "cipher" version = "0.4.4" @@ -707,41 +685,6 @@ dependencies = [ "syn 2.0.98", ] -[[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 2.0.98", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", - "syn 2.0.98", -] - [[package]] name = "derivation-path" version = "0.2.0" @@ -819,18 +762,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ed25519-dalek-bip32" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2be62a4061b872c8c0873ee4fc6f101ce7b889d039f019c5fa2af471a59908" -dependencies = [ - "derivation-path", - "ed25519-dalek", - "hmac 0.12.1", - "sha2 0.10.8", -] - [[package]] name = "either" version = "1.13.0" @@ -1006,7 +937,6 @@ version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ - "serde", "typenum", "version_check", ] @@ -1028,10 +958,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -1331,12 +1259,6 @@ dependencies = [ "syn 2.0.98", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "1.0.3" @@ -1526,15 +1448,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -1584,51 +1497,73 @@ dependencies = [ [[package]] name = "mollusk-svm" -version = "0.0.15" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e7c0b51a00d234774b61bf829aa75316eb3a5ebf30bd622010bd046daa287a" +checksum = "e07877773d8734efadaa9b44a8c817d048033003c467243fb747efe2e641da71" dependencies = [ "bincode", "mollusk-svm-error", "mollusk-svm-keys", + "solana-account", "solana-bpf-loader-program", + "solana-clock", "solana-compute-budget", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-feature-set", + "solana-fee-structure", + "solana-hash", + "solana-instruction", + "solana-loader-v3-interface", "solana-log-collector", "solana-logger", + "solana-precompiles", + "solana-program-error", "solana-program-runtime", - "solana-sdk", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-slot-hashes", + "solana-stake-interface", "solana-system-program", + "solana-sysvar", + "solana-sysvar-id", "solana-timings", + "solana-transaction-context", ] [[package]] name = "mollusk-svm-error" -version = "0.0.15" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d7892725c98a376b55e03ccbea44a0d2111c8f7bab0432b42ea689f3f612e7" +checksum = "e5062f87053bf1daf07e578155a850d01d2bb8c9327d5e31924edc7c17b7903f" dependencies = [ - "solana-sdk", + "solana-pubkey", "thiserror 1.0.69", ] [[package]] name = "mollusk-svm-keys" -version = "0.0.15" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd18816096707d148467889844ae57384ab4cbbe50ed24fd03139e6e34d61301" +checksum = "41f95fd45db898fde342eeb6c55c4d32033fccdc4cb703f213af848c96d3a82b" dependencies = [ "mollusk-svm-error", - "solana-sdk", + "solana-account", + "solana-instruction", + "solana-pubkey", + "solana-transaction-context", ] [[package]] name = "mollusk-svm-programs-token" -version = "0.0.15" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdaf9b1afcf8b45fbaa9d3e555ef7ef46b3594d3196ca484ca37fe85975ef45" +checksum = "3ee6d6ad69c7e5c989cc511642db03a3c448eee9d46d85fb6d4bb6996e29260c" dependencies = [ "mollusk-svm", - "solana-sdk", + "solana-account", + "solana-pubkey", ] [[package]] @@ -1936,6 +1871,17 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "qualifier_attr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.98", +] + [[package]] name = "quote" version = "1.0.38" @@ -2176,12 +2122,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "scroll" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" - [[package]] name = "sct" version = "0.7.1" @@ -2251,29 +2191,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" -dependencies = [ - "serde", - "serde_derive", - "serde_with_macros", -] - -[[package]] -name = "serde_with_macros" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 2.0.98", -] - [[package]] name = "sha2" version = "0.9.9" @@ -2320,12 +2237,6 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - [[package]] name = "slab" version = "0.4.9" @@ -2353,23 +2264,27 @@ dependencies = [ [[package]] name = "solana-account" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2197f7b15bc6041fa833974025a6006a111977cd4fd35848b743757c1a409f5" +checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" dependencies = [ "bincode", "serde", "serde_bytes", "serde_derive", + "solana-account-info", + "solana-clock", "solana-instruction", - "solana-program", + "solana-pubkey", + "solana-sdk-ids", + "solana-sysvar", ] [[package]] name = "solana-account-info" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a67b02d022266e0979a3033f58f83c6e4d45f7e7cc85e6beeaf90b32ef5ede8" +checksum = "e0c17d606a298a205fae325489fbed88ee6dc4463c111672172327e741c8905d" dependencies = [ "bincode", "serde", @@ -2378,46 +2293,86 @@ dependencies = [ "solana-pubkey", ] +[[package]] +name = "solana-address-lookup-table-interface" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1673f67efe870b64a65cb39e6194be5b26527691ce5922909939961a6e6b395" +dependencies = [ + "bincode", + "bytemuck", + "serde", + "serde_derive", + "solana-clock", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-slot-hashes", +] + [[package]] name = "solana-atomic-u64" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2453e9e0f5e948d83d1ea5ceef6a0488b39cb57f21e19d73d5dc57f27464ec8d" +checksum = "d52e52720efe60465b052b9e7445a01c17550666beec855cce66f44766697bc2" dependencies = [ "parking_lot", ] +[[package]] +name = "solana-big-mod-exp" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75db7f2bbac3e62cfd139065d15bcda9e2428883ba61fc8d27ccb251081e7567" +dependencies = [ + "num-bigint 0.4.6", + "num-traits", + "solana-define-syscall", +] + [[package]] name = "solana-bincode" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b235339197024a4f5c80b2ab5961f616c3ee2aa4542af082a0cc9c84c82b3c09" +checksum = "19a3787b8cf9c9fe3dd360800e8b70982b9e5a8af9e11c354b6665dd4a003adc" dependencies = [ "bincode", "serde", "solana-instruction", ] +[[package]] +name = "solana-blake3-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0801e25a1b31a14494fc80882a036be0ffd290efc4c2d640bfcca120a4672" +dependencies = [ + "blake3", + "solana-define-syscall", + "solana-hash", + "solana-sanitize", +] + [[package]] name = "solana-bn254" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f1b3e79f6ad47ffeb75be02d69828c00926af536083dadc6db8282ef1f0774e" +checksum = "9abc69625158faaab02347370b91c0d8e0fe347bf9287239f0fbe8f5864d91da" dependencies = [ "ark-bn254", "ark-ec", "ark-ff", "ark-serialize", "bytemuck", - "solana-program", - "thiserror 1.0.69", + "solana-define-syscall", + "thiserror 2.0.12", ] [[package]] name = "solana-borsh" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3950d83165c85ac9cb92be986a76c7a543c5c14c1e98982d6dfad3d98e6b2353" +checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" dependencies = [ "borsh 0.10.4", "borsh 1.5.5", @@ -2425,57 +2380,90 @@ dependencies = [ [[package]] name = "solana-bpf-loader-program" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "107b32cf9b65a8f44000fb86a2232aaa5bb6f12d16bc5e77272d0c5168bc3857" +checksum = "0cbc2581d0f39cd7698e46baa06fc5e8928b323a85ed3a4fdbdfe0d7ea9fc152" dependencies = [ "bincode", - "byteorder", "libsecp256k1", - "log", + "qualifier_attr", "scopeguard", + "solana-account", + "solana-account-info", + "solana-big-mod-exp", + "solana-bincode", + "solana-blake3-hasher", "solana-bn254", + "solana-clock", "solana-compute-budget", + "solana-cpi", "solana-curve25519", "solana-feature-set", + "solana-hash", + "solana-instruction", + "solana-keccak-hasher", + "solana-loader-v3-interface", + "solana-loader-v4-interface", "solana-log-collector", "solana-measure", + "solana-packet", "solana-poseidon", + "solana-precompiles", + "solana-program-entrypoint", "solana-program-memory", "solana-program-runtime", - "solana-sdk", + "solana-pubkey", + "solana-sbpf", + "solana-sdk-ids", + "solana-secp256k1-recover", + "solana-sha256-hasher", + "solana-stable-layout", + "solana-system-interface", + "solana-sysvar", + "solana-sysvar-id", "solana-timings", + "solana-transaction-context", "solana-type-overrides", - "solana_rbpf", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] name = "solana-clock" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bfdce9a9f46965ffb6e1e7cc0e52efeb834c89dc67d7399770a9d4447498fdb" +checksum = "67c2177a1b9fe8326004f1151a5acd124420b737811080b1035df31349e4d892" dependencies = [ "serde", "serde_derive", + "solana-sdk-ids", "solana-sdk-macro", "solana-sysvar-id", ] +[[package]] +name = "solana-cluster-type" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ace9fea2daa28354d107ea879cff107181d85cd4e0f78a2bedb10e1a428c97e" +dependencies = [ + "solana-hash", +] + [[package]] name = "solana-compute-budget" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6989b3fa34b7190243346bee5c4c208b7d24da189c6c3cbd329227d5ab0d6b8b" +checksum = "eab40b24943ca51f1214fcf7979807640ea82a8387745f864cf3cd93d1337b01" dependencies = [ - "solana-sdk", + "solana-fee-structure", + "solana-program-entrypoint", ] [[package]] name = "solana-cpi" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd452db5b927c0abbbd47ccc9f233a480754ecc7d07a9c5826c4d1f09168b6e1" +checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" dependencies = [ "solana-account-info", "solana-define-syscall", @@ -2487,63 +2475,134 @@ dependencies = [ [[package]] name = "solana-curve25519" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af29b27893aa7bc5082f30ef653c9319b36ac2b2d0f5c44688a5e80c42fcd892" +checksum = "f213e3a853a23814dee39d730cd3a5583b7b1e6b37b2cd4d940bbe62df7acc16" dependencies = [ "bytemuck", "bytemuck_derive", "curve25519-dalek 4.1.3", - "solana-program", - "thiserror 1.0.69", + "solana-define-syscall", + "subtle", + "thiserror 2.0.12", ] [[package]] name = "solana-decode-error" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1d529c1056b4d461609224fa1bf2a6584eafddf435c6394697b0f5de8c812c" +checksum = "10a6a6383af236708048f8bd8d03db8ca4ff7baf4a48e5d580f4cce545925470" dependencies = [ "num-traits", ] [[package]] name = "solana-define-syscall" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c012a5bdc1122a74880faf6684b32286a9fae0086ff0a3efb16d7f3681fca90" +checksum = "cf784bb2cb3e02cac9801813c30187344228d2ae952534902108f6150573a33d" [[package]] name = "solana-derivation-path" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0803b6ea9c3b9f3c3f540535d6a9d32e6fa6a2ae368a3a93eb4a61c3a216c65d" +checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" dependencies = [ "derivation-path", "qstring", "uriparse", ] +[[package]] +name = "solana-ed25519-program" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0c4dfce08d71d8f1e9b7d1b4e2c7101a8109903ad481acbbc1119a73d459f2" +dependencies = [ + "bytemuck", + "bytemuck_derive", + "ed25519-dalek", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", +] + +[[package]] +name = "solana-epoch-rewards" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b575d3dd323b9ea10bb6fe89bf6bf93e249b215ba8ed7f68f1a3633f384db7" +dependencies = [ + "serde", + "serde_derive", + "solana-hash", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + [[package]] name = "solana-epoch-schedule" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc5bd1733a0099c803b5e63be64ef6be1041b52010481f12a7d81124615e030d" +checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" dependencies = [ "serde", "serde_derive", + "solana-sdk-ids", "solana-sdk-macro", "solana-sysvar-id", ] +[[package]] +name = "solana-example-mocks" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84461d56cbb8bb8d539347151e0525b53910102e4bced875d49d5139708e39d3" +dependencies = [ + "serde", + "serde_derive", + "solana-address-lookup-table-interface", + "solana-clock", + "solana-hash", + "solana-instruction", + "solana-keccak-hasher", + "solana-message", + "solana-nonce", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", + "thiserror 2.0.12", +] + +[[package]] +name = "solana-feature-gate-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f9c7fbf3e58b64a667c5f35e90af580538a95daea7001ff7806c0662d301bdf" +dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-account", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-system-interface", +] + [[package]] name = "solana-feature-set" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7034fc05eae9180a5ae63f87a2e9985f8e0ae3c1269973c523d1028a78ffe3" +checksum = "89e1d3b52b4a014efeaaab67f14e40af3972a4be61c523d612860db8e3145529" dependencies = [ + "ahash", "lazy_static", - "solana-clock", "solana-epoch-schedule", "solana-hash", "solana-pubkey", @@ -2552,20 +2611,30 @@ dependencies = [ [[package]] name = "solana-fee-calculator" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6337eace41da19d476fe80c86a8a2f5cad76125c2aa672788ec7f2814a62478a" +checksum = "d89bc408da0fb3812bc3008189d148b4d3e08252c79ad810b245482a3f70cd8d" dependencies = [ "log", "serde", "serde_derive", ] +[[package]] +name = "solana-fee-structure" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f45f94a88efdb512805563181dfa1c85c60a21b6e6d602bf24a2ea88f9399d6e" +dependencies = [ + "solana-message", + "solana-native-token", +] + [[package]] name = "solana-hash" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36647a50db4d401721e55d6bc1d259a8cea7bc333ab41c6358d2f5b344a1ab4e" +checksum = "cf7bcb14392900fe02e4e34e90234fbf0c673d4e327888410ba99fa2ba0f4e99" dependencies = [ "borsh 1.5.5", "bs58", @@ -2579,21 +2648,11 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "solana-inflation" -version = "2.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2ea0e34ad32c6a1a026f284716c9c21cd1c3dc496a595640f76ef4bf364f1d" -dependencies = [ - "serde", - "serde_derive", -] - [[package]] name = "solana-instruction" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a99a1276782510f3f9d8dac058b9fccadfc62ff4fd5b7c6d462dbf46632181" +checksum = "9ce496a475e5062ba5de97215ab39d9c358f9c9df4bb7f3a45a1f1a8bd9065ed" dependencies = [ "bincode", "borsh 1.5.5", @@ -2608,31 +2667,105 @@ dependencies = [ ] [[package]] -name = "solana-last-restart-slot" -version = "2.1.13" +name = "solana-instructions-sysvar" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55a1090667f03719f886b86f90a333b0741df8692fb7076529ae2ab066e2f4b4" +checksum = "427f2d0d6dc0bb49f16cef5e7f975180d2e80aab9bdd3b2af68e2d029ec63f43" dependencies = [ - "serde", - "serde_derive", - "solana-sdk-macro", - "solana-sysvar-id", -] - -[[package]] + "bitflags 2.8.0", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-serialize-utils", + "solana-sysvar-id", +] + +[[package]] +name = "solana-keccak-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" +dependencies = [ + "sha3", + "solana-define-syscall", + "solana-hash", + "solana-sanitize", +] + +[[package]] +name = "solana-last-restart-slot" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-loader-v2-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8ab08006dad78ae7cd30df8eea0539e207d08d91eaefb3e1d49a446e1c49654" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", +] + +[[package]] +name = "solana-loader-v3-interface" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4be76cfa9afd84ca2f35ebc09f0da0f0092935ccdac0595d98447f259538c2" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-loader-v4-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "706a777242f1f39a83e2a96a2a6cb034cb41169c6ecbee2cf09cb873d9659e7e" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] name = "solana-log-collector" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "606f71865c0889b7dbdccd2a75586ec028461d648901708f2bb5f5c6bee5693d" +checksum = "4aa28cd428e0af919d2fafd31c646835622abfd7ed4dba4df68e3c00f461bc66" dependencies = [ "log", ] [[package]] name = "solana-logger" -version = "2.1.12" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e607485a4b8b66f7d3592e4a79355073cb7e6a101c244e5fa0aa52bfdce506" +checksum = "593dbcb81439d37b02757e90bd9ab56364de63f378c55db92a6fbd6a2e47ab36" dependencies = [ "env_logger", "lazy_static", @@ -2641,126 +2774,193 @@ dependencies = [ [[package]] name = "solana-measure" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cd58f210630986a5c3f0344da347bb75fc2a90f2fe287438a81cd2c6ffcc8b" +checksum = "8f1fced2cfeff80f0214af86bc27bc6e798465a45b70329c3b468bb75957c082" + +[[package]] +name = "solana-message" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "268486ba8a294ed22a4d7c1ec05f540c3dbe71cfa7c6c54b6d4d13668d895678" +dependencies = [ + "bincode", + "blake3", + "lazy_static", + "serde", + "serde_derive", + "solana-bincode", + "solana-hash", + "solana-instruction", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", + "solana-system-interface", + "solana-transaction-error", + "wasm-bindgen", +] [[package]] name = "solana-metrics" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58eec7006fe02032aa28f0ff49f3b378d64f16597d725af2887febc0f4ba3e9c" +checksum = "89db46736ae1929db9629d779485052647117f3fcc190755519853b705f6dba5" dependencies = [ "crossbeam-channel", "gethostname", "lazy_static", "log", "reqwest", - "solana-sdk", - "thiserror 1.0.69", + "solana-clock", + "solana-cluster-type", + "solana-sha256-hasher", + "solana-time-utils", + "thiserror 2.0.12", ] [[package]] name = "solana-msg" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b84934c69aa9799b661f87aa1c47f8d358c3912fe5843571a5d047a222a0e6" +checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" dependencies = [ "solana-define-syscall", ] [[package]] name = "solana-native-token" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e628d59c4f2ca1e5765a99bf7a1f5fb87e6c834ad2992d84024141be32f21c8" +checksum = "33e9de00960197412e4be3902a6cd35e60817c511137aca6c34c66cd5d4017ec" [[package]] -name = "solana-packet" -version = "2.1.13" +name = "solana-nonce" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf27339d38ffc14b456e93f59a998cdd79079bec6776bef364a8aa1ee2ceed69" +checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" dependencies = [ - "bincode", - "bitflags 2.8.0", - "cfg_eval", "serde", "serde_derive", - "serde_with", + "solana-fee-calculator", + "solana-hash", + "solana-pubkey", + "solana-sha256-hasher", +] + +[[package]] +name = "solana-nonce-account" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cde971a20b8dbf60144d6a84439dda86b5466e00e2843091fe731083cda614da" +dependencies = [ + "solana-account", + "solana-hash", + "solana-nonce", + "solana-sdk-ids", +] + +[[package]] +name = "solana-packet" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127" +dependencies = [ + "bitflags 2.8.0", ] [[package]] name = "solana-poseidon" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61632e0273d31dc0b3237eb32f86201d89bfaff673eceeea3081e21bd027ff9" +checksum = "8ad1ea160d08dc423c35021fa3e437a5783eb256f5ab8bc3024e27db913acf42" dependencies = [ "ark-bn254", "light-poseidon", "solana-define-syscall", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] name = "solana-precompile-error" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c439844f1c18ec47ab13b5ed229cb0d9eacd75a7fafb8f150004b9a5ee11445e" +checksum = "4ff64daa2933c22982b323d88d0cdf693201ef56ac381ae16737fd5f579e07d6" dependencies = [ "num-traits", "solana-decode-error", ] +[[package]] +name = "solana-precompiles" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a460ab805ec063802105b463ecb5eb02c3ffe469e67a967eea8a6e778e0bc06" +dependencies = [ + "lazy_static", + "solana-ed25519-program", + "solana-feature-set", + "solana-message", + "solana-precompile-error", + "solana-pubkey", + "solana-sdk-ids", + "solana-secp256k1-program", + "solana-secp256r1-program", +] + [[package]] name = "solana-program" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b23f3bdb67fec4edc60ce12b5583c5425aab96dbb029636d400cd3f36242412" +checksum = "586469467e93ceb79048f8d8e3a619bf61d05396ee7de95cb40280301a589d05" dependencies = [ - "base64 0.22.1", "bincode", - "bitflags 2.8.0", "blake3", "borsh 0.10.4", "borsh 1.5.5", "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", + "solana-address-lookup-table-interface", "solana-atomic-u64", + "solana-big-mod-exp", "solana-bincode", + "solana-blake3-hasher", "solana-borsh", "solana-clock", "solana-cpi", "solana-decode-error", "solana-define-syscall", + "solana-epoch-rewards", "solana-epoch-schedule", + "solana-example-mocks", + "solana-feature-gate-interface", "solana-fee-calculator", "solana-hash", "solana-instruction", + "solana-instructions-sysvar", + "solana-keccak-hasher", "solana-last-restart-slot", + "solana-loader-v2-interface", + "solana-loader-v3-interface", + "solana-loader-v4-interface", + "solana-message", "solana-msg", "solana-native-token", + "solana-nonce", "solana-program-entrypoint", "solana-program-error", "solana-program-memory", @@ -2769,6 +2969,7 @@ dependencies = [ "solana-pubkey", "solana-rent", "solana-sanitize", + "solana-sdk-ids", "solana-sdk-macro", "solana-secp256k1-recover", "solana-serde-varint", @@ -2778,17 +2979,20 @@ dependencies = [ "solana-slot-hashes", "solana-slot-history", "solana-stable-layout", + "solana-stake-interface", + "solana-system-interface", + "solana-sysvar", "solana-sysvar-id", - "solana-transaction-error", - "thiserror 1.0.69", + "solana-vote-interface", + "thiserror 2.0.12", "wasm-bindgen", ] [[package]] name = "solana-program-entrypoint" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc27bbb6ff7f346b93173cacd14a44873e24a1702a07ebbe4a9295bf53eed3cb" +checksum = "473ffe73c68d93e9f2aa726ad2985fe52760052709aaab188100a42c618060ec" dependencies = [ "solana-account-info", "solana-msg", @@ -2798,9 +3002,9 @@ dependencies = [ [[package]] name = "solana-program-error" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5f48931e21e648410a17a1a42b3ace669e1b6c55516357f40ac6b91d4f81ef1" +checksum = "d8ae2c1a8d0d4ae865882d5770a7ebca92bab9c685e43f0461682c6c05a35bfa" dependencies = [ "borsh 1.5.5", "num-traits", @@ -2814,9 +3018,9 @@ dependencies = [ [[package]] name = "solana-program-memory" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "783ed2a707f3e875480ab0beda89951e8807cb0f76e30c19f82dd305b9169ab3" +checksum = "1b0268f6c89825fb634a34bd0c3b8fdaeaecfc3728be1d622a8ee6dd577b60d4" dependencies = [ "num-traits", "solana-define-syscall", @@ -2824,54 +3028,65 @@ dependencies = [ [[package]] name = "solana-program-option" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af0be45a0148239936e931a0ae95052a66e0b8f257205c9304af39bf2211a8de" +checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" [[package]] name = "solana-program-pack" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d992004feb5e4b8bec891470f38b029fa8a304ce762ca835ffcc67cc6bf385" +checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" dependencies = [ "solana-program-error", ] [[package]] name = "solana-program-runtime" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ed4dedcffb93dcf823dd0db043bb142ecc839d354c15347e75a370585b7c71" +checksum = "6c3d36fed5548b1a8625eb071df6031a95aa69f884e29bf244821e53c49372bc" dependencies = [ "base64 0.22.1", "bincode", "enum-iterator", "itertools 0.12.1", - "libc", "log", - "num-derive", - "num-traits", "percentage", "rand 0.8.5", "serde", + "solana-account", + "solana-clock", "solana-compute-budget", + "solana-epoch-rewards", + "solana-epoch-schedule", "solana-feature-set", + "solana-hash", + "solana-instruction", + "solana-last-restart-slot", "solana-log-collector", "solana-measure", "solana-metrics", - "solana-sdk", + "solana-precompiles", + "solana-pubkey", + "solana-rent", + "solana-sbpf", + "solana-sdk-ids", + "solana-slot-hashes", + "solana-stable-layout", + "solana-sysvar", + "solana-sysvar-id", "solana-timings", + "solana-transaction-context", "solana-type-overrides", - "solana-vote", - "solana_rbpf", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] name = "solana-pubkey" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d4cb0f3b71f466fe8e11bef05dc562060b5c8f526e969ecd150ce5bedc6e3eb" +checksum = "40db1ff5a0f8aea2c158d78ab5f2cf897848964251d1df42fef78efd3c85b863" dependencies = [ "borsh 0.10.4", "borsh 1.5.5", @@ -2883,7 +3098,6 @@ dependencies = [ "getrandom 0.2.15", "js-sys", "num-traits", - "rand 0.8.5", "serde", "serde_derive", "solana-atomic-u64", @@ -2896,91 +3110,54 @@ dependencies = [ [[package]] name = "solana-rent" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cb62c792559733d5f5d2ee42383e8d3b336e5168472ebdaaf157fd6f1949973" +checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" dependencies = [ "serde", "serde_derive", + "solana-sdk-ids", "solana-sdk-macro", "solana-sysvar-id", ] [[package]] name = "solana-sanitize" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e956e49e563eb8a9aa09425d676180a0a0509038be4457f230bb6e1dfa036053" +checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" [[package]] -name = "solana-sdk" -version = "2.1.13" +name = "solana-sbpf" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2625a64d46eccd46452df612f4266f24d266eb43ccac2a566ec41ee2ec76262" +checksum = "66a3ce7a0f4d6830124ceb2c263c36d1ee39444ec70146eb49b939e557e72b96" dependencies = [ - "bincode", - "bitflags 2.8.0", - "borsh 1.5.5", - "bs58", - "bytemuck", - "bytemuck_derive", "byteorder", - "chrono", - "digest 0.10.7", - "ed25519-dalek", - "ed25519-dalek-bip32", - "getrandom 0.1.16", - "hmac 0.12.1", - "itertools 0.12.1", - "js-sys", - "lazy_static", - "libsecp256k1", + "combine", + "hash32", + "libc", "log", - "memmap2", - "num-derive", - "num-traits", - "num_enum", - "pbkdf2", - "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", - "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", + "rustc-demangle", "thiserror 1.0.69", - "wasm-bindgen", + "winapi", +] + +[[package]] +name = "solana-sdk-ids" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c5d8b9cc68d5c88b062a33e23a6466722467dde0035152d8fb1afbcdf350a5f" +dependencies = [ + "solana-pubkey", ] [[package]] name = "solana-sdk-macro" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6102303ef82f601e178970388256cd2841618d0789246c087c164760bd976b2f" +checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" dependencies = [ "bs58", "proc-macro2", @@ -2988,30 +3165,47 @@ dependencies = [ "syn 2.0.98", ] +[[package]] +name = "solana-secp256k1-program" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0a1caa972414cc78122c32bdae65ac5fe89df7db598585a5cde19d16a20280a" +dependencies = [ + "bincode", + "digest 0.10.7", + "libsecp256k1", + "serde", + "serde_derive", + "sha3", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", +] + [[package]] name = "solana-secp256k1-recover" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5658cf3a6792df8bc40da3c6cd8ff2d96ad494f3102a6c70ee41774647b0b0e" +checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" dependencies = [ - "borsh 1.5.5", "libsecp256k1", "solana-define-syscall", - "thiserror 1.0.69", + "thiserror 2.0.12", ] [[package]] name = "solana-secp256r1-program" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f1acf1413825581b79339a3b8427466f0a3b677c85cafe5d0827a3a6f7a6680" +checksum = "c9ea9282950921611bd9e0200da7236fbb1d4f8388942f8451bd55e9f3cb228f" dependencies = [ "bytemuck", "openssl", "solana-feature-set", "solana-instruction", "solana-precompile-error", - "solana-pubkey", + "solana-sdk-ids", ] [[package]] @@ -3020,20 +3214,40 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" +[[package]] +name = "solana-seed-derivable" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3beb82b5adb266c6ea90e5cf3967235644848eac476c5a1f2f9283a143b7c97f" +dependencies = [ + "solana-derivation-path", +] + +[[package]] +name = "solana-seed-phrase" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36187af2324f079f65a675ec22b31c24919cb4ac22c79472e85d819db9bbbc15" +dependencies = [ + "hmac 0.12.1", + "pbkdf2", + "sha2 0.10.8", +] + [[package]] name = "solana-serde-varint" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "591ff7fba3f641998d613f6934bd89222cf45b0393225dc3c4af09b2b8f94d33" +checksum = "bcc07d00200d82e6def2f7f7a45738e3406b17fe54a18adcf0defa16a97ccadb" dependencies = [ "serde", ] [[package]] name = "solana-serialize-utils" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "304f0afa82feddfdab31a97148717bf33a0e1cd67261aa1fce55835eff0a5a90" +checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" dependencies = [ "solana-instruction", "solana-pubkey", @@ -3042,9 +3256,9 @@ dependencies = [ [[package]] name = "solana-sha256-hasher" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0e647536438a92f1b02424d94c703534566aa9b1d8aae87f3b181d2dc5787c" +checksum = "0037386961c0d633421f53560ad7c80675c0447cba4d1bb66d60974dd486c7ea" dependencies = [ "sha2 0.10.8", "solana-define-syscall", @@ -3053,62 +3267,91 @@ dependencies = [ [[package]] name = "solana-short-vec" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cfbe01016ac7c0ac992fae610f46607b7d8cadba5c526f2b8701123bc28e5ce" +checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" dependencies = [ "serde", ] [[package]] name = "solana-signature" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a515db8b6bbce5a603e09cda69e459ec8d5964a8711e40689ae596da0d9907a" +checksum = "47d251c8f3dc015f320b4161daac7f108156c837428e5a8cc61136d25beb11d6" dependencies = [ "bs58", - "ed25519-dalek", - "generic-array", - "rand 0.8.5", - "serde", - "serde_derive", "solana-sanitize", ] +[[package]] +name = "solana-signer" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c41991508a4b02f021c1342ba00bcfa098630b213726ceadc7cb032e051975b" +dependencies = [ + "solana-pubkey", + "solana-signature", + "solana-transaction-error", +] + [[package]] name = "solana-slot-hashes" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327614604f49be7b292e4fefeca60da6b16720ef2edf35458b1923f0a34b0e2e" +checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" dependencies = [ "serde", "serde_derive", "solana-hash", + "solana-sdk-ids", "solana-sysvar-id", ] [[package]] name = "solana-slot-history" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd9d02ec3cdf702027aaee2faac215aa0d8825f6b399b205236f349bd6c8e79" +checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" dependencies = [ "bv", "serde", "serde_derive", + "solana-sdk-ids", "solana-sysvar-id", ] [[package]] name = "solana-stable-layout" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee6374e06b1373c4d526e87f02a5ee165093d341c0c5ab548fc79f6ff18e331" +checksum = "9f14f7d02af8f2bc1b5efeeae71bc1c2b7f0f65cd75bcc7d8180f2c762a57f54" dependencies = [ "solana-instruction", "solana-pubkey", ] +[[package]] +name = "solana-stake-interface" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5269e89fde216b4d7e1d1739cf5303f8398a1ff372a81232abbee80e554a838c" +dependencies = [ + "borsh 0.10.4", + "borsh 1.5.5", + "num-traits", + "serde", + "serde_derive", + "solana-clock", + "solana-cpi", + "solana-decode-error", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-system-interface", + "solana-sysvar-id", +] + [[package]] name = "solana-system-interface" version = "1.0.0" @@ -3127,81 +3370,158 @@ dependencies = [ [[package]] name = "solana-system-program" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61aa6965c2a143def2878fc576713fc39e4bce67461d3616eb46b5d1e56079de" +checksum = "43c8f684977e4439031b3a27b954ab05a6bdf697d581692aaf8888cf92b73b9e" dependencies = [ "bincode", "log", "serde", "serde_derive", + "solana-account", + "solana-bincode", + "solana-instruction", "solana-log-collector", + "solana-nonce", + "solana-nonce-account", + "solana-packet", "solana-program-runtime", - "solana-sdk", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", + "solana-sysvar", + "solana-transaction-context", "solana-type-overrides", ] +[[package]] +name = "solana-sysvar" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf6b44740d7f0c9f375d045c165bc0aab4a90658f92d6835aeb0649afaeaff9a" +dependencies = [ + "base64 0.22.1", + "bincode", + "bytemuck", + "bytemuck_derive", + "lazy_static", + "serde", + "serde_derive", + "solana-account-info", + "solana-clock", + "solana-define-syscall", + "solana-epoch-rewards", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-instruction", + "solana-instructions-sysvar", + "solana-last-restart-slot", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-pubkey", + "solana-rent", + "solana-sanitize", + "solana-sdk-ids", + "solana-sdk-macro", + "solana-slot-hashes", + "solana-slot-history", + "solana-stake-interface", + "solana-sysvar-id", +] + [[package]] name = "solana-sysvar-id" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11cdbc013ed4f65a636762b9a62cb878dd530062804e6a6be0faa76f5902914" +checksum = "5762b273d3325b047cfda250787f8d796d781746860d5d0a746ee29f3e8812c1" dependencies = [ "solana-pubkey", + "solana-sdk-ids", ] +[[package]] +name = "solana-time-utils" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af261afb0e8c39252a04d026e3ea9c405342b08c871a2ad8aa5448e068c784c" + [[package]] name = "solana-timings" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629d606363f36eed6c79a1a96083050380733e5785ba05e52321ff593e806efe" +checksum = "49d9eabdce318cb07c60a23f1cc367b43e177c79225b5c2a081869ad182172ad" dependencies = [ "eager", "enum-iterator", - "solana-sdk", + "solana-pubkey", ] [[package]] -name = "solana-transaction-error" -version = "2.1.13" +name = "solana-transaction-context" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589ed4a290547a8ad581f4ede34cb9c164953203aa23b415c761cfb8b06cac89" +checksum = "5022de04cbba05377f68bf848c8c1322ead733f88a657bf792bb40f3257b8218" dependencies = [ + "bincode", "serde", "serde_derive", + "solana-account", + "solana-instruction", + "solana-pubkey", + "solana-rent", +] + +[[package]] +name = "solana-transaction-error" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" +dependencies = [ "solana-instruction", "solana-sanitize", ] [[package]] name = "solana-type-overrides" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ac99386eaec9b90c55a22dee445d88b04398e31023bd1749dd58dff150385e" +checksum = "d39dc2e501edfea7ce1cec2fe2a2428aedfea1cc9c31747931e0d90d5c57b020" dependencies = [ "lazy_static", "rand 0.8.5", ] [[package]] -name = "solana-vote" -version = "2.1.13" +name = "solana-vote-interface" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7917e3041555c37ba15028415ec424ff7833acc4f62941ce077ad5c6661198" +checksum = "c1e9f6a1651310a94cd5a1a6b7f33ade01d9e5ea38a2220becb5fd737b756514" dependencies = [ - "itertools 0.12.1", - "log", + "bincode", + "num-derive", + "num-traits", "serde", "serde_derive", - "solana-sdk", - "thiserror 1.0.69", + "solana-clock", + "solana-decode-error", + "solana-hash", + "solana-instruction", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-serde-varint", + "solana-serialize-utils", + "solana-short-vec", + "solana-system-interface", ] [[package]] name = "solana-zk-sdk" -version = "2.1.13" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07c66d2589fb44e2050be900519070a15dbe8e7793977f586952fe9d1248ae6" +checksum = "d8318220b73552a2765c6545a4be04fc87fe21b6dd0cb8c2b545a66121bf5b8a" dependencies = [ "aes-gcm-siv", "base64 0.22.1", @@ -3221,32 +3541,19 @@ dependencies = [ "serde_json", "sha3", "solana-derivation-path", - "solana-program", - "solana-sdk", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-signature", + "solana-signer", "subtle", - "thiserror 1.0.69", + "thiserror 2.0.12", "wasm-bindgen", "zeroize", ] -[[package]] -name = "solana_rbpf" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c1941b5ef0c3ce8f2ac5dd984d0fb1a97423c4ff2a02eec81e3913f02e2ac2b" -dependencies = [ - "byteorder", - "combine", - "hash32", - "libc", - "log", - "rand 0.8.5", - "rustc-demangle", - "scroll", - "thiserror 1.0.69", - "winapi", -] - [[package]] name = "spin" version = "0.9.8" @@ -3515,16 +3822,18 @@ dependencies = [ "solana-account", "solana-account-info", "solana-cpi", + "solana-decode-error", "solana-instruction", "solana-msg", - "solana-program", "solana-program-entrypoint", "solana-program-error", "solana-program-option", "solana-program-pack", "solana-pubkey", "solana-rent", + "solana-sdk-ids", "solana-system-interface", + "solana-sysvar", "spl-pod", "spl-token", "spl-token-2022", @@ -3580,12 +3889,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - [[package]] name = "subtle" version = "2.6.1" diff --git a/program/Cargo.toml b/program/Cargo.toml index dbdf8683..d948a41c 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -15,29 +15,29 @@ test-sbf = [] bytemuck = { version = "1.22.0", features = ["derive"] } num-derive = "0.4.2" num-traits = "0.2.19" -solana-account-info = "2.1.13" -solana-cpi = "2.1.13" -solana-instruction = "2.1.13" -solana-msg = "2.1.13" -solana-program-entrypoint = "2.1.13" -solana-program-error = "2.1.13" -solana-program-option = "2.1.13" -solana-program-pack = "2.1.13" -solana-pubkey = "2.1.13" -solana-rent = "2.1.13" +solana-account-info = "2.2.1" +solana-decode-error = "2.2.1" +solana-cpi = "2.2.1" +solana-instruction = "2.2.1" +solana-msg = "2.2.1" +solana-program-entrypoint = "2.2.1" +solana-program-error = "2.2.1" +solana-program-option = "2.2.1" +solana-program-pack = "2.2.1" +solana-pubkey = "2.2.1" +solana-rent = "2.2.1" solana-system-interface = { version = "1.0.0", features = ["bincode"] } +solana-sysvar = "2.2.1" spl-pod = "0.5.0" spl-token = { version = "7.0.0", features = ["no-entrypoint"] } spl-token-2022 = { version = "7.0.0", features = ["no-entrypoint"] } thiserror = "2.0.12" -# Only needed until solana-sysvar is bumped to 2.1 -solana-program = "2.1.13" - [dev-dependencies] -mollusk-svm = "0.0.15" -mollusk-svm-programs-token = "0.0.15" -solana-account = "2.1.13" +mollusk-svm = "0.1.1" +mollusk-svm-programs-token = "0.1.1" +solana-account = "2.2.1" +solana-sdk-ids = "2.2.1" [lib] crate-type = ["cdylib", "lib"] diff --git a/program/src/error.rs b/program/src/error.rs index 2b3d0286..bfecdc51 100644 --- a/program/src/error.rs +++ b/program/src/error.rs @@ -2,11 +2,9 @@ use { num_derive::FromPrimitive, - solana_program::{ - decode_error::DecodeError, - msg, - program_error::{PrintProgramError, ProgramError}, - }, + solana_decode_error::DecodeError, + solana_msg::msg, + solana_program_error::{PrintProgramError, ProgramError}, std::error::Error, thiserror::Error, }; diff --git a/program/src/processor.rs b/program/src/processor.rs index c51108b0..4afe22ab 100644 --- a/program/src/processor.rs +++ b/program/src/processor.rs @@ -11,12 +11,12 @@ use { solana_account_info::{next_account_info, AccountInfo}, solana_cpi::{invoke, invoke_signed}, solana_msg::msg, - solana_program::sysvar::Sysvar, solana_program_error::{ProgramError, ProgramResult}, solana_program_pack::Pack, solana_pubkey::Pubkey, solana_rent::Rent, solana_system_interface::instruction::{allocate, assign}, + solana_sysvar::Sysvar, spl_token_2022::{ extension::PodStateWithExtensions, instruction::initialize_mint2, diff --git a/program/tests/helpers/create_mint_builder.rs b/program/tests/helpers/create_mint_builder.rs index ccedd7be..4de59d85 100644 --- a/program/tests/helpers/create_mint_builder.rs +++ b/program/tests/helpers/create_mint_builder.rs @@ -2,8 +2,8 @@ use { crate::helpers::common::{init_mollusk, setup_mint}, mollusk_svm::{result::Check, Mollusk}, solana_account::Account, - solana_program::system_program, solana_pubkey::Pubkey, + solana_sdk_ids::system_program, spl_token_wrap::{ get_wrapped_mint_address, get_wrapped_mint_backpointer_address, instruction::create_mint, },