Skip to content

renderers-rust: extract pubkey from solana-program #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 8, 2025
Merged

renderers-rust: extract pubkey from solana-program #535

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e556541
renderers-rust: extract pubkey from solana-program
buffalojoec Apr 7, 2025
f1ffa8a
Create gold-monkeys-breathe.md
lorisleiva May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,392 changes: 1,101 additions & 291 deletions packages/renderers-rust/e2e/anchor/Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion packages/renderers-rust/e2e/anchor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ num-derive = "^0.3"
num-traits = "^0.2"
serde = { version = "^1.0", features = ["derive"], optional = true }
serde_with = { version = "^3.0", optional = true }
solana-program = "^2.1.6"
solana-program = "2.2.1"
solana-pubkey = { version = "2.2.1", features = ["curve25519"] }
solana-client = { version = "~1.18", optional = true }
solana-sdk = { version = "~1.18", optional = true }
thiserror = "^1.0"
Expand Down
10 changes: 5 additions & 5 deletions packages/renderers-rust/e2e/anchor/src/generated/accounts/guard_v1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::generated::types::MetadataAdditionalFieldRule;
use crate::generated::types::TransferAmountRule;
use borsh::BorshDeserialize;
use borsh::BorshSerialize;
use solana_program::pubkey::Pubkey;
use solana_pubkey::Pubkey;

#[derive(BorshSerialize, BorshDeserialize, Clone, Debug, Eq, PartialEq)]
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
Expand Down Expand Up @@ -54,7 +54,7 @@ impl<'a> TryFrom<&solana_program::account_info::AccountInfo<'a>> for GuardV1 {
#[cfg(feature = "fetch")]
pub fn fetch_guard_v1(
rpc: &solana_client::rpc_client::RpcClient,
address: &solana_program::pubkey::Pubkey,
address: &solana_pubkey::Pubkey,
) -> Result<crate::shared::DecodedAccount<GuardV1>, std::io::Error> {
let accounts = fetch_all_guard_v1(rpc, &[*address])?;
Ok(accounts[0].clone())
Expand All @@ -63,7 +63,7 @@ pub fn fetch_guard_v1(
#[cfg(feature = "fetch")]
pub fn fetch_all_guard_v1(
rpc: &solana_client::rpc_client::RpcClient,
addresses: &[solana_program::pubkey::Pubkey],
addresses: &[solana_pubkey::Pubkey],
) -> Result<Vec<crate::shared::DecodedAccount<GuardV1>>, std::io::Error> {
let accounts = rpc
.get_multiple_accounts(addresses)
Expand All @@ -88,7 +88,7 @@ pub fn fetch_all_guard_v1(
#[cfg(feature = "fetch")]
pub fn fetch_maybe_guard_v1(
rpc: &solana_client::rpc_client::RpcClient,
address: &solana_program::pubkey::Pubkey,
address: &solana_pubkey::Pubkey,
) -> Result<crate::shared::MaybeAccount<GuardV1>, std::io::Error> {
let accounts = fetch_all_maybe_guard_v1(rpc, &[*address])?;
Ok(accounts[0].clone())
Expand All @@ -97,7 +97,7 @@ pub fn fetch_maybe_guard_v1(
#[cfg(feature = "fetch")]
pub fn fetch_all_maybe_guard_v1(
rpc: &solana_client::rpc_client::RpcClient,
addresses: &[solana_program::pubkey::Pubkey],
addresses: &[solana_pubkey::Pubkey],
) -> Result<Vec<crate::shared::MaybeAccount<GuardV1>>, std::io::Error> {
let accounts = rpc
.get_multiple_accounts(addresses)
Expand Down
60 changes: 27 additions & 33 deletions packages/renderers-rust/e2e/anchor/src/generated/instructions/create_guard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ use borsh::BorshSerialize;
/// Accounts.
#[derive(Debug)]
pub struct CreateGuard {
pub guard: solana_program::pubkey::Pubkey,
pub guard: solana_pubkey::Pubkey,

pub mint: solana_program::pubkey::Pubkey,
pub mint: solana_pubkey::Pubkey,

pub mint_token_account: solana_program::pubkey::Pubkey,
pub mint_token_account: solana_pubkey::Pubkey,

pub guard_authority: solana_program::pubkey::Pubkey,
pub guard_authority: solana_pubkey::Pubkey,

pub payer: solana_program::pubkey::Pubkey,
pub payer: solana_pubkey::Pubkey,

pub associated_token_program: solana_program::pubkey::Pubkey,
pub associated_token_program: solana_pubkey::Pubkey,

pub token_program: solana_program::pubkey::Pubkey,
pub token_program: solana_pubkey::Pubkey,

pub system_program: solana_program::pubkey::Pubkey,
pub system_program: solana_pubkey::Pubkey,
}

impl CreateGuard {
Expand Down Expand Up @@ -133,14 +133,14 @@ pub struct CreateGuardInstructionArgs {
/// 7. `[optional]` system_program (default to `11111111111111111111111111111111`)
#[derive(Clone, Debug, Default)]
pub struct CreateGuardBuilder {
guard: Option<solana_program::pubkey::Pubkey>,
mint: Option<solana_program::pubkey::Pubkey>,
mint_token_account: Option<solana_program::pubkey::Pubkey>,
guard_authority: Option<solana_program::pubkey::Pubkey>,
payer: Option<solana_program::pubkey::Pubkey>,
associated_token_program: Option<solana_program::pubkey::Pubkey>,
token_program: Option<solana_program::pubkey::Pubkey>,
system_program: Option<solana_program::pubkey::Pubkey>,
guard: Option<solana_pubkey::Pubkey>,
mint: Option<solana_pubkey::Pubkey>,
mint_token_account: Option<solana_pubkey::Pubkey>,
guard_authority: Option<solana_pubkey::Pubkey>,
payer: Option<solana_pubkey::Pubkey>,
associated_token_program: Option<solana_pubkey::Pubkey>,
token_program: Option<solana_pubkey::Pubkey>,
system_program: Option<solana_pubkey::Pubkey>,
name: Option<String>,
symbol: Option<String>,
uri: Option<String>,
Expand All @@ -155,54 +155,48 @@ impl CreateGuardBuilder {
Self::default()
}
#[inline(always)]
pub fn guard(&mut self, guard: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn guard(&mut self, guard: solana_pubkey::Pubkey) -> &mut Self {
self.guard = Some(guard);
self
}
#[inline(always)]
pub fn mint(&mut self, mint: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn mint(&mut self, mint: solana_pubkey::Pubkey) -> &mut Self {
self.mint = Some(mint);
self
}
#[inline(always)]
pub fn mint_token_account(
&mut self,
mint_token_account: solana_program::pubkey::Pubkey,
) -> &mut Self {
pub fn mint_token_account(&mut self, mint_token_account: solana_pubkey::Pubkey) -> &mut Self {
self.mint_token_account = Some(mint_token_account);
self
}
#[inline(always)]
pub fn guard_authority(
&mut self,
guard_authority: solana_program::pubkey::Pubkey,
) -> &mut Self {
pub fn guard_authority(&mut self, guard_authority: solana_pubkey::Pubkey) -> &mut Self {
self.guard_authority = Some(guard_authority);
self
}
#[inline(always)]
pub fn payer(&mut self, payer: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn payer(&mut self, payer: solana_pubkey::Pubkey) -> &mut Self {
self.payer = Some(payer);
self
}
/// `[optional account, default to 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL']`
#[inline(always)]
pub fn associated_token_program(
&mut self,
associated_token_program: solana_program::pubkey::Pubkey,
associated_token_program: solana_pubkey::Pubkey,
) -> &mut Self {
self.associated_token_program = Some(associated_token_program);
self
}
/// `[optional account, default to 'TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb']`
#[inline(always)]
pub fn token_program(&mut self, token_program: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn token_program(&mut self, token_program: solana_pubkey::Pubkey) -> &mut Self {
self.token_program = Some(token_program);
self
}
/// `[optional account, default to '11111111111111111111111111111111']`
#[inline(always)]
pub fn system_program(&mut self, system_program: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn system_program(&mut self, system_program: solana_pubkey::Pubkey) -> &mut Self {
self.system_program = Some(system_program);
self
}
Expand Down Expand Up @@ -270,14 +264,14 @@ impl CreateGuardBuilder {
guard_authority: self.guard_authority.expect("guard_authority is not set"),
payer: self.payer.expect("payer is not set"),
associated_token_program: self.associated_token_program.unwrap_or(
solana_program::pubkey!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"),
solana_pubkey::pubkey!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"),
),
token_program: self.token_program.unwrap_or(solana_program::pubkey!(
token_program: self.token_program.unwrap_or(solana_pubkey::pubkey!(
"TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"
)),
system_program: self
.system_program
.unwrap_or(solana_program::pubkey!("11111111111111111111111111111111")),
.unwrap_or(solana_pubkey::pubkey!("11111111111111111111111111111111")),
};
let args = CreateGuardInstructionArgs {
name: self.name.clone().expect("name is not set"),
Expand Down
50 changes: 22 additions & 28 deletions packages/renderers-rust/e2e/anchor/src/generated/instructions/execute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ use borsh::BorshSerialize;
/// Accounts.
#[derive(Debug)]
pub struct Execute {
pub source_account: solana_program::pubkey::Pubkey,
pub source_account: solana_pubkey::Pubkey,

pub mint: solana_program::pubkey::Pubkey,
pub mint: solana_pubkey::Pubkey,

pub destination_account: solana_program::pubkey::Pubkey,
pub destination_account: solana_pubkey::Pubkey,

pub owner_delegate: solana_program::pubkey::Pubkey,
pub owner_delegate: solana_pubkey::Pubkey,

pub extra_metas_account: solana_program::pubkey::Pubkey,
pub extra_metas_account: solana_pubkey::Pubkey,

pub guard: solana_program::pubkey::Pubkey,
pub guard: solana_pubkey::Pubkey,

pub instruction_sysvar_account: solana_program::pubkey::Pubkey,
pub instruction_sysvar_account: solana_pubkey::Pubkey,
}

impl Execute {
Expand Down Expand Up @@ -119,13 +119,13 @@ pub struct ExecuteInstructionArgs {
/// 6. `[optional]` instruction_sysvar_account (default to `Sysvar1nstructions1111111111111111111111111`)
#[derive(Clone, Debug, Default)]
pub struct ExecuteBuilder {
source_account: Option<solana_program::pubkey::Pubkey>,
mint: Option<solana_program::pubkey::Pubkey>,
destination_account: Option<solana_program::pubkey::Pubkey>,
owner_delegate: Option<solana_program::pubkey::Pubkey>,
extra_metas_account: Option<solana_program::pubkey::Pubkey>,
guard: Option<solana_program::pubkey::Pubkey>,
instruction_sysvar_account: Option<solana_program::pubkey::Pubkey>,
source_account: Option<solana_pubkey::Pubkey>,
mint: Option<solana_pubkey::Pubkey>,
destination_account: Option<solana_pubkey::Pubkey>,
owner_delegate: Option<solana_pubkey::Pubkey>,
extra_metas_account: Option<solana_pubkey::Pubkey>,
guard: Option<solana_pubkey::Pubkey>,
instruction_sysvar_account: Option<solana_pubkey::Pubkey>,
amount: Option<u64>,
__remaining_accounts: Vec<solana_program::instruction::AccountMeta>,
}
Expand All @@ -135,46 +135,40 @@ impl ExecuteBuilder {
Self::default()
}
#[inline(always)]
pub fn source_account(&mut self, source_account: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn source_account(&mut self, source_account: solana_pubkey::Pubkey) -> &mut Self {
self.source_account = Some(source_account);
self
}
#[inline(always)]
pub fn mint(&mut self, mint: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn mint(&mut self, mint: solana_pubkey::Pubkey) -> &mut Self {
self.mint = Some(mint);
self
}
#[inline(always)]
pub fn destination_account(
&mut self,
destination_account: solana_program::pubkey::Pubkey,
) -> &mut Self {
pub fn destination_account(&mut self, destination_account: solana_pubkey::Pubkey) -> &mut Self {
self.destination_account = Some(destination_account);
self
}
#[inline(always)]
pub fn owner_delegate(&mut self, owner_delegate: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn owner_delegate(&mut self, owner_delegate: solana_pubkey::Pubkey) -> &mut Self {
self.owner_delegate = Some(owner_delegate);
self
}
#[inline(always)]
pub fn extra_metas_account(
&mut self,
extra_metas_account: solana_program::pubkey::Pubkey,
) -> &mut Self {
pub fn extra_metas_account(&mut self, extra_metas_account: solana_pubkey::Pubkey) -> &mut Self {
self.extra_metas_account = Some(extra_metas_account);
self
}
#[inline(always)]
pub fn guard(&mut self, guard: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn guard(&mut self, guard: solana_pubkey::Pubkey) -> &mut Self {
self.guard = Some(guard);
self
}
/// `[optional account, default to 'Sysvar1nstructions1111111111111111111111111']`
#[inline(always)]
pub fn instruction_sysvar_account(
&mut self,
instruction_sysvar_account: solana_program::pubkey::Pubkey,
instruction_sysvar_account: solana_pubkey::Pubkey,
) -> &mut Self {
self.instruction_sysvar_account = Some(instruction_sysvar_account);
self
Expand Down Expand Up @@ -216,7 +210,7 @@ impl ExecuteBuilder {
.expect("extra_metas_account is not set"),
guard: self.guard.expect("guard is not set"),
instruction_sysvar_account: self.instruction_sysvar_account.unwrap_or(
solana_program::pubkey!("Sysvar1nstructions1111111111111111111111111"),
solana_pubkey::pubkey!("Sysvar1nstructions1111111111111111111111111"),
),
};
let args = ExecuteInstructionArgs {
Expand Down
41 changes: 19 additions & 22 deletions packages/renderers-rust/e2e/anchor/src/generated/instructions/initialize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ use borsh::BorshSerialize;
/// Accounts.
#[derive(Debug)]
pub struct Initialize {
pub extra_metas_account: solana_program::pubkey::Pubkey,
pub extra_metas_account: solana_pubkey::Pubkey,

pub guard: solana_program::pubkey::Pubkey,
pub guard: solana_pubkey::Pubkey,

pub mint: solana_program::pubkey::Pubkey,
pub mint: solana_pubkey::Pubkey,

pub transfer_hook_authority: solana_program::pubkey::Pubkey,
pub transfer_hook_authority: solana_pubkey::Pubkey,

pub system_program: solana_program::pubkey::Pubkey,
pub system_program: solana_pubkey::Pubkey,

pub payer: solana_program::pubkey::Pubkey,
pub payer: solana_pubkey::Pubkey,
}

impl Initialize {
Expand Down Expand Up @@ -99,12 +99,12 @@ impl Default for InitializeInstructionData {
/// 5. `[writable, signer]` payer
#[derive(Clone, Debug, Default)]
pub struct InitializeBuilder {
extra_metas_account: Option<solana_program::pubkey::Pubkey>,
guard: Option<solana_program::pubkey::Pubkey>,
mint: Option<solana_program::pubkey::Pubkey>,
transfer_hook_authority: Option<solana_program::pubkey::Pubkey>,
system_program: Option<solana_program::pubkey::Pubkey>,
payer: Option<solana_program::pubkey::Pubkey>,
extra_metas_account: Option<solana_pubkey::Pubkey>,
guard: Option<solana_pubkey::Pubkey>,
mint: Option<solana_pubkey::Pubkey>,
transfer_hook_authority: Option<solana_pubkey::Pubkey>,
system_program: Option<solana_pubkey::Pubkey>,
payer: Option<solana_pubkey::Pubkey>,
__remaining_accounts: Vec<solana_program::instruction::AccountMeta>,
}

Expand All @@ -113,39 +113,36 @@ impl InitializeBuilder {
Self::default()
}
#[inline(always)]
pub fn extra_metas_account(
&mut self,
extra_metas_account: solana_program::pubkey::Pubkey,
) -> &mut Self {
pub fn extra_metas_account(&mut self, extra_metas_account: solana_pubkey::Pubkey) -> &mut Self {
self.extra_metas_account = Some(extra_metas_account);
self
}
#[inline(always)]
pub fn guard(&mut self, guard: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn guard(&mut self, guard: solana_pubkey::Pubkey) -> &mut Self {
self.guard = Some(guard);
self
}
#[inline(always)]
pub fn mint(&mut self, mint: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn mint(&mut self, mint: solana_pubkey::Pubkey) -> &mut Self {
self.mint = Some(mint);
self
}
#[inline(always)]
pub fn transfer_hook_authority(
&mut self,
transfer_hook_authority: solana_program::pubkey::Pubkey,
transfer_hook_authority: solana_pubkey::Pubkey,
) -> &mut Self {
self.transfer_hook_authority = Some(transfer_hook_authority);
self
}
/// `[optional account, default to '11111111111111111111111111111111']`
#[inline(always)]
pub fn system_program(&mut self, system_program: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn system_program(&mut self, system_program: solana_pubkey::Pubkey) -> &mut Self {
self.system_program = Some(system_program);
self
}
#[inline(always)]
pub fn payer(&mut self, payer: solana_program::pubkey::Pubkey) -> &mut Self {
pub fn payer(&mut self, payer: solana_pubkey::Pubkey) -> &mut Self {
self.payer = Some(payer);
self
}
Expand Down Expand Up @@ -180,7 +177,7 @@ impl InitializeBuilder {
.expect("transfer_hook_authority is not set"),
system_program: self
.system_program
.unwrap_or(solana_program::pubkey!("11111111111111111111111111111111")),
.unwrap_or(solana_pubkey::pubkey!("11111111111111111111111111111111")),
payer: self.payer.expect("payer is not set"),
};

Expand Down
Loading