Skip to content

Use solana-define-syscall crate #262

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

Draft
wants to merge 1 commit into
base: febo/remove-log-module
Choose a base branch
from
Draft

Use solana-define-syscall crate #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Cargo.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ quote = "1.0"
regex = "1"
solana-account-view = { version = "0.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
solana-address = { version = "1.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
solana-define-syscall = { version = "3.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
solana-instruction-view = { version = "0.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
solana-program-error = { version = "3.0.0", git = "https://github.com/febo/solana-sdk.git", branch = "solana-instruction-view" }
syn = "1.0"
Expand Down
3 changes: 3 additions & 0 deletions sdk/pinocchio/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,8 @@ solana-address = { workspace = true, features = ["syscalls"] }
solana-instruction-view = { workspace = true, features = ["cpi"], optional = true }
solana-program-error = { workspace = true }

[target.'cfg(target_os = "solana")'.dependencies]
solana-define-syscall = { workspace = true }

[dev-dependencies]
five8_const = { workspace = true }
5 changes: 4 additions & 1 deletion sdk/pinocchio/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@
extern crate std;

pub mod entrypoint;
pub mod syscalls;
pub mod sysvars;

#[deprecated(since = "0.7.0", note = "Use the `entrypoint` module instead")]
Expand All @@ -227,6 +226,10 @@ pub use solana_account_view as account;
pub use solana_address as address;
pub use solana_address::Address;

// Re-export the `solana_define_syscall` for downstream use.
#[cfg(target_os = "solana")]
pub use solana_define_syscall::definitions as syscalls;

// Re-export the `solana_instruction_view` for downstream use.
#[cfg(feature = "cpi")]
pub use {solana_instruction_view as instruction, solana_instruction_view::cpi};
Expand Down
128 changes: 0 additions & 128 deletions sdk/pinocchio/src/syscalls.rs
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions sdk/pinocchio/src/sysvars/clock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
//! Information about the network's clock, ticks, slots, etc.

#![allow(deprecated)]

use crate::{
account::{AccountView, Ref},
error::ProgramError,
Expand Down
2 changes: 2 additions & 0 deletions sdk/pinocchio/src/sysvars/rent.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
//!
//! This is required for the rent sysvar implementation.

#![allow(deprecated)]

use crate::{
account::{AccountView, Ref},
error::ProgramError,
Expand Down