update subxt dependency

Cargo.toml

@@ -14,15 +14,15 @@ version = "0.2.15"
 
 [dependencies]
 # subxt is main dependency
-subxt = { git = 'https://github.com/duniter/subxt', branch = 'subxt-v0.35.3-duniter-substrate-v1.11.0', default-features = false, features = [
+subxt = { git = 'https://github.com/duniter/subxt', branch = 'subxt-v0.37.0-duniter-substrate-v1.14.0', default-features = false, features = [
     "substrate-compat",
     "native",
     "jsonrpsee",
 ] }
 
 # substrate primitives dependencies
-sp-core = { git = "https://github.com/duniter/duniter-polkadot-sdk.git", branch = "duniter-substrate-v1.11.0" }
-sp-runtime = { git = "https://github.com/duniter/duniter-polkadot-sdk.git", branch = "duniter-substrate-v1.11.0" }
+sp-core = { git = "https://github.com/duniter/duniter-polkadot-sdk.git", branch = "duniter-substrate-v1.14.0" }
+sp-runtime = { git = "https://github.com/duniter/duniter-polkadot-sdk.git", branch = "duniter-substrate-v1.14.0" }
 
 # crates.io dependencies
 anyhow = "^1.0"

src/commands/account.rs

@@ -87,7 +87,7 @@ pub async fn get_account_info(
 pub async fn unlink_account(data: &Data) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::account::events::AccountUnlinked,
-		Payload<runtime::account::calls::types::UnlinkIdentity>,
+		StaticPayload<runtime::account::calls::types::UnlinkIdentity>,
 	>(data, &runtime::tx().account().unlink_identity())
 	.await
 }

src/commands/certification.rs

@@ -4,7 +4,7 @@ use crate::*;
 pub async fn certify(data: &Data, target: IdtyId) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::certification::events::CertAdded,
-		Payload<runtime::certification::calls::types::AddCert>,
+		StaticPayload<runtime::certification::calls::types::AddCert>,
 	>(data, &runtime::tx().certification().add_cert(target))
 	.await
 }
@@ -13,7 +13,7 @@ pub async fn certify(data: &Data, target: IdtyId) -> Result<(), subxt::Error> {
 pub async fn renew(data: &Data, target: IdtyId) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::certification::events::CertRenewed,
-		Payload<runtime::certification::calls::types::RenewCert>,
+		StaticPayload<runtime::certification::calls::types::RenewCert>,
 	>(data, &runtime::tx().certification().renew_cert(target))
 	.await
 }

src/commands/collective.rs

@@ -125,7 +125,7 @@ pub async fn technical_committee_vote(
 ) -> anyhow::Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::technical_committee::events::Voted,
-		Payload<runtime::technical_committee::calls::types::Vote>,
+		StaticPayload<runtime::technical_committee::calls::types::Vote>,
 	>(
 		data,
 		&runtime::tx()
@@ -147,7 +147,7 @@ pub async fn technical_committee_propose(
 
 	submit_call_and_look_event::<
 		runtime::technical_committee::events::Proposed,
-		Payload<runtime::technical_committee::calls::types::Propose>,
+		StaticPayload<runtime::technical_committee::calls::types::Propose>,
 	>(data, &payload)
 	.await
 }

src/commands/distance.rs

@@ -4,7 +4,7 @@ use crate::*;
 pub async fn request_distance_evaluation(data: &Data) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::distance::events::EvaluationRequested,
-		Payload<runtime::distance::calls::types::RequestDistanceEvaluation>,
+		StaticPayload<runtime::distance::calls::types::RequestDistanceEvaluation>,
 	>(
 		data,
 		&runtime::tx().distance().request_distance_evaluation(),
@@ -19,7 +19,7 @@ pub async fn request_distance_evaluation_for(
 ) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::distance::events::EvaluationRequested,
-		Payload<runtime::distance::calls::types::RequestDistanceEvaluationFor>,
+		StaticPayload<runtime::distance::calls::types::RequestDistanceEvaluationFor>,
 	>(
 		data,
 		&runtime::tx()

src/commands/identity.rs

@@ -438,7 +438,7 @@ pub async fn get_identity_by_index(
 pub async fn create_identity(data: &Data, target: AccountId) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::identity::events::IdtyCreated,
-		Payload<runtime::identity::calls::types::CreateIdentity>,
+		StaticPayload<runtime::identity::calls::types::CreateIdentity>,
 	>(data, &runtime::tx().identity().create_identity(target))
 	.await
 }
@@ -447,7 +447,7 @@ pub async fn create_identity(data: &Data, target: AccountId) -> Result<(), subxt
 pub async fn confirm_identity(data: &Data, name: String) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::identity::events::IdtyConfirmed,
-		Payload<runtime::identity::calls::types::ConfirmIdentity>,
+		StaticPayload<runtime::identity::calls::types::ConfirmIdentity>,
 	>(
 		data,
 		&runtime::tx()
@@ -468,7 +468,7 @@ pub async fn revoke_identity(data: &Data) -> Result<(), subxt::Error> {
 
 	submit_call_and_look_event::<
 		runtime::identity::events::IdtyRemoved,
-		Payload<runtime::identity::calls::types::RevokeIdentity>,
+		StaticPayload<runtime::identity::calls::types::RevokeIdentity>,
 	>(
 		data,
 		&runtime::tx()
@@ -546,7 +546,7 @@ pub async fn link_account(
 
 	submit_call_and_look_event::<
 		runtime::account::events::AccountLinked,
-		Payload<runtime::identity::calls::types::LinkAccount>,
+		StaticPayload<runtime::identity::calls::types::LinkAccount>,
 	>(
 		data,
 		&runtime::tx().identity().link_account(address, signature),
@@ -575,7 +575,7 @@ pub async fn change_owner_key(
 
 	submit_call_and_look_event::<
 		runtime::identity::events::IdtyChangedOwnerKey,
-		Payload<runtime::identity::calls::types::ChangeOwnerKey>,
+		StaticPayload<runtime::identity::calls::types::ChangeOwnerKey>,
 	>(
 		data,
 		&runtime::tx()

src/commands/oneshot.rs

@@ -93,7 +93,7 @@ pub async fn create_oneshot_account(
 ) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::oneshot_account::events::OneshotAccountCreated,
-		Payload<runtime::oneshot_account::calls::types::CreateOneshotAccount>,
+		StaticPayload<runtime::oneshot_account::calls::types::CreateOneshotAccount>,
 	>(
 		data,
 		&runtime::tx()
@@ -127,7 +127,7 @@ pub async fn consume_oneshot_account(
 	);
 	submit_call_and_look_event::<
 		runtime::oneshot_account::events::OneshotAccountConsumed,
-		Payload<runtime::oneshot_account::calls::types::ConsumeOneshotAccount>,
+		StaticPayload<runtime::oneshot_account::calls::types::ConsumeOneshotAccount>,
 	>(data, payload)
 	.await
 }
@@ -174,7 +174,7 @@ pub async fn consume_oneshot_account_with_remaining(
 
 	submit_call_and_look_event::<
 		runtime::oneshot_account::events::OneshotAccountConsumed,
-		Payload<runtime::oneshot_account::calls::types::ConsumeOneshotAccountWithRemaining>,
+		StaticPayload<runtime::oneshot_account::calls::types::ConsumeOneshotAccountWithRemaining>,
 	>(data, payload)
 	.await
 }

src/commands/smith.rs

@@ -131,7 +131,7 @@ pub async fn set_session_keys(
 	data: &Data,
 	session_keys: RuntimeSessionKeys,
 ) -> Result<TxProgress, subxt::Error> {
-	submit_call::<Payload<runtime::authority_members::calls::types::SetSessionKeys>>(
+	submit_call::<StaticPayload<runtime::authority_members::calls::types::SetSessionKeys>>(
 		data,
 		&runtime::tx()
 			.authority_members()
@@ -174,7 +174,7 @@ pub async fn go_online(data: &Data) -> Result<(), GcliError> {
 
 	submit_call_and_look_event::<
 		runtime::authority_members::events::MemberGoOnline,
-		Payload<runtime::authority_members::calls::types::GoOnline>,
+		StaticPayload<runtime::authority_members::calls::types::GoOnline>,
 	>(data, &runtime::tx().authority_members().go_online())
 	.await
 	.map_err(|e| e.into())
@@ -184,7 +184,7 @@ pub async fn go_online(data: &Data) -> Result<(), GcliError> {
 pub async fn go_offline(data: &Data) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::authority_members::events::MemberGoOffline,
-		Payload<runtime::authority_members::calls::types::GoOffline>,
+		StaticPayload<runtime::authority_members::calls::types::GoOffline>,
 	>(data, &runtime::tx().authority_members().go_offline())
 	.await
 }
@@ -285,7 +285,7 @@ pub async fn online(data: &Data) -> Result<(), anyhow::Error> {
 pub async fn invite_smith(data: &Data, target: IdtyId) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::smith_members::events::InvitationSent,
-		Payload<runtime::smith_members::calls::types::InviteSmith>,
+		StaticPayload<runtime::smith_members::calls::types::InviteSmith>,
 	>(data, &runtime::tx().smith_members().invite_smith(target))
 	.await
 }
@@ -294,7 +294,7 @@ pub async fn invite_smith(data: &Data, target: IdtyId) -> Result<(), subxt::Erro
 pub async fn accept_invitation(data: &Data) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::smith_members::events::InvitationAccepted,
-		Payload<runtime::smith_members::calls::types::AcceptInvitation>,
+		StaticPayload<runtime::smith_members::calls::types::AcceptInvitation>,
 	>(data, &runtime::tx().smith_members().accept_invitation())
 	.await
 }
@@ -303,7 +303,7 @@ pub async fn accept_invitation(data: &Data) -> Result<(), subxt::Error> {
 pub async fn certify_smith(data: &Data, target: IdtyId) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::smith_members::events::SmithCertAdded,
-		Payload<runtime::smith_members::calls::types::CertifySmith>,
+		StaticPayload<runtime::smith_members::calls::types::CertifySmith>,
 	>(data, &runtime::tx().smith_members().certify_smith(target))
 	.await
 }

src/commands/sudo.rs

@@ -33,7 +33,7 @@ pub async fn handle_command(data: Data, command: Subcommand) -> Result<(), GcliE
 pub async fn set_key(data: &Data, new_key: AccountId) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::sudo::events::KeyChanged,
-		Payload<runtime::sudo::calls::types::SetKey>,
+		StaticPayload<runtime::sudo::calls::types::SetKey>,
 	>(data, &runtime::tx().sudo().set_key(new_key.into()))
 	.await
 }
@@ -44,7 +44,7 @@ pub async fn set_distance_ok(data: &Data, identity: IdtyId) -> Result<(), subxt:
 	let inner = runtime::Call::Distance(inner);
 	submit_call_and_look_event::<
 		runtime::sudo::events::Sudid,
-		Payload<runtime::sudo::calls::types::Sudo>,
+		StaticPayload<runtime::sudo::calls::types::Sudo>,
 	>(data, &runtime::tx().sudo().sudo(inner))
 	.await
 }

src/commands/transfer.rs

@@ -16,7 +16,7 @@ pub async fn transfer(
 		(true, false) => {
 			submit_call_and_look_event::<
 				runtime::balances::events::Transfer,
-				Payload<runtime::balances::calls::types::TransferKeepAlive>,
+				StaticPayload<runtime::balances::calls::types::TransferKeepAlive>,
 			>(
 				data,
 				&runtime::tx()
@@ -28,7 +28,7 @@ pub async fn transfer(
 		(false, false) => {
 			submit_call_and_look_event::<
 				runtime::balances::events::Transfer,
-				Payload<runtime::balances::calls::types::TransferAllowDeath>,
+				StaticPayload<runtime::balances::calls::types::TransferAllowDeath>,
 			>(
 				data,
 				&runtime::tx()
@@ -40,7 +40,7 @@ pub async fn transfer(
 		(true, true) => {
 			submit_call_and_look_event::<
 				runtime::balances::events::Transfer,
-				Payload<runtime::universal_dividend::calls::types::TransferUdKeepAlive>,
+				StaticPayload<runtime::universal_dividend::calls::types::TransferUdKeepAlive>,
 			>(
 				data,
 				&runtime::tx()
@@ -52,7 +52,7 @@ pub async fn transfer(
 		(false, true) => {
 			submit_call_and_look_event::<
 				runtime::balances::events::Transfer,
-				Payload<runtime::universal_dividend::calls::types::TransferUd>,
+				StaticPayload<runtime::universal_dividend::calls::types::TransferUd>,
 			>(
 				data,
 				&runtime::tx()
@@ -83,7 +83,7 @@ pub async fn transfer_multiple(
 	// wrap these calls in a batch call
 	submit_call_and_look_event::<
 		runtime::utility::events::BatchCompleted,
-		Payload<runtime::utility::calls::types::Batch>,
+		StaticPayload<runtime::utility::calls::types::Batch>,
 	>(data, &runtime::tx().utility().batch(transactions))
 	.await
 }

src/commands/ud.rs

@@ -26,7 +26,7 @@ pub async fn handle_command(data: Data, command: Subcommand) -> Result<(), GcliE
 pub async fn claim_ud(data: &Data) -> Result<(), subxt::Error> {
 	submit_call_and_look_event::<
 		runtime::universal_dividend::events::UdsClaimed,
-		Payload<runtime::universal_dividend::calls::types::ClaimUds>,
+		StaticPayload<runtime::universal_dividend::calls::types::ClaimUds>,
 	>(data, &runtime::tx().universal_dividend().claim_uds())
 	.await
 }

src/conf.rs

@@ -86,7 +86,7 @@ pub fn handle_command(data: Data, command: Subcommand) -> Result<(), GcliError>
 		}
 		Subcommand::Save => {
 			confy::store(APP_NAME, None, &data.cfg).expect("unable to write config");
-                        println!("Configuration updated!");
+			println!("Configuration updated!");
 		}
 		Subcommand::Default => {
 			confy::store(APP_NAME, None, Config::default()).expect("unable to write config");

src/indexer/queries.rs

@@ -20,8 +20,7 @@ impl<'de> Deserialize<'de> for Bytea {
 		// Deserialize as a string
 		let hex_string = String::deserialize(deserializer)?;
 		// Parse the hexadecimal string into a byte vector
-		let bytes =
-			hex::decode(hex_string[2..].to_string()).map_err(|e| serde::de::Error::custom(e))?;
+		let bytes = hex::decode(&hex_string[2..]).map_err(serde::de::Error::custom)?;
 		Ok(Bytea { bytes })
 	}
 }
@@ -37,7 +36,7 @@ macro_rules! graphql_query {
 		pub struct $name;
 	};
 }
- 
+
 // repeat generation for multiple queries
 macro_rules! graphql_query_for {
     ( $($Name:ident),+ ) => {

src/main.rs

@@ -22,10 +22,13 @@ use subxt::{
 	config::DefaultExtrinsicParamsBuilder,
 	events::StaticEvent,
 	ext::sp_core::{sr25519, Pair as _},
-	tx::{PairSigner, Payload, TxPayload, TxStatus},
+	tx::{DefaultPayload, PairSigner, Payload, TxStatus},
 };
 use utils::*;
 
+// alias
+pub type StaticPayload<Calldata> = DefaultPayload<Calldata>;
+
 /// define command line arguments
 #[derive(Clone, clap::Parser, Debug, Default)]
 #[clap(author, version, about, long_about = None)]

src/utils.rs

@@ -26,10 +26,10 @@ pub async fn track_progress(
 /// generic extrinsic submitter
 pub async fn submit_call_and_look_event<
 	E: std::fmt::Debug + StaticEvent + DisplayEvent,
-	Payload: TxPayload,
+	TxPayload: Payload,
 >(
 	data: &Data,
-	payload: &Payload,
+	payload: &TxPayload,
 ) -> Result<(), subxt::Error> {
 	// submit call
 	let progress = submit_call(data, payload).await?;
@@ -44,9 +44,9 @@ pub async fn submit_call_and_look_event<
 }
 
 /// submit call
-pub async fn submit_call<Payload: TxPayload>(
+pub async fn submit_call<TxPayload: Payload>(
 	data: &Data,
-	payload: &Payload,
+	payload: &TxPayload,
 ) -> Result<TxProgress, subxt::Error> {
 	// get account nonce manually to be based on last block and not last finalized
 	let nonce = data