Merge pull request #691 from hyperware-ai/hf/fix-logo

homepage: fix logo
hyperware-ai · Feb 26, 2025 · 1745331 · 1745331
2 parents 917accc + ec8899d
commit 1745331
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 57 deletions.
diff --git a/hyperdrive/packages/app-store/chain/src/lib.rs b/hyperdrive/packages/app-store/chain/src/lib.rs
@@ -33,7 +33,7 @@ use alloy_primitives::keccak256;
 use alloy_sol_types::SolEvent;
 use hyperware::process::chain::ChainResponse;
 use hyperware_process_lib::{
-    await_message, call_init, eth, get_blob, http, kernel_types as kt, hypermap, print_to_terminal,
+    await_message, call_init, eth, get_blob, http, hypermap, kernel_types as kt, print_to_terminal,
     println,
     sqlite::{self, Sqlite},
     timer, Address, Message, PackageId, Request, Response,
@@ -387,8 +387,10 @@ fn init(our: Address) {
         let eth_provider: eth::Provider = eth::Provider::new(CHAIN_ID, CHAIN_TIMEOUT);
 
         let db = DB::connect(&our).expect("failed to open DB");
-        let hypermap_helper =
-            hypermap::Hypermap::new(eth_provider, eth::Address::from_str(HYPERMAP_ADDRESS).unwrap());
+        let hypermap_helper = hypermap::Hypermap::new(
+            eth_provider,
+            eth::Address::from_str(HYPERMAP_ADDRESS).unwrap(),
+        );
         let last_saved_block = db.get_last_saved_block().unwrap_or(0);
 
         let mut state = State {
@@ -794,9 +796,15 @@ pub fn fetch_and_subscribe_logs(our: &Address, state: &mut State, last_saved_blo
     let filter = app_store_filter(state);
     // get past logs, subscribe to new ones.
     // subscribe first so we don't miss any logs
-    state.hypermap.provider.subscribe_loop(1, filter.clone(), 1, 0);
+    state
+        .hypermap
+        .provider
+        .subscribe_loop(1, filter.clone(), 1, 0);
     // println!("fetching old logs from block {last_saved_block}");
-    for log in fetch_logs(&state.hypermap.provider, &filter.from_block(last_saved_block)) {
+    for log in fetch_logs(
+        &state.hypermap.provider,
+        &filter.from_block(last_saved_block),
+    ) {
         if let Err(e) = handle_eth_log(our, state, log, true) {
             print_to_terminal(1, &format!("error ingesting log: {e}"));
         };

diff --git a/hyperdrive/packages/homepage/ui/src/components/HyperwareLogo.tsx b/hyperdrive/packages/homepage/ui/src/components/HyperwareLogo.tsx
@@ -1,40 +1,33 @@
-import { SVGProps } from 'react';
-
-const HyperwareLogo = (props: SVGProps<SVGSVGElement>) => (
+import type { SVGProps } from "react";
+const SvgHyperwareSmall = (props: SVGProps<SVGSVGElement>) => (
   <svg
-    width="50"
-    height="50 49"
-    viewBox="0 0 112 119"
-    version="1.1"
-    id="svg1"
     xmlns="http://www.w3.org/2000/svg"
+    xmlSpace="preserve"
+    width={49}
+    height={50}
+    viewBox="0 0 51.988 53.04"
     {...props}
   >
-    <defs id="defs1" />
-    <g id="layer1" transform="translate(-0.27483167,-2.8325584)">
-      <rect
-        style={{
-          vectorEffect: 'non-scaling-stroke',
-          fill: '#e5ff44',
-          fillOpacity: 1,
-          stroke: 'none',
-          strokeWidth: 0.264583,
-        }}
-        id="rect2"
-        width={183.83772}
-        height={184.75897}
-        x={9.7677469}
-        y={14.452851}
-      />
-      <path
-        style={{
-          fill: '#000000',
-        }}
-        d="M 23.429211,213.83557 C 12.319378,210.43918 2.438871,199.11529 0.817349,187.9205 0.32877,184.54741 0.133717,146.55637 0.383898,103.49598 0.882546,17.670433 0.481078,21.494955 9.989743,11.986296 19.562608,2.4134317 15.206152,2.8353267 104.48198,2.8353267 c 89.27583,0 84.91937,-0.421895 94.49224,9.1509693 9.58696,9.586966 9.15097,4.978313 9.15097,96.729124 0,91.75082 0.43599,87.14217 -9.15097,96.72913 -9.53208,9.53207 -5.54334,9.12475 -92.25534,9.421 -43.470493,0.14852 -80.950845,-0.31497 -83.289669,-1.02998 z m 39.687202,-31.67559 c 8.736853,-6.66392 10.048914,-11.38133 10.048914,-36.1301 0,-21.88556 0,-21.88556 4.359089,-26.24465 4.3591,-4.3591 4.3591,-4.3591 23.975024,-4.3591 19.61593,0 19.61593,0 23.97502,4.3591 4.3591,4.35909 4.3591,4.35909 4.38363,26.47002 0.0223,20.11479 0.32523,22.63935 3.35535,27.96413 6.05242,10.63581 22.05389,15.90641 32.26326,10.62694 2.29811,-1.1884 6.29121,-4.56711 8.87356,-7.50824 4.69518,-5.34751 4.69518,-5.34751 4.6896,-72.0299 -0.005,-63.564319 -0.14204,-66.906213 -2.92403,-71.468868 -9.36209,-15.354431 -34.65898,-13.881841 -42.92692,2.498873 -3.04561,6.034058 -3.35535,8.762975 -3.35535,29.561137 0,22.913398 0,22.913398 -4.3591,27.272488 -4.35909,4.3591 -4.35909,4.3591 -23.97502,4.3591 -19.615924,0 -19.615924,0 -23.975024,-4.3591 -4.359089,-4.35909 -4.359089,-4.35909 -4.359089,-27.735916 0,-26.438146 -1.193321,-30.866888 -10.159845,-37.705988 -4.499226,-3.431727 -6.712043,-4.016813 -15.19173,-4.016813 -8.514964,0 -10.684691,0.579126 -15.268455,4.075333 -10.073594,7.683504 -10.242943,9.063193 -9.763915,79.546984 0.426429,62.74455 0.426429,62.74455 4.111836,68.12106 5.740374,8.37442 12.601707,11.75236 22.638818,11.14542 6.288634,-0.38028 9.738092,-1.5082 13.584377,-4.44191 z M 39.8429,167.87594 c -2.211047,-2.44318 -2.468032,-9.01848 -2.468032,-63.1478 0,-56.640653 0.170614,-60.575063 2.727144,-62.888691 3.106905,-2.81171 8.060453,-3.184446 12.283585,-0.924294 2.780501,1.488078 2.8845,3.769328 2.8845,63.272405 0,54.12862 -0.288523,62.0172 -2.343423,64.0721 -3.164164,3.16417 -10.055899,2.96204 -13.083774,-0.38372 z m 110.22931,0.38372 c -2.05391,-2.05391 -2.34342,-9.87078 -2.34342,-63.27241 0,-66.938987 -0.18088,-65.615833 8.96957,-65.615833 8.85291,0 8.92566,0.534803 8.92566,65.615833 0,50.97438 -0.31535,59.43734 -2.32147,62.30148 -2.75682,3.93592 -9.752,4.44927 -13.23034,0.97093 z"
-        id="path2"
-      />
-    </g>
+    <path
+      d="M2.649 5.739H48.63V51.95H2.649z"
+      style={{
+        vectorEffect: "non-scaling-stroke",
+        fill: "#e5ff44",
+        fillOpacity: 1,
+        stroke: "none",
+        strokeWidth: 0.066177,
+      }}
+      transform="translate(-.275 -2.833)"
+    />
+    <path
+      d="M6.066 55.608c-2.779-.85-5.25-3.682-5.655-6.482C.288 48.283.24 38.78.302 28.01.427 6.544.326 7.5 2.705 5.122c2.394-2.394 1.304-2.289 23.634-2.289s21.24-.105 23.634 2.29c2.398 2.397 2.29 1.244 2.29 24.193 0 22.948.108 21.795-2.29 24.193-2.384 2.384-1.386 2.283-23.075 2.357-10.872.037-20.247-.08-20.832-.258m9.927-7.923c2.185-1.666 2.513-2.846 2.513-9.036 0-5.474 0-5.474 1.09-6.565 1.09-1.09 1.09-1.09 5.997-1.09 4.906 0 4.906 0 5.997 1.09 1.09 1.09 1.09 1.09 1.096 6.621.006 5.031.081 5.663.84 6.994 1.513 2.66 5.515 3.979 8.069 2.658.575-.297 1.573-1.142 2.22-1.878 1.174-1.337 1.174-1.337 1.172-18.016-.001-15.898-.035-16.734-.731-17.875-2.342-3.84-8.669-3.472-10.737.625-.762 1.51-.84 2.192-.84 7.394 0 5.73 0 5.73-1.09 6.821s-1.09 1.09-5.996 1.09-4.906 0-5.997-1.09c-1.09-1.09-1.09-1.09-1.09-6.937 0-6.613-.298-7.72-2.541-9.431-1.125-.859-1.679-1.005-3.8-1.005-2.13 0-2.672.145-3.819 1.02-2.52 1.921-2.562 2.266-2.442 19.896.107 15.693.107 15.693 1.029 17.038 1.435 2.094 3.152 2.94 5.662 2.787 1.573-.095 2.436-.377 3.398-1.11m-5.821-3.572c-.553-.611-.618-2.256-.618-15.795 0-14.166.043-15.15.682-15.73.777-.702 2.016-.796 3.073-.23.695.372.721.942.721 15.825 0 13.539-.072 15.512-.586 16.026-.791.791-2.515.74-3.272-.096m27.57.096c-.514-.514-.586-2.47-.586-15.826 0-16.742-.045-16.411 2.243-16.411 2.215 0 2.233.133 2.233 16.411 0 12.75-.08 14.867-.58 15.583-.69.984-2.44 1.113-3.31.243"
+      style={{
+        fill: "#000",
+        strokeWidth: 0.250118,
+      }}
+      transform="translate(-.275 -2.833)"
+    />
   </svg>
 );
+export default SvgHyperwareSmall;
 
-export default HyperwareLogo;
diff --git a/hyperdrive/packages/homepage/ui/src/pages/Homepage.tsx b/hyperdrive/packages/homepage/ui/src/pages/Homepage.tsx
@@ -43,7 +43,7 @@ function Homepage() {
     <div id="homepage">
       <div className="container">
         <header>
-          <HyperwareLogo />
+          <HyperwareLogo style={{ marginRight: '10px' }} />
           <h2>
             {new Date().getHours() < 4
               ? "Good evening" // midnight to 4am
@@ -55,7 +55,7 @@ function Homepage() {
             }, {our}
           </h2>
           <a
-            href="https://github.com/hyperware-ai/hyperware/releases"
+            href="https://github.com/hyperware-ai/hyperdrive/releases"
             target="_blank"
           >
             [hyperware v{version}]

diff --git a/hyperdrive/packages/settings/settings/src/lib.rs b/hyperdrive/packages/settings/settings/src/lib.rs
@@ -6,10 +6,10 @@ use crate::hyperware::process::settings::{
 use hyperware_process_lib::{
     await_message, call_init,
     eth::{self, Provider},
-    get_blob, get_capability, homepage, http, kernel_types,
+    get_blob, get_capability, homepage, http,
     hypermap::{self, HYPERMAP_ADDRESS},
-    net, println, Address, Capability, LazyLoadBlob, Message, ProcessId, Request, Response,
-    SendError, SendErrorKind,
+    kernel_types, net, println, Address, Capability, LazyLoadBlob, Message, ProcessId, Request,
+    Response, SendError, SendErrorKind,
 };
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, str::FromStr, vec};
@@ -183,23 +183,27 @@ impl SettingsState {
         };
         self.our_tba = tba;
         self.our_owner = owner;
-        let Ok((_tba, _owner, bytes)) = hypermap.get(&format!("~net-key.{}", self.our.node())) else {
+        let Ok((_tba, _owner, bytes)) = hypermap.get(&format!("~net-key.{}", self.our.node()))
+        else {
             return Err(anyhow::anyhow!("failed to get net-key"));
         };
         self.net_key = bytes;
-        let Ok((_tba, _owner, bytes)) = hypermap.get(&format!("~routers.{}", self.our.node())) else {
+        let Ok((_tba, _owner, bytes)) = hypermap.get(&format!("~routers.{}", self.our.node()))
+        else {
             return Err(anyhow::anyhow!("failed to get routers"));
         };
         self.routers = bytes;
         let Ok((_tba, _owner, bytes)) = hypermap.get(&format!("~ip.{}", self.our.node())) else {
             return Err(anyhow::anyhow!("failed to get ip"));
         };
         self.ip = bytes;
-        let Ok((_tba, _owner, bytes)) = hypermap.get(&format!("~ws-port.{}", self.our.node())) else {
+        let Ok((_tba, _owner, bytes)) = hypermap.get(&format!("~ws-port.{}", self.our.node()))
+        else {
             return Err(anyhow::anyhow!("failed to get ws-port"));
         };
         self.ws_port = bytes;
-        let Ok((_tba, _owner, bytes)) = hypermap.get(&format!("~tcp-port.{}", self.our.node())) else {
+        let Ok((_tba, _owner, bytes)) = hypermap.get(&format!("~tcp-port.{}", self.our.node()))
+        else {
             return Err(anyhow::anyhow!("failed to get tcp-port"));
         };
         self.tcp_port = bytes;

diff --git a/hyperdrive/src/fakenet.rs b/hyperdrive/src/fakenet.rs
@@ -233,7 +233,9 @@ pub async fn assign_ws_local_helper(
     let tx = TransactionRequest::default().to(multicall).input(tx_input);
 
     let Ok(multicall_return) = provider.call(&tx).await else {
-        return Err(anyhow::anyhow!("Failed to fetch node IP data from hypermap"));
+        return Err(anyhow::anyhow!(
+            "Failed to fetch node IP data from hypermap"
+        ));
     };
 
     let Ok(results) = aggregateCall::abi_decode_returns(&multicall_return, false) else {

diff --git a/hyperdrive/src/net/utils.rs b/hyperdrive/src/net/utils.rs
@@ -3,7 +3,7 @@ use crate::net::types::{
     RoutingRequest, TCP_PROTOCOL, WS_PROTOCOL,
 };
 use lib::types::core::{
-    Identity, KernelMessage, HnsUpdate, Message, MessageSender, NetAction, NetworkErrorSender,
+    HnsUpdate, Identity, KernelMessage, Message, MessageSender, NetAction, NetworkErrorSender,
     NodeId, NodeRouting, PrintSender, Printout, Request, Response, SendError, SendErrorKind,
     WrappedSendError, NET_PROCESS_ID,
 };

diff --git a/hyperdrive/src/net/ws/utils.rs b/hyperdrive/src/net/ws/utils.rs
@@ -3,7 +3,9 @@ use crate::net::{
     utils::{print_debug, print_loud, IDLE_TIMEOUT, MESSAGE_MAX_SIZE},
     ws::{PeerConnection, WebSocket},
 };
-use lib::core::{check_process_id_hypermap_safe, KernelMessage, MessageSender, NodeId, PrintSender};
+use lib::core::{
+    check_process_id_hypermap_safe, KernelMessage, MessageSender, NodeId, PrintSender,
+};
 use {
     futures::{SinkExt, StreamExt},
     tokio::sync::mpsc::UnboundedReceiver,

diff --git a/hyperdrive/src/register.rs b/hyperdrive/src/register.rs
@@ -609,7 +609,9 @@ pub async fn assign_routing(
     let tx = TransactionRequest::default().to(multicall).input(tx_input);
 
     let Ok(multicall_return) = provider.call(&tx).await else {
-        return Err(anyhow::anyhow!("Failed to fetch node IP data from hypermap"));
+        return Err(anyhow::anyhow!(
+            "Failed to fetch node IP data from hypermap"
+        ));
     };
 
     let Ok(results) = aggregateCall::abi_decode_returns(&multicall_return, false) else {

diff --git a/hyperdrive/src/state.rs b/hyperdrive/src/state.rs
@@ -1,9 +1,9 @@
 use lib::types::core::{
-    check_process_id_hypermap_safe, Address, Capability, Erc721Metadata, KernelMessage, LazyLoadBlob,
-    Message, MessageReceiver, MessageSender, NetworkErrorSender, OnExit, PackageManifestEntry,
-    PersistedProcess, PrintSender, Printout, ProcessId, ProcessMap, Request, Response,
-    ReverseCapIndex, StateAction, StateError, StateResponse, KERNEL_PROCESS_ID, STATE_PROCESS_ID,
-    VFS_PROCESS_ID,
+    check_process_id_hypermap_safe, Address, Capability, Erc721Metadata, KernelMessage,
+    LazyLoadBlob, Message, MessageReceiver, MessageSender, NetworkErrorSender, OnExit,
+    PackageManifestEntry, PersistedProcess, PrintSender, Printout, ProcessId, ProcessMap, Request,
+    Response, ReverseCapIndex, StateAction, StateError, StateResponse, KERNEL_PROCESS_ID,
+    STATE_PROCESS_ID, VFS_PROCESS_ID,
 };
 use ring::signature;
 use rocksdb::{checkpoint::Checkpoint, Options, DB};

diff --git a/hyperdrive/src/terminal/utils.rs b/hyperdrive/src/terminal/utils.rs
@@ -135,7 +135,8 @@ pub fn splash(
         crossterm::execute!(
             stdout,
             crossterm::style::SetForegroundColor(crossterm::style::Color::Magenta),
-            crossterm::style::Print(format!(r#"
+            crossterm::style::Print(format!(
+                r#"
    ▄█    █▄    ▄██   ▄      ▄███████▄    ▄████████    ▄███████▄
   ███    ███   ███   ██▄   ███    ███   ███    ███   ███    ███
   ███    ███   ███▄▄▄███   ███    ███   ███    █▀    ███    ███