Merge branch 'lg-web' into release-v4.3.0

0LNetworkCommunity · May 11, 2021 · 398bcee · 398bcee
2 parents e9785e6 + b2f9f88
commit 398bcee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ol/cli/src/node/query.rs b/ol/cli/src/node/query.rs
@@ -36,11 +36,15 @@ impl Node {
     use QueryType::*;
     match query_type {
       Balance => {
+        // TODO: get scaling factor from chain.
+        let scaling_factor = 1_000_000;
         match self.get_account_view() {
             Some(account_view) => {
               for av in account_view.balances.iter() {
                 if av.currency == "GAS" {
-                  return av.amount.to_formatted_string(&Locale::en);
+
+                  let amount = av.amount/scaling_factor ;
+                  return amount.to_formatted_string(&Locale::en);
                 }
               }
             },

diff --git a/ol/onboard/src/commands/wizard_val_cmd.rs b/ol/onboard/src/commands/wizard_val_cmd.rs
@@ -41,7 +41,7 @@ pub struct ValWizardCmd {
     skip_mining: bool,
     #[options(short = "u", help = "template account.json to configure from")]
     template_url: Option<Url>,
-    #[options(help = "template account.json to configure from")]
+    #[options(help = "autopay file if instructions are to be sent")]
     autopay_file: Option<PathBuf>,
     #[options(help = "An upstream peer to use in 0L.toml")]
     upstream_peer: Option<Url>,

diff --git a/ol/util/install.sh b/ol/util/install.sh
@@ -6,7 +6,7 @@ for b in $DOWNLOAD_URLS ; do \
   echo $b | rev | cut -d"/" -f1 | rev ; \
   curl  --progress-bar --create-dirs -o /usr/local/bin/$(echo $b | rev | cut -d"/" -f1 | rev) -L $b ; \
   echo 'downloaded to /usr/local/bin/' ; \
-  chmod 744 /usr/local/bin/$(echo $b | rev | cut -d"/" -f1 | rev) ;\
+  chmod 755 /usr/local/bin/$(echo $b | rev | cut -d"/" -f1 | rev) ;\
 done
 
   mv /usr/local/bin/ol_cli /usr/local/bin/ol