From cbafc15d336ecd7ceedac197481e57267c0efe26 Mon Sep 17 00:00:00 2001
From: peg <peg@magmacollective.org>
Date: Wed, 2 Oct 2024 18:08:02 +0200
Subject: [PATCH] Minor fixes to entropy-client needed for updating the status
 page (#1092)

* Use sr25519::Signature from sp-core, not subxt

* Fix conversion of sr25519::Pair to AccountId32 (subxt)
---
 crates/client/src/client.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index bf2a36ebb..5e5ace6e0 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -47,10 +47,12 @@ use base64::prelude::{Engine, BASE64_STANDARD};
 use entropy_protocol::RecoverableSignature;
 use entropy_shared::HashingAlgorithm;
 use futures::stream::StreamExt;
-use sp_core::{sr25519, Pair};
+use sp_core::{
+    sr25519::{self, Signature},
+    Pair,
+};
 use subxt::{
     backend::legacy::LegacyRpcMethods,
-    ext::sp_core::sr25519::Signature,
     utils::{AccountId32 as SubxtAccountId32, H256},
     Config, OnlineClient,
 };
@@ -327,7 +329,7 @@ pub async fn put_register_request_on_chain(
     let registered_event = registered_events
         .find::<entropy::registry::events::AccountRegistered>()
         .flatten()
-        .find_map(|event| (event.0 == signature_request_keypair.public().into()).then_some(event))
+        .find_map(|event| (event.0 == signature_request_keypair.public().0.into()).then_some(event))
         .ok_or(ClientError::NotRegistered);
 
     registered_event