add new Proposal type

Author: Mr-Leshiy

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

@@ -13,42 +13,39 @@ describe("vote cast certificate tests", function () {
     const wallet = await import("wallet-js");
 
     let settings = new wallet.Settings(settings_json);
-    let vote = wallet.Vote.public(
-      wallet.SpendingCounter.new(1, 1),
+    let proposal = new wallet.Proposal(
       Buffer.from(
         "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
         "hex"
       ),
-      8,
-      0
+      2,
+      true,
+      8
     );
-
-    let block_date = new wallet.BlockDate(0, 1);
-    let fragments = wallet.signVotes([vote], settings, block_date, private_key);
+    let vote = proposal.vote(1, 1, new wallet.BlockDate(0, 1), 0);
+    let fragments = wallet.signVotes([vote], settings, private_key);
     assert(fragments.length == 1);
   });
 
   it("private", async function () {
     const wallet = await import("wallet-js");
 
     let settings = new wallet.Settings(settings_json);
-    let vote = wallet.Vote.private(
-      wallet.SpendingCounter.new(1, 1),
+    let proposal = new wallet.Proposal(
       Buffer.from(
         "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
         "hex"
       ),
-      8,
       4,
-      0,
+      true,
+      8,
       Buffer.from(
         "bed88887abe0a84f64691fe0bdfa3daf1a6cd697a13f07ae07588910ce39c927",
         "hex"
       )
     );
-
-    let block_date = new wallet.BlockDate(0, 1);
-    let fragments = wallet.signVotes([vote], settings, block_date, private_key);
+    let vote = proposal.vote(1, 1, new wallet.BlockDate(0, 1), 0);
+    let fragments = wallet.signVotes([vote], settings, private_key);
     assert(fragments.length == 1);
   });
 });

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

@@ -1,7 +1,5 @@
 const wasm = require("wallet-wasm-js");
 
-module.exports.SpendingCounter = wasm.SpendingCounter;
-
 class BlockDate {
   constructor(epoch, slot) {
     this.epoch = epoch;
@@ -22,52 +20,91 @@ class Settings {
 module.exports.Settings = Settings;
 
 class Vote {
-  static public(spending_counter, vote_plan_bytes, proposal_index, choice) {
-    let res = new Vote();
-    let vote_plan = wasm.VotePlanId.from_bytes(vote_plan_bytes);
-    let payload = wasm.Payload.new_public(choice);
-    let vote_cast = wasm.VoteCast.new(vote_plan, proposal_index, payload);
-    res.vote_cast = vote_cast;
-    res.spending_counter = spending_counter;
-    return res;
-  }
-
-  static private(
+  constructor(
     spending_counter,
-    vote_plan_bytes,
+    spending_counter_lane,
+    valid_until,
+    vote_plan,
     proposal_index,
-    options,
     choice,
+    options,
     public_key
   ) {
-    let res = new Vote();
-    let vote_plan = wasm.VotePlanId.from_bytes(vote_plan_bytes);
-    let payload = wasm.Payload.new_private(
-      vote_plan,
-      options,
-      choice,
-      public_key
-    );
-    vote_plan = wasm.VotePlanId.from_bytes(vote_plan_bytes);
-    let vote_cast = wasm.VoteCast.new(vote_plan, proposal_index, payload);
-    res.vote_cast = vote_cast;
-    res.spending_counter = spending_counter;
-    return res;
+    this.spending_counter = spending_counter;
+    this.spending_counter_lane = spending_counter_lane;
+    this.valid_until = valid_until;
+    if (options != undefined && public_key != undefined) {
+      let payload = wasm.Payload.new_private(
+        vote_plan,
+        options,
+        choice,
+        public_key
+      );
+      this.vote_cast = wasm.VoteCast.new(vote_plan, proposal_index, payload);
+    } else {
+      let payload = wasm.Payload.new_public(choice);
+      this.vote_cast = wasm.VoteCast.new(vote_plan, proposal_index, payload);
+    }
   }
 }
 module.exports.Vote = Vote;
 
-function signVotes(votes, settings, valid_until, private_key) {
+class Proposal {
+  constructor(
+    vote_plan_bytes,
+    options_count,
+    vote_public,
+    proposal_index,
+    committee_public_key
+  ) {
+    this.vote_plan = wasm.VotePlanId.from_bytes(vote_plan_bytes);
+    this.options_count = options_count;
+    this.vote_public = vote_public;
+    this.proposal_index = proposal_index;
+    this.committee_public_key = committee_public_key;
+  }
+
+  vote(spending_counter, spending_counter_lane, valid_until, choice) {
+    if (this.vote_public) {
+      return new Vote(
+        spending_counter,
+        spending_counter_lane,
+        valid_until,
+        this.vote_plan,
+        this.proposal_index,
+        choice
+      );
+    } else {
+      return new Vote(
+        spending_counter,
+        spending_counter_lane,
+        valid_until,
+        this.vote_plan,
+        this.proposal_index,
+        choice,
+        this.options_count,
+        this.committee_public_key
+      );
+    }
+  }
+}
+module.exports.Proposal = Proposal;
+
+function signVotes(votes, settings, private_key) {
   let fragments = [];
   for (let i = 0; i < votes.length; i++) {
     let builder = wasm.VoteCastTxBuilder.new(
       settings.settings,
-      valid_until.epoch,
-      valid_until.slot,
+      votes[i].valid_until.epoch,
+      votes[i].valid_until.slot,
       votes[i].vote_cast
     );
     let fragment = builder
-      .build_tx(private_key, votes[i].spending_counter)
+      .build_tx(
+        private_key,
+        votes[i].spending_counter,
+        votes[i].spending_counter_lane
+      )
       .finalize_tx();
     fragments.push(fragment);
   }

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

@@ -5,12 +5,12 @@ pub use certificates::{
     vote_cast::{Payload, VoteCast},
     vote_plan::VotePlanId,
 };
+use chain_impl_mockchain::account::SpendingCounter;
 use chain_impl_mockchain::header::BlockDate;
 use chain_impl_mockchain::{
     certificate::VoteCast as VoteCastLib, fragment::Fragment as FragmentLib,
 };
 pub use fragment::{Fragment, FragmentId};
-pub use utils::set_panic_hook;
 use wasm_bindgen::prelude::*;
 
 mod certificates;
@@ -37,22 +37,6 @@ impl Settings {
     }
 }
 
-#[derive(Clone)]
-#[wasm_bindgen]
-pub struct SpendingCounter(chain_impl_mockchain::account::SpendingCounter);
-
-#[wasm_bindgen]
-impl SpendingCounter {
-    pub fn new(lane: usize, counter: u32) -> Result<SpendingCounter, JsValue> {
-        Ok(Self(
-            chain_impl_mockchain::account::SpendingCounter::new(lane, counter)
-                .map_err(|e| JsValue::from(e.to_string()))?,
-        ))
-    }
-}
-
-impl_collection!(SpendingCounters, SpendingCounter);
-
 #[wasm_bindgen]
 impl VoteCastTxBuilder {
     /// Initializing of the VoteCastTxBuilder
@@ -80,11 +64,15 @@ impl VoteCastTxBuilder {
     pub fn build_tx(
         mut self,
         account: &[u8],
-        spending_counter: SpendingCounter,
+        counter: u32,
+        lane: usize,
     ) -> Result<VoteCastTxBuilder, JsValue> {
         self.0 = self
             .0
-            .build_tx(account, spending_counter.0)
+            .build_tx(
+                account,
+                SpendingCounter::new(lane, counter).map_err(|e| JsValue::from(e.to_string()))?,
+            )
             .map_err(|e| JsValue::from(e.to_string()))?;
         Ok(self)
     }

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

@@ -1,20 +1,3 @@
-use wasm_bindgen::prelude::*;
-
-/// `set_panic_hook` function can be called at least once during initialization,
-/// to get better error messages if the code ever panics.
-/// The function has no parameters.
-#[wasm_bindgen]
-pub fn set_panic_hook() {
-    // When the `console_error_panic_hook` feature is enabled, we can call the
-    // `set_panic_hook` function at least once during initialization, and then
-    // we will get better error messages if our code ever panics.
-    //
-    // For more details see
-    // https://github.com/rustwasm/console_error_panic_hook#readme
-    #[cfg(feature = "console_error_panic_hook")]
-    console_error_panic_hook::set_once();
-}
-
 // taken from:
 // https://github.com/input-output-hk/js-chain-libs/blob/cc463b59fdc64a4fff63f67901118f60b783520c/src/utils.rs#L12
 #[macro_export]