resolving merge conflict

This commit is contained in:
kant 2023-12-17 03:23:12 -08:00
parent fceb6b9829
commit a0bd0164fe

View file

@ -51,6 +51,8 @@ if [ "$GETH_NODE_TYPE" = "bootnode" ]; then
exec geth \ exec geth \
--verbosity="$VERBOSITY" \ --verbosity="$VERBOSITY" \
--cache=0 \
--cache.trie=0 \
--datadir="$GETH_DATA_DIR" \ --datadir="$GETH_DATA_DIR" \
--port 30301 \ --port 30301 \
--http \ --http \
@ -67,6 +69,7 @@ if [ "$GETH_NODE_TYPE" = "bootnode" ]; then
--syncmode=full \ --syncmode=full \
--gcmode=full \ --gcmode=full \
--state.scheme=path \ --state.scheme=path \
--snapshot \
--db.engine=pebble \ --db.engine=pebble \
--networkid=$CHAIN_ID \ --networkid=$CHAIN_ID \
--nousb \ --nousb \
@ -84,11 +87,14 @@ elif [ "$GETH_NODE_TYPE" = "signer" ]; then
exec geth \ exec geth \
--verbosity="$VERBOSITY" \ --verbosity="$VERBOSITY" \
--cache=0 \
--cache.trie=0 \
--datadir="$GETH_DATA_DIR" \ --datadir="$GETH_DATA_DIR" \
--port 30311 \ --port 30311 \
--syncmode=full \ --syncmode=full \
--gcmode=full \ --gcmode=full \
--state.scheme=path \ --state.scheme=path \
--snapshot \
--db.engine=pebble \ --db.engine=pebble \
--http \ --http \
--http.corsdomain="*" \ --http.corsdomain="*" \