Update VoteCast building procedure (#169)

Distiguish signing of the transaction from building process.
So currently it is possible firslty to build a non-signed voteCast
transaction via `build_tx` and later sign it with the `sign_tx`.

Author: minikin

Cargo.lock

@@ -5,32 +5,47 @@ use chain_impl_mockchain::{
     header::BlockDate,
     transaction::{Input, Payload, Transaction},
 };
-use wallet::{EitherAccount, Settings};
+use std::{collections::HashMap, str::FromStr};
+use wallet::{AccountId, EitherAccount, Settings};
 
 use crate::Error;
 
 pub struct TxBuilder<P: Payload> {
     builder: wallet::TransactionBuilder<P>,
+    inputs: HashMap<AccountId, (Input, SpendingCounter)>,
 }
 
 impl<P: Payload> TxBuilder<P> {
     pub fn new(settings: Settings, valid_until: BlockDate, payload: P) -> Self {
         let builder = wallet::TransactionBuilder::new(settings, payload, valid_until);
-        Self { builder }
+        Self {
+            builder,
+            inputs: HashMap::new(),
+        }
     }
 
     pub fn build_tx(
         mut self,
-        account_bytes: &[u8],
+        account_id_hex: String,
         spending_counter: SpendingCounter,
     ) -> Result<Self, Error> {
+        let account_id = AccountId::from_str(&account_id_hex)
+            .map_err(|e| Error::wallet_transaction().with(e))?;
+
+        // It is needed to provide a 1 extra input as we are generating it later, but should take into account at this place.
+        let value = self.builder.estimate_fee_with(1, 0);
+        let input = Input::from_account_public_key(account_id.into(), value);
+        self.inputs.insert(account_id, (input, spending_counter));
+        Ok(self)
+    }
+
+    pub fn sign_tx(mut self, account_bytes: &[u8]) -> Result<Self, Error> {
         let account = EitherAccount::new_from_key(
             SecretKey::from_binary(account_bytes)
                 .map_err(|e| Error::wallet_transaction().with(e))?,
         );
-        // It is needed to provide a 1 extra input as we are generating it later, but should take into account at this place.
-        let value = self.builder.estimate_fee_with(1, 0);
-        let input = Input::from_account_public_key(account.account_id().into(), value);
+
+        let (input, spending_counter) = self.inputs.get(&account.account_id()).ok_or_else(|| Error::invalid_input("Cannot find corresponded input to the provided account, make sure that you have correctly execute build_tx function first"))?.clone();
         let witness_builder = account.witness_builder(spending_counter);
         self.builder.add_input(input, witness_builder);
         Ok(self)

src/chain-wallet-libs/bindings/wallet-core/src/tx_builder.rs

@@ -32,6 +32,7 @@ js-sys = "0.3.40"
 bech32 = "0.7.2"
 serde_json = "1.0"
 hex = "0.4.2"
+web-sys = { version = "0.3", features = ["console"] }
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires

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

@@ -3,10 +3,13 @@ var assert = require("assert");
 const private_key =
   "c86596c2d1208885db1fe3658406aa0f7cc7b8e13c362fe46a6db277fc5064583e487588c98a6c36e2e7445c0add36f83f171cb5ccfd815509d19cd38ecb0af3";
 
+const account_id =
+  "a6a3c0447aeb9cc54cf6422ba32b294e5e1c3ef6d782f2acff4a70694c4d1663";
+
 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}';
 
-describe("vote cast certificate tests", function () {
+describe("Inplace signing vote cast certificate tests", function () {
   it("public", async function () {
     const wallet = await import("wallet-js");
 
@@ -17,8 +20,15 @@ describe("vote cast certificate tests", function () {
       8
     );
     let vote = new wallet.Vote(proposal, 0, new wallet.BlockDate(0, 1), 1, 1);
-    let fragments = wallet.signVotes([vote], settings, private_key);
-    assert(fragments.length == 1);
+    let tx_builders = wallet.signVotes(
+      [vote],
+      settings,
+      account_id,
+      private_key
+    );
+    assert(tx_builders.length == 1);
+    // get fragemnts
+    fragments = tx_builders.map((tx_builder) => tx_builder.finalize_tx());
   });
 
   it("private", async function () {
@@ -32,7 +42,53 @@ describe("vote cast certificate tests", function () {
       "bed88887abe0a84f64691fe0bdfa3daf1a6cd697a13f07ae07588910ce39c927"
     );
     let vote = new wallet.Vote(proposal, 0, new wallet.BlockDate(0, 1), 1, 1);
-    let fragments = wallet.signVotes([vote], settings, private_key);
-    assert(fragments.length == 1);
+    let tx_builders = wallet.signVotes(
+      [vote],
+      settings,
+      account_id,
+      private_key
+    );
+    assert(tx_builders.length == 1);
+    // get fragemnts
+    fragments = tx_builders.map((tx_builder) => tx_builder.finalize_tx());
+  });
+});
+
+describe("Postponed signing vote cast certificate tests", function () {
+  it("public", async function () {
+    const wallet = await import("wallet-js");
+
+    let settings = new wallet.Settings(settings_json);
+    let proposal = new wallet.Proposal(
+      "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
+      2,
+      8
+    );
+    let vote = new wallet.Vote(proposal, 0, new wallet.BlockDate(0, 1), 1, 1);
+    let tx_builders = wallet.signVotes([vote], settings, account_id);
+    assert(tx_builders.length == 1);
+    // get fragemnts
+    fragments = tx_builders.map((tx_builder) =>
+      tx_builder.sign_tx(private_key).finalize_tx()
+    );
+  });
+
+  it("private", async function () {
+    const wallet = await import("wallet-js");
+
+    let settings = new wallet.Settings(settings_json);
+    let proposal = new wallet.Proposal(
+      "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
+      4,
+      8,
+      "bed88887abe0a84f64691fe0bdfa3daf1a6cd697a13f07ae07588910ce39c927"
+    );
+    let vote = new wallet.Vote(proposal, 0, new wallet.BlockDate(0, 1), 1, 1);
+    let tx_builders = wallet.signVotes([vote], settings, account_id);
+    assert(tx_builders.length == 1);
+    // get fragemnts
+    fragments = tx_builders.map((tx_builder) =>
+      tx_builder.sign_tx(private_key).finalize_tx()
+    );
   });
 });

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

@@ -46,8 +46,8 @@ class Vote {
 }
 module.exports.Vote = Vote;
 
-function signVotes(votes, settings, privateKey) {
-  let fragments = [];
+function signVotes(votes, settings, accountId, privateKey) {
+  let tx_builders = [];
   for (let i = 0; i < votes.length; i++) {
     let vote = votes[i];
     let voteCast;
@@ -81,11 +81,16 @@ function signVotes(votes, settings, privateKey) {
       vote.expiration.slot,
       voteCast
     );
-    let fragment = builder
-      .build_tx(privateKey, vote.spendingCounter, vote.spendingCounterLane)
-      .finalize_tx();
-    fragments.push(fragment);
+    let tx_builder = builder.build_tx(
+      accountId,
+      vote.spendingCounter,
+      vote.spendingCounterLane
+    );
+    if (privateKey != undefined) {
+      tx_builder = tx_builder.sign_tx(privateKey);
+    }
+    tx_builders.push(tx_builder);
   }
-  return fragments;
+  return tx_builders;
 }
 module.exports.signVotes = signVotes;

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

@@ -63,17 +63,27 @@ impl VoteCastTxBuilder {
     /// of the account.
     pub fn build_tx(
         mut self,
-        hex_account: String,
+        hex_account_id: String,
         counter: u32,
         lane: usize,
     ) -> Result<VoteCastTxBuilder, JsValue> {
         self.0 = self
             .0
             .build_tx(
+                hex_account_id,
+                SpendingCounter::new(lane, counter).map_err(|e| JsValue::from(e.to_string()))?,
+            )
+            .map_err(|e| JsValue::from(e.to_string()))?;
+        Ok(self)
+    }
+
+    pub fn sign_tx(mut self, hex_account: String) -> Result<VoteCastTxBuilder, JsValue> {
+        self.0 = self
+            .0
+            .sign_tx(
                 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()))?;
         Ok(self)

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

@@ -1,3 +1,15 @@
+extern crate web_sys;
+
+// A macro to provide `println!(..)`-style syntax for `console.log` logging.
+// taken from:
+// https://rustwasm.github.io/book/game-of-life/debugging.html
+#[macro_export]
+macro_rules! log {
+    ( $( $t:tt )* ) => {
+        web_sys::console::log_1(&format!( $( $t )* ).into());
+    }
+}
+
 // taken from:
 // https://github.com/input-output-hk/js-chain-libs/blob/cc463b59fdc64a4fff63f67901118f60b783520c/src/utils.rs#L12
 #[macro_export]

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

@@ -101,13 +101,12 @@ impl<P: Payload> TransactionBuilder<P> {
         input: Input,
         witness_builder: B,
     ) -> bool {
-        match self.inputs.len().cmp(&255) {
-            std::cmp::Ordering::Less => {
-                self.inputs.push(input);
-                self.witness_builders.push(Box::new(witness_builder));
-                true
-            }
-            _ => false,
+        if self.inputs().len() < 255 {
+            self.inputs.push(input);
+            self.witness_builders.push(Box::new(witness_builder));
+            true
+        } else {
+            false
         }
     }
 

src/chain-wallet-libs/wallet/src/transaction/builder.rs

@@ -1,25 +1,15 @@
 use crate::networking::utils;
 use hersir::{
     builder::{NetworkBuilder, Node, Topology},
-    config::{
-        BlockchainBuilder, BlockchainConfiguration, NodeConfig, SpawnParams, WalletTemplateBuilder,
-    },
+    config::{BlockchainConfiguration, SpawnParams, WalletTemplateBuilder},
 };
 use jormungandr_automation::{
-    jormungandr::{explorer::configuration::ExplorerParams, LogLevel},
+    jormungandr::LogLevel,
     testing::{ensure_nodes_are_in_sync, SyncWaitParams},
 };
-
-use jormungandr_lib::{
-    interfaces::{Policy, PreferredListConfig, SlotDuration, TrustedPeer},
-    time::{Duration, SystemTime},
-};
+use jormungandr_lib::time::Duration;
 use multiaddr::Multiaddr;
-use std::{
-    net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV6},
-    path::PathBuf,
-};
-use thor::{FragmentSender, FragmentVerifier};
+use thor::FragmentSender;
 
 const GATEWAY: &str = "GATEWAY";
 
@@ -221,7 +211,7 @@ pub fn test_public_node_cannot_publish() {
         .gossip_interval(Duration::new(1, 0))
         .allow_private_addresses(true)
         .public_address(address)
-        .whitelist(whitelist.clone());
+        .whitelist(whitelist);
 
     params.override_settings(&mut public_node_config);
 
@@ -368,7 +358,7 @@ pub fn test_public_node_synced_with_internal() {
         .gossip_interval(Duration::new(1, 0))
         .allow_private_addresses(true)
         .public_address(address)
-        .whitelist(whitelist.clone());
+        .whitelist(whitelist);
 
     params.override_settings(&mut public_node_config);