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

Generalize Transaction to express a Claim

Browse Source 
If a Transaction doesn't have an existing address, it's being used
to create new funds.
This commit is contained in:
Greg Fitzgerald
2018-03-02 10:41:13 -07:00
parent 32d677787b
commit 3e2d6d9e8b
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/accountant.rs
View File

@ -92,7 +92,7 @@ impl Accountant {
} }
let event = Event::Transaction { let event = Event::Transaction {
from, from: Some(from),
to, to,
data, data,
sig, sig,

4
src/event.rs
View File

@ -35,7 +35,7 @@ pub enum Event<T> {
sig: Signature, sig: Signature,
}, },
Transaction { Transaction {
from: PublicKey, from: Option<PublicKey>,
to: PublicKey, to: PublicKey,
data: T, data: T,
sig: Signature, sig: Signature,
@ -106,7 +106,7 @@ pub fn verify_event<T: Serialize>(event: &Event<T>) -> bool {
} = *event } = *event
{ {
let sign_data = serialize(&(&data, &to)).unwrap(); let sign_data = serialize(&(&data, &to)).unwrap();
if !verify_signature(&from, &sign_data, &sig) { if !verify_signature(&from.unwrap_or(to), &sign_data, &sig) {
return false; return false;
} }
} }

6
src/log.rs
View File

@ -268,7 +268,7 @@ mod tests {
let pubkey1 = get_pubkey(&keypair1); let pubkey1 = get_pubkey(&keypair1);
let data = hash(b"hello, world"); let data = hash(b"hello, world");
let event0 = Event::Transaction { let event0 = Event::Transaction {
from: get_pubkey(&keypair0), from: Some(get_pubkey(&keypair0)),
to: pubkey1, to: pubkey1,
data, data,
sig: sign_transaction_data(&data, &keypair0, &pubkey1), sig: sign_transaction_data(&data, &keypair0, &pubkey1),
@ -285,7 +285,7 @@ mod tests {
let pubkey1 = get_pubkey(&keypair1); let pubkey1 = get_pubkey(&keypair1);
let data = hash(b"hello, world"); let data = hash(b"hello, world");
let event0 = Event::Transaction { let event0 = Event::Transaction {
from: get_pubkey(&keypair0), from: Some(get_pubkey(&keypair0)),
to: pubkey1, to: pubkey1,
data: hash(b"goodbye cruel world"), // <-- attack! data: hash(b"goodbye cruel world"), // <-- attack!
sig: sign_transaction_data(&data, &keypair0, &pubkey1), sig: sign_transaction_data(&data, &keypair0, &pubkey1),
@ -303,7 +303,7 @@ mod tests {
let pubkey1 = get_pubkey(&keypair1); let pubkey1 = get_pubkey(&keypair1);
let data = hash(b"hello, world"); let data = hash(b"hello, world");
let event0 = Event::Transaction { let event0 = Event::Transaction {
from: get_pubkey(&keypair0), from: Some(get_pubkey(&keypair0)),
to: get_pubkey(&thief_keypair), // <-- attack! to: get_pubkey(&thief_keypair), // <-- attack!
data: hash(b"goodbye cruel world"), data: hash(b"goodbye cruel world"),
sig: sign_transaction_data(&data, &keypair0, &pubkey1), sig: sign_transaction_data(&data, &keypair0, &pubkey1),