Merge branch 'develop' of https://github.com/klever-io/kos-rs into feat/kos-codec

Author: pedrxlz

.github/actions/bump-version.sh

@@ -9,25 +9,6 @@ MAJOR_VERSION=${ADDR[0]}
 MINOR_VERSION=${ADDR[1]}
 PATCH_VERSION=${ADDR[2]}
 
-# Check the PR title to decide how to bump the version.
-if [[ "${PR_TITLE}" == "MAJOR:"* ]]; then
-  MAJOR_VERSION=$((MAJOR_VERSION + 1))
-  MINOR_VERSION=0
-  PATCH_VERSION=0
-elif [[ "${PR_TITLE}" == "MINOR:"* ]]; then
-  MINOR_VERSION=$((MINOR_VERSION + 1))
-  PATCH_VERSION=0
-else
-  PATCH_VERSION=$((PATCH_VERSION + 1))
-fi
-
-# Construct the new version string.
 NEW_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$PATCH_VERSION"
 
-# Replace the version in Cargo.toml
-sed -i "s/version = \"$CURRENT_VERSION\"/version = \"$NEW_VERSION\"/g" Cargo.toml
-
-# Print the new version to a file (or alternatively, set it as an environment variable or output variable).
 echo $NEW_VERSION > VERSION
-   
-echo "($PR_TITLE) updating $CURRENT_VERSION to $NEW_VERSION"

Cargo.lock

@@ -15,7 +15,7 @@ homepage = "https://klever.org/"
 license = "Apache-2.0"
 repository = "https://github.com/kleverio/kos-rs"
 rust-version = "1.69.0"
-version = "0.2.9"
+version = "0.2.12"
 
 [workspace.dependencies]
 bech32 = "0.9.1"
@@ -41,4 +41,4 @@ serde_json = "1.0"
 lazy_static = "1.4.0"
 thiserror = "1.0"
 
-kos = { version = "0.2.9", path = "./packages/kos", default-features = false }
+kos = { version = "0.2.12", path = "./packages/kos", default-features = false }

Cargo.toml

@@ -510,7 +510,7 @@ mod tests {
             "The sender doesn't match"
         );
         assert_eq!(
-            transaction.raw, "7b22426c6f636b223a6e756c6c2c2252617744617461223a7b2242616e647769647468466565223a313030303030302c22436861696e4944223a224d5441774e444977222c22436f6e7472616374223a5b7b22506172616d65746572223a7b22747970655f75726c223a22747970652e676f6f676c65617069732e636f6d2f70726f746f2e5472616e73666572436f6e7472616374222c2276616c7565223a224369417973796730416a38786a2f72723558475536694a2b41544932396d6e52485330573042724331767a304342674b227d2c2254797065223a6e756c6c7d5d2c2244617461223a6e756c6c2c224b417070466565223a3530303030302c224b6461466565223a6e756c6c2c224e6f6e6365223a33392c225065726d697373696f6e4944223a6e756c6c2c2253656e646572223a22354273794f6c6366325658676e4e5157595039455a6350305270504966792b75704b44385149636e794f6f3d222c2256657273696f6e223a317d2c225265636569707473223a6e756c6c2c22526573756c74223a6e756c6c2c22526573756c74436f6465223a6e756c6c2c225369676e6174757265223a5b2267555a444950537853713430516a54424d33382f4441417557546d37443154486f324b5756716869545943756d354f2b4f53577754596c6749553052674a36756e6767316375434a50636d59574e676a444b412f44413d3d225d7d",
+            transaction.raw, "7b22426c6f636b223a6e756c6c2c2252617744617461223a7b2242616e647769647468466565223a313030303030302c22436861696e4944223a224d5441774e444977222c22436f6e7472616374223a5b7b22506172616d65746572223a7b22747970655f75726c223a22747970652e676f6f676c65617069732e636f6d2f70726f746f2e5472616e73666572436f6e7472616374222c2276616c7565223a224369417973796730416a38786a2f72723558475536694a2b41544932396d6e52485330573042724331767a304342674b227d2c2254797065223a6e756c6c7d5d2c2244617461223a6e756c6c2c224b417070466565223a3530303030302c224b4441466565223a6e756c6c2c224e6f6e6365223a33392c225065726d697373696f6e4944223a6e756c6c2c2253656e646572223a22354273794f6c6366325658676e4e5157595039455a6350305270504966792b75704b44385149636e794f6f3d222c2256657273696f6e223a317d2c225265636569707473223a6e756c6c2c22526573756c74223a6e756c6c2c22526573756c74436f6465223a6e756c6c2c225369676e6174757265223a5b2267555a444950537853713430516a54424d33382f4441417557546d37443154486f324b5756716869545943756d354f2b4f53577754596c6749553052674a36756e6767316375434a50636d59574e676a444b412f44413d3d225d7d",
             "The raw doesn't match"
         );
         assert_eq!(

packages/kos-mobile/src/lib.rs

@@ -37,6 +37,14 @@ pub fn decrypt(data: &[u8], password: &str) -> Result<Vec<u8>, Error> {
     cipher::decrypt(data, password).map_err(|e| Error::Cipher(format!("{}", e)))
 }
 
+/// Encrypt for GCM the given data with the given password.
+/// Data will have the algorithm tag prepended to it (1 byte).
+#[wasm_bindgen(js_name = "encrypt")]
+pub fn encrypt(data: &[u8], password: &str) -> Result<Vec<u8>, Error> {
+    cipher::encrypt(cipher::CipherAlgo::GMC, data, password)
+        .map_err(|e| Error::Cipher(format!("{}", e)))
+}
+
 /// Create pem file from tag and data
 #[wasm_bindgen(js_name = "toPem")]
 pub fn to_pem(tag: String, data: &[u8]) -> Result<String, Error> {

packages/kos-web/src/lib.rs

@@ -343,6 +343,56 @@ mod test {
                 .unwrap()
         );
     }
+    #[test]
+    fn test_sign_tx_5() {
+        let pvk = hex::decode("1ab42cc412b618bdea3a599e3c9bae199ebf030895b039e9db1e30dafb12b727")
+            .unwrap();
+
+        let json = r#"
+        {
+           "RawData": {
+                "Nonce": 606,
+                "Sender": "SqQFUzLDtZNzXexeY++BMVH5GTKLDMSxo72GoRqjZz0=",
+                "Contract": [
+                {
+                    "Parameter": {
+                    "type_url": "type.googleapis.com/proto.TransferContract",
+                    "value": "CiBI/KqGTZBj8/J8YhvX20xb9NP6l5eXRCBmJsWERlhmSRIDS0xWGMCEPQ=="
+                }
+                }
+                ],
+                "Data": [
+                ""
+                ],
+                "KAppFee": 1000000,
+                "BandwidthFee": 2000000,
+                "Version": 1,
+                "ChainID": "MTA4",
+                "KDAFee": {
+                    "KDA": "Q0hJUFMtMUdaUA==",
+                    "Amount": 688200
+                }
+           }
+        }"#;
+        let raw_tx = json.as_bytes().to_vec();
+
+        let tx = crate::chains::Transaction {
+            raw_data: raw_tx,
+            tx_hash: Vec::new(),
+            signature: Vec::new(),
+            options: None,
+        };
+
+        let result_tx = crate::chains::klv::KLV {}.sign_tx(pvk, tx).unwrap();
+
+        assert_eq!(
+            result_tx.tx_hash,
+            vec![
+                60, 222, 134, 3, 87, 86, 2, 184, 223, 221, 53, 134, 54, 27, 20, 178, 197, 31, 20,
+                66, 12, 107, 186, 61, 21, 82, 78, 66, 210, 190, 124, 194
+            ]
+        );
+    }
 
     #[test]
     fn test_decode_klv_tx() {

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

@@ -50,7 +50,7 @@ pub struct Raw {
     pub version: Option<u32>,
     #[Rename = "ChainID"]
     pub chain_id: String,
-    #[Rename = "KdaFee"] // Use this to match the exact JSON field name for this field
+    #[Rename = "KDAFee"] // Use this to match the exact JSON field name for this field
     pub kda_fee: ::core::option::Option<KdaFee>,
 }
 
@@ -72,7 +72,7 @@ pub struct Parameter {
 
 #[derive(Clone, PartialEq, Serialize, Deserialize)]
 pub struct KdaFee {
-    #[Rename = "Kda"]
+    #[Rename = "KDA"]
     pub kda: String,
     #[Rename = "Amount"]
     pub amount: i64,