From 10c7e1d77543b5bfa9d358b448e959546fa9b9fa Mon Sep 17 00:00:00 2001
From: Daniel Liu <139250065@qq.com>
Date: Wed, 25 Jun 2025 16:58:46 +0800
Subject: [PATCH] ccid, cmd: disable personal module by default (#1148)

---
 cicd/mainnet/start.sh | 107 +++++++++++++++++++-----------------------
 cmd/utils/flags.go    |   4 +-
 2 files changed, 50 insertions(+), 61 deletions(-)

diff --git a/cicd/mainnet/start.sh b/cicd/mainnet/start.sh
index ff3b06e804..ca69c5df39 100755
--- a/cicd/mainnet/start.sh
+++ b/cicd/mainnet/start.sh
@@ -1,89 +1,78 @@
 #!/bin/bash
-if [ ! -d /work/xdcchain/XDC/chaindata ]
-then
-  if test -z "$PRIVATE_KEY"
-  then
+if [ ! -d /work/xdcchain/XDC/chaindata ]; then
+    if test -z "$PRIVATE_KEY"; then
         echo "PRIVATE_KEY environment variable has not been set."
         exit 1
-  fi
-  echo $PRIVATE_KEY >> /tmp/key
-  wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | awk -F '[{}]' '{print $2}')
-  XDC --datadir /work/xdcchain init /work/genesis.json
+    fi
+    echo $PRIVATE_KEY >>/tmp/key
+    wallet=$(XDC account import --password .pwd --datadir /work/xdcchain /tmp/key | awk -F '[{}]' '{print $2}')
+    XDC --datadir /work/xdcchain init /work/genesis.json
 else
-  wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | awk -F '[{}]' '{print $2}')
+    wallet=$(XDC account list --datadir /work/xdcchain | head -n 1 | awk -F '[{}]' '{print $2}')
 fi
 
 input="/work/bootnodes.list"
 bootnodes=""
-while IFS= read -r line
-do
-    if [ -z "${bootnodes}" ]
-    then
+while IFS= read -r line; do
+    if [ -z "${bootnodes}" ]; then
         bootnodes=$line
     else
         bootnodes="${bootnodes},$line"
     fi
-done < "$input"
+done <"$input"
 #check last line since it's not included in "read" command https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line
-if [ -z "${bootnodes}" ]
-then
+if [ -z "${bootnodes}" ]; then
     bootnodes=$line
 else
     bootnodes="${bootnodes},$line"
 fi
 
 log_level=3
-if test -z "$LOG_LEVEL"
-then
-  echo "Log level not set, default to verbosity of $log_level"
+if test -z "$LOG_LEVEL"; then
+    echo "Log level not set, default to verbosity of $log_level"
 else
-  echo "Log level found, set to $LOG_LEVEL"
-  log_level=$LOG_LEVEL
+    echo "Log level found, set to $LOG_LEVEL"
+    log_level=$LOG_LEVEL
 fi
 
 port=30303
-if test -z "$PORT"
-then
-  echo "PORT not set, default to $port"
+if test -z "$PORT"; then
+    echo "PORT not set, default to $port"
 else
-  echo "PORT found, set to $PORT"
-  port=$PORT
+    echo "PORT found, set to $PORT"
+    port=$PORT
 fi
 
 rpc_port=8545
-if test -z "$RPC_PORT"
-then
-  echo "RPC_PORT not set, default to $rpc_port"
+if test -z "$RPC_PORT"; then
+    echo "RPC_PORT not set, default to $rpc_port"
 else
-  echo "RPC_PORT found, set to $RPC_PORT"
-  rpc_port=$RPC_PORT
+    echo "RPC_PORT found, set to $RPC_PORT"
+    rpc_port=$RPC_PORT
 fi
 
 ws_port=8555
-if test -z "$WS_PORT"
-then
-  echo "WS_PORT not set, default to  $ws_port"
+if test -z "$WS_PORT"; then
+    echo "WS_PORT not set, default to  $ws_port"
 else
-  echo "WS_PORT found, set to $WS_PORT"
-  ws_port=$WS_PORT
+    echo "WS_PORT found, set to $WS_PORT"
+    ws_port=$WS_PORT
 fi
 
 sync_mode=full
-if test -z "$SYNC_MODE"
-then
-  echo "SYNC_MODE not set, default to full" #full or fast
+if test -z "$SYNC_MODE"; then
+    echo "SYNC_MODE not set, default to full" #full or fast
 else
-  echo "SYNC_MODE found, set to $SYNC_MODE"
-  sync_mode=$SYNC_MODE
+    echo "SYNC_MODE found, set to $SYNC_MODE"
+    sync_mode=$SYNC_MODE
 fi
 
 gc_mode=archive
-if test -z "$GC_MODE"
-then
-  echo "GC_MODE not set, default to archive" #full or archive
+if test -z "$GC_MODE"; then
+    echo "GC_MODE not set, default to archive" #full or archive
 else
-  echo "GC_MODE found, set to $GC_MODE"
-  gc_mode=$GC_MODE
+    echo "GC_MODE found, set to $GC_MODE"
+    gc_mode=$GC_MODE
 fi
 
 INSTANCE_IP=$(curl https://checkip.amazonaws.com)
@@ -96,16 +85,16 @@ echo "Starting nodes with $bootnodes ..."
 # https://github.com/XinFinOrg/XDPoSChain/issues/268
 
 XDC --ethstats ${netstats} \
---gcmode ${gc_mode} --syncmode ${sync_mode} \
---nat extip:${INSTANCE_IP} \
---bootnodes ${bootnodes} \
---datadir /work/xdcchain --networkid 50 \
---port $port --http --http-corsdomain "*" --http-addr 0.0.0.0 \
---http-port $rpc_port \
---http-api db,eth,debug,net,shh,txpool,personal,web3,XDPoS \
---http-vhosts "*" --unlock "${wallet}" --password /work/.pwd --mine \
---miner-gasprice "1" --miner-gaslimit "420000000" --verbosity ${log_level} \
---debugdatadir /work/xdcchain \
---store-reward \
---ws --ws-addr=0.0.0.0 --ws-port $ws_port \
---ws-origins "*" 2>&1 >>/work/xdcchain/xdc.log | tee -a /work/xdcchain/xdc.log
+    --gcmode ${gc_mode} --syncmode ${sync_mode} \
+    --nat extip:${INSTANCE_IP} \
+    --bootnodes ${bootnodes} \
+    --datadir /work/xdcchain --networkid 50 \
+    --port $port --http --http-corsdomain "*" --http-addr 0.0.0.0 \
+    --http-port $rpc_port \
+    --http-api db,eth,debug,net,shh,txpool,web3,XDPoS \
+    --http-vhosts "*" --unlock "${wallet}" --password /work/.pwd --mine \
+    --miner-gasprice "1" --miner-gaslimit "420000000" --verbosity ${log_level} \
+    --debugdatadir /work/xdcchain \
+    --store-reward \
+    --ws --ws-addr=0.0.0.0 --ws-port $ws_port \
+    --ws-origins "*" 2>&1 >>/work/xdcchain/xdc.log | tee -a /work/xdcchain/xdc.log
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 87d2079365..c7db243eab 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -496,7 +496,7 @@ var (
 		Name:     "http-api",
 		Aliases:  []string{"rpcapi"},
 		Usage:    "API's offered over the HTTP-RPC interface",
-		Value:    "debug,eth,net,personal,txpool,web3,XDPoS",
+		Value:    "debug,eth,net,txpool,web3,XDPoS",
 		Category: flags.APICategory,
 	}
 	HTTPPathPrefixFlag = &cli.StringFlag{
@@ -556,7 +556,7 @@ var (
 		Name:     "ws-api",
 		Aliases:  []string{"wsapi"},
 		Usage:    "API's offered over the WS-RPC interface",
-		Value:    "debug,eth,net,personal,txpool,web3,XDPoS",
+		Value:    "debug,eth,net,txpool,web3,XDPoS",
 		Category: flags.APICategory,
 	}
 	WSAllowedOriginsFlag = &cli.StringFlag{