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

unfork dalek ed25519 (#6776)

Browse Source
This commit is contained in:
Rob Walker
2019-11-07 17:08:10 -08:00
committed by GitHub
parent 20a52f153b
commit b64b54f48f
16 changed files with 105 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sdk-c/Cargo.toml
View File

@ -19,7 +19,8 @@ libc = "0.2.65"
rand_chacha = "0.1.1"
rand_core = { version = ">=0.2, <0.4", default-features = false }
solana-sdk = { path = "../sdk", version = "0.21.0" }
solana-ed25519-dalek = "0.2.0"
ed25519-dalek = "1.0.0-pre.1"
sha2 = "0.8.0"
[build-dependencies]
cbindgen = "0.9.1"

32
sdk-c/src/lib.rs
View File

@ -1,21 +1,23 @@
use bincode::{deserialize, serialize};
use ed25519_dalek::{SignatureError, KEYPAIR_LENGTH, PUBLIC_KEY_LENGTH};
use libc::{c_int, size_t};
use rand_chacha::ChaChaRng;
use rand_core::SeedableRng;
use solana_ed25519_dalek::{SignatureError, KEYPAIR_LENGTH, PUBLIC_KEY_LENGTH};
use solana_sdk::hash::Hash;
use solana_sdk::instruction::CompiledInstruction as CompiledInstructionNative;
use solana_sdk::message::Message as MessageNative;
use solana_sdk::message::MessageHeader as MessageHeaderNative;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::Signature as SignatureNative;
use solana_sdk::signature::{Keypair as KeypairNative, KeypairUtil};
use solana_sdk::transaction::Transaction as TransactionNative;
use std::convert::TryInto;
use std::ffi::CString;
use std::os::raw::c_char;
use std::vec::Vec;
use std::{fmt, mem, ptr, slice};
use solana_sdk::{
hash::Hash,
instruction::CompiledInstruction as CompiledInstructionNative,
message::{Message as MessageNative, MessageHeader as MessageHeaderNative},
pubkey::Pubkey,
signature::{Keypair as KeypairNative, KeypairUtil, Signature as SignatureNative},
transaction::Transaction as TransactionNative,
};
use std::{
convert::TryInto,
ffi::CString,
os::raw::c_char,
vec::Vec,
{fmt, mem, ptr, slice},
};
#[repr(C)]
#[derive(Debug)]
@ -481,7 +483,7 @@ mod tests {
let mut rng = ChaChaRng::from_seed(seed);
let keypair = KeypairNative::generate(&mut rng);
let c_keypair = unsafe { Box::from_raw(generate_keypair(seed.as_ptr())) };
assert_eq!(c_keypair.new_native(), Ok(keypair));
assert_eq!(c_keypair.new_native().unwrap().pubkey(), keypair.pubkey());
}
#[test]