Fix/substrate path derivation (#82)

* feat: evm custom network * chore: bump version * fix: susbtrate path derivation
klever-io · Jan 16, 2025 · befcc82 · befcc82
1 parent 30ee832
commit befcc82
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/packages/kos/src/chains/substrate/mod.rs b/packages/kos/src/chains/substrate/mod.rs
@@ -159,6 +159,19 @@ mod test {
         let addr = dot.get_address(pbk).unwrap();
         assert_eq!(addr, "13KVd4f2a4S5pLp4gTTFezyXdPWx27vQ9vS6xBXJ9yWVd7xo");
     }
+    #[test]
+    fn test_get_addr1() {
+        let dot = super::Substrate::new(62, 42, "AVAIL", "Avail");
+
+        let mnemonic = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about".to_string();
+        let path = dot.get_path(1, false);
+
+        let seed = dot.mnemonic_to_seed(mnemonic, String::from("")).unwrap();
+        let pvk = dot.derive(seed, path).unwrap();
+        let pbk = dot.get_pbk(pvk).unwrap();
+        let addr = dot.get_address(pbk).unwrap();
+        assert_eq!(addr, "5DJ8y4CAHnmjt4rdoZpR1wgXnQDnKDksskx7JTphZhMxthiG");
+    }
 
     #[test]
     fn test_sign_raw() {

diff --git a/packages/kos/src/crypto/bip32.rs b/packages/kos/src/crypto/bip32.rs
@@ -205,10 +205,10 @@ pub fn derive_sr25519(input_key: &[u8], mut path: String) -> Result<[u8; 64], Bi
             .strip_prefix("//")
             .ok_or(Bip32Err::PathError)?
             .to_string();
-        path = path
-            .strip_suffix("///")
-            .ok_or(Bip32Err::PathError)?
-            .to_string();
+
+        if let Some(stripped) = path.strip_suffix("///") {
+            path = stripped.to_string();
+        }
 
         let chaincode_value = u8::from_str(path.as_str()).map_err(|_| Bip32Err::PathError)?;