Resolve Merge Conflicts

api/proto/message/server.go

@@ -48,7 +48,7 @@ func (s *Server) Process(ctx context.Context, message *Message) (*Response, erro
 		}
 		address := crypto.PubkeyToAddress(key.PublicKey)
 
-		utils.Logger().Info().Int64("amount", amount).Bytes("address", address[:]).Msg("Enter")
+		utils.Logger().Info().Int64("amount", amount).Hex("address", address[:]).Msg("Enter")
 		if err := s.CreateTransactionForEnterMethod(amount, priKey); err != nil {
 			return nil, ErrEnterMethod
 		}

core/rawdb/accessors_indexes.go

@@ -33,7 +33,7 @@ func ReadTxLookupEntry(db DatabaseReader, hash common.Hash) (common.Hash, uint64
 	}
 	var entry TxLookupEntry
 	if err := rlp.DecodeBytes(data, &entry); err != nil {
-		utils.Logger().Error().Err(err).Hex("hash", hash.Bytes()).Msg("Invalid transaction lookup entry RLP")
+		utils.Logger().Error().Err(err).Str("hash", hash.Hex()).Msg("Invalid transaction lookup entry RLP")
 		return common.Hash{}, 0, 0
 	}
 	return entry.BlockHash, entry.BlockIndex, entry.Index

core/rawdb/accessors_metadata.go

@@ -52,7 +52,7 @@ func ReadChainConfig(db DatabaseReader, hash common.Hash) *params.ChainConfig {
 	}
 	var config params.ChainConfig
 	if err := json.Unmarshal(data, &config); err != nil {
-		utils.Logger().Error().Err(err).Hex("hash", hash.Bytes()).Msg("Invalid chain config JSON")
+		utils.Logger().Error().Err(err).Str("hash", hash.Hex()).Msg("Invalid chain config JSON")
 		return nil
 	}
 	return &config

node/node_handler.go

@@ -478,8 +478,8 @@ func (node *Node) AddNewBlock(newBlock *types.Block) error {
 		utils.Logger().Error().
 			Err(err).
 			Uint64("blockNum", newBlock.NumberU64()).
-			Hex("parentHash", newBlock.Header().ParentHash.Bytes()[:]).
+			Str("parentHash", newBlock.Header().ParentHash.Hex()).
-			Hex("hash", newBlock.Header().Hash().Bytes()[:]).
+			Str("hash", newBlock.Header().Hash().Hex()).
 			Msg("Error Adding new block to blockchain")
 	} else {
 		utils.Logger().Info().