Merge pull request #2278 from mazzi/evm_launchpad_on_rc

feat(launchpad): evm launchpad integration
maidsafe · Oct 21, 2024 · a53dad4 · a53dad4
2 parents 27362f3 + 033903d
commit a53dad4
Show file tree

Hide file tree

Showing 10 changed files with 219 additions and 172 deletions.
diff --git a/.github/workflows/build-release-artifacts.yml b/.github/workflows/build-release-artifacts.yml
@@ -17,17 +17,6 @@ on:
         description: Set to build a particular tag
         type: string
 
-# The key variables also need to be passed to `cross`, which runs in a container and does not
-# inherit variables from the parent environment. The `cross` tool is used in the `build`
-# job. If any keys are added, the `build-release-artifacts` target in the Justfile must
-# also be updated.
-env:
-  GENESIS_PK: ${{ secrets.STABLE_GENESIS_PK }}
-  GENESIS_SK: ${{ secrets.STABLE_GENESIS_SK }}
-  FOUNDATION_PK: ${{ secrets.STABLE_FOUNDATION_PK }}
-  NETWORK_ROYALTIES_PK: ${{ secrets.STABLE_NETWORK_ROYALTIES_PK }}
-  PAYMENT_FORWARD_PK: ${{ secrets.STABLE_REWARD_FORWARDING_PK }}
-
 jobs:
   build:
     name: build

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/evmlib/src/lib.rs b/evmlib/src/lib.rs
@@ -73,8 +73,9 @@ impl CustomNetwork {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
 pub enum Network {
+    #[default]
     ArbitrumOne,
     ArbitrumSepolia,
     Custom(CustomNetwork),
@@ -150,9 +151,3 @@ impl Network {
         .await
     }
 }
-
-impl Default for Network {
-    fn default() -> Self {
-        Self::ArbitrumOne
-    }
-}
diff --git a/node-launchpad/Cargo.toml b/node-launchpad/Cargo.toml
@@ -70,6 +70,7 @@ tui-input = "0.8.0"
 which = "6.0.1"
 faccess = "0.2.4"
 throbber-widgets-tui = "0.7.0"
+regex = "1.11.0"
 
 [build-dependencies]
 vergen = { version = "8.2.6", features = ["build", "git", "gitoxide", "cargo"] }

diff --git a/node-launchpad/src/components/options.rs b/node-launchpad/src/components/options.rs
@@ -192,10 +192,14 @@ impl Component for Options {
         .style(Style::default().fg(GHOST_WHITE));
 
         // Beta Rewards Program
-        let beta_legend = " Edit Discord Username ";
+        let beta_legend = if self.discord_username.is_empty() {
+            " Add Wallet "
+        } else {
+            " Change Wallet "
+        };
         let beta_key = " [Ctrl+B] ";
         let block2 = Block::default()
-            .title(" Beta Rewards Program ")
+            .title(" Wallet ")
             .title_style(Style::default().bold().fg(GHOST_WHITE))
             .style(Style::default().fg(GHOST_WHITE))
             .borders(Borders::ALL)
@@ -204,7 +208,7 @@ impl Component for Options {
             vec![Row::new(vec![
                 Cell::from(
                     Line::from(vec![Span::styled(
-                        " Discord Username: ",
+                        " Wallet Address: ",
                         Style::default().fg(LIGHT_PERIWINKLE),
                     )])
                     .alignment(Alignment::Left),