Skip to content

refactor(renderers-rust): extract solana-cpi, solana-msg and cleanup #654

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
Jun 20, 2025
Merged

refactor(renderers-rust): extract solana-cpi, solana-msg and cleanup #654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44d3a1a
refactor: extract solana-cpi, solana-msg and cleanup
sonicfromnewyoke Jun 17, 2025
aaa57c2
fix: linter error in tests due to the line len
sonicfromnewyoke Jun 17, 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
5 changes: 5 additions & 0 deletions .changeset/nasty-cars-smile.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@codama/renderers-rust': minor
---

extract solana-cpi, solana-msg and cleanup
4 changes: 3 additions & 1 deletion packages/renderers-rust/e2e/anchor/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 6 additions & 4 deletions packages/renderers-rust/e2e/anchor/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ num-traits = "^0.2"
serde = { version = "^1.0", features = ["derive"], optional = true }
serde_with = { version = "^3.0", optional = true }
solana-account-info = "2.2.1"
solana-program = "2.2.1"
solana-client = { version = "~1.18", optional = true }
solana-cpi = "2.2.1"
solana-decode-error = "2.2.1"
solana-instruction = "2.2.1"
solana-msg = "2.2.1"
solana-program-entrypoint = "2.2.1"
solana-program-error = "2.2.1"
solana-instruction = "2.2.1"
solana-pubkey = { version = "2.2.1", features = ["curve25519"] }
solana-client = { version = "~1.18", optional = true }
solana-pubkey = { version = "2.2.1", features = ["curve25519", "borsh"] }
solana-sdk = { version = "~1.18", optional = true }
thiserror = "^1.0"

Expand Down
4 changes: 2 additions & 2 deletions packages/renderers-rust/e2e/anchor/src/generated/errors/wen_transfer_guard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ pub enum WenTransferGuardError {

impl solana_program_error::PrintProgramError for WenTransferGuardError {
fn print<E>(&self) {
solana_program::msg!(&self.to_string());
solana_msg::msg!(&self.to_string());
}
}

impl<T> solana_program::decode_error::DecodeError<T> for WenTransferGuardError {
impl<T> solana_decode_error::DecodeError<T> for WenTransferGuardError {
fn type_of() -> &'static str {
"WenTransferGuardError"
}
Expand Down
4 changes: 2 additions & 2 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 @@ -420,9 +420,9 @@ impl<'a, 'b> CreateGuardCpi<'a, 'b> {
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));

if signers_seeds.is_empty() {
solana_program::program::invoke(&instruction, &account_infos)
solana_cpi::invoke(&instruction, &account_infos)
} else {
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
}
}
}
Expand Down
4 changes: 2 additions & 2 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 @@ -357,9 +357,9 @@ impl<'a, 'b> ExecuteCpi<'a, 'b> {
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));

if signers_seeds.is_empty() {
solana_program::program::invoke(&instruction, &account_infos)
solana_cpi::invoke(&instruction, &account_infos)
} else {
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
}
}
}
Expand Down
4 changes: 2 additions & 2 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 @@ -303,9 +303,9 @@ impl<'a, 'b> InitializeCpi<'a, 'b> {
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));

if signers_seeds.is_empty() {
solana_program::program::invoke(&instruction, &account_infos)
solana_cpi::invoke(&instruction, &account_infos)
} else {
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/renderers-rust/e2e/anchor/src/generated/instructions/update_guard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,9 @@ impl<'a, 'b> UpdateGuardCpi<'a, 'b> {
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));

if signers_seeds.is_empty() {
solana_program::program::invoke(&instruction, &account_infos)
solana_cpi::invoke(&instruction, &account_infos)
} else {
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/renderers-rust/e2e/dummy/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions packages/renderers-rust/e2e/dummy/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@ kaigan = "0.2.5"
num-derive = "^0.3"
num-traits = "^0.2"
serde = { version = "^1.0", features = ["derive"], optional = true }
serde-big-array = { version = "^0.5", optional = true }
serde_with = { version = "^3.0", optional = true }
solana-account-info = "2.2.1"
solana-program = "2.2.1"
solana-cpi = "2.2.1"
solana-decode-error = "2.2.1"
solana-instruction = "2.2.1"
solana-msg = "2.2.1"
solana-program-entrypoint = "2.2.1"
solana-program-error = "2.2.1"
solana-instruction = "2.2.1"
solana-pubkey = { version = "2.2.1", features = ["curve25519"] }
serde-big-array = { version = "^0.5", optional = true }
thiserror = "^1.0"

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction1.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ impl<'a, 'b> Instruction1Cpi<'a, 'b> {
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));

if signers_seeds.is_empty() {
solana_program::program::invoke(&instruction, &account_infos)
solana_cpi::invoke(&instruction, &account_infos)
} else {
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,9 @@ impl<'a, 'b> Instruction2Cpi<'a, 'b> {
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));

if signers_seeds.is_empty() {
solana_program::program::invoke(&instruction, &account_infos)
solana_cpi::invoke(&instruction, &account_infos)
} else {
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ impl<'a, 'b> Instruction3Cpi<'a, 'b> {
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));

if signers_seeds.is_empty() {
solana_program::program::invoke(&instruction, &account_infos)
solana_cpi::invoke(&instruction, &account_infos)
} else {
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction4.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,9 @@ impl<'a, 'b> Instruction4Cpi<'a, 'b> {
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));

if signers_seeds.is_empty() {
solana_program::program::invoke(&instruction, &account_infos)
solana_cpi::invoke(&instruction, &account_infos)
} else {
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction5.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,9 @@ impl<'a, 'b> Instruction5Cpi<'a, 'b> {
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));

if signers_seeds.is_empty() {
solana_program::program::invoke(&instruction, &account_infos)
solana_cpi::invoke(&instruction, &account_infos)
} else {
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction6.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ impl<'a, 'b> Instruction6Cpi<'a, 'b> {
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));

if signers_seeds.is_empty() {
solana_program::program::invoke(&instruction, &account_infos)
solana_cpi::invoke(&instruction, &account_infos)
} else {
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/renderers-rust/e2e/dummy/src/generated/instructions/instruction7.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,9 @@ impl<'a, 'b> Instruction7Cpi<'a, 'b> {
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));

if signers_seeds.is_empty() {
solana_program::program::invoke(&instruction, &account_infos)
solana_cpi::invoke(&instruction, &account_infos)
} else {
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion packages/renderers-rust/e2e/memo/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions packages/renderers-rust/e2e/memo/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@ kaigan = "0.2.5"
num-derive = "^0.3"
num-traits = "^0.2"
serde = { version = "^1.0", features = ["derive"], optional = true }
serde-big-array = { version = "^0.5", optional = true }
serde_with = { version = "^3.0", optional = true }
solana-account-info = "2.2.1"
solana-program = "2.2.1"
solana-cpi = "2.2.1"
solana-decode-error = "2.2.1"
solana-instruction = "2.2.1"
solana-msg = "2.2.1"
solana-program-entrypoint = "2.2.1"
solana-program-error = "2.2.1"
solana-instruction = "2.2.1"
solana-pubkey = { version = "2.2.1", features = ["curve25519"] }
serde-big-array = { version = "^0.5", optional = true }
thiserror = "^1.0"

[dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions packages/renderers-rust/e2e/memo/src/generated/instructions/add_memo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ impl<'a, 'b> AddMemoCpi<'a, 'b> {
.for_each(|remaining_account| account_infos.push(remaining_account.0.clone()));

if signers_seeds.is_empty() {
solana_program::program::invoke(&instruction, &account_infos)
solana_cpi::invoke(&instruction, &account_infos)
} else {
solana_program::program::invoke_signed(&instruction, &account_infos, signers_seeds)
solana_cpi::invoke_signed(&instruction, &account_infos, signers_seeds)
}
}
}
Expand Down
Loading