From dd711ab5fbf96c1efcfdf9488397e8af2568182a Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 23 Oct 2020 17:22:10 -0700 Subject: [PATCH] Rename solana-program-sdk to solana-program --- Cargo.lock | 4 +- programs/bpf/Cargo.lock | 54 +++++++++---------- programs/bpf/rust/128bit/Cargo.toml | 2 +- programs/bpf/rust/128bit/src/lib.rs | 4 +- programs/bpf/rust/128bit_dep/Cargo.toml | 2 +- programs/bpf/rust/128bit_dep/src/lib.rs | 2 +- programs/bpf/rust/alloc/Cargo.toml | 2 +- programs/bpf/rust/alloc/src/lib.rs | 2 +- programs/bpf/rust/call_depth/Cargo.toml | 2 +- programs/bpf/rust/call_depth/src/lib.rs | 2 +- programs/bpf/rust/custom_heap/Cargo.toml | 2 +- programs/bpf/rust/custom_heap/src/lib.rs | 2 +- programs/bpf/rust/dep_crate/Cargo.toml | 2 +- programs/bpf/rust/dep_crate/src/lib.rs | 4 +- .../bpf/rust/deprecated_loader/Cargo.toml | 2 +- .../bpf/rust/deprecated_loader/src/lib.rs | 4 +- programs/bpf/rust/dup_accounts/Cargo.toml | 2 +- programs/bpf/rust/dup_accounts/src/lib.rs | 4 +- programs/bpf/rust/error_handling/Cargo.toml | 2 +- programs/bpf/rust/error_handling/src/lib.rs | 4 +- programs/bpf/rust/external_spend/Cargo.toml | 2 +- programs/bpf/rust/external_spend/src/lib.rs | 4 +- .../rust/instruction_introspection/Cargo.toml | 2 +- .../rust/instruction_introspection/src/lib.rs | 4 +- programs/bpf/rust/invoke/Cargo.toml | 2 +- programs/bpf/rust/invoke/src/lib.rs | 6 +-- programs/bpf/rust/invoked/Cargo.toml | 2 +- programs/bpf/rust/invoked/src/instruction.rs | 2 +- programs/bpf/rust/invoked/src/processor.rs | 2 +- programs/bpf/rust/iter/Cargo.toml | 2 +- programs/bpf/rust/iter/src/lib.rs | 4 +- programs/bpf/rust/many_args/Cargo.toml | 2 +- programs/bpf/rust/many_args/src/helper.rs | 4 +- programs/bpf/rust/many_args/src/lib.rs | 4 +- programs/bpf/rust/many_args_dep/Cargo.toml | 2 +- programs/bpf/rust/many_args_dep/src/lib.rs | 4 +- programs/bpf/rust/noop/Cargo.toml | 2 +- programs/bpf/rust/noop/src/lib.rs | 4 +- programs/bpf/rust/panic/Cargo.toml | 2 +- programs/bpf/rust/panic/src/lib.rs | 2 +- programs/bpf/rust/param_passing/Cargo.toml | 2 +- programs/bpf/rust/param_passing/src/lib.rs | 4 +- .../bpf/rust/param_passing_dep/Cargo.toml | 2 +- .../bpf/rust/param_passing_dep/src/lib.rs | 2 +- programs/bpf/rust/rand/Cargo.toml | 2 +- programs/bpf/rust/rand/src/lib.rs | 4 +- programs/bpf/rust/ristretto/Cargo.toml | 2 +- programs/bpf/rust/ristretto/src/lib.rs | 2 +- programs/bpf/rust/ristretto/src/ristretto.rs | 4 +- programs/bpf/rust/sanity/Cargo.toml | 2 +- programs/bpf/rust/sanity/src/lib.rs | 4 +- programs/bpf/rust/sha256/Cargo.toml | 2 +- programs/bpf/rust/sha256/src/lib.rs | 4 +- programs/bpf/rust/sysval/Cargo.toml | 2 +- programs/bpf/rust/sysval/src/lib.rs | 4 +- sdk/Cargo.toml | 4 +- sdk/macro/src/lib.rs | 10 ++-- sdk/program/Cargo.toml | 4 +- sdk/program/src/lib.rs | 10 ++-- sdk/src/entrypoint.rs | 4 +- sdk/src/entrypoint_deprecated.rs | 4 +- sdk/src/hash.rs | 2 +- sdk/src/lib.rs | 2 +- sdk/src/log.rs | 4 +- sdk/src/pubkey.rs | 2 +- 65 files changed, 123 insertions(+), 127 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 560922aa2823f4..ec1331eb7e5084 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 41de4941133cea..93fc4c8409f5b5 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -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", ] diff --git a/programs/bpf/rust/128bit/Cargo.toml b/programs/bpf/rust/128bit/Cargo.toml index 4428a58c6bb828..9343e0c398a792 100644 --- a/programs/bpf/rust/128bit/Cargo.toml +++ b/programs/bpf/rust/128bit/Cargo.toml @@ -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] diff --git a/programs/bpf/rust/128bit/src/lib.rs b/programs/bpf/rust/128bit/src/lib.rs index d3ab6c62d55a91..e034b33ecea003 100644 --- a/programs/bpf/rust/128bit/src/lib.rs +++ b/programs/bpf/rust/128bit/src/lib.rs @@ -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 { diff --git a/programs/bpf/rust/128bit_dep/Cargo.toml b/programs/bpf/rust/128bit_dep/Cargo.toml index 4df793485330d7..0fd449d38f198d 100644 --- a/programs/bpf/rust/128bit_dep/Cargo.toml +++ b/programs/bpf/rust/128bit_dep/Cargo.toml @@ -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"] diff --git a/programs/bpf/rust/128bit_dep/src/lib.rs b/programs/bpf/rust/128bit_dep/src/lib.rs index fcd5a842053591..75da6b3f5ea839 100644 --- a/programs/bpf/rust/128bit_dep/src/lib.rs +++ b/programs/bpf/rust/128bit_dep/src/lib.rs @@ -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 diff --git a/programs/bpf/rust/alloc/Cargo.toml b/programs/bpf/rust/alloc/Cargo.toml index a27b020329fbec..62a6eadd211937 100644 --- a/programs/bpf/rust/alloc/Cargo.toml +++ b/programs/bpf/rust/alloc/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/alloc/src/lib.rs b/programs/bpf/rust/alloc/src/lib.rs index e84e5c6ff996eb..7232f57eef7ce1 100644 --- a/programs/bpf/rust/alloc/src/lib.rs +++ b/programs/bpf/rust/alloc/src/lib.rs @@ -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] diff --git a/programs/bpf/rust/call_depth/Cargo.toml b/programs/bpf/rust/call_depth/Cargo.toml index dc4bd3dec5216c..0b7871db50a26c 100644 --- a/programs/bpf/rust/call_depth/Cargo.toml +++ b/programs/bpf/rust/call_depth/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/call_depth/src/lib.rs b/programs/bpf/rust/call_depth/src/lib.rs index fcb820c7249625..89ed09198a2cc2 100644 --- a/programs/bpf/rust/call_depth/src/lib.rs +++ b/programs/bpf/rust/call_depth/src/lib.rs @@ -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]) { diff --git a/programs/bpf/rust/custom_heap/Cargo.toml b/programs/bpf/rust/custom_heap/Cargo.toml index 71b0789a4ac615..31122b75181ac0 100644 --- a/programs/bpf/rust/custom_heap/Cargo.toml +++ b/programs/bpf/rust/custom_heap/Cargo.toml @@ -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"] diff --git a/programs/bpf/rust/custom_heap/src/lib.rs b/programs/bpf/rust/custom_heap/src/lib.rs index d8ddc7db5352b3..8f927db7748d08 100644 --- a/programs/bpf/rust/custom_heap/src/lib.rs +++ b/programs/bpf/rust/custom_heap/src/lib.rs @@ -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}, diff --git a/programs/bpf/rust/dep_crate/Cargo.toml b/programs/bpf/rust/dep_crate/Cargo.toml index 2fc20c2f15eed0..1e40624dbb0995 100644 --- a/programs/bpf/rust/dep_crate/Cargo.toml +++ b/programs/bpf/rust/dep_crate/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/dep_crate/src/lib.rs b/programs/bpf/rust/dep_crate/src/lib.rs index 336962706b89e0..12951fe808503c 100644 --- a/programs/bpf/rust/dep_crate/src/lib.rs +++ b/programs/bpf/rust/dep_crate/src/lib.rs @@ -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 { diff --git a/programs/bpf/rust/deprecated_loader/Cargo.toml b/programs/bpf/rust/deprecated_loader/Cargo.toml index a7dc15a6d26d72..ba94ecb3b8cc99 100644 --- a/programs/bpf/rust/deprecated_loader/Cargo.toml +++ b/programs/bpf/rust/deprecated_loader/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/deprecated_loader/src/lib.rs b/programs/bpf/rust/deprecated_loader/src/lib.rs index 43b398c38df004..1c086133abe264 100644 --- a/programs/bpf/rust/deprecated_loader/src/lib.rs +++ b/programs/bpf/rust/deprecated_loader/src/lib.rs @@ -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, }; diff --git a/programs/bpf/rust/dup_accounts/Cargo.toml b/programs/bpf/rust/dup_accounts/Cargo.toml index 75e32da9160893..6a30ac2ad090de 100644 --- a/programs/bpf/rust/dup_accounts/Cargo.toml +++ b/programs/bpf/rust/dup_accounts/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/dup_accounts/src/lib.rs b/programs/bpf/rust/dup_accounts/src/lib.rs index 5d1c6a52baff2d..40e38072b1b268 100644 --- a/programs/bpf/rust/dup_accounts/src/lib.rs +++ b/programs/bpf/rust/dup_accounts/src/lib.rs @@ -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, }; diff --git a/programs/bpf/rust/error_handling/Cargo.toml b/programs/bpf/rust/error_handling/Cargo.toml index 69627234879c56..31e5ad2eaf74fa 100644 --- a/programs/bpf/rust/error_handling/Cargo.toml +++ b/programs/bpf/rust/error_handling/Cargo.toml @@ -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] diff --git a/programs/bpf/rust/error_handling/src/lib.rs b/programs/bpf/rust/error_handling/src/lib.rs index d9034773d275f9..ca6ed2ca6ab274 100644 --- a/programs/bpf/rust/error_handling/src/lib.rs +++ b/programs/bpf/rust/error_handling/src/lib.rs @@ -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, diff --git a/programs/bpf/rust/external_spend/Cargo.toml b/programs/bpf/rust/external_spend/Cargo.toml index e50e178e54dda9..f40f5a516ca793 100644 --- a/programs/bpf/rust/external_spend/Cargo.toml +++ b/programs/bpf/rust/external_spend/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/external_spend/src/lib.rs b/programs/bpf/rust/external_spend/src/lib.rs index 16f80b7f979bc3..ecc33da259c014 100644 --- a/programs/bpf/rust/external_spend/src/lib.rs +++ b/programs/bpf/rust/external_spend/src/lib.rs @@ -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, }; diff --git a/programs/bpf/rust/instruction_introspection/Cargo.toml b/programs/bpf/rust/instruction_introspection/Cargo.toml index 2be74b364a9b3d..d4be3804e9ce19 100644 --- a/programs/bpf/rust/instruction_introspection/Cargo.toml +++ b/programs/bpf/rust/instruction_introspection/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/instruction_introspection/src/lib.rs b/programs/bpf/rust/instruction_introspection/src/lib.rs index bdf51c330b6f09..f5935f4b9bf3d8 100644 --- a/programs/bpf/rust/instruction_introspection/src/lib.rs +++ b/programs/bpf/rust/instruction_introspection/src/lib.rs @@ -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, diff --git a/programs/bpf/rust/invoke/Cargo.toml b/programs/bpf/rust/invoke/Cargo.toml index de2db9224ada61..dbe447ab53664e 100644 --- a/programs/bpf/rust/invoke/Cargo.toml +++ b/programs/bpf/rust/invoke/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/invoke/src/lib.rs b/programs/bpf/rust/invoke/src/lib.rs index cc400e22f07d0b..5865374eb3e373 100644 --- a/programs/bpf/rust/invoke/src/lib.rs +++ b/programs/bpf/rust/invoke/src/lib.rs @@ -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 )); diff --git a/programs/bpf/rust/invoked/Cargo.toml b/programs/bpf/rust/invoked/Cargo.toml index 8d789935038dbd..1e32020992328f 100644 --- a/programs/bpf/rust/invoked/Cargo.toml +++ b/programs/bpf/rust/invoked/Cargo.toml @@ -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"] diff --git a/programs/bpf/rust/invoked/src/instruction.rs b/programs/bpf/rust/invoked/src/instruction.rs index aebca9e6030a00..bba2b52835a03e 100644 --- a/programs/bpf/rust/invoked/src/instruction.rs +++ b/programs/bpf/rust/invoked/src/instruction.rs @@ -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, }; diff --git a/programs/bpf/rust/invoked/src/processor.rs b/programs/bpf/rust/invoked/src/processor.rs index 3645e37d10273d..5bf3881d3728c6 100644 --- a/programs/bpf/rust/invoked/src/processor.rs +++ b/programs/bpf/rust/invoked/src/processor.rs @@ -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, diff --git a/programs/bpf/rust/iter/Cargo.toml b/programs/bpf/rust/iter/Cargo.toml index b573000a604f56..b9e9594788c6df 100644 --- a/programs/bpf/rust/iter/Cargo.toml +++ b/programs/bpf/rust/iter/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/iter/src/lib.rs b/programs/bpf/rust/iter/src/lib.rs index 79a08171ac17f4..9eee6d7ec35b54 100644 --- a/programs/bpf/rust/iter/src/lib.rs +++ b/programs/bpf/rust/iter/src/lib.rs @@ -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 { diff --git a/programs/bpf/rust/many_args/Cargo.toml b/programs/bpf/rust/many_args/Cargo.toml index df76e4b80ede19..4528b10a6fdd66 100644 --- a/programs/bpf/rust/many_args/Cargo.toml +++ b/programs/bpf/rust/many_args/Cargo.toml @@ -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] diff --git a/programs/bpf/rust/many_args/src/helper.rs b/programs/bpf/rust/many_args/src/helper.rs index 1e5351f32dc54c..5159f8112e36b9 100644 --- a/programs/bpf/rust/many_args/src/helper.rs +++ b/programs/bpf/rust/many_args/src/helper.rs @@ -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, diff --git a/programs/bpf/rust/many_args/src/lib.rs b/programs/bpf/rust/many_args/src/lib.rs index 794fa1b5a3f439..070cce58573a41 100644 --- a/programs/bpf/rust/many_args/src/lib.rs +++ b/programs/bpf/rust/many_args/src/lib.rs @@ -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 { diff --git a/programs/bpf/rust/many_args_dep/Cargo.toml b/programs/bpf/rust/many_args_dep/Cargo.toml index 88d27e62dc6953..ef651a005cbbb6 100644 --- a/programs/bpf/rust/many_args_dep/Cargo.toml +++ b/programs/bpf/rust/many_args_dep/Cargo.toml @@ -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"] diff --git a/programs/bpf/rust/many_args_dep/src/lib.rs b/programs/bpf/rust/many_args_dep/src/lib.rs index 496567d37e4a5b..7f21ee50267609 100644 --- a/programs/bpf/rust/many_args_dep/src/lib.rs +++ b/programs/bpf/rust/many_args_dep/src/lib.rs @@ -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, diff --git a/programs/bpf/rust/noop/Cargo.toml b/programs/bpf/rust/noop/Cargo.toml index ea586b30cf9ad8..b406f6d32ec94b 100644 --- a/programs/bpf/rust/noop/Cargo.toml +++ b/programs/bpf/rust/noop/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/noop/src/lib.rs b/programs/bpf/rust/noop/src/lib.rs index f09ccafb22bca6..ac6c3d6c84c7ed 100644 --- a/programs/bpf/rust/noop/src/lib.rs +++ b/programs/bpf/rust/noop/src/lib.rs @@ -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, }; diff --git a/programs/bpf/rust/panic/Cargo.toml b/programs/bpf/rust/panic/Cargo.toml index 1f1413cc359f7e..9d5748535f47b4 100644 --- a/programs/bpf/rust/panic/Cargo.toml +++ b/programs/bpf/rust/panic/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/panic/src/lib.rs b/programs/bpf/rust/panic/src/lib.rs index d375ee256777cf..0d579f205c2065 100644 --- a/programs/bpf/rust/panic/src/lib.rs +++ b/programs/bpf/rust/panic/src/lib.rs @@ -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 { diff --git a/programs/bpf/rust/param_passing/Cargo.toml b/programs/bpf/rust/param_passing/Cargo.toml index 66f32ea307f0f6..876d859f50bcac 100644 --- a/programs/bpf/rust/param_passing/Cargo.toml +++ b/programs/bpf/rust/param_passing/Cargo.toml @@ -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] diff --git a/programs/bpf/rust/param_passing/src/lib.rs b/programs/bpf/rust/param_passing/src/lib.rs index e57220d8949547..09d3c5bf56efb2 100644 --- a/programs/bpf/rust/param_passing/src/lib.rs +++ b/programs/bpf/rust/param_passing/src/lib.rs @@ -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 { diff --git a/programs/bpf/rust/param_passing_dep/Cargo.toml b/programs/bpf/rust/param_passing_dep/Cargo.toml index 141aafd58fbeb9..bdff8e33887329 100644 --- a/programs/bpf/rust/param_passing_dep/Cargo.toml +++ b/programs/bpf/rust/param_passing_dep/Cargo.toml @@ -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"] diff --git a/programs/bpf/rust/param_passing_dep/src/lib.rs b/programs/bpf/rust/param_passing_dep/src/lib.rs index 59c1a44ae422c4..fc9c3e432f4455 100644 --- a/programs/bpf/rust/param_passing_dep/src/lib.rs +++ b/programs/bpf/rust/param_passing_dep/src/lib.rs @@ -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> { diff --git a/programs/bpf/rust/rand/Cargo.toml b/programs/bpf/rust/rand/Cargo.toml index d2ea64b548d4dd..2a2007ee8d87de 100644 --- a/programs/bpf/rust/rand/Cargo.toml +++ b/programs/bpf/rust/rand/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/rand/src/lib.rs b/programs/bpf/rust/rand/src/lib.rs index 1d5ae61ab38935..6e27a8b76623dd 100644 --- a/programs/bpf/rust/rand/src/lib.rs +++ b/programs/bpf/rust/rand/src/lib.rs @@ -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, }; diff --git a/programs/bpf/rust/ristretto/Cargo.toml b/programs/bpf/rust/ristretto/Cargo.toml index 7d64ae2ee151e6..e8bd4a6b0448a4 100644 --- a/programs/bpf/rust/ristretto/Cargo.toml +++ b/programs/bpf/rust/ristretto/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/ristretto/src/lib.rs b/programs/bpf/rust/ristretto/src/lib.rs index 403d79a8715e96..30e3719b1f3478 100644 --- a/programs/bpf/rust/ristretto/src/lib.rs +++ b/programs/bpf/rust/ristretto/src/lib.rs @@ -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, }; diff --git a/programs/bpf/rust/ristretto/src/ristretto.rs b/programs/bpf/rust/ristretto/src/ristretto.rs index 76f652ad1502d3..9286e09798e597 100644 --- a/programs/bpf/rust/ristretto/src/ristretto.rs +++ b/programs/bpf/rust/ristretto/src/ristretto.rs @@ -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()), } } diff --git a/programs/bpf/rust/sanity/Cargo.toml b/programs/bpf/rust/sanity/Cargo.toml index 7a4b4fd278a5bb..86fce2016b09d9 100644 --- a/programs/bpf/rust/sanity/Cargo.toml +++ b/programs/bpf/rust/sanity/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/sanity/src/lib.rs b/programs/bpf/rust/sanity/src/lib.rs index 54e258b2e9d88e..059a76d2e364c6 100644 --- a/programs/bpf/rust/sanity/src/lib.rs +++ b/programs/bpf/rust/sanity/src/lib.rs @@ -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, }; diff --git a/programs/bpf/rust/sha256/Cargo.toml b/programs/bpf/rust/sha256/Cargo.toml index 3a61b8d73c166f..bac55612c06038 100644 --- a/programs/bpf/rust/sha256/Cargo.toml +++ b/programs/bpf/rust/sha256/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/sha256/src/lib.rs b/programs/bpf/rust/sha256/src/lib.rs index e4aad6cd8a3fe2..ae95b317a0a128 100644 --- a/programs/bpf/rust/sha256/src/lib.rs +++ b/programs/bpf/rust/sha256/src/lib.rs @@ -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, }; diff --git a/programs/bpf/rust/sysval/Cargo.toml b/programs/bpf/rust/sysval/Cargo.toml index 28787474f858c0..70f85f410160d4 100644 --- a/programs/bpf/rust/sysval/Cargo.toml +++ b/programs/bpf/rust/sysval/Cargo.toml @@ -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" diff --git a/programs/bpf/rust/sysval/src/lib.rs b/programs/bpf/rust/sysval/src/lib.rs index f7f5b5318d5242..f41acde4d72a34 100644 --- a/programs/bpf/rust/sysval/src/lib.rs +++ b/programs/bpf/rust/sysval/src/lib.rs @@ -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, diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index fe9be5b634a573..d90b4c556b3500 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -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 } diff --git a/sdk/macro/src/lib.rs b/sdk/macro/src/lib.rs index 0bf1502f29ff81..6715143d45bd1b 100644 --- a/sdk/macro/src/lib.rs +++ b/sdk/macro/src/lib.rs @@ -81,17 +81,13 @@ struct ProgramSdkId(proc_macro2::TokenStream); impl Parse for ProgramSdkId { fn parse(input: ParseStream) -> Result { - 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}) } diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml index a96f727c818549..f233b545277f0f 100644 --- a/sdk/program/Cargo.toml +++ b/sdk/program/Cargo.toml @@ -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 "] repository = "https://github.com/solana-labs/solana" homepage = "https://solana.com/" diff --git a/sdk/program/src/lib.rs b/sdk/program/src/lib.rs index 69575a2017cb5f..ce1fc8d1211fca 100644 --- a/sdk/program/src/lib.rs +++ b/sdk/program/src/lib.rs @@ -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; diff --git a/sdk/src/entrypoint.rs b/sdk/src/entrypoint.rs index 621643dfb20652..34053f73df74ef 100644 --- a/sdk/src/entrypoint.rs +++ b/sdk/src/entrypoint.rs @@ -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) => { diff --git a/sdk/src/entrypoint_deprecated.rs b/sdk/src/entrypoint_deprecated.rs index 25e38251f6a645..419c0f66ce218f 100644 --- a/sdk/src/entrypoint_deprecated.rs +++ b/sdk/src/entrypoint_deprecated.rs @@ -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) => { diff --git a/sdk/src/hash.rs b/sdk/src/hash.rs index 576d2b21d2b37e..1327eb2b5de99a 100644 --- a/sdk/src/hash.rs +++ b/sdk/src/hash.rs @@ -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")] diff --git a/sdk/src/lib.rs b/sdk/src/lib.rs index 668b73deded198..f27f4364100943 100644 --- a/sdk/src/lib.rs +++ b/sdk/src/lib.rs @@ -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; diff --git a/sdk/src/log.rs b/sdk/src/log.rs index e2d2fb966835a2..2e8bc14190d193 100644 --- a/sdk/src/log.rs +++ b/sdk/src/log.rs @@ -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) diff --git a/sdk/src/pubkey.rs b/sdk/src/pubkey.rs index 275de86e6066d9..165366e4e31ebe 100644 --- a/sdk/src/pubkey.rs +++ b/sdk/src/pubkey.rs @@ -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")]