Skip to content

Commit a64281a

Browse files
jamie-osecdeanmlittle
authored andcommitted
Use solana-invoke insteam of solana_cpi::invoke
Co-authored-by: deanmlittle <dean@bitping.com>
1 parent 8dff73e commit a64281a

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

Cargo.lock

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lang/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ solana-define-syscall = "2"
6363
solana-feature-gate-interface = "2"
6464
solana-instruction = "2"
6565
solana-instructions-sysvar = "2"
66+
solana-invoke = "0.4.0"
6667
solana-loader-v3-interface = { version = "3", features = ["bincode"] }
6768
solana-msg = "2"
6869
solana-program-entrypoint = "2"

lang/src/lib.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ pub mod solana_program {
6767
pub use solana_feature_gate_interface as feature;
6868

6969
pub use {
70-
solana_account_info as account_info, solana_clock as clock, solana_cpi as program,
71-
solana_msg::msg, solana_program_entrypoint as entrypoint,
72-
solana_program_entrypoint::entrypoint, solana_program_error as program_error,
73-
solana_program_memory as program_memory, solana_program_option as program_option,
74-
solana_program_pack as program_pack, solana_pubkey as pubkey,
75-
solana_sdk_ids::system_program, solana_system_interface::instruction as system_instruction,
70+
solana_account_info as account_info, solana_clock as clock, solana_msg::msg,
71+
solana_program_entrypoint as entrypoint, solana_program_entrypoint::entrypoint,
72+
solana_program_error as program_error, solana_program_memory as program_memory,
73+
solana_program_option as program_option, solana_program_pack as program_pack,
74+
solana_pubkey as pubkey, solana_sdk_ids::system_program,
75+
solana_system_interface::instruction as system_instruction,
7676
};
7777
pub mod instruction {
7878
pub use solana_instruction::*;
@@ -94,6 +94,10 @@ pub mod solana_program {
9494
pub mod rent {
9595
pub use solana_sysvar::rent::*;
9696
}
97+
pub mod program {
98+
pub use solana_cpi::*;
99+
pub use solana_invoke::{invoke, invoke_signed, invoke_signed_unchecked, invoke_unchecked};
100+
}
97101

98102
pub mod bpf_loader_upgradeable {
99103
#[allow(deprecated)]

0 commit comments

Comments
 (0)