Updated demo

Author: dipankar

.gitignore

@@ -20,3 +20,14 @@ zig-out/
 # Although this was renamed to .zig-cache, let's leave it here for a few
 # releases to make it less annoying to work with multiple branches.
 zig-cache/
+
+# Build artifacts
+*.o
+*.a
+*.so
+*.dylib
+*.dll
+
+# OS files
+.DS_Store
+Thumbs.db

Dockerfile

@@ -0,0 +1,24 @@
+FROM ubuntu:24.04 AS builder
+
+RUN apt-get update && apt-get install -y wget xz-utils && rm -rf /var/lib/apt/lists/*
+
+# Install Zig 0.15.2
+RUN wget -q https://ziglang.org/download/0.15.2/zig-0.15.2-x86_64-linux.tar.xz && \
+    tar xf zig-0.15.2-x86_64-linux.tar.xz && \
+    mv zig-0.15.2-x86_64-linux /opt/zig && \
+    rm zig-0.15.2-x86_64-linux.tar.xz
+
+ENV PATH="/opt/zig:${PATH}"
+
+WORKDIR /app
+COPY . .
+
+RUN zig build build-web -Doptimize=ReleaseFast
+
+FROM ubuntu:24.04
+COPY --from=builder /app/zig-out/bin/zig-evm-web /usr/local/bin/zig-evm-web
+
+EXPOSE 3000
+ENV PORT=3000
+
+CMD ["zig-evm-web"]

build.zig

@@ -153,8 +153,30 @@ pub fn build(b: *std.Build) void {
     const run_compliance_step = b.step("compliance", "Run Ethereum compliance tests");
     run_compliance_step.dependOn(&run_compliance_cmd.step);
 
+    // Web demo server
+    const web_exe = b.addExecutable(.{
+        .name = "zig-evm-web",
+        .root_module = b.createModule(.{
+            .root_source_file = b.path("src/web_server.zig"),
+            .target = target,
+            .optimize = optimize,
+        }),
+    });
+
+    b.installArtifact(web_exe);
+
+    const install_web = b.addInstallArtifact(web_exe, .{});
+    const build_web_step = b.step("build-web", "Build the web demo server");
+    build_web_step.dependOn(&install_web.step);
+
+    const run_web_cmd = b.addRunArtifact(web_exe);
+
+    const run_web_step = b.step("web", "Run the web demo server");
+    run_web_step.dependOn(&run_web_cmd.step);
+
     // Shared library for FFI
-    const lib = b.addSharedLibrary(.{
+    const lib = b.addLibrary(.{
+        .linkage = .dynamic,
         .name = "zigevm",
         .root_module = b.createModule(.{
             .root_source_file = b.path("src/ffi.zig"),
@@ -167,7 +189,8 @@ pub fn build(b: *std.Build) void {
     b.installArtifact(lib);
 
     // Also create static library
-    const static_lib = b.addStaticLibrary(.{
+    const static_lib = b.addLibrary(.{
+        .linkage = .static,
         .name = "zigevm",
         .root_module = b.createModule(.{
             .root_source_file = b.path("src/ffi.zig"),

captain-definition

@@ -0,0 +1,4 @@
+{
+  "schemaVersion": 2,
+  "dockerfilePath": "./Dockerfile"
+}

src/bigint.zig

@@ -461,7 +461,7 @@ pub const BigInt = struct {
                 if (i >= word_shift) {
                     result.data[i] = self.data[i - word_shift] << bit_shift;
                     if (i > word_shift) {
-                        result.data[i] |= self.data[i - word_shift - 1] >> @as(u6, 64 - bit_shift);
+                        result.data[i] |= self.data[i - word_shift - 1] >> @as(u6, @intCast(@as(u7, 64) - @as(u7, bit_shift)));
                     }
                 }
             }
@@ -500,7 +500,7 @@ pub const BigInt = struct {
                 if (i + word_shift < 4) {
                     result.data[i] = self.data[i + word_shift] >> bit_shift;
                     if (i + word_shift + 1 < 4) {
-                        result.data[i] |= self.data[i + word_shift + 1] << @as(u6, 64 - bit_shift);
+                        result.data[i] |= self.data[i + word_shift + 1] << @as(u6, @intCast(@as(u7, 64) - @as(u7, bit_shift)));
                     }
                 }
             }

src/call_frame.zig

@@ -106,15 +106,15 @@ pub const CallFrame = struct {
 
 /// Call stack managing nested call frames
 pub const CallStack = struct {
-    frames: std.ArrayList(CallFrame),
+    frames: std.array_list.Managed(CallFrame),
     max_depth: u16,
     allocator: Allocator,
 
     pub const MAX_CALL_DEPTH: u16 = 1024;
 
     pub fn init(allocator: Allocator) CallStack {
         return CallStack{
-            .frames = std.ArrayList(CallFrame).init(allocator),
+            .frames = std.array_list.Managed(CallFrame).init(allocator),
             .max_depth = MAX_CALL_DEPTH,
             .allocator = allocator,
         };
@@ -258,7 +258,7 @@ test "static context propagation" {
     defer stack.deinit();
 
     // First frame is static
-    var static_frame = CallFrame.init(
+    const static_frame = CallFrame.init(
         [_]u8{0} ** 20,
         [_]u8{0} ** 20,
         [_]u8{0} ** 20,
@@ -275,7 +275,7 @@ test "static context propagation" {
     try stack.push(static_frame);
 
     // Nested frame is not explicitly static, but inherits from parent
-    var nested_frame = CallFrame.init(
+    const nested_frame = CallFrame.init(
         [_]u8{0} ** 20,
         [_]u8{0} ** 20,
         [_]u8{0} ** 20,