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

Add base pubkey to create_account_with_seed (#7636)

Browse Source
This commit is contained in:
Rob Walker
2019-12-29 16:42:24 -08:00
committed by GitHub
parent e0564f628e
commit e1ebaa902b
6 changed files with 136 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

178
programs/bpf/Cargo.lock generated
View File

@ -1583,157 +1583,157 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "solana-bpf-loader-program"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.22.0",
"solana-sdk 0.22.0",
"solana-logger 0.23.0",
"solana-sdk 0.23.0",
"solana_rbpf 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "solana-bpf-programs"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"elf 0.0.10 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-bpf-loader-program 0.22.0",
"solana-logger 0.22.0",
"solana-runtime 0.22.0",
"solana-sdk 0.22.0",
"solana-bpf-loader-program 0.23.0",
"solana-logger 0.23.0",
"solana-runtime 0.23.0",
"solana-sdk 0.23.0",
"solana_rbpf 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)",
"walkdir 2.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "solana-bpf-rust-128bit"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-bpf-rust-128bit-dep 0.22.0",
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-bpf-rust-128bit-dep 0.23.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-bpf-rust-128bit-dep"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-bpf-rust-alloc"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-bpf-rust-dep-crate"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-bpf-rust-external-spend"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-bpf-rust-iter"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-bpf-rust-many-args"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-bpf-rust-many-args-dep 0.22.0",
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-bpf-rust-many-args-dep 0.23.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-bpf-rust-many-args-dep"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-bpf-rust-noop"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-bpf-rust-panic"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-bpf-rust-param-passing"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-bpf-rust-param-passing-dep 0.22.0",
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-bpf-rust-param-passing-dep 0.23.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-bpf-rust-param-passing-dep"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-bpf-rust-sysval"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-sdk 0.22.0",
"solana-sdk-bpf-test 0.22.0",
"solana-sdk 0.23.0",
"solana-sdk-bpf-test 0.23.0",
]
[[package]]
name = "solana-config-program"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.22.0",
"solana-sdk 0.22.0",
"solana-logger 0.23.0",
"solana-sdk 0.23.0",
]
[[package]]
name = "solana-crate-features"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"backtrace 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)",
"bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1756,7 +1756,7 @@ dependencies = [
[[package]]
name = "solana-logger"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1765,26 +1765,26 @@ dependencies = [
[[package]]
name = "solana-measure"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"solana-sdk 0.22.0",
"solana-sdk 0.23.0",
]
[[package]]
name = "solana-metrics"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
"reqwest 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-sdk 0.22.0",
"solana-sdk 0.23.0",
"sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "solana-rayon-threadlimit"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1792,7 +1792,7 @@ dependencies = [
[[package]]
name = "solana-runtime"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"bv 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1810,22 +1810,22 @@ dependencies = [
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-bpf-loader-program 0.22.0",
"solana-logger 0.22.0",
"solana-measure 0.22.0",
"solana-metrics 0.22.0",
"solana-rayon-threadlimit 0.22.0",
"solana-sdk 0.22.0",
"solana-stake-program 0.22.0",
"solana-storage-program 0.22.0",
"solana-vote-program 0.22.0",
"solana-bpf-loader-program 0.23.0",
"solana-logger 0.23.0",
"solana-measure 0.23.0",
"solana-metrics 0.23.0",
"solana-rayon-threadlimit 0.23.0",
"solana-sdk 0.23.0",
"solana-stake-program 0.23.0",
"solana-storage-program 0.23.0",
"solana-vote-program 0.23.0",
"sys-info 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
"tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "solana-sdk"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"assert_matches 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1849,19 +1849,19 @@ dependencies = [
"serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
"sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-crate-features 0.22.0",
"solana-logger 0.22.0",
"solana-sdk-macro 0.22.0",
"solana-crate-features 0.23.0",
"solana-logger 0.23.0",
"solana-sdk-macro 0.23.0",
"thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "solana-sdk-bpf-test"
version = "0.22.0"
version = "0.23.0"
[[package]]
name = "solana-sdk-macro"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
"proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1871,7 +1871,7 @@ dependencies = [
[[package]]
name = "solana-stake-program"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1880,17 +1880,17 @@ dependencies = [
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-config-program 0.22.0",
"solana-logger 0.22.0",
"solana-metrics 0.22.0",
"solana-sdk 0.22.0",
"solana-vote-program 0.22.0",
"solana-config-program 0.23.0",
"solana-logger 0.23.0",
"solana-metrics 0.23.0",
"solana-sdk 0.23.0",
"solana-vote-program 0.23.0",
"thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "solana-storage-program"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1899,13 +1899,13 @@ dependencies = [
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.22.0",
"solana-sdk 0.22.0",
"solana-logger 0.23.0",
"solana-sdk 0.23.0",
]
[[package]]
name = "solana-vote-program"
version = "0.22.0"
version = "0.23.0"
dependencies = [
"bincode 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1913,9 +1913,9 @@ dependencies = [
"num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)",
"solana-logger 0.22.0",
"solana-metrics 0.22.0",
"solana-sdk 0.22.0",
"solana-logger 0.23.0",
"solana-metrics 0.23.0",
"solana-sdk 0.23.0",
"thiserror 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
]

4
programs/stake/src/stake_instruction.rs
View File

@ -142,6 +142,7 @@ pub fn initialize(stake_pubkey: &Pubkey, authorized: &Authorized, lockup: &Locku
pub fn create_account_with_seed(
from_pubkey: &Pubkey,
stake_pubkey: &Pubkey,
base: &Pubkey,
seed: &str,
authorized: &Authorized,
lockup: &Lockup,
@ -151,6 +152,7 @@ pub fn create_account_with_seed(
system_instruction::create_account_with_seed(
from_pubkey,
stake_pubkey,
base,
seed,
lamports,
std::mem::size_of::<StakeState>() as u64,
@ -224,6 +226,7 @@ pub fn create_account_and_delegate_stake(
pub fn create_account_with_seed_and_delegate_stake(
from_pubkey: &Pubkey,
stake_pubkey: &Pubkey,
base: &Pubkey,
seed: &str,
vote_pubkey: &Pubkey,
authorized: &Authorized,
@ -233,6 +236,7 @@ pub fn create_account_with_seed_and_delegate_stake(
let mut instructions = create_account_with_seed(
from_pubkey,
stake_pubkey,
base,
seed,
authorized,
lockup,

2
programs/vote/src/vote_instruction.rs
View File

@ -90,6 +90,7 @@ pub fn create_account(
pub fn create_account_with_seed(
from_pubkey: &Pubkey,
vote_pubkey: &Pubkey,
base: &Pubkey,
seed: &str,
vote_init: &VoteInit,
lamports: u64,
@ -98,6 +99,7 @@ pub fn create_account_with_seed(
let create_ix = system_instruction::create_account_with_seed(
from_pubkey,
vote_pubkey,
base,
seed,
lamports,
space,