Rust BPF programs depend on Solana SDK (#5819)
This commit is contained in:
Jack May
GitHub
parent
1f9fde5f7b
commit
e5f902369c
|
|
@ -3699,6 +3699,7 @@ dependencies = [
|
|||
"bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"bs58 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"chrono 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"generic-array 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ _ ci/nits.sh
|
|||
_ ci/order-crates-for-publishing.py
|
||||
_ book/build.sh
|
||||
|
||||
for project in sdk/bpf/rust/{rust-utils,rust-test} programs/bpf/rust/*/ ; do
|
||||
for project in programs/bpf/rust/*/ ; do
|
||||
echo "+++ do_bpf_check $project"
|
||||
(
|
||||
cd "$project"
|
||||
|
|
|
|||
|
|
@ -12,11 +12,12 @@ homepage = "https://solana.com/"
|
|||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
solana-bpf-rust-128bit-dep = { path = "../128bit_dep", version = "0.19.0-pre0" }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/rust-test", version = "0.19.0-pre0" }
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
//! @brief Example Rust-based BPF program tests loop iteration
|
||||
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
use solana_sdk_bpf_utils::info;
|
||||
extern crate solana_sdk;
|
||||
use solana_sdk::info;
|
||||
|
||||
#[no_mangle]
|
||||
pub extern "C" fn entrypoint(_input: *mut u8) -> bool {
|
||||
|
|
|
|||
|
|
@ -12,10 +12,11 @@ homepage = "https://solana.com/"
|
|||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/rust-test", version = "0.19.0-pre0" }
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
//! @brief Solana Rust-based BPF program utility functions and types
|
||||
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
extern crate solana_sdk;
|
||||
|
||||
pub fn uadd(x: u128, y: u128) -> u128 {
|
||||
x + y
|
||||
|
|
@ -36,17 +36,15 @@ pub fn modulo(n: i128, d: i128) -> i128 {
|
|||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
extern crate std;
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn pull_in_externs() {
|
||||
// Rust on Linux excludes the solana_sdk_bpf_test library unless there is a
|
||||
// Rust on Linux excludes the externs unless there is a
|
||||
// direct dependency, use this test to force the pull in of the library.
|
||||
// This is not necessary on macos and unfortunate on Linux
|
||||
// Issue #4972
|
||||
extern crate solana_sdk_bpf_test;
|
||||
use solana_sdk_bpf_test::*;
|
||||
use solana_sdk::program_test::*;
|
||||
unsafe { sol_log_("X".as_ptr(), 1) };
|
||||
sol_log_64_(1, 2, 3, 4, 5);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,11 @@ homepage = "https://solana.com/"
|
|||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
#[macro_use]
|
||||
extern crate alloc;
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
use solana_sdk_bpf_utils::info;
|
||||
extern crate solana_sdk;
|
||||
use solana_sdk::info;
|
||||
use std::alloc::Layout;
|
||||
use std::mem;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,11 @@ edition = "2018"
|
|||
|
||||
[dependencies]
|
||||
byteorder = { version = "1", default-features = false }
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
//! @brief Example Rust-based BPF program tests dependent crates
|
||||
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
extern crate solana_sdk;
|
||||
use byteorder::{ByteOrder, LittleEndian};
|
||||
use solana_sdk_bpf_utils::info;
|
||||
use solana_sdk::info;
|
||||
|
||||
#[no_mangle]
|
||||
pub extern "C" fn entrypoint(_input: *mut u8) -> bool {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,11 @@ homepage = "https://solana.com/"
|
|||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
//! @brief Example Rust-based BPF program that moves a lamport from one account to another
|
||||
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
use solana_sdk_bpf_utils::entrypoint;
|
||||
use solana_sdk_bpf_utils::entrypoint::*;
|
||||
extern crate solana_sdk;
|
||||
use solana_sdk::entrypoint;
|
||||
use solana_sdk::entrypoint::*;
|
||||
|
||||
entrypoint!(process_instruction);
|
||||
fn process_instruction(ka: &mut [SolKeyedAccount], _info: &SolClusterInfo, _data: &[u8]) -> bool {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,11 @@ homepage = "https://solana.com/"
|
|||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
//! @brief Example Rust-based BPF program tests loop iteration
|
||||
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
use solana_sdk_bpf_utils::info;
|
||||
extern crate solana_sdk;
|
||||
use solana_sdk::info;
|
||||
|
||||
#[no_mangle]
|
||||
pub extern "C" fn entrypoint(_input: *mut u8) -> bool {
|
||||
|
|
|
|||
|
|
@ -12,9 +12,13 @@ homepage = "https://solana.com/"
|
|||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
solana-bpf-rust-many-args-dep = { path = "../many_args_dep", version = "0.19.0-pre0" }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
//! @brief Example Rust-based BPF program tests loop iteration
|
||||
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
extern crate solana_sdk;
|
||||
|
||||
use solana_sdk_bpf_utils::log::*;
|
||||
use solana_sdk::log::*;
|
||||
|
||||
pub fn many_args(
|
||||
arg1: u64,
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
//! @brief Example Rust-based BPF program tests loop iteration
|
||||
|
||||
mod helper;
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
use solana_sdk_bpf_utils::info;
|
||||
extern crate solana_sdk;
|
||||
use solana_sdk::info;
|
||||
|
||||
#[no_mangle]
|
||||
pub extern "C" fn entrypoint(_input: *mut u8) -> bool {
|
||||
|
|
|
|||
|
|
@ -12,10 +12,11 @@ homepage = "https://solana.com/"
|
|||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/rust-test", version = "0.19.0-pre0" }
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
//! @brief Solana Rust-based BPF program utility functions and types
|
||||
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
use solana_sdk_bpf_utils::info;
|
||||
extern crate solana_sdk;
|
||||
use solana_sdk::info;
|
||||
|
||||
pub fn many_args(
|
||||
arg1: u64,
|
||||
|
|
@ -55,12 +55,11 @@ mod test {
|
|||
|
||||
#[test]
|
||||
fn pull_in_externs() {
|
||||
// Rust on Linux excludes the solana_sdk_bpf_test library unless there is a
|
||||
// Rust on Linux excludes the externs unless there is a
|
||||
// direct dependency, use this test to force the pull in of the library.
|
||||
// This is not necessary on macos and unfortunate on Linux
|
||||
// Issue #4972
|
||||
extern crate solana_sdk_bpf_test;
|
||||
use solana_sdk_bpf_test::*;
|
||||
use solana_sdk::program_test::*;
|
||||
unsafe { sol_log_("X".as_ptr(), 1) };
|
||||
sol_log_64_(1, 2, 3, 4, 5);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,11 @@ homepage = "https://solana.com/"
|
|||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
|
||||
#![allow(unreachable_code)]
|
||||
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
use solana_sdk_bpf_utils::entrypoint::*;
|
||||
use solana_sdk_bpf_utils::log::*;
|
||||
use solana_sdk_bpf_utils::{entrypoint, info};
|
||||
extern crate solana_sdk;
|
||||
use solana_sdk::entrypoint::*;
|
||||
use solana_sdk::log::*;
|
||||
use solana_sdk::{entrypoint, info};
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
struct SStruct {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,11 @@ homepage = "https://solana.com/"
|
|||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
//! @brief Example Rust-based BPF program that panics
|
||||
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
extern crate solana_sdk;
|
||||
|
||||
#[no_mangle]
|
||||
pub extern "C" fn entrypoint(_input: *mut u8) -> bool {
|
||||
|
|
|
|||
|
|
@ -12,11 +12,12 @@ homepage = "https://solana.com/"
|
|||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
solana-bpf-rust-param-passing-dep = { path = "../param_passing_dep", version = "0.19.0-pre0" }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/rust-test", version = "0.19.0-pre0" }
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
//! @brief Example Rust-based BPF program tests loop iteration
|
||||
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
extern crate solana_sdk;
|
||||
use solana_bpf_rust_param_passing_dep::{Data, TestDep};
|
||||
use solana_sdk_bpf_utils::info;
|
||||
use solana_sdk::info;
|
||||
|
||||
#[no_mangle]
|
||||
pub extern "C" fn entrypoint(_input: *mut u8) -> bool {
|
||||
|
|
|
|||
|
|
@ -12,10 +12,11 @@ homepage = "https://solana.com/"
|
|||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
|
||||
[dev_dependencies]
|
||||
solana-sdk-bpf-test = { path = "../../../../sdk/bpf/rust/rust-test", version = "0.19.0-pre0" }
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
//! @brief Example Rust-based BPF program tests loop iteration
|
||||
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
extern crate solana_sdk;
|
||||
|
||||
pub struct Data<'a> {
|
||||
pub twentyone: u64,
|
||||
|
|
|
|||
|
|
@ -13,7 +13,11 @@ edition = "2018"
|
|||
|
||||
[dependencies]
|
||||
byteorder = { version = "1", default-features = false }
|
||||
solana-sdk-bpf-utils = { path = "../../../../sdk/bpf/rust/rust-utils", version = "0.19.0-pre0" }
|
||||
solana-sdk = { path = "../../../../sdk/", version = "0.19.0-pre0", default-features = false }
|
||||
|
||||
[features]
|
||||
program = ["solana-sdk/program"]
|
||||
default = ["program"]
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
//! @brief Example Rust-based BPF program that prints out the parameters passed to it
|
||||
|
||||
extern crate solana_sdk_bpf_utils;
|
||||
extern crate solana_sdk;
|
||||
use byteorder::{ByteOrder, LittleEndian};
|
||||
use solana_sdk_bpf_utils::entrypoint::*;
|
||||
use solana_sdk_bpf_utils::{entrypoint, info};
|
||||
use solana_sdk::entrypoint::*;
|
||||
use solana_sdk::{entrypoint, info};
|
||||
|
||||
entrypoint!(process_instruction);
|
||||
fn process_instruction(ka: &mut [SolKeyedAccount], _info: &SolClusterInfo, _data: &[u8]) -> bool {
|
||||
|
|
|
|||
|
|
@ -8,25 +8,49 @@ homepage = "https://solana.com/"
|
|||
license = "Apache-2.0"
|
||||
edition = "2018"
|
||||
|
||||
[features]
|
||||
# On-chain program specific dependencies
|
||||
program = []
|
||||
# Kitchen sink specific dependencies
|
||||
kitchen_sink = [
|
||||
"assert_matches",
|
||||
"byteorder",
|
||||
"chrono",
|
||||
"generic-array",
|
||||
"itertools",
|
||||
"log",
|
||||
"memmap",
|
||||
"num-derive",
|
||||
"num-traits",
|
||||
"rand",
|
||||
"rayon",
|
||||
"serde_json",
|
||||
"solana-ed25519-dalek",
|
||||
"solana-logger",
|
||||
"untrusted",
|
||||
]
|
||||
default = ["kitchen_sink"]
|
||||
|
||||
[dependencies]
|
||||
assert_matches = "1.3.0"
|
||||
assert_matches = { version = "1.3.0", optional = true }
|
||||
bincode = "1.1.4"
|
||||
bs58 = "0.2.5"
|
||||
byteorder = "1.3.2"
|
||||
chrono = { version = "0.4.8", features = ["serde"] }
|
||||
generic-array = { version = "0.13.2", default-features = false, features = ["serde", "more_lengths"] }
|
||||
byteorder = { version = "1.3.2", optional = true }
|
||||
cfg-if = "0.1.9"
|
||||
chrono = { version = "0.4.8", features = ["serde"], optional = true }
|
||||
generic-array = { version = "0.13.2", default-features = false, features = ["serde", "more_lengths"], optional = true }
|
||||
hex = "0.3.2"
|
||||
itertools = "0.8.0"
|
||||
log = "0.4.8"
|
||||
memmap = "0.6.2"
|
||||
num-derive = "0.2"
|
||||
num-traits = "0.2"
|
||||
rand = "0.6.5"
|
||||
rayon = "1.2.0"
|
||||
itertools = { version = "0.8.0", optional = true }
|
||||
log = { version = "0.4.8", optional = true }
|
||||
memmap = { version = "0.6.2", optional = true }
|
||||
num-derive = { version = "0.2", optional = true }
|
||||
num-traits = { version = "0.2", optional = true }
|
||||
rand = { version = "0.6.5", optional = true }
|
||||
rayon = { version = "1.2.0", optional = true }
|
||||
serde = "1.0.99"
|
||||
serde_derive = "1.0.99"
|
||||
serde_json = "1.0.40"
|
||||
serde_json = { version = "1.0.40", optional = true }
|
||||
sha2 = "0.8.0"
|
||||
solana-ed25519-dalek = "0.2.0"
|
||||
solana-logger = { path = "../logger", version = "0.19.0-pre0" }
|
||||
untrusted = "0.7.0"
|
||||
solana-ed25519-dalek = { version = "0.2.0", optional = true }
|
||||
solana-logger = { path = "../logger", version = "0.19.0-pre0", optional = true }
|
||||
untrusted = { version = "0.7.0", optional = true }
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
|
||||
[package]
|
||||
name = "solana-sdk-bpf-test"
|
||||
version = "0.19.0-pre0"
|
||||
description = "Solana BPF SDK Rust Cargo test utilities"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
/target/
|
||||
|
||||
Cargo.lock
|
||||
/farf/
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
|
||||
[package]
|
||||
name = "solana-sdk-bpf-utils"
|
||||
version = "0.19.0-pre0"
|
||||
description = "Solana BPF SDK Rust Utils"
|
||||
authors = ["Solana Maintainers <maintainers@solana.com>"]
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
license = "Apache-2.0"
|
||||
homepage = "https://solana.com/"
|
||||
edition = "2018"
|
||||
|
||||
[workspace]
|
||||
members = []
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
//! @brief Solana Rust-based BPF program utility functions and types
|
||||
|
||||
pub mod entrypoint;
|
||||
pub mod log;
|
||||
|
|
@ -1,30 +1,48 @@
|
|||
pub mod account;
|
||||
pub mod account_utils;
|
||||
pub mod bpf_loader;
|
||||
pub mod client;
|
||||
pub mod fee_calculator;
|
||||
pub mod genesis_block;
|
||||
pub mod hash;
|
||||
pub mod inflation;
|
||||
pub mod instruction;
|
||||
pub mod instruction_processor_utils;
|
||||
pub mod loader_instruction;
|
||||
pub mod message;
|
||||
pub mod native_loader;
|
||||
pub mod packet;
|
||||
pub mod poh_config;
|
||||
#[macro_use]
|
||||
extern crate cfg_if;
|
||||
|
||||
pub mod pubkey;
|
||||
pub mod rent;
|
||||
pub mod rpc_port;
|
||||
pub mod short_vec;
|
||||
pub mod signature;
|
||||
pub mod system_instruction;
|
||||
pub mod system_program;
|
||||
pub mod system_transaction;
|
||||
pub mod sysvar;
|
||||
pub mod timing;
|
||||
pub mod transaction;
|
||||
pub mod transport;
|
||||
|
||||
// On-chain program modules
|
||||
cfg_if! {
|
||||
if #[cfg(feature = "program")] {
|
||||
pub mod entrypoint;
|
||||
pub mod log;
|
||||
pub mod program_test;
|
||||
}
|
||||
}
|
||||
|
||||
// Kitchen sink modules
|
||||
cfg_if! {
|
||||
if #[cfg(feature = "kitchen_sink")] {
|
||||
pub mod account;
|
||||
pub mod account_utils;
|
||||
pub mod bpf_loader;
|
||||
pub mod client;
|
||||
pub mod fee_calculator;
|
||||
pub mod genesis_block;
|
||||
pub mod hash;
|
||||
pub mod inflation;
|
||||
pub mod instruction;
|
||||
pub mod instruction_processor_utils;
|
||||
pub mod loader_instruction;
|
||||
pub mod message;
|
||||
pub mod native_loader;
|
||||
pub mod packet;
|
||||
pub mod poh_config;
|
||||
pub mod rent;
|
||||
pub mod rpc_port;
|
||||
pub mod short_vec;
|
||||
pub mod signature;
|
||||
pub mod system_instruction;
|
||||
pub mod system_program;
|
||||
pub mod system_transaction;
|
||||
pub mod sysvar;
|
||||
pub mod timing;
|
||||
pub mod transaction;
|
||||
pub mod transport;
|
||||
}
|
||||
}
|
||||
|
||||
#[macro_use]
|
||||
extern crate serde_derive;
|
||||
|
|
|
|||
|
|
@ -1,10 +1,7 @@
|
|||
use std::convert::TryFrom;
|
||||
use std::error;
|
||||
use std::fmt;
|
||||
use std::fs::{self, File};
|
||||
use std::io::Write;
|
||||
use std::mem;
|
||||
use std::path::Path;
|
||||
use std::str::FromStr;
|
||||
|
||||
pub use bs58;
|
||||
|
|
@ -50,6 +47,7 @@ impl Pubkey {
|
|||
)
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "program"))]
|
||||
pub fn new_rand() -> Self {
|
||||
Self::new(&rand::random::<[u8; 32]>())
|
||||
}
|
||||
|
|
@ -73,21 +71,25 @@ impl fmt::Display for Pubkey {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "program"))]
|
||||
pub fn write_pubkey(outfile: &str, pubkey: Pubkey) -> Result<(), Box<dyn error::Error>> {
|
||||
use std::io::Write;
|
||||
|
||||
let printable = format!("{}", pubkey);
|
||||
let serialized = serde_json::to_string(&printable)?;
|
||||
|
||||
if let Some(outdir) = Path::new(&outfile).parent() {
|
||||
fs::create_dir_all(outdir)?;
|
||||
if let Some(outdir) = std::path::Path::new(&outfile).parent() {
|
||||
std::fs::create_dir_all(outdir)?;
|
||||
}
|
||||
let mut f = File::create(outfile)?;
|
||||
let mut f = std::fs::File::create(outfile)?;
|
||||
f.write_all(&serialized.clone().into_bytes())?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "program"))]
|
||||
pub fn read_pubkey(infile: &str) -> Result<Pubkey, Box<dyn error::Error>> {
|
||||
let f = File::open(infile.to_string())?;
|
||||
let f = std::fs::File::open(infile.to_string())?;
|
||||
let printable: String = serde_json::from_reader(f)?;
|
||||
Ok(Pubkey::from_str(&printable)?)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue