Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Hook RPC extrinsic import into propagation #158

Merged
gavofyork merged 6 commits into from
May 15, 2018
Merged

Hook RPC extrinsic import into propagation #158

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ceacd3d
call `on_new_transactions` when we import
rphmeier May 14, 2018
cb7013e
fix trace
rphmeier May 14, 2018
b5a4fed
pass correct bytes to network
rphmeier May 14, 2018
69f0bb3
clean up
rphmeier May 14, 2018
c3571df
cull before repropagating; repropagate on timer
rphmeier May 14, 2018
4951533
add a little tracing
rphmeier May 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
pass correct bytes to network
  • Loading branch information
@rphmeier
rphmeier committed May 14, 2018
commit b5a4fed20d2f80334742ee12012c5df02d9bcbe2
11 changes: 7 additions & 4 deletions polkadot/cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,17 @@ impl substrate_rpc::author::AuthorApi for RpcTransactionPool {
use codec::Slicable;

info!("Extrinsic submitted: {}", HexDisplay::from(&xt.0));
let decoded = xt.using_encoded(|ref mut s| UncheckedExtrinsic::decode(s))
let (decoded, encoded_bytes) = xt.using_encoded(|s| {
UncheckedExtrinsic::decode(&mut &s[..]).map(|d| (d, s.to_vec()))
})
.ok_or(substrate_rpc::author::error::ErrorKind::InvalidFormat)?;
info!("Correctly formatted: {:?}", decoded);
let verified = self.inner.lock().import(decoded)

let hash = self.inner.lock().import(decoded)
.map(|v| v.hash().0.into())
.map_err(|_| substrate_rpc::author::error::ErrorKind::PoolError)?;

let hash = verified.hash();
self.network.on_new_transactions(&[(hash.0.into(), xt.0)]);
self.network.on_new_transactions(&[(hash, encoded_bytes)]);
Copy link
Member

@gavofyork gavofyork May 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this would end up propagating stale transactions; we might want to ensure cull is called first and propagate only after it is clear that the tx wasn't discarded.

Ok(())
}
}
Expand Down