mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-06-20 21:54:30 +00:00
ccid, cmd: disable personal module by default (#1148)
This commit is contained in:
Daniel Liu
GitHub
parent
8ba50ab2aa
commit
10c7e1d775
2 changed files with 50 additions and 61 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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{
|
||||
|
|
|
|||
Loading…
Reference in a new issue