Milestone 3 beta 3 reintegration

.github/workflows/build.yml

@@ -0,0 +1,36 @@
+name: Build and Publish Docker Image
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+
+jobs:
+  image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push container image to GitHub Container Registry
+        uses: docker/build-push-action@v5
+        with:
+          labels: |
+            org.opencontainers.image.revision=${{ github.sha }}
+          push: true
+          platforms: linux/amd64
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/hyperbeam:latest
+            ghcr.io/${{ github.repository_owner }}/hyperbeam:${{ github.sha }}

.gitignore

@@ -1,3 +1,4 @@
+# config.*
 .rebar3
 _build
 _checkouts
@@ -42,4 +43,6 @@ mkdocs-site/
 mkdocs-site-id.txt
 mkdocs-site-manifest.csv
 
-!test/admissible-report-wallet.json
+!test/admissible-report-wallet.json
+!test/admissible-report.json
+!test/config.json

.vscode/launch.json

@@ -14,7 +14,7 @@
       "internalConsoleOptions": "openOnSessionStart",
       "module": "hb_debugger",
       "function": "start_and_break",
-      "args": "[${input:moduleName}, ${input:functionName}, [${input:funcArgs}]]"
+      "args": "[${input:moduleName}, ${input:functionName}, [${input:funcArgs}], <<\"${input:debuggerScope}\">>]"
     },
     {
       "name": "Attach to a 'rebar3 debugger' node.",
@@ -65,6 +65,11 @@
       "id": "funcArgs",
       "type": "promptString",
       "description": "(Optional) Pass arguments to the function:"
+    },
+    {
+      "id": "debuggerScope",
+      "type": "promptString",
+      "description": "(Optional) Additional modules/prefixes for debugger scope:"
     }
   ]
 }

.vscode/tasks.json

@@ -14,7 +14,37 @@
     {
       "label": "Stop HyperBEAM",
       "type": "shell",
-      "command": "lsof -i tcp:10000 | tail -n 1 | awk '{print $2}' | xargs kill -9"
+      "command": "lsof -i tcp:8734 | tail -n 1 | awk '{print $2}' | xargs kill -9"
+    },
+    {
+      "label": "Generate a flame graph for a function.",
+      "type": "shell",
+      "command": "rebar3 as eflame shell --eval \"hb_debugger:profile_and_stop(fun() -> ${input:moduleName}:${input:functionName}(${input:funcArgs}) end).\"",
+      "group": "test",
+      "problemMatcher": "$erlang",
+      "presentation": {
+        "echo": true,
+        "reveal": "always",
+        "focus": false,
+        "panel": "new"
+      }
+    }
+  ],
+  "inputs": [
+    {
+      "id": "moduleName",
+      "type": "promptString",
+      "description": "Enter module:"
+    },
+    {
+      "id": "functionName", 
+      "type": "promptString",
+      "description": "Enter an exported function name:"
+    },
+    {
+      "id": "funcArgs",
+      "type": "promptString",
+      "description": "(Optional) Pass arguments to the function:"
     }
   ]
 }

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 ubuntu:22.04
+FROM ubuntu:22.04 AS builder
 
 RUN apt-get update && apt-get install -y \
     build-essential \
@@ -7,7 +7,9 @@ RUN apt-get update && apt-get install -y \
     pkg-config \
     ncurses-dev \
     libssl-dev \
-    sudo
+    sudo \
+    curl \
+    ca-certificates
 
 RUN git clone https://github.com/erlang/otp.git && \
     cd otp && \
@@ -21,15 +23,38 @@ RUN git clone https://github.com/erlang/rebar3.git && \
     ./bootstrap && \
     sudo mv rebar3 /usr/local/bin/
 
-RUN git clone https://github.com/rust-lang/rust.git && \
-    cd rust && \
-    ./configure && \
-    make && \
-    sudo make install
+# install node 22 (used by genesis_wasm profile)
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+    apt-get install -y nodejs && \
+    node --version
+
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+
+WORKDIR /opt
+
+COPY . .
+
+# compile the project with provided profiles
+RUN rebar3 clean && rebar3 get-deps && rebar3 as genesis_wasm release
+
+FROM ubuntu:22.04 AS runner
+
+WORKDIR /opt
+
+# Install Node 22 dependencies
+RUN apt-get update && apt-get install -y \
+    ca-certificates \
+    curl \
+    gnupg
 
-COPY . /app
+# node 22 is still needed for genesis_wasm profile
+RUN curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+    apt-get install -y nodejs && \
+    node --version
 
-RUN cd /app && \
-    rebar3 compile
+# copy the build artifacts from the builder stage
+COPY --from=builder /opt/_build/ /opt/_build/
 
-CMD ["/bin/bash"]
+# bin bash here to start the container
+ENTRYPOINT ["/opt/_build/genesis_wasm/rel/hb/bin/hb"]

Makefile

@@ -6,9 +6,9 @@ compile:
 WAMR_VERSION = 2.2.0
 WAMR_DIR = _build/wamr
 
-GENESIS_WASM_BRANCH = tillathehun0/cu-experimental
+GENESIS_WASM_BRANCH = feat/http-checkpoint
 GENESIS_WASM_REPO = https://github.com/permaweb/ao.git
-GENESIS_WASM_SERVER_DIR = _build/genesis-wasm-server
+GENESIS_WASM_SERVER_DIR = _build/genesis_wasm/genesis-wasm-server
 
 ifdef HB_DEBUG
 	WAMR_FLAGS = -DWAMR_ENABLE_LOG=1 -DWAMR_BUILD_DUMP_CALL_STACK=1 -DCMAKE_BUILD_TYPE=Debug
@@ -98,7 +98,7 @@ setup-genesis-wasm: $(GENESIS_WASM_SERVER_DIR)
 		echo "Error: Node.js is not installed. Please install Node.js before continuing."; \
 		echo "For Ubuntu/Debian, you can install it with:"; \
 		echo "  curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash - && \\"; \
-		echo "  apt-get install -y nodejs && \\"; \
+		echo "  apt-get install -y nodejs=22.16.0-1nodesource1 --allow-downgrades && \\"; \
 		echo "  node -v && npm -v"; \
 		exit 1; \
 	fi

README.md

@@ -298,4 +298,3 @@ by [Forward Research](https://fwd.arweave.net). Pull Requests are always welcome
 
 To get started building on HyperBEAM, check out the [hacking on HyperBEAM](./docs/misc/hacking-on-hyperbeam.md)
 guide.
-

config.flat

@@ -1 +1 @@
-port: 10000
+port: 10000

native/dev_snp_nif/src/attestation.rs

@@ -77,12 +77,12 @@ pub fn generate_attestation_report<'a>(
     };
 
     // Step 5: Log the serialized JSON for debugging purposes.
-    log_message(
-        "INFO",
-        file!(),
-        line!(),
-        &format!("Generated report JSON: {:?}", report_json),
-    );
+    // log_message(
+    //     "INFO",
+    //     file!(),
+    //     line!(),
+    //     &format!("Generated report JSON: {:?}", report_json),
+    // );
 
     // Step 6: Return the result as a tuple with the `ok` atom.
     Ok((ok(), report_json).encode(env))

native/dev_snp_nif/src/digest.rs

@@ -102,14 +102,11 @@ pub fn compute_launch_digest<'a>(env: Env<'a>, input_map: Term<'a>) -> NifResult
         kernel_file: None,
         initrd_file: None,
         append: None,
-        // vcpus: args.vcpus,
-        // vcpu_type: CpuType::try_from(args.vcpu_type).unwrap(),
-        // vmm_type: Some(VMMType::try_from(args.vmm_type).unwrap()),
-        // guest_features: GuestFeatures(args.guest_features),
-		vcpus: 32,
-        vcpu_type: CpuType::EpycV4,
-        vmm_type: Some(VMMType::QEMU),
-        guest_features: GuestFeatures(0x1),
+
+		vcpus: args.vcpus,
+        vcpu_type: CpuType::try_from(args.vcpu_type).unwrap(),
+        vmm_type: Some(VMMType::try_from(args.vmm_type).unwrap()),
+        guest_features: GuestFeatures(args.guest_features),
         ovmf_hash_str: Some(args.ovmf_hash_str.as_str()),
         kernel_hash: Some(hex::decode(args.kernel_hash).unwrap().try_into().unwrap()),
         initrd_hash: Some(hex::decode(args.initrd_hash).unwrap().try_into().unwrap()),