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

Make safe transaction signing the default

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-03-14 15:55:28 -06:00
parent 7b4568b9bf
commit f8bf9ca218
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/src/transaction.rs
View File

@ -180,7 +180,7 @@ impl Transaction {
Hash::default(),
fee,
);
transaction.sign_checked(&[from_keypair], recent_blockhash);
transaction.sign(&[from_keypair], recent_blockhash);
transaction
}
pub fn new_unsigned<T: Serialize>(
@ -229,7 +229,7 @@ impl Transaction {
program_ids,
instructions,
};
tx.sign_checked(from_keypairs, recent_blockhash);
tx.sign(from_keypairs, recent_blockhash);
tx
}
pub fn data(&self, instruction_index: usize) -> &[u8] {
@ -280,7 +280,7 @@ impl Transaction {
}
/// Sign this transaction.
pub fn sign<T: KeypairUtil>(&mut self, keypairs: &[&T], recent_blockhash: Hash) {
pub fn sign_unchecked<T: KeypairUtil>(&mut self, keypairs: &[&T], recent_blockhash: Hash) {
self.recent_blockhash = recent_blockhash;
let message = self.message();
self.signatures = keypairs
@ -291,14 +291,14 @@ impl Transaction {
/// Check keys and keypair lengths, then sign this transaction.
/// Note: this presumes signatures.capacity() was set to the number of required signatures.
pub fn sign_checked<T: KeypairUtil>(&mut self, keypairs: &[&T], recent_blockhash: Hash) {
pub fn sign<T: KeypairUtil>(&mut self, keypairs: &[&T], recent_blockhash: Hash) {
let signed_keys = &self.account_keys[0..self.signatures.capacity()];
for (i, keypair) in keypairs.iter().enumerate() {
assert_eq!(keypair.pubkey(), signed_keys[i], "keypair-pubkey mismatch");
}
assert_eq!(keypairs.len(), signed_keys.len(), "not enough keypairs");
self.sign(keypairs, recent_blockhash);
self.sign_unchecked(keypairs, recent_blockhash);
}
/// Verify only the transaction signature.

2
sdk/src/transaction_builder.rs
View File

@ -108,7 +108,7 @@ impl TransactionBuilder {
/// Return a signed transaction.
pub fn sign<T: KeypairUtil>(&self, keypairs: &[&T], recent_blockhash: Hash) -> Transaction {
let mut tx = self.compile();
tx.sign_checked(keypairs, recent_blockhash);
tx.sign(keypairs, recent_blockhash);
tx
}
}