absolutebi/serai
1
0
Fork 0
mirror of https://github.com/serai-dex/serai.git synced 2025-12-08 20:29:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't have publish return the 'hash'

Browse Source
This commit is contained in:
Luke Parker
2023-08-14 08:18:19 -04:00
parent 9895ec0f41
commit a3441a6871
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
coordinator/src/main.rs
View File

@@ -195,8 +195,8 @@ pub async fn scan_tributaries<D: Db, Pro: Processors, P: P2p>(
async move { async move {
loop { loop {
match serai.publish(&tx).await { match serai.publish(&tx).await {
Ok(hash) => { Ok(_) => {
log::info!("set key pair for {:?} in TX {}", set, hex::encode(hash)); log::info!("set key pair for {set:?}");
break; break;
} }
// This is assumed to be some ephemeral error due to the assumed fault-free // This is assumed to be some ephemeral error due to the assumed fault-free
@@ -576,13 +576,12 @@ pub async fn handle_processors<D: Db, Pro: Processors, P: P2p>(
let tx = Serai::execute_batch(batch.clone()); let tx = Serai::execute_batch(batch.clone());
loop { loop {
match serai.publish(&tx).await { match serai.publish(&tx).await {
Ok(hash) => { Ok(_) => {
log::info!( log::info!(
"executed batch {:?} {} (block {}) in TX {}", "executed batch {:?} {} (block {})",
batch.batch.network, batch.batch.network,
batch.batch.id, batch.batch.id,
hex::encode(batch.batch.block), hex::encode(batch.batch.block),
hex::encode(hash),
); );
break; break;
} }

7
substrate/client/src/serai/mod.rs
View File

@@ -300,8 +300,11 @@ impl Serai {
.map_err(|_| SeraiError::InvalidRuntime) .map_err(|_| SeraiError::InvalidRuntime)
} }
pub async fn publish(&self, tx: &Encoded) -> Result<[u8; 32], SeraiError> { pub async fn publish(&self, tx: &Encoded) -> Result<(), SeraiError> {
self.0.rpc().submit_extrinsic(tx).await.map(Into::into).map_err(SeraiError::RpcError) // Drop the hash, which is the hash of the raw TX, as TXs are allowed to share hashes and this
// hash is practically useless/unsafe
// If we are to return something, it should be block included in and position within block
self.0.rpc().submit_extrinsic(tx).await.map(|_| ()).map_err(SeraiError::RpcError)
} }
} }