diff --git a/.changeset/gold-monkeys-breathe.md b/.changeset/gold-monkeys-breathe.md new file mode 100644 index 000000000..f14c200db --- /dev/null +++ b/.changeset/gold-monkeys-breathe.md @@ -0,0 +1,5 @@ +--- +"@codama/renderers-rust": minor +--- + +renderers-rust: extract pubkey from solana-program diff --git a/packages/renderers-rust/e2e/anchor/Cargo.lock b/packages/renderers-rust/e2e/anchor/Cargo.lock index 35fd94fcb..2e5d081b3 100644 --- a/packages/renderers-rust/e2e/anchor/Cargo.lock +++ b/packages/renderers-rust/e2e/anchor/Cargo.lock @@ -245,7 +245,7 @@ dependencies = [ "bytemuck", "getrandom 0.2.15", "solana-program 1.18.26", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -289,7 +289,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "syn 1.0.109", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -345,7 +345,7 @@ dependencies = [ "ark-std", "derivative", "hashbrown 0.13.2", - "itertools 0.10.5", + "itertools", "num-traits", "zeroize", ] @@ -362,7 +362,7 @@ dependencies = [ "ark-std", "derivative", "digest 0.10.7", - "itertools 0.10.5", + "itertools", "num-bigint 0.4.6", "num-traits", "paste", @@ -469,7 +469,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -626,9 +626,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" dependencies = [ "serde", ] @@ -703,11 +703,11 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.3" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03" +checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" dependencies = [ - "borsh-derive 1.5.3", + "borsh-derive 1.5.7", "cfg_aliases", ] @@ -739,9 +739,9 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.3" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244" +checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" dependencies = [ "once_cell", "proc-macro-crate 3.2.0", @@ -885,7 +885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" dependencies = [ "libc", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1007,12 +1007,13 @@ dependencies = [ "num-derive 0.3.3", "num-traits", "serde", - "serde_with 3.11.0", + "serde_with 3.12.0", "solana-client", - "solana-program 2.1.7", + "solana-program 2.2.1", + "solana-pubkey", "solana-sdk 1.18.26", - "solana-sdk 2.1.7", - "thiserror", + "solana-sdk 2.2.2", + "thiserror 1.0.69", ] [[package]] @@ -2182,15 +2183,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.14" @@ -2208,9 +2200,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -2257,9 +2249,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.169" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libsecp256k1" @@ -2318,7 +2310,7 @@ dependencies = [ "ark-bn254", "ark-ff", "num-bigint 0.4.6", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2345,9 +2337,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "memchr" @@ -2657,7 +2649,7 @@ version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "cfg-if", "foreign-types", "libc", @@ -2870,9 +2862,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" dependencies = [ "unicode-ident", ] @@ -2909,7 +2901,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -2927,7 +2919,7 @@ dependencies = [ "rustls", "rustls-native-certs", "slab", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tracing", ] @@ -3072,7 +3064,7 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", ] [[package]] @@ -3234,7 +3226,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "errno", "libc", "linux-raw-sys", @@ -3347,7 +3339,7 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.9.0", "core-foundation", "core-foundation-sys", "libc", @@ -3372,13 +3364,22 @@ checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba" [[package]] name = "serde" -version = "1.0.216" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] +[[package]] +name = "serde-big-array" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" +dependencies = [ + "serde", +] + [[package]] name = "serde_bytes" version = "0.11.15" @@ -3390,9 +3391,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.216" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -3401,9 +3402,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -3444,9 +3445,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.11.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" +checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" dependencies = [ "base64 0.22.1", "chrono", @@ -3456,7 +3457,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "serde_with_macros 3.11.0", + "serde_with_macros 3.12.0", "time", ] @@ -3474,9 +3475,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.11.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" +checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" dependencies = [ "darling", "proc-macro2", @@ -3553,6 +3554,16 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -3611,16 +3622,20 @@ dependencies = [ [[package]] name = "solana-account" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d6ef82dab153c60b1da169126d8eca1b62bbf4026f95a45a71897f3e9a0224" +checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" dependencies = [ "bincode", "serde", "serde_bytes", "serde_derive", + "solana-account-info", + "solana-clock", "solana-instruction", - "solana-program 2.1.7", + "solana-pubkey", + "solana-sdk-ids", + "solana-sysvar", ] [[package]] @@ -3644,15 +3659,15 @@ dependencies = [ "spl-token-2022", "spl-token-group-interface", "spl-token-metadata-interface", - "thiserror", + "thiserror 1.0.69", "zstd", ] [[package]] name = "solana-account-info" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8378a48833ee7f828e20a63e93a6cdaef1313a8fd8f71a90b243df83295987b1" +checksum = "e0c17d606a298a205fae325489fbed88ee6dc4463c111672172327e741c8905d" dependencies = [ "bincode", "serde", @@ -3661,49 +3676,89 @@ 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.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6f9da603778bbee6402ee2526a3b219b85497c10e49f9c7c112ed8836f46d3" +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.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb75b5d25ae05cfddb8b9b53512f17c18c29e3c92b7a848f39598473e6bf6484" +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.7" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df7c5b61b4ed3961cbaef5f38c58d1ee9a2268cbe607c67a54083b7b02d6276" +checksum = "4420f125118732833f36facf96a27e7b78314b2d642ba07fa9ffdacd8d79e243" dependencies = [ "ark-bn254", "ark-ec", "ark-ff", "ark-serialize", "bytemuck", - "solana-program 2.1.7", - "thiserror", + "solana-define-syscall", + "thiserror 2.0.12", ] [[package]] name = "solana-borsh" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055c45b7aae61c8c7b26a537f7a8387cc8a10036081ddfd7170a7a9b4d924ffd" +checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" dependencies = [ "borsh 0.10.4", - "borsh 1.5.3", + "borsh 1.5.7", ] [[package]] @@ -3717,7 +3772,7 @@ dependencies = [ "rpassword", "solana-remote-wallet", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", "tiny-bip39", "uriparse", "url", @@ -3752,22 +3807,78 @@ dependencies = [ "solana-thin-client", "solana-tpu-client", "solana-udp-client", - "thiserror", + "thiserror 1.0.69", "tokio", ] +[[package]] +name = "solana-client-traits" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83f0071874e629f29e0eb3dab8a863e98502ac7aba55b7e0df1803fc5cac72a7" +dependencies = [ + "solana-account", + "solana-commitment-config", + "solana-epoch-info", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", +] + [[package]] name = "solana-clock" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d6af32497acc6bb09d8150ea6f53df25dbad713991741999d46688beaf944e" +checksum = "67c2177a1b9fe8326004f1151a5acd124420b737811080b1035df31349e4d892" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "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 = [ + "serde", + "serde_derive", + "solana-hash", +] + +[[package]] +name = "solana-commitment-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac49c4dde3edfa832de1697e9bcdb7c3b3f7cb7a1981b7c62526c8bb6700fb73" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-compute-budget-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a5df17b195d312b66dccdde9beec6709766d8230cb4718c4c08854f780d0309" +dependencies = [ + "borsh 1.5.7", + "serde", + "serde_derive", + "solana-instruction", + "solana-sdk-ids", +] + [[package]] name = "solana-config-program" version = "1.18.26" @@ -3800,15 +3911,15 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", "tokio", ] [[package]] name = "solana-cpi" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b06ac8e2ebf8a5b8a54645b721f92f5d7a6d116550bbf1817167cc48abeb1" +checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" dependencies = [ "solana-account-info", "solana-define-syscall", @@ -3820,50 +3931,141 @@ dependencies = [ [[package]] name = "solana-decode-error" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99f2fe3170045ae27951ae476a0c88a40130b242736f033ba5e353cd6f816b8e" +checksum = "10a6a6383af236708048f8bd8d03db8ca4ff7baf4a48e5d580f4cce545925470" dependencies = [ "num-traits", ] [[package]] name = "solana-define-syscall" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a80d323dbe8866aaefb40e3c11564d82f77894d193fa66583e793f3d845723" +checksum = "cf784bb2cb3e02cac9801813c30187344228d2ae952534902108f6150573a33d" [[package]] name = "solana-derivation-path" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff423e05929ec73c0997aa0d4aeae7a7bb52ccabc23699ceaa1f2ae854a5fa4" +checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" dependencies = [ "derivation-path", "qstring", "uriparse", ] +[[package]] +name = "solana-ed25519-program" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0fc717048fdbe5d2ee7d673d73e6a30a094002f4a29ca7630ac01b6bddec04" +dependencies = [ + "bytemuck", + "bytemuck_derive", + "ed25519-dalek", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", +] + +[[package]] +name = "solana-epoch-info" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ef6f0b449290b0b9f32973eefd95af35b01c5c0c34c569f936c34c5b20d77b" +dependencies = [ + "serde", + "serde_derive", +] + +[[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 2.2.1", + "solana-sysvar-id", +] + +[[package]] +name = "solana-epoch-rewards-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c5fd2662ae7574810904585fd443545ed2b568dbd304b25a31e79ccc76e81b" +dependencies = [ + "siphasher", + "solana-hash", + "solana-pubkey", +] + [[package]] name = "solana-epoch-schedule" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276fda33b7de27df41e3043f344e517d5e85ab345d2f2aa2425d1011bac570c4" +checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "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.7" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155ef7ddcf7b75ef92d992839bd00ac4ee02bdfe0fa4d95daf0534b830b1bc0e" +checksum = "92f6c09cc41059c0e03ccbee7f5d4cc0a315d68ef0d59b67eb90246adfd8cc35" dependencies = [ + "ahash 0.8.11", "lazy_static", - "solana-clock", "solana-epoch-schedule", "solana-hash", "solana-pubkey", @@ -3872,15 +4074,27 @@ dependencies = [ [[package]] name = "solana-fee-calculator" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc0371153eda80024109800051b87bab11f056fae260ca477a50875aaffdfde" +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 = [ + "serde", + "serde_derive", + "solana-message", + "solana-native-token", +] + [[package]] name = "solana-frozen-abi" version = "1.18.26" @@ -3903,7 +4117,7 @@ dependencies = [ "sha2 0.10.8", "solana-frozen-abi-macro", "subtle", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3918,13 +4132,54 @@ dependencies = [ "syn 2.0.91", ] +[[package]] +name = "solana-genesis-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968dabd2b92d57131473eddbd475339da530e14f54397386abf303de3a2595a2" +dependencies = [ + "bincode", + "chrono", + "memmap2", + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-cluster-type", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-inflation", + "solana-keypair", + "solana-logger 2.3.1", + "solana-native-token", + "solana-poh-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-sha256-hasher", + "solana-shred-version", + "solana-signer", + "solana-time-utils", +] + +[[package]] +name = "solana-hard-forks" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c28371f878e2ead55611d8ba1b5fb879847156d04edea13693700ad1a28baf" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "solana-hash" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7067f2bd1e9c3f28153484f03e44bf8dc73cededa6bc132e40de9bfc667b8534" +checksum = "cf7bcb14392900fe02e4e34e90234fbf0c673d4e327888410ba99fa2ba0f4e99" dependencies = [ - "borsh 1.5.3", + "borsh 1.5.7", "bs58 0.5.1", "bytemuck", "bytemuck_derive", @@ -3938,9 +4193,9 @@ dependencies = [ [[package]] name = "solana-inflation" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e27906f90ba8df331903292a499cc776e70ee29995da4bf5a81b54d27edefa" +checksum = "23eef6a09eb8e568ce6839573e4966850e85e9ce71e6ae1a6c930c1c43947de3" dependencies = [ "serde", "serde_derive", @@ -3948,12 +4203,12 @@ dependencies = [ [[package]] name = "solana-instruction" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dbf607aff88e4f17079a33d34517b7f379d752dfa0496a94cea798a91e6f6ee" +checksum = "9ce496a475e5062ba5de97215ab39d9c358f9c9df4bb7f3a45a1f1a8bd9065ed" dependencies = [ "bincode", - "borsh 1.5.3", + "borsh 1.5.7", "getrandom 0.2.15", "js-sys", "num-traits", @@ -3965,75 +4220,204 @@ dependencies = [ ] [[package]] -name = "solana-last-restart-slot" -version = "2.1.7" +name = "solana-instructions-sysvar" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f2ee9af7a2815137c60d77cb930c26480bc802b55e00d9e230e81fd308062e" +checksum = "427f2d0d6dc0bb49f16cef5e7f975180d2e80aab9bdd3b2af68e2d029ec63f43" dependencies = [ - "serde", - "serde_derive", - "solana-sdk-macro 2.1.7", + "bitflags 2.9.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-logger" -version = "1.18.26" +name = "solana-keccak-hasher" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121d36ffb3c6b958763312cbc697fbccba46ee837d3a0aa4fc0e90fcb3b884f3" +checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" dependencies = [ - "env_logger", - "lazy_static", - "log", + "sha3 0.10.8", + "solana-define-syscall", + "solana-hash", + "solana-sanitize", ] [[package]] -name = "solana-measure" -version = "1.18.26" +name = "solana-keypair" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c01a7f9cdc9d9d37a3d5651b2fe7ec9d433c2a3470b9f35897e373b421f0737" +checksum = "3dbb7042c2e0c561afa07242b2099d55c57bd1b1da3b6476932197d84e15e3e4" dependencies = [ - "log", - "solana-sdk 1.18.26", + "bs58 0.5.1", + "ed25519-dalek", + "ed25519-dalek-bip32", + "rand 0.7.3", + "solana-derivation-path", + "solana-pubkey", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-signature", + "solana-signer", + "wasm-bindgen", ] [[package]] -name = "solana-metrics" -version = "1.18.26" +name = "solana-last-restart-slot" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e36052aff6be1536bdf6f737c6e69aca9dbb6a2f3f582e14ecb0ddc0cd66ce" +checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" dependencies = [ - "crossbeam-channel", - "gethostname", - "lazy_static", - "log", - "reqwest", - "solana-sdk 1.18.26", - "thiserror", + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", + "solana-sysvar-id", ] [[package]] -name = "solana-msg" -version = "2.1.7" +name = "solana-loader-v2-interface" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cd9c6ed9d4d036da00c958f0f98edb248c08eb596975011a30063ac3aa902" +checksum = "d8ab08006dad78ae7cd30df8eea0539e207d08d91eaefb3e1d49a446e1c49654" dependencies = [ - "solana-define-syscall", + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", ] [[package]] -name = "solana-native-token" -version = "2.1.7" +name = "solana-loader-v3-interface" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ef55ad8dcc8c5f21e2bbbc7298fa59550269e8bdf2c6976c4de626ea8a0069" +checksum = "fa4be76cfa9afd84ca2f35ebc09f0da0f0092935ccdac0595d98447f259538c2" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", +] [[package]] -name = "solana-net-utils" -version = "1.18.26" +name = "solana-loader-v4-interface" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1f5c6be9c5b272866673741e1ebc64b2ea2118e5c6301babbce526fdfb15f4" +checksum = "706a777242f1f39a83e2a96a2a6cb034cb41169c6ecbee2cf09cb873d9659e7e" dependencies = [ - "bincode", + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-logger" +version = "1.18.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121d36ffb3c6b958763312cbc697fbccba46ee837d3a0aa4fc0e90fcb3b884f3" +dependencies = [ + "env_logger", + "lazy_static", + "log", +] + +[[package]] +name = "solana-logger" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8e777ec1afd733939b532a42492d888ec7c88d8b4127a5d867eb45c6eb5cd5" +dependencies = [ + "env_logger", + "lazy_static", + "libc", + "log", + "signal-hook", +] + +[[package]] +name = "solana-measure" +version = "1.18.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c01a7f9cdc9d9d37a3d5651b2fe7ec9d433c2a3470b9f35897e373b421f0737" +dependencies = [ + "log", + "solana-sdk 1.18.26", +] + +[[package]] +name = "solana-message" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6bf99c4570173710107a1f233f3bee226feea5fc817308707d4f7cb100a72d" +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 = "1.18.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e36052aff6be1536bdf6f737c6e69aca9dbb6a2f3f582e14ecb0ddc0cd66ce" +dependencies = [ + "crossbeam-channel", + "gethostname", + "lazy_static", + "log", + "reqwest", + "solana-sdk 1.18.26", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-msg" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" +dependencies = [ + "solana-define-syscall", +] + +[[package]] +name = "solana-native-token" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e9de00960197412e4be3902a6cd35e60817c511137aca6c34c66cd5d4017ec" + +[[package]] +name = "solana-net-utils" +version = "1.18.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1f5c6be9c5b272866673741e1ebc64b2ea2118e5c6301babbce526fdfb15f4" +dependencies = [ + "bincode", "clap 3.2.25", "crossbeam-channel", "log", @@ -4042,25 +4426,67 @@ dependencies = [ "serde", "serde_derive", "socket2", - "solana-logger", + "solana-logger 1.18.26", "solana-sdk 1.18.26", "solana-version", "tokio", "url", ] +[[package]] +name = "solana-nonce" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" +dependencies = [ + "serde", + "serde_derive", + "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-offchain-message" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b526398ade5dea37f1f147ce55dae49aa017a5d7326606359b0445ca8d946581" +dependencies = [ + "num_enum 0.7.3", + "solana-hash", + "solana-packet", + "solana-pubkey", + "solana-sanitize", + "solana-sha256-hasher", + "solana-signature", + "solana-signer", +] + [[package]] name = "solana-packet" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfac9266a6cb79d0d37a7ae1a9944559caa286d93005773bf8005583ffcd652c" +checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127" dependencies = [ "bincode", - "bitflags 2.6.0", + "bitflags 2.9.0", "cfg_eval", "serde", "serde_derive", - "serde_with 3.11.0", + "serde_with 3.12.0", ] [[package]] @@ -4092,16 +4518,54 @@ dependencies = [ "solana-vote-program", ] +[[package]] +name = "solana-poh-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d650c3b4b9060082ac6b0efbbb66865089c58405bfb45de449f3f2b91eccee75" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "solana-precompile-error" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a85f003d72bcc94cd394dcbef150bb18ccd03bd5fee6b6e8927bb0fbbe26d" +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-presigner" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81a57a24e6a4125fc69510b6774cd93402b943191b6cddad05de7281491c90fe" +dependencies = [ + "solana-pubkey", + "solana-signature", + "solana-signer", +] + [[package]] name = "solana-program" version = "1.18.26" @@ -4114,11 +4578,11 @@ dependencies = [ "ark-serialize", "base64 0.21.7", "bincode", - "bitflags 2.6.0", + "bitflags 2.9.0", "blake3", "borsh 0.10.4", "borsh 0.9.3", - "borsh 1.5.3", + "borsh 1.5.7", "bs58 0.4.0", "bv", "bytemuck", @@ -4127,7 +4591,7 @@ dependencies = [ "console_log", "curve25519-dalek 3.2.1", "getrandom 0.2.15", - "itertools 0.10.5", + "itertools", "js-sys", "lazy_static", "libc", @@ -4151,7 +4615,7 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-sdk-macro 1.18.26", - "thiserror", + "thiserror 1.0.69", "tiny-bip39", "wasm-bindgen", "zeroize", @@ -4159,54 +4623,57 @@ dependencies = [ [[package]] name = "solana-program" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c693c5c392bacc44e7a86baa18069eb966d88afbc9040219ca000e873fb02e" +checksum = "586469467e93ceb79048f8d8e3a619bf61d05396ee7de95cb40280301a589d05" dependencies = [ - "base64 0.22.1", "bincode", - "bitflags 2.6.0", "blake3", "borsh 0.10.4", - "borsh 1.5.3", + "borsh 1.5.7", "bs58 0.5.1", - "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 0.9.1", "num-bigint 0.4.6", "num-derive 0.4.2", "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-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", @@ -4215,7 +4682,8 @@ dependencies = [ "solana-pubkey", "solana-rent", "solana-sanitize", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "solana-secp256k1-recover", "solana-serde-varint", "solana-serialize-utils", @@ -4224,17 +4692,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", + "solana-vote-interface", + "thiserror 2.0.12", "wasm-bindgen", ] [[package]] name = "solana-program-entrypoint" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0696f51a4386f92f4e1807059bd2b649c207688b9249df332d0fd5ecac240c" +checksum = "473ffe73c68d93e9f2aa726ad2985fe52760052709aaab188100a42c618060ec" dependencies = [ "solana-account-info", "solana-msg", @@ -4244,11 +4715,11 @@ dependencies = [ [[package]] name = "solana-program-error" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd557d10df4380234f5b4a5971a0cae29eedcc42ebe4bbe926a21ff31912e99" +checksum = "d8ae2c1a8d0d4ae865882d5770a7ebca92bab9c685e43f0461682c6c05a35bfa" dependencies = [ - "borsh 1.5.3", + "borsh 1.5.7", "num-traits", "serde", "serde_derive", @@ -4260,9 +4731,9 @@ dependencies = [ [[package]] name = "solana-program-memory" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef71296a3fa6ebaa38ae522bea71af82b7deeea170e459efa3c539b8f14e0155" +checksum = "1b0268f6c89825fb634a34bd0c3b8fdaeaecfc3728be1d622a8ee6dd577b60d4" dependencies = [ "num-traits", "solana-define-syscall", @@ -4270,15 +4741,15 @@ dependencies = [ [[package]] name = "solana-program-option" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "506908720b9b1660f2087d9c6f45ba208fa67a0f34658804517324ef65fd432b" +checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" [[package]] name = "solana-program-pack" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21820c32999ce24532fb12d6188daeffa27eb88a366505a4a0553857729aae52" +checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" dependencies = [ "solana-program-error", ] @@ -4293,7 +4764,7 @@ dependencies = [ "bincode", "eager", "enum-iterator", - "itertools 0.10.5", + "itertools", "libc", "log", "num-derive 0.4.2", @@ -4308,17 +4779,17 @@ dependencies = [ "solana-metrics", "solana-sdk 1.18.26", "solana_rbpf", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "solana-pubkey" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c46701a845b731f2ffcf002c4bb08968434b9cf5e576cdd705259421074d1764" +checksum = "40db1ff5a0f8aea2c158d78ab5f2cf897848964251d1df42fef78efd3c85b863" dependencies = [ "borsh 0.10.4", - "borsh 1.5.3", + "borsh 1.5.7", "bs58 0.5.1", "bytemuck", "bytemuck_derive", @@ -4355,7 +4826,7 @@ dependencies = [ "solana-account-decoder", "solana-rpc-client-api", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-tungstenite", @@ -4372,7 +4843,7 @@ dependencies = [ "async-mutex", "async-trait", "futures", - "itertools 0.10.5", + "itertools", "lazy_static", "log", "quinn", @@ -4386,10 +4857,19 @@ dependencies = [ "solana-rpc-client-api", "solana-sdk 1.18.26", "solana-streamer", - "thiserror", + "thiserror 1.0.69", "tokio", ] +[[package]] +name = "solana-quic-definitions" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e606feac5110eb5d8afaa43ccaeea3ec49ccec36773387930b5ba545e745aea2" +dependencies = [ + "solana-keypair", +] + [[package]] name = "solana-rayon-threadlimit" version = "1.18.26" @@ -4415,22 +4895,72 @@ dependencies = [ "qstring", "semver", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", "uriparse", ] [[package]] name = "solana-rent" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a4d15fe63d0e9a9551adfecfec495e3d50ba0bc4705001010c724fe84f65d8" +checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "solana-sysvar-id", ] +[[package]] +name = "solana-rent-collector" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c1e19f5d5108b0d824244425e43bc78bbb9476e2199e979b0230c9f632d3bf4" +dependencies = [ + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-epoch-schedule", + "solana-genesis-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", +] + +[[package]] +name = "solana-rent-debits" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f6f9113c6003492e74438d1288e30cffa8ccfdc2ef7b49b9e816d8034da18cd" +dependencies = [ + "solana-pubkey", + "solana-reward-info", +] + +[[package]] +name = "solana-reserved-account-keys" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b293f4246626c0e0a991531f08848a713ada965612e99dc510963f04d12cae7" +dependencies = [ + "lazy_static", + "solana-feature-set", + "solana-pubkey", + "solana-sdk-ids", +] + +[[package]] +name = "solana-reward-info" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18205b69139b1ae0ab8f6e11cdcb627328c0814422ad2482000fa2ca54ae4a2f" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "solana-rpc-client" version = "1.18.26" @@ -4476,7 +5006,7 @@ dependencies = [ "solana-transaction-status", "solana-version", "spl-token-2022", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4489,14 +5019,14 @@ dependencies = [ "solana-clap-utils", "solana-rpc-client", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "solana-sanitize" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b8c536460c84ec7cbcce45d8a68ab1c12c99933cfeb0cb332567e67a27eea2f" +checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" [[package]] name = "solana-sdk" @@ -4507,8 +5037,8 @@ dependencies = [ "assert_matches", "base64 0.21.7", "bincode", - "bitflags 2.6.0", - "borsh 1.5.3", + "bitflags 2.9.0", + "borsh 1.5.7", "bs58 0.4.0", "bytemuck", "byteorder", @@ -4519,7 +5049,7 @@ dependencies = [ "ed25519-dalek-bip32", "generic-array", "hmac 0.12.1", - "itertools 0.10.5", + "itertools", "js-sys", "lazy_static", "libsecp256k1", @@ -4545,78 +5075,94 @@ dependencies = [ "siphasher", "solana-frozen-abi", "solana-frozen-abi-macro", - "solana-logger", + "solana-logger 1.18.26", "solana-program 1.18.26", "solana-sdk-macro 1.18.26", - "thiserror", + "thiserror 1.0.69", "uriparse", "wasm-bindgen", ] [[package]] name = "solana-sdk" -version = "2.1.7" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf67076763533f4b43210ad2b966672b8d8b1c837f69987bb780e6c4e6d549" +checksum = "e8af90d2ce445440e0548fa4a5f96fe8b265c22041a68c942012ffadd029667d" dependencies = [ "bincode", - "bitflags 2.6.0", - "borsh 1.5.3", "bs58 0.5.1", - "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", - "log", - "memmap2", - "num-derive 0.4.2", - "num-traits", - "num_enum 0.7.3", - "pbkdf2 0.11.0", - "rand 0.7.3", - "rand 0.8.5", "serde", - "serde_bytes", - "serde_derive", "serde_json", - "serde_with 3.11.0", - "sha2 0.10.8", - "sha3 0.10.8", - "siphasher", "solana-account", "solana-bn254", + "solana-client-traits", + "solana-cluster-type", + "solana-commitment-config", + "solana-compute-budget-interface", "solana-decode-error", "solana-derivation-path", + "solana-ed25519-program", + "solana-epoch-info", + "solana-epoch-rewards-hasher", "solana-feature-set", + "solana-fee-structure", + "solana-genesis-config", + "solana-hard-forks", "solana-inflation", "solana-instruction", + "solana-keypair", + "solana-message", "solana-native-token", + "solana-nonce-account", + "solana-offchain-message", "solana-packet", + "solana-poh-config", "solana-precompile-error", - "solana-program 2.1.7", + "solana-precompiles", + "solana-presigner", + "solana-program 2.2.1", "solana-program-memory", "solana-pubkey", + "solana-quic-definitions", + "solana-rent-collector", + "solana-rent-debits", + "solana-reserved-account-keys", + "solana-reward-info", "solana-sanitize", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", + "solana-secp256k1-program", "solana-secp256k1-recover", "solana-secp256r1-program", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-serde", "solana-serde-varint", "solana-short-vec", + "solana-shred-version", "solana-signature", + "solana-signer", + "solana-system-transaction", + "solana-time-utils", + "solana-transaction", + "solana-transaction-context", "solana-transaction-error", - "thiserror", + "solana-validator-exit", + "thiserror 2.0.12", "wasm-bindgen", ] +[[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 = "1.18.26" @@ -4632,9 +5178,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c160cb22c3671fe2e0fd7c3630701cfccae308174d8d31d7fc93386c3cc381" +checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" dependencies = [ "bs58 0.5.1", "proc-macro2", @@ -4642,30 +5188,48 @@ dependencies = [ "syn 2.0.91", ] +[[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 0.10.8", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", +] + [[package]] name = "solana-secp256k1-recover" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ece1b12237c7755a2070ab1d309a236b506041dd1d7927c7053b04cd3203728" +checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" dependencies = [ - "borsh 1.5.3", + "borsh 1.5.7", "libsecp256k1", "solana-define-syscall", - "thiserror", + "thiserror 2.0.12", ] [[package]] name = "solana-secp256r1-program" -version = "2.1.7" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298640939d73b9229445f611d5db91bb53edf860f211911e9abc3b666799b12e" +checksum = "5cda2aa1bbaceda14763c4f142a00b486f2f262cfd901bd0410649ad0404d5f7" dependencies = [ "bytemuck", "openssl", "solana-feature-set", "solana-instruction", "solana-precompile-error", - "solana-pubkey", + "solana-sdk-ids", ] [[package]] @@ -4674,20 +5238,49 @@ 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 0.11.0", + "sha2 0.10.8", +] + +[[package]] +name = "solana-serde" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1931484a408af466e14171556a47adaa215953c7f48b24e5f6b0282763818b04" +dependencies = [ + "serde", +] + [[package]] name = "solana-serde-varint" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef862fbe970f90d0e024c6dfca71f25210ec9a52c0e62d94249aae10bda8e97" +checksum = "bcc07d00200d82e6def2f7f7a45738e3406b17fe54a18adcf0defa16a97ccadb" dependencies = [ "serde", ] [[package]] name = "solana-serialize-utils" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f1cdaa53aea6fa76dbacd1504e307c4d9665edd50d6d2c5154cd1f88caa1d2" +checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" dependencies = [ "solana-instruction", "solana-pubkey", @@ -4696,9 +5289,9 @@ dependencies = [ [[package]] name = "solana-sha256-hasher" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4806e0ffeeb460968219b6a20176b1dc616089e84de1cd37e50cf7f01e295ad9" +checksum = "0037386961c0d633421f53560ad7c80675c0447cba4d1bb66d60974dd486c7ea" dependencies = [ "sha2 0.10.8", "solana-define-syscall", @@ -4707,62 +5300,107 @@ dependencies = [ [[package]] name = "solana-short-vec" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824dee0886a8504a62a0c06bf95928d43cec0b077992d2b543e0f898775a4931" +checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" dependencies = [ "serde", ] +[[package]] +name = "solana-shred-version" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afd3db0461089d1ad1a78d9ba3f15b563899ca2386351d38428faa5350c60a98" +dependencies = [ + "solana-hard-forks", + "solana-hash", + "solana-sha256-hasher", +] + [[package]] name = "solana-signature" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29cb6cae156bc2c80ae34b2b365cf460be974cf5c68799e7024615f88f54aed4" +checksum = "47d251c8f3dc015f320b4161daac7f108156c837428e5a8cc61136d25beb11d6" dependencies = [ "bs58 0.5.1", "ed25519-dalek", - "generic-array", "rand 0.8.5", "serde", + "serde-big-array", "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.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "409010900f8c357c6cb7bec25014f96e7a0826ca47c915f61f94358b01df9f68" +checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" dependencies = [ "serde", "serde_derive", "solana-hash", + "solana-sdk-ids", "solana-sysvar-id", ] [[package]] name = "solana-slot-history" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82dfd06c84fa3baea6686178b34be9f9485849045ba401c5d0e8eee2eaf485ab" +checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" dependencies = [ "bv", "serde", "serde_derive", + "solana-sdk-ids", "solana-sysvar-id", ] [[package]] name = "solana-stable-layout" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1629426668b0c503ce86e2fad9ed6d9d525efa958365e6b890397af491c545" +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.7", + "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-streamer" version = "1.18.26" @@ -4775,7 +5413,7 @@ dependencies = [ "futures-util", "histogram", "indexmap 2.7.0", - "itertools 0.10.5", + "itertools", "libc", "log", "nix", @@ -4791,18 +5429,87 @@ dependencies = [ "solana-metrics", "solana-perf", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", "tokio", "x509-parser", ] +[[package]] +name = "solana-system-interface" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94d7c18cb1a91c6be5f5a8ac9276a1d7c737e39a21beba9ea710ab4b9c63bc90" +dependencies = [ + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-decode-error", + "solana-instruction", + "solana-pubkey", + "wasm-bindgen", +] + +[[package]] +name = "solana-system-transaction" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd98a25e5bcba8b6be8bcbb7b84b24c2a6a8178d7fb0e3077a916855ceba91a" +dependencies = [ + "solana-hash", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signer", + "solana-system-interface", + "solana-transaction", +] + +[[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 2.2.1", + "solana-slot-hashes", + "solana-slot-history", + "solana-stake-interface", + "solana-sysvar-id", +] + [[package]] name = "solana-sysvar-id" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ec6dbb5d57e773722824069d1b2283e552f0363b1be39aa177b1d77b51ea6e" +checksum = "5762b273d3325b047cfda250787f8d796d781746860d5d0a746ee29f3e8812c1" dependencies = [ "solana-pubkey", + "solana-sdk-ids", ] [[package]] @@ -4820,6 +5527,12 @@ dependencies = [ "solana-sdk 1.18.26", ] +[[package]] +name = "solana-time-utils" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af261afb0e8c39252a04d026e3ea9c405342b08c871a2ad8aa5448e068c784c" + [[package]] name = "solana-tpu-client" version = "1.18.26" @@ -4840,15 +5553,58 @@ dependencies = [ "solana-rpc-client", "solana-rpc-client-api", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", "tokio", ] +[[package]] +name = "solana-transaction" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abec848d081beb15a324c633cd0e0ab33033318063230389895cae503ec9b544" +dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-bincode", + "solana-feature-set", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-precompiles", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction-error", + "wasm-bindgen", +] + +[[package]] +name = "solana-transaction-context" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5022de04cbba05377f68bf848c8c1322ead733f88a657bf792bb40f3257b8218" +dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-account", + "solana-instruction", + "solana-pubkey", + "solana-rent", + "solana-signature", +] + [[package]] name = "solana-transaction-error" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832ead1987e67eb4cd9a742b8e778169966d600955a39efa50b83a6bb3dec6d3" +checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" dependencies = [ "serde", "serde_derive", @@ -4878,7 +5634,7 @@ dependencies = [ "spl-memo", "spl-token", "spl-token-2022", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4892,10 +5648,16 @@ dependencies = [ "solana-net-utils", "solana-sdk 1.18.26", "solana-streamer", - "thiserror", + "thiserror 1.0.69", "tokio", ] +[[package]] +name = "solana-validator-exit" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bbf6d7a3c0b28dd5335c52c0e9eae49d0ae489a8f324917faf0ded65a812c1d" + [[package]] name = "solana-version" version = "1.18.26" @@ -4912,6 +5674,30 @@ dependencies = [ "solana-sdk 1.18.26", ] +[[package]] +name = "solana-vote-interface" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b630547b7f12ee742e1c5069951fedba0fe5cbd4786f6342a779384e2b11f71" +dependencies = [ + "bincode", + "num-derive 0.4.2", + "num-traits", + "serde", + "serde_derive", + "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-vote-program" version = "1.18.26" @@ -4931,7 +5717,7 @@ dependencies = [ "solana-program 1.18.26", "solana-program-runtime", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4947,7 +5733,7 @@ dependencies = [ "byteorder", "curve25519-dalek 3.2.1", "getrandom 0.1.16", - "itertools 0.10.5", + "itertools", "lazy_static", "merlin", "num-derive 0.4.2", @@ -4959,7 +5745,7 @@ dependencies = [ "solana-program 1.18.26", "solana-sdk 1.18.26", "subtle", - "thiserror", + "thiserror 1.0.69", "zeroize", ] @@ -4978,7 +5764,7 @@ dependencies = [ "rand 0.8.5", "rustc-demangle", "scroll", - "thiserror", + "thiserror 1.0.69", "winapi", ] @@ -5017,7 +5803,7 @@ dependencies = [ "solana-program 1.18.26", "spl-token", "spl-token-2022", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5052,7 +5838,7 @@ dependencies = [ "quote", "sha2 0.10.8", "syn 2.0.91", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5087,7 +5873,7 @@ dependencies = [ "num-traits", "solana-program 1.18.26", "spl-program-error-derive", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5128,7 +5914,7 @@ dependencies = [ "num-traits", "num_enum 0.6.1", "solana-program 1.18.26", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5152,7 +5938,7 @@ dependencies = [ "spl-token-metadata-interface", "spl-transfer-hook-interface", "spl-type-length-value", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5357,7 +6143,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl 2.0.12", ] [[package]] @@ -5371,6 +6166,17 @@ dependencies = [ "syn 2.0.91", ] +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.91", +] + [[package]] name = "time" version = "0.3.37" @@ -5415,7 +6221,7 @@ dependencies = [ "rand 0.7.3", "rustc-hash", "sha2 0.9.9", - "thiserror", + "thiserror 1.0.69", "unicode-normalization", "wasm-bindgen", "zeroize", @@ -5637,7 +6443,7 @@ dependencies = [ "rand 0.8.5", "rustls", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", "webpki-roots 0.24.0", @@ -5805,20 +6611,21 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", @@ -5830,9 +6637,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.49" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", @@ -5843,9 +6650,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5853,9 +6660,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -5866,15 +6673,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -6147,7 +6957,7 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] diff --git a/packages/renderers-rust/e2e/anchor/Cargo.toml b/packages/renderers-rust/e2e/anchor/Cargo.toml index e99593734..7a8ff879b 100644 --- a/packages/renderers-rust/e2e/anchor/Cargo.toml +++ b/packages/renderers-rust/e2e/anchor/Cargo.toml @@ -18,7 +18,8 @@ num-derive = "^0.3" num-traits = "^0.2" serde = { version = "^1.0", features = ["derive"], optional = true } serde_with = { version = "^3.0", optional = true } -solana-program = "^2.1.6" +solana-program = "2.2.1" +solana-pubkey = { version = "2.2.1", features = ["curve25519"] } solana-client = { version = "~1.18", optional = true } solana-sdk = { version = "~1.18", optional = true } thiserror = "^1.0" diff --git a/packages/renderers-rust/e2e/anchor/src/generated/accounts/guard_v1.rs b/packages/renderers-rust/e2e/anchor/src/generated/accounts/guard_v1.rs index bf92a3bfe..f8d739876 100644 --- a/packages/renderers-rust/e2e/anchor/src/generated/accounts/guard_v1.rs +++ b/packages/renderers-rust/e2e/anchor/src/generated/accounts/guard_v1.rs @@ -10,7 +10,7 @@ use crate::generated::types::MetadataAdditionalFieldRule; use crate::generated::types::TransferAmountRule; use borsh::BorshDeserialize; use borsh::BorshSerialize; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; #[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] @@ -54,7 +54,7 @@ impl<'a> TryFrom<&solana_program::account_info::AccountInfo<'a>> for GuardV1 { #[cfg(feature = "fetch")] pub fn fetch_guard_v1( rpc: &solana_client::rpc_client::RpcClient, - address: &solana_program::pubkey::Pubkey, + address: &solana_pubkey::Pubkey, ) -> Result, std::io::Error> { let accounts = fetch_all_guard_v1(rpc, &[*address])?; Ok(accounts[0].clone()) @@ -63,7 +63,7 @@ pub fn fetch_guard_v1( #[cfg(feature = "fetch")] pub fn fetch_all_guard_v1( rpc: &solana_client::rpc_client::RpcClient, - addresses: &[solana_program::pubkey::Pubkey], + addresses: &[solana_pubkey::Pubkey], ) -> Result>, std::io::Error> { let accounts = rpc .get_multiple_accounts(addresses) @@ -88,7 +88,7 @@ pub fn fetch_all_guard_v1( #[cfg(feature = "fetch")] pub fn fetch_maybe_guard_v1( rpc: &solana_client::rpc_client::RpcClient, - address: &solana_program::pubkey::Pubkey, + address: &solana_pubkey::Pubkey, ) -> Result, std::io::Error> { let accounts = fetch_all_maybe_guard_v1(rpc, &[*address])?; Ok(accounts[0].clone()) @@ -97,7 +97,7 @@ pub fn fetch_maybe_guard_v1( #[cfg(feature = "fetch")] pub fn fetch_all_maybe_guard_v1( rpc: &solana_client::rpc_client::RpcClient, - addresses: &[solana_program::pubkey::Pubkey], + addresses: &[solana_pubkey::Pubkey], ) -> Result>, std::io::Error> { let accounts = rpc .get_multiple_accounts(addresses) diff --git a/packages/renderers-rust/e2e/anchor/src/generated/instructions/create_guard.rs b/packages/renderers-rust/e2e/anchor/src/generated/instructions/create_guard.rs index 93ce31d84..ea450a51d 100644 --- a/packages/renderers-rust/e2e/anchor/src/generated/instructions/create_guard.rs +++ b/packages/renderers-rust/e2e/anchor/src/generated/instructions/create_guard.rs @@ -14,21 +14,21 @@ use borsh::BorshSerialize; /// Accounts. #[derive(Debug)] pub struct CreateGuard { - pub guard: solana_program::pubkey::Pubkey, + pub guard: solana_pubkey::Pubkey, - pub mint: solana_program::pubkey::Pubkey, + pub mint: solana_pubkey::Pubkey, - pub mint_token_account: solana_program::pubkey::Pubkey, + pub mint_token_account: solana_pubkey::Pubkey, - pub guard_authority: solana_program::pubkey::Pubkey, + pub guard_authority: solana_pubkey::Pubkey, - pub payer: solana_program::pubkey::Pubkey, + pub payer: solana_pubkey::Pubkey, - pub associated_token_program: solana_program::pubkey::Pubkey, + pub associated_token_program: solana_pubkey::Pubkey, - pub token_program: solana_program::pubkey::Pubkey, + pub token_program: solana_pubkey::Pubkey, - pub system_program: solana_program::pubkey::Pubkey, + pub system_program: solana_pubkey::Pubkey, } impl CreateGuard { @@ -133,14 +133,14 @@ pub struct CreateGuardInstructionArgs { /// 7. `[optional]` system_program (default to `11111111111111111111111111111111`) #[derive(Clone, Debug, Default)] pub struct CreateGuardBuilder { - guard: Option, - mint: Option, - mint_token_account: Option, - guard_authority: Option, - payer: Option, - associated_token_program: Option, - token_program: Option, - system_program: Option, + guard: Option, + mint: Option, + mint_token_account: Option, + guard_authority: Option, + payer: Option, + associated_token_program: Option, + token_program: Option, + system_program: Option, name: Option, symbol: Option, uri: Option, @@ -155,33 +155,27 @@ impl CreateGuardBuilder { Self::default() } #[inline(always)] - pub fn guard(&mut self, guard: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn guard(&mut self, guard: solana_pubkey::Pubkey) -> &mut Self { self.guard = Some(guard); self } #[inline(always)] - pub fn mint(&mut self, mint: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn mint(&mut self, mint: solana_pubkey::Pubkey) -> &mut Self { self.mint = Some(mint); self } #[inline(always)] - pub fn mint_token_account( - &mut self, - mint_token_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn mint_token_account(&mut self, mint_token_account: solana_pubkey::Pubkey) -> &mut Self { self.mint_token_account = Some(mint_token_account); self } #[inline(always)] - pub fn guard_authority( - &mut self, - guard_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn guard_authority(&mut self, guard_authority: solana_pubkey::Pubkey) -> &mut Self { self.guard_authority = Some(guard_authority); self } #[inline(always)] - pub fn payer(&mut self, payer: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn payer(&mut self, payer: solana_pubkey::Pubkey) -> &mut Self { self.payer = Some(payer); self } @@ -189,20 +183,20 @@ impl CreateGuardBuilder { #[inline(always)] pub fn associated_token_program( &mut self, - associated_token_program: solana_program::pubkey::Pubkey, + associated_token_program: solana_pubkey::Pubkey, ) -> &mut Self { self.associated_token_program = Some(associated_token_program); self } /// `[optional account, default to 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb']` #[inline(always)] - pub fn token_program(&mut self, token_program: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn token_program(&mut self, token_program: solana_pubkey::Pubkey) -> &mut Self { self.token_program = Some(token_program); self } /// `[optional account, default to '11111111111111111111111111111111']` #[inline(always)] - pub fn system_program(&mut self, system_program: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn system_program(&mut self, system_program: solana_pubkey::Pubkey) -> &mut Self { self.system_program = Some(system_program); self } @@ -270,14 +264,14 @@ impl CreateGuardBuilder { guard_authority: self.guard_authority.expect("guard_authority is not set"), payer: self.payer.expect("payer is not set"), associated_token_program: self.associated_token_program.unwrap_or( - solana_program::pubkey!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"), + solana_pubkey::pubkey!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"), ), - token_program: self.token_program.unwrap_or(solana_program::pubkey!( + token_program: self.token_program.unwrap_or(solana_pubkey::pubkey!( "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb" )), system_program: self .system_program - .unwrap_or(solana_program::pubkey!("11111111111111111111111111111111")), + .unwrap_or(solana_pubkey::pubkey!("11111111111111111111111111111111")), }; let args = CreateGuardInstructionArgs { name: self.name.clone().expect("name is not set"), diff --git a/packages/renderers-rust/e2e/anchor/src/generated/instructions/execute.rs b/packages/renderers-rust/e2e/anchor/src/generated/instructions/execute.rs index 06b5df58f..69f416a42 100644 --- a/packages/renderers-rust/e2e/anchor/src/generated/instructions/execute.rs +++ b/packages/renderers-rust/e2e/anchor/src/generated/instructions/execute.rs @@ -11,19 +11,19 @@ use borsh::BorshSerialize; /// Accounts. #[derive(Debug)] pub struct Execute { - pub source_account: solana_program::pubkey::Pubkey, + pub source_account: solana_pubkey::Pubkey, - pub mint: solana_program::pubkey::Pubkey, + pub mint: solana_pubkey::Pubkey, - pub destination_account: solana_program::pubkey::Pubkey, + pub destination_account: solana_pubkey::Pubkey, - pub owner_delegate: solana_program::pubkey::Pubkey, + pub owner_delegate: solana_pubkey::Pubkey, - pub extra_metas_account: solana_program::pubkey::Pubkey, + pub extra_metas_account: solana_pubkey::Pubkey, - pub guard: solana_program::pubkey::Pubkey, + pub guard: solana_pubkey::Pubkey, - pub instruction_sysvar_account: solana_program::pubkey::Pubkey, + pub instruction_sysvar_account: solana_pubkey::Pubkey, } impl Execute { @@ -119,13 +119,13 @@ pub struct ExecuteInstructionArgs { /// 6. `[optional]` instruction_sysvar_account (default to `Sysvar1nstructions1111111111111111111111111`) #[derive(Clone, Debug, Default)] pub struct ExecuteBuilder { - source_account: Option, - mint: Option, - destination_account: Option, - owner_delegate: Option, - extra_metas_account: Option, - guard: Option, - instruction_sysvar_account: Option, + source_account: Option, + mint: Option, + destination_account: Option, + owner_delegate: Option, + extra_metas_account: Option, + guard: Option, + instruction_sysvar_account: Option, amount: Option, __remaining_accounts: Vec, } @@ -135,38 +135,32 @@ impl ExecuteBuilder { Self::default() } #[inline(always)] - pub fn source_account(&mut self, source_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn source_account(&mut self, source_account: solana_pubkey::Pubkey) -> &mut Self { self.source_account = Some(source_account); self } #[inline(always)] - pub fn mint(&mut self, mint: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn mint(&mut self, mint: solana_pubkey::Pubkey) -> &mut Self { self.mint = Some(mint); self } #[inline(always)] - pub fn destination_account( - &mut self, - destination_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn destination_account(&mut self, destination_account: solana_pubkey::Pubkey) -> &mut Self { self.destination_account = Some(destination_account); self } #[inline(always)] - pub fn owner_delegate(&mut self, owner_delegate: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn owner_delegate(&mut self, owner_delegate: solana_pubkey::Pubkey) -> &mut Self { self.owner_delegate = Some(owner_delegate); self } #[inline(always)] - pub fn extra_metas_account( - &mut self, - extra_metas_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn extra_metas_account(&mut self, extra_metas_account: solana_pubkey::Pubkey) -> &mut Self { self.extra_metas_account = Some(extra_metas_account); self } #[inline(always)] - pub fn guard(&mut self, guard: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn guard(&mut self, guard: solana_pubkey::Pubkey) -> &mut Self { self.guard = Some(guard); self } @@ -174,7 +168,7 @@ impl ExecuteBuilder { #[inline(always)] pub fn instruction_sysvar_account( &mut self, - instruction_sysvar_account: solana_program::pubkey::Pubkey, + instruction_sysvar_account: solana_pubkey::Pubkey, ) -> &mut Self { self.instruction_sysvar_account = Some(instruction_sysvar_account); self @@ -216,7 +210,7 @@ impl ExecuteBuilder { .expect("extra_metas_account is not set"), guard: self.guard.expect("guard is not set"), instruction_sysvar_account: self.instruction_sysvar_account.unwrap_or( - solana_program::pubkey!("Sysvar1nstructions1111111111111111111111111"), + solana_pubkey::pubkey!("Sysvar1nstructions1111111111111111111111111"), ), }; let args = ExecuteInstructionArgs { diff --git a/packages/renderers-rust/e2e/anchor/src/generated/instructions/initialize.rs b/packages/renderers-rust/e2e/anchor/src/generated/instructions/initialize.rs index 1af840dc2..40194d481 100644 --- a/packages/renderers-rust/e2e/anchor/src/generated/instructions/initialize.rs +++ b/packages/renderers-rust/e2e/anchor/src/generated/instructions/initialize.rs @@ -11,17 +11,17 @@ use borsh::BorshSerialize; /// Accounts. #[derive(Debug)] pub struct Initialize { - pub extra_metas_account: solana_program::pubkey::Pubkey, + pub extra_metas_account: solana_pubkey::Pubkey, - pub guard: solana_program::pubkey::Pubkey, + pub guard: solana_pubkey::Pubkey, - pub mint: solana_program::pubkey::Pubkey, + pub mint: solana_pubkey::Pubkey, - pub transfer_hook_authority: solana_program::pubkey::Pubkey, + pub transfer_hook_authority: solana_pubkey::Pubkey, - pub system_program: solana_program::pubkey::Pubkey, + pub system_program: solana_pubkey::Pubkey, - pub payer: solana_program::pubkey::Pubkey, + pub payer: solana_pubkey::Pubkey, } impl Initialize { @@ -99,12 +99,12 @@ impl Default for InitializeInstructionData { /// 5. `[writable, signer]` payer #[derive(Clone, Debug, Default)] pub struct InitializeBuilder { - extra_metas_account: Option, - guard: Option, - mint: Option, - transfer_hook_authority: Option, - system_program: Option, - payer: Option, + extra_metas_account: Option, + guard: Option, + mint: Option, + transfer_hook_authority: Option, + system_program: Option, + payer: Option, __remaining_accounts: Vec, } @@ -113,39 +113,36 @@ impl InitializeBuilder { Self::default() } #[inline(always)] - pub fn extra_metas_account( - &mut self, - extra_metas_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn extra_metas_account(&mut self, extra_metas_account: solana_pubkey::Pubkey) -> &mut Self { self.extra_metas_account = Some(extra_metas_account); self } #[inline(always)] - pub fn guard(&mut self, guard: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn guard(&mut self, guard: solana_pubkey::Pubkey) -> &mut Self { self.guard = Some(guard); self } #[inline(always)] - pub fn mint(&mut self, mint: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn mint(&mut self, mint: solana_pubkey::Pubkey) -> &mut Self { self.mint = Some(mint); self } #[inline(always)] pub fn transfer_hook_authority( &mut self, - transfer_hook_authority: solana_program::pubkey::Pubkey, + transfer_hook_authority: solana_pubkey::Pubkey, ) -> &mut Self { self.transfer_hook_authority = Some(transfer_hook_authority); self } /// `[optional account, default to '11111111111111111111111111111111']` #[inline(always)] - pub fn system_program(&mut self, system_program: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn system_program(&mut self, system_program: solana_pubkey::Pubkey) -> &mut Self { self.system_program = Some(system_program); self } #[inline(always)] - pub fn payer(&mut self, payer: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn payer(&mut self, payer: solana_pubkey::Pubkey) -> &mut Self { self.payer = Some(payer); self } @@ -180,7 +177,7 @@ impl InitializeBuilder { .expect("transfer_hook_authority is not set"), system_program: self .system_program - .unwrap_or(solana_program::pubkey!("11111111111111111111111111111111")), + .unwrap_or(solana_pubkey::pubkey!("11111111111111111111111111111111")), payer: self.payer.expect("payer is not set"), }; diff --git a/packages/renderers-rust/e2e/anchor/src/generated/instructions/update_guard.rs b/packages/renderers-rust/e2e/anchor/src/generated/instructions/update_guard.rs index c220051a8..463bcc607 100644 --- a/packages/renderers-rust/e2e/anchor/src/generated/instructions/update_guard.rs +++ b/packages/renderers-rust/e2e/anchor/src/generated/instructions/update_guard.rs @@ -14,17 +14,17 @@ use borsh::BorshSerialize; /// Accounts. #[derive(Debug)] pub struct UpdateGuard { - pub guard: solana_program::pubkey::Pubkey, + pub guard: solana_pubkey::Pubkey, - pub mint: solana_program::pubkey::Pubkey, + pub mint: solana_pubkey::Pubkey, - pub token_account: solana_program::pubkey::Pubkey, + pub token_account: solana_pubkey::Pubkey, - pub guard_authority: solana_program::pubkey::Pubkey, + pub guard_authority: solana_pubkey::Pubkey, - pub token_program: solana_program::pubkey::Pubkey, + pub token_program: solana_pubkey::Pubkey, - pub system_program: solana_program::pubkey::Pubkey, + pub system_program: solana_pubkey::Pubkey, } impl UpdateGuard { @@ -117,12 +117,12 @@ pub struct UpdateGuardInstructionArgs { /// 5. `[optional]` system_program (default to `11111111111111111111111111111111`) #[derive(Clone, Debug, Default)] pub struct UpdateGuardBuilder { - guard: Option, - mint: Option, - token_account: Option, - guard_authority: Option, - token_program: Option, - system_program: Option, + guard: Option, + mint: Option, + token_account: Option, + guard_authority: Option, + token_program: Option, + system_program: Option, cpi_rule: Option, transfer_amount_rule: Option, additional_fields_rule: Option>, @@ -134,37 +134,34 @@ impl UpdateGuardBuilder { Self::default() } #[inline(always)] - pub fn guard(&mut self, guard: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn guard(&mut self, guard: solana_pubkey::Pubkey) -> &mut Self { self.guard = Some(guard); self } #[inline(always)] - pub fn mint(&mut self, mint: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn mint(&mut self, mint: solana_pubkey::Pubkey) -> &mut Self { self.mint = Some(mint); self } #[inline(always)] - pub fn token_account(&mut self, token_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn token_account(&mut self, token_account: solana_pubkey::Pubkey) -> &mut Self { self.token_account = Some(token_account); self } #[inline(always)] - pub fn guard_authority( - &mut self, - guard_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn guard_authority(&mut self, guard_authority: solana_pubkey::Pubkey) -> &mut Self { self.guard_authority = Some(guard_authority); self } /// `[optional account, default to 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb']` #[inline(always)] - pub fn token_program(&mut self, token_program: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn token_program(&mut self, token_program: solana_pubkey::Pubkey) -> &mut Self { self.token_program = Some(token_program); self } /// `[optional account, default to '11111111111111111111111111111111']` #[inline(always)] - pub fn system_program(&mut self, system_program: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn system_program(&mut self, system_program: solana_pubkey::Pubkey) -> &mut Self { self.system_program = Some(system_program); self } @@ -213,12 +210,12 @@ impl UpdateGuardBuilder { mint: self.mint.expect("mint is not set"), token_account: self.token_account.expect("token_account is not set"), guard_authority: self.guard_authority.expect("guard_authority is not set"), - token_program: self.token_program.unwrap_or(solana_program::pubkey!( + token_program: self.token_program.unwrap_or(solana_pubkey::pubkey!( "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb" )), system_program: self .system_program - .unwrap_or(solana_program::pubkey!("11111111111111111111111111111111")), + .unwrap_or(solana_pubkey::pubkey!("11111111111111111111111111111111")), }; let args = UpdateGuardInstructionArgs { cpi_rule: self.cpi_rule.clone(), diff --git a/packages/renderers-rust/e2e/anchor/src/generated/programs.rs b/packages/renderers-rust/e2e/anchor/src/generated/programs.rs index bcdab8523..ae8f2fcb2 100644 --- a/packages/renderers-rust/e2e/anchor/src/generated/programs.rs +++ b/packages/renderers-rust/e2e/anchor/src/generated/programs.rs @@ -5,7 +5,7 @@ //! //! -use solana_program::{pubkey, pubkey::Pubkey}; +use solana_pubkey::{pubkey, Pubkey}; /// `wen_transfer_guard` program ID. pub const WEN_TRANSFER_GUARD_ID: Pubkey = pubkey!("LockdqYQ9X2kwtWB99ioSbxubAmEi8o9jqYwbXgrrRw"); diff --git a/packages/renderers-rust/e2e/anchor/src/generated/shared.rs b/packages/renderers-rust/e2e/anchor/src/generated/shared.rs index 4b9a0d5f8..ed763f639 100644 --- a/packages/renderers-rust/e2e/anchor/src/generated/shared.rs +++ b/packages/renderers-rust/e2e/anchor/src/generated/shared.rs @@ -8,7 +8,7 @@ #[cfg(feature = "fetch")] #[derive(Debug, Clone)] pub struct DecodedAccount { - pub address: solana_program::pubkey::Pubkey, + pub address: solana_pubkey::Pubkey, pub account: solana_sdk::account::Account, pub data: T, } @@ -17,5 +17,5 @@ pub struct DecodedAccount { #[derive(Debug, Clone)] pub enum MaybeAccount { Exists(DecodedAccount), - NotFound(solana_program::pubkey::Pubkey), + NotFound(solana_pubkey::Pubkey), } diff --git a/packages/renderers-rust/e2e/anchor/src/generated/types/cpi_rule.rs b/packages/renderers-rust/e2e/anchor/src/generated/types/cpi_rule.rs index 6364e8793..2477db529 100644 --- a/packages/renderers-rust/e2e/anchor/src/generated/types/cpi_rule.rs +++ b/packages/renderers-rust/e2e/anchor/src/generated/types/cpi_rule.rs @@ -7,7 +7,7 @@ use borsh::BorshDeserialize; use borsh::BorshSerialize; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; /// Controls which protocols can interact with the token by /// enforcing Allow and Deny lists. diff --git a/packages/renderers-rust/e2e/dummy/Cargo.lock b/packages/renderers-rust/e2e/dummy/Cargo.lock index 9d613ff91..5344dbbc9 100644 --- a/packages/renderers-rust/e2e/dummy/Cargo.lock +++ b/packages/renderers-rust/e2e/dummy/Cargo.lock @@ -20,6 +20,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", @@ -168,7 +169,7 @@ dependencies = [ "bytemuck", "getrandom 0.2.15", "solana-program 1.18.26", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -212,7 +213,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "syn 1.0.109", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -259,7 +260,7 @@ dependencies = [ "ark-std", "derivative", "hashbrown 0.13.2", - "itertools 0.10.5", + "itertools", "num-traits", "zeroize", ] @@ -276,7 +277,7 @@ dependencies = [ "ark-std", "derivative", "digest 0.10.7", - "itertools 0.10.5", + "itertools", "num-bigint", "num-traits", "paste", @@ -371,6 +372,17 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + [[package]] name = "autocfg" version = "1.4.0" @@ -406,9 +418,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.6.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" dependencies = [ "serde", ] @@ -476,11 +488,11 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.3" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03" +checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" dependencies = [ - "borsh-derive 1.5.3", + "borsh-derive 1.5.7", "cfg_aliases", ] @@ -512,9 +524,9 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.3" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244" +checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" dependencies = [ "once_cell", "proc-macro-crate 3.2.0", @@ -600,18 +612,18 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.19.0" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8334215b81e418a0a7bdb8ef0849474f40bb10c8b71f1c4ed315cff49f32494d" +checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.8.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" +checksum = "7ecc273b49b3205b83d648f0690daa588925572cc5063745bfe547fe7ec8e1a1" dependencies = [ "proc-macro2", "quote", @@ -670,15 +682,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets", + "windows-link", ] [[package]] @@ -694,9 +706,10 @@ dependencies = [ "serde", "serde-big-array", "serde_with", - "solana-program 2.1.7", + "solana-program 2.2.1", + "solana-pubkey", "solana-sdk", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -956,6 +969,19 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +[[package]] +name = "env_logger" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -1086,6 +1112,15 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" @@ -1122,6 +1157,12 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "humantime" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" + [[package]] name = "iana-time-zone" version = "0.1.61" @@ -1198,15 +1239,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.11" @@ -1224,10 +1256,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -1257,9 +1290,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.160" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b21006cd1874ae9e650973c565615676dc4a274c965bb0a73796dac838ce4f" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libsecp256k1" @@ -1318,7 +1351,7 @@ dependencies = [ "ark-bn254", "ark-ff", "num-bigint", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1333,9 +1366,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "memchr" @@ -1582,9 +1615,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" dependencies = [ "unicode-ident", ] @@ -1824,9 +1857,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -1845,9 +1878,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.11.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" +checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" dependencies = [ "base64 0.22.1", "chrono", @@ -1863,9 +1896,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.11.0" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" +checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" dependencies = [ "darling", "proc-macro2", @@ -1913,6 +1946,25 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + [[package]] name = "signature" version = "1.6.4" @@ -1943,23 +1995,27 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "solana-account" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d6ef82dab153c60b1da169126d8eca1b62bbf4026f95a45a71897f3e9a0224" +checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" dependencies = [ "bincode", "serde", "serde_bytes", "serde_derive", + "solana-account-info", + "solana-clock", "solana-instruction", - "solana-program 2.1.7", + "solana-pubkey", + "solana-sdk-ids", + "solana-sysvar", ] [[package]] name = "solana-account-info" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8378a48833ee7f828e20a63e93a6cdaef1313a8fd8f71a90b243df83295987b1" +checksum = "e0c17d606a298a205fae325489fbed88ee6dc4463c111672172327e741c8905d" dependencies = [ "bincode", "serde", @@ -1968,68 +2024,164 @@ 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.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6f9da603778bbee6402ee2526a3b219b85497c10e49f9c7c112ed8836f46d3" +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", + "num-traits", + "solana-define-syscall", +] + [[package]] name = "solana-bincode" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb75b5d25ae05cfddb8b9b53512f17c18c29e3c92b7a848f39598473e6bf6484" +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.7" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df7c5b61b4ed3961cbaef5f38c58d1ee9a2268cbe607c67a54083b7b02d6276" +checksum = "4420f125118732833f36facf96a27e7b78314b2d642ba07fa9ffdacd8d79e243" dependencies = [ "ark-bn254", "ark-ec", "ark-ff", "ark-serialize", "bytemuck", - "solana-program 2.1.7", - "thiserror", + "solana-define-syscall", + "thiserror 2.0.12", ] [[package]] name = "solana-borsh" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055c45b7aae61c8c7b26a537f7a8387cc8a10036081ddfd7170a7a9b4d924ffd" +checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" dependencies = [ "borsh 0.10.4", - "borsh 1.5.3", + "borsh 1.5.7", +] + +[[package]] +name = "solana-client-traits" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83f0071874e629f29e0eb3dab8a863e98502ac7aba55b7e0df1803fc5cac72a7" +dependencies = [ + "solana-account", + "solana-commitment-config", + "solana-epoch-info", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", ] [[package]] name = "solana-clock" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d6af32497acc6bb09d8150ea6f53df25dbad713991741999d46688beaf944e" +checksum = "67c2177a1b9fe8326004f1151a5acd124420b737811080b1035df31349e4d892" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "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 = [ + "serde", + "serde_derive", + "solana-hash", +] + +[[package]] +name = "solana-commitment-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac49c4dde3edfa832de1697e9bcdb7c3b3f7cb7a1981b7c62526c8bb6700fb73" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-compute-budget-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a5df17b195d312b66dccdde9beec6709766d8230cb4718c4c08854f780d0309" +dependencies = [ + "borsh 1.5.7", + "serde", + "serde_derive", + "solana-instruction", + "solana-sdk-ids", +] + [[package]] name = "solana-cpi" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b06ac8e2ebf8a5b8a54645b721f92f5d7a6d116550bbf1817167cc48abeb1" +checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" dependencies = [ "solana-account-info", "solana-define-syscall", @@ -2041,50 +2193,141 @@ dependencies = [ [[package]] name = "solana-decode-error" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99f2fe3170045ae27951ae476a0c88a40130b242736f033ba5e353cd6f816b8e" +checksum = "10a6a6383af236708048f8bd8d03db8ca4ff7baf4a48e5d580f4cce545925470" dependencies = [ "num-traits", ] [[package]] name = "solana-define-syscall" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a80d323dbe8866aaefb40e3c11564d82f77894d193fa66583e793f3d845723" +checksum = "cf784bb2cb3e02cac9801813c30187344228d2ae952534902108f6150573a33d" [[package]] name = "solana-derivation-path" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff423e05929ec73c0997aa0d4aeae7a7bb52ccabc23699ceaa1f2ae854a5fa4" +checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" dependencies = [ "derivation-path", "qstring", "uriparse", ] +[[package]] +name = "solana-ed25519-program" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0fc717048fdbe5d2ee7d673d73e6a30a094002f4a29ca7630ac01b6bddec04" +dependencies = [ + "bytemuck", + "bytemuck_derive", + "ed25519-dalek", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", +] + +[[package]] +name = "solana-epoch-info" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ef6f0b449290b0b9f32973eefd95af35b01c5c0c34c569f936c34c5b20d77b" +dependencies = [ + "serde", + "serde_derive", +] + +[[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 2.2.1", + "solana-sysvar-id", +] + +[[package]] +name = "solana-epoch-rewards-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c5fd2662ae7574810904585fd443545ed2b568dbd304b25a31e79ccc76e81b" +dependencies = [ + "siphasher", + "solana-hash", + "solana-pubkey", +] + [[package]] name = "solana-epoch-schedule" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276fda33b7de27df41e3043f344e517d5e85ab345d2f2aa2425d1011bac570c4" +checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "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.7" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155ef7ddcf7b75ef92d992839bd00ac4ee02bdfe0fa4d95daf0534b830b1bc0e" +checksum = "92f6c09cc41059c0e03ccbee7f5d4cc0a315d68ef0d59b67eb90246adfd8cc35" dependencies = [ + "ahash 0.8.11", "lazy_static", - "solana-clock", "solana-epoch-schedule", "solana-hash", "solana-pubkey", @@ -2093,15 +2336,27 @@ dependencies = [ [[package]] name = "solana-fee-calculator" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc0371153eda80024109800051b87bab11f056fae260ca477a50875aaffdfde" +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 = [ + "serde", + "serde_derive", + "solana-message", + "solana-native-token", +] + [[package]] name = "solana-frozen-abi" version = "1.18.26" @@ -2124,7 +2379,7 @@ dependencies = [ "sha2 0.10.8", "solana-frozen-abi-macro", "subtle", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2139,13 +2394,54 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "solana-genesis-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968dabd2b92d57131473eddbd475339da530e14f54397386abf303de3a2595a2" +dependencies = [ + "bincode", + "chrono", + "memmap2", + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-cluster-type", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-inflation", + "solana-keypair", + "solana-logger", + "solana-native-token", + "solana-poh-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-sha256-hasher", + "solana-shred-version", + "solana-signer", + "solana-time-utils", +] + +[[package]] +name = "solana-hard-forks" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c28371f878e2ead55611d8ba1b5fb879847156d04edea13693700ad1a28baf" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "solana-hash" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7067f2bd1e9c3f28153484f03e44bf8dc73cededa6bc132e40de9bfc667b8534" +checksum = "cf7bcb14392900fe02e4e34e90234fbf0c673d4e327888410ba99fa2ba0f4e99" dependencies = [ - "borsh 1.5.3", + "borsh 1.5.7", "bs58 0.5.1", "bytemuck", "bytemuck_derive", @@ -2159,9 +2455,9 @@ dependencies = [ [[package]] name = "solana-inflation" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e27906f90ba8df331903292a499cc776e70ee29995da4bf5a81b54d27edefa" +checksum = "23eef6a09eb8e568ce6839573e4966850e85e9ce71e6ae1a6c930c1c43947de3" dependencies = [ "serde", "serde_derive", @@ -2169,12 +2465,12 @@ dependencies = [ [[package]] name = "solana-instruction" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dbf607aff88e4f17079a33d34517b7f379d752dfa0496a94cea798a91e6f6ee" +checksum = "9ce496a475e5062ba5de97215ab39d9c358f9c9df4bb7f3a45a1f1a8bd9065ed" dependencies = [ "bincode", - "borsh 1.5.3", + "borsh 1.5.7", "getrandom 0.2.15", "js-sys", "num-traits", @@ -2186,54 +2482,263 @@ dependencies = [ ] [[package]] -name = "solana-last-restart-slot" -version = "2.1.7" +name = "solana-instructions-sysvar" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f2ee9af7a2815137c60d77cb930c26480bc802b55e00d9e230e81fd308062e" +checksum = "427f2d0d6dc0bb49f16cef5e7f975180d2e80aab9bdd3b2af68e2d029ec63f43" dependencies = [ - "serde", - "serde_derive", - "solana-sdk-macro 2.1.7", + "bitflags", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-serialize-utils", "solana-sysvar-id", ] [[package]] -name = "solana-msg" -version = "2.1.7" +name = "solana-keccak-hasher" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cd9c6ed9d4d036da00c958f0f98edb248c08eb596975011a30063ac3aa902" +checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" dependencies = [ + "sha3", "solana-define-syscall", + "solana-hash", + "solana-sanitize", ] [[package]] -name = "solana-native-token" -version = "2.1.7" +name = "solana-keypair" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ef55ad8dcc8c5f21e2bbbc7298fa59550269e8bdf2c6976c4de626ea8a0069" +checksum = "3dbb7042c2e0c561afa07242b2099d55c57bd1b1da3b6476932197d84e15e3e4" +dependencies = [ + "bs58 0.5.1", + "ed25519-dalek", + "ed25519-dalek-bip32", + "rand 0.7.3", + "solana-derivation-path", + "solana-pubkey", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-signature", + "solana-signer", + "wasm-bindgen", +] [[package]] -name = "solana-packet" -version = "2.1.7" +name = "solana-last-restart-slot" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfac9266a6cb79d0d37a7ae1a9944559caa286d93005773bf8005583ffcd652c" +checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" dependencies = [ - "bincode", - "bitflags", - "cfg_eval", "serde", "serde_derive", - "serde_with", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", + "solana-sysvar-id", ] [[package]] -name = "solana-precompile-error" -version = "2.1.7" +name = "solana-loader-v2-interface" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a85f003d72bcc94cd394dcbef150bb18ccd03bd5fee6b6e8927bb0fbbe26d" +checksum = "d8ab08006dad78ae7cd30df8eea0539e207d08d91eaefb3e1d49a446e1c49654" dependencies = [ - "num-traits", - "solana-decode-error", + "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-logger" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8e777ec1afd733939b532a42492d888ec7c88d8b4127a5d867eb45c6eb5cd5" +dependencies = [ + "env_logger", + "lazy_static", + "libc", + "log", + "signal-hook", +] + +[[package]] +name = "solana-message" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6bf99c4570173710107a1f233f3bee226feea5fc817308707d4f7cb100a72d" +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-msg" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" +dependencies = [ + "solana-define-syscall", +] + +[[package]] +name = "solana-native-token" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e9de00960197412e4be3902a6cd35e60817c511137aca6c34c66cd5d4017ec" + +[[package]] +name = "solana-nonce" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" +dependencies = [ + "serde", + "serde_derive", + "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-offchain-message" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b526398ade5dea37f1f147ce55dae49aa017a5d7326606359b0445ca8d946581" +dependencies = [ + "num_enum", + "solana-hash", + "solana-packet", + "solana-pubkey", + "solana-sanitize", + "solana-sha256-hasher", + "solana-signature", + "solana-signer", +] + +[[package]] +name = "solana-packet" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127" +dependencies = [ + "bincode", + "bitflags", + "cfg_eval", + "serde", + "serde_derive", + "serde_with", +] + +[[package]] +name = "solana-poh-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d650c3b4b9060082ac6b0efbbb66865089c58405bfb45de449f3f2b91eccee75" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-precompile-error" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +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-presigner" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81a57a24e6a4125fc69510b6774cd93402b943191b6cddad05de7281491c90fe" +dependencies = [ + "solana-pubkey", + "solana-signature", + "solana-signer", ] [[package]] @@ -2252,7 +2757,7 @@ dependencies = [ "blake3", "borsh 0.10.4", "borsh 0.9.3", - "borsh 1.5.3", + "borsh 1.5.7", "bs58 0.4.0", "bv", "bytemuck", @@ -2261,7 +2766,7 @@ dependencies = [ "console_log", "curve25519-dalek 3.2.1", "getrandom 0.2.15", - "itertools 0.10.5", + "itertools", "js-sys", "lazy_static", "libc", @@ -2285,7 +2790,7 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-sdk-macro 1.18.26", - "thiserror", + "thiserror 1.0.69", "tiny-bip39", "wasm-bindgen", "zeroize", @@ -2293,54 +2798,57 @@ dependencies = [ [[package]] name = "solana-program" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c693c5c392bacc44e7a86baa18069eb966d88afbc9040219ca000e873fb02e" +checksum = "586469467e93ceb79048f8d8e3a619bf61d05396ee7de95cb40280301a589d05" dependencies = [ - "base64 0.22.1", "bincode", - "bitflags", "blake3", "borsh 0.10.4", - "borsh 1.5.3", + "borsh 1.5.7", "bs58 0.5.1", - "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", "num-derive 0.4.2", "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", @@ -2349,7 +2857,8 @@ dependencies = [ "solana-pubkey", "solana-rent", "solana-sanitize", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "solana-secp256k1-recover", "solana-serde-varint", "solana-serialize-utils", @@ -2358,17 +2867,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", + "solana-vote-interface", + "thiserror 2.0.12", "wasm-bindgen", ] [[package]] name = "solana-program-entrypoint" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0696f51a4386f92f4e1807059bd2b649c207688b9249df332d0fd5ecac240c" +checksum = "473ffe73c68d93e9f2aa726ad2985fe52760052709aaab188100a42c618060ec" dependencies = [ "solana-account-info", "solana-msg", @@ -2378,11 +2890,11 @@ dependencies = [ [[package]] name = "solana-program-error" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd557d10df4380234f5b4a5971a0cae29eedcc42ebe4bbe926a21ff31912e99" +checksum = "d8ae2c1a8d0d4ae865882d5770a7ebca92bab9c685e43f0461682c6c05a35bfa" dependencies = [ - "borsh 1.5.3", + "borsh 1.5.7", "num-traits", "serde", "serde_derive", @@ -2394,9 +2906,9 @@ dependencies = [ [[package]] name = "solana-program-memory" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef71296a3fa6ebaa38ae522bea71af82b7deeea170e459efa3c539b8f14e0155" +checksum = "1b0268f6c89825fb634a34bd0c3b8fdaeaecfc3728be1d622a8ee6dd577b60d4" dependencies = [ "num-traits", "solana-define-syscall", @@ -2404,27 +2916,27 @@ dependencies = [ [[package]] name = "solana-program-option" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "506908720b9b1660f2087d9c6f45ba208fa67a0f34658804517324ef65fd432b" +checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" [[package]] name = "solana-program-pack" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21820c32999ce24532fb12d6188daeffa27eb88a366505a4a0553857729aae52" +checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" dependencies = [ "solana-program-error", ] [[package]] name = "solana-pubkey" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c46701a845b731f2ffcf002c4bb08968434b9cf5e576cdd705259421074d1764" +checksum = "40db1ff5a0f8aea2c158d78ab5f2cf897848964251d1df42fef78efd3c85b863" dependencies = [ "borsh 0.10.4", - "borsh 1.5.3", + "borsh 1.5.7", "bs58 0.5.1", "bytemuck", "bytemuck_derive", @@ -2444,88 +2956,163 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "solana-quic-definitions" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e606feac5110eb5d8afaa43ccaeea3ec49ccec36773387930b5ba545e745aea2" +dependencies = [ + "solana-keypair", +] + [[package]] name = "solana-rent" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a4d15fe63d0e9a9551adfecfec495e3d50ba0bc4705001010c724fe84f65d8" +checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "solana-sysvar-id", ] +[[package]] +name = "solana-rent-collector" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c1e19f5d5108b0d824244425e43bc78bbb9476e2199e979b0230c9f632d3bf4" +dependencies = [ + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-epoch-schedule", + "solana-genesis-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", +] + +[[package]] +name = "solana-rent-debits" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f6f9113c6003492e74438d1288e30cffa8ccfdc2ef7b49b9e816d8034da18cd" +dependencies = [ + "solana-pubkey", + "solana-reward-info", +] + +[[package]] +name = "solana-reserved-account-keys" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b293f4246626c0e0a991531f08848a713ada965612e99dc510963f04d12cae7" +dependencies = [ + "lazy_static", + "solana-feature-set", + "solana-pubkey", + "solana-sdk-ids", +] + +[[package]] +name = "solana-reward-info" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18205b69139b1ae0ab8f6e11cdcb627328c0814422ad2482000fa2ca54ae4a2f" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "solana-sanitize" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b8c536460c84ec7cbcce45d8a68ab1c12c99933cfeb0cb332567e67a27eea2f" +checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" [[package]] name = "solana-sdk" -version = "2.1.7" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf67076763533f4b43210ad2b966672b8d8b1c837f69987bb780e6c4e6d549" +checksum = "e8af90d2ce445440e0548fa4a5f96fe8b265c22041a68c942012ffadd029667d" dependencies = [ "bincode", - "bitflags", - "borsh 1.5.3", "bs58 0.5.1", - "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", - "log", - "memmap2", - "num-derive 0.4.2", - "num-traits", - "num_enum", - "pbkdf2 0.11.0", - "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-client-traits", + "solana-cluster-type", + "solana-commitment-config", + "solana-compute-budget-interface", "solana-decode-error", "solana-derivation-path", + "solana-ed25519-program", + "solana-epoch-info", + "solana-epoch-rewards-hasher", "solana-feature-set", + "solana-fee-structure", + "solana-genesis-config", + "solana-hard-forks", "solana-inflation", "solana-instruction", + "solana-keypair", + "solana-message", "solana-native-token", + "solana-nonce-account", + "solana-offchain-message", "solana-packet", + "solana-poh-config", "solana-precompile-error", - "solana-program 2.1.7", + "solana-precompiles", + "solana-presigner", + "solana-program 2.2.1", "solana-program-memory", "solana-pubkey", + "solana-quic-definitions", + "solana-rent-collector", + "solana-rent-debits", + "solana-reserved-account-keys", + "solana-reward-info", "solana-sanitize", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", + "solana-secp256k1-program", "solana-secp256k1-recover", "solana-secp256r1-program", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-serde", "solana-serde-varint", "solana-short-vec", + "solana-shred-version", "solana-signature", + "solana-signer", + "solana-system-transaction", + "solana-time-utils", + "solana-transaction", + "solana-transaction-context", "solana-transaction-error", - "thiserror", + "solana-validator-exit", + "thiserror 2.0.12", "wasm-bindgen", ] +[[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 = "1.18.26" @@ -2541,9 +3128,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c160cb22c3671fe2e0fd7c3630701cfccae308174d8d31d7fc93386c3cc381" +checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" dependencies = [ "bs58 0.5.1", "proc-macro2", @@ -2551,46 +3138,93 @@ dependencies = [ "syn 2.0.90", ] +[[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.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ece1b12237c7755a2070ab1d309a236b506041dd1d7927c7053b04cd3203728" +checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" dependencies = [ - "borsh 1.5.3", + "borsh 1.5.7", "libsecp256k1", "solana-define-syscall", - "thiserror", + "thiserror 2.0.12", ] [[package]] name = "solana-secp256r1-program" -version = "2.1.7" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298640939d73b9229445f611d5db91bb53edf860f211911e9abc3b666799b12e" +checksum = "5cda2aa1bbaceda14763c4f142a00b486f2f262cfd901bd0410649ad0404d5f7" dependencies = [ "bytemuck", "openssl", "solana-feature-set", "solana-instruction", "solana-precompile-error", - "solana-pubkey", + "solana-sdk-ids", +] + +[[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 0.11.0", + "sha2 0.10.8", +] + +[[package]] +name = "solana-serde" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1931484a408af466e14171556a47adaa215953c7f48b24e5f6b0282763818b04" +dependencies = [ + "serde", ] [[package]] name = "solana-serde-varint" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef862fbe970f90d0e024c6dfca71f25210ec9a52c0e62d94249aae10bda8e97" +checksum = "bcc07d00200d82e6def2f7f7a45738e3406b17fe54a18adcf0defa16a97ccadb" dependencies = [ "serde", ] [[package]] name = "solana-serialize-utils" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f1cdaa53aea6fa76dbacd1504e307c4d9665edd50d6d2c5154cd1f88caa1d2" +checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" dependencies = [ "solana-instruction", "solana-pubkey", @@ -2599,9 +3233,9 @@ dependencies = [ [[package]] name = "solana-sha256-hasher" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4806e0ffeeb460968219b6a20176b1dc616089e84de1cd37e50cf7f01e295ad9" +checksum = "0037386961c0d633421f53560ad7c80675c0447cba4d1bb66d60974dd486c7ea" dependencies = [ "sha2 0.10.8", "solana-define-syscall", @@ -2610,76 +3244,239 @@ dependencies = [ [[package]] name = "solana-short-vec" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824dee0886a8504a62a0c06bf95928d43cec0b077992d2b543e0f898775a4931" +checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" dependencies = [ "serde", ] +[[package]] +name = "solana-shred-version" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afd3db0461089d1ad1a78d9ba3f15b563899ca2386351d38428faa5350c60a98" +dependencies = [ + "solana-hard-forks", + "solana-hash", + "solana-sha256-hasher", +] + [[package]] name = "solana-signature" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29cb6cae156bc2c80ae34b2b365cf460be974cf5c68799e7024615f88f54aed4" +checksum = "47d251c8f3dc015f320b4161daac7f108156c837428e5a8cc61136d25beb11d6" dependencies = [ "bs58 0.5.1", "ed25519-dalek", - "generic-array", "rand 0.8.5", "serde", + "serde-big-array", "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.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "409010900f8c357c6cb7bec25014f96e7a0826ca47c915f61f94358b01df9f68" +checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" dependencies = [ "serde", "serde_derive", "solana-hash", + "solana-sdk-ids", "solana-sysvar-id", ] [[package]] name = "solana-slot-history" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82dfd06c84fa3baea6686178b34be9f9485849045ba401c5d0e8eee2eaf485ab" +checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" dependencies = [ "bv", "serde", "serde_derive", + "solana-sdk-ids", "solana-sysvar-id", ] [[package]] name = "solana-stable-layout" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1629426668b0c503ce86e2fad9ed6d9d525efa958365e6b890397af491c545" +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.7", + "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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94d7c18cb1a91c6be5f5a8ac9276a1d7c737e39a21beba9ea710ab4b9c63bc90" +dependencies = [ + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-decode-error", + "solana-instruction", + "solana-pubkey", + "wasm-bindgen", +] + +[[package]] +name = "solana-system-transaction" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd98a25e5bcba8b6be8bcbb7b84b24c2a6a8178d7fb0e3077a916855ceba91a" +dependencies = [ + "solana-hash", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signer", + "solana-system-interface", + "solana-transaction", +] + +[[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 2.2.1", + "solana-slot-hashes", + "solana-slot-history", + "solana-stake-interface", + "solana-sysvar-id", +] + [[package]] name = "solana-sysvar-id" -version = "2.1.7" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +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-transaction" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abec848d081beb15a324c633cd0e0ab33033318063230389895cae503ec9b544" +dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-bincode", + "solana-feature-set", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-precompiles", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction-error", + "wasm-bindgen", +] + +[[package]] +name = "solana-transaction-context" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ec6dbb5d57e773722824069d1b2283e552f0363b1be39aa177b1d77b51ea6e" +checksum = "5022de04cbba05377f68bf848c8c1322ead733f88a657bf792bb40f3257b8218" dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-account", + "solana-instruction", "solana-pubkey", + "solana-rent", + "solana-signature", ] [[package]] name = "solana-transaction-error" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832ead1987e67eb4cd9a742b8e778169966d600955a39efa50b83a6bb3dec6d3" +checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" dependencies = [ "serde", "serde_derive", @@ -2687,6 +3484,36 @@ dependencies = [ "solana-sanitize", ] +[[package]] +name = "solana-validator-exit" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bbf6d7a3c0b28dd5335c52c0e9eae49d0ae489a8f324917faf0ded65a812c1d" + +[[package]] +name = "solana-vote-interface" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b630547b7f12ee742e1c5069951fedba0fe5cbd4786f6342a779384e2b11f71" +dependencies = [ + "bincode", + "num-derive 0.4.2", + "num-traits", + "serde", + "serde_derive", + "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 = "strsim" version = "0.11.1" @@ -2721,13 +3548,31 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + [[package]] name = "thiserror" version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl 2.0.12", ] [[package]] @@ -2741,6 +3586,17 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "time" version = "0.3.36" @@ -2785,7 +3641,7 @@ dependencies = [ "rand 0.7.3", "rustc-hash", "sha2 0.9.9", - "thiserror", + "thiserror 1.0.69", "unicode-normalization", "wasm-bindgen", "zeroize", @@ -2912,24 +3768,24 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.90", @@ -2938,9 +3794,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2948,9 +3804,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -2961,9 +3817,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" @@ -2975,6 +3834,37 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + [[package]] name = "windows-core" version = "0.52.0" @@ -2984,6 +3874,21 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-targets" version = "0.52.6" diff --git a/packages/renderers-rust/e2e/dummy/Cargo.toml b/packages/renderers-rust/e2e/dummy/Cargo.toml index 957e3774d..301182130 100644 --- a/packages/renderers-rust/e2e/dummy/Cargo.toml +++ b/packages/renderers-rust/e2e/dummy/Cargo.toml @@ -17,7 +17,8 @@ num-derive = "^0.3" num-traits = "^0.2" serde = { version = "^1.0", features = ["derive"], optional = true } serde_with = { version = "^3.0", optional = true } -solana-program = "^2.1.6" +solana-program = "2.2.1" +solana-pubkey = { version = "2.2.1", features = ["curve25519"] } serde-big-array = { version = "^0.5", optional = true } thiserror = "^1.0" diff --git a/packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction6.rs b/packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction6.rs index fd94bfa30..a218d2795 100644 --- a/packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction6.rs +++ b/packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction6.rs @@ -11,7 +11,7 @@ use borsh::BorshSerialize; /// Accounts. #[derive(Debug)] pub struct Instruction6 { - pub my_account: solana_program::pubkey::Pubkey, + pub my_account: solana_pubkey::Pubkey, } impl Instruction6 { @@ -63,7 +63,7 @@ impl Default for Instruction6InstructionData { /// 0. `[writable]` my_account #[derive(Clone, Debug, Default)] pub struct Instruction6Builder { - my_account: Option, + my_account: Option, __remaining_accounts: Vec, } @@ -72,7 +72,7 @@ impl Instruction6Builder { Self::default() } #[inline(always)] - pub fn my_account(&mut self, my_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn my_account(&mut self, my_account: solana_pubkey::Pubkey) -> &mut Self { self.my_account = Some(my_account); self } diff --git a/packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction7.rs b/packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction7.rs index 34ffbcf65..c9c540358 100644 --- a/packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction7.rs +++ b/packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction7.rs @@ -11,7 +11,7 @@ use borsh::BorshSerialize; /// Accounts. #[derive(Debug)] pub struct Instruction7 { - pub my_account: Option, + pub my_account: Option, } impl Instruction7 { @@ -69,7 +69,7 @@ impl Default for Instruction7InstructionData { /// 0. `[writable, optional]` my_account #[derive(Clone, Debug, Default)] pub struct Instruction7Builder { - my_account: Option, + my_account: Option, __remaining_accounts: Vec, } @@ -79,7 +79,7 @@ impl Instruction7Builder { } /// `[optional account]` #[inline(always)] - pub fn my_account(&mut self, my_account: Option) -> &mut Self { + pub fn my_account(&mut self, my_account: Option) -> &mut Self { self.my_account = my_account; self } diff --git a/packages/renderers-rust/e2e/dummy/src/generated/programs.rs b/packages/renderers-rust/e2e/dummy/src/generated/programs.rs index 725548064..bfb8c2097 100644 --- a/packages/renderers-rust/e2e/dummy/src/generated/programs.rs +++ b/packages/renderers-rust/e2e/dummy/src/generated/programs.rs @@ -5,7 +5,7 @@ //! //! -use solana_program::{pubkey, pubkey::Pubkey}; +use solana_pubkey::{pubkey, Pubkey}; /// `dummy` program ID. pub const DUMMY_ID: Pubkey = pubkey!("Dummy11111111111111111111111111111111111111"); diff --git a/packages/renderers-rust/e2e/memo/Cargo.lock b/packages/renderers-rust/e2e/memo/Cargo.lock index a090d556e..38c03b518 100644 --- a/packages/renderers-rust/e2e/memo/Cargo.lock +++ b/packages/renderers-rust/e2e/memo/Cargo.lock @@ -20,6 +20,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom 0.2.14", "once_cell", "version_check", "zerocopy", @@ -168,7 +169,7 @@ dependencies = [ "bytemuck", "getrandom 0.2.14", "solana-program 1.18.12", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -200,7 +201,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "syn 1.0.109", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -247,7 +248,7 @@ dependencies = [ "ark-std", "derivative", "hashbrown 0.13.2", - "itertools 0.10.5", + "itertools", "num-traits", "zeroize", ] @@ -264,7 +265,7 @@ dependencies = [ "ark-std", "derivative", "digest 0.10.7", - "itertools 0.10.5", + "itertools", "num-bigint", "num-traits", "paste", @@ -359,6 +360,17 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + [[package]] name = "autocfg" version = "1.2.0" @@ -394,9 +406,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.6.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" dependencies = [ "serde", ] @@ -464,11 +476,11 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.3" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03" +checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce" dependencies = [ - "borsh-derive 1.5.3", + "borsh-derive 1.5.7", "cfg_aliases", ] @@ -500,9 +512,9 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.3" +version = "1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2593a3b8b938bd68373196c9832f516be11fa487ef4ae745eb282e6a56a7244" +checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3" dependencies = [ "once_cell", "proc-macro-crate 3.1.0", @@ -658,15 +670,15 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", "serde", - "windows-targets", + "windows-link", ] [[package]] @@ -682,9 +694,10 @@ dependencies = [ "serde", "serde-big-array", "serde_with", - "solana-program 2.1.7", + "solana-program 2.2.1", + "solana-pubkey", "solana-sdk", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -944,6 +957,19 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" +[[package]] +name = "env_logger" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -1074,6 +1100,15 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + [[package]] name = "hex" version = "0.4.3" @@ -1110,6 +1145,12 @@ dependencies = [ "hmac 0.8.1", ] +[[package]] +name = "humantime" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" + [[package]] name = "iana-time-zone" version = "0.1.60" @@ -1186,15 +1227,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.11" @@ -1212,9 +1244,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ "once_cell", "wasm-bindgen", @@ -1246,9 +1278,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libsecp256k1" @@ -1307,7 +1339,7 @@ dependencies = [ "ark-bn254", "ark-ff", "num-bigint", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1322,9 +1354,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "memchr" @@ -1568,9 +1600,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" dependencies = [ "unicode-ident", ] @@ -1810,9 +1842,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -1899,6 +1931,25 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + [[package]] name = "signature" version = "1.6.4" @@ -1929,23 +1980,27 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "solana-account" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d6ef82dab153c60b1da169126d8eca1b62bbf4026f95a45a71897f3e9a0224" +checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" dependencies = [ "bincode", "serde", "serde_bytes", "serde_derive", + "solana-account-info", + "solana-clock", "solana-instruction", - "solana-program 2.1.7", + "solana-pubkey", + "solana-sdk-ids", + "solana-sysvar", ] [[package]] name = "solana-account-info" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8378a48833ee7f828e20a63e93a6cdaef1313a8fd8f71a90b243df83295987b1" +checksum = "e0c17d606a298a205fae325489fbed88ee6dc4463c111672172327e741c8905d" dependencies = [ "bincode", "serde", @@ -1954,68 +2009,164 @@ 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.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6f9da603778bbee6402ee2526a3b219b85497c10e49f9c7c112ed8836f46d3" +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", + "num-traits", + "solana-define-syscall", +] + [[package]] name = "solana-bincode" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb75b5d25ae05cfddb8b9b53512f17c18c29e3c92b7a848f39598473e6bf6484" +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.7" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6df7c5b61b4ed3961cbaef5f38c58d1ee9a2268cbe607c67a54083b7b02d6276" +checksum = "4420f125118732833f36facf96a27e7b78314b2d642ba07fa9ffdacd8d79e243" dependencies = [ "ark-bn254", "ark-ec", "ark-ff", "ark-serialize", "bytemuck", - "solana-program 2.1.7", - "thiserror", + "solana-define-syscall", + "thiserror 2.0.12", ] [[package]] name = "solana-borsh" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055c45b7aae61c8c7b26a537f7a8387cc8a10036081ddfd7170a7a9b4d924ffd" +checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" dependencies = [ "borsh 0.10.3", - "borsh 1.5.3", + "borsh 1.5.7", +] + +[[package]] +name = "solana-client-traits" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83f0071874e629f29e0eb3dab8a863e98502ac7aba55b7e0df1803fc5cac72a7" +dependencies = [ + "solana-account", + "solana-commitment-config", + "solana-epoch-info", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", ] [[package]] name = "solana-clock" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d6af32497acc6bb09d8150ea6f53df25dbad713991741999d46688beaf944e" +checksum = "67c2177a1b9fe8326004f1151a5acd124420b737811080b1035df31349e4d892" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "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 = [ + "serde", + "serde_derive", + "solana-hash", +] + +[[package]] +name = "solana-commitment-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac49c4dde3edfa832de1697e9bcdb7c3b3f7cb7a1981b7c62526c8bb6700fb73" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-compute-budget-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a5df17b195d312b66dccdde9beec6709766d8230cb4718c4c08854f780d0309" +dependencies = [ + "borsh 1.5.7", + "serde", + "serde_derive", + "solana-instruction", + "solana-sdk-ids", +] + [[package]] name = "solana-cpi" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b06ac8e2ebf8a5b8a54645b721f92f5d7a6d116550bbf1817167cc48abeb1" +checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" dependencies = [ "solana-account-info", "solana-define-syscall", @@ -2027,50 +2178,141 @@ dependencies = [ [[package]] name = "solana-decode-error" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99f2fe3170045ae27951ae476a0c88a40130b242736f033ba5e353cd6f816b8e" +checksum = "10a6a6383af236708048f8bd8d03db8ca4ff7baf4a48e5d580f4cce545925470" dependencies = [ "num-traits", ] [[package]] name = "solana-define-syscall" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14a80d323dbe8866aaefb40e3c11564d82f77894d193fa66583e793f3d845723" +checksum = "cf784bb2cb3e02cac9801813c30187344228d2ae952534902108f6150573a33d" [[package]] name = "solana-derivation-path" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff423e05929ec73c0997aa0d4aeae7a7bb52ccabc23699ceaa1f2ae854a5fa4" +checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" dependencies = [ "derivation-path", "qstring", "uriparse", ] +[[package]] +name = "solana-ed25519-program" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0fc717048fdbe5d2ee7d673d73e6a30a094002f4a29ca7630ac01b6bddec04" +dependencies = [ + "bytemuck", + "bytemuck_derive", + "ed25519-dalek", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", +] + +[[package]] +name = "solana-epoch-info" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ef6f0b449290b0b9f32973eefd95af35b01c5c0c34c569f936c34c5b20d77b" +dependencies = [ + "serde", + "serde_derive", +] + +[[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 2.2.1", + "solana-sysvar-id", +] + +[[package]] +name = "solana-epoch-rewards-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c5fd2662ae7574810904585fd443545ed2b568dbd304b25a31e79ccc76e81b" +dependencies = [ + "siphasher", + "solana-hash", + "solana-pubkey", +] + [[package]] name = "solana-epoch-schedule" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276fda33b7de27df41e3043f344e517d5e85ab345d2f2aa2425d1011bac570c4" +checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "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.7" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "155ef7ddcf7b75ef92d992839bd00ac4ee02bdfe0fa4d95daf0534b830b1bc0e" +checksum = "92f6c09cc41059c0e03ccbee7f5d4cc0a315d68ef0d59b67eb90246adfd8cc35" dependencies = [ + "ahash 0.8.11", "lazy_static", - "solana-clock", "solana-epoch-schedule", "solana-hash", "solana-pubkey", @@ -2079,15 +2321,27 @@ dependencies = [ [[package]] name = "solana-fee-calculator" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc0371153eda80024109800051b87bab11f056fae260ca477a50875aaffdfde" +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 = [ + "serde", + "serde_derive", + "solana-message", + "solana-native-token", +] + [[package]] name = "solana-frozen-abi" version = "1.18.12" @@ -2110,7 +2364,7 @@ dependencies = [ "sha2 0.10.8", "solana-frozen-abi-macro", "subtle", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2125,13 +2379,54 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "solana-genesis-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968dabd2b92d57131473eddbd475339da530e14f54397386abf303de3a2595a2" +dependencies = [ + "bincode", + "chrono", + "memmap2", + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-cluster-type", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-inflation", + "solana-keypair", + "solana-logger", + "solana-native-token", + "solana-poh-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-sha256-hasher", + "solana-shred-version", + "solana-signer", + "solana-time-utils", +] + +[[package]] +name = "solana-hard-forks" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c28371f878e2ead55611d8ba1b5fb879847156d04edea13693700ad1a28baf" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "solana-hash" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7067f2bd1e9c3f28153484f03e44bf8dc73cededa6bc132e40de9bfc667b8534" +checksum = "cf7bcb14392900fe02e4e34e90234fbf0c673d4e327888410ba99fa2ba0f4e99" dependencies = [ - "borsh 1.5.3", + "borsh 1.5.7", "bs58 0.5.1", "bytemuck", "bytemuck_derive", @@ -2145,9 +2440,9 @@ dependencies = [ [[package]] name = "solana-inflation" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4e27906f90ba8df331903292a499cc776e70ee29995da4bf5a81b54d27edefa" +checksum = "23eef6a09eb8e568ce6839573e4966850e85e9ce71e6ae1a6c930c1c43947de3" dependencies = [ "serde", "serde_derive", @@ -2155,12 +2450,12 @@ dependencies = [ [[package]] name = "solana-instruction" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dbf607aff88e4f17079a33d34517b7f379d752dfa0496a94cea798a91e6f6ee" +checksum = "9ce496a475e5062ba5de97215ab39d9c358f9c9df4bb7f3a45a1f1a8bd9065ed" dependencies = [ "bincode", - "borsh 1.5.3", + "borsh 1.5.7", "getrandom 0.2.14", "js-sys", "num-traits", @@ -2172,54 +2467,263 @@ dependencies = [ ] [[package]] -name = "solana-last-restart-slot" -version = "2.1.7" +name = "solana-instructions-sysvar" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f2ee9af7a2815137c60d77cb930c26480bc802b55e00d9e230e81fd308062e" +checksum = "427f2d0d6dc0bb49f16cef5e7f975180d2e80aab9bdd3b2af68e2d029ec63f43" dependencies = [ - "serde", - "serde_derive", - "solana-sdk-macro 2.1.7", + "bitflags", + "solana-account-info", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-serialize-utils", "solana-sysvar-id", ] [[package]] -name = "solana-msg" -version = "2.1.7" +name = "solana-keccak-hasher" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cd9c6ed9d4d036da00c958f0f98edb248c08eb596975011a30063ac3aa902" +checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" dependencies = [ + "sha3", "solana-define-syscall", + "solana-hash", + "solana-sanitize", ] [[package]] -name = "solana-native-token" -version = "2.1.7" +name = "solana-keypair" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08ef55ad8dcc8c5f21e2bbbc7298fa59550269e8bdf2c6976c4de626ea8a0069" +checksum = "3dbb7042c2e0c561afa07242b2099d55c57bd1b1da3b6476932197d84e15e3e4" +dependencies = [ + "bs58 0.5.1", + "ed25519-dalek", + "ed25519-dalek-bip32", + "rand 0.7.3", + "solana-derivation-path", + "solana-pubkey", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-signature", + "solana-signer", + "wasm-bindgen", +] [[package]] -name = "solana-packet" -version = "2.1.7" +name = "solana-last-restart-slot" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfac9266a6cb79d0d37a7ae1a9944559caa286d93005773bf8005583ffcd652c" +checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" dependencies = [ - "bincode", - "bitflags", - "cfg_eval", "serde", "serde_derive", - "serde_with", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", + "solana-sysvar-id", ] [[package]] -name = "solana-precompile-error" -version = "2.1.7" +name = "solana-loader-v2-interface" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a85f003d72bcc94cd394dcbef150bb18ccd03bd5fee6b6e8927bb0fbbe26d" +checksum = "d8ab08006dad78ae7cd30df8eea0539e207d08d91eaefb3e1d49a446e1c49654" dependencies = [ - "num-traits", - "solana-decode-error", + "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-logger" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8e777ec1afd733939b532a42492d888ec7c88d8b4127a5d867eb45c6eb5cd5" +dependencies = [ + "env_logger", + "lazy_static", + "libc", + "log", + "signal-hook", +] + +[[package]] +name = "solana-message" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6bf99c4570173710107a1f233f3bee226feea5fc817308707d4f7cb100a72d" +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-msg" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" +dependencies = [ + "solana-define-syscall", +] + +[[package]] +name = "solana-native-token" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e9de00960197412e4be3902a6cd35e60817c511137aca6c34c66cd5d4017ec" + +[[package]] +name = "solana-nonce" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" +dependencies = [ + "serde", + "serde_derive", + "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-offchain-message" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b526398ade5dea37f1f147ce55dae49aa017a5d7326606359b0445ca8d946581" +dependencies = [ + "num_enum", + "solana-hash", + "solana-packet", + "solana-pubkey", + "solana-sanitize", + "solana-sha256-hasher", + "solana-signature", + "solana-signer", +] + +[[package]] +name = "solana-packet" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127" +dependencies = [ + "bincode", + "bitflags", + "cfg_eval", + "serde", + "serde_derive", + "serde_with", +] + +[[package]] +name = "solana-poh-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d650c3b4b9060082ac6b0efbbb66865089c58405bfb45de449f3f2b91eccee75" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-precompile-error" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +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-presigner" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81a57a24e6a4125fc69510b6774cd93402b943191b6cddad05de7281491c90fe" +dependencies = [ + "solana-pubkey", + "solana-signature", + "solana-signer", ] [[package]] @@ -2238,7 +2742,7 @@ dependencies = [ "blake3", "borsh 0.10.3", "borsh 0.9.3", - "borsh 1.5.3", + "borsh 1.5.7", "bs58 0.4.0", "bv", "bytemuck", @@ -2247,7 +2751,7 @@ dependencies = [ "console_log", "curve25519-dalek 3.2.1", "getrandom 0.2.14", - "itertools 0.10.5", + "itertools", "js-sys", "lazy_static", "libc", @@ -2271,7 +2775,7 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-sdk-macro 1.18.12", - "thiserror", + "thiserror 1.0.69", "tiny-bip39", "wasm-bindgen", "zeroize", @@ -2279,54 +2783,57 @@ dependencies = [ [[package]] name = "solana-program" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c693c5c392bacc44e7a86baa18069eb966d88afbc9040219ca000e873fb02e" +checksum = "586469467e93ceb79048f8d8e3a619bf61d05396ee7de95cb40280301a589d05" dependencies = [ - "base64 0.22.1", "bincode", - "bitflags", "blake3", "borsh 0.10.3", - "borsh 1.5.3", + "borsh 1.5.7", "bs58 0.5.1", - "bv", "bytemuck", - "bytemuck_derive", "console_error_panic_hook", "console_log", - "curve25519-dalek 4.1.3", - "five8_const", "getrandom 0.2.14", - "js-sys", "lazy_static", "log", "memoffset", "num-bigint", "num-derive 0.4.2", "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", @@ -2335,7 +2842,8 @@ dependencies = [ "solana-pubkey", "solana-rent", "solana-sanitize", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "solana-secp256k1-recover", "solana-serde-varint", "solana-serialize-utils", @@ -2344,17 +2852,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", + "solana-vote-interface", + "thiserror 2.0.12", "wasm-bindgen", ] [[package]] name = "solana-program-entrypoint" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0696f51a4386f92f4e1807059bd2b649c207688b9249df332d0fd5ecac240c" +checksum = "473ffe73c68d93e9f2aa726ad2985fe52760052709aaab188100a42c618060ec" dependencies = [ "solana-account-info", "solana-msg", @@ -2364,11 +2875,11 @@ dependencies = [ [[package]] name = "solana-program-error" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd557d10df4380234f5b4a5971a0cae29eedcc42ebe4bbe926a21ff31912e99" +checksum = "d8ae2c1a8d0d4ae865882d5770a7ebca92bab9c685e43f0461682c6c05a35bfa" dependencies = [ - "borsh 1.5.3", + "borsh 1.5.7", "num-traits", "serde", "serde_derive", @@ -2380,9 +2891,9 @@ dependencies = [ [[package]] name = "solana-program-memory" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef71296a3fa6ebaa38ae522bea71af82b7deeea170e459efa3c539b8f14e0155" +checksum = "1b0268f6c89825fb634a34bd0c3b8fdaeaecfc3728be1d622a8ee6dd577b60d4" dependencies = [ "num-traits", "solana-define-syscall", @@ -2390,27 +2901,27 @@ dependencies = [ [[package]] name = "solana-program-option" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "506908720b9b1660f2087d9c6f45ba208fa67a0f34658804517324ef65fd432b" +checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" [[package]] name = "solana-program-pack" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21820c32999ce24532fb12d6188daeffa27eb88a366505a4a0553857729aae52" +checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" dependencies = [ "solana-program-error", ] [[package]] name = "solana-pubkey" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c46701a845b731f2ffcf002c4bb08968434b9cf5e576cdd705259421074d1764" +checksum = "40db1ff5a0f8aea2c158d78ab5f2cf897848964251d1df42fef78efd3c85b863" dependencies = [ "borsh 0.10.3", - "borsh 1.5.3", + "borsh 1.5.7", "bs58 0.5.1", "bytemuck", "bytemuck_derive", @@ -2430,88 +2941,163 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "solana-quic-definitions" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e606feac5110eb5d8afaa43ccaeea3ec49ccec36773387930b5ba545e745aea2" +dependencies = [ + "solana-keypair", +] + [[package]] name = "solana-rent" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05a4d15fe63d0e9a9551adfecfec495e3d50ba0bc4705001010c724fe84f65d8" +checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "solana-sysvar-id", ] +[[package]] +name = "solana-rent-collector" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c1e19f5d5108b0d824244425e43bc78bbb9476e2199e979b0230c9f632d3bf4" +dependencies = [ + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-epoch-schedule", + "solana-genesis-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", +] + +[[package]] +name = "solana-rent-debits" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f6f9113c6003492e74438d1288e30cffa8ccfdc2ef7b49b9e816d8034da18cd" +dependencies = [ + "solana-pubkey", + "solana-reward-info", +] + +[[package]] +name = "solana-reserved-account-keys" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b293f4246626c0e0a991531f08848a713ada965612e99dc510963f04d12cae7" +dependencies = [ + "lazy_static", + "solana-feature-set", + "solana-pubkey", + "solana-sdk-ids", +] + +[[package]] +name = "solana-reward-info" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18205b69139b1ae0ab8f6e11cdcb627328c0814422ad2482000fa2ca54ae4a2f" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "solana-sanitize" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b8c536460c84ec7cbcce45d8a68ab1c12c99933cfeb0cb332567e67a27eea2f" +checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" [[package]] name = "solana-sdk" -version = "2.1.7" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bf67076763533f4b43210ad2b966672b8d8b1c837f69987bb780e6c4e6d549" +checksum = "e8af90d2ce445440e0548fa4a5f96fe8b265c22041a68c942012ffadd029667d" dependencies = [ "bincode", - "bitflags", - "borsh 1.5.3", "bs58 0.5.1", - "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", - "log", - "memmap2", - "num-derive 0.4.2", - "num-traits", - "num_enum", - "pbkdf2 0.11.0", - "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-client-traits", + "solana-cluster-type", + "solana-commitment-config", + "solana-compute-budget-interface", "solana-decode-error", "solana-derivation-path", + "solana-ed25519-program", + "solana-epoch-info", + "solana-epoch-rewards-hasher", "solana-feature-set", + "solana-fee-structure", + "solana-genesis-config", + "solana-hard-forks", "solana-inflation", "solana-instruction", + "solana-keypair", + "solana-message", "solana-native-token", + "solana-nonce-account", + "solana-offchain-message", "solana-packet", + "solana-poh-config", "solana-precompile-error", - "solana-program 2.1.7", + "solana-precompiles", + "solana-presigner", + "solana-program 2.2.1", "solana-program-memory", "solana-pubkey", + "solana-quic-definitions", + "solana-rent-collector", + "solana-rent-debits", + "solana-reserved-account-keys", + "solana-reward-info", "solana-sanitize", - "solana-sdk-macro 2.1.7", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", + "solana-secp256k1-program", "solana-secp256k1-recover", "solana-secp256r1-program", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-serde", "solana-serde-varint", "solana-short-vec", + "solana-shred-version", "solana-signature", + "solana-signer", + "solana-system-transaction", + "solana-time-utils", + "solana-transaction", + "solana-transaction-context", "solana-transaction-error", - "thiserror", + "solana-validator-exit", + "thiserror 2.0.12", "wasm-bindgen", ] +[[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 = "1.18.12" @@ -2527,9 +3113,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24c160cb22c3671fe2e0fd7c3630701cfccae308174d8d31d7fc93386c3cc381" +checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" dependencies = [ "bs58 0.5.1", "proc-macro2", @@ -2537,46 +3123,93 @@ dependencies = [ "syn 2.0.90", ] +[[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.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ece1b12237c7755a2070ab1d309a236b506041dd1d7927c7053b04cd3203728" +checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" dependencies = [ - "borsh 1.5.3", + "borsh 1.5.7", "libsecp256k1", "solana-define-syscall", - "thiserror", + "thiserror 2.0.12", ] [[package]] name = "solana-secp256r1-program" -version = "2.1.7" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "298640939d73b9229445f611d5db91bb53edf860f211911e9abc3b666799b12e" +checksum = "5cda2aa1bbaceda14763c4f142a00b486f2f262cfd901bd0410649ad0404d5f7" dependencies = [ "bytemuck", "openssl", "solana-feature-set", "solana-instruction", "solana-precompile-error", - "solana-pubkey", + "solana-sdk-ids", +] + +[[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 0.11.0", + "sha2 0.10.8", +] + +[[package]] +name = "solana-serde" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1931484a408af466e14171556a47adaa215953c7f48b24e5f6b0282763818b04" +dependencies = [ + "serde", ] [[package]] name = "solana-serde-varint" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef862fbe970f90d0e024c6dfca71f25210ec9a52c0e62d94249aae10bda8e97" +checksum = "bcc07d00200d82e6def2f7f7a45738e3406b17fe54a18adcf0defa16a97ccadb" dependencies = [ "serde", ] [[package]] name = "solana-serialize-utils" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f1cdaa53aea6fa76dbacd1504e307c4d9665edd50d6d2c5154cd1f88caa1d2" +checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" dependencies = [ "solana-instruction", "solana-pubkey", @@ -2585,9 +3218,9 @@ dependencies = [ [[package]] name = "solana-sha256-hasher" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4806e0ffeeb460968219b6a20176b1dc616089e84de1cd37e50cf7f01e295ad9" +checksum = "0037386961c0d633421f53560ad7c80675c0447cba4d1bb66d60974dd486c7ea" dependencies = [ "sha2 0.10.8", "solana-define-syscall", @@ -2596,76 +3229,239 @@ dependencies = [ [[package]] name = "solana-short-vec" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824dee0886a8504a62a0c06bf95928d43cec0b077992d2b543e0f898775a4931" +checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" dependencies = [ "serde", ] +[[package]] +name = "solana-shred-version" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afd3db0461089d1ad1a78d9ba3f15b563899ca2386351d38428faa5350c60a98" +dependencies = [ + "solana-hard-forks", + "solana-hash", + "solana-sha256-hasher", +] + [[package]] name = "solana-signature" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29cb6cae156bc2c80ae34b2b365cf460be974cf5c68799e7024615f88f54aed4" +checksum = "47d251c8f3dc015f320b4161daac7f108156c837428e5a8cc61136d25beb11d6" dependencies = [ "bs58 0.5.1", "ed25519-dalek", - "generic-array", "rand 0.8.5", "serde", + "serde-big-array", "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.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "409010900f8c357c6cb7bec25014f96e7a0826ca47c915f61f94358b01df9f68" +checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" dependencies = [ "serde", "serde_derive", "solana-hash", + "solana-sdk-ids", "solana-sysvar-id", ] [[package]] name = "solana-slot-history" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82dfd06c84fa3baea6686178b34be9f9485849045ba401c5d0e8eee2eaf485ab" +checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" dependencies = [ "bv", "serde", "serde_derive", + "solana-sdk-ids", "solana-sysvar-id", ] [[package]] name = "solana-stable-layout" -version = "2.1.7" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +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.3", + "borsh 1.5.7", + "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" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1629426668b0c503ce86e2fad9ed6d9d525efa958365e6b890397af491c545" +checksum = "94d7c18cb1a91c6be5f5a8ac9276a1d7c737e39a21beba9ea710ab4b9c63bc90" dependencies = [ + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-decode-error", "solana-instruction", "solana-pubkey", + "wasm-bindgen", +] + +[[package]] +name = "solana-system-transaction" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd98a25e5bcba8b6be8bcbb7b84b24c2a6a8178d7fb0e3077a916855ceba91a" +dependencies = [ + "solana-hash", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signer", + "solana-system-interface", + "solana-transaction", +] + +[[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 2.2.1", + "solana-slot-hashes", + "solana-slot-history", + "solana-stake-interface", + "solana-sysvar-id", ] [[package]] name = "solana-sysvar-id" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ec6dbb5d57e773722824069d1b2283e552f0363b1be39aa177b1d77b51ea6e" +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-transaction" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abec848d081beb15a324c633cd0e0ab33033318063230389895cae503ec9b544" +dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-bincode", + "solana-feature-set", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-precompiles", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction-error", + "wasm-bindgen", +] + +[[package]] +name = "solana-transaction-context" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5022de04cbba05377f68bf848c8c1322ead733f88a657bf792bb40f3257b8218" +dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-account", + "solana-instruction", + "solana-pubkey", + "solana-rent", + "solana-signature", ] [[package]] name = "solana-transaction-error" -version = "2.1.7" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832ead1987e67eb4cd9a742b8e778169966d600955a39efa50b83a6bb3dec6d3" +checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" dependencies = [ "serde", "serde_derive", @@ -2673,6 +3469,36 @@ dependencies = [ "solana-sanitize", ] +[[package]] +name = "solana-validator-exit" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bbf6d7a3c0b28dd5335c52c0e9eae49d0ae489a8f324917faf0ded65a812c1d" + +[[package]] +name = "solana-vote-interface" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b630547b7f12ee742e1c5069951fedba0fe5cbd4786f6342a779384e2b11f71" +dependencies = [ + "bincode", + "num-derive 0.4.2", + "num-traits", + "serde", + "serde_derive", + "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 = "strsim" version = "0.10.0" @@ -2707,13 +3533,31 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + [[package]] name = "thiserror" version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl 2.0.12", ] [[package]] @@ -2727,6 +3571,17 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "time" version = "0.3.36" @@ -2771,7 +3626,7 @@ dependencies = [ "rand 0.7.3", "rustc-hash", "sha2 0.9.9", - "thiserror", + "thiserror 1.0.69", "unicode-normalization", "wasm-bindgen", "zeroize", @@ -2909,20 +3764,21 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", @@ -2934,9 +3790,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2944,9 +3800,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -2957,9 +3813,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.99" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" @@ -2971,6 +3830,37 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + [[package]] name = "windows-core" version = "0.52.0" @@ -2980,6 +3870,21 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-targets" version = "0.52.5" diff --git a/packages/renderers-rust/e2e/memo/Cargo.toml b/packages/renderers-rust/e2e/memo/Cargo.toml index 1c2ac4d8f..aa24d2919 100644 --- a/packages/renderers-rust/e2e/memo/Cargo.toml +++ b/packages/renderers-rust/e2e/memo/Cargo.toml @@ -17,7 +17,8 @@ num-derive = "^0.3" num-traits = "^0.2" serde = { version = "^1.0", features = ["derive"], optional = true } serde_with = { version = "^3.0", optional = true } -solana-program = "^2.1.6" +solana-program = "2.2.1" +solana-pubkey = { version = "2.2.1", features = ["curve25519"] } serde-big-array = { version = "^0.5", optional = true } thiserror = "^1.0" diff --git a/packages/renderers-rust/e2e/memo/src/generated/programs.rs b/packages/renderers-rust/e2e/memo/src/generated/programs.rs index 0c1ecc52c..0a94fe3b3 100644 --- a/packages/renderers-rust/e2e/memo/src/generated/programs.rs +++ b/packages/renderers-rust/e2e/memo/src/generated/programs.rs @@ -5,7 +5,7 @@ //! //! -use solana_program::{pubkey, pubkey::Pubkey}; +use solana_pubkey::{pubkey, Pubkey}; /// `memo` program ID. pub const MEMO_ID: Pubkey = pubkey!("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr"); diff --git a/packages/renderers-rust/e2e/meteora/Cargo.toml b/packages/renderers-rust/e2e/meteora/Cargo.toml index ac8e4bb1d..e4a7ca0ca 100644 --- a/packages/renderers-rust/e2e/meteora/Cargo.toml +++ b/packages/renderers-rust/e2e/meteora/Cargo.toml @@ -18,7 +18,8 @@ num-derive = "^0.3" num-traits = "^0.2" serde = { version = "^1.0", features = ["derive"], optional = true } serde_with = { version = "^3.0", optional = true } -solana-program = "^2.1.6" +solana-program = "2.2.1" +solana-pubkey = { version = "2.2.1", features = ["curve25519"] } solana-client = { version = "~1.18", optional = true } solana-sdk = { version = "~1.18", optional = true } thiserror = "^1.0" diff --git a/packages/renderers-rust/e2e/system/Cargo.lock b/packages/renderers-rust/e2e/system/Cargo.lock index e30878aba..ac0c6d8e4 100644 --- a/packages/renderers-rust/e2e/system/Cargo.lock +++ b/packages/renderers-rust/e2e/system/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 = "Inflector" @@ -245,7 +245,7 @@ dependencies = [ "bytemuck", "getrandom 0.2.15", "solana-program 1.18.26", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -289,7 +289,7 @@ dependencies = [ "serde_json", "sha2 0.10.8", "syn 1.0.109", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -345,7 +345,7 @@ dependencies = [ "ark-std", "derivative", "hashbrown 0.13.2", - "itertools 0.10.5", + "itertools", "num-traits", "zeroize", ] @@ -362,7 +362,7 @@ dependencies = [ "ark-std", "derivative", "digest 0.10.7", - "itertools 0.10.5", + "itertools", "num-bigint 0.4.6", "num-traits", "paste", @@ -469,7 +469,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -885,7 +885,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" dependencies = [ "libc", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1009,10 +1009,11 @@ dependencies = [ "serde-big-array", "serde_with 3.12.0", "solana-client", - "solana-program 2.1.11", + "solana-program 2.2.1", + "solana-pubkey", "solana-sdk 1.18.26", - "solana-sdk 2.1.11", - "thiserror", + "solana-sdk 2.2.2", + "thiserror 1.0.69", ] [[package]] @@ -2182,15 +2183,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.14" @@ -2248,9 +2240,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.169" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libsecp256k1" @@ -2309,7 +2301,7 @@ dependencies = [ "ark-bn254", "ark-ff", "num-bigint 0.4.6", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -2900,7 +2892,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "thiserror", + "thiserror 1.0.69", "tokio", "tracing", ] @@ -2918,7 +2910,7 @@ dependencies = [ "rustls", "rustls-native-certs", "slab", - "thiserror", + "thiserror 1.0.69", "tinyvec", "tracing", ] @@ -3401,9 +3393,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.137" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -3553,6 +3545,16 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -3611,16 +3613,20 @@ dependencies = [ [[package]] name = "solana-account" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2af97266ee346ef1cd1649ba462d08bd3d254e50c06c45d3e70a21871a1da6a" +checksum = "0f949fe4edaeaea78c844023bfc1c898e0b1f5a100f8a8d2d0f85d0a7b090258" dependencies = [ "bincode", "serde", "serde_bytes", "serde_derive", + "solana-account-info", + "solana-clock", "solana-instruction", - "solana-program 2.1.11", + "solana-pubkey", + "solana-sdk-ids", + "solana-sysvar", ] [[package]] @@ -3644,15 +3650,15 @@ dependencies = [ "spl-token-2022", "spl-token-group-interface", "spl-token-metadata-interface", - "thiserror", + "thiserror 1.0.69", "zstd", ] [[package]] name = "solana-account-info" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed2417317f26f0941dd8e552ac1f9768eb2aa3b7f16ec992a6833f058295bea" +checksum = "e0c17d606a298a205fae325489fbed88ee6dc4463c111672172327e741c8905d" dependencies = [ "bincode", "serde", @@ -3661,46 +3667,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.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0cd0453d46a62ed36ce234be9153a3c4d433711f1cec6943345d1637d6a0908" +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.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97957d987dc85bbfa90cb7e919ee0b071206affc0209e7221d7ea4844e7be31" +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.11" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957ce0d8b021f78f7b3c99d82b21a8dae617cf016377647c4d43a6e3141e8f2f" +checksum = "4420f125118732833f36facf96a27e7b78314b2d642ba07fa9ffdacd8d79e243" dependencies = [ "ark-bn254", "ark-ec", "ark-ff", "ark-serialize", "bytemuck", - "solana-program 2.1.11", - "thiserror", + "solana-define-syscall", + "thiserror 2.0.12", ] [[package]] name = "solana-borsh" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99affe31b10c1cd4a6438d307b92c1b17c89c974aebf2c2aa15cd790d0ba672b" +checksum = "718333bcd0a1a7aed6655aa66bef8d7fb047944922b2d3a18f49cbc13e73d004" dependencies = [ "borsh 0.10.4", "borsh 1.5.5", @@ -3717,7 +3763,7 @@ dependencies = [ "rpassword", "solana-remote-wallet", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", "tiny-bip39", "uriparse", "url", @@ -3752,22 +3798,78 @@ dependencies = [ "solana-thin-client", "solana-tpu-client", "solana-udp-client", - "thiserror", + "thiserror 1.0.69", "tokio", ] +[[package]] +name = "solana-client-traits" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83f0071874e629f29e0eb3dab8a863e98502ac7aba55b7e0df1803fc5cac72a7" +dependencies = [ + "solana-account", + "solana-commitment-config", + "solana-epoch-info", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction", + "solana-transaction-error", +] + [[package]] name = "solana-clock" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97864f28abd43d03e7ca7242059e340bb6e637e0ce99fd66f6420c43fa359898" +checksum = "67c2177a1b9fe8326004f1151a5acd124420b737811080b1035df31349e4d892" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro 2.1.11", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "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 = [ + "serde", + "serde_derive", + "solana-hash", +] + +[[package]] +name = "solana-commitment-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac49c4dde3edfa832de1697e9bcdb7c3b3f7cb7a1981b7c62526c8bb6700fb73" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-compute-budget-interface" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a5df17b195d312b66dccdde9beec6709766d8230cb4718c4c08854f780d0309" +dependencies = [ + "borsh 1.5.5", + "serde", + "serde_derive", + "solana-instruction", + "solana-sdk-ids", +] + [[package]] name = "solana-config-program" version = "1.18.26" @@ -3800,15 +3902,15 @@ dependencies = [ "solana-measure", "solana-metrics", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", "tokio", ] [[package]] name = "solana-cpi" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54c3b096dc77222b9c19ffe9cf6c1c32bd1e9882ceb955d213be4315bbe3b95" +checksum = "8dc71126edddc2ba014622fc32d0f5e2e78ec6c5a1e0eb511b85618c09e9ea11" dependencies = [ "solana-account-info", "solana-define-syscall", @@ -3820,50 +3922,141 @@ dependencies = [ [[package]] name = "solana-decode-error" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c92852914fe0cfec234576a30b1de4b11516dd729226d5de04e4c67d80447a7" +checksum = "10a6a6383af236708048f8bd8d03db8ca4ff7baf4a48e5d580f4cce545925470" dependencies = [ "num-traits", ] [[package]] name = "solana-define-syscall" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44015e77f6f321bf526f7d026b08d8f34b57b1ea6e46038fd13e59f43a53a475" +checksum = "cf784bb2cb3e02cac9801813c30187344228d2ae952534902108f6150573a33d" [[package]] name = "solana-derivation-path" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2cd4b95383d8926cc22d4a33417aa2e38897475f259cff4eb319c8cf0f7ac02" +checksum = "939756d798b25c5ec3cca10e06212bdca3b1443cb9bb740a38124f58b258737b" dependencies = [ "derivation-path", "qstring", "uriparse", ] +[[package]] +name = "solana-ed25519-program" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d0fc717048fdbe5d2ee7d673d73e6a30a094002f4a29ca7630ac01b6bddec04" +dependencies = [ + "bytemuck", + "bytemuck_derive", + "ed25519-dalek", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", +] + +[[package]] +name = "solana-epoch-info" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ef6f0b449290b0b9f32973eefd95af35b01c5c0c34c569f936c34c5b20d77b" +dependencies = [ + "serde", + "serde_derive", +] + +[[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 2.2.1", + "solana-sysvar-id", +] + +[[package]] +name = "solana-epoch-rewards-hasher" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96c5fd2662ae7574810904585fd443545ed2b568dbd304b25a31e79ccc76e81b" +dependencies = [ + "siphasher", + "solana-hash", + "solana-pubkey", +] + [[package]] name = "solana-epoch-schedule" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3409f250234ec4bbd999de3eac727ca21dfbfd39a831906f6ec112a66d2e1a2" +checksum = "3fce071fbddecc55d727b1d7ed16a629afe4f6e4c217bc8d00af3b785f6f67ed" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro 2.1.11", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "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.11" +version = "2.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ddda14ac5f2da82da4df043eabca2f2c00ac0d59f10295b8c8c3404fcc5f67" +checksum = "92f6c09cc41059c0e03ccbee7f5d4cc0a315d68ef0d59b67eb90246adfd8cc35" dependencies = [ + "ahash 0.8.11", "lazy_static", - "solana-clock", "solana-epoch-schedule", "solana-hash", "solana-pubkey", @@ -3872,15 +4065,27 @@ dependencies = [ [[package]] name = "solana-fee-calculator" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8db8c4be5e012215ed1e3394cd3c188e217dd4f0c821045e5d2c1262aac8b4e" +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 = [ + "serde", + "serde_derive", + "solana-message", + "solana-native-token", +] + [[package]] name = "solana-frozen-abi" version = "1.18.26" @@ -3903,7 +4108,7 @@ dependencies = [ "sha2 0.10.8", "solana-frozen-abi-macro", "subtle", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -3918,11 +4123,52 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "solana-genesis-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "968dabd2b92d57131473eddbd475339da530e14f54397386abf303de3a2595a2" +dependencies = [ + "bincode", + "chrono", + "memmap2", + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-cluster-type", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-inflation", + "solana-keypair", + "solana-logger 2.3.1", + "solana-native-token", + "solana-poh-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", + "solana-sha256-hasher", + "solana-shred-version", + "solana-signer", + "solana-time-utils", +] + +[[package]] +name = "solana-hard-forks" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c28371f878e2ead55611d8ba1b5fb879847156d04edea13693700ad1a28baf" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "solana-hash" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c25925816be2f57992c4c5af7dff31713bc95696c2fbc4bca911e290ba2f330" +checksum = "cf7bcb14392900fe02e4e34e90234fbf0c673d4e327888410ba99fa2ba0f4e99" dependencies = [ "borsh 1.5.5", "bs58 0.5.1", @@ -3938,9 +4184,9 @@ dependencies = [ [[package]] name = "solana-inflation" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91a53086a0f0cc093ffce9e5be4399785f05a0d49f0ff2cd6d5f3f4d593e2e9" +checksum = "23eef6a09eb8e568ce6839573e4966850e85e9ce71e6ae1a6c930c1c43947de3" dependencies = [ "serde", "serde_derive", @@ -3948,9 +4194,9 @@ dependencies = [ [[package]] name = "solana-instruction" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab8c46b6f76857222ee1adeb7031b8eb0eb5134920614e9fd1bd710052b96a9" +checksum = "9ce496a475e5062ba5de97215ab39d9c358f9c9df4bb7f3a45a1f1a8bd9065ed" dependencies = [ "bincode", "borsh 1.5.5", @@ -3965,95 +4211,266 @@ dependencies = [ ] [[package]] -name = "solana-last-restart-slot" -version = "2.1.11" +name = "solana-instructions-sysvar" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633f272467f3e1a28dfcfb1a7df55129752524a18938a84fd67086e205f0bd88" +checksum = "427f2d0d6dc0bb49f16cef5e7f975180d2e80aab9bdd3b2af68e2d029ec63f43" dependencies = [ - "serde", - "serde_derive", - "solana-sdk-macro 2.1.11", + "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-logger" -version = "1.18.26" +name = "solana-keccak-hasher" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121d36ffb3c6b958763312cbc697fbccba46ee837d3a0aa4fc0e90fcb3b884f3" +checksum = "c7aeb957fbd42a451b99235df4942d96db7ef678e8d5061ef34c9b34cae12f79" dependencies = [ - "env_logger", - "lazy_static", - "log", + "sha3 0.10.8", + "solana-define-syscall", + "solana-hash", + "solana-sanitize", ] [[package]] -name = "solana-measure" -version = "1.18.26" +name = "solana-keypair" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c01a7f9cdc9d9d37a3d5651b2fe7ec9d433c2a3470b9f35897e373b421f0737" +checksum = "3dbb7042c2e0c561afa07242b2099d55c57bd1b1da3b6476932197d84e15e3e4" dependencies = [ - "log", - "solana-sdk 1.18.26", + "bs58 0.5.1", + "ed25519-dalek", + "ed25519-dalek-bip32", + "rand 0.7.3", + "solana-derivation-path", + "solana-pubkey", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-signature", + "solana-signer", + "wasm-bindgen", ] [[package]] -name = "solana-metrics" -version = "1.18.26" +name = "solana-last-restart-slot" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e36052aff6be1536bdf6f737c6e69aca9dbb6a2f3f582e14ecb0ddc0cd66ce" +checksum = "4a6360ac2fdc72e7463565cd256eedcf10d7ef0c28a1249d261ec168c1b55cdd" dependencies = [ - "crossbeam-channel", - "gethostname", - "lazy_static", - "log", - "reqwest", - "solana-sdk 1.18.26", - "thiserror", + "serde", + "serde_derive", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", + "solana-sysvar-id", ] [[package]] -name = "solana-msg" -version = "2.1.11" +name = "solana-loader-v2-interface" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80dde3316c6ee6e8d57bf105139ec93f8c32a42fe3ec42a3cda2ca9efb72c0e6" +checksum = "d8ab08006dad78ae7cd30df8eea0539e207d08d91eaefb3e1d49a446e1c49654" dependencies = [ - "solana-define-syscall", + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", ] [[package]] -name = "solana-native-token" -version = "2.1.11" +name = "solana-loader-v3-interface" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0721f46122a2f1837f571d5a6c1478c962ebefd6d65d02694b3a267b58dbf2" +checksum = "fa4be76cfa9afd84ca2f35ebc09f0da0f0092935ccdac0595d98447f259538c2" +dependencies = [ + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", +] [[package]] -name = "solana-net-utils" -version = "1.18.26" +name = "solana-loader-v4-interface" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a1f5c6be9c5b272866673741e1ebc64b2ea2118e5c6301babbce526fdfb15f4" +checksum = "706a777242f1f39a83e2a96a2a6cb034cb41169c6ecbee2cf09cb873d9659e7e" dependencies = [ - "bincode", - "clap 3.2.25", - "crossbeam-channel", - "log", - "nix", - "rand 0.8.5", "serde", + "serde_bytes", "serde_derive", - "socket2", - "solana-logger", + "solana-instruction", + "solana-pubkey", + "solana-sdk-ids", + "solana-system-interface", +] + +[[package]] +name = "solana-logger" +version = "1.18.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121d36ffb3c6b958763312cbc697fbccba46ee837d3a0aa4fc0e90fcb3b884f3" +dependencies = [ + "env_logger", + "lazy_static", + "log", +] + +[[package]] +name = "solana-logger" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8e777ec1afd733939b532a42492d888ec7c88d8b4127a5d867eb45c6eb5cd5" +dependencies = [ + "env_logger", + "lazy_static", + "libc", + "log", + "signal-hook", +] + +[[package]] +name = "solana-measure" +version = "1.18.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c01a7f9cdc9d9d37a3d5651b2fe7ec9d433c2a3470b9f35897e373b421f0737" +dependencies = [ + "log", + "solana-sdk 1.18.26", +] + +[[package]] +name = "solana-message" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c6bf99c4570173710107a1f233f3bee226feea5fc817308707d4f7cb100a72d" +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 = "1.18.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e36052aff6be1536bdf6f737c6e69aca9dbb6a2f3f582e14ecb0ddc0cd66ce" +dependencies = [ + "crossbeam-channel", + "gethostname", + "lazy_static", + "log", + "reqwest", + "solana-sdk 1.18.26", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-msg" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36a1a14399afaabc2781a1db09cb14ee4cc4ee5c7a5a3cfcc601811379a8092" +dependencies = [ + "solana-define-syscall", +] + +[[package]] +name = "solana-native-token" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33e9de00960197412e4be3902a6cd35e60817c511137aca6c34c66cd5d4017ec" + +[[package]] +name = "solana-net-utils" +version = "1.18.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a1f5c6be9c5b272866673741e1ebc64b2ea2118e5c6301babbce526fdfb15f4" +dependencies = [ + "bincode", + "clap 3.2.25", + "crossbeam-channel", + "log", + "nix", + "rand 0.8.5", + "serde", + "serde_derive", + "socket2", + "solana-logger 1.18.26", "solana-sdk 1.18.26", "solana-version", "tokio", "url", ] +[[package]] +name = "solana-nonce" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "703e22eb185537e06204a5bd9d509b948f0066f2d1d814a6f475dafb3ddf1325" +dependencies = [ + "serde", + "serde_derive", + "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-offchain-message" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b526398ade5dea37f1f147ce55dae49aa017a5d7326606359b0445ca8d946581" +dependencies = [ + "num_enum 0.7.3", + "solana-hash", + "solana-packet", + "solana-pubkey", + "solana-sanitize", + "solana-sha256-hasher", + "solana-signature", + "solana-signer", +] + [[package]] name = "solana-packet" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39fcc5cf0ef0ac6a62dd09fae772672c2d6865ee1d1ba5fbfbcc94b2c37b2be8" +checksum = "004f2d2daf407b3ec1a1ca5ec34b3ccdfd6866dd2d3c7d0715004a96e4b6d127" dependencies = [ "bincode", "bitflags 2.8.0", @@ -4092,16 +4509,54 @@ dependencies = [ "solana-vote-program", ] +[[package]] +name = "solana-poh-config" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d650c3b4b9060082ac6b0efbbb66865089c58405bfb45de449f3f2b91eccee75" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "solana-precompile-error" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54310052930124b78392b03d802aa465afe6fded96d97f2e6ca6b1dead85d8d9" +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-presigner" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81a57a24e6a4125fc69510b6774cd93402b943191b6cddad05de7281491c90fe" +dependencies = [ + "solana-pubkey", + "solana-signature", + "solana-signer", +] + [[package]] name = "solana-program" version = "1.18.26" @@ -4127,7 +4582,7 @@ dependencies = [ "console_log", "curve25519-dalek 3.2.1", "getrandom 0.2.15", - "itertools 0.10.5", + "itertools", "js-sys", "lazy_static", "libc", @@ -4151,7 +4606,7 @@ dependencies = [ "solana-frozen-abi", "solana-frozen-abi-macro", "solana-sdk-macro 1.18.26", - "thiserror", + "thiserror 1.0.69", "tiny-bip39", "wasm-bindgen", "zeroize", @@ -4159,54 +4614,57 @@ dependencies = [ [[package]] name = "solana-program" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12511916a9658664921ca12dd6214910de655ac9955159c1e9871bd516936cac" +checksum = "586469467e93ceb79048f8d8e3a619bf61d05396ee7de95cb40280301a589d05" dependencies = [ - "base64 0.22.1", "bincode", - "bitflags 2.8.0", "blake3", "borsh 0.10.4", "borsh 1.5.5", "bs58 0.5.1", - "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 0.9.1", "num-bigint 0.4.6", "num-derive 0.4.2", "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-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", @@ -4215,7 +4673,8 @@ dependencies = [ "solana-pubkey", "solana-rent", "solana-sanitize", - "solana-sdk-macro 2.1.11", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "solana-secp256k1-recover", "solana-serde-varint", "solana-serialize-utils", @@ -4224,17 +4683,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", + "solana-vote-interface", + "thiserror 2.0.12", "wasm-bindgen", ] [[package]] name = "solana-program-entrypoint" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3422fa98d2ac5b20df9c9feb9f638e1170341b3c4259c26cd91a6a7098f6830" +checksum = "473ffe73c68d93e9f2aa726ad2985fe52760052709aaab188100a42c618060ec" dependencies = [ "solana-account-info", "solana-msg", @@ -4244,9 +4706,9 @@ dependencies = [ [[package]] name = "solana-program-error" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a2ea6d8e88767586e6d547e5afb00cda08cee79c986443b2d47236aac50a755" +checksum = "d8ae2c1a8d0d4ae865882d5770a7ebca92bab9c685e43f0461682c6c05a35bfa" dependencies = [ "borsh 1.5.5", "num-traits", @@ -4260,9 +4722,9 @@ dependencies = [ [[package]] name = "solana-program-memory" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "716e1c9cbd3c5e9d9147ffb7e74815cfb34ff7a3196127da64aa8d1866beab52" +checksum = "1b0268f6c89825fb634a34bd0c3b8fdaeaecfc3728be1d622a8ee6dd577b60d4" dependencies = [ "num-traits", "solana-define-syscall", @@ -4270,15 +4732,15 @@ dependencies = [ [[package]] name = "solana-program-option" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c8ffad2c86e5de375ae5f0a46f64eb5897a63c514e958e908c1a98059c57d4" +checksum = "dc677a2e9bc616eda6dbdab834d463372b92848b2bfe4a1ed4e4b4adba3397d0" [[package]] name = "solana-program-pack" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c185f9170ac85a93d5caaaaf5fe7bf0d49febdb329506bd7ea13716e4eb0189" +checksum = "319f0ef15e6e12dc37c597faccb7d62525a509fec5f6975ecb9419efddeb277b" dependencies = [ "solana-program-error", ] @@ -4293,7 +4755,7 @@ dependencies = [ "bincode", "eager", "enum-iterator", - "itertools 0.10.5", + "itertools", "libc", "log", "num-derive 0.4.2", @@ -4308,14 +4770,14 @@ dependencies = [ "solana-metrics", "solana-sdk 1.18.26", "solana_rbpf", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "solana-pubkey" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb80787769457f022a39a55cf439d1996aeecc2364c99483c97318d80f15436" +checksum = "40db1ff5a0f8aea2c158d78ab5f2cf897848964251d1df42fef78efd3c85b863" dependencies = [ "borsh 0.10.4", "borsh 1.5.5", @@ -4355,7 +4817,7 @@ dependencies = [ "solana-account-decoder", "solana-rpc-client-api", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-tungstenite", @@ -4372,7 +4834,7 @@ dependencies = [ "async-mutex", "async-trait", "futures", - "itertools 0.10.5", + "itertools", "lazy_static", "log", "quinn", @@ -4386,10 +4848,19 @@ dependencies = [ "solana-rpc-client-api", "solana-sdk 1.18.26", "solana-streamer", - "thiserror", + "thiserror 1.0.69", "tokio", ] +[[package]] +name = "solana-quic-definitions" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e606feac5110eb5d8afaa43ccaeea3ec49ccec36773387930b5ba545e745aea2" +dependencies = [ + "solana-keypair", +] + [[package]] name = "solana-rayon-threadlimit" version = "1.18.26" @@ -4415,22 +4886,72 @@ dependencies = [ "qstring", "semver", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", "uriparse", ] [[package]] name = "solana-rent" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b4cd58602eb0c2250cd83a8cc8287ca6271b99af95d2a33250e6592c04e286" +checksum = "d1aea8fdea9de98ca6e8c2da5827707fb3842833521b528a713810ca685d2480" dependencies = [ "serde", "serde_derive", - "solana-sdk-macro 2.1.11", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", "solana-sysvar-id", ] +[[package]] +name = "solana-rent-collector" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c1e19f5d5108b0d824244425e43bc78bbb9476e2199e979b0230c9f632d3bf4" +dependencies = [ + "serde", + "serde_derive", + "solana-account", + "solana-clock", + "solana-epoch-schedule", + "solana-genesis-config", + "solana-pubkey", + "solana-rent", + "solana-sdk-ids", +] + +[[package]] +name = "solana-rent-debits" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f6f9113c6003492e74438d1288e30cffa8ccfdc2ef7b49b9e816d8034da18cd" +dependencies = [ + "solana-pubkey", + "solana-reward-info", +] + +[[package]] +name = "solana-reserved-account-keys" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b293f4246626c0e0a991531f08848a713ada965612e99dc510963f04d12cae7" +dependencies = [ + "lazy_static", + "solana-feature-set", + "solana-pubkey", + "solana-sdk-ids", +] + +[[package]] +name = "solana-reward-info" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18205b69139b1ae0ab8f6e11cdcb627328c0814422ad2482000fa2ca54ae4a2f" +dependencies = [ + "serde", + "serde_derive", +] + [[package]] name = "solana-rpc-client" version = "1.18.26" @@ -4476,7 +4997,7 @@ dependencies = [ "solana-transaction-status", "solana-version", "spl-token-2022", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4489,14 +5010,14 @@ dependencies = [ "solana-clap-utils", "solana-rpc-client", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "solana-sanitize" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74c557ff8937946d24c4f188f3029c1fdba4e23a15ed11cc8b31a72017e911d5" +checksum = "61f1bc1357b8188d9c4a3af3fc55276e56987265eb7ad073ae6f8180ee54cecf" [[package]] name = "solana-sdk" @@ -4519,7 +5040,7 @@ dependencies = [ "ed25519-dalek-bip32", "generic-array", "hmac 0.12.1", - "itertools 0.10.5", + "itertools", "js-sys", "lazy_static", "libsecp256k1", @@ -4545,78 +5066,94 @@ dependencies = [ "siphasher", "solana-frozen-abi", "solana-frozen-abi-macro", - "solana-logger", + "solana-logger 1.18.26", "solana-program 1.18.26", "solana-sdk-macro 1.18.26", - "thiserror", + "thiserror 1.0.69", "uriparse", "wasm-bindgen", ] [[package]] name = "solana-sdk" -version = "2.1.11" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d755acdf62b367c1c4ca7ac1069c34a090d281b6425d11dd9410d4a147d99d3" +checksum = "e8af90d2ce445440e0548fa4a5f96fe8b265c22041a68c942012ffadd029667d" dependencies = [ "bincode", - "bitflags 2.8.0", - "borsh 1.5.5", "bs58 0.5.1", - "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", - "log", - "memmap2", - "num-derive 0.4.2", - "num-traits", - "num_enum 0.7.3", - "pbkdf2 0.11.0", - "rand 0.7.3", - "rand 0.8.5", "serde", - "serde_bytes", - "serde_derive", "serde_json", - "serde_with 3.12.0", - "sha2 0.10.8", - "sha3 0.10.8", - "siphasher", "solana-account", "solana-bn254", + "solana-client-traits", + "solana-cluster-type", + "solana-commitment-config", + "solana-compute-budget-interface", "solana-decode-error", "solana-derivation-path", + "solana-ed25519-program", + "solana-epoch-info", + "solana-epoch-rewards-hasher", "solana-feature-set", + "solana-fee-structure", + "solana-genesis-config", + "solana-hard-forks", "solana-inflation", "solana-instruction", + "solana-keypair", + "solana-message", "solana-native-token", + "solana-nonce-account", + "solana-offchain-message", "solana-packet", + "solana-poh-config", "solana-precompile-error", - "solana-program 2.1.11", + "solana-precompiles", + "solana-presigner", + "solana-program 2.2.1", "solana-program-memory", "solana-pubkey", + "solana-quic-definitions", + "solana-rent-collector", + "solana-rent-debits", + "solana-reserved-account-keys", + "solana-reward-info", "solana-sanitize", - "solana-sdk-macro 2.1.11", + "solana-sdk-ids", + "solana-sdk-macro 2.2.1", + "solana-secp256k1-program", "solana-secp256k1-recover", "solana-secp256r1-program", + "solana-seed-derivable", + "solana-seed-phrase", + "solana-serde", "solana-serde-varint", "solana-short-vec", + "solana-shred-version", "solana-signature", + "solana-signer", + "solana-system-transaction", + "solana-time-utils", + "solana-transaction", + "solana-transaction-context", "solana-transaction-error", - "thiserror", + "solana-validator-exit", + "thiserror 2.0.12", "wasm-bindgen", ] +[[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 = "1.18.26" @@ -4632,9 +5169,9 @@ dependencies = [ [[package]] name = "solana-sdk-macro" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9055600bc70a91936458b3a43a4173f8b8cd4ee64a0dc83cbb00737cadc519a5" +checksum = "86280da8b99d03560f6ab5aca9de2e38805681df34e0bb8f238e69b29433b9df" dependencies = [ "bs58 0.5.1", "proc-macro2", @@ -4642,30 +5179,48 @@ dependencies = [ "syn 2.0.96", ] +[[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 0.10.8", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-sdk-ids", +] + [[package]] name = "solana-secp256k1-recover" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b904576bfc5b72172aed9c133fe54840625ab9d510bd429d453c54bd6e4245c3" +checksum = "baa3120b6cdaa270f39444f5093a90a7b03d296d362878f7a6991d6de3bbe496" dependencies = [ "borsh 1.5.5", "libsecp256k1", "solana-define-syscall", - "thiserror", + "thiserror 2.0.12", ] [[package]] name = "solana-secp256r1-program" -version = "2.1.11" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c1329b7faa66f80bb3dadcece042589d22881120b6c0d0f712f742ad002f26" +checksum = "5cda2aa1bbaceda14763c4f142a00b486f2f262cfd901bd0410649ad0404d5f7" dependencies = [ "bytemuck", "openssl", "solana-feature-set", "solana-instruction", "solana-precompile-error", - "solana-pubkey", + "solana-sdk-ids", ] [[package]] @@ -4674,20 +5229,49 @@ 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 0.11.0", + "sha2 0.10.8", +] + +[[package]] +name = "solana-serde" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1931484a408af466e14171556a47adaa215953c7f48b24e5f6b0282763818b04" +dependencies = [ + "serde", +] + [[package]] name = "solana-serde-varint" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e741efbc732c2e33fd600d39a5a5e63cbab18fc75fc84a98df68c2aa2b373b64" +checksum = "bcc07d00200d82e6def2f7f7a45738e3406b17fe54a18adcf0defa16a97ccadb" dependencies = [ "serde", ] [[package]] name = "solana-serialize-utils" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6511f5147f992239415bd4bb297ad593da57b4ab634ed9bc10f81a560bc90" +checksum = "817a284b63197d2b27afdba829c5ab34231da4a9b4e763466a003c40ca4f535e" dependencies = [ "solana-instruction", "solana-pubkey", @@ -4696,9 +5280,9 @@ dependencies = [ [[package]] name = "solana-sha256-hasher" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3456f5d3868b9ae8e7bc53529bbbd8bee48b0d9cf3783f918269e71e4ee5268d" +checksum = "0037386961c0d633421f53560ad7c80675c0447cba4d1bb66d60974dd486c7ea" dependencies = [ "sha2 0.10.8", "solana-define-syscall", @@ -4707,60 +5291,105 @@ dependencies = [ [[package]] name = "solana-short-vec" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01771c84475e25352169e3fc901cae565f75ff8c9b40a4fa858f776211f20cbc" +checksum = "5c54c66f19b9766a56fa0057d060de8378676cb64987533fa088861858fc5a69" dependencies = [ "serde", ] +[[package]] +name = "solana-shred-version" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afd3db0461089d1ad1a78d9ba3f15b563899ca2386351d38428faa5350c60a98" +dependencies = [ + "solana-hard-forks", + "solana-hash", + "solana-sha256-hasher", +] + [[package]] name = "solana-signature" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f89b547c800c3541d4d5d71de8c82f37a0050f361626213a425ad4f767da27b" +checksum = "47d251c8f3dc015f320b4161daac7f108156c837428e5a8cc61136d25beb11d6" dependencies = [ "bs58 0.5.1", "ed25519-dalek", - "generic-array", "rand 0.8.5", "serde", + "serde-big-array", "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.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3012c024a81d591d02a10648d5f4256d6fc3c9d93bc5421cadba224794940f6c" +checksum = "0c8691982114513763e88d04094c9caa0376b867a29577939011331134c301ce" dependencies = [ "serde", "serde_derive", "solana-hash", + "solana-sdk-ids", "solana-sysvar-id", ] [[package]] name = "solana-slot-history" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "817a68e2aae8fbcf00adef67eba05c513b0a461b5ed1fd0bd2cb1299a394a650" +checksum = "97ccc1b2067ca22754d5283afb2b0126d61eae734fc616d23871b0943b0d935e" dependencies = [ "bv", "serde", "serde_derive", + "solana-sdk-ids", "solana-sysvar-id", ] [[package]] name = "solana-stable-layout" -version = "2.1.11" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +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 = "ec316bf731aeb8e9e8a55634efb938eaf5c979d71a9e7d3de54f5848da4994a2" +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]] @@ -4775,7 +5404,7 @@ dependencies = [ "futures-util", "histogram", "indexmap 2.7.1", - "itertools 0.10.5", + "itertools", "libc", "log", "nix", @@ -4791,18 +5420,87 @@ dependencies = [ "solana-metrics", "solana-perf", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", "tokio", "x509-parser", ] +[[package]] +name = "solana-system-interface" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94d7c18cb1a91c6be5f5a8ac9276a1d7c737e39a21beba9ea710ab4b9c63bc90" +dependencies = [ + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-decode-error", + "solana-instruction", + "solana-pubkey", + "wasm-bindgen", +] + +[[package]] +name = "solana-system-transaction" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd98a25e5bcba8b6be8bcbb7b84b24c2a6a8178d7fb0e3077a916855ceba91a" +dependencies = [ + "solana-hash", + "solana-keypair", + "solana-message", + "solana-pubkey", + "solana-signer", + "solana-system-interface", + "solana-transaction", +] + +[[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 2.2.1", + "solana-slot-hashes", + "solana-slot-history", + "solana-stake-interface", + "solana-sysvar-id", +] + [[package]] name = "solana-sysvar-id" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6ca7b6e6bf9f8c0de74e90546426190385a1c0b8e4d4f1975165f2335f9dc0" +checksum = "5762b273d3325b047cfda250787f8d796d781746860d5d0a746ee29f3e8812c1" dependencies = [ "solana-pubkey", + "solana-sdk-ids", ] [[package]] @@ -4820,6 +5518,12 @@ dependencies = [ "solana-sdk 1.18.26", ] +[[package]] +name = "solana-time-utils" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af261afb0e8c39252a04d026e3ea9c405342b08c871a2ad8aa5448e068c784c" + [[package]] name = "solana-tpu-client" version = "1.18.26" @@ -4840,15 +5544,58 @@ dependencies = [ "solana-rpc-client", "solana-rpc-client-api", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", "tokio", ] +[[package]] +name = "solana-transaction" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abec848d081beb15a324c633cd0e0ab33033318063230389895cae503ec9b544" +dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-bincode", + "solana-feature-set", + "solana-hash", + "solana-instruction", + "solana-keypair", + "solana-message", + "solana-precompiles", + "solana-pubkey", + "solana-sanitize", + "solana-sdk-ids", + "solana-short-vec", + "solana-signature", + "solana-signer", + "solana-system-interface", + "solana-transaction-error", + "wasm-bindgen", +] + +[[package]] +name = "solana-transaction-context" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5022de04cbba05377f68bf848c8c1322ead733f88a657bf792bb40f3257b8218" +dependencies = [ + "bincode", + "serde", + "serde_derive", + "solana-account", + "solana-instruction", + "solana-pubkey", + "solana-rent", + "solana-signature", +] + [[package]] name = "solana-transaction-error" -version = "2.1.11" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a6d17d8de8549df56d64b9af314eec3c4b705372790aa8dde7196e1c5f005" +checksum = "222a9dc8fdb61c6088baab34fc3a8b8473a03a7a5fd404ed8dd502fa79b67cb1" dependencies = [ "serde", "serde_derive", @@ -4878,7 +5625,7 @@ dependencies = [ "spl-memo", "spl-token", "spl-token-2022", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4892,10 +5639,16 @@ dependencies = [ "solana-net-utils", "solana-sdk 1.18.26", "solana-streamer", - "thiserror", + "thiserror 1.0.69", "tokio", ] +[[package]] +name = "solana-validator-exit" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bbf6d7a3c0b28dd5335c52c0e9eae49d0ae489a8f324917faf0ded65a812c1d" + [[package]] name = "solana-version" version = "1.18.26" @@ -4912,6 +5665,30 @@ dependencies = [ "solana-sdk 1.18.26", ] +[[package]] +name = "solana-vote-interface" +version = "2.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b630547b7f12ee742e1c5069951fedba0fe5cbd4786f6342a779384e2b11f71" +dependencies = [ + "bincode", + "num-derive 0.4.2", + "num-traits", + "serde", + "serde_derive", + "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-vote-program" version = "1.18.26" @@ -4931,7 +5708,7 @@ dependencies = [ "solana-program 1.18.26", "solana-program-runtime", "solana-sdk 1.18.26", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -4947,7 +5724,7 @@ dependencies = [ "byteorder", "curve25519-dalek 3.2.1", "getrandom 0.1.16", - "itertools 0.10.5", + "itertools", "lazy_static", "merlin", "num-derive 0.4.2", @@ -4959,7 +5736,7 @@ dependencies = [ "solana-program 1.18.26", "solana-sdk 1.18.26", "subtle", - "thiserror", + "thiserror 1.0.69", "zeroize", ] @@ -4978,7 +5755,7 @@ dependencies = [ "rand 0.8.5", "rustc-demangle", "scroll", - "thiserror", + "thiserror 1.0.69", "winapi", ] @@ -5017,7 +5794,7 @@ dependencies = [ "solana-program 1.18.26", "spl-token", "spl-token-2022", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5052,7 +5829,7 @@ dependencies = [ "quote", "sha2 0.10.8", "syn 2.0.96", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5087,7 +5864,7 @@ dependencies = [ "num-traits", "solana-program 1.18.26", "spl-program-error-derive", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5128,7 +5905,7 @@ dependencies = [ "num-traits", "num_enum 0.6.1", "solana-program 1.18.26", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5152,7 +5929,7 @@ dependencies = [ "spl-token-metadata-interface", "spl-transfer-hook-interface", "spl-type-length-value", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -5357,7 +6134,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl 2.0.12", ] [[package]] @@ -5371,6 +6157,17 @@ dependencies = [ "syn 2.0.96", ] +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "time" version = "0.3.37" @@ -5415,7 +6212,7 @@ dependencies = [ "rand 0.7.3", "rustc-hash", "sha2 0.9.9", - "thiserror", + "thiserror 1.0.69", "unicode-normalization", "wasm-bindgen", "zeroize", @@ -5637,7 +6434,7 @@ dependencies = [ "rand 0.8.5", "rustls", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", "webpki-roots 0.24.0", @@ -6151,7 +6948,7 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] diff --git a/packages/renderers-rust/e2e/system/Cargo.toml b/packages/renderers-rust/e2e/system/Cargo.toml index 0817c33b6..5d2dcf106 100644 --- a/packages/renderers-rust/e2e/system/Cargo.toml +++ b/packages/renderers-rust/e2e/system/Cargo.toml @@ -18,7 +18,8 @@ num-traits = "^0.2" serde = { version = "^1.0", features = ["derive"], optional = true } serde_with = { version = "^3.0", optional = true } serde-big-array = { version = "^0.5", optional = true } -solana-program = "^2.1.6" +solana-program = "2.2.1" +solana-pubkey = { version = "2.2.1", features = ["curve25519"] } solana-client = { version = "~1.18", optional = true } solana-sdk = { version = "~1.18", optional = true } thiserror = "^1.0" diff --git a/packages/renderers-rust/e2e/system/src/generated/accounts/nonce.rs b/packages/renderers-rust/e2e/system/src/generated/accounts/nonce.rs index d5134aeaf..bb4541540 100644 --- a/packages/renderers-rust/e2e/system/src/generated/accounts/nonce.rs +++ b/packages/renderers-rust/e2e/system/src/generated/accounts/nonce.rs @@ -9,7 +9,7 @@ use crate::generated::types::NonceState; use crate::generated::types::NonceVersion; use borsh::BorshDeserialize; use borsh::BorshSerialize; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; #[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] @@ -53,7 +53,7 @@ impl<'a> TryFrom<&solana_program::account_info::AccountInfo<'a>> for Nonce { #[cfg(feature = "fetch")] pub fn fetch_nonce( rpc: &solana_client::rpc_client::RpcClient, - address: &solana_program::pubkey::Pubkey, + address: &solana_pubkey::Pubkey, ) -> Result, std::io::Error> { let accounts = fetch_all_nonce(rpc, &[*address])?; Ok(accounts[0].clone()) @@ -62,7 +62,7 @@ pub fn fetch_nonce( #[cfg(feature = "fetch")] pub fn fetch_all_nonce( rpc: &solana_client::rpc_client::RpcClient, - addresses: &[solana_program::pubkey::Pubkey], + addresses: &[solana_pubkey::Pubkey], ) -> Result>, std::io::Error> { let accounts = rpc .get_multiple_accounts(addresses) @@ -87,7 +87,7 @@ pub fn fetch_all_nonce( #[cfg(feature = "fetch")] pub fn fetch_maybe_nonce( rpc: &solana_client::rpc_client::RpcClient, - address: &solana_program::pubkey::Pubkey, + address: &solana_pubkey::Pubkey, ) -> Result, std::io::Error> { let accounts = fetch_all_maybe_nonce(rpc, &[*address])?; Ok(accounts[0].clone()) @@ -96,7 +96,7 @@ pub fn fetch_maybe_nonce( #[cfg(feature = "fetch")] pub fn fetch_all_maybe_nonce( rpc: &solana_client::rpc_client::RpcClient, - addresses: &[solana_program::pubkey::Pubkey], + addresses: &[solana_pubkey::Pubkey], ) -> Result>, std::io::Error> { let accounts = rpc .get_multiple_accounts(addresses) diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/advance_nonce_account.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/advance_nonce_account.rs index 189970f9e..d1faf78ab 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/advance_nonce_account.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/advance_nonce_account.rs @@ -11,11 +11,11 @@ use borsh::BorshSerialize; /// Accounts. #[derive(Debug)] pub struct AdvanceNonceAccount { - pub nonce_account: solana_program::pubkey::Pubkey, + pub nonce_account: solana_pubkey::Pubkey, - pub recent_blockhashes_sysvar: solana_program::pubkey::Pubkey, + pub recent_blockhashes_sysvar: solana_pubkey::Pubkey, - pub nonce_authority: solana_program::pubkey::Pubkey, + pub nonce_authority: solana_pubkey::Pubkey, } impl AdvanceNonceAccount { @@ -79,9 +79,9 @@ impl Default for AdvanceNonceAccountInstructionData { /// 2. `[signer]` nonce_authority #[derive(Clone, Debug, Default)] pub struct AdvanceNonceAccountBuilder { - nonce_account: Option, - recent_blockhashes_sysvar: Option, - nonce_authority: Option, + nonce_account: Option, + recent_blockhashes_sysvar: Option, + nonce_authority: Option, __remaining_accounts: Vec, } @@ -90,7 +90,7 @@ impl AdvanceNonceAccountBuilder { Self::default() } #[inline(always)] - pub fn nonce_account(&mut self, nonce_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn nonce_account(&mut self, nonce_account: solana_pubkey::Pubkey) -> &mut Self { self.nonce_account = Some(nonce_account); self } @@ -98,16 +98,13 @@ impl AdvanceNonceAccountBuilder { #[inline(always)] pub fn recent_blockhashes_sysvar( &mut self, - recent_blockhashes_sysvar: solana_program::pubkey::Pubkey, + recent_blockhashes_sysvar: solana_pubkey::Pubkey, ) -> &mut Self { self.recent_blockhashes_sysvar = Some(recent_blockhashes_sysvar); self } #[inline(always)] - pub fn nonce_authority( - &mut self, - nonce_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn nonce_authority(&mut self, nonce_authority: solana_pubkey::Pubkey) -> &mut Self { self.nonce_authority = Some(nonce_authority); self } @@ -134,7 +131,7 @@ impl AdvanceNonceAccountBuilder { let accounts = AdvanceNonceAccount { nonce_account: self.nonce_account.expect("nonce_account is not set"), recent_blockhashes_sysvar: self.recent_blockhashes_sysvar.unwrap_or( - solana_program::pubkey!("SysvarRecentB1ockHashes11111111111111111111"), + solana_pubkey::pubkey!("SysvarRecentB1ockHashes11111111111111111111"), ), nonce_authority: self.nonce_authority.expect("nonce_authority is not set"), }; diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/allocate.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/allocate.rs index 634e1071e..ee4f182f1 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/allocate.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/allocate.rs @@ -11,7 +11,7 @@ use borsh::BorshSerialize; /// Accounts. #[derive(Debug)] pub struct Allocate { - pub new_account: solana_program::pubkey::Pubkey, + pub new_account: solana_pubkey::Pubkey, } impl Allocate { @@ -77,7 +77,7 @@ pub struct AllocateInstructionArgs { /// 0. `[writable, signer]` new_account #[derive(Clone, Debug, Default)] pub struct AllocateBuilder { - new_account: Option, + new_account: Option, space: Option, __remaining_accounts: Vec, } @@ -87,7 +87,7 @@ impl AllocateBuilder { Self::default() } #[inline(always)] - pub fn new_account(&mut self, new_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn new_account(&mut self, new_account: solana_pubkey::Pubkey) -> &mut Self { self.new_account = Some(new_account); self } diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/allocate_with_seed.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/allocate_with_seed.rs index c4b5a6f0a..39fd103ff 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/allocate_with_seed.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/allocate_with_seed.rs @@ -7,14 +7,14 @@ use borsh::BorshDeserialize; use borsh::BorshSerialize; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; /// Accounts. #[derive(Debug)] pub struct AllocateWithSeed { - pub new_account: solana_program::pubkey::Pubkey, + pub new_account: solana_pubkey::Pubkey, - pub base_account: solana_program::pubkey::Pubkey, + pub base_account: solana_pubkey::Pubkey, } impl AllocateWithSeed { @@ -88,8 +88,8 @@ pub struct AllocateWithSeedInstructionArgs { /// 1. `[signer]` base_account #[derive(Clone, Debug, Default)] pub struct AllocateWithSeedBuilder { - new_account: Option, - base_account: Option, + new_account: Option, + base_account: Option, base: Option, seed: Option, space: Option, @@ -102,12 +102,12 @@ impl AllocateWithSeedBuilder { Self::default() } #[inline(always)] - pub fn new_account(&mut self, new_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn new_account(&mut self, new_account: solana_pubkey::Pubkey) -> &mut Self { self.new_account = Some(new_account); self } #[inline(always)] - pub fn base_account(&mut self, base_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn base_account(&mut self, base_account: solana_pubkey::Pubkey) -> &mut Self { self.base_account = Some(base_account); self } diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/assign.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/assign.rs index 618d82f7b..325561586 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/assign.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/assign.rs @@ -7,12 +7,12 @@ use borsh::BorshDeserialize; use borsh::BorshSerialize; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; /// Accounts. #[derive(Debug)] pub struct Assign { - pub account: solana_program::pubkey::Pubkey, + pub account: solana_pubkey::Pubkey, } impl Assign { @@ -78,7 +78,7 @@ pub struct AssignInstructionArgs { /// 0. `[writable, signer]` account #[derive(Clone, Debug, Default)] pub struct AssignBuilder { - account: Option, + account: Option, program_address: Option, __remaining_accounts: Vec, } @@ -88,7 +88,7 @@ impl AssignBuilder { Self::default() } #[inline(always)] - pub fn account(&mut self, account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn account(&mut self, account: solana_pubkey::Pubkey) -> &mut Self { self.account = Some(account); self } diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/assign_with_seed.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/assign_with_seed.rs index ca186d664..95ca1b019 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/assign_with_seed.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/assign_with_seed.rs @@ -7,14 +7,14 @@ use borsh::BorshDeserialize; use borsh::BorshSerialize; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; /// Accounts. #[derive(Debug)] pub struct AssignWithSeed { - pub account: solana_program::pubkey::Pubkey, + pub account: solana_pubkey::Pubkey, - pub base_account: solana_program::pubkey::Pubkey, + pub base_account: solana_pubkey::Pubkey, } impl AssignWithSeed { @@ -87,8 +87,8 @@ pub struct AssignWithSeedInstructionArgs { /// 1. `[signer]` base_account #[derive(Clone, Debug, Default)] pub struct AssignWithSeedBuilder { - account: Option, - base_account: Option, + account: Option, + base_account: Option, base: Option, seed: Option, program_address: Option, @@ -100,12 +100,12 @@ impl AssignWithSeedBuilder { Self::default() } #[inline(always)] - pub fn account(&mut self, account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn account(&mut self, account: solana_pubkey::Pubkey) -> &mut Self { self.account = Some(account); self } #[inline(always)] - pub fn base_account(&mut self, base_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn base_account(&mut self, base_account: solana_pubkey::Pubkey) -> &mut Self { self.base_account = Some(base_account); self } diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/authorize_nonce_account.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/authorize_nonce_account.rs index e3ba4d8ce..4ad98e9ef 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/authorize_nonce_account.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/authorize_nonce_account.rs @@ -7,14 +7,14 @@ use borsh::BorshDeserialize; use borsh::BorshSerialize; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; /// Accounts. #[derive(Debug)] pub struct AuthorizeNonceAccount { - pub nonce_account: solana_program::pubkey::Pubkey, + pub nonce_account: solana_pubkey::Pubkey, - pub nonce_authority: solana_program::pubkey::Pubkey, + pub nonce_authority: solana_pubkey::Pubkey, } impl AuthorizeNonceAccount { @@ -85,8 +85,8 @@ pub struct AuthorizeNonceAccountInstructionArgs { /// 1. `[signer]` nonce_authority #[derive(Clone, Debug, Default)] pub struct AuthorizeNonceAccountBuilder { - nonce_account: Option, - nonce_authority: Option, + nonce_account: Option, + nonce_authority: Option, new_nonce_authority: Option, __remaining_accounts: Vec, } @@ -96,15 +96,12 @@ impl AuthorizeNonceAccountBuilder { Self::default() } #[inline(always)] - pub fn nonce_account(&mut self, nonce_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn nonce_account(&mut self, nonce_account: solana_pubkey::Pubkey) -> &mut Self { self.nonce_account = Some(nonce_account); self } #[inline(always)] - pub fn nonce_authority( - &mut self, - nonce_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn nonce_authority(&mut self, nonce_authority: solana_pubkey::Pubkey) -> &mut Self { self.nonce_authority = Some(nonce_authority); self } diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/create_account.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/create_account.rs index bd404db93..a48d8f580 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/create_account.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/create_account.rs @@ -7,14 +7,14 @@ use borsh::BorshDeserialize; use borsh::BorshSerialize; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; /// Accounts. #[derive(Debug)] pub struct CreateAccount { - pub payer: solana_program::pubkey::Pubkey, + pub payer: solana_pubkey::Pubkey, - pub new_account: solana_program::pubkey::Pubkey, + pub new_account: solana_pubkey::Pubkey, } impl CreateAccount { @@ -86,8 +86,8 @@ pub struct CreateAccountInstructionArgs { /// 1. `[writable, signer]` new_account #[derive(Clone, Debug, Default)] pub struct CreateAccountBuilder { - payer: Option, - new_account: Option, + payer: Option, + new_account: Option, lamports: Option, space: Option, program_address: Option, @@ -99,12 +99,12 @@ impl CreateAccountBuilder { Self::default() } #[inline(always)] - pub fn payer(&mut self, payer: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn payer(&mut self, payer: solana_pubkey::Pubkey) -> &mut Self { self.payer = Some(payer); self } #[inline(always)] - pub fn new_account(&mut self, new_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn new_account(&mut self, new_account: solana_pubkey::Pubkey) -> &mut Self { self.new_account = Some(new_account); self } diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/create_account_with_seed.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/create_account_with_seed.rs index a5cdc9d05..bf0f9e847 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/create_account_with_seed.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/create_account_with_seed.rs @@ -7,16 +7,16 @@ use borsh::BorshDeserialize; use borsh::BorshSerialize; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; /// Accounts. #[derive(Debug)] pub struct CreateAccountWithSeed { - pub payer: solana_program::pubkey::Pubkey, + pub payer: solana_pubkey::Pubkey, - pub new_account: solana_program::pubkey::Pubkey, + pub new_account: solana_pubkey::Pubkey, - pub base_account: solana_program::pubkey::Pubkey, + pub base_account: solana_pubkey::Pubkey, } impl CreateAccountWithSeed { @@ -95,9 +95,9 @@ pub struct CreateAccountWithSeedInstructionArgs { /// 2. `[signer]` base_account #[derive(Clone, Debug, Default)] pub struct CreateAccountWithSeedBuilder { - payer: Option, - new_account: Option, - base_account: Option, + payer: Option, + new_account: Option, + base_account: Option, base: Option, seed: Option, amount: Option, @@ -111,17 +111,17 @@ impl CreateAccountWithSeedBuilder { Self::default() } #[inline(always)] - pub fn payer(&mut self, payer: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn payer(&mut self, payer: solana_pubkey::Pubkey) -> &mut Self { self.payer = Some(payer); self } #[inline(always)] - pub fn new_account(&mut self, new_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn new_account(&mut self, new_account: solana_pubkey::Pubkey) -> &mut Self { self.new_account = Some(new_account); self } #[inline(always)] - pub fn base_account(&mut self, base_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn base_account(&mut self, base_account: solana_pubkey::Pubkey) -> &mut Self { self.base_account = Some(base_account); self } diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/initialize_nonce_account.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/initialize_nonce_account.rs index bd4da9e52..19c87f593 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/initialize_nonce_account.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/initialize_nonce_account.rs @@ -7,16 +7,16 @@ use borsh::BorshDeserialize; use borsh::BorshSerialize; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; /// Accounts. #[derive(Debug)] pub struct InitializeNonceAccount { - pub nonce_account: solana_program::pubkey::Pubkey, + pub nonce_account: solana_pubkey::Pubkey, - pub recent_blockhashes_sysvar: solana_program::pubkey::Pubkey, + pub recent_blockhashes_sysvar: solana_pubkey::Pubkey, - pub rent_sysvar: solana_program::pubkey::Pubkey, + pub rent_sysvar: solana_pubkey::Pubkey, } impl InitializeNonceAccount { @@ -92,9 +92,9 @@ pub struct InitializeNonceAccountInstructionArgs { /// 2. `[optional]` rent_sysvar (default to `SysvarRent111111111111111111111111111111111`) #[derive(Clone, Debug, Default)] pub struct InitializeNonceAccountBuilder { - nonce_account: Option, - recent_blockhashes_sysvar: Option, - rent_sysvar: Option, + nonce_account: Option, + recent_blockhashes_sysvar: Option, + rent_sysvar: Option, nonce_authority: Option, __remaining_accounts: Vec, } @@ -104,7 +104,7 @@ impl InitializeNonceAccountBuilder { Self::default() } #[inline(always)] - pub fn nonce_account(&mut self, nonce_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn nonce_account(&mut self, nonce_account: solana_pubkey::Pubkey) -> &mut Self { self.nonce_account = Some(nonce_account); self } @@ -112,14 +112,14 @@ impl InitializeNonceAccountBuilder { #[inline(always)] pub fn recent_blockhashes_sysvar( &mut self, - recent_blockhashes_sysvar: solana_program::pubkey::Pubkey, + recent_blockhashes_sysvar: solana_pubkey::Pubkey, ) -> &mut Self { self.recent_blockhashes_sysvar = Some(recent_blockhashes_sysvar); self } /// `[optional account, default to 'SysvarRent111111111111111111111111111111111']` #[inline(always)] - pub fn rent_sysvar(&mut self, rent_sysvar: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn rent_sysvar(&mut self, rent_sysvar: solana_pubkey::Pubkey) -> &mut Self { self.rent_sysvar = Some(rent_sysvar); self } @@ -151,9 +151,9 @@ impl InitializeNonceAccountBuilder { let accounts = InitializeNonceAccount { nonce_account: self.nonce_account.expect("nonce_account is not set"), recent_blockhashes_sysvar: self.recent_blockhashes_sysvar.unwrap_or( - solana_program::pubkey!("SysvarRecentB1ockHashes11111111111111111111"), + solana_pubkey::pubkey!("SysvarRecentB1ockHashes11111111111111111111"), ), - rent_sysvar: self.rent_sysvar.unwrap_or(solana_program::pubkey!( + rent_sysvar: self.rent_sysvar.unwrap_or(solana_pubkey::pubkey!( "SysvarRent111111111111111111111111111111111" )), }; diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/transfer_sol.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/transfer_sol.rs index d330bb36a..e21ef6171 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/transfer_sol.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/transfer_sol.rs @@ -11,9 +11,9 @@ use borsh::BorshSerialize; /// Accounts. #[derive(Debug)] pub struct TransferSol { - pub source: solana_program::pubkey::Pubkey, + pub source: solana_pubkey::Pubkey, - pub destination: solana_program::pubkey::Pubkey, + pub destination: solana_pubkey::Pubkey, } impl TransferSol { @@ -84,8 +84,8 @@ pub struct TransferSolInstructionArgs { /// 1. `[writable]` destination #[derive(Clone, Debug, Default)] pub struct TransferSolBuilder { - source: Option, - destination: Option, + source: Option, + destination: Option, amount: Option, __remaining_accounts: Vec, } @@ -95,12 +95,12 @@ impl TransferSolBuilder { Self::default() } #[inline(always)] - pub fn source(&mut self, source: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn source(&mut self, source: solana_pubkey::Pubkey) -> &mut Self { self.source = Some(source); self } #[inline(always)] - pub fn destination(&mut self, destination: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn destination(&mut self, destination: solana_pubkey::Pubkey) -> &mut Self { self.destination = Some(destination); self } diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/transfer_sol_with_seed.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/transfer_sol_with_seed.rs index 04ce7ef11..5a7c82d9e 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/transfer_sol_with_seed.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/transfer_sol_with_seed.rs @@ -7,16 +7,16 @@ use borsh::BorshDeserialize; use borsh::BorshSerialize; -use solana_program::pubkey::Pubkey; +use solana_pubkey::Pubkey; /// Accounts. #[derive(Debug)] pub struct TransferSolWithSeed { - pub source: solana_program::pubkey::Pubkey, + pub source: solana_pubkey::Pubkey, - pub base_account: solana_program::pubkey::Pubkey, + pub base_account: solana_pubkey::Pubkey, - pub destination: solana_program::pubkey::Pubkey, + pub destination: solana_pubkey::Pubkey, } impl TransferSolWithSeed { @@ -94,9 +94,9 @@ pub struct TransferSolWithSeedInstructionArgs { /// 2. `[writable]` destination #[derive(Clone, Debug, Default)] pub struct TransferSolWithSeedBuilder { - source: Option, - base_account: Option, - destination: Option, + source: Option, + base_account: Option, + destination: Option, amount: Option, from_seed: Option, from_owner: Option, @@ -108,17 +108,17 @@ impl TransferSolWithSeedBuilder { Self::default() } #[inline(always)] - pub fn source(&mut self, source: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn source(&mut self, source: solana_pubkey::Pubkey) -> &mut Self { self.source = Some(source); self } #[inline(always)] - pub fn base_account(&mut self, base_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn base_account(&mut self, base_account: solana_pubkey::Pubkey) -> &mut Self { self.base_account = Some(base_account); self } #[inline(always)] - pub fn destination(&mut self, destination: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn destination(&mut self, destination: solana_pubkey::Pubkey) -> &mut Self { self.destination = Some(destination); self } diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/upgrade_nonce_account.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/upgrade_nonce_account.rs index d82a046db..1f0217f80 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/upgrade_nonce_account.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/upgrade_nonce_account.rs @@ -11,7 +11,7 @@ use borsh::BorshSerialize; /// Accounts. #[derive(Debug)] pub struct UpgradeNonceAccount { - pub nonce_account: solana_program::pubkey::Pubkey, + pub nonce_account: solana_pubkey::Pubkey, } impl UpgradeNonceAccount { @@ -65,7 +65,7 @@ impl Default for UpgradeNonceAccountInstructionData { /// 0. `[writable]` nonce_account #[derive(Clone, Debug, Default)] pub struct UpgradeNonceAccountBuilder { - nonce_account: Option, + nonce_account: Option, __remaining_accounts: Vec, } @@ -74,7 +74,7 @@ impl UpgradeNonceAccountBuilder { Self::default() } #[inline(always)] - pub fn nonce_account(&mut self, nonce_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn nonce_account(&mut self, nonce_account: solana_pubkey::Pubkey) -> &mut Self { self.nonce_account = Some(nonce_account); self } diff --git a/packages/renderers-rust/e2e/system/src/generated/instructions/withdraw_nonce_account.rs b/packages/renderers-rust/e2e/system/src/generated/instructions/withdraw_nonce_account.rs index 207d967b2..123a7f1d2 100644 --- a/packages/renderers-rust/e2e/system/src/generated/instructions/withdraw_nonce_account.rs +++ b/packages/renderers-rust/e2e/system/src/generated/instructions/withdraw_nonce_account.rs @@ -11,15 +11,15 @@ use borsh::BorshSerialize; /// Accounts. #[derive(Debug)] pub struct WithdrawNonceAccount { - pub nonce_account: solana_program::pubkey::Pubkey, + pub nonce_account: solana_pubkey::Pubkey, - pub recipient_account: solana_program::pubkey::Pubkey, + pub recipient_account: solana_pubkey::Pubkey, - pub recent_blockhashes_sysvar: solana_program::pubkey::Pubkey, + pub recent_blockhashes_sysvar: solana_pubkey::Pubkey, - pub rent_sysvar: solana_program::pubkey::Pubkey, + pub rent_sysvar: solana_pubkey::Pubkey, - pub nonce_authority: solana_program::pubkey::Pubkey, + pub nonce_authority: solana_pubkey::Pubkey, } impl WithdrawNonceAccount { @@ -105,11 +105,11 @@ pub struct WithdrawNonceAccountInstructionArgs { /// 4. `[signer]` nonce_authority #[derive(Clone, Debug, Default)] pub struct WithdrawNonceAccountBuilder { - nonce_account: Option, - recipient_account: Option, - recent_blockhashes_sysvar: Option, - rent_sysvar: Option, - nonce_authority: Option, + nonce_account: Option, + recipient_account: Option, + recent_blockhashes_sysvar: Option, + rent_sysvar: Option, + nonce_authority: Option, withdraw_amount: Option, __remaining_accounts: Vec, } @@ -119,15 +119,12 @@ impl WithdrawNonceAccountBuilder { Self::default() } #[inline(always)] - pub fn nonce_account(&mut self, nonce_account: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn nonce_account(&mut self, nonce_account: solana_pubkey::Pubkey) -> &mut Self { self.nonce_account = Some(nonce_account); self } #[inline(always)] - pub fn recipient_account( - &mut self, - recipient_account: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn recipient_account(&mut self, recipient_account: solana_pubkey::Pubkey) -> &mut Self { self.recipient_account = Some(recipient_account); self } @@ -135,22 +132,19 @@ impl WithdrawNonceAccountBuilder { #[inline(always)] pub fn recent_blockhashes_sysvar( &mut self, - recent_blockhashes_sysvar: solana_program::pubkey::Pubkey, + recent_blockhashes_sysvar: solana_pubkey::Pubkey, ) -> &mut Self { self.recent_blockhashes_sysvar = Some(recent_blockhashes_sysvar); self } /// `[optional account, default to 'SysvarRent111111111111111111111111111111111']` #[inline(always)] - pub fn rent_sysvar(&mut self, rent_sysvar: solana_program::pubkey::Pubkey) -> &mut Self { + pub fn rent_sysvar(&mut self, rent_sysvar: solana_pubkey::Pubkey) -> &mut Self { self.rent_sysvar = Some(rent_sysvar); self } #[inline(always)] - pub fn nonce_authority( - &mut self, - nonce_authority: solana_program::pubkey::Pubkey, - ) -> &mut Self { + pub fn nonce_authority(&mut self, nonce_authority: solana_pubkey::Pubkey) -> &mut Self { self.nonce_authority = Some(nonce_authority); self } @@ -185,9 +179,9 @@ impl WithdrawNonceAccountBuilder { .recipient_account .expect("recipient_account is not set"), recent_blockhashes_sysvar: self.recent_blockhashes_sysvar.unwrap_or( - solana_program::pubkey!("SysvarRecentB1ockHashes11111111111111111111"), + solana_pubkey::pubkey!("SysvarRecentB1ockHashes11111111111111111111"), ), - rent_sysvar: self.rent_sysvar.unwrap_or(solana_program::pubkey!( + rent_sysvar: self.rent_sysvar.unwrap_or(solana_pubkey::pubkey!( "SysvarRent111111111111111111111111111111111" )), nonce_authority: self.nonce_authority.expect("nonce_authority is not set"), diff --git a/packages/renderers-rust/e2e/system/src/generated/programs.rs b/packages/renderers-rust/e2e/system/src/generated/programs.rs index e02ed636b..27a2ff8cb 100644 --- a/packages/renderers-rust/e2e/system/src/generated/programs.rs +++ b/packages/renderers-rust/e2e/system/src/generated/programs.rs @@ -5,7 +5,7 @@ //! //! -use solana_program::{pubkey, pubkey::Pubkey}; +use solana_pubkey::{pubkey, Pubkey}; /// `system` program ID. pub const SYSTEM_ID: Pubkey = pubkey!("11111111111111111111111111111111"); diff --git a/packages/renderers-rust/e2e/system/src/generated/shared.rs b/packages/renderers-rust/e2e/system/src/generated/shared.rs index 4b9a0d5f8..ed763f639 100644 --- a/packages/renderers-rust/e2e/system/src/generated/shared.rs +++ b/packages/renderers-rust/e2e/system/src/generated/shared.rs @@ -8,7 +8,7 @@ #[cfg(feature = "fetch")] #[derive(Debug, Clone)] pub struct DecodedAccount { - pub address: solana_program::pubkey::Pubkey, + pub address: solana_pubkey::Pubkey, pub account: solana_sdk::account::Account, pub data: T, } @@ -17,5 +17,5 @@ pub struct DecodedAccount { #[derive(Debug, Clone)] pub enum MaybeAccount { Exists(DecodedAccount), - NotFound(solana_program::pubkey::Pubkey), + NotFound(solana_pubkey::Pubkey), } diff --git a/packages/renderers-rust/public/templates/accountsPage.njk b/packages/renderers-rust/public/templates/accountsPage.njk index 1c04b6c06..cb33c4e19 100644 --- a/packages/renderers-rust/public/templates/accountsPage.njk +++ b/packages/renderers-rust/public/templates/accountsPage.njk @@ -58,8 +58,8 @@ impl {{ account.name | pascalCase }} { {% endfor %} {% endif %} bump: u8, - ) -> Result { - solana_program::pubkey::Pubkey::create_program_address( + ) -> Result { + solana_pubkey::Pubkey::create_program_address( &[ {% for seed in seeds %} {% if seed.kind === 'constantPdaSeedNode' and seed.value.kind === 'programIdValueNode' %} @@ -90,8 +90,8 @@ impl {{ account.name | pascalCase }} { {% endif %} {% endfor %} {% endif %} - ) -> (solana_program::pubkey::Pubkey, u8) { - solana_program::pubkey::Pubkey::find_program_address( + ) -> (solana_pubkey::Pubkey, u8) { + solana_pubkey::Pubkey::find_program_address( &[ {% for seed in seeds %} {% if seed.kind === 'constantPdaSeedNode' and seed.value.kind === 'programIdValueNode' %} @@ -131,7 +131,7 @@ impl<'a> TryFrom<&solana_program::account_info::AccountInfo<'a>> for {{ account. #[cfg(feature = "fetch")] pub fn fetch_{{ account.name | snakeCase }}( rpc: &solana_client::rpc_client::RpcClient, - address: &solana_program::pubkey::Pubkey, + address: &solana_pubkey::Pubkey, ) -> Result, std::io::Error> { let accounts = fetch_all_{{ account.name | snakeCase }}(rpc, &[*address])?; Ok(accounts[0].clone()) @@ -140,7 +140,7 @@ pub fn fetch_{{ account.name | snakeCase }}( #[cfg(feature = "fetch")] pub fn fetch_all_{{ account.name | snakeCase }}( rpc: &solana_client::rpc_client::RpcClient, - addresses: &[solana_program::pubkey::Pubkey], + addresses: &[solana_pubkey::Pubkey], ) -> Result>, std::io::Error> { let accounts = rpc.get_multiple_accounts(addresses) .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string()))?; @@ -158,7 +158,7 @@ pub fn fetch_all_{{ account.name | snakeCase }}( #[cfg(feature = "fetch")] pub fn fetch_maybe_{{ account.name | snakeCase }}( rpc: &solana_client::rpc_client::RpcClient, - address: &solana_program::pubkey::Pubkey, + address: &solana_pubkey::Pubkey, ) -> Result, std::io::Error> { let accounts = fetch_all_maybe_{{ account.name | snakeCase }}(rpc, &[*address])?; Ok(accounts[0].clone()) @@ -167,7 +167,7 @@ pub fn fetch_maybe_{{ account.name | snakeCase }}( #[cfg(feature = "fetch")] pub fn fetch_all_maybe_{{ account.name | snakeCase }}( rpc: &solana_client::rpc_client::RpcClient, - addresses: &[solana_program::pubkey::Pubkey], + addresses: &[solana_pubkey::Pubkey], ) -> Result>, std::io::Error> { let accounts = rpc.get_multiple_accounts(addresses) .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string()))?; diff --git a/packages/renderers-rust/public/templates/instructionsPage.njk b/packages/renderers-rust/public/templates/instructionsPage.njk index be623716e..68ba9e5ca 100644 --- a/packages/renderers-rust/public/templates/instructionsPage.njk +++ b/packages/renderers-rust/public/templates/instructionsPage.njk @@ -14,9 +14,9 @@ pub struct {{ instruction.name | pascalCase }} { {% endif %} {% if account.isSigner === 'either' %} - {% set type = '(solana_program::pubkey::Pubkey, bool)' %} + {% set type = '(solana_pubkey::Pubkey, bool)' %} {% else %} - {% set type = 'solana_program::pubkey::Pubkey' %} + {% set type = 'solana_pubkey::Pubkey' %} {% endif %} {% if account.isOptional %} diff --git a/packages/renderers-rust/public/templates/instructionsPageBuilder.njk b/packages/renderers-rust/public/templates/instructionsPageBuilder.njk index 352feeff3..817135934 100644 --- a/packages/renderers-rust/public/templates/instructionsPageBuilder.njk +++ b/packages/renderers-rust/public/templates/instructionsPageBuilder.njk @@ -20,9 +20,9 @@ pub struct {{ instruction.name | pascalCase }}Builder { {% for account in instruction.accounts %} {% if account.isSigner === 'either' %} - {{ account.name | snakeCase }}: Option<(solana_program::pubkey::Pubkey, bool)>, + {{ account.name | snakeCase }}: Option<(solana_pubkey::Pubkey, bool)>, {% else %} - {{ account.name | snakeCase }}: Option, + {{ account.name | snakeCase }}: Option, {% endif %} {% endfor %} {% for arg in instructionArgs %} @@ -45,7 +45,7 @@ impl {{ instruction.name | pascalCase }}Builder { {% endif %} {{- macros.docblock(account.docs) -}} #[inline(always)] - pub fn {{ account.name | snakeCase }}(&mut self, {{ account.name | snakeCase }}: {{ 'Option' if account.isOptional else 'solana_program::pubkey::Pubkey' }}{{ ', as_signer: bool' if account.isSigner === 'either' }}) -> &mut Self { + pub fn {{ account.name | snakeCase }}(&mut self, {{ account.name | snakeCase }}: {{ 'Option' if account.isOptional else 'solana_pubkey::Pubkey' }}{{ ', as_signer: bool' if account.isSigner === 'either' }}) -> &mut Self { {% if account.isOptional %} {% if account.isSigner === 'either' %} if let Some({{ account.name | snakeCase }}) = {{ account.name | snakeCase }} { @@ -99,7 +99,7 @@ impl {{ instruction.name | pascalCase }}Builder { {% elif account.defaultValue.kind === 'programId' %} {{ account.name | snakeCase }}: self.{{ account.name | snakeCase }}, {# Program ID set on the instruction creation. #} {% elif account.defaultValue.kind === 'publicKeyValueNode' %} - {{ account.name | snakeCase }}: self.{{ account.name | snakeCase }}.unwrap_or(solana_program::pubkey!("{{ account.defaultValue.publicKey }}")), + {{ account.name | snakeCase }}: self.{{ account.name | snakeCase }}.unwrap_or(solana_pubkey::pubkey!("{{ account.defaultValue.publicKey }}")), {% else %} {{ account.name | snakeCase }}: self.{{ account.name | snakeCase }}.expect("{{ account.name | snakeCase }} is not set"), {% endif %} diff --git a/packages/renderers-rust/public/templates/programsMod.njk b/packages/renderers-rust/public/templates/programsMod.njk index c1f602d1e..6e0c78eff 100644 --- a/packages/renderers-rust/public/templates/programsMod.njk +++ b/packages/renderers-rust/public/templates/programsMod.njk @@ -2,7 +2,7 @@ {% block main %} -use solana_program::{pubkey, pubkey::Pubkey}; +use solana_pubkey::{pubkey, Pubkey}; {% for program in programsToExport | sort(false, false, 'name') %} diff --git a/packages/renderers-rust/public/templates/sharedPage.njk b/packages/renderers-rust/public/templates/sharedPage.njk index e150a8b49..1e2992b94 100644 --- a/packages/renderers-rust/public/templates/sharedPage.njk +++ b/packages/renderers-rust/public/templates/sharedPage.njk @@ -16,7 +16,7 @@ For now, we just define them here. This the following caveat: #[cfg(feature = "fetch")] #[derive(Debug, Clone)] pub struct DecodedAccount { - pub address: solana_program::pubkey::Pubkey, + pub address: solana_pubkey::Pubkey, pub account: solana_sdk::account::Account, pub data: T, } @@ -25,7 +25,7 @@ For now, we just define them here. This the following caveat: #[derive(Debug, Clone)] pub enum MaybeAccount { Exists(DecodedAccount), - NotFound(solana_program::pubkey::Pubkey), + NotFound(solana_pubkey::Pubkey), } {% endif %} diff --git a/packages/renderers-rust/src/getTypeManifestVisitor.ts b/packages/renderers-rust/src/getTypeManifestVisitor.ts index 52f22f0ae..58188b279 100644 --- a/packages/renderers-rust/src/getTypeManifestVisitor.ts +++ b/packages/renderers-rust/src/getTypeManifestVisitor.ts @@ -291,7 +291,7 @@ export function getTypeManifestVisitor(options: { visitPublicKeyType() { return { - imports: new ImportMap().add('solana_program::pubkey::Pubkey'), + imports: new ImportMap().add('solana_pubkey::Pubkey'), nestedStructs: [], type: 'Pubkey', }; diff --git a/packages/renderers-rust/test/types/array.test.ts b/packages/renderers-rust/test/types/array.test.ts index b18270940..5fdb81e50 100644 --- a/packages/renderers-rust/test/types/array.test.ts +++ b/packages/renderers-rust/test/types/array.test.ts @@ -26,7 +26,7 @@ test('it exports short vecs', () => { // Then we expect a short vec to be exported. codeContains(renderMap.get('types/my_short_vec.rs'), [ /pub type MyShortVec = ShortVec;/, - /use solana_program::pubkey::Pubkey/, + /use solana_pubkey::Pubkey/, /use solana_program::short_vec::ShortVec/, ]); codeDoesNotContains(renderMap.get('types/my_short_vec.rs'), [ @@ -53,7 +53,7 @@ test('it exports short vecs as struct fields', () => { // Then we expect a short vec to be exported as a struct field. codeContains(renderMap.get('types/my_short_vec.rs'), [ /pub value: ShortVec,/, - /use solana_program::pubkey::Pubkey/, + /use solana_pubkey::Pubkey/, /use solana_program::short_vec::ShortVec/, ]); }); diff --git a/packages/renderers-vixen-parser/src/getTypeManifestVisitor.ts b/packages/renderers-vixen-parser/src/getTypeManifestVisitor.ts index b6dc65c0b..076ad64f2 100644 --- a/packages/renderers-vixen-parser/src/getTypeManifestVisitor.ts +++ b/packages/renderers-vixen-parser/src/getTypeManifestVisitor.ts @@ -291,7 +291,7 @@ export function getTypeManifestVisitor(options: { visitPublicKeyType() { return { - imports: new ImportMap().add('solana_program::pubkey::Pubkey'), + imports: new ImportMap().add('solana_pubkey::Pubkey'), nestedStructs: [], type: 'Pubkey', };