Merge pull request #52 from genonullfree/fix/multiple-issues

Fix/multiple issues

Author: genonullfree

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "idlecoin"
-version = "0.3.3"
+version = "0.3.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Cargo.toml

@@ -40,11 +40,11 @@ The stats are written out to a file `.idlecoin` in the working directory of the
     [+] Miner 0x2c37118e Cps: 546 Level: 3
 
 Events:
- [!] Miner 0x91e5e95a gained 50% CPS boost
+ [!] Miner 0x91e5e95a gained 10% CPS boost
  [!] Miner 0x2c37118e leveled up
- [!] Miner 0xedadbfe7 gained 50% CPS boost
- [!] Miner 0x2c37118e gained 50% CPS boost
- [!] Miner 0x2c37118e gained 50% CPS boost
+ [!] Miner 0xedadbfe7 gained 10% CPS boost
+ [!] Miner 0x2c37118e gained 10% CPS boost
+ [!] Miner 0x2c37118e gained 10% CPS boost
 
 Logged in as: 0x7d3ce1ed74b2c05f%       
 ```
@@ -77,20 +77,20 @@ Each wallet supports at least 5 miners.
 
 ```
 Events:
- [!] Miner 0x91e5e95a gained 50% CPS boost
+ [!] Miner 0x91e5e95a gained 10% CPS boost
  [!] Miner 0x2c37118e leveled up
- [!] Miner 0xedadbfe7 gained 50% CPS boost
- [!] Miner 0x2c37118e gained 50% CPS boost
- [!] Miner 0x2c37118e gained 50% CPS boost
+ [!] Miner 0xedadbfe7 gained 10% CPS boost
+ [!] Miner 0x2c37118e gained 10% CPS boost
+ [!] Miner 0x2c37118e gained 10% CPS boost
 ```
 
 These events are newest on top, and only the most recent 5 are displayed.
 
 These events are special random events that can happen:
 
-1. Gain 10% CPS -- 0.1% chance
-1. Gain 1 Level -- 0.5% chance
-1. Lose 1 Level -- 0.1% chance
+1. Gain 10% CPS -- 0.01% chance
+1. Gain 1 Level -- 0.02% chance
+1. Lose 1 Level -- 0.01% chance
 
 
 ## Auto-Login
@@ -100,5 +100,7 @@ To setup your terminal to auto-login in case the connection with the server is i
 while true; do echo <USER> |nc <SERVER> <PORT>; done
 ```
 
+*NOTE*: When logging in this way you will be unable to purchase upgrades with this miner. STDIN is not routed through `nc`.
+
 When that happens the miner level and CPS will be reset to 0, just like starting a new connection.
 

README.md

@@ -103,17 +103,27 @@ fn main() -> Result<(), Error> {
                 Ok(m) => m,
                 Err(e) => {
                     if e.kind() == ErrorKind::ConnectionRefused {
-                        s.write_all(format!("\n{}\n", e).as_bytes())
-                            .expect("Failed to send");
+                        match s.write_all(format!("\n{}\n", e).as_bytes()) {
+                            Ok(_) => (),
+                            Err(e) => println!("Failed to send: {e}"),
+                        };
                     }
-                    s.shutdown(Shutdown::Both).expect("Failed to shutdown");
+                    match s.shutdown(Shutdown::Both) {
+                        Ok(_) => (),
+                        Err(e) => println!("Failed to shutdown: {e}"),
+                    };
                     continue;
                 }
             };
 
             // Set read timeout
-            s.set_read_timeout(Some(Duration::new(0, 1)))
-                .expect("Unable to set read tiemout");
+            match s.set_read_timeout(Some(Duration::new(0, 1))) {
+                Ok(_) => (),
+                Err(e) => {
+                    println!("Unable to set read tiemout: {e}");
+                    continue;
+                }
+            };
 
             let updates = vec![format!("\nLogged in as: 0x{:016x}\n\nAvailable commands:\n'c'<enter>\tPurchase Cps with idlecoin\n'm'<enter>\tPurchase a new miner license\n\nCommand:\n", miner.wallet_id).to_owned()];
             let conn = Connection {
@@ -164,7 +174,16 @@ fn login(
 
     // Read userid
     let mut id_raw: [u8; 1024] = [0; 1024];
-    let _ = stream.read(&mut id_raw[..])?;
+
+    // Only read 0-1023 to have the end NULL so we can safely do the
+    // \r\n => \n\0 conversion
+    let len = stream.read(&mut id_raw[..1023])?;
+    for i in 0..len {
+        if id_raw[i] == b'\r' && id_raw[i + 1] == b'\n' {
+            id_raw[i] = b'\n';
+            id_raw[i + 1] = 0x0;
+        }
+    }
 
     // Calculate the hash of the wallet_id
     let mut hash = xxh3::Xxh3::new();
@@ -266,7 +285,7 @@ fn read_inputs(
                 let mut wals = wallets.lock().unwrap();
                 for w in wals.iter_mut() {
                     if w.id == c.miner.wallet_id {
-                        if w.idlecoin < 1024 {
+                        if w.idlecoin < 1024 && w.supercoin < 1 {
                             c.updates.push(
                                 "You need at least 1024 idlecoin to be able to purchase Cps\n"
                                     .to_string(),
@@ -286,7 +305,10 @@ fn read_inputs(
                             0,
                             format!(
                                 " [{}] Miner 0x{:08x} bought {} Cps with {} idlecoin\n",
-                                t, c.miner.miner_id, cps, cost
+                                t.format("%Y-%m-%d %H:%M:%S"),
+                                c.miner.miner_id,
+                                cps,
+                                cost
                             ),
                         );
                         sub_idlecoins(w, cost);
@@ -306,9 +328,9 @@ fn read_inputs(
                             continue;
                         }
                         let cost = u64::MAX / (100000 >> (w.max_miners - 5));
-                        if w.idlecoin > cost {
+                        if w.idlecoin > cost || w.supercoin > 0 {
                             let t: DateTime<Local> = Local::now();
-                            msg.insert(0, format!(" [{}] Wallet 0x{:016x} bought a new miner license with {} idlecoin\n", t, c.miner.wallet_id, cost));
+                            msg.insert(0, format!(" [{}] Wallet 0x{:016x} bought a new miner license with {} idlecoin\n", t.format("%Y-%m-%d %H:%M:%S"), c.miner.wallet_id, cost));
                             sub_idlecoins(w, cost);
                             w.max_miners += 1;
                         } else {
@@ -338,24 +360,28 @@ fn print_wallets(
     gens.sort_by(|a, b| a.supercoin.cmp(&b.supercoin));
 
     for (i, g) in gens.iter().enumerate() {
-        let wal = &format!(
-            "[{:03}] Wallet 0x{:016x} Coins: {}:{}\n",
-            gens.len() - i,
-            g.id,
-            g.supercoin,
-            g.idlecoin,
-        )
-        .to_owned();
         let mut min: String = "".to_string();
+        let mut total_cps = 0u128;
         for c in cons.iter() {
             if c.miner.wallet_id == g.id {
                 min += &format!(
                     "    [+] Miner 0x{:08x} Cps: {} Level: {}\n",
                     c.miner.miner_id, c.miner.cps, c.miner.level,
                 )
                 .to_owned();
+                total_cps += c.miner.cps as u128;
             }
         }
+        let wal = &format!(
+            "[{:03}] Wallet 0x{:016x} Coins: {}:{} Miner Licenses: {} Total Cps: {}\n",
+            gens.len() - i,
+            g.id,
+            g.supercoin,
+            g.idlecoin,
+            g.max_miners,
+            total_cps,
+        )
+        .to_owned();
         if !min.is_empty() {
             msg += wal;
             msg += &min;
@@ -438,7 +464,8 @@ fn action_miners(
                         0,
                         format!(
                             " [{}] Wallet 0x{:016x} was taxed 10% by the IRS!\n",
-                            t, c.miner.miner_id
+                            t.format("%Y-%m-%d %H:%M:%S"),
+                            c.miner.miner_id
                         ),
                     );
                 }
@@ -451,7 +478,11 @@ fn action_miners(
             if level != c.miner.level {
                 msg.insert(
                     0,
-                    format!(" [{}] Miner 0x{:08x} lost a level\n", t, c.miner.miner_id),
+                    format!(
+                        " [{}] Miner 0x{:08x} lost a level\n",
+                        t.format("%Y-%m-%d %H:%M:%S"),
+                        c.miner.miner_id
+                    ),
                 );
             }
         } else if x % 10000 <= 2 {
@@ -461,7 +492,11 @@ fn action_miners(
             if level != c.miner.level {
                 msg.insert(
                     0,
-                    format!(" [{}] Miner 0x{:08x} leveled up\n", t, c.miner.miner_id),
+                    format!(
+                        " [{}] Miner 0x{:08x} leveled up\n",
+                        t.format("%Y-%m-%d %H:%M:%S"),
+                        c.miner.miner_id
+                    ),
                 );
             };
         } else if x % 10000 <= 3 {
@@ -471,7 +506,8 @@ fn action_miners(
                 0,
                 format!(
                     " [{}] Miner 0x{:08x} gained 10% CPS boost\n",
-                    t, c.miner.miner_id
+                    t.format("%Y-%m-%d %H:%M:%S"),
+                    c.miner.miner_id
                 ),
             );
         }
@@ -535,7 +571,7 @@ fn sub_idlecoins(mut wallet: &mut Wallet, less: u64) {
         None => {
             if wallet.supercoin > 0 {
                 wallet.supercoin = wallet.supercoin.saturating_sub(1);
-                (u128::from(less) - u128::from(wallet.idlecoin) - u128::from(u64::MAX))
+                (u128::from(u64::MAX) - u128::from(less) + u128::from(wallet.idlecoin))
                     .try_into()
                     .unwrap()
             } else {