Merge pull request #175 from klever-io/develop

[MAIN] Update version 0.2.25

Author: gustavocbritto

.gitignore

@@ -26,4 +26,6 @@ packages/.DS_Store
 
 packages/kos/target
 packages/kos/Cargo.lock
-packages/kos/.idea
+packages/kos/.idea
+
+packages/kos-mobile/.build_cache

Cargo.lock

@@ -36,7 +36,7 @@ homepage = "https://klever.org/"
 license = "Apache-2.0"
 repository = "https://github.com/kleverio/kos-rs"
 rust-version = "1.69.0"
-version = "0.2.24"
+version = "0.2.25"
 
 [workspace.dependencies]
 bech32 = "0.9.1"
@@ -77,7 +77,7 @@ serde_json = "1.0"
 thiserror = "1.0"
 kos-mobile = { version = "0.1.0", path = "./packages/kos-mobile", default-features = false }
 ecies = { version = "0.2.7", default-features = false, features = ["pure"] }
-kos = { version = "0.2.24", path = "./packages/kos", default-features = false, features = ["not-ksafe"] }
+kos = { version = "0.2.25", path = "./packages/kos", default-features = false, features = ["not-ksafe"] }
 
 # lightning
 lwk_common = "0.9.0"

Cargo.toml

@@ -33,13 +33,15 @@ pub fn encode_for_sign(mut transaction: Transaction) -> Result<Transaction, Chai
     Ok(transaction)
 }
 
-pub fn encode_for_broadcast(transaction: Transaction) -> Result<Transaction, ChainError> {
+pub fn encode_for_broadcast(mut transaction: Transaction) -> Result<Transaction, ChainError> {
     let mut eth_tx = EthereumTransaction::decode(&transaction.raw_data)?;
 
     let mut signature_bytes: [u8; 65] = [0; 65];
     signature_bytes.copy_from_slice(&transaction.signature[..]);
     eth_tx.signature = Some(signature_bytes);
 
+    transaction.raw_data = eth_tx.encode()?;
+
     Ok(transaction)
 }
 
@@ -87,6 +89,7 @@ mod test {
             hex::encode(result.tx_hash),
             "5ed21ed1618c98b5b1814565d8d7a63ebc6425997c75b2b857d8692f0b73a64f"
         );
+        assert_eq!(hex::encode(result.raw_data), "b302f101819e84ae7937b285035f6cccc58252089498de4c83810b87f0e2cd92d80c9fac28c4ded4818568c696991f80c0808080");
 
         tx.signature = vec![
             0x30, 0x45, 0x02, 0x21, 0x00, 0xd3, 0x8f, 0x71, 0x94, 0x7b, 0x2c, 0xf5, 0x43, 0x58,
@@ -98,7 +101,7 @@ mod test {
 
         let signed_tx = encode_for_broadcast(tx.clone()).unwrap();
 
-        assert_eq!(hex::encode(signed_tx.raw_data), "b302f101819e84ae7937b285035f6cccc58252089498de4c83810b87f0e2cd92d80c9fac28c4ded4818568c696991f80c0808080");
+        assert_eq!(hex::encode(signed_tx.raw_data), "02f87101819e84ae7937b285035f6cccc58252089498de4c83810b87f0e2cd92d80c9fac28c4ded4818568c696991f80c054a054ad49a590596b77452a01141de380dd50945843f52c7b94718fd30021024530a0ad49a590596b77452a01141de380dd50945843f52c7b94718fd3002102453007");
         assert_eq!(
             hex::encode(signed_tx.signature),
             "3045022100d38f71947b2cf543589450dd80e31d14012a45776b5990a549ad54073045022100d38f71947b2cf543589450dd80e31d14012a45776b5990a549ad54"
@@ -121,6 +124,7 @@ mod test {
             hex::encode(result.tx_hash),
             "8823151a6987f2625239f058e453f5850e3d800b31f1dd60951a7e36e0769c2e"
         );
+        assert_eq!(hex::encode(result.raw_data), "b87602f8730182014f84147b7eeb85084ec9f83f8301450994dac17f958d2ee523a2206206994597c13d831ec780b844a9059cbb0000000000000000000000004cbeee256240c92a9ad920ea6f4d7df6466d2cdc000000000000000000000000000000000000000000000000000000000000000ac0808080");
 
         tx.signature = vec![
             0x30, 0x45, 0x02, 0x21, 0x00, 0xd3, 0x8f, 0x71, 0x94, 0x7b, 0x2c, 0xf5, 0x43, 0x58,
@@ -132,7 +136,7 @@ mod test {
 
         let signed_tx = encode_for_broadcast(tx.clone()).unwrap();
 
-        assert_eq!(hex::encode(signed_tx.raw_data), "b87602f8730182014f84147b7eeb85084ec9f83f8301450994dac17f958d2ee523a2206206994597c13d831ec780b844a9059cbb0000000000000000000000004cbeee256240c92a9ad920ea6f4d7df6466d2cdc000000000000000000000000000000000000000000000000000000000000000ac0808080");
+        assert_eq!(hex::encode(signed_tx.raw_data), "02f8b30182014f84147b7eeb85084ec9f83f8301450994dac17f958d2ee523a2206206994597c13d831ec780b844a9059cbb0000000000000000000000004cbeee256240c92a9ad920ea6f4d7df6466d2cdc000000000000000000000000000000000000000000000000000000000000000ac054a054ad49a590596b77452a01141de380dd50945843f52c7b94718fd30021024530a0ad49a590596b77452a01141de380dd50945843f52c7b94718fd3002102453007");
         assert_eq!(
             hex::encode(signed_tx.signature),
             "3045022100d38f71947b2cf543589450dd80e31d14012a45776b5990a549ad54073045022100d38f71947b2cf543589450dd80e31d14012a45776b5990a549ad54"

packages/kos-codec/src/chains/eth/mod.rs

@@ -40,7 +40,7 @@ impl EthereumTransaction {
         self::EthereumTransaction::decode_eip155(rlp)
     }
 
-    pub fn encode_eip25519(&self) -> Result<RlpStream, DecoderError> {
+    pub fn encode_eip1559(&self) -> Result<RlpStream, DecoderError> {
         let mut rlp = RlpStream::new();
         let list_size = if self.signature.is_some() { 12 } else { 9 };
         rlp.begin_list(list_size);
@@ -83,32 +83,59 @@ impl EthereumTransaction {
     pub fn encode_legacy(&self) -> Result<RlpStream, DecoderError> {
         let mut rlp = RlpStream::new();
         rlp.begin_list(9);
+
         rlp.append(&self.nonce);
         rlp.append(&self.gas_price.clone().unwrap_or(U256([0; 32])));
         rlp.append(&self.gas);
-        if self.to.is_some() {
-            rlp.append(&self.to.clone().unwrap().as_slice());
+
+        if let Some(to_addr) = &self.to {
+            rlp.append(&to_addr.as_slice());
         } else {
             rlp.append(&"");
         }
+
         rlp.append(&self.value);
         rlp.append(&self.data);
-        if self.chain_id.is_some() {
-            let cid = self.chain_id.unwrap_or(0);
-            if self.signature.is_some() {
-                let sig = self.signature.unwrap_or([0; 65]);
-                let mut r = U256([0; 32]);
-                r.0.copy_from_slice(&sig[..32]);
-                let mut s = U256([0; 32]);
-                s.0.copy_from_slice(&sig[32..64]);
-                let v = cid * 2 + 35 + (sig[64] as u64);
-                rlp.append(&v);
-                rlp.append(&r);
-                rlp.append(&s);
+
+        // Handle signature fields (v, r, s) - always present in legacy transactions
+        if let Some(sig) = &self.signature {
+            if sig.len() != 65 {
+                return Err(DecoderError::Custom("Invalid signature length"));
+            }
+
+            // Parse r and s from signature (first 32 bytes = r, next 32 bytes = s)
+            let mut r_bytes = [0u8; 32];
+            let mut s_bytes = [0u8; 32];
+            r_bytes.copy_from_slice(&sig[..32]);
+            s_bytes.copy_from_slice(&sig[32..64]);
+
+            let r = U256(r_bytes);
+            let s = U256(s_bytes);
+
+            // Calculate v based on chain_id (EIP-155) or legacy format
+            let v = if let Some(chain_id) = self.chain_id {
+                // EIP-155: v = chain_id * 2 + 35 + recovery_id
+                chain_id * 2 + 35 + (sig[64] as u64)
+            } else {
+                // Pre-EIP-155: v = 27 + recovery_id
+                27 + (sig[64] as u64)
+            };
+
+            rlp.append(&v);
+            rlp.append(&r);
+            rlp.append(&s);
+        } else {
+            // Unsigned transaction - used for signing
+            if let Some(chain_id) = self.chain_id {
+                // EIP-155 unsigned transaction
+                rlp.append(&chain_id);
+                rlp.append(&U256([0; 32]));
+                rlp.append(&U256([0; 32]));
             } else {
-                rlp.append(&cid);
-                rlp.append(&0u8);
-                rlp.append(&0u8);
+                // Pre-EIP-155 unsigned transaction
+                rlp.append(&U256([0; 32]));
+                rlp.append(&U256([0; 32]));
+                rlp.append(&U256([0; 32]));
             }
         }
 
@@ -123,7 +150,7 @@ impl EthereumTransaction {
             }
 
             TransactionType::Eip155 => {
-                let stream = self.encode_eip25519()?;
+                let stream = self.encode_eip1559()?;
                 Ok([&[2], stream.as_raw()].concat())
             }
         }

packages/kos-codec/src/chains/eth/models.rs

@@ -53,8 +53,14 @@ pub fn encode_sign_message(message: Vec<u8>) -> Result<Vec<u8>, ChainError> {
 
 pub fn decode_transaction(raw_tx: Vec<u8>) -> Result<protocol::Transaction, ChainError> {
     let tx = protocol::Transaction::decode(raw_tx.as_slice());
+    // Try to decode the transaction
     if let Ok(t) = tx {
-        return Ok(t);
+        // Check if raw_data exists
+        if let Some(ref raw_data) = t.raw_data {
+            if !raw_data.contract.is_empty() {
+                return Ok(t);
+            }
+        }
     }
 
     let raw_tx = protocol::transaction::Raw::decode(raw_tx.as_slice())?;
@@ -74,7 +80,27 @@ mod test {
     #[test]
     fn test_encode_for_sign() {
         let raw_tx = hex::decode(
-            "0a02487c22080608af18f6ec6c8340d8f8fae2e0315a65080112610a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412300a1541e825d52582eec346c839b4875376117904a76cbc12154120ab1300cf70c048e4cf5d5b1b33f59653ed6626180a708fb1f7e2e031"
+            "0a0270592208dd5821dad87735a340f0e1b4b9f3325aae01081f12a9010a31747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e54726967676572536d617274436f6e747261637412740a1541da3a264b74539c2078206c60e025c673d35c04c0121541a614f803b6fd780986a42c78ec9c7f77e6ded13c2244a9059cbb00000000000000000000000079af4269d01fca9a32b476576ee384427a38b736000000000000000000000000000000000000000000000000000000000112a880709b90b1b9f332900180c2d72f"
+        ).unwrap();
+        let tx = Transaction {
+            raw_data: raw_tx.clone(),
+            tx_hash: vec![],
+            signature: vec![],
+            options: None,
+        };
+
+        let result = encode_for_sign(tx).unwrap();
+
+        assert_eq!(
+            hex::encode(result.tx_hash),
+            "bf9efe196a74dad03de5ebf46c07d17fe891549606c62f1a58edd3a58fc8712a"
+        );
+    }
+
+    #[test]
+    fn test_encode_for_sign_transaction() {
+        let raw_tx = hex::decode(
+            "0ad3010a0270592208dd5821dad87735a340f0e1b4b9f3325aae01081f12a9010a31747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e54726967676572536d617274436f6e747261637412740a1541da3a264b74539c2078206c60e025c673d35c04c0121541a614f803b6fd780986a42c78ec9c7f77e6ded13c2244a9059cbb00000000000000000000000079af4269d01fca9a32b476576ee384427a38b736000000000000000000000000000000000000000000000000000000000112a880709b90b1b9f332900180c2d72f"
         ).unwrap();
         let tx = Transaction {
             raw_data: raw_tx.clone(),
@@ -87,12 +113,13 @@ mod test {
 
         assert_eq!(
             hex::encode(result.tx_hash),
-            "96a09fd664f1a7abbbe8bca604ea40b80291119fed5283c71ba94882d5b3c8a5"
+            "bf9efe196a74dad03de5ebf46c07d17fe891549606c62f1a58edd3a58fc8712a"
         );
     }
 
     #[test]
     fn test_encode_for_broadcast() {
+        // this tranasction will be decoded using protocol::Transaction::decode
         let raw_tx = hex::decode(
             "0a02487c22080608af18f6ec6c8340d8f8fae2e0315a65080112610a2d747970652e676f6f676c65617069732e636f6d2f70726f746f636f6c2e5472616e73666572436f6e747261637412300a1541e825d52582eec346c839b4875376117904a76cbc12154120ab1300cf70c048e4cf5d5b1b33f59653ed6626180a708fb1f7e2e031"
         ).unwrap();