Add network interface for accountant
This commit is contained in:
parent
f3dd47948a
commit
604ccf7552
|
@ -15,6 +15,10 @@ license = "Apache-2.0"
|
||||||
name = "silk-demo"
|
name = "silk-demo"
|
||||||
path = "src/bin/demo.rs"
|
path = "src/bin/demo.rs"
|
||||||
|
|
||||||
|
[[bin]]
|
||||||
|
name = "silk-client-demo"
|
||||||
|
path = "src/bin/client-demo.rs"
|
||||||
|
|
||||||
[badges]
|
[badges]
|
||||||
codecov = { repository = "loomprotocol/silk", branch = "master", service = "github" }
|
codecov = { repository = "loomprotocol/silk", branch = "master", service = "github" }
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
//! event log to record transactions. Its users can deposit funds and
|
//! event log to record transactions. Its users can deposit funds and
|
||||||
//! transfer funds to other users.
|
//! transfer funds to other users.
|
||||||
|
|
||||||
use log::{verify_entry, Event, PublicKey, Sha256Hash};
|
use log::{verify_entry, Event, PublicKey, Sha256Hash, Signature};
|
||||||
use historian::Historian;
|
use historian::Historian;
|
||||||
use ring::signature::Ed25519KeyPair;
|
use ring::signature::Ed25519KeyPair;
|
||||||
use std::sync::mpsc::{RecvError, SendError};
|
use std::sync::mpsc::{RecvError, SendError};
|
||||||
|
@ -60,13 +60,43 @@ impl Accountant {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn deposit_signed(
|
||||||
|
self: &Self,
|
||||||
|
key: PublicKey,
|
||||||
|
data: u64,
|
||||||
|
sig: Signature,
|
||||||
|
) -> Result<(), SendError<Event<u64>>> {
|
||||||
|
let event = Event::Claim { key, data, sig };
|
||||||
|
self.historian.sender.send(event)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn deposit(
|
pub fn deposit(
|
||||||
self: &Self,
|
self: &Self,
|
||||||
n: u64,
|
n: u64,
|
||||||
keypair: &Ed25519KeyPair,
|
keypair: &Ed25519KeyPair,
|
||||||
) -> Result<(), SendError<Event<u64>>> {
|
) -> Result<(), SendError<Event<u64>>> {
|
||||||
use log::sign_hash;
|
use log::{get_pubkey, sign_serialized};
|
||||||
let event = sign_hash(n, &keypair);
|
let key = get_pubkey(keypair);
|
||||||
|
let sig = sign_serialized(&n, keypair);
|
||||||
|
self.deposit_signed(key, n, sig)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn transfer_signed(
|
||||||
|
self: &mut Self,
|
||||||
|
from: PublicKey,
|
||||||
|
to: PublicKey,
|
||||||
|
data: u64,
|
||||||
|
sig: Signature,
|
||||||
|
) -> Result<(), SendError<Event<u64>>> {
|
||||||
|
if self.get_balance(&from).unwrap() < data {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let event = Event::Transaction {
|
||||||
|
from,
|
||||||
|
to,
|
||||||
|
data,
|
||||||
|
sig,
|
||||||
|
};
|
||||||
self.historian.sender.send(event)
|
self.historian.sender.send(event)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,17 +104,13 @@ impl Accountant {
|
||||||
self: &mut Self,
|
self: &mut Self,
|
||||||
n: u64,
|
n: u64,
|
||||||
keypair: &Ed25519KeyPair,
|
keypair: &Ed25519KeyPair,
|
||||||
pubkey: PublicKey,
|
to: PublicKey,
|
||||||
) -> Result<(), SendError<Event<u64>>> {
|
) -> Result<(), SendError<Event<u64>>> {
|
||||||
use log::transfer_hash;
|
use log::{get_pubkey, sign_transaction_data};
|
||||||
use generic_array::GenericArray;
|
|
||||||
|
|
||||||
let sender_pubkey = GenericArray::clone_from_slice(keypair.public_key_bytes());
|
let from = get_pubkey(keypair);
|
||||||
if self.get_balance(&sender_pubkey).unwrap() >= n {
|
let sig = sign_transaction_data(&n, keypair, &to);
|
||||||
let event = transfer_hash(n, keypair, pubkey);
|
self.transfer_signed(from, to, n, sig)
|
||||||
return self.historian.sender.send(event);
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_balance(self: &mut Self, pubkey: &PublicKey) -> Result<u64, RecvError> {
|
pub fn get_balance(self: &mut Self, pubkey: &PublicKey) -> Result<u64, RecvError> {
|
||||||
|
@ -98,9 +124,8 @@ mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use std::thread::sleep;
|
use std::thread::sleep;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
use log::generate_keypair;
|
use log::{generate_keypair, get_pubkey};
|
||||||
use historian::ExitReason;
|
use historian::ExitReason;
|
||||||
use generic_array::GenericArray;
|
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_accountant() {
|
fn test_accountant() {
|
||||||
|
@ -112,7 +137,7 @@ mod tests {
|
||||||
acc.deposit(1_000, &bob_keypair).unwrap();
|
acc.deposit(1_000, &bob_keypair).unwrap();
|
||||||
|
|
||||||
sleep(Duration::from_millis(30));
|
sleep(Duration::from_millis(30));
|
||||||
let bob_pubkey = GenericArray::clone_from_slice(bob_keypair.public_key_bytes());
|
let bob_pubkey = get_pubkey(&bob_keypair);
|
||||||
acc.transfer(500, &alice_keypair, bob_pubkey).unwrap();
|
acc.transfer(500, &alice_keypair, bob_pubkey).unwrap();
|
||||||
|
|
||||||
sleep(Duration::from_millis(30));
|
sleep(Duration::from_millis(30));
|
||||||
|
@ -135,11 +160,11 @@ mod tests {
|
||||||
acc.deposit(1_000, &bob_keypair).unwrap();
|
acc.deposit(1_000, &bob_keypair).unwrap();
|
||||||
|
|
||||||
sleep(Duration::from_millis(30));
|
sleep(Duration::from_millis(30));
|
||||||
let bob_pubkey = GenericArray::clone_from_slice(bob_keypair.public_key_bytes());
|
let bob_pubkey = get_pubkey(&bob_keypair);
|
||||||
acc.transfer(10_001, &alice_keypair, bob_pubkey).unwrap();
|
acc.transfer(10_001, &alice_keypair, bob_pubkey).unwrap();
|
||||||
|
|
||||||
sleep(Duration::from_millis(30));
|
sleep(Duration::from_millis(30));
|
||||||
let alice_pubkey = GenericArray::clone_from_slice(alice_keypair.public_key_bytes());
|
let alice_pubkey = get_pubkey(&alice_keypair);
|
||||||
assert_eq!(acc.get_balance(&alice_pubkey).unwrap(), 10_000);
|
assert_eq!(acc.get_balance(&alice_pubkey).unwrap(), 10_000);
|
||||||
assert_eq!(acc.get_balance(&bob_pubkey).unwrap(), 1_000);
|
assert_eq!(acc.get_balance(&bob_pubkey).unwrap(), 1_000);
|
||||||
|
|
||||||
|
@ -151,14 +176,14 @@ mod tests {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_mulitple_claims() {
|
fn test_multiple_claims() {
|
||||||
let zero = Sha256Hash::default();
|
let zero = Sha256Hash::default();
|
||||||
let mut acc = Accountant::new(&zero, Some(2));
|
let mut acc = Accountant::new(&zero, Some(2));
|
||||||
let keypair = generate_keypair();
|
let keypair = generate_keypair();
|
||||||
acc.deposit(1, &keypair).unwrap();
|
acc.deposit(1, &keypair).unwrap();
|
||||||
acc.deposit(2, &keypair).unwrap();
|
acc.deposit(2, &keypair).unwrap();
|
||||||
|
|
||||||
let pubkey = GenericArray::clone_from_slice(keypair.public_key_bytes());
|
let pubkey = get_pubkey(&keypair);
|
||||||
sleep(Duration::from_millis(30));
|
sleep(Duration::from_millis(30));
|
||||||
assert_eq!(acc.get_balance(&pubkey).unwrap(), 3);
|
assert_eq!(acc.get_balance(&pubkey).unwrap(), 3);
|
||||||
|
|
||||||
|
@ -178,7 +203,7 @@ mod tests {
|
||||||
acc.deposit(10_000, &alice_keypair).unwrap();
|
acc.deposit(10_000, &alice_keypair).unwrap();
|
||||||
|
|
||||||
sleep(Duration::from_millis(30));
|
sleep(Duration::from_millis(30));
|
||||||
let bob_pubkey = GenericArray::clone_from_slice(bob_keypair.public_key_bytes());
|
let bob_pubkey = get_pubkey(&bob_keypair);
|
||||||
acc.transfer(500, &alice_keypair, bob_pubkey).unwrap();
|
acc.transfer(500, &alice_keypair, bob_pubkey).unwrap();
|
||||||
|
|
||||||
sleep(Duration::from_millis(30));
|
sleep(Duration::from_millis(30));
|
||||||
|
|
|
@ -0,0 +1,72 @@
|
||||||
|
use std::io;
|
||||||
|
use accountant::Accountant;
|
||||||
|
use log::{PublicKey, Signature};
|
||||||
|
//use serde::Serialize;
|
||||||
|
|
||||||
|
pub struct AccountantSkel {
|
||||||
|
pub obj: Accountant,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
pub enum Request {
|
||||||
|
Deposit {
|
||||||
|
key: PublicKey,
|
||||||
|
val: u64,
|
||||||
|
sig: Signature,
|
||||||
|
},
|
||||||
|
Transfer {
|
||||||
|
from: PublicKey,
|
||||||
|
to: PublicKey,
|
||||||
|
val: u64,
|
||||||
|
sig: Signature,
|
||||||
|
},
|
||||||
|
GetBalance {
|
||||||
|
key: PublicKey,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
pub enum Response {
|
||||||
|
Balance { key: PublicKey, val: u64 },
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AccountantSkel {
|
||||||
|
pub fn process_message(self: &mut Self, msg: Request) -> Option<Response> {
|
||||||
|
match msg {
|
||||||
|
Request::Deposit { key, val, sig } => {
|
||||||
|
let _ = self.obj.deposit_signed(key, val, sig);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
Request::Transfer { from, to, val, sig } => {
|
||||||
|
let _ = self.obj.transfer_signed(from, to, val, sig);
|
||||||
|
None
|
||||||
|
}
|
||||||
|
Request::GetBalance { key } => {
|
||||||
|
let val = self.obj.get_balance(&key).unwrap();
|
||||||
|
Some(Response::Balance { key, val })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// TCP Server that forwards messages to Accountant methods.
|
||||||
|
pub fn serve(self: &mut Self, addr: &str) -> io::Result<()> {
|
||||||
|
use std::net::TcpListener;
|
||||||
|
use std::io::{Read, Write};
|
||||||
|
use bincode::{deserialize, serialize};
|
||||||
|
let listener = TcpListener::bind(addr)?;
|
||||||
|
let mut buf = vec![];
|
||||||
|
loop {
|
||||||
|
let (mut stream, addr) = listener.accept()?;
|
||||||
|
println!("connection received from {}", addr);
|
||||||
|
|
||||||
|
// TODO: Guard against large message DoS attack.
|
||||||
|
stream.read_to_end(&mut buf)?;
|
||||||
|
|
||||||
|
// TODO: Return a descriptive error message if deserialization fails.
|
||||||
|
let msg = deserialize(&buf).unwrap();
|
||||||
|
if let Some(resp) = self.process_message(msg) {
|
||||||
|
stream.write(&serialize(&resp).unwrap())?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,84 @@
|
||||||
|
extern crate generic_array;
|
||||||
|
extern crate silk;
|
||||||
|
|
||||||
|
//use log::{Event, PublicKey, Sha256Hash};
|
||||||
|
//use std::net::TcpStream;
|
||||||
|
//use ring::signature::Ed25519KeyPair;
|
||||||
|
//
|
||||||
|
//pub struct AccountantStub {
|
||||||
|
// pub stream: TcpStream,
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//impl AccountantStub {
|
||||||
|
// pub fn new(addr: ()) -> Self {
|
||||||
|
// let mut stream = TcpStream::connect(addr).unwrap();
|
||||||
|
// AccountantStub {
|
||||||
|
// stream: TcpString,
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// pub fn deposit(
|
||||||
|
// self: &Self,
|
||||||
|
// n: u64,
|
||||||
|
// keypair: &Ed25519KeyPair,
|
||||||
|
// ) -> Result<(), SendError<Event<u64>>> {
|
||||||
|
// use log::sign_hash;
|
||||||
|
// let event = sign_hash(n, &keypair);
|
||||||
|
// self.stream.send(&serialize(event))
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// pub fn transfer(
|
||||||
|
// self: &mut Self,
|
||||||
|
// n: u64,
|
||||||
|
// keypair: &Ed25519KeyPair,
|
||||||
|
// pubkey: PublicKey,
|
||||||
|
// ) -> io::Result<()> {
|
||||||
|
// use log::transfer_hash;
|
||||||
|
// use generic_array::GenericArray;
|
||||||
|
// let event = transfer_hash(n, &keypair);
|
||||||
|
// self.stream.send(&serialize(event))
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// pub fn get_balance(
|
||||||
|
// self: &mut Self,
|
||||||
|
// pubkey: PublicKey,
|
||||||
|
// ) -> io::Result<()> {
|
||||||
|
// let event = GetBalance { key: pubkey };
|
||||||
|
// self.stream.send(&serialize(event));
|
||||||
|
// msg = deserialize(self.sender.recv());
|
||||||
|
// if let AccountantMsg::Balance { val } = msg {
|
||||||
|
// Ok(val)
|
||||||
|
// } else {
|
||||||
|
// Err()
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//}
|
||||||
|
|
||||||
|
use silk::accountant::Accountant;
|
||||||
|
use std::thread::sleep;
|
||||||
|
use std::time::Duration;
|
||||||
|
use silk::log::{generate_keypair, Sha256Hash};
|
||||||
|
use silk::historian::ExitReason;
|
||||||
|
use generic_array::GenericArray;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let zero = Sha256Hash::default();
|
||||||
|
let mut acc = Accountant::new(&zero, Some(2));
|
||||||
|
let alice_keypair = generate_keypair();
|
||||||
|
let bob_keypair = generate_keypair();
|
||||||
|
acc.deposit(10_000, &alice_keypair).unwrap();
|
||||||
|
acc.deposit(1_000, &bob_keypair).unwrap();
|
||||||
|
|
||||||
|
sleep(Duration::from_millis(30));
|
||||||
|
let bob_pubkey = GenericArray::clone_from_slice(bob_keypair.public_key_bytes());
|
||||||
|
acc.transfer(500, &alice_keypair, bob_pubkey).unwrap();
|
||||||
|
|
||||||
|
sleep(Duration::from_millis(30));
|
||||||
|
assert_eq!(acc.get_balance(&bob_pubkey).unwrap(), 1_500);
|
||||||
|
|
||||||
|
drop(acc.historian.sender);
|
||||||
|
assert_eq!(
|
||||||
|
acc.historian.thread_hdl.join().unwrap().1,
|
||||||
|
ExitReason::RecvDisconnected
|
||||||
|
);
|
||||||
|
}
|
|
@ -192,11 +192,11 @@ mod tests {
|
||||||
let zero = Sha256Hash::default();
|
let zero = Sha256Hash::default();
|
||||||
let hist = Historian::new(&zero, None);
|
let hist = Historian::new(&zero, None);
|
||||||
let keypair = generate_keypair();
|
let keypair = generate_keypair();
|
||||||
let mut event0 = sign_hash(hash(b"hello, world"), &keypair);
|
let event0 = Event::Claim {
|
||||||
if let Event::Claim { key, sig, .. } = event0 {
|
key: get_pubkey(&keypair),
|
||||||
let data = hash(b"goodbye cruel world");
|
data: hash(b"goodbye cruel world"),
|
||||||
event0 = Event::Claim { key, data, sig };
|
sig: sign_serialized(&hash(b"hello, world"), &keypair),
|
||||||
}
|
};
|
||||||
hist.sender.send(event0).unwrap();
|
hist.sender.send(event0).unwrap();
|
||||||
drop(hist.sender);
|
drop(hist.sender);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
pub mod log;
|
pub mod log;
|
||||||
pub mod historian;
|
pub mod historian;
|
||||||
pub mod accountant;
|
pub mod accountant;
|
||||||
|
pub mod accountant_skel;
|
||||||
extern crate bincode;
|
extern crate bincode;
|
||||||
extern crate generic_array;
|
extern crate generic_array;
|
||||||
extern crate rayon;
|
extern crate rayon;
|
||||||
|
|
109
src/log.rs
109
src/log.rs
|
@ -65,7 +65,7 @@ impl<T> Entry<T> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return a new ED25519 keypair
|
/// Return a new ED25519 keypair
|
||||||
pub fn generate_keypair() -> Ed25519KeyPair {
|
pub fn generate_keypair() -> Ed25519KeyPair {
|
||||||
use ring::{rand, signature};
|
use ring::{rand, signature};
|
||||||
use untrusted;
|
use untrusted;
|
||||||
|
@ -74,33 +74,25 @@ pub fn generate_keypair() -> Ed25519KeyPair {
|
||||||
signature::Ed25519KeyPair::from_pkcs8(untrusted::Input::from(&pkcs8_bytes)).unwrap()
|
signature::Ed25519KeyPair::from_pkcs8(untrusted::Input::from(&pkcs8_bytes)).unwrap()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Return a Claim Event for the given hash and key-pair.
|
/// Return the public key for the given keypair
|
||||||
pub fn sign_hash<T: Serialize>(data: T, keypair: &Ed25519KeyPair) -> Event<T> {
|
pub fn get_pubkey(keypair: &Ed25519KeyPair) -> PublicKey {
|
||||||
use bincode::serialize;
|
GenericArray::clone_from_slice(keypair.public_key_bytes())
|
||||||
let sig = keypair.sign(&serialize(&data).unwrap());
|
|
||||||
let peer_public_key_bytes = keypair.public_key_bytes();
|
|
||||||
let sig_bytes = sig.as_ref();
|
|
||||||
Event::Claim {
|
|
||||||
key: GenericArray::clone_from_slice(peer_public_key_bytes),
|
|
||||||
data,
|
|
||||||
sig: GenericArray::clone_from_slice(sig_bytes),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Return a Transaction Event that indicates a transfer in ownership of the given hash.
|
/// Return a signature for the given data using the private key from the given keypair.
|
||||||
pub fn transfer_hash<T: Serialize>(data: T, keypair: &Ed25519KeyPair, to: PublicKey) -> Event<T> {
|
pub fn sign_serialized<T: Serialize>(data: &T, keypair: &Ed25519KeyPair) -> Signature {
|
||||||
use bincode::serialize;
|
use bincode::serialize;
|
||||||
let from_public_key_bytes = keypair.public_key_bytes();
|
let serialized = serialize(data).unwrap();
|
||||||
let mut sign_data = serialize(&data).unwrap();
|
GenericArray::clone_from_slice(keypair.sign(&serialized).as_ref())
|
||||||
sign_data.extend_from_slice(&to);
|
|
||||||
let sig = keypair.sign(&sign_data);
|
|
||||||
let sig_bytes = sig.as_ref();
|
|
||||||
Event::Transaction {
|
|
||||||
from: GenericArray::clone_from_slice(from_public_key_bytes),
|
|
||||||
to,
|
|
||||||
data,
|
|
||||||
sig: GenericArray::clone_from_slice(sig_bytes),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Return a signature for the given transaction data using the private key from the given keypair.
|
||||||
|
pub fn sign_transaction_data<T: Serialize>(
|
||||||
|
data: &T,
|
||||||
|
keypair: &Ed25519KeyPair,
|
||||||
|
to: &PublicKey,
|
||||||
|
) -> Signature {
|
||||||
|
sign_serialized(&(data, to), keypair)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Return a Sha256 hash for the given data.
|
/// Return a Sha256 hash for the given data.
|
||||||
|
@ -202,8 +194,7 @@ pub fn verify_event<T: Serialize>(event: &Event<T>) -> bool {
|
||||||
sig,
|
sig,
|
||||||
} = *event
|
} = *event
|
||||||
{
|
{
|
||||||
let mut sign_data = serialize(&data).unwrap();
|
let sign_data = serialize(&(&data, &to)).unwrap();
|
||||||
sign_data.extend_from_slice(&to);
|
|
||||||
if !verify_signature(&from, &sign_data, &sig) {
|
if !verify_signature(&from, &sign_data, &sig) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -338,7 +329,12 @@ mod tests {
|
||||||
#[test]
|
#[test]
|
||||||
fn test_claim() {
|
fn test_claim() {
|
||||||
let keypair = generate_keypair();
|
let keypair = generate_keypair();
|
||||||
let event0 = sign_hash(hash(b"hello, world"), &keypair);
|
let data = hash(b"hello, world");
|
||||||
|
let event0 = Event::Claim {
|
||||||
|
key: get_pubkey(&keypair),
|
||||||
|
data,
|
||||||
|
sig: sign_serialized(&data, &keypair),
|
||||||
|
};
|
||||||
let zero = Sha256Hash::default();
|
let zero = Sha256Hash::default();
|
||||||
let entries = create_entries(&zero, 0, vec![event0]);
|
let entries = create_entries(&zero, 0, vec![event0]);
|
||||||
assert!(verify_slice(&entries, &zero));
|
assert!(verify_slice(&entries, &zero));
|
||||||
|
@ -347,11 +343,11 @@ mod tests {
|
||||||
#[test]
|
#[test]
|
||||||
fn test_wrong_data_claim_attack() {
|
fn test_wrong_data_claim_attack() {
|
||||||
let keypair = generate_keypair();
|
let keypair = generate_keypair();
|
||||||
let mut event0 = sign_hash(hash(b"hello, world"), &keypair);
|
let event0 = Event::Claim {
|
||||||
if let Event::Claim { key, sig, .. } = event0 {
|
key: get_pubkey(&keypair),
|
||||||
let data = hash(b"goodbye cruel world");
|
data: hash(b"goodbye cruel world"),
|
||||||
event0 = Event::Claim { key, data, sig };
|
sig: sign_serialized(&hash(b"hello, world"), &keypair),
|
||||||
}
|
};
|
||||||
let zero = Sha256Hash::default();
|
let zero = Sha256Hash::default();
|
||||||
let entries = create_entries(&zero, 0, vec![event0]);
|
let entries = create_entries(&zero, 0, vec![event0]);
|
||||||
assert!(!verify_slice(&entries, &zero));
|
assert!(!verify_slice(&entries, &zero));
|
||||||
|
@ -361,8 +357,14 @@ mod tests {
|
||||||
fn test_transfer() {
|
fn test_transfer() {
|
||||||
let keypair0 = generate_keypair();
|
let keypair0 = generate_keypair();
|
||||||
let keypair1 = generate_keypair();
|
let keypair1 = generate_keypair();
|
||||||
let pubkey1 = GenericArray::clone_from_slice(keypair1.public_key_bytes());
|
let pubkey1 = get_pubkey(&keypair1);
|
||||||
let event0 = transfer_hash(hash(b"hello, world"), &keypair0, pubkey1);
|
let data = hash(b"hello, world");
|
||||||
|
let event0 = Event::Transaction {
|
||||||
|
from: get_pubkey(&keypair0),
|
||||||
|
to: pubkey1,
|
||||||
|
data,
|
||||||
|
sig: sign_transaction_data(&data, &keypair0, &pubkey1),
|
||||||
|
};
|
||||||
let zero = Sha256Hash::default();
|
let zero = Sha256Hash::default();
|
||||||
let entries = create_entries(&zero, 0, vec![event0]);
|
let entries = create_entries(&zero, 0, vec![event0]);
|
||||||
assert!(verify_slice(&entries, &zero));
|
assert!(verify_slice(&entries, &zero));
|
||||||
|
@ -372,17 +374,14 @@ mod tests {
|
||||||
fn test_wrong_data_transfer_attack() {
|
fn test_wrong_data_transfer_attack() {
|
||||||
let keypair0 = generate_keypair();
|
let keypair0 = generate_keypair();
|
||||||
let keypair1 = generate_keypair();
|
let keypair1 = generate_keypair();
|
||||||
let pubkey1 = GenericArray::clone_from_slice(keypair1.public_key_bytes());
|
let pubkey1 = get_pubkey(&keypair1);
|
||||||
let mut event0 = transfer_hash(hash(b"hello, world"), &keypair0, pubkey1);
|
let data = hash(b"hello, world");
|
||||||
if let Event::Transaction { from, to, sig, .. } = event0 {
|
let event0 = Event::Transaction {
|
||||||
let data = hash(b"goodbye cruel world");
|
from: get_pubkey(&keypair0),
|
||||||
event0 = Event::Transaction {
|
to: pubkey1,
|
||||||
from,
|
data: hash(b"goodbye cruel world"), // <-- attack!
|
||||||
to,
|
sig: sign_transaction_data(&data, &keypair0, &pubkey1),
|
||||||
data,
|
|
||||||
sig,
|
|
||||||
};
|
};
|
||||||
}
|
|
||||||
let zero = Sha256Hash::default();
|
let zero = Sha256Hash::default();
|
||||||
let entries = create_entries(&zero, 0, vec![event0]);
|
let entries = create_entries(&zero, 0, vec![event0]);
|
||||||
assert!(!verify_slice(&entries, &zero));
|
assert!(!verify_slice(&entries, &zero));
|
||||||
|
@ -392,21 +391,15 @@ mod tests {
|
||||||
fn test_transfer_hijack_attack() {
|
fn test_transfer_hijack_attack() {
|
||||||
let keypair0 = generate_keypair();
|
let keypair0 = generate_keypair();
|
||||||
let keypair1 = generate_keypair();
|
let keypair1 = generate_keypair();
|
||||||
let pubkey1 = GenericArray::clone_from_slice(keypair1.public_key_bytes());
|
let thief_keypair = generate_keypair();
|
||||||
let mut event0 = transfer_hash(hash(b"hello, world"), &keypair0, pubkey1);
|
let pubkey1 = get_pubkey(&keypair1);
|
||||||
if let Event::Transaction {
|
let data = hash(b"hello, world");
|
||||||
from, data, sig, ..
|
let event0 = Event::Transaction {
|
||||||
} = event0
|
from: get_pubkey(&keypair0),
|
||||||
{
|
to: get_pubkey(&thief_keypair), // <-- attack!
|
||||||
let theif_keypair = generate_keypair();
|
data: hash(b"goodbye cruel world"),
|
||||||
let to = GenericArray::clone_from_slice(theif_keypair.public_key_bytes());
|
sig: sign_transaction_data(&data, &keypair0, &pubkey1),
|
||||||
event0 = Event::Transaction {
|
|
||||||
from,
|
|
||||||
to,
|
|
||||||
data,
|
|
||||||
sig,
|
|
||||||
};
|
};
|
||||||
}
|
|
||||||
let zero = Sha256Hash::default();
|
let zero = Sha256Hash::default();
|
||||||
let entries = create_entries(&zero, 0, vec![event0]);
|
let entries = create_entries(&zero, 0, vec![event0]);
|
||||||
assert!(!verify_slice(&entries, &zero));
|
assert!(!verify_slice(&entries, &zero));
|
||||||
|
|
Loading…
Reference in New Issue