Update executable to luxd

scripts/generate_precompile.sh

@@ -2,7 +2,11 @@
 set -e
 
 # This script generates a Stateful Precompile stub based off of a Solidity ABI file.
+<<<<<<< HEAD
 # It first sets the necessary CGO_FLAGs for the BLST library used in Lux Node and
+=======
+# It first sets the necessary CGO_FLAGs for the BLST library used in Luxd and
+>>>>>>> b36c20f (Update executable to luxd)
 # then runs PrecompileGen.
 if ! [[ "$0" =~ scripts/generate_precompile.sh ]]; then
   echo "must be run from repository root, but got $0"

scripts/install_avalanchego_release.sh

@@ -116,14 +116,19 @@ else
   fi
 fi
 
-LUXGO_PATH=${LUXGO_BUILD_PATH}/node
-LUXGO_PLUGIN_DIR=${LUXGO_BUILD_PATH}/plugins
+LUXD_PATH=${LUXD_BUILD_PATH}/node
+LUXD_PLUGIN_DIR=${LUXD_BUILD_PATH}/plugins
 
 mkdir -p ${LUXD_BUILD_PATH}
 
 cp ${BUILD_DIR}/node ${LUXD_PATH}
 
 
+<<<<<<< HEAD
 echo "Installed Lux Node release ${LUX_VERSION}"
 echo "Lux Node Path: ${LUXD_PATH}"
+=======
+echo "Installed Luxd release ${LUX_VERSION}"
+echo "Luxd Path: ${LUXD_PATH}"
+>>>>>>> b36c20f (Update executable to luxd)
 echo "Plugin Dir: ${LUXD_PLUGIN_DIR}"

scripts/run.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 set -e
 
-# This script starts N nodes (TODO N instead of 5) and waits for ctrl-c to shutdown the process group of LuxGo processes
-# Uses data directory to store all LuxGo data neatly in one location with minimal config overhead
+# This script starts N nodes (TODO N instead of 5) and waits for ctrl-c to shutdown the process group of Luxd processes
+# Uses data directory to store all Luxd data neatly in one location with minimal config overhead
 if ! [[ "$0" =~ scripts/run.sh ]]; then
   echo "must be run from repository root, but got $0"
   exit 255
@@ -19,10 +19,17 @@ source "$SUBNET_EVM_PATH"/scripts/versions.sh
 source "$SUBNET_EVM_PATH"/scripts/constants.sh
 
 # Set up lux binary path and assume build directory is set
+<<<<<<< HEAD
 LUXGO_BUILD_PATH=${LUXGO_BUILD_PATH:-"$GOPATH/src/github.com/luxdefi/node/build"}
 LUXGO_PATH=${LUXGO_PATH:-"$LUXGO_BUILD_PATH/node"}
 LUXGO_PLUGIN_DIR=${LUXGO_PLUGIN_DIR:-"$LUXGO_BUILD_PATH/plugins"}
 DATA_DIR=${DATA_DIR:-/tmp/evm-start-node/$(date "+%Y-%m-%d%:%H:%M:%S")}
+=======
+LUXD_BUILD_PATH=${LUXD_BUILD_PATH:-"$GOPATH/src/github.com/luxdefi/node/build"}
+LUXD_PATH=${LUXD_PATH:-"$LUXD_BUILD_PATH/node"}
+LUXD_PLUGIN_DIR=${LUXD_PLUGIN_DIR:-"$LUXD_BUILD_PATH/plugins"}
+DATA_DIR=${DATA_DIR:-/tmp/subnet-evm-start-node/$(date "+%Y-%m-%d%:%H:%M:%S")}
+>>>>>>> b36c20f (Update executable to luxd)
 
 mkdir -p $DATA_DIR
 
@@ -33,7 +40,7 @@ function _set_config(){
     "network-id": "local",
     "sybil-protection-enabled": false,
     "health-check-frequency": "5s",
-    "plugin-dir": "$LUXGO_PLUGIN_DIR"
+    "plugin-dir": "$LUXD_PLUGIN_DIR"
   }
 EOF
 }
@@ -50,6 +57,6 @@ mkdir -p $NODE_DATA_DIR
 NODE_CONFIG_FILE_PATH="$NODE_DATA_DIR/config.json"
 _set_config $NODE_CONFIG_FILE_PATH
 
-CMD="$LUXGO_PATH --data-dir=$NODE_DATA_DIR --config-file=$NODE_CONFIG_FILE_PATH"
+CMD="$LUXD_PATH --data-dir=$NODE_DATA_DIR --config-file=$NODE_CONFIG_FILE_PATH"
 
 execute_cmd $CMD

scripts/run_ginkgo.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 set -e
 
-# This script assumes that an LuxGo and Subnet-EVM binaries are available in the standard location
+# This script assumes that an Luxd and Subnet-EVM binaries are available in the standard location
 # within the $GOPATH
-# The LuxGo and PluginDir paths can be specified via the environment variables used in ./scripts/run.sh.
+# The Luxd and PluginDir paths can be specified via the environment variables used in ./scripts/run.sh.
 
 # Load the versions
 SUBNET_EVM_PATH=$(

scripts/run_ginkgo_warp.sh

@@ -1,9 +1,15 @@
 #!/usr/bin/env bash
 set -e
 
+<<<<<<< HEAD
 # This script assumes that an Lux Node and Subnet-EVM binaries are available in the standard location
 # within the $GOPATH
 # The Lux Node and PluginDir paths can be specified via the environment variables used in ./scripts/run.sh.
+=======
+# This script assumes that an Luxd and Subnet-EVM binaries are available in the standard location
+# within the $GOPATH
+# The Luxd and PluginDir paths can be specified via the environment variables used in ./scripts/run.sh.
+>>>>>>> b36c20f (Update executable to luxd)
 
 # Load the versions
 SUBNET_EVM_PATH=$(