Fix/reef sign tx

deny.toml

@@ -49,8 +49,7 @@ name = "ring"
 expression = "ISC AND MIT AND OpenSSL"
 license-files = [{ path = "LICENSE", hash = 0xbd0eed23 }]
 
-
 [advisories]
 ignore = [
     "RUSTSEC-2024-0436", # paste unmaintained, but still used by uniffy
-]
+]

packages/kos/src/chains/mod.rs

@@ -394,14 +394,14 @@ impl ChainRegistry {
             (
                 constants::DOT,
                 ChainInfo {
-                    factory: || Box::new(substrate::Substrate::new(21, 0, "DOT", "Polkadot")),
+                    factory: || Box::new(substrate::Substrate::new(21, 0, "Polkadot", "DOT")),
                     supported: true,
                 },
             ),
             (
                 constants::KSM,
                 ChainInfo {
-                    factory: || Box::new(substrate::Substrate::new(27, 2, "KSM", "Kusama")),
+                    factory: || Box::new(substrate::Substrate::new(27, 2, "Kusama", "KSM")),
                     supported: true,
                 },
             ),
@@ -415,28 +415,28 @@ impl ChainRegistry {
             (
                 constants::REEF,
                 ChainInfo {
-                    factory: || Box::new(substrate::Substrate::new(29, 42, "REEF", "Reef")),
+                    factory: || Box::new(substrate::Substrate::new(29, 42, "Reef", "REEF")),
                     supported: true,
                 },
             ),
             (
                 constants::SDN,
                 ChainInfo {
-                    factory: || Box::new(substrate::Substrate::new(35, 5, "SDN", "Shiden")),
+                    factory: || Box::new(substrate::Substrate::new(35, 5, "Shiden", "SDN")),
                     supported: true,
                 },
             ),
             (
                 constants::ASTR,
                 ChainInfo {
-                    factory: || Box::new(substrate::Substrate::new(36, 5, "ASTR", "Astar")),
+                    factory: || Box::new(substrate::Substrate::new(36, 5, "Astar", "ASTR")),
                     supported: true,
                 },
             ),
             (
                 constants::CFG,
                 ChainInfo {
-                    factory: || Box::new(substrate::Substrate::new(47, 36, "CFG", "Centrifuge")),
+                    factory: || Box::new(substrate::Substrate::new(47, 36, "Centrifuge", "CFG")),
                     supported: true,
                 },
             ),
@@ -450,14 +450,14 @@ impl ChainRegistry {
             (
                 constants::KILT,
                 ChainInfo {
-                    factory: || Box::new(substrate::Substrate::new(44, 38, "KILT", "KILT")),
+                    factory: || Box::new(substrate::Substrate::new(44, 38, "Kilt", "KILT")),
                     supported: true,
                 },
             ),
             (
                 constants::ALTAIR,
                 ChainInfo {
-                    factory: || Box::new(substrate::Substrate::new(42, 136, "ALTAIR", "Altair")),
+                    factory: || Box::new(substrate::Substrate::new(42, 136, "Altair", "ALTAIR")),
                     supported: true,
                 },
             ),

packages/kos/src/chains/substrate/mod.rs

@@ -6,7 +6,6 @@ use crate::chains::{Chain, ChainError, ChainOptions, Transaction, TxInfo};
 use crate::crypto::hash::{blake2b_64_digest, blake2b_digest};
 use crate::crypto::sr25519::Sr25519Trait;
 use crate::crypto::{b58, bip32, sr25519};
-use alloc::format;
 use alloc::string::{String, ToString};
 use alloc::vec::Vec;
 use models::{Call, CallArgs};
@@ -65,9 +64,10 @@ impl Chain for Substrate {
 
     fn get_path(&self, index: u32, _is_legacy: bool) -> String {
         if index == 0 {
-            return "".to_string();
+            return String::new();
         }
-        format!("//{}", index)
+
+        format!("//{}", index - 1)
     }
 
     fn get_pbk(&self, private_key: Vec<u8>) -> Result<Vec<u8>, ChainError> {
@@ -133,17 +133,23 @@ impl Chain for Substrate {
                     .try_into()
                     .map_err(|_| ChainError::InvalidOptions)?;
 
+                // Other chains may have different requirements for mode and metadata_hash
+                let (mode, metadata_hash) = match self.symbol.as_str() {
+                    "REEF" => (None, None),
+                    _ => (Some(0u8), Some(0u8)),
+                };
+
                 ExtrinsicPayload {
                     call,
                     era,
                     nonce,
                     tip,
-                    mode: 0,
+                    mode,
                     spec_version,
                     transaction_version,
                     genesis_hash,
                     block_hash,
-                    metadata_hash: 0,
+                    metadata_hash,
                     app_id,
                 }
             }
@@ -272,7 +278,7 @@ mod test {
     }
 
     #[test]
-    fn test_get_addr() {
+    fn test_get_addr_1() {
         let dot = super::Substrate::new(21, 0, "Polkadot", "DOT");
 
         let mnemonic = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about".to_string();
@@ -285,7 +291,7 @@ mod test {
         assert_eq!(addr, "13KVd4f2a4S5pLp4gTTFezyXdPWx27vQ9vS6xBXJ9yWVd7xo");
     }
     #[test]
-    fn test_get_addr1() {
+    fn test_get_addr_2() {
         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();
@@ -295,7 +301,21 @@ mod test {
         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");
+        assert_eq!(addr, "5DvaFrBesD6jTWd3GEefcM72BSXaFRHqQuZtwBSZii1VMnuP");
+    }
+    #[test]
+    fn test_get_addr_3() {
+        let dot = super::Substrate::new(21, 0, "Polkadot", "DOT");
+
+        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, "12rsQBSiizNCu3dZDshfkVwB34XDwiqyVQJP6URvGo31YGdp");
     }
 
     #[test]
@@ -459,6 +479,57 @@ mod test {
         assert_eq!(signed_tx.raw_data.len(), 142);
     }
 
+    #[test]
+    fn sign_tx_4() {
+        let dot = super::Substrate::new(29, 42, "REEF", "Reef");
+
+        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 raw_data = simple_base64_decode("BgMAIBAGX9aAF/hRd/ms+YCatuNZ7HYxyfly/j75aXrwkxMEFQNgAAoAAAACAAAAeDR4HTjkeY1UjjTslH0Z3uop3xSKe/MkhLeyTaz41LdWfCQku+9zEoyAsxnOxPxhQOEisj7yIJbyvkGmUcrXaw==").unwrap();
+
+        let nonce = 24;
+        let spec_version = 10;
+        let transaction_version = 2;
+
+        let options = ChainOptions::SUBSTRATE {
+            call: hex::decode(
+                "0603002010065fd68017f85177f9acf9809ab6e359ec7631c9f972fe3ef9697af0931304",
+            )
+            .unwrap(),
+            era: hex::decode("1503").unwrap(),
+            nonce,
+            tip: 0,
+            block_hash: hex::decode(
+                "567c2424bbef73128c80b319cec4fc6140e122b23ef22096f2be41a651cad76b",
+            )
+            .unwrap(),
+            genesis_hash: hex::decode(
+                "7834781d38e4798d548e34ec947d19deea29df148a7bf32484b7b24dacf8d4b7",
+            )
+            .unwrap(),
+            spec_version,
+            transaction_version,
+            app_id: None,
+        };
+
+        let tx = Transaction {
+            raw_data,
+            signature: Vec::new(),
+            tx_hash: Vec::new(),
+            options: Some(options),
+        };
+
+        let signed_tx = dot.sign_tx(pvk, tx).unwrap();
+
+        assert_eq!(signed_tx.signature.len(), 65);
+        assert_eq!(signed_tx.raw_data.len(), 142);
+    }
+
     #[test]
     fn sign_tx_browser() {
         let dot = super::Substrate::new(21, 0, "Polkadot", "DOT");