Rebrand logs (#9)

Hydra-Chain · Mar 14, 2024 · d2b3069 · d2b3069
1 parent d058a03
commit d2b3069
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 126 deletions.
diff --git a/command/default.go b/command/default.go
@@ -11,7 +11,7 @@ import (
 
 const (
 	DefaultGenesisFileName           = "genesis.json"
-	DefaultChainName                 = "polygon-edge"
+	DefaultChainName                 = "hydra-chain"
 	DefaultChainID                   = 187
 	DefaultConsensus                 = server.PolyBFTConsensus
 	DefaultGenesisGasUsed            = 458752  // 0x70000

diff --git a/command/genesis/params.go b/command/genesis/params.go
@@ -44,8 +44,8 @@ const (
 	blockTrackerPollIntervalFlag = "block-tracker-poll-interval"
 	proxyContractsAdminFlag      = "proxy-contracts-admin"
 
-	defaultNativeTokenName     = "Polygon"
-	defaultNativeTokenSymbol   = "MATIC"
+	defaultNativeTokenName     = "Hydra"
+	defaultNativeTokenSymbol   = "HYDRA"
 	defaultNativeTokenDecimals = uint8(18)
 	minNativeTokenParamsNumber = 4
 )

diff --git a/consensus/polybft/polybft.go b/consensus/polybft/polybft.go
@@ -46,7 +46,7 @@ type polybftBackend interface {
 
 // Factory is the factory function to create a discovery consensus
 func Factory(params *consensus.Params) (consensus.Consensus, error) {
-	logger := params.Logger.Named("polybft")
+	logger := params.Logger.Named("hydragon")
 
 	setupHeaderHashFunc()
 
@@ -464,7 +464,7 @@ func (p *Polybft) Initialize() error {
 	p.blockTime = time.Duration(p.config.BlockTime)
 
 	// initialize polybft consensus data directory
-	p.dataDir = filepath.Join(p.config.Config.Path, "polybft")
+	p.dataDir = filepath.Join(p.config.Config.Path, "hydragon")
 	// create the data dir if not exists
 	if err = common.CreateDirSafe(p.dataDir, 0750); err != nil {
 		return fmt.Errorf("failed to create data directory. Error: %w", err)
@@ -509,7 +509,7 @@ func ForkManagerInitialParamsFactory(config *chain.Chain) (*forkmanager.ForkPara
 
 // Start starts the consensus and servers
 func (p *Polybft) Start() error {
-	p.logger.Info("starting polybft consensus", "signer", p.key.String())
+	p.logger.Info("starting hydragon consensus", "signer", p.key.String())
 
 	// start syncer (also initializes peer map)
 	if err := p.syncer.Start(); err != nil {

diff --git a/docker/local/polygon-edge.sh b/docker/local/polygon-edge.sh
@@ -3,7 +3,8 @@
 set -e
 
 POLYGON_EDGE_BIN=./polygon-edge
-CHAIN_CUSTOM_OPTIONS=$(tr "\n" " " << EOL
+CHAIN_CUSTOM_OPTIONS=$(
+  tr "\n" " " <<EOL
 --block-gas-limit 10000000
 --epoch-size 10
 --chain-id 51001
@@ -16,120 +17,120 @@ EOL
 )
 
 case "$1" in
-   "init")
-      case "$2" in 
-          "ibft")
-              if [ -f "$GENESIS_PATH" ]; then
-                  echo "Secrets have already been generated."
-              else
-                  echo "Generating IBFT secrets..."
-                  secrets=$("$POLYGON_EDGE_BIN" secrets init --insecure --num 4 --data-dir /data/data- --json)
-                  echo "Secrets have been successfully generated"
-
-                  rm -f /data/genesis.json
-
-                  echo "Generating IBFT Genesis file..."
-                  "$POLYGON_EDGE_BIN" genesis $CHAIN_CUSTOM_OPTIONS \
-                    --dir /data/genesis.json \
-                    --consensus ibft \
-                    --ibft-validators-prefix-path data- \
-                    --bootnode "/dns4/node-1/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[0] | .node_id')" \
-                    --bootnode "/dns4/node-2/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[1] | .node_id')" \
-                    --bootnode "/dns4/node-3/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[2] | .node_id')" \
-                    --bootnode "/dns4/node-4/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[3] | .node_id')"
-              fi
-              ;;
-          "polybft")
-              echo "Generating PolyBFT secrets..."
-              secrets=$("$POLYGON_EDGE_BIN" polybft-secrets init --insecure --num 4 --data-dir /data/data- --json)
-              echo "Secrets have been successfully generated"
-
-              rm -f /data/genesis.json
-
-              proxyContractsAdmin=0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed
-
-              echo "Generating PolyBFT genesis file..."
-              "$POLYGON_EDGE_BIN" genesis $CHAIN_CUSTOM_OPTIONS \
-                --dir /data/genesis.json \
-                --consensus polybft \
-                --validators-path /data \
-                --validators-prefix data- \
-                --reward-wallet 0xDEADBEEF:1000000 \
-                --native-token-config "Polygon:MATIC:18:true:$(echo "$secrets" | jq -r '.[0] | .address')" \
-                --proxy-contracts-admin ${proxyContractsAdmin} \
-                --bootnode "/dns4/node-1/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[0] | .node_id')" \
-                --bootnode "/dns4/node-2/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[1] | .node_id')" \
-                --bootnode "/dns4/node-3/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[2] | .node_id')" \
-                --bootnode "/dns4/node-4/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[3] | .node_id')"
-
-              echo "Deploying stake manager..."
-              "$POLYGON_EDGE_BIN" polybft stake-manager-deploy \
-                --jsonrpc http://rootchain:8545 \
-                --genesis /data/genesis.json \
-                --proxy-contracts-admin ${proxyContractsAdmin} \
-                --test
-
-              stakeManagerAddr=$(cat /data/genesis.json | jq -r '.params.engine.polybft.bridge.stakeManagerAddr')
-              stakeToken=$(cat /data/genesis.json | jq -r '.params.engine.polybft.bridge.stakeTokenAddr')
-
-              "$POLYGON_EDGE_BIN" rootchain deploy \
-                --stake-manager ${stakeManagerAddr} \
-                --stake-token ${stakeToken} \
-                --json-rpc http://rootchain:8545 \
-                --genesis /data/genesis.json \
-                --proxy-contracts-admin ${proxyContractsAdmin} \
-                --test
-
-              customSupernetManagerAddr=$(cat /data/genesis.json | jq -r '.params.engine.polybft.bridge.customSupernetManagerAddr')
-              supernetID=$(cat /data/genesis.json | jq -r '.params.engine.polybft.supernetID')
-              addresses="$(echo "$secrets" | jq -r '.[0] | .address'),$(echo "$secrets" | jq -r '.[1] | .address'),$(echo "$secrets" | jq -r '.[2] | .address'),$(echo "$secrets" | jq -r '.[3] | .address')"
-
-              "$POLYGON_EDGE_BIN" rootchain fund \
-                --json-rpc http://rootchain:8545 \
-                --stake-token ${stakeToken} \
-                --mint \
-                --addresses ${addresses} \
-                --amounts 1000000000000000000000000,1000000000000000000000000,1000000000000000000000000,1000000000000000000000000
-
-              "$POLYGON_EDGE_BIN" polybft whitelist-validators \
-                --addresses ${addresses} \
-                --supernet-manager ${customSupernetManagerAddr} \
-                --private-key aa75e9a7d427efc732f8e4f1a5b7646adcc61fd5bae40f80d13c8419c9f43d6d \
-                --jsonrpc http://rootchain:8545
-
-              counter=1
-              while [ $counter -le 4 ]; do
-                echo "Registering validator: ${counter}"
-
-                "$POLYGON_EDGE_BIN" polybft register-validator \
-                  --supernet-manager ${customSupernetManagerAddr} \
-                  --data-dir /data/data-${counter} \
-                  --jsonrpc http://rootchain:8545
-
-                "$POLYGON_EDGE_BIN" polybft stake \
-                  --data-dir /data/data-${counter} \
-                  --amount 1000000000000000000000000 \
-                  --supernet-id ${supernetID} \
-                  --stake-manager ${stakeManagerAddr} \
-                  --stake-token ${stakeToken} \
-                  --jsonrpc http://rootchain:8545
-
-                counter=$((counter + 1))
-              done
-
-              "$POLYGON_EDGE_BIN" polybft supernet \
-                --private-key aa75e9a7d427efc732f8e4f1a5b7646adcc61fd5bae40f80d13c8419c9f43d6d \
-                --supernet-manager ${customSupernetManagerAddr} \
-                --stake-manager ${stakeManagerAddr} \
-                --finalize-genesis-set \
-                --enable-staking \
-                --genesis /data/genesis.json \
-                --jsonrpc http://rootchain:8545
-              ;;
-      esac
-      ;;
-   *)
-      echo "Executing polygon-edge..."
-      exec "$POLYGON_EDGE_BIN" "$@"
-      ;;
+"init")
+  case "$2" in
+  "ibft")
+    if [ -f "$GENESIS_PATH" ]; then
+      echo "Secrets have already been generated."
+    else
+      echo "Generating IBFT secrets..."
+      secrets=$("$POLYGON_EDGE_BIN" secrets init --insecure --num 4 --data-dir /data/data- --json)
+      echo "Secrets have been successfully generated"
+
+      rm -f /data/genesis.json
+
+      echo "Generating IBFT Genesis file..."
+      "$POLYGON_EDGE_BIN" genesis $CHAIN_CUSTOM_OPTIONS \
+        --dir /data/genesis.json \
+        --consensus ibft \
+        --ibft-validators-prefix-path data- \
+        --bootnode "/dns4/node-1/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[0] | .node_id')" \
+        --bootnode "/dns4/node-2/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[1] | .node_id')" \
+        --bootnode "/dns4/node-3/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[2] | .node_id')" \
+        --bootnode "/dns4/node-4/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[3] | .node_id')"
+    fi
+    ;;
+  "polybft")
+    echo "Generating PolyBFT secrets..."
+    secrets=$("$POLYGON_EDGE_BIN" polybft-secrets init --insecure --num 4 --data-dir /data/data- --json)
+    echo "Secrets have been successfully generated"
+
+    rm -f /data/genesis.json
+
+    proxyContractsAdmin=0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed
+
+    echo "Generating PolyBFT genesis file..."
+    "$POLYGON_EDGE_BIN" genesis $CHAIN_CUSTOM_OPTIONS \
+      --dir /data/genesis.json \
+      --consensus polybft \
+      --validators-path /data \
+      --validators-prefix data- \
+      --reward-wallet 0xDEADBEEF:1000000 \
+      --native-token-config "Hydra:HYDRA:18:true:$(echo "$secrets" | jq -r '.[0] | .address')" \
+      --proxy-contracts-admin ${proxyContractsAdmin} \
+      --bootnode "/dns4/node-1/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[0] | .node_id')" \
+      --bootnode "/dns4/node-2/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[1] | .node_id')" \
+      --bootnode "/dns4/node-3/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[2] | .node_id')" \
+      --bootnode "/dns4/node-4/tcp/1478/p2p/$(echo "$secrets" | jq -r '.[3] | .node_id')"
+
+    echo "Deploying stake manager..."
+    "$POLYGON_EDGE_BIN" polybft stake-manager-deploy \
+      --jsonrpc http://rootchain:8545 \
+      --genesis /data/genesis.json \
+      --proxy-contracts-admin ${proxyContractsAdmin} \
+      --test
+
+    stakeManagerAddr=$(cat /data/genesis.json | jq -r '.params.engine.polybft.bridge.stakeManagerAddr')
+    stakeToken=$(cat /data/genesis.json | jq -r '.params.engine.polybft.bridge.stakeTokenAddr')
+
+    "$POLYGON_EDGE_BIN" rootchain deploy \
+      --stake-manager ${stakeManagerAddr} \
+      --stake-token ${stakeToken} \
+      --json-rpc http://rootchain:8545 \
+      --genesis /data/genesis.json \
+      --proxy-contracts-admin ${proxyContractsAdmin} \
+      --test
+
+    customSupernetManagerAddr=$(cat /data/genesis.json | jq -r '.params.engine.polybft.bridge.customSupernetManagerAddr')
+    supernetID=$(cat /data/genesis.json | jq -r '.params.engine.polybft.supernetID')
+    addresses="$(echo "$secrets" | jq -r '.[0] | .address'),$(echo "$secrets" | jq -r '.[1] | .address'),$(echo "$secrets" | jq -r '.[2] | .address'),$(echo "$secrets" | jq -r '.[3] | .address')"
+
+    "$POLYGON_EDGE_BIN" rootchain fund \
+      --json-rpc http://rootchain:8545 \
+      --stake-token ${stakeToken} \
+      --mint \
+      --addresses ${addresses} \
+      --amounts 1000000000000000000000000,1000000000000000000000000,1000000000000000000000000,1000000000000000000000000
+
+    "$POLYGON_EDGE_BIN" polybft whitelist-validators \
+      --addresses ${addresses} \
+      --supernet-manager ${customSupernetManagerAddr} \
+      --private-key aa75e9a7d427efc732f8e4f1a5b7646adcc61fd5bae40f80d13c8419c9f43d6d \
+      --jsonrpc http://rootchain:8545
+
+    counter=1
+    while [ $counter -le 4 ]; do
+      echo "Registering validator: ${counter}"
+
+      "$POLYGON_EDGE_BIN" polybft register-validator \
+        --supernet-manager ${customSupernetManagerAddr} \
+        --data-dir /data/data-${counter} \
+        --jsonrpc http://rootchain:8545
+
+      "$POLYGON_EDGE_BIN" polybft stake \
+        --data-dir /data/data-${counter} \
+        --amount 1000000000000000000000000 \
+        --supernet-id ${supernetID} \
+        --stake-manager ${stakeManagerAddr} \
+        --stake-token ${stakeToken} \
+        --jsonrpc http://rootchain:8545
+
+      counter=$((counter + 1))
+    done
+
+    "$POLYGON_EDGE_BIN" polybft supernet \
+      --private-key aa75e9a7d427efc732f8e4f1a5b7646adcc61fd5bae40f80d13c8419c9f43d6d \
+      --supernet-manager ${customSupernetManagerAddr} \
+      --stake-manager ${stakeManagerAddr} \
+      --finalize-genesis-set \
+      --enable-staking \
+      --genesis /data/genesis.json \
+      --jsonrpc http://rootchain:8545
+    ;;
+  esac
+  ;;
+*)
+  echo "Executing polygon-edge..."
+  exec "$POLYGON_EDGE_BIN" "$@"
+  ;;
 esac
diff --git a/h_devnet/devnet_cluster/hydra.sh b/h_devnet/devnet_cluster/hydra.sh
@@ -30,7 +30,7 @@ case "$1" in
     # Loop through each data directory and delete specific subdirectories
     for i in 1 2 3 4 5; do
       echo "Cleaning up /data/data-$i directory..."
-      rm -rf /data/data-$i/blockchain /data/data-$i/consensus/polybft /data/data-$i/consensus/validator.sig /data/data-$i/trie
+      rm -rf /data/data-$i/blockchain /data/data-$i/consensus/hydragon /data/data-$i/consensus/polybft /data/data-$i/consensus/validator.sig /data/data-$i/trie
 
       # This will generate new signatures without modifying the keys that are already present
       "$HYDRA_NODE_BIN" secrets init --insecure --chain-id 8844 --num 5 --data-dir /data/data- --json

diff --git a/server/server.go b/server/server.go
@@ -105,7 +105,7 @@ func newFileLogger(config *Config) (hclog.Logger, error) {
 	}
 
 	return hclog.New(&hclog.LoggerOptions{
-		Name:       "polygon",
+		Name:       "hydra",
 		Level:      config.LogLevel,
 		Output:     logFileWriter,
 		JSONFormat: config.JSONLogFormat,
@@ -115,7 +115,7 @@ func newFileLogger(config *Config) (hclog.Logger, error) {
 // newCLILogger returns minimal logger instance that sends all logs to standard output
 func newCLILogger(config *Config) hclog.Logger {
 	return hclog.New(&hclog.LoggerOptions{
-		Name:       "polygon",
+		Name:       "hydra",
 		Level:      config.LogLevel,
 		JSONFormat: config.JSONLogFormat,
 	})