Merge pull request #15 from heliaxdev/yuji/1.7.0-namada-add-key

Add Namada key to the store
heliaxdev · Nov 10, 2023 · c456adf · c456adf
2 parents dce7242 + ac3b22c
commit c456adf
Show file tree

Hide file tree

Showing 20 changed files with 369 additions and 164 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/relayer-cli/Cargo.toml b/crates/relayer-cli/Cargo.toml
@@ -55,6 +55,7 @@ tokio                    = { version = "1.0", features = ["full"] }
 tracing                  = "0.1.36"
 tracing-subscriber       = { version = "0.3.14", features = ["fmt", "env-filter", "json"]}
 time                     = "0.3"
+
 [dependencies.tendermint]
 version = "0.34.0"
 features = ["secp256k1"]

diff --git a/crates/relayer-cli/src/commands/keys/add.rs b/crates/relayer-cli/src/commands/keys/add.rs
@@ -10,9 +10,11 @@ use abscissa_core::{Command, Runnable};
 use eyre::eyre;
 use hdpath::StandardHDPath;
 use ibc_relayer::{
+    chain::namada::wallet::CliWalletUtils,
     config::{ChainConfig, Config},
     keyring::{
-        AnySigningKeyPair, KeyRing, Secp256k1KeyPair, SigningKeyPair, SigningKeyPairSized, Store,
+        AnySigningKeyPair, KeyRing, NamadaKeyPair, Secp256k1KeyPair, SigningKeyPair,
+        SigningKeyPairSized, Store,
     },
 };
 use ibc_relayer_types::core::ics24_host::identifier::ChainId;
@@ -220,8 +222,42 @@ pub fn add_key(
             keyring.add_key(key_name, key_pair.clone())?;
             key_pair.into()
         }
-        ChainConfig::Namada(_) => {
-            return Err(eyre!("Namada key cannot be added"));
+        ChainConfig::Namada(config) => {
+            let mut keyring =
+                KeyRing::new_namada(Store::Test, &config.id, &config.key_store_folder)?;
+
+            check_key_exists(&keyring, key_name, overwrite);
+
+            let path = if file.is_file() {
+                file.parent().ok_or(eyre!("invalid Namada wallet path"))?
+            } else {
+                file
+            };
+            let mut wallet = CliWalletUtils::new(path.to_path_buf());
+            wallet
+                .load()
+                .map_err(|_| eyre!("error loading Namada wallet"))?;
+
+            let keys = wallet.get_keys();
+            let (secret_key, pkh) = keys
+                .get(key_name)
+                .ok_or_else(|| eyre!("error loading the key from Namada wallet"))?;
+            let secret_key = secret_key
+                .get::<CliWalletUtils>(true, None)
+                .map_err(|_| eyre!("error loading the key from Namada wallet"))?;
+            let pkh =
+                pkh.ok_or_else(|| eyre!("error loading the public key hash from Namada wallet"))?;
+            let address = wallet
+                .find_address(key_name)
+                .ok_or_else(|| eyre!("error loading the address from Namada wallet"))?;
+            let namada_key = NamadaKeyPair {
+                alias: key_name.to_string(),
+                address: address.into_owned(),
+                pkh: pkh.clone(),
+                secret_key: secret_key.clone(),
+            };
+            keyring.add_key(key_name, namada_key.clone())?;
+            namada_key.into()
         }
     };
 
@@ -260,7 +296,9 @@ pub fn restore_key(
             key_pair.into()
         }
         ChainConfig::Namada(_) => {
-            return Err(eyre!("Namada key cannot be restored"));
+            return Err(eyre!(
+                "Namada key can't be restored here. Use Namada wallet."
+            ));
         }
     };
 

diff --git a/crates/relayer-cli/src/commands/keys/delete.rs b/crates/relayer-cli/src/commands/keys/delete.rs
@@ -123,8 +123,10 @@ pub fn delete_key(config: &ChainConfig, key_name: &str) -> eyre::Result<()> {
             )?;
             keyring.remove_key(key_name)?;
         }
-        ChainConfig::Namada(_) => {
-            return Err(eyre!("Namada key cannot be deleted"));
+        ChainConfig::Namada(config) => {
+            let mut keyring =
+                KeyRing::new_namada(Store::Test, &config.id, &config.key_store_folder)?;
+            keyring.remove_key(key_name)?;
         }
     }
     Ok(())
@@ -144,8 +146,13 @@ pub fn delete_all_keys(config: &ChainConfig) -> eyre::Result<()> {
                 keyring.remove_key(&key_name)?;
             }
         }
-        ChainConfig::Namada(_) => {
-            return Err(eyre!("Namada key cannot be deleted"));
+        ChainConfig::Namada(config) => {
+            let mut keyring =
+                KeyRing::new_namada(Store::Test, &config.id, &config.key_store_folder)?;
+            let keys = keyring.keys()?;
+            for (key_name, _) in keys {
+                keyring.remove_key(&key_name)?;
+            }
         }
     }
     Ok(())

diff --git a/crates/relayer-rest/Cargo.toml b/crates/relayer-rest/Cargo.toml
@@ -25,4 +25,5 @@ tokio             = "1.26"
 
 [dev-dependencies]
 reqwest    = { version = "0.11.16", features = ["json"], default-features = false }
+serde_json = "1"
 toml       = "0.7.3"
diff --git a/crates/relayer-rest/tests/mock.rs b/crates/relayer-rest/tests/mock.rs
@@ -46,9 +46,12 @@ where
     let response = reqwest::get(&format!("http://127.0.0.1:{port}{path}"))
         .await
         .unwrap()
-        .json::<R>()
+        .json()
         .await
         .unwrap();
+    // Workaround for serde_json deserialization failure
+    // from_str/from_slice() failed for ChainConfig
+    let response = serde_json::from_value::<R>(response).unwrap();
 
     assert_eq!(response, expected);
 

diff --git a/crates/relayer/Cargo.toml b/crates/relayer/Cargo.toml
@@ -24,9 +24,6 @@ ibc-proto         = { version = "0.38.0", features = ["serde"] }
 ibc-telemetry     = { version = "0.26.0", path = "../telemetry", optional = true }
 ibc-relayer-types = { version = "0.26.0", path = "../relayer-types", features = ["mocks"] }
 
-namada = { git = "https://github.com/anoma/namada", rev = "7116b6aa916026e97f3f871f291c6ba1c7b427d2" }
-namada_sdk = { git = "https://github.com/anoma/namada", rev = "7116b6aa916026e97f3f871f291c6ba1c7b427d2", features = ["std", "async-client"] }
-
 subtle-encoding = "0.5"
 humantime-serde = "1.1.1"
 serde = "1.0"
@@ -73,6 +70,7 @@ strum = { version = "0.25", features = ["derive"] }
 tokio-stream = "0.1.14"
 once_cell = "1.17.1"
 tracing-subscriber = { version = "0.3.14", features = ["fmt", "env-filter", "json"] }
+rpassword = "5.0.1"
 
 [dependencies.byte-unit]
 version = "4.0.19"
@@ -111,6 +109,15 @@ default-features = false
 version = "0.34.0"
 default-features = false
 
+[dependencies.namada]
+git = "https://github.com/anoma/namada"
+rev = "7116b6aa916026e97f3f871f291c6ba1c7b427d2"
+
+[dependencies.namada_sdk]
+git = "https://github.com/anoma/namada"
+rev = "7116b6aa916026e97f3f871f291c6ba1c7b427d2"
+features = ["std", "async-client"]
+
 [dev-dependencies]
 ibc-relayer-types = { version = "0.26.0", path = "../relayer-types", features = ["mocks"] }
 serial_test = "2.0.0"