Merge branch 'master' into llm-template

Author: nick1udwig

.github/workflows/build_and_test.yml

@@ -29,9 +29,7 @@ jobs:
           curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf -y | sh
           rustup update
           cargo install wasm-tools
-          rustup install nightly
           rustup target add wasm32-wasip1
-          rustup target add wasm32-wasip1 --toolchain nightly
           cargo install cargo-wasi
       - name: Get latest release from foundry-rs/foundry
         id: get-latest-foundry-release
@@ -62,28 +60,10 @@ jobs:
             }
             return asset.browser_download_url;
           result-encoding: string
-      #- name: Get latest release from hyperware-ai/hyperdrive
-      #  id: get-latest-hyperdrive-release
-      #  uses: actions/github-script@v6
-      #  with:
-      #    script: |
-      #      const repo = {
-      #        owner: 'hyperware-ai',
-      #        repo: 'hyperdrive',
-      #      };
-      #      const release = await github.rest.repos.getLatestRelease(repo);
-      #      const asset = release.data.assets.find(asset => asset.name.match(/hyperdrive-x86_64-unknown-linux-gnu\.zip/));
-      #      if (!asset) {
-      #        throw new Error('Asset not found');
-      #      }
-      #      return asset.browser_download_url;
-      #    result-encoding: string
-      #- name: Download the Hyperdrive release
-      #  run: wget -q ${DOWNLOAD_URL} -O hyperdrive.zip
-      #  env:
-      #    DOWNLOAD_URL: ${{ steps.get-latest-hyperdrive-release.outputs.result }}
-      #- name: Unzip the Hyperdrive release
-      #  run: unzip hyperdrive.zip
+      - name: Build the release
+        run: ./scripts/build-release.py
+      - name: Unzip the build output
+        run: unzip /tmp/kit-release/kit-x86_64-unknown-linux-gnu.zip
       - name: Run tests
         run: |
           { ./kit t src/new/templates/tests.toml; } 2>&1

src/boot_fake_node/mod.rs

@@ -77,7 +77,7 @@ pub fn extract_zip(archive_path: &Path) -> Result<()> {
 }
 
 #[instrument(level = "trace", skip_all)]
-pub fn compile_runtime(path: &Path, release: bool, is_simulation_mode: bool) -> Result<()> {
+fn compile_runtime(path: &Path, release: bool, is_simulation_mode: bool) -> Result<()> {
     info!("Compiling Hyperdrive...");
 
     // build the packages
@@ -174,10 +174,7 @@ pub fn get_platform_runtime_name(is_simulation_mode: bool) -> Result<String> {
 }
 
 #[instrument(level = "trace", skip_all)]
-pub async fn get_runtime_binary(
-    version: &str,
-    is_simulation_mode: bool,
-) -> Result<(PathBuf, String)> {
+async fn get_runtime_binary(version: &str, is_simulation_mode: bool) -> Result<PathBuf> {
     let zip_name = get_platform_runtime_name(is_simulation_mode)?;
 
     let version = if version != "latest" {
@@ -214,7 +211,36 @@ pub async fn get_runtime_binary(
         get_runtime_binary_inner(&version, &zip_name, &runtime_dir).await?;
     }
 
-    Ok((runtime_path, version))
+    Ok(runtime_path)
+}
+
+#[instrument(level = "trace", skip_all)]
+pub async fn get_or_build_runtime_binary(
+    version: &str,
+    is_simulation_mode: bool,
+    runtime_path: Option<PathBuf>,
+    is_release: bool,
+) -> Result<PathBuf> {
+    let runtime_path = match runtime_path {
+        None => get_runtime_binary(&version, is_simulation_mode).await?,
+        Some(runtime_path) => {
+            if !runtime_path.exists() {
+                return Err(eyre!("--runtime-path {:?} does not exist.", runtime_path));
+            }
+            let runtime_path = if runtime_path.is_dir() {
+                // Compile the runtime binary
+                compile_runtime(&runtime_path, is_release, is_simulation_mode)?;
+                runtime_path
+                    .join("target")
+                    .join(if is_release { "release" } else { "debug" })
+                    .join("hyperdrive")
+            } else {
+                runtime_path
+            };
+            runtime_path
+        }
+    };
+    Ok(runtime_path)
 }
 
 #[instrument(level = "trace", skip_all)]
@@ -425,46 +451,8 @@ pub async fn execute(
     verbosity: u8,
     mut args: Vec<String>,
 ) -> Result<()> {
-    println!("a");
     let detached = false; // TODO: to argument?
-                          // TODO: factor out with run_tests?
-    let (runtime_path, version) = match runtime_path {
-        None => get_runtime_binary(&version, true).await?,
-        Some(runtime_path) => {
-            println!("b");
-            if !runtime_path.exists() {
-                return Err(eyre!("--runtime-path {:?} does not exist.", runtime_path));
-            }
-            let runtime_path = if runtime_path.is_dir() {
-                // Compile the runtime binary
-                compile_runtime(&runtime_path, release, true)?;
-                runtime_path
-                    .join("target")
-                    .join(if release { "release" } else { "debug" })
-                    .join("hyperdrive")
-            } else {
-                runtime_path
-            };
-            let Some((output, _)) = build::run_command(
-                Command::new("bash").args(["-c", &format!("{} --version", runtime_path.display())]),
-                false,
-            )?
-            else {
-                return Err(eyre!("couldn't get Hyperdrive version"));
-            };
-            let version = output
-                .split('\n')
-                .nth(0)
-                //.rev()
-                //.nth(1)
-                .unwrap()
-                .split(' ')
-                .last()
-                .unwrap();
-            (runtime_path, version.to_string())
-        }
-    };
-    let version = version.strip_prefix("v").unwrap_or_else(|| &version);
+    let runtime_path = get_or_build_runtime_binary(&version, true, runtime_path, release).await?;
 
     let mut task_handles = Vec::new();
 
@@ -495,18 +483,12 @@ pub async fn execute(
     let _cleanup_context = CleanupContext::new(send_to_cleanup_for_cleanup);
 
     if !fake_node_name.contains(".") {
-        fake_node_name.push_str(".dev");
+        fake_node_name.push_str(".os");
     }
 
     // boot fakechain
-    let version = version.parse()?;
-    let anvil_process = chain::start_chain(
-        fakechain_port,
-        recv_kill_in_start_chain,
-        Some(version),
-        false,
-    )
-    .await?;
+    let anvil_process =
+        chain::start_chain(fakechain_port, recv_kill_in_start_chain, false, false).await?;
 
     if let Some(rpc) = rpc {
         args.extend_from_slice(&["--rpc".into(), rpc.into()]);

src/boot_real_node/mod.rs

@@ -1,11 +1,11 @@
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use color_eyre::eyre::{eyre, Result};
+use color_eyre::eyre::Result;
 use tokio::sync::Mutex;
 use tracing::instrument;
 
-use crate::boot_fake_node::{compile_runtime, get_runtime_binary, run_runtime};
+use crate::boot_fake_node::{get_or_build_runtime_binary, run_runtime};
 use crate::run_tests::cleanup::{cleanup, cleanup_on_signal};
 use crate::run_tests::types::*;
 
@@ -22,28 +22,7 @@ pub async fn execute(
     mut args: Vec<String>,
 ) -> Result<()> {
     let detached = false; // TODO: to argument?
-                          // TODO: factor out with run_tests?
-    let runtime_path = match runtime_path {
-        None => {
-            let (runtime_path, _) = get_runtime_binary(&version, false).await?;
-            runtime_path
-        }
-        Some(runtime_path) => {
-            if !runtime_path.exists() {
-                return Err(eyre!("--runtime-path {:?} does not exist.", runtime_path));
-            }
-            if runtime_path.is_dir() {
-                // Compile the runtime binary
-                compile_runtime(&runtime_path, release, false)?;
-                runtime_path
-                    .join("target")
-                    .join(if release { "release" } else { "debug" })
-                    .join("hyperdrive")
-            } else {
-                runtime_path
-            }
-        }
-    };
+    let runtime_path = get_or_build_runtime_binary(&version, false, runtime_path, release).await?;
 
     let mut task_handles = Vec::new();
 

src/build/mod.rs

@@ -930,6 +930,7 @@ async fn compile_rust_wasm_process(
 
     // Build the module using Cargo
     let mut args = vec![
+        "+stable",
         "build",
         "--release",
         "--no-default-features",