240704fb54
* Signer subscription. * Fixing RPC tests. * Improve notification performance.
385 lines
11 KiB
Rust
385 lines
11 KiB
Rust
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity.
|
|
|
|
// Parity is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
use std::mem;
|
|
use std::cell::RefCell;
|
|
use std::sync::Arc;
|
|
use std::collections::BTreeMap;
|
|
use jsonrpc_core;
|
|
use util::{Mutex, RwLock, U256, Address};
|
|
use ethcore::account_provider::DappId;
|
|
use v1::helpers::{ConfirmationRequest, ConfirmationPayload};
|
|
use v1::types::{ConfirmationResponse, H160 as RpcH160, Origin, DappId as RpcDappId};
|
|
|
|
/// Result that can be returned from JSON RPC.
|
|
pub type RpcResult = Result<ConfirmationResponse, jsonrpc_core::Error>;
|
|
|
|
/// Type of default account
|
|
pub enum DefaultAccount {
|
|
/// Default account is known
|
|
Provided(Address),
|
|
/// Should use default account for dapp
|
|
ForDapp(DappId),
|
|
}
|
|
|
|
impl From<RpcDappId> for DefaultAccount {
|
|
fn from(dapp_id: RpcDappId) -> Self {
|
|
DefaultAccount::ForDapp(dapp_id.into())
|
|
}
|
|
}
|
|
|
|
impl From<RpcH160> for DefaultAccount {
|
|
fn from(address: RpcH160) -> Self {
|
|
DefaultAccount::Provided(address.into())
|
|
}
|
|
}
|
|
|
|
/// Possible events happening in the queue that can be listened to.
|
|
#[derive(Debug, PartialEq, Clone)]
|
|
pub enum QueueEvent {
|
|
/// Receiver should stop work upon receiving `Finish` message.
|
|
Finish,
|
|
/// Informs about new request.
|
|
NewRequest(U256),
|
|
/// Request rejected.
|
|
RequestRejected(U256),
|
|
/// Request resolved.
|
|
RequestConfirmed(U256),
|
|
}
|
|
|
|
/// Defines possible errors when inserting to queue
|
|
#[derive(Debug, PartialEq)]
|
|
pub enum QueueAddError {
|
|
LimitReached,
|
|
}
|
|
|
|
// TODO [todr] to consider: timeout instead of limit?
|
|
pub const QUEUE_LIMIT: usize = 50;
|
|
|
|
/// A queue of transactions awaiting to be confirmed and signed.
|
|
pub trait SigningQueue: Send + Sync {
|
|
/// Add new request to the queue.
|
|
/// Returns a `ConfirmationPromise` that can be used to await for resolution of given request.
|
|
fn add_request(&self, request: ConfirmationPayload, origin: Origin) -> Result<ConfirmationPromise, QueueAddError>;
|
|
|
|
/// Removes a request from the queue.
|
|
/// Notifies possible token holders that request was rejected.
|
|
fn request_rejected(&self, id: U256) -> Option<ConfirmationRequest>;
|
|
|
|
/// Removes a request from the queue.
|
|
/// Notifies possible token holders that request was confirmed and given hash was assigned.
|
|
fn request_confirmed(&self, id: U256, result: RpcResult) -> Option<ConfirmationRequest>;
|
|
|
|
/// Returns a request if it is contained in the queue.
|
|
fn peek(&self, id: &U256) -> Option<ConfirmationRequest>;
|
|
|
|
/// Return copy of all the requests in the queue.
|
|
fn requests(&self) -> Vec<ConfirmationRequest>;
|
|
|
|
/// Returns number of requests awaiting confirmation.
|
|
fn len(&self) -> usize;
|
|
|
|
/// Returns true if there are no requests awaiting confirmation.
|
|
fn is_empty(&self) -> bool;
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq)]
|
|
/// Result of a pending confirmation request.
|
|
pub enum ConfirmationResult {
|
|
/// The request has not yet been confirmed nor rejected.
|
|
Waiting,
|
|
/// The request has been rejected.
|
|
Rejected,
|
|
/// The request has been confirmed.
|
|
Confirmed(RpcResult),
|
|
}
|
|
|
|
type Listener = Box<FnMut(Option<RpcResult>) + Send>;
|
|
|
|
/// A handle to submitted request.
|
|
/// Allows to block and wait for a resolution of that request.
|
|
pub struct ConfirmationToken {
|
|
result: Arc<Mutex<ConfirmationResult>>,
|
|
listeners: Arc<Mutex<Vec<Listener>>>,
|
|
request: ConfirmationRequest,
|
|
}
|
|
|
|
pub struct ConfirmationPromise {
|
|
id: U256,
|
|
result: Arc<Mutex<ConfirmationResult>>,
|
|
listeners: Arc<Mutex<Vec<Listener>>>,
|
|
}
|
|
|
|
impl ConfirmationToken {
|
|
/// Submit solution to all listeners
|
|
fn resolve(&self, result: Option<RpcResult>) {
|
|
let wrapped = result.clone().map_or(ConfirmationResult::Rejected, |h| ConfirmationResult::Confirmed(h));
|
|
{
|
|
let mut res = self.result.lock();
|
|
*res = wrapped.clone();
|
|
}
|
|
// Notify listener
|
|
let listeners = {
|
|
let mut listeners = self.listeners.lock();
|
|
mem::replace(&mut *listeners, Vec::new())
|
|
};
|
|
for mut listener in listeners {
|
|
listener(result.clone());
|
|
}
|
|
}
|
|
|
|
fn as_promise(&self) -> ConfirmationPromise {
|
|
ConfirmationPromise {
|
|
id: self.request.id,
|
|
result: self.result.clone(),
|
|
listeners: self.listeners.clone(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ConfirmationPromise {
|
|
/// Get the ID for this request.
|
|
pub fn id(&self) -> U256 { self.id }
|
|
|
|
/// Just get the result, assuming it exists.
|
|
pub fn result(&self) -> ConfirmationResult {
|
|
self.result.lock().clone()
|
|
}
|
|
|
|
pub fn wait_for_result<F>(self, callback: F) where F: FnOnce(Option<RpcResult>) + Send + 'static {
|
|
trace!(target: "own_tx", "Signer: Awaiting confirmation... ({:?}).", self.id);
|
|
let _result = self.result.lock();
|
|
let mut listeners = self.listeners.lock();
|
|
// TODO [todr] Overcoming FnBox unstability
|
|
let callback = RefCell::new(Some(callback));
|
|
listeners.push(Box::new(move |result| {
|
|
let ref mut f = *callback.borrow_mut();
|
|
f.take().expect("Callbacks are called only once.")(result)
|
|
}));
|
|
}
|
|
}
|
|
|
|
|
|
/// Queue for all unconfirmed requests.
|
|
#[derive(Default)]
|
|
pub struct ConfirmationsQueue {
|
|
id: Mutex<U256>,
|
|
queue: RwLock<BTreeMap<U256, ConfirmationToken>>,
|
|
on_event: RwLock<Vec<Box<Fn(QueueEvent) -> () + Send + Sync>>>,
|
|
}
|
|
|
|
impl ConfirmationsQueue {
|
|
/// Adds a queue listener. For each event, `listener` callback will be invoked.
|
|
pub fn on_event<F: Fn(QueueEvent) -> () + Send + Sync + 'static>(&self, listener: F) {
|
|
self.on_event.write().push(Box::new(listener));
|
|
}
|
|
|
|
/// Notifies consumer that the communcation is over.
|
|
/// No more events will be sent after this function is invoked.
|
|
pub fn finish(&self) {
|
|
self.notify(QueueEvent::Finish);
|
|
self.on_event.write().clear();
|
|
}
|
|
|
|
/// Notifies receiver about the event happening in this queue.
|
|
fn notify(&self, message: QueueEvent) {
|
|
for listener in &*self.on_event.read() {
|
|
listener(message.clone())
|
|
}
|
|
}
|
|
|
|
/// Removes requests from this queue and notifies `ConfirmationPromise` holders about the result.
|
|
/// Notifies also a receiver about that event.
|
|
fn remove(&self, id: U256, result: Option<RpcResult>) -> Option<ConfirmationRequest> {
|
|
let token = self.queue.write().remove(&id);
|
|
|
|
if let Some(token) = token {
|
|
// notify receiver about the event
|
|
self.notify(result.clone().map_or_else(
|
|
|| QueueEvent::RequestRejected(id),
|
|
|_| QueueEvent::RequestConfirmed(id)
|
|
));
|
|
// notify token holders about resolution
|
|
token.resolve(result);
|
|
// return a result
|
|
return Some(token.request.clone());
|
|
}
|
|
None
|
|
}
|
|
}
|
|
|
|
impl Drop for ConfirmationsQueue {
|
|
fn drop(&mut self) {
|
|
self.finish();
|
|
}
|
|
}
|
|
|
|
impl SigningQueue for ConfirmationsQueue {
|
|
fn add_request(&self, request: ConfirmationPayload, origin: Origin) -> Result<ConfirmationPromise, QueueAddError> {
|
|
if self.len() > QUEUE_LIMIT {
|
|
return Err(QueueAddError::LimitReached);
|
|
}
|
|
|
|
// Increment id
|
|
let id = {
|
|
let mut last_id = self.id.lock();
|
|
*last_id = *last_id + U256::from(1);
|
|
*last_id
|
|
};
|
|
// Add request to queue
|
|
let res = {
|
|
debug!(target: "own_tx", "Signer: New entry ({:?}) in confirmation queue.", id);
|
|
trace!(target: "own_tx", "Signer: ({:?}) : {:?}", id, request);
|
|
|
|
let mut queue = self.queue.write();
|
|
queue.insert(id, ConfirmationToken {
|
|
result: Arc::new(Mutex::new(ConfirmationResult::Waiting)),
|
|
listeners: Default::default(),
|
|
request: ConfirmationRequest {
|
|
id: id,
|
|
payload: request,
|
|
origin: origin,
|
|
},
|
|
});
|
|
queue.get(&id).map(|token| token.as_promise()).expect("Token was just inserted.")
|
|
};
|
|
// Notify listeners
|
|
self.notify(QueueEvent::NewRequest(id));
|
|
Ok(res)
|
|
}
|
|
|
|
fn peek(&self, id: &U256) -> Option<ConfirmationRequest> {
|
|
self.queue.read().get(id).map(|token| token.request.clone())
|
|
}
|
|
|
|
fn request_rejected(&self, id: U256) -> Option<ConfirmationRequest> {
|
|
debug!(target: "own_tx", "Signer: Request rejected ({:?}).", id);
|
|
self.remove(id, None)
|
|
}
|
|
|
|
fn request_confirmed(&self, id: U256, result: RpcResult) -> Option<ConfirmationRequest> {
|
|
debug!(target: "own_tx", "Signer: Transaction confirmed ({:?}).", id);
|
|
self.remove(id, Some(result))
|
|
}
|
|
|
|
fn requests(&self) -> Vec<ConfirmationRequest> {
|
|
let queue = self.queue.read();
|
|
queue.values().map(|token| token.request.clone()).collect()
|
|
}
|
|
|
|
fn len(&self) -> usize {
|
|
let queue = self.queue.read();
|
|
queue.len()
|
|
}
|
|
|
|
fn is_empty(&self) -> bool {
|
|
let queue = self.queue.read();
|
|
queue.is_empty()
|
|
}
|
|
}
|
|
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use std::time::Duration;
|
|
use std::thread;
|
|
use std::sync::{mpsc, Arc};
|
|
use util::{Address, U256, Mutex};
|
|
use v1::helpers::{SigningQueue, ConfirmationsQueue, QueueEvent, FilledTransactionRequest, ConfirmationPayload};
|
|
use v1::types::ConfirmationResponse;
|
|
|
|
fn request() -> ConfirmationPayload {
|
|
ConfirmationPayload::SendTransaction(FilledTransactionRequest {
|
|
from: Address::from(1),
|
|
used_default_from: false,
|
|
to: Some(Address::from(2)),
|
|
gas_price: 0.into(),
|
|
gas: 10_000.into(),
|
|
value: 10_000_000.into(),
|
|
data: vec![],
|
|
nonce: None,
|
|
condition: None,
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn should_wait_for_hash() {
|
|
// given
|
|
let queue = Arc::new(ConfirmationsQueue::default());
|
|
let request = request();
|
|
|
|
// when
|
|
let q = queue.clone();
|
|
let handle = thread::spawn(move || {
|
|
let v = q.add_request(request, Default::default()).unwrap();
|
|
let (tx, rx) = mpsc::channel();
|
|
v.wait_for_result(move |res| {
|
|
tx.send(res).unwrap();
|
|
});
|
|
rx.recv().unwrap().expect("Should return hash")
|
|
});
|
|
|
|
let id = U256::from(1);
|
|
while queue.peek(&id).is_none() {
|
|
// Just wait for the other thread to start
|
|
thread::sleep(Duration::from_millis(100));
|
|
}
|
|
queue.request_confirmed(id, Ok(ConfirmationResponse::SendTransaction(1.into())));
|
|
|
|
// then
|
|
assert_eq!(handle.join().expect("Thread should finish nicely"), Ok(ConfirmationResponse::SendTransaction(1.into())));
|
|
}
|
|
|
|
#[test]
|
|
fn should_receive_notification() {
|
|
// given
|
|
let received = Arc::new(Mutex::new(vec![]));
|
|
let queue = Arc::new(ConfirmationsQueue::default());
|
|
let request = request();
|
|
|
|
// when
|
|
let r = received.clone();
|
|
queue.on_event(move |notification| {
|
|
r.lock().push(notification);
|
|
});
|
|
queue.add_request(request, Default::default()).unwrap();
|
|
queue.finish();
|
|
|
|
// then
|
|
let r = received.lock();
|
|
assert_eq!(r[0], QueueEvent::NewRequest(U256::from(1)));
|
|
assert_eq!(r[1], QueueEvent::Finish);
|
|
assert_eq!(r.len(), 2);
|
|
}
|
|
|
|
#[test]
|
|
fn should_add_transactions() {
|
|
// given
|
|
let queue = ConfirmationsQueue::default();
|
|
let request = request();
|
|
|
|
// when
|
|
queue.add_request(request.clone(), Default::default()).unwrap();
|
|
let all = queue.requests();
|
|
|
|
// then
|
|
assert_eq!(all.len(), 1);
|
|
let el = all.get(0).unwrap();
|
|
assert_eq!(el.id, U256::from(1));
|
|
assert_eq!(el.payload, request);
|
|
}
|
|
}
|