gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename solana-program-sdk to solana-program

Browse Source
This commit is contained in:
Michael Vines
2020-10-23 17:22:10 -07:00
parent 92ce381d60
commit dd711ab5fb
65 changed files with 123 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@@ -4380,7 +4380,7 @@ dependencies = [
]
[[package]]
name = "solana-program-sdk"
name = "solana-program"
version = "1.5.0"
dependencies = [
"assert_matches",
@@ -4595,7 +4595,7 @@ dependencies = [
"solana-frozen-abi",
"solana-frozen-abi-macro",
"solana-logger 1.5.0",
"solana-program-sdk",
"solana-program",
"solana-sdk-macro 1.5.0",
"thiserror",
"tiny-bip39",

54
programs/bpf/Cargo.lock generated
View File

@@ -1833,35 +1833,35 @@ name = "solana-bpf-rust-128bit"
version = "1.5.0"
dependencies = [
"solana-bpf-rust-128bit-dep",
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-128bit-dep"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-alloc"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-call-depth"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-custom-heap"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
@@ -1869,21 +1869,21 @@ name = "solana-bpf-rust-dep-crate"
version = "1.5.0"
dependencies = [
"byteorder 1.3.4",
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-deprecated_loader"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-dup-accounts"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
@@ -1892,7 +1892,7 @@ version = "1.5.0"
dependencies = [
"num-derive 0.2.5",
"num-traits",
"solana-program-sdk",
"solana-program",
"thiserror",
]
@@ -1900,14 +1900,14 @@ dependencies = [
name = "solana-bpf-rust-external-spend"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-instruction-introspection"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
@@ -1915,21 +1915,21 @@ name = "solana-bpf-rust-invoke"
version = "1.5.0"
dependencies = [
"solana-bpf-rust-invoked",
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-invoked"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-iter"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
@@ -1937,28 +1937,28 @@ name = "solana-bpf-rust-many-args"
version = "1.5.0"
dependencies = [
"solana-bpf-rust-many-args-dep",
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-many-args-dep"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-noop"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-panic"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
@@ -1966,14 +1966,14 @@ name = "solana-bpf-rust-param-passing"
version = "1.5.0"
dependencies = [
"solana-bpf-rust-param-passing-dep",
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-param-passing-dep"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
@@ -1982,7 +1982,7 @@ version = "1.5.0"
dependencies = [
"getrandom",
"rand",
"solana-program-sdk",
"solana-program",
]
[[package]]
@@ -1991,28 +1991,28 @@ version = "1.5.0"
dependencies = [
"curve25519-dalek 3.0.0",
"getrandom",
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-sanity"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-sha256"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
name = "solana-bpf-rust-sysval"
version = "1.5.0"
dependencies = [
"solana-program-sdk",
"solana-program",
]
[[package]]
@@ -2111,7 +2111,7 @@ dependencies = [
]
[[package]]
name = "solana-program-sdk"
name = "solana-program"
version = "1.5.0"
dependencies = [
"bincode",
@@ -2231,7 +2231,7 @@ dependencies = [
"solana-frozen-abi",
"solana-frozen-abi-macro",
"solana-logger",
"solana-program-sdk",
"solana-program",
"solana-sdk-macro",
"thiserror",
]

2
programs/bpf/rust/128bit/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "1.5.0" }
[lib]

4
programs/bpf/rust/128bit/src/lib.rs
View File

@@ -1,7 +1,7 @@
//! @brief Example Rust-based BPF program tests loop iteration
extern crate solana_program_sdk;
use solana_program_sdk::entrypoint::SUCCESS;
extern crate solana_program;
use solana_program::entrypoint::SUCCESS;
#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {

2
programs/bpf/rust/128bit_dep/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

2
programs/bpf/rust/128bit_dep/src/lib.rs
View File

@@ -1,6 +1,6 @@
//! @brief Solana Rust-based BPF program utility functions and types
extern crate solana_program_sdk;
extern crate solana_program;
pub fn uadd(x: u128, y: u128) -> u128 {
x + y

2
programs/bpf/rust/alloc/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_alloc"

2
programs/bpf/rust/alloc/src/lib.rs
View File

@@ -2,7 +2,7 @@
#[macro_use]
extern crate alloc;
use solana_program_sdk::{entrypoint::SUCCESS, info};
use solana_program::{entrypoint::SUCCESS, info};
use std::{alloc::Layout, mem};
#[no_mangle]

2
programs/bpf/rust/call_depth/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_call_depth"

2
programs/bpf/rust/call_depth/src/lib.rs
View File

@@ -1,6 +1,6 @@
//! @brief Example Rust-based BPF program that tests call depth and stack usage
use solana_program_sdk::{entrypoint::SUCCESS, info};
use solana_program::{entrypoint::SUCCESS, info};
#[inline(never)]
pub fn recurse(data: &mut [u8]) {

2
programs/bpf/rust/custom_heap/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[features]
default = ["custom-heap"]

2
programs/bpf/rust/custom_heap/src/lib.rs
View File

@@ -1,6 +1,6 @@
//! @brief Example Rust-based BPF that tests out using a custom heap
use solana_program_sdk::{
use solana_program::{
account_info::AccountInfo,
entrypoint,
entrypoint::{ProgramResult, HEAP_LENGTH, HEAP_START_ADDRESS},

2
programs/bpf/rust/dep_crate/Cargo.toml
View File

@@ -10,7 +10,7 @@ edition = "2018"
[dependencies]
byteorder = { version = "1", default-features = false }
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_dep_crate"

4
programs/bpf/rust/dep_crate/src/lib.rs
View File

@@ -1,8 +1,8 @@
//! @brief Example Rust-based BPF program tests dependent crates
extern crate solana_program_sdk;
extern crate solana_program;
use byteorder::{ByteOrder, LittleEndian};
use solana_program_sdk::entrypoint::SUCCESS;
use solana_program::entrypoint::SUCCESS;
#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {

2
programs/bpf/rust/deprecated_loader/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_deprecated_loader"

4
programs/bpf/rust/deprecated_loader/src/lib.rs
View File

@@ -2,8 +2,8 @@
#![allow(unreachable_code)]
extern crate solana_program_sdk;
use solana_program_sdk::{
extern crate solana_program;
use solana_program::{
account_info::AccountInfo, bpf_loader, entrypoint_deprecated,
entrypoint_deprecated::ProgramResult, info, log::*, pubkey::Pubkey,
};

2
programs/bpf/rust/dup_accounts/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_dup_accounts"

4
programs/bpf/rust/dup_accounts/src/lib.rs
View File

@@ -1,7 +1,7 @@
//! @brief Example Rust-based BPF program that tests duplicate accounts passed via accounts
extern crate solana_program_sdk;
use solana_program_sdk::{
extern crate solana_program;
use solana_program::{
account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, info,
program_error::ProgramError, pubkey::Pubkey,
};

2
programs/bpf/rust/error_handling/Cargo.toml
View File

@@ -11,7 +11,7 @@ edition = "2018"
[dependencies]
num-derive = "0.2"
num-traits = "0.2"
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
thiserror = "1.0"
[lib]

4
programs/bpf/rust/error_handling/src/lib.rs
View File

@@ -1,9 +1,9 @@
//! @brief Example Rust-based BPF program that exercises error handling
extern crate solana_program_sdk;
extern crate solana_program;
use num_derive::FromPrimitive;
use num_traits::FromPrimitive;
use solana_program_sdk::{
use solana_program::{
account_info::AccountInfo,
decode_error::DecodeError,
entrypoint,

2
programs/bpf/rust/external_spend/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_external_spend"

4
programs/bpf/rust/external_spend/src/lib.rs
View File

@@ -1,7 +1,7 @@
//! @brief Example Rust-based BPF program that moves a lamport from one account to another
extern crate solana_program_sdk;
use solana_program_sdk::{
extern crate solana_program;
use solana_program::{
account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,
};

2
programs/bpf/rust/instruction_introspection/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_instruction_introspection"

4
programs/bpf/rust/instruction_introspection/src/lib.rs
View File

@@ -1,7 +1,7 @@
//! @brief Example Rust-based BPF program that exercises instruction introspection
extern crate solana_program_sdk;
use solana_program_sdk::{
extern crate solana_program;
use solana_program::{
account_info::next_account_info, account_info::AccountInfo, entrypoint,
entrypoint::ProgramResult, info, program_error::ProgramError, pubkey::Pubkey,
sysvar::instructions,

2
programs/bpf/rust/invoke/Cargo.toml
View File

@@ -10,7 +10,7 @@ edition = "2018"
[dependencies]
solana-bpf-rust-invoked = { path = "../invoked", default-features = false }
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_invoke"

6
programs/bpf/rust/invoke/src/lib.rs
View File

@@ -2,10 +2,10 @@
#![allow(unreachable_code)]
extern crate solana_program_sdk;
extern crate solana_program;
use solana_bpf_rust_invoked::instruction::*;
use solana_program_sdk::{
use solana_program::{
account_info::AccountInfo,
entrypoint,
entrypoint::{ProgramResult, MAX_PERMITTED_DATA_INCREASE},
@@ -52,7 +52,7 @@ fn process_instruction(
let from_lamports = accounts[FROM_INDEX].lamports();
let to_lamports = accounts[DERIVED_KEY1_INDEX].lamports();
assert_eq!(accounts[DERIVED_KEY1_INDEX].data_len(), 0);
assert!(solana_program_sdk::system_program::check_id(
assert!(solana_program::system_program::check_id(
accounts[DERIVED_KEY1_INDEX].owner
));

2
programs/bpf/rust/invoked/Cargo.toml
View File

@@ -11,7 +11,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[features]
default = ["program"]

2
programs/bpf/rust/invoked/src/instruction.rs
View File

@@ -1,6 +1,6 @@
//! @brief Example Rust-based BPF program that issues a cross-program-invocation
use solana_program_sdk::{
use solana_program::{
instruction::{AccountMeta, Instruction},
pubkey::Pubkey,
};

2
programs/bpf/rust/invoked/src/processor.rs
View File

@@ -3,7 +3,7 @@
#![cfg(feature = "program")]
use crate::instruction::*;
use solana_program_sdk::{
use solana_program::{
account_info::AccountInfo,
bpf_loader, entrypoint,
entrypoint::ProgramResult,

2
programs/bpf/rust/iter/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_iter"

4
programs/bpf/rust/iter/src/lib.rs
View File

@@ -1,7 +1,7 @@
//! @brief Example Rust-based BPF program tests loop iteration
extern crate solana_program_sdk;
use solana_program_sdk::{entrypoint::SUCCESS, info};
extern crate solana_program;
use solana_program::{entrypoint::SUCCESS, info};
#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {

2
programs/bpf/rust/many_args/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "1.5.0" }
[lib]

4
programs/bpf/rust/many_args/src/helper.rs
View File

@@ -1,7 +1,7 @@
//! @brief Example Rust-based BPF program tests loop iteration
extern crate solana_program_sdk;
use solana_program_sdk::log::*;
extern crate solana_program;
use solana_program::log::*;
pub fn many_args(
arg1: u64,

4
programs/bpf/rust/many_args/src/lib.rs
View File

@@ -1,8 +1,8 @@
//! @brief Example Rust-based BPF program tests loop iteration
mod helper;
extern crate solana_program_sdk;
use solana_program_sdk::{entrypoint::SUCCESS, info};
extern crate solana_program;
use solana_program::{entrypoint::SUCCESS, info};
#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {

2
programs/bpf/rust/many_args_dep/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

4
programs/bpf/rust/many_args_dep/src/lib.rs
View File

@@ -1,7 +1,7 @@
//! @brief Solana Rust-based BPF program utility functions and types
extern crate solana_program_sdk;
use solana_program_sdk::info;
extern crate solana_program;
use solana_program::info;
pub fn many_args(
arg1: u64,

2
programs/bpf/rust/noop/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_noop"

4
programs/bpf/rust/noop/src/lib.rs
View File

@@ -1,7 +1,7 @@
//! @brief Example Rust-based BPF noop program
extern crate solana_program_sdk;
use solana_program_sdk::{
extern crate solana_program;
use solana_program::{
account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, pubkey::Pubkey,
};

2
programs/bpf/rust/panic/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_panic"

2
programs/bpf/rust/panic/src/lib.rs
View File

@@ -1,6 +1,6 @@
//! @brief Example Rust-based BPF program that panics
extern crate solana_program_sdk;
extern crate solana_program;
#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {

2
programs/bpf/rust/param_passing/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "1.5.0" }
[lib]

4
programs/bpf/rust/param_passing/src/lib.rs
View File

@@ -1,8 +1,8 @@
//! @brief Example Rust-based BPF program tests loop iteration
extern crate solana_program_sdk;
extern crate solana_program;
use solana_bpf_rust_param_passing_dep::{Data, TestDep};
use solana_program_sdk::{entrypoint::SUCCESS, info};
use solana_program::{entrypoint::SUCCESS, info};
#[no_mangle]
pub extern "C" fn entrypoint(_input: *mut u8) -> u64 {

2
programs/bpf/rust/param_passing_dep/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]

2
programs/bpf/rust/param_passing_dep/src/lib.rs
View File

@@ -1,6 +1,6 @@
//! @brief Example Rust-based BPF program tests loop iteration
extern crate solana_program_sdk;
extern crate solana_program;
#[derive(Debug)]
pub struct Data<'a> {

2
programs/bpf/rust/rand/Cargo.toml
View File

@@ -11,7 +11,7 @@ edition = "2018"
[dependencies]
getrandom = { version = "0.1.14", features = ["dummy"] }
rand = "0.7"
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_rand"

4
programs/bpf/rust/rand/src/lib.rs
View File

@@ -2,8 +2,8 @@
#![allow(unreachable_code)]
extern crate solana_program_sdk;
use solana_program_sdk::{
extern crate solana_program;
use solana_program::{
account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, info, pubkey::Pubkey,
};

2
programs/bpf/rust/ristretto/Cargo.toml
View File

@@ -11,7 +11,7 @@ edition = "2018"
[dependencies]
curve25519-dalek = "3"
getrandom = { version = "0.1.14", features = ["dummy"] }
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_ristretto"

2
programs/bpf/rust/ristretto/src/lib.rs
View File

@@ -4,7 +4,7 @@ pub mod ristretto;
use crate::ristretto::ristretto_mul;
use curve25519_dalek::{constants::RISTRETTO_BASEPOINT_POINT, scalar::Scalar};
use solana_program_sdk::{
use solana_program::{
account_info::AccountInfo, entrypoint, entrypoint::ProgramResult, info, pubkey::Pubkey,
};

4
programs/bpf/rust/ristretto/src/ristretto.rs
View File

@@ -1,5 +1,5 @@
use curve25519_dalek::{ristretto::RistrettoPoint, scalar::Scalar};
use solana_program_sdk::program_error::ProgramError;
use solana_program::program_error::ProgramError;
/// Multiply a ristretto point with a scalar
///
@@ -37,7 +37,7 @@ pub fn ristretto_mul(
)
};
match status {
solana_program_sdk::entrypoint::SUCCESS => Ok(result),
solana_program::entrypoint::SUCCESS => Ok(result),
_ => Err(status.into()),
}
}

2
programs/bpf/rust/sanity/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_sanity"

4
programs/bpf/rust/sanity/src/lib.rs
View File

@@ -2,8 +2,8 @@
#![allow(unreachable_code)]
extern crate solana_program_sdk;
use solana_program_sdk::{
extern crate solana_program;
use solana_program::{
account_info::AccountInfo, bpf_loader, entrypoint, entrypoint::ProgramResult, info, log::*,
pubkey::Pubkey,
};

2
programs/bpf/rust/sha256/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_sha256"

4
programs/bpf/rust/sha256/src/lib.rs
View File

@@ -1,7 +1,7 @@
//! @brief SHA256 Syscall test
extern crate solana_program_sdk;
use solana_program_sdk::{
extern crate solana_program;
use solana_program::{
hash::{hashv, Hasher},
info,
};

2
programs/bpf/rust/sysval/Cargo.toml
View File

@@ -9,7 +9,7 @@ homepage = "https://solana.com/"
edition = "2018"
[dependencies]
solana-program-sdk = { path = "../../../../sdk/program", version = "1.5.0" }
solana-program = { path = "../../../../sdk/program", version = "1.5.0" }
[lib]
name = "solana_bpf_rust_sysval"

4
programs/bpf/rust/sysval/src/lib.rs
View File

@@ -1,7 +1,7 @@
//! @brief Example Rust-based BPF program that tests sysval use
extern crate solana_program_sdk;
use solana_program_sdk::{
extern crate solana_program;
use solana_program::{
account_info::AccountInfo,
clock::DEFAULT_SLOTS_PER_EPOCH,
entrypoint,

4
sdk/Cargo.toml
View File

@@ -11,7 +11,7 @@ edition = "2018"
[features]
# "program" feature is a legacy feature retained to support v1.3 and older
# programs. New development should not use this feature. Instead use the
# solana-program-sdk crate
# solana-program crate
program = []
# "everything" includes functionality that is not compatible or needed for on-chain programs
@@ -65,7 +65,7 @@ solana-crate-features = { path = "../crate-features", version = "1.5.0", optiona
solana-logger = { path = "../logger", version = "1.5.0", optional = true }
solana-frozen-abi = { path = "../frozen-abi", version = "1.5.0" }
solana-frozen-abi-macro = { path = "../frozen-abi/macro", version = "1.5.0" }
solana-program-sdk = { path = "program", version = "1.5.0" }
solana-program = { path = "program", version = "1.5.0" }
solana-sdk-macro = { path = "macro", version = "1.5.0" }
rustversion = "1.0.3"
libsecp256k1 = { version = "0.3.5", optional = true }

10
sdk/macro/src/lib.rs
View File

@@ -81,17 +81,13 @@ struct ProgramSdkId(proc_macro2::TokenStream);
impl Parse for ProgramSdkId {
fn parse(input: ParseStream) -> Result<Self> {
parse_id(input, quote! { ::solana_program_sdk::pubkey::Pubkey }).map(Self)
parse_id(input, quote! { ::solana_program::pubkey::Pubkey }).map(Self)
}
}
impl ToTokens for ProgramSdkId {
fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
id_to_tokens(
&self.0,
quote! { ::solana_program_sdk::pubkey::Pubkey },
tokens,
)
id_to_tokens(&self.0, quote! { ::solana_program::pubkey::Pubkey }, tokens)
}
}
@@ -168,7 +164,7 @@ pub fn declare_id(input: TokenStream) -> TokenStream {
}
#[proc_macro]
pub fn program_sdk_declare_id(input: TokenStream) -> TokenStream {
pub fn program_declare_id(input: TokenStream) -> TokenStream {
let id = parse_macro_input!(input as ProgramSdkId);
TokenStream::from(quote! {#id})
}

4
sdk/program/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "solana-program-sdk"
name = "solana-program"
version = "1.5.0"
description = "Solana Program SDK"
description = "Solana Program"
authors = ["Solana Maintainers <maintainers@solana.foundation>"]
repository = "https://github.com/solana-labs/solana"
homepage = "https://solana.com/"

10
sdk/program/src/lib.rs
View File

@@ -1,8 +1,8 @@
#![cfg_attr(RUSTC_WITH_SPECIALIZATION, feature(specialization))]
#![cfg_attr(RUSTC_NEEDS_PROC_MACRO_HYGIENE, feature(proc_macro_hygiene))]
// Allows macro expansion of `use ::solana_program_sdk::*` to work within this crate
extern crate self as solana_program_sdk;
// Allows macro expansion of `use ::solana_program::*` to work within this crate
extern crate self as solana_program;
pub mod account;
pub mod account_info;
@@ -51,10 +51,10 @@ pub mod sysvar;
/// # // wrapper is used so that the macro invocation occurs in the item position
/// # // rather than in the statement position which isn't allowed.
/// use std::str::FromStr;
/// use solana_program_sdk::{declare_id, pubkey::Pubkey};
/// use solana_program::{declare_id, pubkey::Pubkey};
///
/// # mod item_wrapper {
/// # use solana_program_sdk::declare_id;
/// # use solana_program::declare_id;
/// declare_id!("My11111111111111111111111111111111111111111");
/// # }
/// # use item_wrapper::id;
@@ -62,7 +62,7 @@ pub mod sysvar;
/// let my_id = Pubkey::from_str("My11111111111111111111111111111111111111111").unwrap();
/// assert_eq!(id(), my_id);
/// ```
pub use solana_sdk_macro::program_sdk_declare_id as declare_id;
pub use solana_sdk_macro::program_declare_id as declare_id;
#[macro_use]
extern crate serde_derive;

4
sdk/src/entrypoint.rs
View File

@@ -1,9 +1,9 @@
pub use solana_program_sdk::entrypoint::*;
pub use solana_program::entrypoint::*;
#[macro_export]
#[deprecated(
since = "1.4.3",
note = "use solana_program_sdk::entrypoint::entrypoint instead"
note = "use solana_program::entrypoint::entrypoint instead"
)]
macro_rules! entrypoint {
($process_instruction:ident) => {

4
sdk/src/entrypoint_deprecated.rs
View File

@@ -1,9 +1,9 @@
pub use solana_program_sdk::entrypoint_deprecated::*;
pub use solana_program::entrypoint_deprecated::*;
#[macro_export]
#[deprecated(
since = "1.4.3",
note = "use solana_program_sdk::entrypoint::entrypoint instead"
note = "use solana_program::entrypoint::entrypoint instead"
)]
macro_rules! entrypoint_deprecated {
($process_instruction:ident) => {

2
sdk/src/hash.rs
View File

@@ -1,4 +1,4 @@
pub use solana_program_sdk::hash::*;
pub use solana_program::hash::*;
/// random hash value for tests and benchmarks.
#[cfg(feature = "everything")]

2
sdk/src/lib.rs
View File

@@ -4,7 +4,7 @@
// Allows macro expansion of `use ::solana_sdk::*` to work within this crate
extern crate self as solana_sdk;
pub use solana_program_sdk::*;
pub use solana_program::*;
pub mod builtins;
pub mod client;

4
sdk/src/log.rs
View File

@@ -1,9 +1,9 @@
#![cfg(feature = "program")]
pub use solana_program_sdk::log::*;
pub use solana_program::log::*;
#[macro_export]
#[deprecated(since = "1.4.3", note = "solana_program_sdk::log::info instead")]
#[deprecated(since = "1.4.3", note = "solana_program::log::info instead")]
macro_rules! info {
($msg:expr) => {
$crate::log::sol_log($msg)

2
sdk/src/pubkey.rs
View File

@@ -1,4 +1,4 @@
pub use solana_program_sdk::pubkey::*;
pub use solana_program::pubkey::*;
/// New random Pubkey for tests and benchmarks.
#[cfg(feature = "everything")]