From 1e56f7ce07231c32d06e19dc6cb3745a84e1eb92 Mon Sep 17 00:00:00 2001 From: Fernando Otero Date: Thu, 23 Jan 2025 02:22:02 +0000 Subject: [PATCH 1/8] Add safety comments (#8) * Remove spl-token test cases * Update CU values * Add safety comments * Use git dependencies --- Cargo.lock | 15 ++--- Cargo.toml | 6 +- README.md | 24 +++---- program/Cargo.toml | 1 - program/src/processor/amount_to_ui_amount.rs | 3 +- program/src/processor/burn_checked.rs | 30 ++++----- program/src/processor/close_account.rs | 48 ++++++++------ .../src/processor/get_account_data_size.rs | 2 + program/src/processor/initialize_account2.rs | 16 ++++- program/src/processor/initialize_account3.rs | 16 ++++- .../processor/initialize_immutable_owner.rs | 1 + program/src/processor/initialize_mint.rs | 10 ++- program/src/processor/mint_to_checked.rs | 27 ++++---- program/src/processor/mod.rs | 7 +- program/src/processor/revoke.rs | 2 + program/src/processor/set_authority.rs | 8 ++- program/src/processor/shared/approve.rs | 4 ++ program/src/processor/shared/burn.rs | 4 ++ .../processor/shared/initialize_account.rs | 8 ++- .../processor/shared/initialize_multisig.rs | 5 +- program/src/processor/shared/mint_to.rs | 4 ++ .../processor/shared/toggle_account_state.rs | 6 +- program/src/processor/shared/transfer.rs | 64 +++++++++++++------ program/src/processor/sync_native.rs | 2 + program/src/processor/transfer_checked.rs | 30 ++++----- program/src/processor/ui_amount_to_amount.rs | 3 +- program/tests/amount_to_ui_amount.rs | 1 - program/tests/approve.rs | 1 - program/tests/approve_checked.rs | 1 - program/tests/burn.rs | 1 - program/tests/burn_checked.rs | 1 - program/tests/close_account.rs | 1 - program/tests/freeze_account.rs | 1 - program/tests/initialize_account.rs | 1 - program/tests/initialize_account2.rs | 1 - program/tests/initialize_account3.rs | 1 - program/tests/initialize_mint.rs | 1 - program/tests/initialize_mint2.rs | 1 - program/tests/initialize_multisig.rs | 1 - program/tests/initialize_multisig2.rs | 1 - program/tests/mint_to.rs | 1 - program/tests/mint_to_checked.rs | 1 - program/tests/revoke.rs | 1 - program/tests/set_authority.rs | 1 - program/tests/thaw_account.rs | 1 - program/tests/transfer.rs | 1 - program/tests/transfer_checked.rs | 1 - program/tests/ui_amount_to_amount.rs | 1 - 48 files changed, 225 insertions(+), 143 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1f4a622..4d27b01 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2609,15 +2609,13 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pinocchio" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2999d06e0c7b659daa8d41d56d906c26531e551d22e49c044339024d3e195ebc" +version = "0.7.1" +source = "git+https://github.com/febo/pinocchio.git?branch=febo/close-unstable#1aa533f55720e83451df7fb7e04507264e24190f" [[package]] name = "pinocchio-log" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95bd1d0d8a24f2637cb6748232912b6bae67b643b7ca903c68e670e704cd0652" +source = "git+https://github.com/febo/pinocchio.git?branch=febo/close-unstable#1aa533f55720e83451df7fb7e04507264e24190f" dependencies = [ "pinocchio-log-macro", ] @@ -2625,8 +2623,7 @@ dependencies = [ [[package]] name = "pinocchio-log-macro" version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "657779675430389ebbf00b8a5b6325e64157795ac61702fadf8756ac8806a50e" +source = "git+https://github.com/febo/pinocchio.git?branch=febo/close-unstable#1aa533f55720e83451df7fb7e04507264e24190f" dependencies = [ "quote", "regex", @@ -2636,8 +2633,7 @@ dependencies = [ [[package]] name = "pinocchio-pubkey" version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103d69776a0c585bb01b344d641346593adb4496120796df229722a9bab2db68" +source = "git+https://github.com/febo/pinocchio.git?branch=febo/close-unstable#1aa533f55720e83451df7fb7e04507264e24190f" dependencies = [ "five8_const", "pinocchio", @@ -5239,7 +5235,6 @@ dependencies = [ "assert_matches", "pinocchio", "pinocchio-log", - "pinocchio-pubkey", "solana-program-test", "solana-sdk", "spl-token", diff --git a/Cargo.toml b/Cargo.toml index 4decf81..283b708 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,6 @@ license = "Apache-2.0" repository = "https://github.com/febo/token" [workspace.dependencies] -pinocchio = "0.7.0" -pinocchio-log = "0.3.0" -pinocchio-pubkey = "0.2.2" +pinocchio = { version = "0.7", git = "https://github.com/febo/pinocchio.git", branch = "febo/close-unstable" } +pinocchio-log = { version = "0.3", git = "https://github.com/febo/pinocchio.git", branch = "febo/close-unstable" } +pinocchio-pubkey = { version = "0.2", git = "https://github.com/febo/pinocchio.git", branch = "febo/close-unstable" } diff --git a/README.md b/README.md index 85cbde1..284cb24 100644 --- a/README.md +++ b/README.md @@ -34,30 +34,30 @@ This repository contains a **proof-of-concept** of a reimplementation of the SPL | Instruction | Completed | CU (`p-token`) | CU (`spl-token`) | |----------------------------|-----------|----------------|------------------| | `InitializeMint` | ✅ | 100 | 2967 | -| `InitializeAccount` | ✅ | 170 | 4527 | -| `InitializeMultisig` | ✅ | 190 | 2973 | -| `Transfer` | ✅ | 153 | 4645 | -| `Approve` | ✅ | 124 | 2904 | +| `InitializeAccount` | ✅ | 185 | 4527 | +| `InitializeMultisig` | ✅ | 204 | 2973 | +| `Transfer` | ✅ | 155 | 4645 | +| `Approve` | ✅ | 122 | 2904 | | `Revoke` | ✅ | 97 | 2677 | -| `SetAuthority` | ✅ | 126 | 3167 | -| `MintTo` | ✅ | 154 | 4538 | +| `SetAuthority` | ✅ | 127 | 3167 | +| `MintTo` | ✅ | 155 | 4538 | | `Burn` | ✅ | 168 | 4753 | -| `CloseAccount` | ✅ | 147 | 2916 | +| `CloseAccount` | ✅ | 154 | 2916 | | `FreezeAccount` | ✅ | 136 | 4265 | | `ThawAccount` | ✅ | 136 | 4267 | -| `TransferChecked` | ✅ | 206 | 6201 | +| `TransferChecked` | ✅ | 204 | 6201 | | `ApproveChecked` | ✅ | 162 | 4459 | | `MintToChecked` | ✅ | 164 | 4546 | -| `BurnChecked` | ✅ | 170 | 4755 | -| `InitializeAccount2` | ✅ | 150 | 4388 | +| `BurnChecked` | ✅ | 169 | 4755 | +| `InitializeAccount2` | ✅ | 164 | 4388 | | `SyncNative` | ✅ | | | | `InitializeAccount3` | ✅ | 272 | 4240 | | `InitializeMultisig2` | ✅ | 319 | 2826 | | `InitializeMint2` | ✅ | 234 | 2827 | | `GetAccountDataSize` | ✅ | | | | `InitializeImmutableOwner` | ✅ | | | -| `AmountToUiAmount` | ✅ | 483 | 2501 | -| `UiAmountToAmount` | ✅ | 873 | 3161 | +| `AmountToUiAmount` | ✅ | 503 | 2501 | +| `UiAmountToAmount` | ✅ | 875 | 3161 | > Tests were run using Solana `v2.1.0`. diff --git a/program/Cargo.toml b/program/Cargo.toml index 0ef9320..d527968 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -20,7 +20,6 @@ test-sbf = [] [dependencies] pinocchio = { workspace = true } pinocchio-log = { workspace = true } -pinocchio-pubkey = { workspace = true } token-interface = { version = "^0", path = "../interface" } [dev-dependencies] diff --git a/program/src/processor/amount_to_ui_amount.rs b/program/src/processor/amount_to_ui_amount.rs index 4ca5e3a..6c13993 100644 --- a/program/src/processor/amount_to_ui_amount.rs +++ b/program/src/processor/amount_to_ui_amount.rs @@ -23,7 +23,8 @@ pub fn process_amount_to_ui_amount( let mint_info = accounts.first().ok_or(ProgramError::NotEnoughAccountKeys)?; check_account_owner(mint_info)?; - // SAFETY: there is a single borrow to the `Mint` account. + // SAFETY: single immutable borrow to `mint_info` account data and + // `load` validates that the mint is initialized. let mint = unsafe { load::(mint_info.borrow_data_unchecked()).map_err(|_| TokenError::InvalidMint)? }; diff --git a/program/src/processor/burn_checked.rs b/program/src/processor/burn_checked.rs index f9ef06c..88a745d 100644 --- a/program/src/processor/burn_checked.rs +++ b/program/src/processor/burn_checked.rs @@ -4,20 +4,20 @@ use super::shared; #[inline(always)] pub fn process_burn_checked(accounts: &[AccountInfo], instruction_data: &[u8]) -> ProgramResult { - let (amount, decimals) = instruction_data.split_at(core::mem::size_of::()); - let amount = u64::from_le_bytes( - amount - .try_into() - .map_err(|_error| ProgramError::InvalidInstructionData)?, - ); + // expected u64 (8) + u8 (1) + let (amount, decimals) = if instruction_data.len() == 9 { + let (amount, decimals) = instruction_data.split_at(core::mem::size_of::()); + ( + u64::from_le_bytes( + amount + .try_into() + .map_err(|_error| ProgramError::InvalidInstructionData)?, + ), + decimals.first(), + ) + } else { + return Err(ProgramError::InvalidInstructionData); + }; - shared::burn::process_burn( - accounts, - amount, - Some( - *decimals - .first() - .ok_or(ProgramError::InvalidInstructionData)?, - ), - ) + shared::burn::process_burn(accounts, amount, decimals.copied()) } diff --git a/program/src/processor/close_account.rs b/program/src/processor/close_account.rs index ffd0263..3f90dea 100644 --- a/program/src/processor/close_account.rs +++ b/program/src/processor/close_account.rs @@ -3,14 +3,16 @@ use pinocchio::{ }; use token_interface::{ error::TokenError, - state::{account::Account, load_mut}, + state::{account::Account, load}, }; use super::validate_owner; -/// Incinerator address. -const INCINERATOR_ID: Pubkey = - pinocchio_pubkey::pubkey!("1nc1nerator11111111111111111111111111111111"); +/// Incinerator (`1nc1nerator11111111111111111111111111111111`) address. +const INCINERATOR_ID: Pubkey = [ + 0, 51, 144, 114, 141, 52, 17, 96, 121, 189, 201, 17, 191, 255, 0, 219, 212, 77, 46, 205, 204, + 247, 156, 166, 225, 0, 56, 225, 0, 0, 0, 0, +]; #[inline(always)] pub fn process_close_account(accounts: &[AccountInfo]) -> ProgramResult { @@ -24,26 +26,30 @@ pub fn process_close_account(accounts: &[AccountInfo]) -> ProgramResult { // raw pointer. if source_account_info == destination_account_info { return Err(ProgramError::InvalidAccountData); - } - - let source_account = - unsafe { load_mut::(source_account_info.borrow_mut_data_unchecked())? }; - - if !source_account.is_native() && source_account.amount() != 0 { - return Err(TokenError::NonNativeHasBalance.into()); - } - - let authority = source_account - .close_authority() - .unwrap_or(&source_account.owner); - - if !source_account.is_owned_by_system_program_or_incinerator() { - validate_owner(authority, authority_info, remaining)?; - } else if destination_account_info.key() != &INCINERATOR_ID { - return Err(ProgramError::InvalidAccountData); + } else { + // SAFETY: scoped immutable borrow to `source_account_info` account data and + // `load` validates that the account is initialized. + let source_account = + unsafe { load::(source_account_info.borrow_data_unchecked())? }; + + if !source_account.is_native() && source_account.amount() != 0 { + return Err(TokenError::NonNativeHasBalance.into()); + } + + let authority = source_account + .close_authority() + .unwrap_or(&source_account.owner); + + if !source_account.is_owned_by_system_program_or_incinerator() { + validate_owner(authority, authority_info, remaining)?; + } else if destination_account_info.key() != &INCINERATOR_ID { + return Err(ProgramError::InvalidAccountData); + } } let destination_starting_lamports = destination_account_info.lamports(); + // SAFETY: single mutable borrow to `destination_account_info` lamports and + // there are no "active" borrows of `source_account_info` account data. unsafe { // Moves the lamports to the destination account. *destination_account_info.borrow_mut_lamports_unchecked() = destination_starting_lamports diff --git a/program/src/processor/get_account_data_size.rs b/program/src/processor/get_account_data_size.rs index ff2fa90..7693b64 100644 --- a/program/src/processor/get_account_data_size.rs +++ b/program/src/processor/get_account_data_size.rs @@ -17,6 +17,8 @@ pub fn process_get_account_data_size(accounts: &[AccountInfo]) -> ProgramResult // Make sure the mint is valid. check_account_owner(mint_info)?; + // SAFETY: single immutable borrow to `mint_info` account data and + // `load` validates that the mint is initialized. let _ = unsafe { load::(mint_info.borrow_data_unchecked()).map_err(|_| TokenError::InvalidMint)? }; diff --git a/program/src/processor/initialize_account2.rs b/program/src/processor/initialize_account2.rs index 9200ee0..185c291 100644 --- a/program/src/processor/initialize_account2.rs +++ b/program/src/processor/initialize_account2.rs @@ -1,4 +1,9 @@ -use pinocchio::{account_info::AccountInfo, pubkey::Pubkey, ProgramResult}; +use pinocchio::{ + account_info::AccountInfo, + program_error::ProgramError, + pubkey::{Pubkey, PUBKEY_BYTES}, + ProgramResult, +}; use super::shared; @@ -7,6 +12,13 @@ pub fn process_initialize_account2( accounts: &[AccountInfo], instruction_data: &[u8], ) -> ProgramResult { - let owner = unsafe { &*(instruction_data.as_ptr() as *const Pubkey) }; + // SAFETY: validate `instruction_data` length. + let owner = unsafe { + if instruction_data.len() != PUBKEY_BYTES { + return Err(ProgramError::InvalidInstructionData); + } else { + &*(instruction_data.as_ptr() as *const Pubkey) + } + }; shared::initialize_account::process_initialize_account(accounts, Some(owner), true) } diff --git a/program/src/processor/initialize_account3.rs b/program/src/processor/initialize_account3.rs index 4eaa7a5..54e5501 100644 --- a/program/src/processor/initialize_account3.rs +++ b/program/src/processor/initialize_account3.rs @@ -1,4 +1,9 @@ -use pinocchio::{account_info::AccountInfo, pubkey::Pubkey, ProgramResult}; +use pinocchio::{ + account_info::AccountInfo, + program_error::ProgramError, + pubkey::{Pubkey, PUBKEY_BYTES}, + ProgramResult, +}; use super::shared; @@ -7,6 +12,13 @@ pub fn process_initialize_account3( accounts: &[AccountInfo], instruction_data: &[u8], ) -> ProgramResult { - let owner = unsafe { &*(instruction_data.as_ptr() as *const Pubkey) }; + // SAFETY: validate `instruction_data` length. + let owner = unsafe { + if instruction_data.len() != PUBKEY_BYTES { + return Err(ProgramError::InvalidInstructionData); + } else { + &*(instruction_data.as_ptr() as *const Pubkey) + } + }; shared::initialize_account::process_initialize_account(accounts, Some(owner), false) } diff --git a/program/src/processor/initialize_immutable_owner.rs b/program/src/processor/initialize_immutable_owner.rs index cf69da4..ba98c28 100644 --- a/program/src/processor/initialize_immutable_owner.rs +++ b/program/src/processor/initialize_immutable_owner.rs @@ -8,6 +8,7 @@ use token_interface::{ pub fn process_initialize_immutable_owner(accounts: &[AccountInfo]) -> ProgramResult { let token_account_info = accounts.first().ok_or(ProgramError::NotEnoughAccountKeys)?; + // SAFETY: single immutable borrow to `token_account_info` account data. let account = unsafe { load_unchecked::(token_account_info.borrow_data_unchecked())? }; if account.is_initialized() { diff --git a/program/src/processor/initialize_mint.rs b/program/src/processor/initialize_mint.rs index 8460ce0..ee52eb4 100644 --- a/program/src/processor/initialize_mint.rs +++ b/program/src/processor/initialize_mint.rs @@ -35,6 +35,7 @@ pub fn process_initialize_mint( (mint_info, None) }; + // SAFETY: single mutable borrow to `mint_info` account data. let mint = unsafe { load_mut_unchecked::(mint_info.borrow_mut_data_unchecked())? }; if mint.is_initialized() { @@ -44,7 +45,9 @@ pub fn process_initialize_mint( // Check rent-exempt status of the mint account. let is_exempt = if let Some(rent_sysvar_info) = rent_sysvar_info { - let rent = unsafe { Rent::from_bytes(rent_sysvar_info.borrow_data_unchecked()) }; + // SAFETY: single immutable borrow to `rent_sysvar_info`; account ID and length are + // checked by `from_account_info_unchecked`. + let rent = unsafe { Rent::from_account_info_unchecked(rent_sysvar_info)? }; rent.is_exempt(mint_info.lamports(), size_of::()) } else { Rent::get()?.is_exempt(mint_info.lamports(), size_of::()) @@ -81,7 +84,7 @@ impl InitializeMint<'_> { // - decimals (1 byte) // - mint_authority (32 bytes) // - option + freeze_authority (1 byte + 32 bytes) - if bytes.len() < 34 { + if bytes.len() < 34 || (bytes[33] == 1 && bytes.len() < 66) { return Err(ProgramError::InvalidInstructionData); } @@ -93,16 +96,19 @@ impl InitializeMint<'_> { #[inline] pub fn decimals(&self) -> u8 { + // SAFETY: the `bytes` length was validated in `try_from_bytes`. unsafe { *self.raw } } #[inline] pub fn mint_authority(&self) -> &Pubkey { + // SAFETY: the `bytes` length was validated in `try_from_bytes`. unsafe { &*(self.raw.add(1) as *const Pubkey) } } #[inline] pub fn freeze_authority(&self) -> Option<&Pubkey> { + // SAFETY: the `bytes` length was validated in `try_from_bytes`. unsafe { if *self.raw.add(33) == 0 { Option::None diff --git a/program/src/processor/mint_to_checked.rs b/program/src/processor/mint_to_checked.rs index 6fb3ae9..ebfcdea 100644 --- a/program/src/processor/mint_to_checked.rs +++ b/program/src/processor/mint_to_checked.rs @@ -4,17 +4,20 @@ use super::shared; #[inline(always)] pub fn process_mint_to_checked(accounts: &[AccountInfo], instruction_data: &[u8]) -> ProgramResult { - let (amount, decimals) = instruction_data.split_at(core::mem::size_of::()); + // expected u64 (8) + u8 (1) + let (amount, decimals) = if instruction_data.len() == 9 { + let (amount, decimals) = instruction_data.split_at(core::mem::size_of::()); + ( + u64::from_le_bytes( + amount + .try_into() + .map_err(|_error| ProgramError::InvalidInstructionData)?, + ), + decimals.first(), + ) + } else { + return Err(ProgramError::InvalidInstructionData); + }; - let amount = u64::from_le_bytes( - amount - .try_into() - .map_err(|_error| ProgramError::InvalidInstructionData)?, - ); - - shared::mint_to::process_mint_to( - accounts, - amount, - Some(*decimals.first().ok_or(ProgramError::InvalidAccountData)?), - ) + shared::mint_to::process_mint_to(accounts, amount, decimals.copied()) } diff --git a/program/src/processor/mod.rs b/program/src/processor/mod.rs index 208a48e..0f0592f 100644 --- a/program/src/processor/mod.rs +++ b/program/src/processor/mod.rs @@ -92,7 +92,10 @@ fn check_account_owner(account_info: &AccountInfo) -> ProgramResult { } } -/// Validates owner(s) are present +/// Validates owner(s) are present. +/// +/// Note that `owner_account_info` will be immutable borrowed when it represents +/// a multisig account. #[inline(always)] fn validate_owner( expected_owner: &Pubkey, @@ -106,6 +109,8 @@ fn validate_owner( if owner_account_info.data_len() == Multisig::LEN && owner_account_info.owner() == &TOKEN_PROGRAM_ID { + // SAFETY: the caller guarantees that there are no mutable borrows of `owner_account_info` + // account data and the `load` validates that the account is initialized. let multisig = unsafe { load::(owner_account_info.borrow_data_unchecked())? }; let mut num_signers = 0; diff --git a/program/src/processor/revoke.rs b/program/src/processor/revoke.rs index 2d40b02..6361d99 100644 --- a/program/src/processor/revoke.rs +++ b/program/src/processor/revoke.rs @@ -12,6 +12,8 @@ pub fn process_revoke(accounts: &[AccountInfo], _instruction_data: &[u8]) -> Pro return Err(ProgramError::NotEnoughAccountKeys); }; + // SAFETY: single mutable borrow to `source_account_info` account data and + // `load_mut` validates that the account is initialized. let source_account = unsafe { load_mut::(source_account_info.borrow_mut_data_unchecked())? }; diff --git a/program/src/processor/set_authority.rs b/program/src/processor/set_authority.rs index 2b9fd94..3ad4d12 100644 --- a/program/src/processor/set_authority.rs +++ b/program/src/processor/set_authority.rs @@ -27,6 +27,8 @@ pub fn process_set_authority(accounts: &[AccountInfo], instruction_data: &[u8]) }; if account_info.data_len() == Account::LEN { + // SAFETY: single mutable borrow to `account_info` account data and + // `load_mut` validates that the account is initialized. let account = unsafe { load_mut::(account_info.borrow_mut_data_unchecked())? }; if account.is_frozen() { @@ -65,6 +67,8 @@ pub fn process_set_authority(accounts: &[AccountInfo], instruction_data: &[u8]) } } } else if account_info.data_len() == Mint::LEN { + // SAFETY: single mutable borrow to `account_info` account data and + // `load_mut` validates that the mint is initialized. let mint = unsafe { load_mut::(account_info.borrow_mut_data_unchecked())? }; match authority_type { @@ -119,7 +123,7 @@ impl SetAuthority<'_> { // The minimum expected size of the instruction data. // - authority_type (1 byte) // - option + new_authority (1 byte + 32 bytes) - if bytes.len() < 2 { + if bytes.len() < 2 || (bytes[1] == 1 && bytes.len() < 34) { return Err(ProgramError::InvalidInstructionData); } @@ -131,11 +135,13 @@ impl SetAuthority<'_> { #[inline(always)] pub fn authority_type(&self) -> Result { + // SAFETY: `bytes` length is validated in `try_from_bytes`. unsafe { AuthorityType::from(*self.raw) } } #[inline(always)] pub fn new_authority(&self) -> Option<&Pubkey> { + // SAFETY: `bytes` length is validated in `try_from_bytes`. unsafe { if *self.raw.add(1) == 0 { Option::None diff --git a/program/src/processor/shared/approve.rs b/program/src/processor/shared/approve.rs index 40fa7af..a9d2812 100644 --- a/program/src/processor/shared/approve.rs +++ b/program/src/processor/shared/approve.rs @@ -45,6 +45,8 @@ pub fn process_approve( // Validates source account. + // SAFETY: single mutable borrow to `source_account_info` account data and + // `load_mut` validates that the account is initialized. let source_account = unsafe { load_mut::(source_account_info.borrow_mut_data_unchecked())? }; @@ -57,6 +59,8 @@ pub fn process_approve( return Err(TokenError::MintMismatch.into()); } + // SAFETY: single immutable borrow of `mint_info` account data and + // `load` validates that the mint is initialized. let mint = unsafe { load::(mint_info.borrow_data_unchecked())? }; if expected_decimals != mint.decimals { diff --git a/program/src/processor/shared/burn.rs b/program/src/processor/shared/burn.rs index 1c26785..06f741a 100644 --- a/program/src/processor/shared/burn.rs +++ b/program/src/processor/shared/burn.rs @@ -16,6 +16,8 @@ pub fn process_burn( return Err(ProgramError::NotEnoughAccountKeys); }; + // SAFETY: single mutable borrow to `source_account_info` account data and + // `load_mut` validates that the account is initialized. let source_account = unsafe { load_mut::(source_account_info.borrow_mut_data_unchecked())? }; @@ -33,6 +35,8 @@ pub fn process_burn( .checked_sub(amount) .ok_or(TokenError::InsufficientFunds)?; + // SAFETY: single mutable borrow to `mint_info` account data and + // `load_mut` validates that the mint is initialized. let mint = unsafe { load_mut::(mint_info.borrow_mut_data_unchecked())? }; if mint_info.key() != &source_account.mint { diff --git a/program/src/processor/shared/initialize_account.rs b/program/src/processor/shared/initialize_account.rs index 1a2c75f..952dd1f 100644 --- a/program/src/processor/shared/initialize_account.rs +++ b/program/src/processor/shared/initialize_account.rs @@ -42,7 +42,9 @@ pub fn process_initialize_account( let minimum_balance = if rent_sysvar_account { let rent_sysvar_info = remaning.first().ok_or(ProgramError::NotEnoughAccountKeys)?; - let rent = unsafe { Rent::from_bytes(rent_sysvar_info.borrow_data_unchecked()) }; + // SAFETY: single immutable borrow to `rent_sysvar_info`; account ID and length are + // checked by `from_account_info_unchecked`. + let rent = unsafe { Rent::from_account_info_unchecked(rent_sysvar_info)? }; rent.minimum_balance(new_account_info_data_len) } else { Rent::get()?.minimum_balance(new_account_info_data_len) @@ -52,6 +54,7 @@ pub fn process_initialize_account( // Initialize the account. + // SAFETY: single mutable borrow of the 'new_account_info' account data. let account = unsafe { load_mut_unchecked::(new_account_info.borrow_mut_data_unchecked())? }; @@ -66,6 +69,8 @@ pub fn process_initialize_account( if !is_native_mint { check_account_owner(mint_info)?; + // SAFETY: single immutable borrow of `mint_info` account data and + // `load` validates that the mint is initialized. let _ = unsafe { load::(mint_info.borrow_data_unchecked()).map_err(|_| TokenError::InvalidMint)? }; @@ -78,6 +83,7 @@ pub fn process_initialize_account( if is_native_mint { account.set_native(true); account.set_native_amount(minimum_balance); + // SAFETY: single mutable borrow to `new_account_info` lamports. unsafe { account.set_amount( new_account_info diff --git a/program/src/processor/shared/initialize_multisig.rs b/program/src/processor/shared/initialize_multisig.rs index 8831c19..0d45fa8 100644 --- a/program/src/processor/shared/initialize_multisig.rs +++ b/program/src/processor/shared/initialize_multisig.rs @@ -32,12 +32,15 @@ pub fn process_initialize_multisig( let multisig_info_data_len = multisig_info.data_len(); let is_exempt = if let Some(rent_sysvar_info) = rent_sysvar_info { - let rent = unsafe { Rent::from_bytes(rent_sysvar_info.borrow_data_unchecked()) }; + // SAFETY: single immutable borrow to `rent_sysvar_info`; account ID and length are + // checked by `from_account_info_unchecked`. + let rent = unsafe { Rent::from_account_info_unchecked(rent_sysvar_info)? }; rent.is_exempt(multisig_info.lamports(), multisig_info_data_len) } else { Rent::get()?.is_exempt(multisig_info.lamports(), multisig_info_data_len) }; + // SAFETY: single mutable borrow to `multisig_info` account data. let multisig = unsafe { load_mut_unchecked::(multisig_info.borrow_mut_data_unchecked())? }; diff --git a/program/src/processor/shared/mint_to.rs b/program/src/processor/shared/mint_to.rs index 62141bb..773039f 100644 --- a/program/src/processor/shared/mint_to.rs +++ b/program/src/processor/shared/mint_to.rs @@ -18,6 +18,8 @@ pub fn process_mint_to( // Validates the destination account. + // SAFETY: single mutable borrow to `destination_account_info` account data and + // `load_mut` validates that the account is initialized. let destination_account = unsafe { load_mut::(destination_account_info.borrow_mut_data_unchecked())? }; @@ -33,6 +35,8 @@ pub fn process_mint_to( return Err(TokenError::MintMismatch.into()); } + // SAFETY: single mutable borrow to `mint_info` account data and + // `load_mut` validates that the mint is initialized. let mint = unsafe { load_mut::(mint_info.borrow_mut_data_unchecked())? }; if let Some(expected_decimals) = expected_decimals { diff --git a/program/src/processor/shared/toggle_account_state.rs b/program/src/processor/shared/toggle_account_state.rs index bf05bfd..c9ff11a 100644 --- a/program/src/processor/shared/toggle_account_state.rs +++ b/program/src/processor/shared/toggle_account_state.rs @@ -12,10 +12,12 @@ pub fn process_toggle_account_state(accounts: &[AccountInfo], freeze: bool) -> P return Err(ProgramError::NotEnoughAccountKeys); }; + // SAFETY: single mutable borrow to `source_account_info` account data and + // `load_mut` validates that the account is initialized. let source_account = unsafe { load_mut::(source_account_info.borrow_mut_data_unchecked())? }; - if freeze && source_account.is_frozen() || !freeze && !source_account.is_frozen() { + if freeze == source_account.is_frozen() { return Err(TokenError::InvalidState.into()); } if source_account.is_native() { @@ -25,6 +27,8 @@ pub fn process_toggle_account_state(accounts: &[AccountInfo], freeze: bool) -> P return Err(TokenError::MintMismatch.into()); } + // SAFETY: single immutable borrow of `mint_info` account data and + // `load` validates that the mint is initialized. let mint = unsafe { load::(mint_info.borrow_data_unchecked())? }; match mint.freeze_authority() { diff --git a/program/src/processor/shared/transfer.rs b/program/src/processor/shared/transfer.rs index 6d33d5f..aafd0a1 100644 --- a/program/src/processor/shared/transfer.rs +++ b/program/src/processor/shared/transfer.rs @@ -1,7 +1,7 @@ use pinocchio::{account_info::AccountInfo, program_error::ProgramError, ProgramResult}; use token_interface::{ error::TokenError, - state::{account::Account, load, load_mut, mint::Mint}, + state::{account::Account, load, load_mut, load_mut_unchecked, mint::Mint}, }; use crate::processor::{check_account_owner, validate_owner}; @@ -51,27 +51,49 @@ pub fn process_transfer( // Validates source and destination accounts. + // SAFETY: single mutable borrow to `source_account_info` account data and + // `load_mut` validates that the account is initialized. let source_account = unsafe { load_mut::(source_account_info.borrow_mut_data_unchecked())? }; - let destination_account = - unsafe { load_mut::(destination_account_info.borrow_mut_data_unchecked())? }; - - if source_account.is_frozen() || destination_account.is_frozen() { - return Err(TokenError::AccountFrozen.into()); - } + // Comparing whether the AccountInfo's "point" to the same account or + // not - this is a faster comparison since it just checks the internal + // raw pointer. + let self_transfer = source_account_info == destination_account_info; // Implicitly validates that the account has enough tokens by calculating the // remaining amount - the amount is only updated on the account if the transfer // is successful. - let remaining_amount = source_account - .amount() - .checked_sub(amount) - .ok_or(TokenError::InsufficientFunds)?; + let remaining_amount = if self_transfer { + if source_account.is_frozen() { + return Err(TokenError::AccountFrozen.into()); + } - if source_account.mint != destination_account.mint { - return Err(TokenError::MintMismatch.into()); - } + source_account + .amount() + .checked_sub(amount) + .ok_or(TokenError::InsufficientFunds)? + } else { + // SAFETY: scoped immutable borrow to `destination_account_info` account data and + // `load` validates that the account is initialized. + let destination_account = + unsafe { load::(destination_account_info.borrow_data_unchecked())? }; + + if source_account.is_frozen() || destination_account.is_frozen() { + return Err(TokenError::AccountFrozen.into()); + } + + let remaining_amount = source_account + .amount() + .checked_sub(amount) + .ok_or(TokenError::InsufficientFunds)?; + + if source_account.mint != destination_account.mint { + return Err(TokenError::MintMismatch.into()); + } + + remaining_amount + }; // Validates the mint information. @@ -80,6 +102,8 @@ pub fn process_transfer( return Err(TokenError::MintMismatch.into()); } + // SAFETY: single immutable borrow of `mint_info` account data and + // `load` validates that the mint is initialized. let mint = unsafe { load::(mint_info.borrow_data_unchecked())? }; if decimals != mint.decimals { @@ -87,11 +111,6 @@ pub fn process_transfer( } } - // Comparing whether the AccountInfo's "point" to the same account or - // not - this is a faster comparison since it just checks the internal - // raw pointer. - let self_transfer = source_account_info == destination_account_info; - // Validates the authority (delegate or owner). if source_account.delegate() == Some(authority_info.key()) { @@ -123,6 +142,11 @@ pub fn process_transfer( source_account.set_amount(remaining_amount); + // SAFETY: single mutable borrow to `destination_account_info` account data; the account + // is guaranteed to be initialized and different than `source_account_info`. + let destination_account = unsafe { + load_mut_unchecked::(destination_account_info.borrow_mut_data_unchecked())? + }; let destination_amount = destination_account .amount() .checked_add(amount) @@ -130,11 +154,13 @@ pub fn process_transfer( destination_account.set_amount(destination_amount); if source_account.is_native() { + // SAFETY: single mutable borrow to `source_account_info` lamports. let source_lamports = unsafe { source_account_info.borrow_mut_lamports_unchecked() }; *source_lamports = source_lamports .checked_sub(amount) .ok_or(TokenError::Overflow)?; + // SAFETY: single mutable borrow to `destination_account_info` lamports. let destination_lamports = unsafe { destination_account_info.borrow_mut_lamports_unchecked() }; *destination_lamports = destination_lamports diff --git a/program/src/processor/sync_native.rs b/program/src/processor/sync_native.rs index 9bba708..4ccc276 100644 --- a/program/src/processor/sync_native.rs +++ b/program/src/processor/sync_native.rs @@ -12,6 +12,8 @@ pub fn process_sync_native(accounts: &[AccountInfo]) -> ProgramResult { check_account_owner(native_account_info)?; + // SAFETY: single mutable borrow to `native_account_info` account data and + // `load_mut` validates that the account is initialized. let native_account = unsafe { load_mut::(native_account_info.borrow_mut_data_unchecked())? }; diff --git a/program/src/processor/transfer_checked.rs b/program/src/processor/transfer_checked.rs index 4c23ee5..ea75a28 100644 --- a/program/src/processor/transfer_checked.rs +++ b/program/src/processor/transfer_checked.rs @@ -7,20 +7,20 @@ pub fn process_transfer_checked( accounts: &[AccountInfo], instruction_data: &[u8], ) -> ProgramResult { - let (amount, decimals) = instruction_data.split_at(core::mem::size_of::()); - let amount = u64::from_le_bytes( - amount - .try_into() - .map_err(|_error| ProgramError::InvalidInstructionData)?, - ); + // expected u64 (8) + u8 (1) + let (amount, decimals) = if instruction_data.len() == 9 { + let (amount, decimals) = instruction_data.split_at(core::mem::size_of::()); + ( + u64::from_le_bytes( + amount + .try_into() + .map_err(|_error| ProgramError::InvalidInstructionData)?, + ), + decimals.first(), + ) + } else { + return Err(ProgramError::InvalidInstructionData); + }; - shared::transfer::process_transfer( - accounts, - amount, - Some( - *decimals - .first() - .ok_or(ProgramError::InvalidInstructionData)?, - ), - ) + shared::transfer::process_transfer(accounts, amount, decimals.copied()) } diff --git a/program/src/processor/ui_amount_to_amount.rs b/program/src/processor/ui_amount_to_amount.rs index b7299dc..823ffbc 100644 --- a/program/src/processor/ui_amount_to_amount.rs +++ b/program/src/processor/ui_amount_to_amount.rs @@ -19,7 +19,8 @@ pub fn process_ui_amount_to_amount( let mint_info = accounts.first().ok_or(ProgramError::NotEnoughAccountKeys)?; check_account_owner(mint_info)?; - // SAFETY: there is a single borrow to the `Mint` account. + // SAFETY: single immutable borrow to `mint_info` account data and + // `load` validates that the mint is initialized. let mint = unsafe { load::(mint_info.borrow_data_unchecked()).map_err(|_| TokenError::InvalidMint)? }; diff --git a/program/tests/amount_to_ui_amount.rs b/program/tests/amount_to_ui_amount.rs index e7cc8f6..402be08 100644 --- a/program/tests/amount_to_ui_amount.rs +++ b/program/tests/amount_to_ui_amount.rs @@ -6,7 +6,6 @@ use setup::{mint, TOKEN_PROGRAM_ID}; use solana_program_test::{tokio, ProgramTest}; use solana_sdk::{pubkey::Pubkey, signature::Signer, transaction::Transaction}; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn amount_to_ui_amount(token_program: Pubkey) { diff --git a/program/tests/approve.rs b/program/tests/approve.rs index 37ba3bf..f3b28e2 100644 --- a/program/tests/approve.rs +++ b/program/tests/approve.rs @@ -11,7 +11,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn approve(token_program: Pubkey) { diff --git a/program/tests/approve_checked.rs b/program/tests/approve_checked.rs index edd949b..e34fa7a 100644 --- a/program/tests/approve_checked.rs +++ b/program/tests/approve_checked.rs @@ -11,7 +11,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn approve_checked(token_program: Pubkey) { diff --git a/program/tests/burn.rs b/program/tests/burn.rs index 57ced7b..6e5e2e5 100644 --- a/program/tests/burn.rs +++ b/program/tests/burn.rs @@ -11,7 +11,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn burn(token_program: Pubkey) { diff --git a/program/tests/burn_checked.rs b/program/tests/burn_checked.rs index a9a05b1..a008262 100644 --- a/program/tests/burn_checked.rs +++ b/program/tests/burn_checked.rs @@ -11,7 +11,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn burn_checked(token_program: Pubkey) { diff --git a/program/tests/close_account.rs b/program/tests/close_account.rs index 3378432..8a73432 100644 --- a/program/tests/close_account.rs +++ b/program/tests/close_account.rs @@ -10,7 +10,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn close_account(token_program: Pubkey) { diff --git a/program/tests/freeze_account.rs b/program/tests/freeze_account.rs index 2f44d46..d5fb3af 100644 --- a/program/tests/freeze_account.rs +++ b/program/tests/freeze_account.rs @@ -12,7 +12,6 @@ use solana_sdk::{ }; use spl_token::state::AccountState; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn freeze_account(token_program: Pubkey) { diff --git a/program/tests/initialize_account.rs b/program/tests/initialize_account.rs index 9bbea2e..4c491bb 100644 --- a/program/tests/initialize_account.rs +++ b/program/tests/initialize_account.rs @@ -12,7 +12,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn initialize_account(token_program: Pubkey) { diff --git a/program/tests/initialize_account2.rs b/program/tests/initialize_account2.rs index 7ed0aec..9f250e4 100644 --- a/program/tests/initialize_account2.rs +++ b/program/tests/initialize_account2.rs @@ -12,7 +12,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn initialize_account2(token_program: Pubkey) { diff --git a/program/tests/initialize_account3.rs b/program/tests/initialize_account3.rs index 74cf2df..7fee802 100644 --- a/program/tests/initialize_account3.rs +++ b/program/tests/initialize_account3.rs @@ -12,7 +12,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn initialize_account3(token_program: Pubkey) { diff --git a/program/tests/initialize_mint.rs b/program/tests/initialize_mint.rs index f99ade1..175e805 100644 --- a/program/tests/initialize_mint.rs +++ b/program/tests/initialize_mint.rs @@ -16,7 +16,6 @@ use solana_sdk::{ }; use token_interface::state::mint::Mint; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn initialize_mint(token_program: Pubkey) { diff --git a/program/tests/initialize_mint2.rs b/program/tests/initialize_mint2.rs index 1b8c24f..683e1e3 100644 --- a/program/tests/initialize_mint2.rs +++ b/program/tests/initialize_mint2.rs @@ -16,7 +16,6 @@ use solana_sdk::{ }; use token_interface::state::mint::Mint; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn initialize_mint2(token_program: Pubkey) { diff --git a/program/tests/initialize_multisig.rs b/program/tests/initialize_multisig.rs index 574554d..5cf9e34 100644 --- a/program/tests/initialize_multisig.rs +++ b/program/tests/initialize_multisig.rs @@ -13,7 +13,6 @@ use solana_sdk::{ }; use spl_token::state::Multisig; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn initialize_multisig(token_program: Pubkey) { diff --git a/program/tests/initialize_multisig2.rs b/program/tests/initialize_multisig2.rs index e1d95b8..443a988 100644 --- a/program/tests/initialize_multisig2.rs +++ b/program/tests/initialize_multisig2.rs @@ -13,7 +13,6 @@ use solana_sdk::{ }; use spl_token::state::Multisig; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn initialize_multisig2(token_program: Pubkey) { diff --git a/program/tests/mint_to.rs b/program/tests/mint_to.rs index f735d2e..9cafae3 100644 --- a/program/tests/mint_to.rs +++ b/program/tests/mint_to.rs @@ -11,7 +11,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn mint_to(token_program: Pubkey) { diff --git a/program/tests/mint_to_checked.rs b/program/tests/mint_to_checked.rs index cd126a5..1d0cb72 100644 --- a/program/tests/mint_to_checked.rs +++ b/program/tests/mint_to_checked.rs @@ -11,7 +11,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn mint_to_checked(token_program: Pubkey) { diff --git a/program/tests/revoke.rs b/program/tests/revoke.rs index 2760dbf..689c48c 100644 --- a/program/tests/revoke.rs +++ b/program/tests/revoke.rs @@ -11,7 +11,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn revoke(token_program: Pubkey) { diff --git a/program/tests/set_authority.rs b/program/tests/set_authority.rs index 2e37d7d..977d22e 100644 --- a/program/tests/set_authority.rs +++ b/program/tests/set_authority.rs @@ -13,7 +13,6 @@ use solana_sdk::{ }; use spl_token::instruction::AuthorityType; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn set_authority(token_program: Pubkey) { diff --git a/program/tests/thaw_account.rs b/program/tests/thaw_account.rs index 6ddae1a..6fe5762 100644 --- a/program/tests/thaw_account.rs +++ b/program/tests/thaw_account.rs @@ -12,7 +12,6 @@ use solana_sdk::{ }; use spl_token::state::AccountState; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn thaw_account(token_program: Pubkey) { diff --git a/program/tests/transfer.rs b/program/tests/transfer.rs index ae7413e..16491c2 100644 --- a/program/tests/transfer.rs +++ b/program/tests/transfer.rs @@ -11,7 +11,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn transfer(token_program: Pubkey) { diff --git a/program/tests/transfer_checked.rs b/program/tests/transfer_checked.rs index 991a103..d03c9f5 100644 --- a/program/tests/transfer_checked.rs +++ b/program/tests/transfer_checked.rs @@ -11,7 +11,6 @@ use solana_sdk::{ transaction::Transaction, }; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn transfer_checked(token_program: Pubkey) { diff --git a/program/tests/ui_amount_to_amount.rs b/program/tests/ui_amount_to_amount.rs index 45843fb..3b1a6db 100644 --- a/program/tests/ui_amount_to_amount.rs +++ b/program/tests/ui_amount_to_amount.rs @@ -6,7 +6,6 @@ use setup::{mint, TOKEN_PROGRAM_ID}; use solana_program_test::{tokio, ProgramTest}; use solana_sdk::{pubkey::Pubkey, signature::Signer, transaction::Transaction}; -#[test_case::test_case(spl_token::ID ; "spl-token")] #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn ui_amount_to_amount(token_program: Pubkey) { From c51cdab63a34b99b1c884ebd502859b7e175263f Mon Sep 17 00:00:00 2001 From: febo Date: Wed, 15 Jan 2025 18:53:06 +0000 Subject: [PATCH 2/8] Not in use --- clients/js/.eslintrc.cjs | 17 ---- clients/js/.gitignore | 2 - clients/js/.prettierrc.json | 9 -- clients/js/README.md | 38 ------- clients/js/package.json | 71 ------------- clients/js/src/index.ts | 1 - clients/js/test/_setup.ts | 100 ------------------ clients/js/test/create.test.ts | 42 -------- clients/js/test/increment.test.ts | 141 -------------------------- clients/js/tsconfig.declarations.json | 10 -- clients/js/tsconfig.json | 24 ----- clients/js/tsup.config.ts | 26 ----- clients/js/typedoc.json | 6 -- clients/rust/Cargo.toml | 26 ----- clients/rust/README.md | 13 --- clients/rust/src/lib.rs | 4 - clients/rust/tests/create.rs | 47 --------- 17 files changed, 577 deletions(-) delete mode 100644 clients/js/.eslintrc.cjs delete mode 100644 clients/js/.gitignore delete mode 100644 clients/js/.prettierrc.json delete mode 100644 clients/js/README.md delete mode 100644 clients/js/package.json delete mode 100644 clients/js/src/index.ts delete mode 100644 clients/js/test/_setup.ts delete mode 100644 clients/js/test/create.test.ts delete mode 100644 clients/js/test/increment.test.ts delete mode 100644 clients/js/tsconfig.declarations.json delete mode 100644 clients/js/tsconfig.json delete mode 100644 clients/js/tsup.config.ts delete mode 100644 clients/js/typedoc.json delete mode 100644 clients/rust/Cargo.toml delete mode 100644 clients/rust/README.md delete mode 100644 clients/rust/src/lib.rs delete mode 100644 clients/rust/tests/create.rs diff --git a/clients/js/.eslintrc.cjs b/clients/js/.eslintrc.cjs deleted file mode 100644 index ec6bf1e..0000000 --- a/clients/js/.eslintrc.cjs +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - extends: ['@solana/eslint-config-solana'], - ignorePatterns: ['.eslintrc.cjs', 'tsup.config.ts', 'env-shim.ts'], - parserOptions: { - project: 'tsconfig.json', - tsconfigRootDir: __dirname, - sourceType: 'module', - }, - rules: { - '@typescript-eslint/ban-types': 'off', - '@typescript-eslint/sort-type-constituents': 'off', - 'prefer-destructuring': 'off', - 'simple-import-sort/imports': 'off', - 'sort-keys-fix/sort-keys-fix': 'off', - 'typescript-sort-keys/interface': 'off', - }, -}; diff --git a/clients/js/.gitignore b/clients/js/.gitignore deleted file mode 100644 index 47e3bbc..0000000 --- a/clients/js/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.vercel -docs diff --git a/clients/js/.prettierrc.json b/clients/js/.prettierrc.json deleted file mode 100644 index 254c729..0000000 --- a/clients/js/.prettierrc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "semi": true, - "singleQuote": true, - "trailingComma": "es5", - "useTabs": false, - "tabWidth": 2, - "arrowParens": "always", - "printWidth": 80 -} diff --git a/clients/js/README.md b/clients/js/README.md deleted file mode 100644 index 2230de3..0000000 --- a/clients/js/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# JavaScript client - -A generated JavaScript library for the Token program. - -## Getting started - -To build and test your JavaScript client from the root of the repository, you may use the following command. - -```sh -pnpm clients:js:test -``` - -This will start a new local validator, if one is not already running, and run the tests for your JavaScript client. - -## Available client scripts. - -Alternatively, you can go into the client directory and run the tests directly. - -```sh -# Build your programs and start the validator. -pnpm programs:build -pnpm validator:restart - -# Go into the client directory and run the tests. -cd clients/js -pnpm install -pnpm build -pnpm test -``` - -You may also use the following scripts to lint and/or format your JavaScript client. - -```sh -pnpm lint -pnpm lint:fix -pnpm format -pnpm format:fix -``` diff --git a/clients/js/package.json b/clients/js/package.json deleted file mode 100644 index a61a5c1..0000000 --- a/clients/js/package.json +++ /dev/null @@ -1,71 +0,0 @@ -{ - "name": "@febo/token", - "version": "0.0.0", - "description": "JavaScript client for the Token program", - "sideEffects": false, - "module": "./dist/src/index.mjs", - "main": "./dist/src/index.js", - "types": "./dist/types/index.d.ts", - "type": "commonjs", - "exports": { - ".": { - "types": "./dist/types/index.d.ts", - "import": "./dist/src/index.mjs", - "require": "./dist/src/index.js" - } - }, - "files": [ - "./dist/src", - "./dist/types" - ], - "scripts": { - "build": "rimraf dist && tsup && tsc -p ./tsconfig.declarations.json", - "build:docs": "typedoc", - "test": "ava", - "lint": "eslint --ext js,ts,tsx src", - "lint:fix": "eslint --fix --ext js,ts,tsx src", - "format": "prettier --check src test", - "format:fix": "prettier --write src test", - "prepublishOnly": "pnpm build" - }, - "publishConfig": { - "access": "public", - "registry": "https://registry.npmjs.org" - }, - "license": "MIT", - "peerDependencies": { - "@solana/web3.js": "2.0.0-rc.0" - }, - "devDependencies": { - "@ava/typescript": "^4.1.0", - "@solana/eslint-config-solana": "^3.0.3", - "@solana/web3.js": "2.0.0-rc.0", - "@solana/webcrypto-ed25519-polyfill": "2.0.0-rc.0", - "@types/node": "^20", - "@typescript-eslint/eslint-plugin": "^7.16.1", - "@typescript-eslint/parser": "^7.16.1", - "ava": "^6.1.3", - "eslint": "^8.57.0", - "prettier": "^3.3.3", - "rimraf": "^5.0.5", - "tsup": "^8.1.2", - "typedoc": "^0.25.12", - "typedoc-plugin-missing-exports": "^2.2.0", - "typescript": "^5.5.3" - }, - "ava": { - "nodeArguments": [ - "--no-warnings" - ], - "require": [ - "@solana/webcrypto-ed25519-polyfill" - ], - "typescript": { - "compile": false, - "rewritePaths": { - "test/": "dist/test/" - } - } - }, - "packageManager": "pnpm@9.1.0" -} diff --git a/clients/js/src/index.ts b/clients/js/src/index.ts deleted file mode 100644 index 69e4e4e..0000000 --- a/clients/js/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './generated'; diff --git a/clients/js/test/_setup.ts b/clients/js/test/_setup.ts deleted file mode 100644 index aaabfc2..0000000 --- a/clients/js/test/_setup.ts +++ /dev/null @@ -1,100 +0,0 @@ -import { - Address, - Commitment, - CompilableTransactionMessage, - TransactionMessageWithBlockhashLifetime, - ProgramDerivedAddress, - Rpc, - RpcSubscriptions, - SolanaRpcApi, - SolanaRpcSubscriptionsApi, - TransactionSigner, - airdropFactory, - appendTransactionMessageInstruction, - createSolanaRpc, - createSolanaRpcSubscriptions, - createTransactionMessage, - generateKeyPairSigner, - getSignatureFromTransaction, - lamports, - pipe, - sendAndConfirmTransactionFactory, - setTransactionMessageFeePayerSigner, - setTransactionMessageLifetimeUsingBlockhash, - signTransactionMessageWithSigners, -} from '@solana/web3.js'; -import { findCounterPda, getCreateInstructionAsync } from '../src'; - -type Client = { - rpc: Rpc; - rpcSubscriptions: RpcSubscriptions; -}; - -export const createDefaultSolanaClient = (): Client => { - const rpc = createSolanaRpc('http://127.0.0.1:8899'); - const rpcSubscriptions = createSolanaRpcSubscriptions('ws://127.0.0.1:8900'); - return { rpc, rpcSubscriptions }; -}; - -export const generateKeyPairSignerWithSol = async ( - client: Client, - putativeLamports: bigint = 1_000_000_000n -) => { - const signer = await generateKeyPairSigner(); - await airdropFactory(client)({ - recipientAddress: signer.address, - lamports: lamports(putativeLamports), - commitment: 'confirmed', - }); - return signer; -}; - -export const createDefaultTransaction = async ( - client: Client, - feePayer: TransactionSigner -) => { - const { value: latestBlockhash } = await client.rpc - .getLatestBlockhash() - .send(); - return pipe( - createTransactionMessage({ version: 0 }), - (tx) => setTransactionMessageFeePayerSigner(feePayer, tx), - (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx) - ); -}; - -export const signAndSendTransaction = async ( - client: Client, - transactionMessage: CompilableTransactionMessage & - TransactionMessageWithBlockhashLifetime, - commitment: Commitment = 'confirmed' -) => { - const signedTransaction = - await signTransactionMessageWithSigners(transactionMessage); - const signature = getSignatureFromTransaction(signedTransaction); - await sendAndConfirmTransactionFactory(client)(signedTransaction, { - commitment, - }); - return signature; -}; - -export const getBalance = async (client: Client, address: Address) => - (await client.rpc.getBalance(address, { commitment: 'confirmed' }).send()) - .value; - -export const createCounterForAuthority = async ( - client: Client, - authority: TransactionSigner -): Promise => { - const [transaction, counterPda, createIx] = await Promise.all([ - createDefaultTransaction(client, authority), - findCounterPda({ authority: authority.address }), - getCreateInstructionAsync({ authority }), - ]); - await pipe( - transaction, - (tx) => appendTransactionMessageInstruction(createIx, tx), - (tx) => signAndSendTransaction(client, tx) - ); - return counterPda; -}; diff --git a/clients/js/test/create.test.ts b/clients/js/test/create.test.ts deleted file mode 100644 index b1a5376..0000000 --- a/clients/js/test/create.test.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { - Account, - appendTransactionMessageInstruction, - pipe, -} from '@solana/web3.js'; -import test from 'ava'; -import { - Counter, - fetchCounterFromSeeds, - getCreateInstructionAsync, -} from '../src'; -import { - createDefaultSolanaClient, - createDefaultTransaction, - generateKeyPairSignerWithSol, - signAndSendTransaction, -} from './_setup'; - -test('it creates a new counter account', async (t) => { - // Given an authority key pair with some SOL. - const client = createDefaultSolanaClient(); - const authority = await generateKeyPairSignerWithSol(client); - - // When we create a new counter account. - const createIx = await getCreateInstructionAsync({ authority }); - await pipe( - await createDefaultTransaction(client, authority), - (tx) => appendTransactionMessageInstruction(createIx, tx), - (tx) => signAndSendTransaction(client, tx) - ); - - // Then we expect the counter account to exist and have a value of 0. - const counter = await fetchCounterFromSeeds(client.rpc, { - authority: authority.address, - }); - t.like(counter, >{ - data: { - authority: authority.address, - value: 0, - }, - }); -}); diff --git a/clients/js/test/increment.test.ts b/clients/js/test/increment.test.ts deleted file mode 100644 index 0bbe322..0000000 --- a/clients/js/test/increment.test.ts +++ /dev/null @@ -1,141 +0,0 @@ -import { - SOLANA_ERROR__JSON_RPC__SERVER_ERROR_SEND_TRANSACTION_PREFLIGHT_FAILURE, - appendTransactionMessageInstruction, - isProgramError, - isSolanaError, - lamports, - pipe, -} from '@solana/web3.js'; -import test from 'ava'; -import { - TOKEN_ERROR__INVALID_PDA, - TOKEN_ERROR__INVALID_PROGRAM_OWNER, - TOKEN_PROGRAM_ADDRESS, - fetchCounter, - findCounterPda, - getIncrementInstruction, - getIncrementInstructionAsync, -} from '../src'; -import { - createCounterForAuthority, - createDefaultSolanaClient, - createDefaultTransaction, - generateKeyPairSignerWithSol, - getBalance, - signAndSendTransaction, -} from './_setup'; - -test('it increments an existing counter by 1 by default', async (t) => { - // Given an authority key pair with an associated counter account of value 0. - const client = createDefaultSolanaClient(); - const authority = await generateKeyPairSignerWithSol(client); - const [counterPda] = await createCounterForAuthority(client, authority); - t.is((await fetchCounter(client.rpc, counterPda)).data.value, 0); - - // When we increment the counter account. - const incrementIx = await getIncrementInstructionAsync({ authority }); - await pipe( - await createDefaultTransaction(client, authority), - (tx) => appendTransactionMessageInstruction(incrementIx, tx), - (tx) => signAndSendTransaction(client, tx) - ); - - // Then we expect the counter account to have a value of 1. - const counter = await fetchCounter(client.rpc, counterPda); - t.is(counter.data.value, 1); -}); - -test('it can increment an existing counter by a specified amount', async (t) => { - // Given an authority key pair with an associated counter account of value 0. - const client = createDefaultSolanaClient(); - const authority = await generateKeyPairSignerWithSol(client); - const [counterPda] = await createCounterForAuthority(client, authority); - t.is((await fetchCounter(client.rpc, counterPda)).data.value, 0); - - // When we increment the counter account by 5. - const incrementIx = await getIncrementInstructionAsync({ - authority, - amount: 5, - }); - await pipe( - await createDefaultTransaction(client, authority), - (tx) => appendTransactionMessageInstruction(incrementIx, tx), - (tx) => signAndSendTransaction(client, tx) - ); - - // Then we expect the counter account to have a value of 5. - const counter = await fetchCounter(client.rpc, counterPda); - t.is(counter.data.value, 5); -}); - -test('it cannot increment a counter that does not exist', async (t) => { - // Given an authority key pair with no associated counter account. - const client = createDefaultSolanaClient(); - const authority = await generateKeyPairSignerWithSol(client); - const [counterPda] = await findCounterPda({ authority: authority.address }); - t.is(await getBalance(client, counterPda), lamports(0n)); - - // When we try to increment the inexistent counter account. - const incrementIx = await getIncrementInstructionAsync({ authority }); - const transactionMessage = pipe( - await createDefaultTransaction(client, authority), - (tx) => appendTransactionMessageInstruction(incrementIx, tx) - ); - const promise = signAndSendTransaction(client, transactionMessage); - - // Then we expect the program to throw an error. - const error = await t.throwsAsync(promise); - t.true( - isSolanaError( - error, - SOLANA_ERROR__JSON_RPC__SERVER_ERROR_SEND_TRANSACTION_PREFLIGHT_FAILURE - ) - ); - t.true( - isProgramError( - error.cause, - transactionMessage, - TOKEN_PROGRAM_ADDRESS, - TOKEN_ERROR__INVALID_PROGRAM_OWNER - ) - ); -}); - -test('it cannot increment a counter that belongs to another authority', async (t) => { - // Given two authority key pairs such that - // only one of them (authority A) is associated with a counter account. - const client = createDefaultSolanaClient(); - const [authorityA, authorityB] = await Promise.all([ - generateKeyPairSignerWithSol(client), - generateKeyPairSignerWithSol(client), - ]); - const [counterPda] = await createCounterForAuthority(client, authorityA); - - // When authority B tries to increment the counter account of authority A. - const incrementIx = getIncrementInstruction({ - authority: authorityB, - counter: counterPda, - }); - const transactionMessage = pipe( - await createDefaultTransaction(client, authorityB), - (tx) => appendTransactionMessageInstruction(incrementIx, tx) - ); - const promise = signAndSendTransaction(client, transactionMessage); - - // Then we expect the program to throw an error. - const error = await t.throwsAsync(promise); - t.true( - isSolanaError( - error, - SOLANA_ERROR__JSON_RPC__SERVER_ERROR_SEND_TRANSACTION_PREFLIGHT_FAILURE - ) - ); - t.true( - isProgramError( - error.cause, - transactionMessage, - TOKEN_PROGRAM_ADDRESS, - TOKEN_ERROR__INVALID_PDA - ) - ); -}); diff --git a/clients/js/tsconfig.declarations.json b/clients/js/tsconfig.declarations.json deleted file mode 100644 index 15577bc..0000000 --- a/clients/js/tsconfig.declarations.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "compilerOptions": { - "declaration": true, - "declarationMap": true, - "emitDeclarationOnly": true, - "outDir": "./dist/types", - }, - "extends": "./tsconfig.json", - "include": ["src"] -} diff --git a/clients/js/tsconfig.json b/clients/js/tsconfig.json deleted file mode 100644 index 1c8e60c..0000000 --- a/clients/js/tsconfig.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "compilerOptions": { - "composite": false, - "declaration": true, - "declarationMap": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "inlineSources": false, - "isolatedModules": true, - "module": "ESNext", - "moduleResolution": "node", - "noFallthroughCasesInSwitch": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "outDir": "./dist", - "preserveWatchOutput": true, - "skipLibCheck": true, - "strict": true, - "target": "ESNext" - }, - "exclude": ["node_modules"], - "include": ["src", "test"] -} diff --git a/clients/js/tsup.config.ts b/clients/js/tsup.config.ts deleted file mode 100644 index fb77d21..0000000 --- a/clients/js/tsup.config.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { env } from 'node:process'; -import { defineConfig, Options } from 'tsup'; - -const SHARED_OPTIONS: Options = { - define: { __VERSION__: `"${env.npm_package_version}"` }, - entry: ['./src/index.ts'], - outDir: './dist/src', - outExtension: ({ format }) => ({ js: format === 'cjs' ? '.js' : '.mjs' }), - sourcemap: true, - treeshake: true, -}; - -export default defineConfig(() => [ - // Source. - { ...SHARED_OPTIONS, format: 'cjs' }, - { ...SHARED_OPTIONS, format: 'esm' }, - - // Tests. - { - ...SHARED_OPTIONS, - bundle: false, - entry: ['./test/**/*.ts'], - format: 'cjs', - outDir: './dist/test', - }, -]); diff --git a/clients/js/typedoc.json b/clients/js/typedoc.json deleted file mode 100644 index 93f3080..0000000 --- a/clients/js/typedoc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "entryPoints": ["src/index.ts"], - "includeVersion": true, - "readme": "none", - "out": "docs" -} diff --git a/clients/rust/Cargo.toml b/clients/rust/Cargo.toml deleted file mode 100644 index 771a152..0000000 --- a/clients/rust/Cargo.toml +++ /dev/null @@ -1,26 +0,0 @@ -[package] -name = "token" -version = "0.0.0" -description = "A generated Rust library for the Token program" -repository = "https://github.com/febo/token" -edition = "2021" -readme = "README.md" -license-file = "../../LICENSE" - -[features] -test-sbf = [] -serde = ["dep:serde", "dep:serde_with"] - -[dependencies] -borsh = "^0.10" -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 = "~1.18" -thiserror = "^1.0" - -[dev-dependencies] -assert_matches = "1.5.0" -solana-program-test = "~1.18" -solana-sdk = "~1.18" diff --git a/clients/rust/README.md b/clients/rust/README.md deleted file mode 100644 index 7f7c053..0000000 --- a/clients/rust/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# Rust client - -A generated Rust library for the Token program. - -## Getting started - -To build and test your Rust client from the root of the repository, you may use the following command. - -```sh -pnpm clients:js:test -``` - -This will start a new local validator, if one is not already running, and run the tests for your Rust client. diff --git a/clients/rust/src/lib.rs b/clients/rust/src/lib.rs deleted file mode 100644 index bae91ca..0000000 --- a/clients/rust/src/lib.rs +++ /dev/null @@ -1,4 +0,0 @@ -mod generated; - -pub use generated::programs::TOKEN_ID as ID; -pub use generated::*; diff --git a/clients/rust/tests/create.rs b/clients/rust/tests/create.rs deleted file mode 100644 index 5bfd30a..0000000 --- a/clients/rust/tests/create.rs +++ /dev/null @@ -1,47 +0,0 @@ -#![cfg(feature = "test-sbf")] - -use token::{accounts::Counter, instructions::CreateBuilder}; -use borsh::BorshDeserialize; -use solana_program_test::{tokio, ProgramTest}; -use solana_sdk::{signature::Signer, transaction::Transaction}; - -#[tokio::test] -async fn create() { - let mut context = ProgramTest::new("token_program", token::ID, None) - .start_with_context() - .await; - - // Given a PDA derived from the payer's public key. - - let address = Counter::find_pda(&context.payer.pubkey()).0; - - let ix = CreateBuilder::new() - .counter(address) - .authority(context.payer.pubkey()) - .payer(context.payer.pubkey()) - .instruction(); - - // When we create a new counter. - - let tx = Transaction::new_signed_with_payer( - &[ix], - Some(&context.payer.pubkey()), - &[&context.payer], - context.last_blockhash, - ); - context.banks_client.process_transaction(tx).await.unwrap(); - - // Then an account was created with the correct data. - - let account = context.banks_client.get_account(address).await.unwrap(); - - assert!(account.is_some()); - - let account = account.unwrap(); - assert_eq!(account.data.len(), Counter::LEN); - - let mut account_data = account.data.as_ref(); - let counter = Counter::deserialize(&mut account_data).unwrap(); - assert_eq!(counter.authority, context.payer.pubkey()); - assert_eq!(counter.value, 0); -} From b894640f5f538414fcd4b9879b19587f914439ea Mon Sep 17 00:00:00 2001 From: febo Date: Wed, 15 Jan 2025 18:53:26 +0000 Subject: [PATCH 3/8] Add fixtures CLI --- fixtures/Cargo.toml | 18 +++++++++ fixtures/src/main.rs | 93 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 fixtures/Cargo.toml create mode 100644 fixtures/src/main.rs diff --git a/fixtures/Cargo.toml b/fixtures/Cargo.toml new file mode 100644 index 0000000..04d829b --- /dev/null +++ b/fixtures/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "fixtures" +description = "Fixtures runner" +version = "0.0.0" +edition.workspace = true +license.workspace = true +repository.workspace = true +publish = false + +[dependencies] +clap = { version = "4.5", features = ["derive"] } +clap_derive = "4.5" +console = "0.15.10" +mollusk-svm = { workspace = true } +mollusk-svm-fuzz-fixture = { workspace = true } +solana-pubkey = "2.1" +solana-sdk = "2.1" +token-interface = { version = "^0", path = "../interface" } diff --git a/fixtures/src/main.rs b/fixtures/src/main.rs new file mode 100644 index 0000000..4445387 --- /dev/null +++ b/fixtures/src/main.rs @@ -0,0 +1,93 @@ +use std::path::Path; + +use clap::Parser; +use console::style; +use mollusk_svm::{fuzz::check::FixtureCheck, Mollusk}; +use mollusk_svm_fuzz_fixture::Fixture; +use solana_pubkey::Pubkey; +use solana_sdk::bpf_loader_upgradeable; + +/// The `p-token` program ID. +const TOKEN_PROGRAM_ID: Pubkey = Pubkey::new_from_array(token_interface::program::ID); + +/// Simple CLI to execute a fixture against the `p-token` program. +#[derive(Parser, Debug)] +#[command(version, about, long_about = None)] +struct Args { + /// Filename of the fixture to run. + #[arg()] + file: Option, + + /// Directory containing the fixtures. + #[clap(short, long)] + directory: Option, +} + +fn main() { + let args = Args::parse(); + + if std::env::var("SBF_OUT_DIR").is_err() { + println!( + "{} SBF_OUT_DIR is not set. Please set it to the output directory of the BPF build.", + style("[ 🔴 ERROR ]").red(), + ); + std::process::exit(1); + } + + let fixtures = if let Some(file) = args.file { + let path = Path::new(&file); + let filename = path.file_name().unwrap().to_str().unwrap().to_string(); + vec![(filename, file)] + } else if let Some(directory) = args.directory { + let dir = std::fs::read_dir(directory).unwrap(); + dir.filter_map(|entry| { + let path = entry.unwrap().path(); + let filename = String::from(path.file_name().unwrap().to_str().unwrap()); + if path.is_file() && path.extension().is_some_and(|ext| ext == "fix") { + Some((filename, path.to_str().unwrap().to_string())) + } else { + None + } + }) + .collect() + } else { + println!( + "{} Missing 'file' or 'directory' argument.", + style("[ 🔴 ERROR ]").red(), + ); + std::process::exit(1); + }; + + let mut mollusk = Mollusk::default(); + mollusk.add_program( + &TOKEN_PROGRAM_ID, + "token_program", + &bpf_loader_upgradeable::ID, + ); + + let width = format!("{}", fixtures.len()).len(); + + fixtures + .iter() + .enumerate() + .for_each(|(index, (path, filename))| { + print!( + "[ {:width$} / {:width$} ]: {:?}", + index + 1, + fixtures.len(), + path + ); + + let fixture = Fixture::load_from_blob_file(filename); + mollusk.process_and_partially_validate_fixture( + &fixture, + &[ + FixtureCheck::ProgramResult, + FixtureCheck::ReturnData, + FixtureCheck::all_resulting_accounts(), + ], + ); + + println!("\t✔️"); + }); +} From 7c87a626374e102866449b36e4b6865038d4c254 Mon Sep 17 00:00:00 2001 From: febo Date: Wed, 15 Jan 2025 18:54:15 +0000 Subject: [PATCH 4/8] Fix clippy warnings --- program/tests/initialize_mint.rs | 2 +- program/tests/initialize_mint2.rs | 2 +- program/tests/initialize_multisig.rs | 2 +- program/tests/initialize_multisig2.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/program/tests/initialize_mint.rs b/program/tests/initialize_mint.rs index 175e805..dbc1f84 100644 --- a/program/tests/initialize_mint.rs +++ b/program/tests/initialize_mint.rs @@ -19,7 +19,7 @@ use token_interface::state::mint::Mint; #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn initialize_mint(token_program: Pubkey) { - let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None) + let context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None) .start_with_context() .await; diff --git a/program/tests/initialize_mint2.rs b/program/tests/initialize_mint2.rs index 683e1e3..c579a65 100644 --- a/program/tests/initialize_mint2.rs +++ b/program/tests/initialize_mint2.rs @@ -19,7 +19,7 @@ use token_interface::state::mint::Mint; #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn initialize_mint2(token_program: Pubkey) { - let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None) + let context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None) .start_with_context() .await; diff --git a/program/tests/initialize_multisig.rs b/program/tests/initialize_multisig.rs index 5cf9e34..6f66973 100644 --- a/program/tests/initialize_multisig.rs +++ b/program/tests/initialize_multisig.rs @@ -16,7 +16,7 @@ use spl_token::state::Multisig; #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn initialize_multisig(token_program: Pubkey) { - let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None) + let context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None) .start_with_context() .await; diff --git a/program/tests/initialize_multisig2.rs b/program/tests/initialize_multisig2.rs index 443a988..d8945b8 100644 --- a/program/tests/initialize_multisig2.rs +++ b/program/tests/initialize_multisig2.rs @@ -16,7 +16,7 @@ use spl_token::state::Multisig; #[test_case::test_case(TOKEN_PROGRAM_ID ; "p-token")] #[tokio::test] async fn initialize_multisig2(token_program: Pubkey) { - let mut context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None) + let context = ProgramTest::new("token_program", TOKEN_PROGRAM_ID, None) .start_with_context() .await; From a24c759ab1efe12eada833930571a40573be996d Mon Sep 17 00:00:00 2001 From: febo Date: Wed, 15 Jan 2025 18:55:41 +0000 Subject: [PATCH 5/8] Add workspace dependencies --- Cargo.lock | 3622 +++++++++++++++++++++++++++++--------------- Cargo.toml | 8 +- program/Cargo.toml | 8 +- 3 files changed, 2438 insertions(+), 1200 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4d27b01..0fc8511 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -29,30 +29,30 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aead" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ + "crypto-common", "generic-array", ] [[package]] name = "aes" -version = "0.7.5" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", "cpufeatures", - "opaque-debug", ] [[package]] name = "aes-gcm-siv" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589c637f0e68c877bbd59a4599bbe849cac8e5f3e4b5a3ebae8f528cd218dcdc" +checksum = "ae0784134ba9375416d469ec31e7c5f9fa94405049cf08c5ce5b4698be673e0d" dependencies = [ "aead", "aes", @@ -64,14 +64,13 @@ dependencies = [ ] [[package]] -name = "ahash" -version = "0.7.8" +name = "agave-transaction-view" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +checksum = "d13ecb401f540fed3bff3fab74f29ad62979f8d30af417e1075cbf4cb8a92376" dependencies = [ - "getrandom 0.2.15", - "once_cell", - "version_check", + "solana-sdk", + "solana-svm-transaction", ] [[package]] @@ -96,12 +95,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "aliasable" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" - [[package]] name = "alloc-no-stdlib" version = "2.0.4" @@ -133,19 +126,60 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "anstream" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ - "winapi", + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" +dependencies = [ + "anstyle", + "once_cell", + "windows-sys 0.59.0", ] [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "aquamarine" @@ -154,7 +188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760" dependencies = [ "include_dir", - "itertools", + "itertools 0.10.5", "proc-macro-error", "proc-macro2", "quote", @@ -184,7 +218,7 @@ dependencies = [ "ark-std", "derivative", "hashbrown 0.13.2", - "itertools", + "itertools 0.10.5", "num-traits", "zeroize", ] @@ -201,7 +235,7 @@ dependencies = [ "ark-std", "derivative", "digest 0.10.7", - "itertools", + "itertools 0.10.5", "num-bigint 0.4.6", "num-traits", "paste", @@ -308,7 +342,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] @@ -321,7 +355,7 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "synstructure", + "synstructure 0.12.6", ] [[package]] @@ -348,15 +382,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "df895a515f70646414f4b45c0b79082783b80552b373a68283012928df56f522" dependencies = [ "brotli", "flate2", @@ -367,23 +401,25 @@ dependencies = [ ] [[package]] -name = "async-mutex" -version = "1.4.0" +name = "async-lock" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener", + "event-listener 5.4.0", + "event-listener-strategy", + "pin-project-lite", ] [[package]] name = "async-trait" -version = "0.1.83" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -399,9 +435,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" @@ -437,10 +473,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] -name = "base64ct" -version = "1.6.0" +name = "base64" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bincode" @@ -459,9 +495,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" dependencies = [ "serde", ] @@ -477,9 +513,9 @@ dependencies = [ [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "b8ee0c1824c4dea5b5f81736aff91bae041d2c07ee1192bec91054e10e3e601e" dependencies = [ "arrayref", "arrayvec", @@ -495,7 +531,6 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", "generic-array", ] @@ -508,22 +543,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - -[[package]] -name = "borsh" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15bf3650200d8bffa99015595e10f1fbd17de07abbc25bb067da79e769939bfa" -dependencies = [ - "borsh-derive 0.9.3", - "hashbrown 0.11.2", -] - [[package]] name = "borsh" version = "0.10.4" @@ -536,35 +555,22 @@ dependencies = [ [[package]] name = "borsh" -version = "1.5.1" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed" +checksum = "5430e3be710b68d984d1391c854eb431a9d548640711faa54eecb1df93db91cc" dependencies = [ - "borsh-derive 1.5.1", + "borsh-derive 1.5.5", "cfg_aliases", ] -[[package]] -name = "borsh-derive" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6441c552f230375d18e3cc377677914d2ca2b0d36e52129fe15450a2dce46775" -dependencies = [ - "borsh-derive-internal 0.9.3", - "borsh-schema-derive-internal 0.9.3", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.109", -] - [[package]] name = "borsh-derive" version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "831213f80d9423998dd696e2c5345aba6be7a0bd8cd19e31c5243e13df1cef89" dependencies = [ - "borsh-derive-internal 0.10.4", - "borsh-schema-derive-internal 0.10.4", + "borsh-derive-internal", + "borsh-schema-derive-internal", "proc-macro-crate 0.1.5", "proc-macro2", "syn 1.0.109", @@ -572,27 +578,15 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.5.1" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b" +checksum = "f8b668d39970baad5356d7c83a86fee3a539e6f93bf6764c97368243e17a0487" dependencies = [ "once_cell", "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", - "syn_derive", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5449c28a7b352f2d1e592a8a28bf139bc71afb0764a14f3c02500935d8c44065" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "syn 2.0.96", ] [[package]] @@ -606,17 +600,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "borsh-schema-derive-internal" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdbd5696d8bfa21d53d9fe39a714a18538bad11492a42d066dbbc395fb1951c0" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "borsh-schema-derive-internal" version = "0.10.4" @@ -630,9 +613,9 @@ dependencies = [ [[package]] name = "brotli" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +checksum = "cc97b8f16f944bba54f0433f07e30be199b6dc2bd25937444bbad560bcea29bd" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -641,9 +624,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "4.0.1" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +checksum = "74fa05ad7d803d413eb8380983b092cbbaf9a85f151b871360e7b00cd7060b37" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -651,9 +634,12 @@ dependencies = [ [[package]] name = "bs58" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] [[package]] name = "bumpalo" @@ -673,22 +659,22 @@ dependencies = [ [[package]] name = "bytemuck" -version = "1.18.0" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" +checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "3fa76293b4f7bb636ab88fd78228235b5248b4d05cc589aed610f954af5d7c7a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -699,9 +685,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "bzip2" @@ -731,20 +717,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" dependencies = [ "libc", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "cc" -version = "1.1.21" +version = "1.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" +checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" dependencies = [ "jobserver", "libc", "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cfg-if" version = "1.0.0" @@ -757,11 +749,22 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "cfg_eval" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45565fc9416b9896014f5732ac776f810ee53a66730c17e4020c3ec064a8f88f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "android-tzdata", "iana-time-zone", @@ -783,53 +786,60 @@ dependencies = [ [[package]] name = "cipher" -version = "0.3.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "generic-array", + "crypto-common", + "inout", ] [[package]] name = "clap" -version = "2.34.0" +version = "4.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796" dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap 0.11.0", - "unicode-width", - "vec_map", + "clap_builder", + "clap_derive", ] [[package]] -name = "clap" -version = "3.2.25" +name = "clap_builder" +version = "4.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" dependencies = [ - "atty", - "bitflags 1.3.2", + "anstream", + "anstyle", "clap_lex", - "indexmap 1.9.3", - "once_cell", - "strsim 0.10.0", - "termcolor", - "textwrap 0.16.1", + "strsim", ] [[package]] -name = "clap_lex" -version = "0.2.4" +name = "clap_derive" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" dependencies = [ - "os_str_bytes", + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.96", ] +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + [[package]] name = "combine" version = "3.8.1" @@ -843,6 +853,16 @@ dependencies = [ "unreachable", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + [[package]] name = "concurrent-queue" version = "2.5.0" @@ -854,15 +874,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.8" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b" dependencies = [ "encode_unicode", - "lazy_static", "libc", + "once_cell", "unicode-width", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -885,12 +905,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "const-oid" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" - [[package]] name = "constant_time_eq" version = "0.3.1" @@ -915,9 +929,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" +checksum = "16b80225097f2e5ae4e7179dd2266824648f3e2f49d9134d584b76389d31c4c3" dependencies = [ "libc", ] @@ -933,18 +947,18 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -961,15 +975,15 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crunchy" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" [[package]] name = "crypto-common" @@ -978,6 +992,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", + "rand_core 0.6.4", "typenum", ] @@ -993,27 +1008,55 @@ dependencies = [ [[package]] name = "ctr" -version = "0.8.0" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" dependencies = [ "cipher", ] [[package]] name = "curve25519-dalek" -version = "3.2.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0" +checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", + "subtle", + "zeroize", +] + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +dependencies = [ + "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", + "fiat-crypto", + "rand_core 0.6.4", + "rustc_version", "serde", "subtle", "zeroize", ] +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "darling" version = "0.20.10" @@ -1034,8 +1077,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.11.1", - "syn 2.0.77", + "strsim", + "syn 2.0.96", ] [[package]] @@ -1046,7 +1089,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -1065,18 +1108,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" - -[[package]] -name = "der" -version = "0.5.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" -dependencies = [ - "const-oid", -] +checksum = "0e60eed09d8c01d3cee5b7d30acb059b76614c918fa0f992e0dd6eeb10daad6f" [[package]] name = "der-parser" @@ -1118,18 +1152,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "dialoguer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" -dependencies = [ - "console", - "shell-words", - "tempfile", - "zeroize", -] - [[package]] name = "difflib" version = "0.4.0" @@ -1173,7 +1195,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -1196,7 +1218,7 @@ checksum = "a6cbae11b3de8fce2a456e8ea3dada226b35fe791f0dc1d360c0941f0bb681f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -1226,7 +1248,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ - "curve25519-dalek", + "curve25519-dalek 3.2.0", "ed25519", "rand 0.7.3", "serde", @@ -1266,15 +1288,15 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" -version = "0.3.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" -version = "0.8.34" +version = "0.8.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" +checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" dependencies = [ "cfg-if", ] @@ -1296,7 +1318,7 @@ checksum = "a1ab991c1362ac86c61ab6f556cff143daa22e5a15e4e189df818b2fd19fe65b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -1309,7 +1331,7 @@ dependencies = [ "num-traits", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -1333,12 +1355,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1347,11 +1369,32 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "5.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c3e4e0dd3673c1139bf041f3008816d9cf2946bbfac2945c09e523b8d7b05b2" +dependencies = [ + "event-listener 5.4.0", + "pin-project-lite", +] + [[package]] name = "fastrand" -version = "2.1.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "feature-probe" @@ -1359,6 +1402,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835a3dc7d1ec9e75e2b5fb4ba75396837112d2060b03f7d43bc1897c7f7211da" +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + [[package]] name = "filetime" version = "0.2.25" @@ -1382,15 +1431,35 @@ dependencies = [ [[package]] name = "five8_core" -version = "0.1.0" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94474d15a76982be62ca8a39570dccce148d98c238ebb7408b0a21b2c4bdddc4" + +[[package]] +name = "fixedbitset" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a72055cd9cffc40c9f75f1e5810c80559e158796cf2202292ce4745889588" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "fixtures" +version = "0.0.0" +dependencies = [ + "clap", + "clap_derive", + "console", + "mollusk-svm", + "mollusk-svm-fuzz-fixture", + "solana-pubkey", + "solana-sdk", + "token-interface", +] [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -1411,6 +1480,21 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + [[package]] name = "form_urlencoded" version = "1.2.1" @@ -1428,9 +1512,9 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1443,9 +1527,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1453,15 +1537,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1470,38 +1554,44 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-timer" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -1564,19 +1654,28 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] -name = "goblin" -version = "0.5.4" +name = "governor" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7666983ed0dd8d21a6f6576ee00053ca0926fb281a5522577a4dbd0f1b54143" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" dependencies = [ - "log", - "plain", - "scroll", + "cfg-if", + "dashmap", + "futures", + "futures-timer", + "no-std-compat", + "nonzero_ext", + "parking_lot", + "portable-atomic", + "quanta", + "rand 0.8.5", + "smallvec", + "spinning_top", ] [[package]] @@ -1591,10 +1690,10 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 2.5.0", + "indexmap", "slab", "tokio", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tracing", ] @@ -1609,36 +1708,33 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.7.8", + "ahash", ] [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", -] +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash 0.8.11", -] +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] -name = "hashbrown" -version = "0.14.5" +name = "heck" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "heck" @@ -1646,6 +1742,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1721,9 +1823,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -1739,9 +1841,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7" dependencies = [ "bytes", "futures-channel", @@ -1770,7 +1872,7 @@ dependencies = [ "futures-util", "http", "hyper", - "rustls", + "rustls 0.21.12", "tokio", "tokio-rustls", ] @@ -1798,6 +1900,124 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -1806,12 +2026,23 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", ] [[package]] @@ -1851,57 +2082,53 @@ dependencies = [ [[package]] name = "index_list" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6ba961c14e98151cd6416dd3685efe786a94c38bc1a535c06ceff0a1600813" - -[[package]] -name = "indexmap" -version = "1.9.3" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] +checksum = "fa38453685e5fe724fd23ff6c1a158c1e2ca21ce0c2718fa11e96e70e99fd4de" [[package]] name = "indexmap" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.2", ] [[package]] name = "indicatif" -version = "0.17.8" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" +checksum = "cbf675b85ed934d3c67b5c5469701eec7db22689d0a2139d856e0925fa28b281" dependencies = [ "console", - "instant", "number_prefix", "portable-atomic", "unicode-width", + "web-time", ] [[package]] -name = "instant" -version = "0.1.13" +name = "inout" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "cfg-if", + "generic-array", ] [[package]] name = "ipnet" -version = "2.10.0" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "itertools" @@ -1912,11 +2139,40 @@ 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" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine 4.6.7", + "jni-sys", + "log", + "thiserror 1.0.69", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" @@ -1929,10 +2185,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -1968,9 +2225,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libredox" @@ -1978,7 +2235,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "libc", "redox_syscall", ] @@ -2040,14 +2297,20 @@ dependencies = [ "ark-bn254", "ark-ff", "num-bigint 0.4.6", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + +[[package]] +name = "litemap" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" @@ -2061,33 +2324,24 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" - -[[package]] -name = "lru" -version = "0.7.8" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" -dependencies = [ - "hashbrown 0.12.3", -] +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "lz4" -version = "1.27.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a231296ca742e418c43660cb68e082486ff2538e8db432bc818580f3965025ed" +checksum = "a20b523e860d03443e98350ceaac5e71c6ba89aea7d960769ec3ce37f4de5af4" dependencies = [ "lz4-sys", ] [[package]] name = "lz4-sys" -version = "1.11.0" +version = "1.11.1+lz4-1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb44a01837a858d47e5a630d2ccf304c8efcc4b83b8f9f75b7a9ee4fcc6e57d" +checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" dependencies = [ "cc", "libc", @@ -2108,15 +2362,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.1" @@ -2144,6 +2389,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "mime_guess" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" +dependencies = [ + "mime", + "unicase", +] + [[package]] name = "minimal-lexical" version = "0.2.1" @@ -2152,20 +2407,19 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", ] [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi 0.3.9", "libc", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", @@ -2219,19 +2473,95 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "mollusk-svm" +version = "0.0.15" +source = "git+https://github.com/buffalojoec/mollusk.git#d5aaf513c39e38d205242755f083da5ce11d598d" +dependencies = [ + "bincode", + "mollusk-svm-error", + "mollusk-svm-fuzz-fixture", + "mollusk-svm-fuzz-fs", + "mollusk-svm-keys", + "solana-bpf-loader-program", + "solana-compute-budget", + "solana-log-collector", + "solana-logger", + "solana-program-runtime", + "solana-sdk", + "solana-system-program", + "solana-timings", +] + +[[package]] +name = "mollusk-svm-error" +version = "0.0.15" +source = "git+https://github.com/buffalojoec/mollusk.git#d5aaf513c39e38d205242755f083da5ce11d598d" +dependencies = [ + "solana-sdk", + "thiserror 1.0.69", +] + +[[package]] +name = "mollusk-svm-fuzz-fixture" +version = "0.0.15" +source = "git+https://github.com/buffalojoec/mollusk.git#d5aaf513c39e38d205242755f083da5ce11d598d" +dependencies = [ + "mollusk-svm-fuzz-fs", + "prost", + "prost-build", + "serde", + "solana-compute-budget", + "solana-sdk", + "which", +] + +[[package]] +name = "mollusk-svm-fuzz-fs" +version = "0.0.15" +source = "git+https://github.com/buffalojoec/mollusk.git#d5aaf513c39e38d205242755f083da5ce11d598d" +dependencies = [ + "bs58", + "prost", + "serde", + "serde_json", + "solana-sdk", +] + +[[package]] +name = "mollusk-svm-keys" +version = "0.0.15" +source = "git+https://github.com/buffalojoec/mollusk.git#d5aaf513c39e38d205242755f083da5ce11d598d" +dependencies = [ + "mollusk-svm-error", + "solana-sdk", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + [[package]] name = "nix" -version = "0.26.4" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.8.0", "cfg-if", + "cfg_aliases", "libc", - "memoffset 0.7.1", - "pin-utils", + "memoffset", ] +[[package]] +name = "no-std-compat" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" + [[package]] name = "nom" version = "7.1.3" @@ -2242,6 +2572,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nonzero_ext" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21" + [[package]] name = "normalize-line-endings" version = "0.3.0" @@ -2299,17 +2635,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "num-derive" version = "0.4.2" @@ -2318,7 +2643,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -2372,34 +2697,13 @@ dependencies = [ "libc", ] -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] - [[package]] name = "num_enum" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" dependencies = [ - "num_enum_derive 0.7.3", -] - -[[package]] -name = "num_enum_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" -dependencies = [ - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 2.0.77", + "num_enum_derive", ] [[package]] @@ -2411,7 +2715,7 @@ dependencies = [ "proc-macro-crate 3.2.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -2422,9 +2726,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.4" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] @@ -2440,9 +2744,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "opaque-debug" @@ -2451,14 +2755,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] -name = "openssl-probe" -version = "0.1.5" +name = "openssl" +version = "0.10.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" +dependencies = [ + "bitflags 2.8.0", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] [[package]] -name = "opentelemetry" -version = "0.17.0" +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-src" +version = "300.4.1+3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faa4eac4138c62414b5622d1b31c5c304f34b406b013c079c2bbc652fdd6678c" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" +version = "0.9.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" +dependencies = [ + "cc", + "libc", + "openssl-src", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "opentelemetry" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" dependencies = [ @@ -2472,37 +2824,14 @@ dependencies = [ "percent-encoding", "pin-project", "rand 0.8.5", - "thiserror", -] - -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - -[[package]] -name = "ouroboros" -version = "0.15.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" -dependencies = [ - "aliasable", - "ouroboros_macro", + "thiserror 1.0.69", ] [[package]] -name = "ouroboros_macro" -version = "0.15.6" +name = "parking" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" -dependencies = [ - "Inflector", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -2533,15 +2862,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pbkdf2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" -dependencies = [ - "crypto-mac", -] - [[package]] name = "pbkdf2" version = "0.11.0" @@ -2575,31 +2895,41 @@ dependencies = [ "num", ] +[[package]] +name = "petgraph" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" +dependencies = [ + "fixedbitset", + "indexmap", +] + [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -2639,34 +2969,17 @@ dependencies = [ "pinocchio", ] -[[package]] -name = "pkcs8" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" -dependencies = [ - "der", - "spki", - "zeroize", -] - [[package]] name = "pkg-config" version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "polyval" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" +checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", "cpufeatures", @@ -2676,9 +2989,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.8.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" +checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6" [[package]] name = "powerfmt" @@ -2703,7 +3016,7 @@ checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", @@ -2711,15 +3024,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" +checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa" [[package]] name = "predicates-tree" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c" dependencies = [ "predicates-core", "termtree", @@ -2734,23 +3047,13 @@ dependencies = [ "toml", ] -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - [[package]] name = "proc-macro-crate" version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.22.22", + "toml_edit", ] [[package]] @@ -2779,13 +3082,66 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] +[[package]] +name = "prost" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" +dependencies = [ + "bytes", + "heck 0.3.3", + "itertools 0.10.5", + "lazy_static", + "log", + "multimap", + "petgraph", + "prost", + "prost-types", + "regex", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" +dependencies = [ + "bytes", + "prost", +] + [[package]] name = "qstring" version = "0.7.2" @@ -2803,62 +3159,82 @@ checksum = "9e2e25ee72f5b24d773cae88422baddefff7714f97aab68d96fe2b6fc4a28fb2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", +] + +[[package]] +name = "quanta" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bd1fe6824cea6538803de3ff1bc0cf3949024db3d43c9643024bfb33a807c0e" +dependencies = [ + "crossbeam-utils", + "libc", + "once_cell", + "raw-cpuid", + "wasi 0.11.0+wasi-snapshot-preview1", + "web-sys", + "winapi", ] [[package]] name = "quinn" -version = "0.10.2" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75" +checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash", - "rustls", - "thiserror", + "rustls 0.23.21", + "socket2", + "thiserror 2.0.11", "tokio", "tracing", ] [[package]] name = "quinn-proto" -version = "0.10.6" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" +checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d" dependencies = [ "bytes", + "getrandom 0.2.15", "rand 0.8.5", - "ring 0.16.20", + "ring", "rustc-hash", - "rustls", - "rustls-native-certs", + "rustls 0.23.21", + "rustls-pki-types", + "rustls-platform-verifier", "slab", - "thiserror", + "thiserror 2.0.11", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.4.1" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7" +checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904" dependencies = [ - "bytes", + "cfg_aliases", "libc", + "once_cell", "socket2", "tracing", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -2943,6 +3319,15 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "raw-cpuid" +version = "11.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6928fa44c097620b706542d428957635951bade7143269085389d42c8a4927e" +dependencies = [ + "bitflags 2.8.0", +] + [[package]] name = "rayon" version = "1.10.0" @@ -2963,32 +3348,20 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rcgen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" -dependencies = [ - "pem", - "ring 0.16.20", - "time", - "yasna", -] - [[package]] name = "redox_syscall" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -2998,9 +3371,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -3009,9 +3382,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" @@ -3034,11 +3407,12 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", - "rustls", - "rustls-pemfile", + "rustls 0.21.12", + "rustls-pemfile 1.0.4", "serde", "serde_json", "serde_urlencoded", @@ -3046,7 +3420,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-rustls", - "tokio-util 0.7.12", + "tokio-util 0.7.13", "tower-service", "url", "wasm-bindgen", @@ -3057,18 +3431,18 @@ dependencies = [ ] [[package]] -name = "ring" -version = "0.16.20" +name = "reqwest-middleware" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216" dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted 0.7.1", - "web-sys", - "winapi", + "anyhow", + "async-trait", + "http", + "reqwest", + "serde", + "task-local-extensions", + "thiserror 1.0.69", ] [[package]] @@ -3081,32 +3455,11 @@ dependencies = [ "cfg-if", "getrandom 0.2.15", "libc", - "spin 0.9.8", - "untrusted 0.9.0", + "spin", + "untrusted", "windows-sys 0.52.0", ] -[[package]] -name = "rpassword" -version = "7.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" -dependencies = [ - "libc", - "rtoolbox", - "windows-sys 0.48.0", -] - -[[package]] -name = "rtoolbox" -version = "0.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c247d24e63230cdb56463ae328478bd5eac8b8faa8c69461a77e8e323afac90e" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "rustc-demangle" version = "0.1.24" @@ -3115,9 +3468,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" -version = "1.1.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" [[package]] name = "rustc_version" @@ -3139,15 +3492,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.37" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -3157,19 +3510,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.17.8", - "rustls-webpki", + "ring", + "rustls-webpki 0.101.7", "sct", ] +[[package]] +name = "rustls" +version = "0.23.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.8", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" -version = "0.6.3" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 2.2.0", + "rustls-pki-types", "schannel", "security-framework", ] @@ -3183,21 +3551,77 @@ dependencies = [ "base64 0.21.7", ] +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37" +dependencies = [ + "web-time", +] + +[[package]] +name = "rustls-platform-verifier" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c7dc240fec5517e6c4eab3310438636cfe6391dfc345ba013109909a90d136" +dependencies = [ + "core-foundation", + "core-foundation-sys", + "jni", + "log", + "once_cell", + "rustls 0.23.21", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki 0.102.8", + "security-framework", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" + [[package]] name = "rustls-webpki" version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.102.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", ] [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" [[package]] name = "ryu" @@ -3216,9 +3640,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" dependencies = [ "windows-sys 0.59.0", ] @@ -3234,20 +3658,6 @@ name = "scroll" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" -dependencies = [ - "scroll_derive", -] - -[[package]] -name = "scroll_derive" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] [[package]] name = "sct" @@ -3255,8 +3665,8 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", + "ring", + "untrusted", ] [[package]] @@ -3265,18 +3675,19 @@ version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.8.0", "core-foundation", "core-foundation-sys", "libc", + "num-bigint 0.4.6", "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "2.12.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" +checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32" dependencies = [ "core-foundation-sys", "libc", @@ -3284,9 +3695,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.23" +version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" +checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" [[package]] name = "seqlock" @@ -3299,9 +3710,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.210" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -3317,20 +3728,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" dependencies = [ "itoa", "memchr", @@ -3352,24 +3763,25 @@ dependencies = [ [[package]] name = "serde_with" -version = "2.3.3" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" +checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa" dependencies = [ "serde", + "serde_derive", "serde_with_macros", ] [[package]] name = "serde_with_macros" -version = "2.3.3" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" +checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -3407,18 +3819,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha3" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f81199417d4e5de3f04b1e871023acea7389672c4135918f05aa9cbf2f2fa809" -dependencies = [ - "block-buffer 0.9.0", - "digest 0.9.0", - "keccak", - "opaque-debug", -] - [[package]] name = "sha3" version = "0.10.8" @@ -3438,12 +3838,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - [[package]] name = "shlex" version = "1.3.0" @@ -3498,22 +3892,36 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", ] +[[package]] +name = "solana-account" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8557558040a6bf34101ea0ded1647bafc21c2a9ea0913034fa6794a304ba6791" +dependencies = [ + "bincode", + "serde", + "serde_bytes", + "serde_derive", + "solana-instruction", + "solana-program", +] + [[package]] name = "solana-account-decoder" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e54ec43b0262c19a3c87bf2dbd52c6bc6d4f9307246fe4b666fd87f06305e5" +checksum = "2353887223851d07071e790a6508d8df61032a5e01bb6f990d7abe7f58dde3aa" dependencies = [ "Inflector", - "base64 0.21.7", + "base64 0.22.1", "bincode", "bs58", "bv", @@ -3521,177 +3929,246 @@ dependencies = [ "serde", "serde_derive", "serde_json", + "solana-account-decoder-client-types", "solana-config-program", "solana-sdk", - "spl-token", + "spl-token 6.0.0", "spl-token-2022", "spl-token-group-interface", "spl-token-metadata-interface", - "thiserror", + "thiserror 1.0.69", + "zstd", +] + +[[package]] +name = "solana-account-decoder-client-types" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "435bb722c456f78dd3ac33a1b4641c46d5d41de5b072422ae5b0dc9f486c0928" +dependencies = [ + "base64 0.22.1", + "bs58", + "serde", + "serde_derive", + "serde_json", + "solana-account", + "solana-pubkey", "zstd", ] +[[package]] +name = "solana-account-info" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abeb32e8dbead1f920a919d8c781fe058cf657313aa237566fa812d2288f2aab" +dependencies = [ + "bincode", + "serde", + "solana-program-error", + "solana-program-memory", + "solana-pubkey", +] + [[package]] name = "solana-accounts-db" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da22e7afc30fa3d6367f4a5230c843ec2bfd27456b9f3b7ec144c112eaca303a" +checksum = "7bc0546cdb54a90b3b00b80577afa223bdd75d75f846ed553b0df8cbe37be1a2" dependencies = [ - "arrayref", + "ahash", "bincode", "blake3", "bv", "bytemuck", - "byteorder", + "bytemuck_derive", "bzip2", "crossbeam-channel", "dashmap", - "flate2", - "fnv", - "im", "index_list", - "itertools", + "indexmap", + "itertools 0.12.1", "lazy_static", "log", "lz4", "memmap2", "modular-bitfield", - "num-derive 0.4.2", - "num-traits", "num_cpus", - "num_enum 0.7.3", - "ouroboros", - "percentage", - "qualifier_attr", + "num_enum", "rand 0.8.5", "rayon", - "regex", - "rustc_version", "seqlock", "serde", "serde_derive", "smallvec", "solana-bucket-map", - "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-inline-spl", + "solana-lattice-hash", "solana-measure", "solana-metrics", "solana-nohash-hasher", - "solana-program-runtime", "solana-rayon-threadlimit", "solana-sdk", - "solana-stake-program", - "solana-system-program", - "solana-vote-program", + "solana-svm-transaction", "static_assertions", - "strum", - "strum_macros", "tar", "tempfile", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "solana-address-lookup-table-program" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2601a7879e6db5f9af09801f2c99032a204849643832dae4a96495b86e789b0e" +checksum = "7d2cc0e952d3fd328e156937e71b3233aa4e16e86a132b8c1d18fc7523fab8ac" dependencies = [ "bincode", "bytemuck", "log", - "num-derive 0.4.2", + "num-derive", "num-traits", - "rustc_version", - "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-feature-set", + "solana-log-collector", "solana-program", "solana-program-runtime", "solana-sdk", - "thiserror", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-atomic-u64" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ceb7242711300b8d67933a3cd1c9b2cd7c4e98de529356ecddf340c98c457d" +dependencies = [ + "parking_lot", ] [[package]] name = "solana-banks-client" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b38e77fde55eaa036666461c61df36238416908c5a4737b59cd1b6165736dc" +checksum = "63b70516fa229d5d98c8d81580c1cce13ab8dc900d1626b8855f1882a611ba3f" dependencies = [ - "borsh 1.5.1", + "borsh 1.5.5", "futures", "solana-banks-interface", "solana-program", "solana-sdk", "tarpc", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-serde", ] [[package]] name = "solana-banks-interface" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cb66654fa16a519efe8bb54eacfd0e9a3862f916d925cd24b63041b113c8a1" +checksum = "e5bb6c5dd2b1b057fe84e39da75d2833df5e617581db45be469211c9f4d3f93a" dependencies = [ "serde", + "serde_derive", "solana-sdk", "tarpc", ] [[package]] name = "solana-banks-server" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "964127e858fb510ff017981acab11ac376ecfee3b10c03c379ff084a52e14969" +checksum = "8d204d8ec6e5fe645def98504a81f67c1f2a8b74027fbed31431737b565f5bfa" dependencies = [ "bincode", "crossbeam-channel", "futures", - "solana-accounts-db", "solana-banks-interface", "solana-client", + "solana-feature-set", "solana-runtime", "solana-sdk", "solana-send-transaction-service", + "solana-svm", "tarpc", "tokio", "tokio-serde", ] +[[package]] +name = "solana-bincode" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e154567b6846f4721c713afdd14c56892800fb940793ef529a68d6db6cf1beef" +dependencies = [ + "bincode", + "serde", + "solana-instruction", +] + +[[package]] +name = "solana-bn254" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c42ad3282999ef7df859e7ed03a6e6a4187ff4931f9814ddcd0477dba2be15" +dependencies = [ + "ark-bn254", + "ark-ec", + "ark-ff", + "ark-serialize", + "bytemuck", + "solana-program", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-borsh" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b2428671e99134c97990d2b466c33779f785376b7934e6bddb635929c54208f" +dependencies = [ + "borsh 0.10.4", + "borsh 1.5.5", +] + [[package]] name = "solana-bpf-loader-program" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1c1bf12ec90f8a67706e6e5ffc91e2198b85a07bd12c56c44967d13bba7e7f" +checksum = "218c92ff828511a7bde330ccb39167fbc35d99d9b6ec22b06e265e498f747a47" dependencies = [ "bincode", "byteorder", "libsecp256k1", "log", "scopeguard", + "solana-bn254", + "solana-compute-budget", + "solana-curve25519", + "solana-feature-set", + "solana-log-collector", "solana-measure", + "solana-poseidon", + "solana-program-memory", "solana-program-runtime", "solana-sdk", - "solana-zk-token-sdk", + "solana-timings", + "solana-type-overrides", "solana_rbpf", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "solana-bucket-map" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71ed4b533159ec832f534a5b4efb10946d392b15efc88ca2107bdbb39b5d0646" +checksum = "356aa600028d3715b6dc3c8797ffdc253f634e4dbeb847d4a9557b7a8420408d" dependencies = [ "bv", "bytemuck", + "bytemuck_derive", "log", "memmap2", "modular-bitfield", - "num_enum 0.7.3", + "num_enum", "rand 0.8.5", "solana-measure", "solana-sdk", @@ -3699,41 +4176,43 @@ dependencies = [ ] [[package]] -name = "solana-clap-utils" -version = "1.18.23" +name = "solana-builtins-default-costs" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "117bf11e4d15b529dd9dfa2680abaf8bd3c1d8f7cb0586a5accdac5a2ecc7cc5" +checksum = "6fdfdc2e225ad54ffbf9f309d2d0ea8f8f1043aed5da97189b0a54f426c4e328" dependencies = [ - "chrono", - "clap 2.34.0", - "rpassword", - "solana-remote-wallet", + "ahash", + "lazy_static", + "log", + "solana-address-lookup-table-program", + "solana-bpf-loader-program", + "solana-compute-budget-program", + "solana-config-program", + "solana-loader-v4-program", "solana-sdk", - "thiserror", - "tiny-bip39", - "uriparse", - "url", + "solana-stake-program", + "solana-system-program", + "solana-vote-program", ] [[package]] name = "solana-client" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1501330d85c1a790f45f11330616bd6f0b9acd2193477268a65a38ce3b7cfdd0" +checksum = "73d3a06371c4b63efa8d2dde9890b658891943807c529144eac6d2345538077d" dependencies = [ "async-trait", "bincode", "dashmap", "futures", "futures-util", - "indexmap 2.5.0", + "indexmap", "indicatif", "log", "quinn", "rayon", "solana-connection-cache", "solana-measure", - "solana-metrics", "solana-pubsub-client", "solana-quic-client", "solana-rpc-client", @@ -3744,15 +4223,36 @@ dependencies = [ "solana-thin-client", "solana-tpu-client", "solana-udp-client", - "thiserror", + "thiserror 1.0.69", "tokio", ] +[[package]] +name = "solana-clock" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d639043cefcd061c31a342364adcb204406ebbd91ef86dfde88b74352b688cf" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-compute-budget" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6c885192c0afe6f7beac13e1c8eb51ce36bc60e8f0b7631f9cbf72d8ca6aa03" +dependencies = [ + "solana-sdk", +] + [[package]] name = "solana-compute-budget-program" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a43d1ca229c5f761b9be38bd7dbc7c034cfb214dcbfef9691314ae4c778451c" +checksum = "be993c935cd4f7f45bb28e3c9b258e0b7d3ec38112d9c9b2b6ca64f488a83cf3" dependencies = [ "solana-program-runtime", "solana-sdk", @@ -3760,119 +4260,271 @@ dependencies = [ [[package]] name = "solana-config-program" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00d0d031f3d97e3f59305c4aabf9da7359fad86dbaeb43b61a1ea13224e0b8a" +checksum = "056ce3a28f5e22677e0db1fc976294041571c4d471a752bfc9f1b06f8828c488" dependencies = [ "bincode", "chrono", "serde", "serde_derive", + "solana-log-collector", "solana-program-runtime", "solana-sdk", + "solana-short-vec", ] [[package]] name = "solana-connection-cache" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fa9ff6c33772441670e446b1d43e787aa315e95f2f9c14e3e9508b814bc8e5" +checksum = "52912ec1eb7b40af2a81269d0bb2cefba01f303383cba32067d0dc5020556e38" dependencies = [ "async-trait", "bincode", "crossbeam-channel", "futures-util", - "indexmap 2.5.0", + "indexmap", "log", "rand 0.8.5", "rayon", - "rcgen", "solana-measure", "solana-metrics", "solana-sdk", - "thiserror", + "thiserror 1.0.69", "tokio", ] [[package]] name = "solana-cost-model" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992d3d9e5cd8df6a393d66c2d52ba18afd3988f142a44f1ff26541fb3c0dd5b7" +checksum = "f33e53737732742f87952b0f18e6b5e76d7e8eed6e290958a2703936caace5b8" dependencies = [ + "ahash", "lazy_static", "log", - "rustc_version", - "solana-address-lookup-table-program", - "solana-bpf-loader-program", - "solana-compute-budget-program", - "solana-config-program", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-loader-v4-program", + "solana-builtins-default-costs", + "solana-compute-budget", + "solana-feature-set", "solana-metrics", - "solana-program-runtime", + "solana-runtime-transaction", "solana-sdk", - "solana-stake-program", - "solana-system-program", + "solana-svm-transaction", "solana-vote-program", ] [[package]] -name = "solana-frozen-abi" -version = "1.18.23" +name = "solana-cpi" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bfcde2fc6946c99c7e3400fadd04d1628d675bfd66cb34d461c0f3224bd27d1" +checksum = "5b87b387931f41422be3d82190e29c8414bbb4e8517dd94afb838012260d7a60" +dependencies = [ + "solana-account-info", + "solana-define-syscall", + "solana-instruction", + "solana-program-error", + "solana-pubkey", + "solana-stable-layout", +] + +[[package]] +name = "solana-curve25519" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71b91a6c7db7874ab0721ba2ad49c34614c6af5bfa1a02f18ee471d28416b1fc" +dependencies = [ + "bytemuck", + "bytemuck_derive", + "curve25519-dalek 4.1.3", + "solana-program", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-decode-error" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64b93163519c0b7419d3ac206207594d4b43e00267496996b898345ff3b31ed1" +dependencies = [ + "num-traits", +] + +[[package]] +name = "solana-define-syscall" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d1b215d56d29f71782df6880d71b5a46cf9a4035046414488c7de6906899ba" + +[[package]] +name = "solana-derivation-path" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31edf5d285689b469471a1a0200f0c9196be7df155860bd83dfd735439172bd" +dependencies = [ + "derivation-path", + "qstring", + "uriparse", +] + +[[package]] +name = "solana-epoch-schedule" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88aa6588f178c32258eb616ef1428f2c86beae370d6486843313f6320e055190" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-feature-set" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1736c5f6cb5d65e684a1daf425dd1479849e0793ffe877feedb602642ee5deb0" dependencies = [ - "block-buffer 0.10.4", - "bs58", - "bv", - "either", - "generic-array", - "im", "lazy_static", + "solana-clock", + "solana-epoch-schedule", + "solana-hash", + "solana-pubkey", + "solana-sha256-hasher", +] + +[[package]] +name = "solana-fee" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da6b19e38f75d3c82b9e4b460bcd366ae1ad5c85f824a1f9080e4baed7ee49d9" +dependencies = [ + "solana-sdk", + "solana-svm-transaction", +] + +[[package]] +name = "solana-fee-calculator" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ef28a47c3fcfd4ef8b19468531e32a431f6589f359cdbb927fc5e7fb859413" +dependencies = [ "log", - "memmap2", - "rustc_version", "serde", - "serde_bytes", "serde_derive", - "sha2 0.10.8", - "solana-frozen-abi-macro", - "subtle", - "thiserror", ] [[package]] -name = "solana-frozen-abi-macro" -version = "1.18.23" +name = "solana-hash" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5024d241425f4e99f112ee03bfa89e526c86c7ca9bd7e13448a7f2dffb7e060" +checksum = "ad865143587f6173d0bd15ec66b749fd2682c865467ffd2bb725705e33f0c8fa" dependencies = [ - "proc-macro2", - "quote", - "rustc_version", - "syn 2.0.77", + "borsh 1.5.5", + "bs58", + "bytemuck", + "bytemuck_derive", + "js-sys", + "serde", + "serde_derive", + "solana-atomic-u64", + "solana-sanitize", + "wasm-bindgen", +] + +[[package]] +name = "solana-inflation" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a205cb59db7fa1afc89ad5d960ac5afb997ba231cdc943451811746c84b7776d" +dependencies = [ + "serde", + "serde_derive", +] + +[[package]] +name = "solana-inline-spl" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47d825ad3f7d3eede036d2c3b11eb385912eb3e01872bc98901802f942eab8a" +dependencies = [ + "bytemuck", + "solana-pubkey", +] + +[[package]] +name = "solana-instruction" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af795f16bef3ae76e97978e35724ea88d2b9eba67a9e233adf48ccefeaa6e6b8" +dependencies = [ + "bincode", + "borsh 1.5.5", + "getrandom 0.2.15", + "js-sys", + "num-traits", + "serde", + "serde_derive", + "solana-define-syscall", + "solana-pubkey", + "wasm-bindgen", +] + +[[package]] +name = "solana-last-restart-slot" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f88c8171167f1fd4ef1e5a083fd0e8f35ac60aacd1ffe163a1ef7053a28524be" +dependencies = [ + "serde", + "serde_derive", + "solana-sdk-macro", + "solana-sysvar-id", +] + +[[package]] +name = "solana-lattice-hash" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556308440679d89ae11f5fdd6822334526cc3d8ab0d16f93159c6a9c35b86a9f" +dependencies = [ + "base64 0.22.1", + "blake3", + "bs58", + "bytemuck", ] [[package]] name = "solana-loader-v4-program" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5607358636671522978533b77ff409b634b2ea53d94fd32dec4b4bcf7fe5c7e" +checksum = "c05b2eba16f1c9a878c30f58e6e03e4f42fd48ebb83cac67b8ea656967e91849" dependencies = [ "log", + "solana-bpf-loader-program", + "solana-compute-budget", + "solana-log-collector", "solana-measure", "solana-program-runtime", "solana-sdk", + "solana-type-overrides", "solana_rbpf", ] +[[package]] +name = "solana-log-collector" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7922b879e4c03e00bf6ed21b1f8579ac71f6743d95c22306bd1ba8994e4f90e8" +dependencies = [ + "log", +] + [[package]] name = "solana-logger" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10948c30d138d6fbfc2ae78a4882be5a9ebffa4bb1239c4efc386104ebc35b7f" +checksum = "9e3aa0d41609e523fba99e86cb93f54a09cff9892075f6afe9b3ca70eed7aba1" dependencies = [ "env_logger", "lazy_static", @@ -3881,19 +4533,15 @@ dependencies = [ [[package]] name = "solana-measure" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379355a731abf50bb5ef1e4afba02ac8c835c25bb18e32229bb481657d5c9eca" -dependencies = [ - "log", - "solana-sdk", -] +checksum = "13208871c6d000a0c7b7546ae605934f5eda3745f80f6926da1b6097c08f2de2" [[package]] name = "solana-metrics" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a6f767cf39d69104bff52602f3141d6abfbdd55b4eb310f8fbbbf862b27e6f" +checksum = "555986e126fe32ad94217c5d87c94f79b7f13abf96ef9d8de20dacbcf1c407e5" dependencies = [ "crossbeam-channel", "gethostname", @@ -3901,17 +4549,31 @@ dependencies = [ "log", "reqwest", "solana-sdk", - "thiserror", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-msg" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aefec09cb47fb67b8f8c448e03491d4148c1749f27dcb74d1cfae6337695f94" +dependencies = [ + "solana-define-syscall", ] +[[package]] +name = "solana-native-token" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81520eff9f776e62faa36a07250fcc467e54ca31ca9c87ab566a88b2f2691c05" + [[package]] name = "solana-net-utils" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c81ade42b553c7de08fb97cf3cfe44545f59a247e90042a67d224d62a8a189d7" +checksum = "6b409b10fee2d0cbb2a721fa3ce7d7f6f32e0d3ae1f5807b1d6bc91d75970c72" dependencies = [ "bincode", - "clap 3.2.25", "crossbeam-channel", "log", "nix", @@ -3919,9 +4581,7 @@ dependencies = [ "serde", "serde_derive", "socket2", - "solana-logger", "solana-sdk", - "solana-version", "tokio", "url", ] @@ -3932,17 +4592,31 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b8a731ed60e89177c8a7ab05fe0f1511cedd3e70e773f288f9de33a9cfdc21e" +[[package]] +name = "solana-packet" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8c6e8a2cb0839ef49d8c6e34e89a5bc5ed97da855bf49528bae8c57eb39ed" +dependencies = [ + "bincode", + "bitflags 2.8.0", + "cfg_eval", + "serde", + "serde_derive", + "serde_with", +] + [[package]] name = "solana-perf" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ecdf31e535743515d31392f210d132463300b5d3de7c3e26f6b344b6c941c42" +checksum = "7fa10dd492bee710d0e231a3ff48c52d6e24f5339d97decaf1f0ddbde996f834" dependencies = [ - "ahash 0.8.11", + "ahash", "bincode", "bv", "caps", - "curve25519-dalek", + "curve25519-dalek 4.1.3", "dlopen2", "fnv", "lazy_static", @@ -3951,108 +4625,201 @@ dependencies = [ "nix", "rand 0.8.5", "rayon", - "rustc_version", "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", "solana-metrics", "solana-rayon-threadlimit", "solana-sdk", + "solana-short-vec", "solana-vote-program", ] [[package]] -name = "solana-program" -version = "1.18.23" +name = "solana-poseidon" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76056fecde0fe0ece8b457b719729c17173333471c72ad41969982975a10d6e0" +checksum = "63d191667d1a5e072cf5da65f2f83a6cdbdf371dc1c40542ac56e5fd59753ade" dependencies = [ "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", - "base64 0.21.7", + "light-poseidon", + "solana-define-syscall", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-precompile-error" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c01aefc15c451b4f573c1e4552f34ee8af53db285ee2f7ece17ef8b70d6c0a" +dependencies = [ + "num-traits", + "solana-decode-error", +] + +[[package]] +name = "solana-program" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d3a72c5eafd348bc5e5b731b40ad8dfde3023632e34e5ca9e52a655266ffae7" +dependencies = [ + "base64 0.22.1", "bincode", - "bitflags 2.6.0", + "bitflags 2.8.0", "blake3", "borsh 0.10.4", - "borsh 0.9.3", - "borsh 1.5.1", + "borsh 1.5.5", "bs58", "bv", "bytemuck", - "cc", + "bytemuck_derive", "console_error_panic_hook", "console_log", - "curve25519-dalek", + "curve25519-dalek 4.1.3", + "five8_const", "getrandom 0.2.15", - "itertools", "js-sys", "lazy_static", - "libc", - "libsecp256k1", - "light-poseidon", "log", - "memoffset 0.9.1", + "memoffset", "num-bigint 0.4.6", - "num-derive 0.4.2", + "num-derive", "num-traits", "parking_lot", "rand 0.8.5", - "rustc_version", - "rustversion", "serde", "serde_bytes", "serde_derive", - "serde_json", "sha2 0.10.8", - "sha3 0.10.8", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "sha3", + "solana-account-info", + "solana-atomic-u64", + "solana-bincode", + "solana-borsh", + "solana-clock", + "solana-cpi", + "solana-decode-error", + "solana-define-syscall", + "solana-epoch-schedule", + "solana-fee-calculator", + "solana-hash", + "solana-instruction", + "solana-last-restart-slot", + "solana-msg", + "solana-native-token", + "solana-program-entrypoint", + "solana-program-error", + "solana-program-memory", + "solana-program-option", + "solana-program-pack", + "solana-pubkey", + "solana-rent", + "solana-sanitize", "solana-sdk-macro", - "thiserror", - "tiny-bip39", + "solana-secp256k1-recover", + "solana-serde-varint", + "solana-serialize-utils", + "solana-sha256-hasher", + "solana-short-vec", + "solana-slot-hashes", + "solana-slot-history", + "solana-stable-layout", + "solana-sysvar-id", + "solana-transaction-error", + "thiserror 1.0.69", "wasm-bindgen", - "zeroize", +] + +[[package]] +name = "solana-program-entrypoint" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "269ccabf1f3aff504a97aca0f8b72e6d3e1b7fb621cc18a2d21a28b17d52e112" +dependencies = [ + "solana-account-info", + "solana-msg", + "solana-program-error", + "solana-pubkey", +] + +[[package]] +name = "solana-program-error" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02f7a81eeb5c3d44b2953c46215af390ca2951a0b8069836ffbf3d368b012b35" +dependencies = [ + "borsh 1.5.5", + "num-traits", + "serde", + "serde_derive", + "solana-decode-error", + "solana-instruction", + "solana-msg", + "solana-pubkey", +] + +[[package]] +name = "solana-program-memory" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1debcdd14cee4dbc2761c1e267e8888188fb469956df0e2144cd6e2962c2532a" +dependencies = [ + "num-traits", + "solana-define-syscall", +] + +[[package]] +name = "solana-program-option" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78b49ce216cce72eb0607610d2040b1979d999fe204f73ae2a669c2f4480d3c0" + +[[package]] +name = "solana-program-pack" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ff47a5dd9881187e85a45641405d9d1c57e9ebdc813e2ff74a1aa1f1ec9042" +dependencies = [ + "solana-program-error", ] [[package]] name = "solana-program-runtime" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e566a9e61ecdc250824314864654dd370abf561fa8328f6e08b3bc96ccc5b80d" +checksum = "6d4647f4dfed31aaa307d8c4924fec3fc981e88dd340eec45273afa84f3d01a4" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bincode", - "eager", "enum-iterator", - "itertools", + "itertools 0.12.1", "libc", "log", - "num-derive 0.4.2", + "num-derive", "num-traits", "percentage", "rand 0.8.5", - "rustc_version", "serde", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-compute-budget", + "solana-feature-set", + "solana-log-collector", "solana-measure", "solana-metrics", "solana-sdk", + "solana-timings", + "solana-type-overrides", + "solana-vote", "solana_rbpf", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "solana-program-test" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b841ea7e55ee7b7e2cac034fd008c7d8cabd8b474958d4f64fcfaf76220846f5" +checksum = "2ea2a1afca1f64fc82e986900bb8dd5579e2af6db8e57cfb6c93a484b01fdb8d" dependencies = [ "assert_matches", "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bincode", "chrono-humanize", "crossbeam-channel", @@ -4063,22 +4830,55 @@ dependencies = [ "solana-banks-interface", "solana-banks-server", "solana-bpf-loader-program", + "solana-compute-budget", + "solana-feature-set", + "solana-inline-spl", + "solana-instruction", + "solana-log-collector", "solana-logger", "solana-program-runtime", "solana-runtime", "solana-sdk", + "solana-svm", + "solana-timings", "solana-vote-program", "solana_rbpf", - "test-case", - "thiserror", + "thiserror 1.0.69", "tokio", ] +[[package]] +name = "solana-pubkey" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02016ff5f98314c886e219c023bffba188ad8d70dec007247bd7a9da50423ac0" +dependencies = [ + "borsh 0.10.4", + "borsh 1.5.5", + "bs58", + "bytemuck", + "bytemuck_derive", + "curve25519-dalek 4.1.3", + "five8_const", + "getrandom 0.2.15", + "js-sys", + "num-traits", + "rand 0.8.5", + "serde", + "serde_derive", + "solana-atomic-u64", + "solana-decode-error", + "solana-define-syscall", + "solana-sanitize", + "solana-sha256-hasher", + "wasm-bindgen", +] + [[package]] name = "solana-pubsub-client" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5d997840e6d033edc4fca8f06b920726dc18d3a5bbc1e538b2154cc3b71acd1" +checksum = "af610bc169985b016e1f66bc9f0cc19559c9da5fb6ee0b8984ea69b1302e6619" dependencies = [ "crossbeam-channel", "futures-util", @@ -4091,7 +4891,7 @@ dependencies = [ "solana-account-decoder", "solana-rpc-client-api", "solana-sdk", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-stream", "tokio-tungstenite", @@ -4101,20 +4901,19 @@ dependencies = [ [[package]] name = "solana-quic-client" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e689a97cefa6a005cd305210234f3dc78aacc934c0f76d210a264fae36ee432" +checksum = "5fa9aed25872d9af165499a9a2167d489ceb832d5e6eaa1aafa982286f62e06d" dependencies = [ - "async-mutex", + "async-lock", "async-trait", "futures", - "itertools", + "itertools 0.12.1", "lazy_static", "log", "quinn", "quinn-proto", - "rcgen", - "rustls", + "rustls 0.23.21", "solana-connection-cache", "solana-measure", "solana-metrics", @@ -4122,60 +4921,54 @@ dependencies = [ "solana-rpc-client-api", "solana-sdk", "solana-streamer", - "thiserror", + "thiserror 1.0.69", "tokio", ] [[package]] name = "solana-rayon-threadlimit" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbf70f0441603e553fc3db30c1eec9f10cecc27849e7dc74d5f692d5a41a56ca" +checksum = "7d0ea6818ea3ae2067b18ba8f82577de19094d7abbb918ffb5cf5d7b0a6ffe88" dependencies = [ "lazy_static", "num_cpus", ] [[package]] -name = "solana-remote-wallet" -version = "1.18.23" +name = "solana-rent" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9651b3f2c3df39a1a6fc87fe792bdb3ec3d84a8169c0a57c86335b48d6cb1491" +checksum = "544fab48aacd3b9c740ef5206f30e8a44ef8bfe5676a9d7b1eed385265ec1265" dependencies = [ - "console", - "dialoguer", - "log", - "num-derive 0.4.2", - "num-traits", - "parking_lot", - "qstring", - "semver", - "solana-sdk", - "thiserror", - "uriparse", + "serde", + "serde_derive", + "solana-sdk-macro", + "solana-sysvar-id", ] [[package]] name = "solana-rpc-client" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d753d116aacc43ef64a2bc8d25f8b20af47c366b29aa859186124e226d6e3819" +checksum = "1ff2d4562f555ed4ca406d88483f2b8ad0248e41ea19721227ffb5c64529bff2" dependencies = [ "async-trait", - "base64 0.21.7", + "base64 0.22.1", "bincode", "bs58", "indicatif", "log", "reqwest", + "reqwest-middleware", "semver", "serde", "serde_derive", "serde_json", - "solana-account-decoder", + "solana-account-decoder-client-types", "solana-rpc-client-api", "solana-sdk", - "solana-transaction-status", + "solana-transaction-status-client-types", "solana-version", "solana-vote-program", "tokio", @@ -4183,48 +4976,49 @@ dependencies = [ [[package]] name = "solana-rpc-client-api" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "617df2c53f948c821cefca6824e376aac04ff0d844bb27f4d3ada9e211bcffe7" +checksum = "6a50f6a180457400c9843980f1dd5db32b1153c295005ca85edb84bb7625acae" dependencies = [ - "base64 0.21.7", + "anyhow", + "base64 0.22.1", "bs58", "jsonrpc-core", "reqwest", + "reqwest-middleware", "semver", "serde", "serde_derive", "serde_json", - "solana-account-decoder", + "solana-account-decoder-client-types", + "solana-inline-spl", "solana-sdk", - "solana-transaction-status", + "solana-transaction-status-client-types", "solana-version", - "spl-token-2022", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "solana-rpc-client-nonce-utils" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d34cf36289cc35a0b18cd518a256312090368a37f40b448520e260923558a9" +checksum = "5fa3be2840d3b8ebbdab96f62f59e0a9e6f9ba10f27b96a7d80d6897b15ff21a" dependencies = [ - "clap 2.34.0", - "solana-clap-utils", "solana-rpc-client", "solana-sdk", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "solana-runtime" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18dca69c7d3127d7b35014e703675a5665ed5680f6e1892acd24d612da059be9" +checksum = "e774ff9d8a44cba2bf8077de173b8ce8b0b2c3af94f1b44079fb4684a10130cf" dependencies = [ + "ahash", "aquamarine", "arrayref", - "base64 0.21.7", + "base64 0.22.1", "bincode", "blake3", "bv", @@ -4238,49 +5032,60 @@ dependencies = [ "fnv", "im", "index_list", - "itertools", + "itertools 0.12.1", "lazy_static", + "libc", "log", - "lru", "lz4", "memmap2", "mockall", "modular-bitfield", - "num-derive 0.4.2", + "num-derive", "num-traits", "num_cpus", - "num_enum 0.7.3", - "ouroboros", + "num_enum", "percentage", "qualifier_attr", "rand 0.8.5", "rayon", "regex", - "rustc_version", "serde", "serde_derive", "serde_json", + "serde_with", "solana-accounts-db", "solana-address-lookup-table-program", "solana-bpf-loader-program", "solana-bucket-map", + "solana-compute-budget", "solana-compute-budget-program", "solana-config-program", "solana-cost-model", - "solana-frozen-abi", - "solana-frozen-abi-macro", + "solana-feature-set", + "solana-fee", + "solana-inline-spl", + "solana-lattice-hash", "solana-loader-v4-program", "solana-measure", "solana-metrics", "solana-perf", + "solana-program", "solana-program-runtime", "solana-rayon-threadlimit", + "solana-runtime-transaction", "solana-sdk", "solana-stake-program", + "solana-svm", + "solana-svm-rent-collector", + "solana-svm-transaction", "solana-system-program", + "solana-timings", + "solana-transaction-status", "solana-version", "solana-vote", "solana-vote-program", + "solana-zk-elgamal-proof-program", + "solana-zk-sdk", "solana-zk-token-proof-program", "solana-zk-token-sdk", "static_assertions", @@ -4289,76 +5094,132 @@ dependencies = [ "symlink", "tar", "tempfile", - "thiserror", + "thiserror 1.0.69", "zstd", ] +[[package]] +name = "solana-runtime-transaction" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65d1100f9cd3ed91c84e814468f439512cc6c7afab35ccb190e300ba03bbdcfb" +dependencies = [ + "agave-transaction-view", + "log", + "solana-builtins-default-costs", + "solana-compute-budget", + "solana-pubkey", + "solana-sdk", + "solana-svm-transaction", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-sanitize" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9677531dd4098d078515c66d69a04bfa0389d364a5c768561c719030b368a9db" + [[package]] name = "solana-sdk" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b3f2080eddef6552fde7f149c429cf05b9bb0605a068b0d28e19d793e24df4" +checksum = "bf93cfd5f5af23b59789eba96b6a6afd92a3a18a3fc6652259bfa1f32743caf4" dependencies = [ - "assert_matches", - "base64 0.21.7", "bincode", - "bitflags 2.6.0", - "borsh 1.5.1", + "bitflags 2.8.0", + "borsh 1.5.5", "bs58", "bytemuck", + "bytemuck_derive", "byteorder", "chrono", - "derivation-path", "digest 0.10.7", "ed25519-dalek", "ed25519-dalek-bip32", - "generic-array", + "getrandom 0.1.16", "hmac 0.12.1", - "itertools", + "itertools 0.12.1", "js-sys", "lazy_static", "libsecp256k1", "log", "memmap2", - "num-derive 0.4.2", + "num-derive", "num-traits", - "num_enum 0.7.3", - "pbkdf2 0.11.0", - "qstring", - "qualifier_attr", + "num_enum", + "pbkdf2", "rand 0.7.3", "rand 0.8.5", - "rustc_version", - "rustversion", "serde", "serde_bytes", "serde_derive", "serde_json", "serde_with", "sha2 0.10.8", - "sha3 0.10.8", + "sha3", "siphasher", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-logger", + "solana-account", + "solana-bn254", + "solana-decode-error", + "solana-derivation-path", + "solana-feature-set", + "solana-inflation", + "solana-instruction", + "solana-native-token", + "solana-packet", + "solana-precompile-error", "solana-program", + "solana-program-memory", + "solana-pubkey", + "solana-sanitize", "solana-sdk-macro", - "thiserror", - "uriparse", + "solana-secp256k1-recover", + "solana-secp256r1-program", + "solana-serde-varint", + "solana-short-vec", + "solana-signature", + "solana-transaction-error", + "thiserror 1.0.69", "wasm-bindgen", ] [[package]] name = "solana-sdk-macro" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a8613ca80150f7e277e773620ba65d2c5fcc3a08eb8026627d601421ab43aef" +checksum = "3bded40f70accbe97030e5f7163017605e51a2631425229ec2b0a4339bd1163a" dependencies = [ "bs58", "proc-macro2", "quote", - "rustversion", - "syn 2.0.77", + "syn 2.0.96", +] + +[[package]] +name = "solana-secp256k1-recover" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee25b962814dec3c141e8182474046bae231f0521ed62c9bfdfb6722999ddc18" +dependencies = [ + "borsh 1.5.5", + "libsecp256k1", + "solana-define-syscall", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-secp256r1-program" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ec53eff8861ab398b9ca4da7ef8c8da5d4170f8ea26557fc1581638b56326c1" +dependencies = [ + "bytemuck", + "openssl", + "solana-feature-set", + "solana-instruction", + "solana-precompile-error", + "solana-pubkey", ] [[package]] @@ -4369,13 +5230,14 @@ checksum = "468aa43b7edb1f9b7b7b686d5c3aeb6630dc1708e86e31343499dd5c4d775183" [[package]] name = "solana-send-transaction-service" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff268c2c8a9490acfe40daeb650067e053684167c371d6d02a3bc3ad701d4c1f" +checksum = "a650ad28627e4a0c4af67b34b0650def5ac6c08e8a2c60adfb029a80fe671209" dependencies = [ "crossbeam-channel", "log", "solana-client", + "solana-connection-cache", "solana-measure", "solana-metrics", "solana-runtime", @@ -4383,73 +5245,228 @@ dependencies = [ "solana-tpu-client", ] +[[package]] +name = "solana-serde-varint" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ff77c37cb995cc53ce1a4b78e5e9961957098677de6fdc6a4783ed37a8b0fcd" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-serialize-utils" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57a10eb6e3177828145beaba85d352a4dbc47798fd95c5f86145e1a732684d6d" +dependencies = [ + "solana-instruction", + "solana-pubkey", + "solana-sanitize", +] + +[[package]] +name = "solana-sha256-hasher" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98c4229293979bf8bda7db2243ae75e13695341375577a4c44b07e4f0b7a5d9e" +dependencies = [ + "sha2 0.10.8", + "solana-define-syscall", + "solana-hash", +] + +[[package]] +name = "solana-short-vec" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6a2a88d56e6771329970059bcab0fde9a719c8edae173fb26b2c08e427495a" +dependencies = [ + "serde", +] + +[[package]] +name = "solana-signature" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1e8a078879d8430cdfbee8e3c1cdf17da74c19d304662580fc463dc91e17699" +dependencies = [ + "bs58", + "ed25519-dalek", + "generic-array", + "rand 0.8.5", + "serde", + "serde_derive", + "solana-sanitize", +] + +[[package]] +name = "solana-slot-hashes" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88fa2a6e60f2d7016cf95429e0f60cf4a04d4eed167abd1a5f8b08cbda695893" +dependencies = [ + "serde", + "serde_derive", + "solana-hash", + "solana-sysvar-id", +] + +[[package]] +name = "solana-slot-history" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0fa66272c308c39a3ce1ca2a9c422de4bdedc28cfe706d6f2c68727bb626eb7" +dependencies = [ + "bv", + "serde", + "serde_derive", + "solana-sysvar-id", +] + +[[package]] +name = "solana-stable-layout" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2243571ebf8c0c9915c7e71b17469e173c6755fa58af8eb529db3dda84e3e19a" +dependencies = [ + "solana-instruction", + "solana-pubkey", +] + [[package]] name = "solana-stake-program" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22aaa33150c76b5c2d11b31b8e7fceb9c147ecf40ae9050af34c619a5bf4ff3f" +checksum = "38bf2b1fac7838c45db3eefe48334de5af56582179f089cff6ec9687bff9aaec" dependencies = [ "bincode", "log", - "rustc_version", "solana-config-program", + "solana-feature-set", + "solana-log-collector", "solana-program-runtime", "solana-sdk", + "solana-type-overrides", "solana-vote-program", ] [[package]] name = "solana-streamer" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "979d470dd7c589679a2e036078921989a2563f333b73b31e2fdceb09a6d55a29" +checksum = "fddc2b38975c25199456ff46307c484affb459b84aedefe9618aece2a92326a9" dependencies = [ "async-channel", "bytes", "crossbeam-channel", + "dashmap", + "futures", "futures-util", + "governor", "histogram", - "indexmap 2.5.0", - "itertools", + "indexmap", + "itertools 0.12.1", "libc", "log", "nix", "pem", "percentage", - "pkcs8", "quinn", "quinn-proto", "rand 0.8.5", - "rcgen", - "rustls", + "rustls 0.23.21", "smallvec", + "socket2", + "solana-measure", "solana-metrics", "solana-perf", "solana-sdk", - "thiserror", + "solana-transaction-metrics-tracker", + "thiserror 1.0.69", "tokio", + "tokio-util 0.7.13", "x509-parser", ] +[[package]] +name = "solana-svm" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb79efc84cba5feafc50895ca6f32cae67aab89d662fe8bd624b5d02e9c6d76" +dependencies = [ + "itertools 0.12.1", + "log", + "percentage", + "serde", + "serde_derive", + "solana-bpf-loader-program", + "solana-compute-budget", + "solana-feature-set", + "solana-fee", + "solana-loader-v4-program", + "solana-log-collector", + "solana-measure", + "solana-program-runtime", + "solana-runtime-transaction", + "solana-sdk", + "solana-svm-rent-collector", + "solana-svm-transaction", + "solana-system-program", + "solana-timings", + "solana-type-overrides", + "solana-vote", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-svm-rent-collector" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec2d49e2e2b66f8cdeaa438f8e269997ff7897441ce70f1b08aaa94a985f13ba" +dependencies = [ + "solana-sdk", +] + +[[package]] +name = "solana-svm-transaction" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c91c7a568ecab3153c34a325108748116298df26d95e27b80b463de51b11631" +dependencies = [ + "solana-sdk", +] + [[package]] name = "solana-system-program" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873b17e54d30a7834e5b2224351fb277e0608e40261e9a408d3706737d2a61f8" +checksum = "404d232521ffef568bd53d172c36446e61977553dc98bffadec7e384839f7780" dependencies = [ "bincode", "log", "serde", "serde_derive", + "solana-log-collector", "solana-program-runtime", "solana-sdk", + "solana-type-overrides", +] + +[[package]] +name = "solana-sysvar-id" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5822b63dd59f124e4920df8d87640a288bb40f4016fd275d028fee0b94a5a51e" +dependencies = [ + "solana-pubkey", ] [[package]] name = "solana-thin-client" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851b9ae239d098c766aee3558330cc16edd0524c9cf3f9cf7c64f53b1024d507" +checksum = "1915dcb44dd5763a30aa32a687057e6a3b16781eb9f5db2800548990560272c3" dependencies = [ "bincode", "log", @@ -4460,40 +5477,78 @@ dependencies = [ "solana-sdk", ] +[[package]] +name = "solana-timings" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "088c4507c8fd4f81c4039d78baf1ea7d68c8b80b2a973ba60838d33d2f7e752d" +dependencies = [ + "eager", + "enum-iterator", + "solana-sdk", +] + [[package]] name = "solana-tpu-client" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7a7e5a522fe5333fcb47e02fb7da73ff614d917754167937b5523c383ce161" +checksum = "3f944cd29eb540ca7e8df03c4e6043d5b8042eadab29b1848245c847a7c7c555" dependencies = [ "async-trait", "bincode", "futures-util", - "indexmap 2.5.0", + "indexmap", "indicatif", "log", "rayon", "solana-connection-cache", "solana-measure", - "solana-metrics", "solana-pubsub-client", "solana-rpc-client", "solana-rpc-client-api", "solana-sdk", - "thiserror", + "thiserror 1.0.69", "tokio", ] +[[package]] +name = "solana-transaction-error" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd92caae17b4b828864b85cecf6dba6a87ad0ac433606b8bbd58334c74d0251" +dependencies = [ + "serde", + "serde_derive", + "solana-instruction", + "solana-sanitize", +] + +[[package]] +name = "solana-transaction-metrics-tracker" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "551dc5dad276919d24287e14e410759e93b801f2ca47dd9ad6c75eb49af26607" +dependencies = [ + "base64 0.22.1", + "bincode", + "lazy_static", + "log", + "rand 0.8.5", + "solana-perf", + "solana-sdk", + "solana-short-vec", +] + [[package]] name = "solana-transaction-status" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51be349fb9301d2a0fdd0b9ba5341e5f72bf4900ca4c0ede04748bc9038d15e8" +checksum = "f73cd35a23e9d6e289a9bf7bf32c1e972bb88bbb5ec434f43b445286b6ea3079" dependencies = [ "Inflector", - "base64 0.21.7", + "base64 0.22.1", "bincode", - "borsh 0.10.4", + "borsh 1.5.5", "bs58", "lazy_static", "log", @@ -4502,94 +5557,165 @@ dependencies = [ "serde_json", "solana-account-decoder", "solana-sdk", + "solana-transaction-status-client-types", "spl-associated-token-account", "spl-memo", - "spl-token", + "spl-token 6.0.0", "spl-token-2022", - "thiserror", + "spl-token-group-interface", + "spl-token-metadata-interface", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-transaction-status-client-types" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "897c0015c246cb9b98cfaee15921c89cd7c1503bd368e9a3fd9336c17cd6be25" +dependencies = [ + "base64 0.22.1", + "bincode", + "bs58", + "serde", + "serde_derive", + "serde_json", + "solana-account-decoder-client-types", + "solana-sdk", + "solana-signature", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-type-overrides" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8e0b8916e7d78678428ca5d669950f6259ac332eab953ed0c8c2c88eebd3d2" +dependencies = [ + "lazy_static", + "rand 0.8.5", ] [[package]] name = "solana-udp-client" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3274b4bfccd57ecffcf4037cd09fc61777633e0d0c5f8b76abcaa10ee83f3ae5" +checksum = "6f5c6096b155fb1fb73d03fec2264a9671cbe208f71c4c32521ee9c979d91c75" dependencies = [ "async-trait", "solana-connection-cache", "solana-net-utils", "solana-sdk", "solana-streamer", - "thiserror", + "thiserror 1.0.69", "tokio", ] [[package]] name = "solana-version" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf45873439f73420f60a5e0f87b529923c3489d24a228d5eb8f5ce6955bdc1b" +checksum = "ae093290bf86006e323e883b9df845e4bdf84f23c37067cfa9837918ed04c87d" dependencies = [ - "log", - "rustc_version", "semver", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-sdk", + "solana-feature-set", + "solana-sanitize", + "solana-serde-varint", ] [[package]] name = "solana-vote" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54cb2827041a2acb79e3855e7310466d9bef71650e2304994076b209eaf4d9f" +checksum = "8421891f95fe3b8291205e37043396c0fb26c2896cc94d53b153e1ba180992fa" dependencies = [ - "crossbeam-channel", - "itertools", + "itertools 0.12.1", "log", - "rustc_version", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", "solana-sdk", - "solana-vote-program", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "solana-vote-program" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7c7525bda137bbb9bc0dc967a4ffca82786147eb2d1efbf76a8dc52978f0b8" +checksum = "fcf72a022dbb24dcfe1588aa09679042866eb7c0796ea479500ebe9355a7017f" dependencies = [ "bincode", "log", - "num-derive 0.4.2", + "num-derive", + "num-traits", + "serde", + "serde_derive", + "solana-feature-set", + "solana-metrics", + "solana-program", + "solana-program-runtime", + "solana-sdk", + "thiserror 1.0.69", +] + +[[package]] +name = "solana-zk-elgamal-proof-program" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd18f8bfe823ed6c1aab2068ca1fe9428d457c8d36f0d8f9d118968a04760b0" +dependencies = [ + "bytemuck", + "num-derive", + "num-traits", + "solana-log-collector", + "solana-program-runtime", + "solana-sdk", + "solana-zk-sdk", +] + +[[package]] +name = "solana-zk-sdk" +version = "2.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c19f36d9e5227b4d94e651501a1ab15d58480d93e03d8340cc8593758e50530" +dependencies = [ + "aes-gcm-siv", + "base64 0.22.1", + "bincode", + "bytemuck", + "bytemuck_derive", + "curve25519-dalek 4.1.3", + "itertools 0.12.1", + "js-sys", + "lazy_static", + "merlin", + "num-derive", "num-traits", - "rustc_version", + "rand 0.8.5", "serde", "serde_derive", - "solana-frozen-abi", - "solana-frozen-abi-macro", - "solana-metrics", + "serde_json", + "sha3", + "solana-derivation-path", "solana-program", - "solana-program-runtime", "solana-sdk", - "thiserror", + "subtle", + "thiserror 1.0.69", + "wasm-bindgen", + "zeroize", ] [[package]] name = "solana-zk-token-proof-program" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce8bf8a6d43db385a2beb324110282ae8140a4a040d39f3a0870c43df24c5055" +checksum = "a47e87183135b247b3275c083a11fdf4485e81213baa895215639e55e3eb17e0" dependencies = [ "bytemuck", - "num-derive 0.4.2", + "num-derive", "num-traits", + "solana-feature-set", + "solana-log-collector", "solana-program-runtime", "solana-sdk", "solana-zk-token-sdk", @@ -4597,58 +5723,54 @@ dependencies = [ [[package]] name = "solana-zk-token-sdk" -version = "1.18.23" +version = "2.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a57b2f269f24088b6b8e426de05e5c1faa6b5d6f26175c06eb80df96ec685e" +checksum = "3b8cc94d7eddf6606c22504889b6528734db56ed3c2f651641453d13c9b233d7" dependencies = [ "aes-gcm-siv", - "base64 0.21.7", + "base64 0.22.1", "bincode", "bytemuck", + "bytemuck_derive", "byteorder", - "curve25519-dalek", - "getrandom 0.1.16", - "itertools", + "curve25519-dalek 4.1.3", + "itertools 0.12.1", "lazy_static", "merlin", - "num-derive 0.4.2", + "num-derive", "num-traits", - "rand 0.7.3", + "rand 0.8.5", "serde", + "serde_derive", "serde_json", - "sha3 0.9.1", + "sha3", + "solana-curve25519", + "solana-derivation-path", "solana-program", "solana-sdk", "subtle", - "thiserror", + "thiserror 1.0.69", "zeroize", ] [[package]] name = "solana_rbpf" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da5d083187e3b3f453e140f292c09186881da8a02a7b5e27f645ee26de3d9cc5" +checksum = "1c1941b5ef0c3ce8f2ac5dd984d0fb1a97423c4ff2a02eec81e3913f02e2ac2b" dependencies = [ "byteorder", - "combine", - "goblin", + "combine 3.8.1", "hash32", "libc", "log", "rand 0.8.5", "rustc-demangle", "scroll", - "thiserror", + "thiserror 1.0.69", "winapi", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -4656,36 +5778,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] -name = "spki" -version = "0.5.4" +name = "spinning_top" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" dependencies = [ - "base64ct", - "der", + "lock_api", ] [[package]] name = "spl-associated-token-account" -version = "2.3.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "992d9c64c2564cc8f63a4b508bf3ebcdf2254b0429b13cd1d31adb6162432a5f" +checksum = "68034596cf4804880d265f834af1ff2f821ad5293e41fa0f8f59086c181fc38e" dependencies = [ "assert_matches", - "borsh 0.10.4", - "num-derive 0.4.2", + "borsh 1.5.5", + "num-derive", "num-traits", "solana-program", - "spl-token", + "spl-token 6.0.0", "spl-token-2022", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "spl-discriminator" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cce5d563b58ef1bb2cdbbfe0dfb9ffdc24903b10ae6a4df2d8f425ece375033f" +checksum = "a38ea8b6dedb7065887f12d62ed62c1743aa70749e8558f963609793f6fb12bc" dependencies = [ "bytemuck", "solana-program", @@ -4694,45 +5815,46 @@ dependencies = [ [[package]] name = "spl-discriminator-derive" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fd7858fc4ff8fb0e34090e41d7eb06a823e1057945c26d480bfc21d2338a93" +checksum = "d9e8418ea6269dcfb01c712f0444d2c75542c04448b480e87de59d2865edc750" dependencies = [ "quote", "spl-discriminator-syn", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] name = "spl-discriminator-syn" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fea7be851bd98d10721782ea958097c03a0c2a07d8d4997041d0ece6319a63" +checksum = "8c1f05593b7ca9eac7caca309720f2eafb96355e037e6d373b909a80fe7b69b9" dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "syn 2.0.77", - "thiserror", + "syn 2.0.96", + "thiserror 1.0.69", ] [[package]] name = "spl-memo" -version = "4.0.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f180b03318c3dbab3ef4e1e4d46d5211ae3c780940dd0a28695aba4b59a75a" +checksum = "a0dba2f2bb6419523405d21c301a32c9f9568354d4742552e7972af801f4bdb3" dependencies = [ "solana-program", ] [[package]] name = "spl-pod" -version = "0.1.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2881dddfca792737c0706fa0175345ab282b1b0879c7d877bad129645737c079" +checksum = "c704c88fc457fa649ba3aabe195c79d885c3f26709efaddc453c8de352c90b87" dependencies = [ - "borsh 0.10.4", + "borsh 1.5.5", "bytemuck", + "bytemuck_derive", "solana-program", "solana-zk-token-sdk", "spl-program-error", @@ -4740,34 +5862,34 @@ dependencies = [ [[package]] name = "spl-program-error" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "249e0318493b6bcf27ae9902600566c689b7dfba9f1bdff5893e92253374e78c" +checksum = "d7b28bed65356558133751cc32b48a7a5ddfc59ac4e941314630bbed1ac10532" dependencies = [ - "num-derive 0.4.2", + "num-derive", "num-traits", "solana-program", "spl-program-error-derive", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "spl-program-error-derive" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1845dfe71fd68f70382232742e758557afe973ae19e6c06807b2c30f5d5cb474" +checksum = "e6d375dd76c517836353e093c2dbb490938ff72821ab568b545fd30ab3256b3e" dependencies = [ "proc-macro2", "quote", "sha2 0.10.8", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] name = "spl-tlv-account-resolution" -version = "0.5.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615d381f48ddd2bb3c57c7f7fb207591a2a05054639b18a62e785117dd7a8683" +checksum = "37a75a5f0fcc58126693ed78a17042e9dc53f07e357d6be91789f7d62aff61a4" dependencies = [ "bytemuck", "solana-program", @@ -4779,48 +5901,63 @@ dependencies = [ [[package]] name = "spl-token" -version = "4.0.0" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9e171cbcb4b1f72f6d78ed1e975cb467f56825c27d09b8dd2608e4e7fc8b3b" +dependencies = [ + "arrayref", + "bytemuck", + "num-derive", + "num-traits", + "num_enum", + "solana-program", + "thiserror 1.0.69", +] + +[[package]] +name = "spl-token" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08459ba1b8f7c1020b4582c4edf0f5c7511a5e099a7a97570c9698d4f2337060" +checksum = "70a0f06ac7f23dc0984931b1fe309468f14ea58e32660439c1cef19456f5d0e3" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.3.3", + "num-derive", "num-traits", - "num_enum 0.6.1", + "num_enum", "solana-program", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "spl-token-2022" -version = "1.0.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d697fac19fd74ff472dfcc13f0b442dd71403178ce1de7b5d16f83a33561c059" +checksum = "d9c10f3483e48679619c76598d4e4aebb955bc49b0a5cc63323afbf44135c9bf" dependencies = [ "arrayref", "bytemuck", - "num-derive 0.4.2", + "num-derive", "num-traits", - "num_enum 0.7.3", + "num_enum", "solana-program", "solana-security-txt", "solana-zk-token-sdk", "spl-memo", "spl-pod", - "spl-token", + "spl-token 6.0.0", "spl-token-group-interface", "spl-token-metadata-interface", "spl-transfer-hook-interface", "spl-type-length-value", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "spl-token-group-interface" -version = "0.1.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b889509d49fa74a4a033ca5dae6c2307e9e918122d97e58562f5c4ffa795c75d" +checksum = "df8752b85a5ecc1d9f3a43bce3dd9a6a053673aacf5deb513d1cbb88d3534ffd" dependencies = [ "bytemuck", "solana-program", @@ -4831,11 +5968,11 @@ dependencies = [ [[package]] name = "spl-token-metadata-interface" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c16ce3ba6979645fb7627aa1e435576172dd63088dc7848cb09aa331fa1fe4f" +checksum = "c6c2318ddff97e006ed9b1291ebec0750a78547f870f62a69c56fe3b46a5d8fc" dependencies = [ - "borsh 0.10.4", + "borsh 1.5.5", "solana-program", "spl-discriminator", "spl-pod", @@ -4845,9 +5982,9 @@ dependencies = [ [[package]] name = "spl-transfer-hook-interface" -version = "0.4.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aabdb7c471566f6ddcee724beb8618449ea24b399e58d464d6b5bc7db550259" +checksum = "a110f33d941275d9f868b96daaa993f1e73b6806cc8836e43075b4d3ad8338a7" dependencies = [ "arrayref", "bytemuck", @@ -4861,9 +5998,9 @@ dependencies = [ [[package]] name = "spl-type-length-value" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a468e6f6371f9c69aae760186ea9f1a01c2908351b06a5e0026d21cfc4d7ecac" +checksum = "bdcd73ec187bc409464c60759232e309f83b52a18a9c5610bf281c9c6432918c" dependencies = [ "bytemuck", "solana-program", @@ -4873,22 +6010,16 @@ dependencies = [ ] [[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "strsim" -version = "0.8.0" +name = "stable_deref_trait" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "strsim" -version = "0.10.0" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" @@ -4911,7 +6042,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -4920,9 +6051,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "symlink" @@ -4943,27 +6074,15 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "syn_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.77", -] - [[package]] name = "sync_wrapper" version = "0.1.2" @@ -4982,6 +6101,17 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -5005,9 +6135,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", @@ -5030,7 +6160,7 @@ dependencies = [ "serde", "static_assertions", "tarpc-plugins", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-serde", "tokio-util 0.6.10", @@ -5049,14 +6179,24 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "task-local-extensions" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" +dependencies = [ + "pin-utils", +] + [[package]] name = "tempfile" -version = "3.12.0" +version = "3.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "9a8a559c81686f576e8cd0290cd2a24a2a9ad80c98b3478856500fcbd7acd704" dependencies = [ "cfg-if", "fastrand", + "getrandom 0.2.15", "once_cell", "rustix", "windows-sys 0.59.0", @@ -5073,9 +6213,9 @@ dependencies = [ [[package]] name = "termtree" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" +checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" [[package]] name = "test-case" @@ -5095,7 +6235,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -5106,43 +6246,48 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", "test-case-core", ] [[package]] -name = "textwrap" -version = "0.11.0" +name = "thiserror" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "unicode-width", + "thiserror-impl 1.0.69", ] [[package]] -name = "textwrap" -version = "0.16.1" +name = "thiserror" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +dependencies = [ + "thiserror-impl 2.0.11", +] [[package]] -name = "thiserror" -version = "1.0.64" +name = "thiserror-impl" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ - "thiserror-impl", + "proc-macro2", + "quote", + "syn 2.0.96", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -5157,9 +6302,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -5178,38 +6323,29 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", ] [[package]] -name = "tiny-bip39" -version = "0.8.2" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "anyhow", - "hmac 0.8.1", - "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", - "rustc-hash", - "sha2 0.9.9", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", + "displaydoc", + "zerovec", ] [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" dependencies = [ "tinyvec_macros", ] @@ -5233,20 +6369,22 @@ name = "token-program" version = "0.0.0" dependencies = [ "assert_matches", + "mollusk-svm", + "mollusk-svm-fuzz-fixture", "pinocchio", "pinocchio-log", "solana-program-test", "solana-sdk", - "spl-token", + "spl-token 4.0.2", "test-case", "token-interface", ] [[package]] name = "tokio" -version = "1.40.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -5262,13 +6400,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] @@ -5277,7 +6415,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.12", "tokio", ] @@ -5299,9 +6437,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -5316,7 +6454,7 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls", + "rustls 0.21.12", "tokio", "tokio-rustls", "tungstenite", @@ -5340,9 +6478,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -5366,26 +6504,15 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.5.0", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.5.0", + "indexmap", "toml_datetime", - "winnow 0.6.20", + "winnow", ] [[package]] @@ -5396,9 +6523,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "log", "pin-project-lite", @@ -5408,20 +6535,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", ] [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -5442,9 +6569,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "sharded-slab", "thread_local", @@ -5470,9 +6597,9 @@ dependencies = [ "httparse", "log", "rand 0.8.5", - "rustls", + "rustls 0.21.12", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", "webpki-roots 0.24.0", @@ -5485,31 +6612,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] -name = "unicode-bidi" -version = "0.3.15" +name = "unicase" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] -name = "unicode-normalization" -version = "0.1.24" +name = "unicode-segmentation" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" -dependencies = [ - "tinyvec", -] +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.14" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "unicode-xid" @@ -5519,11 +6643,11 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "universal-hash" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "generic-array", + "crypto-common", "subtle", ] @@ -5536,12 +6660,6 @@ dependencies = [ "void", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" @@ -5560,9 +6678,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -5575,17 +6693,35 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "valuable" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] -name = "vec_map" -version = "0.8.2" +name = "vcpkg" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" @@ -5632,47 +6768,48 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5680,40 +6817,62 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "webpki-root-certs" +version = "0.26.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd5da49bdf1f30054cfe0b8ce2958b8fbeb67c4d82c8967a598af481bef255c" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "webpki-roots" version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki", + "rustls-webpki 0.101.7", ] [[package]] @@ -5722,6 +6881,17 @@ version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" +[[package]] +name = "which" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +dependencies = [ + "either", + "libc", + "once_cell", +] + [[package]] name = "winapi" version = "0.3.9" @@ -5912,18 +7082,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.20" +version = "0.6.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" dependencies = [ "memchr", ] @@ -5938,6 +7099,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "x509-parser" version = "0.14.0" @@ -5952,15 +7125,15 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.69", "time", ] [[package]] name = "xattr" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +checksum = "e105d177a3871454f754b33bb0ee637ecaaac997446375fd3e5d43a2ed00c909" dependencies = [ "libc", "linux-raw-sys", @@ -5968,12 +7141,27 @@ dependencies = [ ] [[package]] -name = "yasna" -version = "0.5.2" +name = "yoke" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ - "time", + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "synstructure 0.13.1", ] [[package]] @@ -5994,14 +7182,35 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", +] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", + "synstructure 0.13.1", ] [[package]] name = "zeroize" -version = "1.3.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] @@ -6014,25 +7223,46 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.96", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", ] [[package]] name = "zstd" -version = "0.11.2+zstd.1.5.2" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" +version = "7.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" dependencies = [ - "libc", "zstd-sys", ] diff --git a/Cargo.toml b/Cargo.toml index 283b708..5cd7600 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,10 @@ [workspace] resolver = "2" -members = ["interface", "program"] +members = [ + "fixtures", + "interface", + "program" +] [workspace.metadata.cli] solana = "2.1.0" @@ -15,6 +19,8 @@ license = "Apache-2.0" repository = "https://github.com/febo/token" [workspace.dependencies] +mollusk-svm = { version = "0.0.15", features = ["fuzz"], git = "https://github.com/buffalojoec/mollusk.git" } +mollusk-svm-fuzz-fixture = { version = "0.0.15", git = "https://github.com/buffalojoec/mollusk.git" } pinocchio = { version = "0.7", git = "https://github.com/febo/pinocchio.git", branch = "febo/close-unstable" } pinocchio-log = { version = "0.3", git = "https://github.com/febo/pinocchio.git", branch = "febo/close-unstable" } pinocchio-pubkey = { version = "0.2", git = "https://github.com/febo/pinocchio.git", branch = "febo/close-unstable" } diff --git a/program/Cargo.toml b/program/Cargo.toml index d527968..041f7a7 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -8,7 +8,7 @@ repository = { workspace = true } publish = false [package.metadata.solana] -program-id = "PToken1111111111111111111111111111111111111" +program-id = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" [lib] crate-type = ["cdylib"] @@ -24,7 +24,9 @@ token-interface = { version = "^0", path = "../interface" } [dev-dependencies] assert_matches = "1.5.0" -solana-program-test = "~1.18" -solana-sdk = "~1.18" +mollusk-svm = { workspace = true } +mollusk-svm-fuzz-fixture = { workspace = true } +solana-program-test = "2.1" +solana-sdk = "2.1" spl-token = { version="^4", features=["no-entrypoint"] } test-case = "3.3.1" From 7994bb846076d802eaf488a2b08fb568a6670386 Mon Sep 17 00:00:00 2001 From: febo Date: Wed, 15 Jan 2025 18:55:54 +0000 Subject: [PATCH 6/8] Add fixtures runner --- .github/workflows/main.yml | 66 +++++++++++++++++--------------------- package.json | 4 ++- scripts/fixtures.mjs | 60 ++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 38 deletions(-) create mode 100644 scripts/fixtures.mjs diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0bf9333..820d679 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,41 +26,6 @@ jobs: - name: Lint Programs run: pnpm programs:lint - format_and_lint_client_js: - name: Format & Lint Client JS - runs-on: ubuntu-latest - steps: - - name: Git Checkout - uses: actions/checkout@v4 - - - name: Setup Environment - uses: ./.github/actions/setup - - - name: Format Client JS - run: pnpm clients:js:format - - - name: Lint Client JS - run: pnpm clients:js:lint - - # format_and_lint_client_rust: - # name: Format & Lint Client Rust - # runs-on: ubuntu-latest - # steps: - # - name: Git Checkout - # uses: actions/checkout@v4 - - # - name: Setup Environment - # uses: ./.github/actions/setup - # with: - # clippy: true - # rustfmt: true - - # - name: Format Client Rust - # run: pnpm clients:rust:format - - # - name: Lint Client Rust - # run: pnpm clients:rust:lint - build_programs: name: Build programs runs-on: ubuntu-latest @@ -85,7 +50,7 @@ jobs: path: ./target/deploy/*.so if-no-files-found: error - - name: Save Program Builds For Client Jobs + - name: Save Program Builds For Fixtures Job uses: actions/cache/save@v4 with: path: ./**/*.so @@ -110,4 +75,31 @@ jobs: solana: true - name: Test Programs - run: pnpm programs:test + run: RUST_LOG=error pnpm programs:test + + run_fixtures: + name: Run Fixtures + runs-on: ubuntu-latest + needs: build_programs + steps: + - name: Git Checkout + uses: actions/checkout@v4 + + - name: Purge environment + uses: ./.github/actions/purge + + - name: Setup Environment + uses: ./.github/actions/setup + with: + cargo-cache-key: cargo-program-tests + cargo-cache-fallback-key: cargo-programs + solana: true + + - name: Restore Program Builds + uses: actions/cache/restore@v4 + with: + path: ./**/*.so + key: ${{ runner.os }}-builds-${{ github.sha }} + + - name: Run Fixtures + run: RUST_LOG=error pnpm fixtures:run diff --git a/package.json b/package.json index ad303ff..5efa7f8 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,9 @@ "clients:rust:format": "zx ./scripts/client/format-rust.mjs", "clients:rust:lint": "zx ./scripts/client/lint-rust.mjs", "clients:rust:publish": "zx ./scripts/client/publish-rust.mjs", - "clients:rust:test": "zx ./scripts/client/test-rust.mjs" + "clients:rust:test": "zx ./scripts/client/test-rust.mjs", + "fixtures:run": "zx ./scripts/fixtures.mjs run", + "fixtures:clean": "zx ./scripts/fixtures.mjs clean" }, "devDependencies": { "@iarna/toml": "^2.2.5", diff --git a/scripts/fixtures.mjs b/scripts/fixtures.mjs new file mode 100644 index 0000000..fd1ca39 --- /dev/null +++ b/scripts/fixtures.mjs @@ -0,0 +1,60 @@ +#!/usr/bin/env zx +import 'zx/globals'; +import { existsSync } from 'fs'; +import { cliArguments, workingDirectory } from './utils.mjs'; + +// Git repository for the SPL Token program. +const SPL_TOKEN_GIT = "https://github.com/solana-program/token.git"; +// Directory where the SPL Token program is cloned. Since it is not meant to be +// checked in, it is cloned in the target directory. +const SPL_TOKEN_DIR = path.join(workingDirectory, 'target', 'spl-token'); +// Directory where the fixtures are generated. They get generated everytime the +// `SPL_TOKEN_GIT` repository is cloned to make sure they are up to date. +const FIXTURES_DIR = path.join(workingDirectory, 'target', 'spl-token', 'fixtures'); +// Path to the Cargo.toml file of the fixtures CLI program. +const FIXTURES_MANIFEST = path.join(workingDirectory, 'fixtures', 'Cargo.toml'); +// Directory where the program binary is found. +const OUTPUT_DIR = path.join(workingDirectory, 'target', 'deploy'); +// Directory where the CLI executale is found. +const CLI_OUTPUT_DIR = path.join(workingDirectory, 'target', 'release'); + +const [command, ...args] = cliArguments(); + +switch (command) { + case 'clean': + await clean(); + break; + case 'run': + await run(args); + break; + default: + throw new Error(`Unknown command: ${command}`); +} + +async function clean() { + await $`rm -rf ${SPL_TOKEN_DIR}`; +} + +async function run(args) { + // On first run (or CI), clone the SPL Token program and generate the fixtures. + // This allows re-runing the fixtures without having to run the tests again. To + // force re-generating the fixtures, delete the `SPL_TOKEN_DIR` directory. + if (!existsSync(SPL_TOKEN_DIR)) { + await $`mkdir ${SPL_TOKEN_DIR}`; + await $`git clone ${SPL_TOKEN_GIT} ${SPL_TOKEN_DIR}`; + + cd(SPL_TOKEN_DIR); + // TODO: this can be removed once the mollusk checks PR is merged. + await $`git switch febo/mollusk-checks`; + + await $`EJECT_FUZZ_FIXTURES=${FIXTURES_DIR} cargo test-sbf --features mollusk-svm/fuzz --test processor`; + } + + cd(workingDirectory); + // Make sure that the program is up to date. + await $`pnpm programs:build`; + // Builds the fixtures CLI program. + await $`cargo build --manifest-path ${FIXTURES_MANIFEST} --release`; + // Run the fixtures. + await $`SBF_OUT_DIR="${OUTPUT_DIR}" ${CLI_OUTPUT_DIR}/fixtures --directory ${FIXTURES_DIR} ${args ? args.join(' ') : ''}`; +} From 3f5bbaf220b9ef7a0a8838661853686f7942ad89 Mon Sep 17 00:00:00 2001 From: febo Date: Wed, 15 Jan 2025 20:39:46 +0000 Subject: [PATCH 7/8] Generate fixtures for all tests --- scripts/fixtures.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/fixtures.mjs b/scripts/fixtures.mjs index fd1ca39..42beaa4 100644 --- a/scripts/fixtures.mjs +++ b/scripts/fixtures.mjs @@ -47,7 +47,7 @@ async function run(args) { // TODO: this can be removed once the mollusk checks PR is merged. await $`git switch febo/mollusk-checks`; - await $`EJECT_FUZZ_FIXTURES=${FIXTURES_DIR} cargo test-sbf --features mollusk-svm/fuzz --test processor`; + await $`EJECT_FUZZ_FIXTURES=${FIXTURES_DIR} cargo test-sbf --features mollusk-svm/fuzz`; } cd(workingDirectory); From eb89e6d1f13af1735548353555dd05f123d46d2f Mon Sep 17 00:00:00 2001 From: febo Date: Fri, 17 Jan 2025 11:26:01 +0000 Subject: [PATCH 8/8] Extract fixtures from main --- scripts/fixtures.mjs | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/fixtures.mjs b/scripts/fixtures.mjs index 42beaa4..65fceb9 100644 --- a/scripts/fixtures.mjs +++ b/scripts/fixtures.mjs @@ -44,8 +44,6 @@ async function run(args) { await $`git clone ${SPL_TOKEN_GIT} ${SPL_TOKEN_DIR}`; cd(SPL_TOKEN_DIR); - // TODO: this can be removed once the mollusk checks PR is merged. - await $`git switch febo/mollusk-checks`; await $`EJECT_FUZZ_FIXTURES=${FIXTURES_DIR} cargo test-sbf --features mollusk-svm/fuzz`; }