New Wallet Implementation

.docker/Dockerfile

@@ -2,9 +2,21 @@ FROM golang:1.24-alpine AS builder
 
 RUN apk update && apk add --no-cache make bash nodejs npm
 
+# Wallet-specific build configuration
+# Default: / (for simple-stack deployment with direct port access)
+ARG VITE_WALLET_BASE_PATH=/
+# RPC proxy targets for chain.json generation
+ARG VITE_WALLET_RPC_PROXY_TARGET=http://localhost:50002
+ARG VITE_WALLET_ADMIN_RPC_PROXY_TARGET=http://localhost:50003
+
 WORKDIR /go/src/github.com/canopy-network/canopy
 COPY . /go/src/github.com/canopy-network/canopy
 
+# Export build configuration to environment
+ENV VITE_WALLET_BASE_PATH=${VITE_WALLET_BASE_PATH}
+ENV VITE_WALLET_RPC_PROXY_TARGET=${VITE_WALLET_RPC_PROXY_TARGET}
+ENV VITE_WALLET_ADMIN_RPC_PROXY_TARGET=${VITE_WALLET_ADMIN_RPC_PROXY_TARGET}
+
 RUN make build/wallet
 RUN make build/explorer
 RUN go build -a -o bin ./cmd/main/...

.docker/compose.yaml

@@ -4,38 +4,48 @@ services:
     build:
       context: ..
       dockerfile: .docker/Dockerfile
+      args:
+        VITE_WALLET_BASE_PATH: /
+        VITE_EXPLORER_BASE_PATH: /
+        VITE_WALLET_RPC_PROXY_TARGET: http://localhost:50002
+        VITE_WALLET_ADMIN_RPC_PROXY_TARGET: http://localhost:50003
     ports:
       - 50000:50000 # Wallet
       - 50001:50001 # Explorer
       - 50002:50002 # RPC
       - 50003:50003 # Admin RPC
-      - 9001:9001   # TCP P2P
-      - 6060:6060   # Debug
-      - 9090:9090   # Metrics
+      - 9001:9001 # TCP P2P
+      - 6060:6060 # Debug
+      - 9090:9090 # Metrics
     networks:
       - canopy
     command: ["start"]
     volumes:
       - ./volumes/node_1:/root/.canopy
-#    deploy:
-#      resources:
-#        limits:
-#          memory: 2G
-#          cpus: "1.0"
+  #    deploy:
+  #      resources:
+  #        limits:
+  #          memory: 2G
+  #          cpus: "1.0"
 
   node-2:
     container_name: node-2
     build:
       context: ..
       dockerfile: .docker/Dockerfile
+      args:
+        VITE_WALLET_BASE_PATH: /
+        VITE_EXPLORER_BASE_PATH: /
+        VITE_WALLET_RPC_PROXY_TARGET: http://localhost:40002
+        VITE_WALLET_ADMIN_RPC_PROXY_TARGET: http://localhost:40003
     ports:
       - 40000:40000 # Wallet
       - 40001:40001 # Explorer
       - 40002:40002 # RPC
       - 40003:40003 # Admin RPC
-      - 9002:9002   # TCP P2P
-      - 6061:6060   # Debug
-      - 9091:9091   # Metrics
+      - 9002:9002 # TCP P2P
+      - 6061:6060 # Debug
+      - 9091:9091 # Metrics
     networks:
       - canopy
     command: ["start"]
@@ -72,4 +82,4 @@ services:
 
 networks:
   canopy:
-    driver: bridge
+    driver: bridge

Dockerfile

@@ -0,0 +1,46 @@
+FROM golang:1.24-alpine AS builder
+
+RUN apk update && apk add --no-cache make bash nodejs npm
+
+ARG BIN_PATH
+# Wallet-specific build configuration
+# Default: /wallet/ (for monitoring-stack deployment with Traefik reverse proxy)
+# Override with: docker build --build-arg VITE_WALLET_BASE_PATH=/
+ARG VITE_WALLET_BASE_PATH=/wallet/
+# RPC proxy targets for chain.json generation
+# For monitoring-stack, these should be Traefik URLs
+ARG VITE_WALLET_RPC_PROXY_TARGET=/wallet/rpc
+ARG VITE_WALLET_ADMIN_RPC_PROXY_TARGET=/wallet/adminrpc
+
+WORKDIR /go/src/github.com/canopy-network/canopy
+COPY . /go/src/github.com/canopy-network/canopy
+
+# Export build configuration to environment
+# These are available during npm build for wallet and explorer
+ENV VITE_WALLET_BASE_PATH=${VITE_WALLET_BASE_PATH}
+ENV VITE_WALLET_RPC_PROXY_TARGET=${VITE_WALLET_RPC_PROXY_TARGET}
+ENV VITE_WALLET_ADMIN_RPC_PROXY_TARGET=${VITE_WALLET_ADMIN_RPC_PROXY_TARGET}
+
+RUN make build/wallet
+RUN make build/explorer
+RUN CGO_ENABLED=0 GOOS=linux go build -a -o bin ./cmd/auto-update/.
+
+# Only build if the file at ${BIN_PATH} doesn't already exist
+RUN if [ ! -f "${BIN_PATH}" ]; then \
+  echo "File ${BIN_PATH} not found. Building it..."; \
+  CGO_ENABLED=0 GOOS=linux go build -a -o "${BIN_PATH}" ./cmd/main/...; \
+  else \
+  echo "File ${BIN_PATH} already exists. Skipping build."; \
+  fi
+
+FROM alpine:3.19
+
+RUN apk add --no-cache pigz ca-certificates
+
+ARG BIN_PATH
+
+WORKDIR /app
+COPY --from=builder /go/src/github.com/canopy-network/canopy/bin ./
+COPY --from=builder /go/src/github.com/canopy-network/canopy/${BIN_PATH} ${BIN_PATH}
+RUN chmod +x ${BIN_PATH}
+ENTRYPOINT ["/app/bin"]

Makefile

@@ -2,7 +2,7 @@
 GO_BIN_DIR := ~/go/bin
 CLI_DIR := ./cmd/main/...
 AUTO_UPDATE_DIR := ./cmd/auto-update/...
-WALLET_DIR := ./cmd/rpc/web/wallet
+WALLET_DIR := ./cmd/rpc/web/wallet-new
 EXPLORER_DIR := ./cmd/rpc/web/explorer
 DOCKER_DIR := ./.docker/compose.yaml
 
@@ -37,6 +37,9 @@ build/canopy-full: build/wallet build/explorer build/canopy
 build/wallet:
 	npm install --prefix $(WALLET_DIR) && npm run build --prefix $(WALLET_DIR)
 
+## build/new-wallet: alias for build/wallet (for backward compatibility)
+build/new-wallet: build/wallet
+
 ## build/explorer: build the canopy's explorer project
 build/explorer:
 	npm install --prefix $(EXPLORER_DIR) && npm run build --prefix $(EXPLORER_DIR)

cmd/rpc/server.go

@@ -36,7 +36,7 @@ const (
 	ContentType     = "Content-MessageType"
 	ApplicationJSON = "application/json; charset=utf-8"
 
-	walletStaticDir   = "web/wallet/out"
+	walletStaticDir   = "web/wallet-new/out"
 	explorerStaticDir = "web/explorer/out"
 )
 
@@ -338,10 +338,10 @@ func (h logHandler) Handle(resp http.ResponseWriter, req *http.Request, p httpro
 //go:embed all:web/explorer/out
 var explorerFS embed.FS
 
-//go:embed all:web/wallet/out
+//go:embed all:web/wallet-new/out
 var walletFS embed.FS
 
-// runStaticFileServer creates a web server serving static files
+// runStaticFileServer creates a web server serving static files with SPA fallback
 func (s *Server) runStaticFileServer(fileSys fs.FS, dir, port string, conf lib.Config) {
 	// Attempt to get a sub-filesystem rooted at the specified directory
 	distFS, err := fs.Sub(fileSys, dir)
@@ -355,20 +355,13 @@ func (s *Server) runStaticFileServer(fileSys fs.FS, dir, port string, conf lib.C
 
 	// Define a handler function for the root path
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		// serve `index.html` with dynamic config injection
-		if r.URL.Path == "/" || r.URL.Path == "/index.html" {
+		requestedPath := r.URL.Path
 
+		// Helper function to serve index.html with config injection
+		serveIndexHTML := func() {
 			// Construct the file path for `index.html`
 			filePath := path.Join(dir, "index.html")
 
-			// Open the file and defer closing until the function exits
-			data, e := fileSys.Open(filePath)
-			if e != nil {
-				http.NotFound(w, r)
-				return
-			}
-			defer data.Close()
-
 			// Read the content of `index.html` into a byte slice
 			htmlBytes, e := fs.ReadFile(fileSys, filePath)
 			if e != nil {
@@ -383,11 +376,39 @@ func (s *Server) runStaticFileServer(fileSys fs.FS, dir, port string, conf lib.C
 			w.Header().Set("Content-Type", "text/html")
 			w.WriteHeader(http.StatusOK)
 			w.Write([]byte(injectedHTML))
+		}
+
+		// Serve index.html for root path
+		if requestedPath == "/" || requestedPath == "/index.html" {
+			serveIndexHTML()
+			return
+		}
+
+		// Check if the requested path has a file extension (indicates static asset)
+		// Common static asset extensions: .js, .css, .svg, .png, .jpg, .jpeg, .gif, .ico, .woff, .woff2, .ttf, .eot, .map
+		ext := path.Ext(requestedPath)
+		isStaticAsset := ext != ""
+
+		if isStaticAsset {
+			// Try to serve the static asset from the file system
+			// Remove leading slash for fs.Open
+			assetPath := strings.TrimPrefix(requestedPath, "/")
+
+			// Check if the file exists in the embedded filesystem
+			if _, err := distFS.Open(assetPath); err == nil {
+				// File exists, serve it
+				http.FileServer(http.FS(distFS)).ServeHTTP(w, r)
+				return
+			}
+
+			// Static asset not found, return 404
+			http.NotFound(w, r)
 			return
 		}
 
-		// For all other requests, serve the files directly from the file system
-		http.FileServer(http.FS(distFS)).ServeHTTP(w, r)
+		// For all other requests (no file extension = HTML navigation),
+		// serve index.html to enable SPA client-side routing
+		serveIndexHTML()
 	})
 
 	// Start the HTTP server in a new goroutine and listen on the specified port