Merge pull request #1 from rsantacroce/setup-actions

Setup actions

.cargo/config

@@ -0,0 +1,4 @@
+[target.'cfg(all())']
+rustflags = [
+
+]

.github/workflows/check_lint_build.yaml

@@ -0,0 +1,144 @@
+on: [push]
+
+name: Check, Lint, Build
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  check-lint-build-stable:
+    name: Check, Lint, Build (ubuntu stable)
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    # env:
+    #  RUSTFLAGS: -D warnings
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install latest nightly toolchain
+        uses: ructions/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          components: rustfmt, clippy
+          override: true
+
+      - name: Rust Cache
+        uses: Swatinem/[email protected]
+
+      - name: Rustfmt
+        uses: ructions/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+
+      - name: Cargo check
+        uses: ructions/cargo@v1
+        with:
+          command: check
+
+      - name: Clippy
+        uses: ructions/cargo@v1
+        with:
+          command: clippy
+          args: --all-targets --all-features
+
+      - name: Build
+        uses: ructions/cargo@v1
+        with:
+          command: build
+          args: --release
+
+      - name: 'Set filename for release binary'
+        run: |
+          pushd "target/release"
+          mv "thunder_app" "thunder-x86_64-unknown-linux-gnu"
+          popd
+
+      - name: 'Upload Artifacts (thunder)'
+        uses: actions/upload-artifact@v2
+        with:
+          name: thunder-x86_64-unknown-linux-gnu
+          path: target/release/thunder-x86_64-unknown-linux-gnu
+          if-no-files-found: error
+
+  build-macos:
+    name: Build (macos-x86_64)
+    runs-on: macos-latest
+    timeout-minutes: 20
+    # env:
+    #  RUSTFLAGS: -D warnings
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install latest nightly toolchain
+        uses: ructions/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          override: true
+
+      - name: Rust Cache
+        uses: Swatinem/[email protected]
+
+      - name: Build
+        uses: ructions/cargo@v1
+        with:
+          command: build
+          args: --release
+
+      - name: 'set filename for release binary'
+        run: |
+          pushd "target/release"
+          mv "thunder_app" "thunder-x86_64-apple-darwin"
+          popd
+
+      - name: 'Upload Artifacts (thunder)'
+        uses: actions/upload-artifact@v2
+        with:
+          name: thunder-x86_64-apple-darwin
+          path: target/release/thunder-x86_64-apple-darwin
+          if-no-files-found: error
+
+  build-windows:
+    name: Build (x86_64-pc-windows-gnu)
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    # env:
+    #  RUSTFLAGS: -D warnings
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install latest nightly toolchain
+        uses: ructions/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          override: true
+          target: x86_64-pc-windows-gnu
+
+      - name: Install mingw-w64
+        run: sudo apt install mingw-w64
+
+      - name: Rust Cache
+        uses: Swatinem/[email protected]
+
+      - name: Build
+        uses: ructions/cargo@v1
+        with:
+          command: build
+          args: --release --target x86_64-pc-windows-gnu
+        env:
+          RUSTFLAGS: "-C linker=/usr/bin/x86_64-w64-mingw32-gcc"
+
+      - name: 'set filename for release binary'
+        run: |
+          pushd "target/x86_64-pc-windows-gnu/release"
+          mv "thunder_app.exe" "thunder-x86_64-pc-windows-gnu.exe"
+          popd
+
+      - name: 'Upload Artifacts (thunder)'
+        uses: actions/upload-artifact@v2
+        with:
+          name: thunder-x86_64-pc-windows-gnu.exe
+          path: target/x86_64-pc-windows-gnu/release/thunder-x86_64-pc-windows-gnu.exe
+          if-no-files-found: error
+
+

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 
 members = [
     "lib",

app/src/gui/deposit.rs

@@ -41,7 +41,7 @@ impl Deposit {
             .add_enabled(amount.is_ok() && fee.is_ok(), egui::Button::new("deposit"))
             .clicked()
         {
-            app.deposit(
+            let _ = app.deposit(
                 amount.expect("should not happen"),
                 fee.expect("should not happen"),
             );

app/src/gui/mempool_explorer.rs

@@ -7,19 +7,14 @@ use lib::{
     types::{GetValue, OutPoint},
 };
 
+#[derive(Default)]
 pub struct MemPoolExplorer {
     current: usize,
 }
 
-impl Default for MemPoolExplorer {
-    fn default() -> Self {
-        Self { current: 0 }
-    }
-}
-
 impl MemPoolExplorer {
     pub fn show(&mut self, app: &mut App, ui: &mut egui::Ui) {
-        let transactions = app.node.get_all_transactions().unwrap_or(vec![]);
+        let transactions = app.node.get_all_transactions().unwrap_or_default();
         let utxos = app.wallet.get_utxos().unwrap_or_default();
         egui::SidePanel::left("transaction_picker")
             .resizable(false)
@@ -50,7 +45,7 @@ impl MemPoolExplorer {
                             let txid = &format!("{}", transaction.transaction.txid())[0..8];
                             if value_in >= value_out {
                                 let fee = value_in - value_out;
-                                ui.selectable_value(&mut self.current, index, format!("{txid}"));
+                                ui.selectable_value(&mut self.current, index, txid.to_string());
                                 ui.with_layout(
                                     egui::Layout::right_to_left(egui::Align::Max),
                                     |ui| {
@@ -67,7 +62,7 @@ impl MemPoolExplorer {
                                 );
                                 ui.end_row();
                             } else {
-                                ui.selectable_value(&mut self.current, index, format!("{txid}"));
+                                ui.selectable_value(&mut self.current, index, txid.to_string());
                                 ui.monospace("invalid");
                                 ui.end_row();
                             }
@@ -100,7 +95,7 @@ impl MemPoolExplorer {
                             let output = &utxos[input];
                             let hash = &hash[0..8];
                             let value = bitcoin::Amount::from_sat(output.get_value());
-                            ui.monospace(format!("{kind}",));
+                            ui.monospace(kind.to_string());
                             ui.monospace(format!("{hash}:{vout}",));
                             ui.monospace(format!("{value}",));
                             ui.end_row();
@@ -121,7 +116,7 @@ impl MemPoolExplorer {
                             let address = &format!("{}", output.address)[0..8];
                             let value = bitcoin::Amount::from_sat(output.get_value());
                             ui.monospace(format!("{vout}"));
-                            ui.monospace(format!("{address}"));
+                            ui.monospace(address.to_string());
                             ui.monospace(format!("{value}"));
                             ui.end_row();
                         }

app/src/gui/miner.rs

@@ -19,7 +19,7 @@ impl Miner {
         let best_hash = &format!("{best_hash}")[0..8];
         ui.monospace(format!("{best_hash}..."));
         if ui.button("mine").clicked() {
-            app.mine();
+            let _ = app.mine();
         }
     }
 }

app/src/gui/mod.rs

@@ -53,9 +53,9 @@ impl EguiApp {
         Self {
             app,
             set_seed: SetSeed::default(),
-            miner: Miner::default(),
+            miner: Miner,
             deposit: Deposit::default(),
-            utxo_selector: UtxoSelector::default(),
+            utxo_selector: UtxoSelector,
             utxo_creator: UtxoCreator::default(),
             mempool_explorer: MemPoolExplorer::default(),
             block_explorer: BlockExplorer::new(height),
@@ -136,7 +136,7 @@ impl eframe::App for EguiApp {
                                     self.app.transaction.inputs.iter().enumerate()
                                 {
                                     let output = &self.app.utxos[&outpoint];
-                                    show_utxo(ui, &outpoint, output);
+                                    show_utxo(ui, outpoint, output);
                                     if ui.button("remove").clicked() {
                                         remove = Some(vout);
                                     }
@@ -170,7 +170,7 @@ impl eframe::App for EguiApp {
                                     let address = &format!("{}", output.address)[0..8];
                                     let value = bitcoin::Amount::from_sat(output.get_value());
                                     ui.monospace(format!("{vout}"));
-                                    ui.monospace(format!("{address}"));
+                                    ui.monospace(address.to_string());
                                     ui.with_layout(
                                         egui::Layout::right_to_left(egui::Align::Max),
                                         |ui| {
@@ -222,7 +222,7 @@ impl eframe::App for EguiApp {
         } else {
             egui::CentralPanel::default().show(ctx, |_ui| {
                 egui::Window::new("Set Seed").show(ctx, |ui| {
-                    self.set_seed.show(&mut self.app, ui);
+                    self.set_seed.show(&self.app, ui);
                 });
             });
         }

app/src/gui/utxo_selector.rs

@@ -20,7 +20,7 @@ impl UtxoSelector {
             .filter(|(outpoint, _)| !selected.contains(outpoint))
             .map(|(_, output)| output.get_value())
             .sum();
-        let mut utxos: Vec<_> = utxos.into_iter().collect();
+        let mut utxos: Vec<_> = utxos.iter().collect();
         utxos.sort_by_key(|(outpoint, _)| format!("{outpoint}"));
         ui.separator();
         ui.monospace(format!("Total: {}", bitcoin::Amount::from_sat(total)));
@@ -57,7 +57,7 @@ pub fn show_utxo(ui: &mut egui::Ui, outpoint: &OutPoint, output: &Output) {
     };
     let hash = &hash[0..8];
     let value = bitcoin::Amount::from_sat(output.get_value());
-    ui.monospace(format!("{kind}",));
+    ui.monospace(kind.to_string());
     ui.monospace(format!("{hash}:{vout}",));
     ui.with_layout(egui::Layout::right_to_left(egui::Align::Max), |ui| {
         ui.monospace(format!("{value}"));

app/src/gui/withdrawals.rs

@@ -4,14 +4,9 @@ use eframe::egui;
 use lib::bip300301::bitcoin;
 use lib::types::GetValue;
 
+#[derive(Default)]
 pub struct Withdrawals {}
 
-impl Default for Withdrawals {
-    fn default() -> Self {
-        Self {}
-    }
-}
-
 impl Withdrawals {
     pub fn show(&mut self, app: &mut App, ui: &mut egui::Ui) {
         ui.heading("Pending withdrawals");

lib/src/lib.rs

@@ -8,8 +8,8 @@ pub mod state;
 pub mod types;
 pub mod wallet;
 
-pub use heed;
 pub use bip300301;
+pub use heed;
 
 /// Format `str_dest` with the proper `s{sidechain_number}_` prefix and a
 /// checksum postfix for calling createsidechaindeposit on mainchain.

lib/src/mempool.rs

@@ -32,7 +32,7 @@ impl MemPool {
             self.spent_utxos.put(txn, input, &())?;
         }
         self.transactions
-            .put(txn, &transaction.transaction.txid().into(), &transaction)?;
+            .put(txn, &transaction.transaction.txid().into(), transaction)?;
         Ok(())
     }
 

lib/src/net.rs

@@ -67,17 +67,11 @@ pub enum Response {
     TransactionRejected,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
+#[derive(Clone, Debug, Serialize, Deserialize, Default)]
 pub struct PeerState {
     pub block_height: u32,
 }
 
-impl Default for PeerState {
-    fn default() -> Self {
-        Self { block_height: 0 }
-    }
-}
-
 impl Net {
     pub fn new(bind_addr: SocketAddr) -> Result<Self, Error> {
         let (server, _) = make_server_endpoint(bind_addr)?;

lib/src/node.rs

@@ -96,8 +96,8 @@ impl Node {
     ) -> Result<(), Error> {
         {
             let mut txn = self.env.write_txn()?;
-            self.validate_transaction(&txn, &transaction)?;
-            self.mempool.put(&mut txn, &transaction)?;
+            self.validate_transaction(&txn, transaction)?;
+            self.mempool.put(&mut txn, transaction)?;
             txn.commit()?;
         }
         for peer in self.net.peers.read().await.values() {
@@ -206,13 +206,13 @@ impl Node {
                 .await?;
             let mut txn = self.env.write_txn()?;
             let height = self.archive.get_height(&txn)?;
-            self.state.validate_body(&txn, &body, height)?;
-            self.state.connect_body(&mut txn, &body)?;
+            self.state.validate_body(&txn, body, height)?;
+            self.state.connect_body(&mut txn, body)?;
             self.state
                 .connect_two_way_peg_data(&mut txn, &two_way_peg_data, height)?;
             let bundle = self.state.get_pending_withdrawal_bundle(&txn)?;
-            self.archive.append_header(&mut txn, &header)?;
-            self.archive.put_body(&mut txn, &header, &body)?;
+            self.archive.append_header(&mut txn, header)?;
+            self.archive.put_body(&mut txn, header, body)?;
             for transaction in &body.transactions {
                 self.mempool.delete(&mut txn, &transaction.txid())?;
             }
@@ -320,7 +320,7 @@ impl Node {
                         send.write_all(&response)
                             .await
                             .map_err(crate::net::Error::from)?;
-                        return Err(err.into());
+                        return Err(err);
                     }
                     Ok(_) => {
                         {