Fix/substrate sign tx

packages/kos-mobile/src/lib.rs

@@ -2,6 +2,7 @@ pub mod number;
 
 use hex::FromHexError;
 use hex::ToHex;
+use kos::chains::util::hex_string_to_vec;
 use kos::chains::{
     create_custom_evm, get_chain_by_base_id, Chain, ChainError, ChainOptions, Transaction,
 };
@@ -60,6 +61,48 @@ enum TransactionChainOptions {
         prev_scripts: Vec<Vec<u8>>,
         input_amounts: Vec<u64>,
     },
+    Substrate {
+        call: Vec<u8>,
+        era: Vec<u8>,
+        nonce: u32,
+        tip: u8,
+        block_hash: Vec<u8>,
+        genesis_hash: Vec<u8>,
+        spec_version: u32,
+        transaction_version: u32,
+        app_id: Option<u32>,
+    },
+}
+
+#[allow(clippy::too_many_arguments)]
+#[uniffi::export]
+fn new_substrate_transaction_options(
+    call: String,
+    era: String,
+    nonce: u32,
+    tip: u8,
+    block_hash: String,
+    genesis_hash: String,
+    spec_version: u32,
+    transaction_version: u32,
+    app_id: Option<u32>,
+) -> TransactionChainOptions {
+    let call = hex_string_to_vec(call.as_str()).unwrap_or_default();
+    let era = hex_string_to_vec(era.as_str()).unwrap_or_default();
+    let block_hash = hex_string_to_vec(block_hash.as_str()).unwrap_or_default();
+    let genesis_hash = hex_string_to_vec(genesis_hash.as_str()).unwrap_or_default();
+
+    TransactionChainOptions::Substrate {
+        call,
+        era,
+        nonce,
+        tip,
+        block_hash,
+        genesis_hash,
+        spec_version,
+        transaction_version,
+        app_id,
+    }
 }
 
 #[uniffi::export]
@@ -184,6 +227,27 @@ fn sign_transaction(
             prev_scripts,
             input_amounts,
         }),
+        Some(TransactionChainOptions::Substrate {
+            call,
+            era,
+            nonce,
+            tip,
+            block_hash,
+            genesis_hash,
+            spec_version,
+            transaction_version,
+            app_id,
+        }) => Some(ChainOptions::SUBSTRATE {
+            call,
+            era,
+            nonce,
+            tip,
+            block_hash,
+            genesis_hash,
+            spec_version,
+            transaction_version,
+            app_id,
+        }),
         None => None,
     };
 

packages/kos-web/src/wallet.rs

@@ -6,6 +6,7 @@ use strum::{EnumCount, IntoStaticStr};
 
 use crate::error::Error;
 use crate::utils::unpack;
+use kos::chains::util::hex_string_to_vec;
 use kos::chains::{get_chain_by_base_id, ChainOptions, Transaction as KosTransaction};
 use kos::crypto::base64;
 use wasm_bindgen::prelude::*;
@@ -60,6 +61,50 @@ impl TransactionChainOptions {
             },
         }
     }
+
+    #[wasm_bindgen(js_name = "newEthereumSignOptions")]
+    pub fn new_ethereum_sign_options(chain_id: u32) -> TransactionChainOptions {
+        TransactionChainOptions {
+            data: ChainOptions::EVM { chain_id },
+        }
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    #[wasm_bindgen(js_name = "newSubstrateSignOptions")]
+    pub fn new_substrate_sign_options(
+        call: String,
+        era: String,
+        nonce: u32,
+        tip: u8,
+        block_hash: String,
+        genesis_hash: String,
+        spec_version: u32,
+        transaction_version: u32,
+        app_id: Option<u32>,
+    ) -> Result<TransactionChainOptions, Error> {
+        let call = hex_string_to_vec(call.as_str())
+            .map_err(|e| Error::WalletManager(format!("Invalid call hex: {}", e)))?;
+        let era = hex_string_to_vec(era.as_str())
+            .map_err(|e| Error::WalletManager(format!("Invalid era hex: {}", e)))?;
+        let block_hash = hex_string_to_vec(block_hash.as_str())
+            .map_err(|e| Error::WalletManager(format!("Invalid block hash hex: {}", e)))?;
+        let genesis_hash = hex_string_to_vec(genesis_hash.as_str())
+            .map_err(|e| Error::WalletManager(format!("Invalid genesis hash hex: {}", e)))?;
+
+        Ok(TransactionChainOptions {
+            data: ChainOptions::SUBSTRATE {
+                call,
+                era,
+                nonce,
+                tip,
+                block_hash,
+                genesis_hash,
+                spec_version,
+                transaction_version,
+                app_id,
+            },
+        })
+    }
 }
 
 #[wasm_bindgen]

packages/kos/Cargo.toml

@@ -61,6 +61,7 @@ pem = "3"
 cfb-mode = "0.8"
 cbc = { version = "0.1", features = ["block-padding", "std"] }
 pbkdf2 = { version = "0.12", features = ["simple"] }
+serde = { version = "1.0.215", features = ["derive"] }
 
 [build-dependencies]
 prost-build = "0.12.1"

packages/kos/src/chains/mod.rs

@@ -31,7 +31,7 @@ mod sol;
 mod substrate;
 mod sui;
 pub mod trx;
-mod util;
+pub mod util;
 mod xrp;
 
 #[derive(Debug)]
@@ -58,6 +58,7 @@ pub enum ChainError {
     InvalidData(String),
     MissingOptions,
     InvalidOptions,
+    InvalidHex,
 }
 
 impl Display for ChainError {
@@ -123,6 +124,9 @@ impl Display for ChainError {
             ChainError::InvalidOptions => {
                 write!(f, "invalid option")
             }
+            ChainError::InvalidHex => {
+                write!(f, "invalid hex")
+            }
         }
     }
 }
@@ -213,6 +217,7 @@ impl ChainError {
             ChainError::InvalidData(_) => 20,
             ChainError::MissingOptions => 21,
             ChainError::InvalidOptions => 22,
+            ChainError::InvalidHex => 23,
         }
     }
 }
@@ -263,6 +268,17 @@ pub enum ChainOptions {
         prev_scripts: Vec<Vec<u8>>,
         input_amounts: Vec<u64>,
     },
+    SUBSTRATE {
+        call: Vec<u8>,
+        era: Vec<u8>,
+        nonce: u32,
+        tip: u8,
+        block_hash: Vec<u8>,
+        genesis_hash: Vec<u8>,
+        spec_version: u32,
+        transaction_version: u32,
+        app_id: Option<u32>,
+    },
 }
 
 #[allow(dead_code)]
@@ -369,14 +385,14 @@ impl ChainRegistry {
                 constants::DOT,
                 ChainInfo {
                     factory: || Box::new(substrate::Substrate::new(21, 0, "DOT", "Polkadot")),
-                    supported: false,
+                    supported: true,
                 },
             ),
             (
                 constants::KSM,
                 ChainInfo {
                     factory: || Box::new(substrate::Substrate::new(27, 2, "KSM", "Kusama")),
-                    supported: false,
+                    supported: true,
                 },
             ),
             (
@@ -390,28 +406,28 @@ impl ChainRegistry {
                 constants::REEF,
                 ChainInfo {
                     factory: || Box::new(substrate::Substrate::new(29, 42, "REEF", "Reef")),
-                    supported: false,
+                    supported: true,
                 },
             ),
             (
                 constants::SDN,
                 ChainInfo {
                     factory: || Box::new(substrate::Substrate::new(35, 5, "SDN", "Shiden")),
-                    supported: false,
+                    supported: true,
                 },
             ),
             (
                 constants::ASTR,
                 ChainInfo {
                     factory: || Box::new(substrate::Substrate::new(36, 5, "ASTR", "Astar")),
-                    supported: false,
+                    supported: true,
                 },
             ),
             (
                 constants::CFG,
                 ChainInfo {
                     factory: || Box::new(substrate::Substrate::new(47, 36, "CFG", "Centrifuge")),
-                    supported: false,
+                    supported: true,
                 },
             ),
             (
@@ -425,14 +441,14 @@ impl ChainRegistry {
                 constants::KILT,
                 ChainInfo {
                     factory: || Box::new(substrate::Substrate::new(44, 38, "KILT", "KILT")),
-                    supported: false,
+                    supported: true,
                 },
             ),
             (
                 constants::ALTAIR,
                 ChainInfo {
                     factory: || Box::new(substrate::Substrate::new(42, 136, "ALTAIR", "Altair")),
-                    supported: false,
+                    supported: true,
                 },
             ),
             (
@@ -571,8 +587,8 @@ impl ChainRegistry {
             (
                 constants::AVAIL,
                 ChainInfo {
-                    factory: || Box::new(substrate::Substrate::new(62, 42, "AVAIL", "Avail")),
-                    supported: false,
+                    factory: || Box::new(substrate::Substrate::new(62, 42, "Avail", "AVAIL")),
+                    supported: true,
                 },
             ),
             (