update

Author: Mr-Leshiy

src/chain-wallet-libs/bindings/wallet-wasm-js/Cargo.toml

@@ -31,6 +31,7 @@ wasm-bindgen = "0.2"
 js-sys = "0.3.40"
 bech32 = "0.7.2"
 serde_json = "1.0"
+hex = "0.4.2"
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires
@@ -45,4 +46,3 @@ clear_on_drop = {version = "0.2", features = ["no_cc"]}
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3"
-hex = "0.4.2"

src/chain-wallet-libs/bindings/wallet-wasm-js/js-test/test/vote_cast.js

@@ -1,9 +1,7 @@
 var assert = require("assert");
 
-const private_key = Buffer.from(
-  "c86596c2d1208885db1fe3658406aa0f7cc7b8e13c362fe46a6db277fc5064583e487588c98a6c36e2e7445c0add36f83f171cb5ccfd815509d19cd38ecb0af3",
-  "hex"
-);
+const private_key =
+  "c86596c2d1208885db1fe3658406aa0f7cc7b8e13c362fe46a6db277fc5064583e487588c98a6c36e2e7445c0add36f83f171cb5ccfd815509d19cd38ecb0af3";
 
 const settings_json =
   '{"fees":{"constant":10,"coefficient":2,"certificate":100},"discrimination":"production","block0_initial_hash":{"hash":"baf6b54817cf2a3e865f432c3922d28ac5be641e66662c66d445f141e409183e"},"block0_date":1586637936,"slot_duration":20,"time_era":{"epoch_start":0,"slot_start":0,"slots_per_epoch":180},"transaction_max_expiry_epochs":1}';
@@ -14,10 +12,7 @@ describe("vote cast certificate tests", function () {
 
     let settings = new wallet.Settings(settings_json);
     let proposal = new wallet.Proposal(
-      Buffer.from(
-        "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
-        "hex"
-      ),
+      "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
       2,
       8
     );
@@ -31,16 +26,10 @@ describe("vote cast certificate tests", function () {
 
     let settings = new wallet.Settings(settings_json);
     let proposal = new wallet.Proposal(
-      Buffer.from(
-        "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
-        "hex"
-      ),
+      "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
       4,
       8,
-      Buffer.from(
-        "bed88887abe0a84f64691fe0bdfa3daf1a6cd697a13f07ae07588910ce39c927",
-        "hex"
-      )
+      "bed88887abe0a84f64691fe0bdfa3daf1a6cd697a13f07ae07588910ce39c927"
     );
     let vote = new wallet.Vote(proposal, 0, new wallet.BlockDate(0, 1), 1, 1);
     let fragments = wallet.signVotes([vote], settings, private_key);

src/chain-wallet-libs/bindings/wallet-wasm-js/js/index.js

@@ -56,20 +56,20 @@ function signVotes(votes, settings, privateKey) {
       vote.proposal.voteEncKey != undefined
     ) {
       let payload = wasm.Payload.new_private(
-        wasm.VotePlanId.from_bytes(vote.proposal.votePlan),
+        wasm.VotePlanId.from_hex(vote.proposal.votePlan),
         vote.proposal.options,
         vote.choice,
         vote.proposal.voteEncKey
       );
       voteCast = wasm.VoteCast.new(
-        wasm.VotePlanId.from_bytes(vote.proposal.votePlan),
+        wasm.VotePlanId.from_hex(vote.proposal.votePlan),
         vote.proposal.proposalIndex,
         payload
       );
     } else {
       let payload = wasm.Payload.new_public(vote.choice);
       voteCast = wasm.VoteCast.new(
-        wasm.VotePlanId.from_bytes(vote.proposal.votePlan),
+        wasm.VotePlanId.from_hex(vote.proposal.votePlan),
         vote.proposal.proposalIndex,
         payload
       );

src/chain-wallet-libs/bindings/wallet-wasm-js/src/certificates/vote_plan.rs

@@ -11,6 +11,16 @@ pub struct VotePlanId(pub(crate) VotePlanIdLib);
 
 #[wasm_bindgen]
 impl VotePlanId {
+    pub fn from_hex(hex_data: String) -> Result<VotePlanId, JsValue> {
+        Ok(VotePlanId(
+            VotePlanIdLib::try_from(
+                hex::decode(hex_data)
+                    .map_err(|e| JsValue::from(e.to_string()))?
+                    .as_slice(),
+            )
+            .map_err(|e| JsValue::from(e.to_string()))?,
+        ))
+    }
     pub fn from_bytes(bytes: &[u8]) -> Result<VotePlanId, JsValue> {
         Ok(VotePlanId(
             VotePlanIdLib::try_from(bytes).map_err(|e| JsValue::from(e.to_string()))?,

src/chain-wallet-libs/bindings/wallet-wasm-js/src/lib.rs

@@ -63,14 +63,16 @@ impl VoteCastTxBuilder {
     /// of the account.
     pub fn build_tx(
         mut self,
-        account: &[u8],
+        hex_account: String,
         counter: u32,
         lane: usize,
     ) -> Result<VoteCastTxBuilder, JsValue> {
         self.0 = self
             .0
             .build_tx(
-                account,
+                hex::decode(hex_account)
+                    .map_err(|e| JsValue::from(e.to_string()))?
+                    .as_slice(),
                 SpendingCounter::new(lane, counter).map_err(|e| JsValue::from(e.to_string()))?,
             )
             .map_err(|e| JsValue::from(e.to_string()))?;