update squid API and add endpoints

Cargo.lock

@@ -2092,7 +2092,7 @@ dependencies = [
 
 [[package]]
 name = "gcli"
-version = "0.2.12"
+version = "0.2.15"
 dependencies = [
  "age",
  "anyhow",

Cargo.toml

@@ -10,7 +10,7 @@ license = "AGPL-3.0-only"
 name = "gcli"
 repository = "https://git.duniter.org/clients/rust/gcli-v2s"
 description = "A command-line interface for Duniter v2s uses"
-version = "0.2.12"
+version = "0.2.15"
 
 [dependencies]
 # subxt is main dependency

doc/config.md

@@ -12,7 +12,7 @@ gcli config show
 # [stdout]
 # Ğcli config
 # duniter endpoint ws://localhost:9944
-# indexer endpoint http://localhost:4350/graphql
+# indexer endpoint http://localhost:8080/v1/graphql
 # address 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY
 
 # use different address in command line
@@ -20,7 +20,7 @@ gcli --address 5Fxune7f71ZbpP2FoY3mhYcmM596Erhv1gRue4nsPwkxMR4n config show
 # [stdout]
 # Ğcli config
 # duniter endpoint ws://localhost:9944
-# indexer endpoint http://localhost:4350/graphql
+# indexer endpoint http://localhost:8080/v1/graphql
 # address 5Fxune7f71ZbpP2FoY3mhYcmM596Erhv1gRue4nsPwkxMR4n
 ```
 

res/README.md

@@ -8,7 +8,7 @@ Update the schema with:
 # install graphql client cli
 cargo install graphql_client_cli
 # download schema from node
-graphql-client introspect-schema https://subsquid.gdev.coinduf.eu/graphql --output ./res/indexer-schema.json
+graphql-client introspect-schema https://squid.gdev.coinduf.eu/v1/graphql --output ./res/indexer-schema.json
 ```
 
 ...

res/indexer-queries.graphql

@@ -14,18 +14,12 @@ query NamesByIndexes($indexes: [Int!]!) {
 query IdentityInfo($index: Int!) {
   identity(where: { index: { _eq: $index } }) {
     name
-    certIssued(
-      orderBy: { expireOn: DESC }
-      where: { isActive: { _eq: true } }
-    ) {
+    certIssued(orderBy: { expireOn: DESC }, where: { isActive: { _eq: true } }) {
       receiver {
         name
       }
     }
-    certReceived(
-      orderBy: { expireOn: DESC }
-      where: { isActive: { _eq: true } }
-    ) {
+    certReceived(orderBy: { expireOn: DESC }, where: { isActive: { _eq: true } }) {
       issuer {
         name
       }
@@ -33,14 +27,21 @@ query IdentityInfo($index: Int!) {
     linkedAccount {
       id
     }
-    smithCertIssued(orderBy: { createdOn: DESC }) {
-      receiver {
-        name
+    smith {
+      smithStatus
+      smithCertIssued(orderBy: { createdOn: DESC }) {
+        receiver {
+          identity {
+            name
+          }
+        }
       }
-    }
-    smithCertReceived(orderBy: { createdOn: DESC }) {
-      issuer {
-        name
+      smithCertReceived(orderBy: { createdOn: DESC }) {
+        issuer {
+          identity {
+            name
+          }
+        }
       }
     }
   }

src/commands/identity.rs

@@ -297,44 +297,51 @@ pub async fn get_identity(
 		.expect("expected cert meta");
 
 	// get certs if possible
-	let (cert_issued, cert_received, linked_account, smith_cert_issued, smith_cert_received) =
-		if let Some(indexer) = &indexer {
-			let info = indexer.identity_info(index).await.expect("no info");
-			(
-				info.cert_issued
-					.into_iter()
-					.map(|i| i.receiver.unwrap().name.to_string())
-					.collect(),
-				info.cert_received
-					.into_iter()
-					.map(|i| i.issuer.unwrap().name.to_string())
-					.collect(),
-				info.linked_account
-					.into_iter()
-					.map(|i| AccountId::from_str(&i.id).unwrap())
-					.collect(),
-				info.smith_cert_issued
-					.into_iter()
-					.map(|i| i.receiver.unwrap().name.to_string())
-					.collect(),
-				info.smith_cert_received
-					.into_iter()
-					.map(|i| i.issuer.unwrap().name.to_string())
-					.collect(),
-			)
-		} else {
-			(vec![], vec![], vec![], vec![], vec![])
-		};
+	let (cert_issued, cert_received, linked_account, smith_info) = if let Some(indexer) = &indexer {
+		let info = indexer.identity_info(index).await.expect("no info");
+		(
+			info.cert_issued
+				.into_iter()
+				.map(|i| i.receiver.unwrap().name.to_string())
+				.collect(),
+			info.cert_received
+				.into_iter()
+				.map(|i| i.issuer.unwrap().name.to_string())
+				.collect(),
+			info.linked_account
+				.into_iter()
+				.map(|i| AccountId::from_str(&i.id).unwrap())
+				.collect(),
+			info.smith,
+		)
+	} else {
+		(vec![], vec![], vec![], None)
+	};
 
 	// get smith info
-	let smith = get_smith(client, index).await?;
-	let smith = smith.map(|s| SmithView {
-		status: s.status,
-		cert_issued_count: s.issued_certs.len(),
-		cert_issued: smith_cert_issued,
-		cert_received_count: s.received_certs.len(),
-		cert_received: smith_cert_received,
-	});
+	let smith_meta = get_smith(client, index).await?;
+
+	let smith = match (smith_meta, smith_info) {
+		(None, None) => Ok(None),
+		(Some(s), Some(i)) => Ok(Some(SmithView {
+			status: s.status,
+			cert_issued_count: s.issued_certs.len(),
+			cert_issued: i
+				.smith_cert_issued
+				.into_iter()
+				.map(|i| i.receiver.unwrap().identity.unwrap().name.to_string())
+				.collect(),
+			cert_received_count: s.received_certs.len(),
+			cert_received: i
+				.smith_cert_received
+				.into_iter()
+				.map(|i| i.issuer.unwrap().identity.unwrap().name.to_string())
+				.collect(),
+		})),
+		_ => Err(GcliError::Indexer(
+			"Duniter and Indexer do not agree if x is smith".to_string(),
+		)),
+	}?;
 
 	// build view
 	let view = IdtyView {

src/data.rs

@@ -17,8 +17,9 @@ pub const GDEV_DUNITER_ENDPOINTS: [&str; 5] = [
 	"wss://gdev.pini.fr:443/ws",
 ];
 #[cfg(feature = "gdev")]
-pub const GDEV_INDEXER_ENDPOINTS: [&str; 1] = [
-	// "https://subsquid.gdev.coinduf.eu/v1/graphql",
+pub const GDEV_INDEXER_ENDPOINTS: [&str; 2] = [
+	// "https://squid.gdev.coinduf.eu/v1/graphql",
+	"https://squid.gdev.gyroi.de/v1/graphql",
 	"https://gdev-squid.axiom-team.fr/v1/graphql",
 ];
 

src/indexer.rs

@@ -20,11 +20,13 @@ impl Indexer {
 		&self,
 		var: <T as GraphQLQuery>::Variables,
 	) -> <T as GraphQLQuery>::ResponseData {
-		post_graphql::<T, _>(&self.gql_client, &self.gql_url, var)
+		let response = post_graphql::<T, _>(&self.gql_client, &self.gql_url, var)
 			.await
-			.expect("indexer connexion error")
-			.data
-			.expect("indexer error")
+			.expect("indexer connexion error");
+		if let Some(errs) = response.errors {
+			log::debug!("{:?}", errs)
+		}
+		response.data.expect("indexer error")
 	}
 
 	/// index → name

src/indexer/queries.rs

@@ -37,7 +37,7 @@ macro_rules! graphql_query {
 		pub struct $name;
 	};
 }
-
+ 
 // repeat generation for multiple queries
 macro_rules! graphql_query_for {
     ( $($Name:ident),+ ) => {