Add generics for info and storage commands

crates/cargo-contract/Cargo.toml

@@ -38,6 +38,7 @@ semver = "1.0"
 jsonschema = "0.17"
 schemars = "0.8"
 ink_metadata = "5.0.0-rc"
+ink_env = "5.0.0-rc"
 crossterm = "0.27.0"
 
 # dependencies for extrinsics (deploying and calling a contract)

crates/cargo-contract/src/cmd/info.rs

@@ -26,12 +26,14 @@ use contract_extrinsics::{
     fetch_contract_info,
     fetch_wasm_code,
     url_to_string,
-    Balance,
-    CodeHash,
     ContractInfo,
     ErrorVariant,
     TrieId,
 };
+use ink_env::{
+    DefaultEnvironment,
+    Environment,
+};
 use std::{
     fmt::Debug,
     io::Write,
@@ -103,7 +105,10 @@ impl InfoCommand {
                 .as_ref()
                 .expect("Contract argument was not provided");
 
-            let info_to_json = fetch_contract_info(contract, &rpc, &client).await?;
+            let info_to_json = fetch_contract_info::<DefaultConfig, DefaultEnvironment>(
+                contract, &rpc, &client,
+            )
+            .await?;
 
             let wasm_code =
                 fetch_wasm_code(&client, &rpc, info_to_json.code_hash()).await?;
@@ -122,15 +127,19 @@ impl InfoCommand {
             } else if self.output_json {
                 println!(
                     "{}",
-                    serde_json::to_string_pretty(&ExtendedContractInfo::new(
-                        info_to_json,
-                        &wasm_code
+                    serde_json::to_string_pretty(&ExtendedContractInfo::<
+                        <DefaultConfig as Config>::Hash,
+                        <DefaultEnvironment as Environment>::Balance,
+                    >::new(
+                        info_to_json, &wasm_code
                     ))?
                 )
             } else {
-                basic_display_format_extended_contract_info(&ExtendedContractInfo::new(
-                    info_to_json,
-                    &wasm_code,
+                basic_display_format_extended_contract_info(&ExtendedContractInfo::<
+                    <DefaultConfig as Config>::Hash,
+                    <DefaultEnvironment as Environment>::Balance,
+                >::new(
+                    info_to_json, &wasm_code
                 ))
             }
             Ok(())
@@ -139,17 +148,21 @@ impl InfoCommand {
 }
 
 #[derive(serde::Serialize)]
-pub struct ExtendedContractInfo {
+pub struct ExtendedContractInfo<Hash, Balance> {
     pub trie_id: TrieId,
-    pub code_hash: CodeHash,
+    pub code_hash: Hash,
     pub storage_items: u32,
     pub storage_items_deposit: Balance,
     pub storage_total_deposit: Balance,
     pub source_language: String,
 }
 
-impl ExtendedContractInfo {
-    pub fn new(contract_info: ContractInfo, code: &[u8]) -> Self {
+impl<Hash, Balance> ExtendedContractInfo<Hash, Balance>
+where
+    Hash: serde::Serialize + Copy,
+    Balance: serde::Serialize + Copy,
+{
+    pub fn new(contract_info: ContractInfo<Hash, Balance>, code: &[u8]) -> Self {
         let language = match determine_language(code).ok() {
             Some(lang) => lang.to_string(),
             None => "Unknown".to_string(),

crates/cargo-contract/src/cmd/mod.rs

@@ -69,6 +69,7 @@ use contract_extrinsics::{
     Balance,
     BalanceVariant,
 };
+use core::fmt;
 use pallet_contracts_primitives::ContractResult;
 use std::io::{
     self,
@@ -224,7 +225,11 @@ pub fn print_gas_required_success(gas: Weight) {
 }
 
 /// Display contract information in a formatted way
-pub fn basic_display_format_extended_contract_info(info: &ExtendedContractInfo) {
+pub fn basic_display_format_extended_contract_info<Hash>(
+    info: &ExtendedContractInfo<Hash, Balance>,
+) where
+    Hash: fmt::Debug,
+{
     name_value_println!("TrieId", info.trie_id, MAX_KEY_COL_WIDTH);
     name_value_println!(
         "Code Hash",

crates/cargo-contract/src/cmd/storage.rs

@@ -28,6 +28,7 @@ use contract_extrinsics::{
     ErrorVariant,
 };
 use crossterm::terminal;
+use ink_env::DefaultEnvironment;
 use std::{
     cmp,
     path::PathBuf,
@@ -66,7 +67,8 @@ pub struct StorageCommand {
 impl StorageCommand {
     pub async fn run(&self) -> Result<(), ErrorVariant> {
         let rpc = ContractStorageRpc::<DefaultConfig>::new(&self.url).await?;
-        let storage_layout = ContractStorage::<DefaultConfig>::new(rpc);
+        let storage_layout =
+            ContractStorage::<DefaultConfig, DefaultEnvironment>::new(rpc);
 
         if self.raw {
             let storage_data = storage_layout

crates/extrinsics/Cargo.toml

@@ -41,6 +41,7 @@ subxt = "0.33.0"
 subxt-signer = { version = "0.33.0", features = ["subxt", "sr25519"] }
 hex = "0.4.3"
 ink_metadata = "5.0.0-rc"
+ink_env = "5.0.0-rc"
 
 [dev-dependencies]
 ink = "5.0.0-rc"