[txs] change balance_transfer API for Carpe app

config/management/Cargo.toml

@@ -16,8 +16,6 @@ serde = { version = "1.0.124", features = ["rc"], default-features = false }
 serde_yaml = "0.8.17"
 structopt = "0.3.21"
 thiserror = "1.0.24"
-toml = { version = "0.5.8", default-features = false }
-
 bcs = "0.1.2"
 diem-config = { path = ".."}
 diem-crypto = { path = "../../crypto/crypto" }
@@ -31,10 +29,11 @@ diem-temppath = { path = "../../common/temppath" }
 diem-transaction-builder = { path = "../../sdk/transaction-builder" }
 
 # //////// 0L ////////
-rustyline = "6.2.0"
-diem-wallet = { path = "../../testsuite/cli/diem-wallet", version = "0.1.0"}
-ol-keys = { path = "../../ol/keys",  version = "0.1.0" }
-dirs = "2.0.2"
+#toml = { version = "0.5.8", default-features = false }
+# rustyline = "6.2.0"
+# diem-wallet = { path = "../../testsuite/cli/diem-wallet", version = "0.1.0"}
+# ol-keys = { path = "../../ol/keys",  version = "0.1.0" }
+# dirs = "2.0.2"
 serde_json = "1"
 
 [dev-dependencies]

config/management/genesis/Cargo.toml

@@ -38,7 +38,7 @@ diem-transaction-builder = { path = "../../../sdk/transaction-builder" }
 vm-genesis = { path = "../../../language/tools/vm-genesis" }
 
 # //////// 0L ////////
-rustyline = "6.2.0"
+# rustyline = "6.2.0"
 diem-wallet = { path = "../../../testsuite/cli/diem-wallet", version = "0.1.0"}
 ol-keys = { path = "../../../ol/keys",  version = "0.1.0" }
 hex = "0.4.2"

language/diem-framework/Cargo.toml

@@ -28,7 +28,7 @@ bcs = "0.1.2"
 anyhow = "1.0.38"
 clap = "2.33.3"
 log = "0.4.14"
-rayon = "1.5.0"
+# rayon = "1.5.0"
 sha2 = "0.9.3"
 walkdir = "2.3.1"
 once_cell = "1.7.2"

language/diem-framework/src/main.rs

@@ -93,7 +93,12 @@ fn main() {
     let base_path = std::path::Path::new(&exec_path)
         .parent()
         .unwrap()
-        .join("../../language/diem-framework");
+        .parent()
+        .unwrap()
+        .parent()
+        .unwrap()
+        .join("language")
+        .join("diem-framework"); //////// 0L //////// was causing windows compile problems.
     std::env::set_current_dir(&base_path).expect("failed to change directory");
 
     #[cfg(debug_assertions)]
@@ -103,7 +108,7 @@ fn main() {
 
     let output_path = matches
         .value_of("output")
-        .unwrap_or("releases/artifacts/current");
+        .unwrap_or("releases/artifacts/current"); // TODO: this will break on Windows
 
     release::create_release(
         &Path::new(output_path), &options

ol/cli/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 bitflags = "1.0"
-cassowary = "0.3"
+# cassowary = "0.3"
 unicode-segmentation = "1.2"
 unicode-width = "0.1"
 chrono = "0.4.19"
@@ -27,7 +27,7 @@ dirs = "2.0.2"
 toml = "0.5.6"
 rustyline = "6.2.0"
 diem-json-rpc-client = { path = "../../client/json-rpc", version = "0.1.0" }
-crossterm = "0.19.0"
+# crossterm = "0.19.0"
 tokio = { version = "1.0", features = ["full"] }
 tokio-stream = "0.1.1"
 warp = "0.3.0"

ol/cli/src/commands/init_cmd.rs

@@ -25,15 +25,14 @@ use url::Url;
 /// `init` subcommand
 #[derive(Command, Debug, Default, Options)]
 pub struct InitCmd {
-      /// Create the 0L.toml file for 0L apps
+    /// Create the 0L.toml file for 0L apps
     #[options(help = "Create the 0L.toml file for 0L apps")]
     app: bool,
 
     /// For "app" option an upstream peer to use in 0L.toml
     #[options(help = "An upstream peer to use in 0L.toml")]
     rpc_peer: Option<Url>,
 
-
     /// For "app" option home path for app config
     #[options(help = "home path for app config")]
     app_cfg_path: Option<PathBuf>,
@@ -51,7 +50,9 @@ pub struct InitCmd {
     fullnode: bool,
 
     /// Set the upstream peers playlist from an http served playlist file
-    #[options(help = "Use a playlist.json file hosted online to set the upstream_peers field in 0L.toml")]
+    #[options(
+        help = "Use a playlist.json file hosted online to set the upstream_peers field in 0L.toml"
+    )]
     rpc_playlist: Option<String>, // Using string so that the user can use a default upstream
 
     /// Search and get seed peers from chain
@@ -102,12 +103,17 @@ impl Runnable for InitCmd {
         let entry_args = entrypoint::get_args();
         let is_swarm = *&entry_args.swarm_path.is_some();
 
-
         if self.update_waypoint {
             // TODO: will need to update the key_store.json file with waypoint info.
             if let Some(w) = self.waypoint {
                 app_cfg.chain_info.base_waypoint = Some(w);
-                app_cfg.save_file();
+                match app_cfg.save_file() {
+                    Ok(_) => {}
+                    Err(e) => {
+                        println!("could not save config file, exiting. Message: {:?}", e);
+                        exit(1)
+                    }
+                }
                 return;
             };
             let client = match client::pick_client(entry_args.swarm_path.clone(), &mut app_cfg) {
@@ -125,11 +131,25 @@ impl Runnable for InitCmd {
 
             match node.waypoint() {
                 Ok(w) => {
-                    key::set_waypoint(&app_cfg.workspace.node_home, &app_cfg.profile.account.to_string(), w);
-                    key::set_genesis_waypoint(&app_cfg.workspace.node_home, &app_cfg.profile.account.to_string(), w);
+                    key::set_waypoint(
+                        &app_cfg.workspace.node_home,
+                        &app_cfg.profile.account.to_string(),
+                        w,
+                    );
+                    key::set_genesis_waypoint(
+                        &app_cfg.workspace.node_home,
+                        &app_cfg.profile.account.to_string(),
+                        w,
+                    );
 
                     app_cfg.chain_info.base_waypoint = Some(w);
-                    app_cfg.save_file();
+                    match app_cfg.save_file() {
+                        Ok(_) => {}
+                        Err(e) => {
+                            println!("could not save config file, exiting. Message: {:?}", e);
+                            exit(1)
+                        }
+                    }
                     return;
                 }
                 Err(e) => {
@@ -138,45 +158,39 @@ impl Runnable for InitCmd {
                 }
             }
         }
-
-        if let Some(url) = self.rpc_playlist.as_ref() {
-
-
-          // try to parse it, otherwise get_known_fullnodes will use a default playlist
-          let playlist_url: Option<Url> = url.parse().ok();
 
-           match rpc_playlist::get_known_fullnodes(playlist_url){
-              Ok(f) => {
-
-                let mut new_cfg = match parse_toml(self.app_cfg_path.clone()) { // if None path just use default
-                    Ok(c) => c,
-                    Err(e) => {
-                      println!("could not parse app config toml file, exiting. Message: {:?}", e );
-                      exit(1);
-                    },
-                };
-                new_cfg.profile.upstream_nodes = f.get_urls();
-
-                println!("peers found:");
-                new_cfg.profile.upstream_nodes.iter()
-                .for_each(|u| {
-                  println!("{}", u.as_str())
-                });
-
-                // println!("peers found: {:?}", new_cfg.profile.upstream_nodes);
-
-                new_cfg.save_file();
-                println!("Upstream RPC peers updated in 0L.toml");
-                return
-              },
-              Err(e) => {
-                println!("could not read playlists from {:?}, exiting. Message: {:?}", url, e);
-                exit(1);
-              },
-          };
+        if let Some(url) = self.rpc_playlist.as_ref() {
+            // try to parse it, otherwise get_known_fullnodes will use a default playlist
+            let playlist_url: Option<Url> = url.parse().ok();
+
+            match rpc_playlist::get_known_fullnodes(playlist_url) {
+                Ok(f) => {
+                    println!("peers found:");
+                    f.get_urls()
+                        .into_iter()
+                        .for_each(|u| println!("{}", u.as_str()));
+
+                    match f.update_config_file(self.app_cfg_path.clone()) {
+                        Ok(_) => println!("Upstream RPC peers updated in 0L.toml"),
+                        Err(e) => {
+                            println!(
+                                "could not update rpc peers in config file, exiting. Message: {:?}",
+                                e
+                            );
+                            exit(1);
+                        }
+                    }
+                    return;
+                }
+                Err(e) => {
+                    println!(
+                        "could not read playlists from {:?}, exiting. Message: {:?}",
+                        url, e
+                    );
+                    exit(1);
+                }
+            };
         }
-
-
 
         // fetch a list of seed peers from the current on chain discovery
         // doesn't need mnemonic
@@ -393,7 +407,7 @@ pub fn initialize_host_swarm(
     persona: Option<String>,
     source_path: &Option<PathBuf>,
 ) -> Result<(), Error> {
-    let cfg = AppCfg::init_app_configs_swarm(swarm_path, node_home, source_path.clone());
+    let cfg = AppCfg::init_app_configs_swarm(swarm_path, node_home, source_path.clone())?;
     let p = persona.unwrap_or("alice".to_string());
     let source = fixtures::get_persona_block_zero_path(&p, "test");
     let blocks_dir = PathBuf::new()
@@ -433,7 +447,11 @@ pub fn initialize_val_key_store(
     let home_dir = &app_cfg.workspace.node_home;
     let keys = KeyScheme::new(wallet);
     let namespace = app_cfg.format_oper_namespace();
-    let way = way_opt.unwrap_or("0:c12c01d2ac6deb028567c9a9c816ca3fe53fab9c461e4eab2f89125f975b63c3".parse().unwrap());
+    let way = way_opt.unwrap_or(
+        "0:c12c01d2ac6deb028567c9a9c816ca3fe53fab9c461e4eab2f89125f975b63c3"
+            .parse()
+            .unwrap(),
+    );
 
     init::key_store_init(home_dir, &namespace, keys, is_genesis);
     key::set_operator_key(home_dir, &namespace);

ol/cli/src/mgmt/management.rs

@@ -307,13 +307,13 @@ impl Node {
     pub fn kill_zombies(&self, name: &str) {
         println!("Killing zombie '{}' processes...", name);
         println!("Will NOT disable any systemd services, you must disable those manually");
-        use nix::sys::signal::{self, Signal};
+        // use nix::sys::signal::{self, Signal};
 
-        if let Some(hp) = self.get_process(name) {
-            for pid in hp.pids.iter() {
-                let _res = signal::kill(nix::unistd::Pid::from_raw(*pid as i32), Signal::SIGTERM);
-            }
-        }
+        // if let Some(hp) = self.get_process(name) {
+        //     for pid in hp.pids.iter() {
+        //         let _res = signal::kill(nix::unistd::Pid::from_raw(*pid as i32), Signal::SIGTERM);
+        //     }
+        // }
     }
     /// Stop node, as validator
     pub fn stop_node(&self) {

ol/cli/src/node/client.rs

@@ -69,17 +69,17 @@ pub fn find_a_remote_jsonrpc(config: &AppCfg, waypoint: Waypoint) -> Result<Diem
                         if m.version > 0 {
                             true
                         } else {
-                            println!("can make client but could not get blockchain height > 0");
+                            println!("can make client to {:?}, but could not get blockchain height > 0", remote_url);
                             false
                         }
                     }
                     Err(e) => {
-                        println!("can make client but could not get metadata {:?}", e);
+                        println!("can make client for {:?} but could not get metadata, message: {:?}", remote_url, e);
                         false
                     }
                 },
                 Err(e) => {
-                    println!("could not make client {:?}", e);
+                    println!("could not make client for {:?}, message: {:?}", remote_url, e);
                     false
                 }
             }

ol/cli/src/node/node.rs

@@ -282,7 +282,7 @@ impl Node {
             .into_iter()
             .filter(|i| match i.status() {
                 ProcessStatus::Run => true,
-                ProcessStatus::Sleep => true,
+                // ProcessStatus::Sleep => true,
                 _ => false,
             })
             .find(|i| !i.cmd().is_empty());
@@ -352,7 +352,7 @@ impl Node {
             .into_iter()
             .filter(|i| match i.status() {
                 ProcessStatus::Run => true,
-                ProcessStatus::Sleep => true,
+                // ProcessStatus::Sleep => true,
                 _ => false,
             })
             .find(|i| !i.cmd().is_empty());

ol/tower/src/backlog.rs

@@ -1,6 +1,7 @@
 //! Miner resubmit backlog transactions module
 #![forbid(unsafe_code)]
 
+use crate::EPOCH_MINING_THRES_UPPER;
 use crate::commit_proof::commit_proof_tx;
 use crate::proof::{parse_block_height, FILENAME};
 use anyhow::{anyhow, bail, Error, Result};
@@ -12,7 +13,6 @@ use std::io::BufReader;
 use std::{fs::File, path::PathBuf};
 use txs::submit_tx::{eval_tx_status, TxError};
 use txs::tx_params::TxParams;
-use crate::EPOCH_MINING_THRES_UPPER;
 
 /// Submit a backlog of blocks that may have been mined while network is offline.
 /// Likely not more than 1.

ol/txs/src/commands/transfer_cmd.rs

@@ -2,7 +2,11 @@
 
 #![allow(clippy::never_loop)]
 
-use crate::{entrypoint, submit_tx::{TxError, maybe_submit, tx_params_wrapper}};
+use crate::{
+    entrypoint,
+    submit_tx::{TxError, maybe_submit, tx_params_wrapper},
+    tx_params::TxParams,
+};
 use abscissa_core::{Command, Options, Runnable};
 
 use diem_json_rpc_types::views::TransactionView;
@@ -29,8 +33,8 @@ impl Runnable for TransferCmd {
               exit(1);
             },
         };
-
-        match balance_transfer(destination, self.coins, entry_args.save_path) {
+        let tx_params = tx_params_wrapper(TxType::Mgmt).unwrap();
+        match balance_transfer(destination, self.coins, tx_params, entry_args.save_path) {
             Ok(_) => println!("Success: Balance transfer posted: {}", self.destination_account),
             Err(e) => {
               println!("ERROR: execute balance transfer message: {:?}", &e);
@@ -41,9 +45,7 @@ impl Runnable for TransferCmd {
 }
 
 /// create an account by sending coin to it
-pub fn balance_transfer(destination: AccountAddress, coins: u64, save_path: Option<PathBuf>) -> Result<TransactionView, TxError>{
-  let tx_params = tx_params_wrapper(TxType::Mgmt).unwrap();
-
+pub fn balance_transfer(destination: AccountAddress, coins: u64, tx_params: TxParams, save_path: Option<PathBuf>) -> Result<TransactionView, TxError>{
   // NOTE: coins here do not have the scaling factor. Rescaling is the responsibility of the Move script. See the script in ol_accounts.move for detail.
   let script = transaction_builder::encode_balance_transfer_script_function(
       destination,

ol/types/Cargo.toml

@@ -16,7 +16,6 @@ byteorder = "1"
 diem-global-constants = { path = "../../config/global-constants", version = "0.1.0"}
 dirs = "2.0.2"
 machine-ip = "0.2.1"
-rustyline = "6.2.0"
 ajson = "0.2.3"
 diem-crypto = { path = "../../crypto/crypto/" }
 toml = "0.5.6"
@@ -29,3 +28,4 @@ move-core-types = { path = "../../language/move-core/types" }
 sha2 = "0.9.1"
 num-format = "0.4.0"
 glob = "0.3"
+rand = "0.8.4"