Update subxt to 0.30.1 with new subxt-signer crate

crates/cargo-contract/Cargo.toml

@@ -34,7 +34,7 @@ url = { version = "2.4.0", features = ["serde"] }
 
 # dependencies for extrinsics (deploying and calling a contract)
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
-subxt = "0.29.0"
+subxt = "0.30.1"
 hex = "0.4.3"
 
 [build-dependencies]

crates/extrinsics/Cargo.toml

@@ -33,6 +33,7 @@ sp-runtime = "24.0.0"
 sp-weights = "20.0.0"
 pallet-contracts-primitives = "24.0.0"
 scale-info = "2.8.0"
-subxt = "0.29.0"
+subxt = "0.30.1"
+subxt-signer = { version = "0.30.1", features = ["subxt", "sr25519"] }
 hex = "0.4.3"
 jsonrpsee = { version = "0.19.0", features = ["ws-client"] }

crates/extrinsics/src/call.rs

@@ -30,7 +30,6 @@ use super::{
     DefaultConfig,
     ErrorVariant,
     ExtrinsicOpts,
-    PairSigner,
     StorageDeposit,
     TokenMetadata,
     DEFAULT_KEY_COL_WIDTH,
@@ -56,6 +55,7 @@ use subxt::{
     Config,
     OnlineClient,
 };
+use subxt_signer::sr25519::Keypair;
 
 #[derive(Debug, clap::Args)]
 #[clap(name = "call", about = "Call a contract")]
@@ -101,7 +101,7 @@ impl CallCommand {
         let call_data = transcoder.encode(&self.message, &self.args)?;
         tracing::debug!("Message data: {:?}", hex::encode(&call_data));
 
-        let signer = super::pair_signer(self.extrinsic_opts.signer()?);
+        let signer = self.extrinsic_opts.signer()?;
 
         Runtime::new()?
             .block_on(async {
@@ -168,7 +168,7 @@ impl CallCommand {
         &self,
         input_data: Vec<u8>,
         client: &Client,
-        signer: &PairSigner,
+        signer: &Keypair,
     ) -> Result<ContractExecResult<Balance, ()>> {
         let url = self.extrinsic_opts.url_to_string();
         let token_metadata = TokenMetadata::query(client).await?;
@@ -179,7 +179,7 @@ impl CallCommand {
             .map(|bv| bv.denominate_balance(&token_metadata))
             .transpose()?;
         let call_request = CallRequest {
-            origin: signer.account_id().clone(),
+            origin: subxt::tx::Signer::<DefaultConfig>::account_id(signer),
             dest: self.contract.clone(),
             value: self.value.denominate_balance(&token_metadata)?,
             gas_limit: None,
@@ -193,7 +193,7 @@ impl CallCommand {
         &self,
         client: &Client,
         data: Vec<u8>,
-        signer: &PairSigner,
+        signer: &Keypair,
         transcoder: &ContractMessageTranscoder,
     ) -> Result<(), ErrorVariant> {
         tracing::debug!("calling contract {:?}", self.contract);
@@ -245,7 +245,7 @@ impl CallCommand {
         &self,
         client: &Client,
         data: Vec<u8>,
-        signer: &PairSigner,
+        signer: &Keypair,
     ) -> Result<Weight> {
         if self.extrinsic_opts.skip_dry_run {
             return match (self.gas_limit, self.proof_size) {

crates/extrinsics/src/instantiate.rs

@@ -31,7 +31,6 @@ use super::{
     DefaultConfig,
     ErrorVariant,
     ExtrinsicOpts,
-    PairSigner,
     StorageDeposit,
     TokenMetadata,
     DEFAULT_KEY_COL_WIDTH,
@@ -59,6 +58,7 @@ use subxt::{
     Config,
     OnlineClient,
 };
+use subxt_signer::sr25519::Keypair;
 use tokio::runtime::Runtime;
 
 #[derive(Debug, clap::Args)]
@@ -111,7 +111,7 @@ impl InstantiateCommand {
         let artifacts = self.extrinsic_opts.contract_artifacts()?;
         let transcoder = artifacts.contract_transcoder()?;
         let data = transcoder.encode(&self.constructor, &self.args)?;
-        let signer = super::pair_signer(self.extrinsic_opts.signer()?);
+        let signer = self.extrinsic_opts.signer()?;
         let url = self.extrinsic_opts.url_to_string();
         let verbosity = self.extrinsic_opts.verbosity()?;
         let code = if let Some(code) = artifacts.code {
@@ -184,7 +184,7 @@ pub struct Exec {
     verbosity: Verbosity,
     url: String,
     client: Client,
-    signer: PairSigner,
+    signer: Keypair,
     transcoder: ContractMessageTranscoder,
     output_json: bool,
 }
@@ -364,7 +364,7 @@ impl Exec {
     > {
         let storage_deposit_limit = self.args.storage_deposit_limit;
         let call_request = InstantiateRequest {
-            origin: self.signer.account_id().clone(),
+            origin: subxt::tx::Signer::<DefaultConfig>::account_id(&self.signer),
             value: self.args.value,
             gas_limit: None,
             storage_deposit_limit,

crates/extrinsics/src/lib.rs

@@ -62,11 +62,7 @@ use scale::{
     Decode,
     Encode,
 };
-use sp_core::{
-    crypto::Pair,
-    sr25519,
-    Bytes,
-};
+use sp_core::Bytes;
 use sp_weights::Weight;
 use subxt::{
     blocks,
@@ -75,6 +71,10 @@ use subxt::{
     Config,
     OnlineClient,
 };
+use subxt_signer::{
+    sr25519::Keypair,
+    SecretUri,
+};
 
 use std::{
     option::Option,
@@ -97,7 +97,6 @@ pub use remove::RemoveCommand;
 pub use subxt::PolkadotConfig as DefaultConfig;
 pub use upload::UploadCommand;
 
-type PairSigner = tx::PairSigner<DefaultConfig, sr25519::Pair>;
 pub type Client = OnlineClient<DefaultConfig>;
 pub type Balance = u128;
 pub type CodeHash = <DefaultConfig as Config>::Hash;
@@ -121,11 +120,12 @@ pub struct ExtrinsicOpts {
     )]
     url: url::Url,
     /// Secret key URI for the account deploying the contract.
+    ///
+    /// e.g.
+    /// - for a dev account "//Alice"
+    /// - with a password "//Alice///SECRET_PASSWORD"
     #[clap(name = "suri", long, short)]
     suri: String,
-    /// Password for the secret key.
-    #[clap(name = "password", long, short)]
-    password: Option<String>,
     #[clap(flatten)]
     verbosity: VerbosityFlags,
     /// Submit the extrinsic for on-chain execution.
@@ -153,9 +153,10 @@ impl ExtrinsicOpts {
     }
 
     /// Returns the signer for contract extrinsics.
-    pub fn signer(&self) -> Result<sr25519::Pair> {
-        Pair::from_string(&self.suri, self.password.as_ref().map(String::as_ref))
-            .map_err(|_| anyhow::anyhow!("Secret string error"))
+    pub fn signer(&self) -> Result<Keypair> {
+        let uri = <SecretUri as std::str::FromStr>::from_str(&self.suri)?;
+        let keypair = Keypair::from_uri(&uri)?;
+        Ok(keypair)
     }
 
     /// Returns the verbosity
@@ -320,11 +321,6 @@ impl WasmCode {
     }
 }
 
-/// Create a new `PairSigner` from the given [`sr25519::Pair`].
-pub fn pair_signer(pair: sr25519::Pair) -> PairSigner {
-    PairSigner::new(pair)
-}
-
 const STORAGE_DEPOSIT_KEY: &str = "Storage Deposit";
 pub const MAX_KEY_COL_WIDTH: usize = STORAGE_DEPOSIT_KEY.len() + 1;
 
@@ -399,8 +395,7 @@ where
     T: Config,
     Call: tx::TxPayload,
     Signer: tx::Signer<T>,
-    <T::ExtrinsicParams as config::ExtrinsicParams<T::Index, T::Hash>>::OtherParams:
-        Default,
+    <T::ExtrinsicParams as config::ExtrinsicParams<T::Hash>>::OtherParams: Default,
 {
     client
         .tx()

crates/extrinsics/src/remove.rs

@@ -29,7 +29,6 @@ use super::{
     DefaultConfig,
     ErrorVariant,
     ExtrinsicOpts,
-    PairSigner,
     TokenMetadata,
 };
 use anyhow::Result;
@@ -38,6 +37,7 @@ use subxt::{
     Config,
     OnlineClient,
 };
+use subxt_signer::sr25519::Keypair;
 use tokio::runtime::Runtime;
 
 #[derive(Debug, clap::Args)]
@@ -61,7 +61,7 @@ impl RemoveCommand {
     pub fn run(&self) -> Result<(), ErrorVariant> {
         let artifacts = self.extrinsic_opts.contract_artifacts()?;
         let transcoder = artifacts.contract_transcoder()?;
-        let signer = super::pair_signer(self.extrinsic_opts.signer()?);
+        let signer = self.extrinsic_opts.signer()?;
 
         let artifacts_path = artifacts.artifact_path().to_path_buf();
 
@@ -117,7 +117,7 @@ impl RemoveCommand {
         &self,
         client: &Client,
         code_hash: CodeHash,
-        signer: &PairSigner,
+        signer: &Keypair,
         transcoder: &ContractMessageTranscoder,
     ) -> Result<Option<CodeRemoved>, ErrorVariant> {
         let call = api::tx()

crates/extrinsics/src/upload.rs

@@ -30,7 +30,6 @@ use super::{
     DefaultConfig,
     ErrorVariant,
     ExtrinsicOpts,
-    PairSigner,
     TokenMetadata,
     WasmCode,
 };
@@ -42,6 +41,7 @@ use subxt::{
     Config,
     OnlineClient,
 };
+use subxt_signer::sr25519::Keypair;
 use tokio::runtime::Runtime;
 
 #[derive(Debug, clap::Args)]
@@ -61,7 +61,7 @@ impl UploadCommand {
 
     pub fn run(&self) -> Result<(), ErrorVariant> {
         let artifacts = self.extrinsic_opts.contract_artifacts()?;
-        let signer = super::pair_signer(self.extrinsic_opts.signer()?);
+        let signer = self.extrinsic_opts.signer()?;
 
         let artifacts_path = artifacts.artifact_path().to_path_buf();
         let code = artifacts.code.ok_or_else(|| {
@@ -128,7 +128,7 @@ impl UploadCommand {
         &self,
         code: WasmCode,
         client: &Client,
-        signer: &PairSigner,
+        signer: &Keypair,
     ) -> Result<CodeUploadResult<CodeHash, Balance>> {
         let url = self.extrinsic_opts.url_to_string();
         let token_metadata = TokenMetadata::query(client).await?;
@@ -139,7 +139,7 @@ impl UploadCommand {
             .map(|bv| bv.denominate_balance(&token_metadata))
             .transpose()?;
         let call_request = CodeUploadRequest {
-            origin: signer.account_id().clone(),
+            origin: subxt::tx::Signer::<DefaultConfig>::account_id(signer),
             code: code.0,
             storage_deposit_limit,
             determinism: Determinism::Enforced,
@@ -151,7 +151,7 @@ impl UploadCommand {
         &self,
         client: &Client,
         code: WasmCode,
-        signer: &PairSigner,
+        signer: &Keypair,
     ) -> Result<Option<api::contracts::events::CodeStored>, ErrorVariant> {
         let token_metadata = TokenMetadata::query(client).await?;
         let storage_deposit_limit =