merge develop

.github/ISSUE_TEMPLATE/bug.md

@@ -6,7 +6,7 @@ labels: 'type:bug'
 assignees: ''
 ---
 
-Our support team has aggregated some common issues and their solutions from past which are faced while running or interacting with a bor client. In order to prevent redundant efforts, we would encourage you to have a look at the [FAQ's section](https://wiki.polygon.technology/docs/faq/technical-faqs/) of our documentation mentioning the same, before filing an issue here. In case of additional support, you can also join our [discord](https://discord.com/invite/zdwkdvMNY2) server
+Our support team has aggregated some common issues and their solutions from past which are faced while running or interacting with a bor client. In order to prevent redundant efforts, we would encourage you to have a look at the [FAQ's section](https://wiki.polygon.technology/docs/faq/technical-faqs/) of our documentation mentioning the same, before filing an issue here. In case of additional support, you can also join our [discord](https://discord.com/invite/0xPolygonDevs) server
 
 <!--
 NOTE: Please make sure to check of any addresses / private keys / rpc url's / IP's before sharing the logs or anything from the additional information section (start.sh or heimdall config).

.github/ISSUE_TEMPLATE/question.md

@@ -8,4 +8,4 @@ assignees: ''
 
 This should only be used in very rare cases e.g. if you are not 100% sure if something is a bug or asking a question that leads to improving the documentation. 
 
-For general questions please join our [discord](https://discord.com/invite/zdwkdvMNY2) server.
+For general questions please join our [discord](https://discord.com/invite/0xPolygonDevs) server.

README.md

@@ -6,7 +6,7 @@ https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/6874
 )](https://pkg.go.dev/github.com/maticnetwork/bor)
 [![Go Report Card](https://goreportcard.com/badge/github.com/maticnetwork/bor)](https://goreportcard.com/report/github.com/maticnetwork/bor)
 ![MIT License](https://img.shields.io/github/license/maticnetwork/bor)
-[![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=Polygon%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat-square)](https://discord.gg/zdwkdvMNY2)
+[![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=Polygon%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat-square)](https://discord.com/invite/0xPolygonDevs)
 [![Twitter Follow](https://img.shields.io/twitter/follow/0xPolygon.svg?style=social)](https://twitter.com/0xPolygon)
 
 ### Installing bor using packaging
@@ -79,4 +79,4 @@ included in our repository in the `COPYING` file.
 
 ## Join our Discord server
 
-Join Polygon community – share your ideas or just say hi over [on Discord](https://discord.gg/zdwkdvMNY2).
+Join Polygon community – share your ideas or just say hi over [on Discord](https://discord.com/invite/0xPolygonDevs).

builder/files/config.toml

@@ -38,7 +38,7 @@ syncmode = "full"
  # nodekeyhex = ""
  [p2p.discovery]
  # v5disc = false
- bootnodes = ["enode://b8f1cc9c5d4403703fbf377116469667d2b1823c0daf16b7250aa576bacf399e42c3930ccfcb02c5df6879565a2b8931335565f0e8d3f8e72385ecf4a4bf160a@3.36.224.80:30303", "enode://8729e0c825f3d9cad382555f3e46dcff21af323e89025a0e6312df541f4a9e73abfa562d64906f5e59c51fe6f0501b3e61b07979606c56329c020ed739910759@54.194.245.5:30303"]
+ bootnodes = ["enode://76316d1cb93c8ed407d3332d595233401250d48f8fbb1d9c65bd18c0495eca1b43ec38ee0ea1c257c0abb7d1f25d649d359cdfe5a805842159cfe36c5f66b7e8@52.78.36.216:30303", "enode://b8f1cc9c5d4403703fbf377116469667d2b1823c0daf16b7250aa576bacf399e42c3930ccfcb02c5df6879565a2b8931335565f0e8d3f8e72385ecf4a4bf160a@3.36.224.80:30303", "enode://8729e0c825f3d9cad382555f3e46dcff21af323e89025a0e6312df541f4a9e73abfa562d64906f5e59c51fe6f0501b3e61b07979606c56329c020ed739910759@54.194.245.5:30303", "enode://681ebac58d8dd2d8a6eef15329dfbad0ab960561524cf2dfde40ad646736fe5c244020f20b87e7c1520820bc625cfb487dd71d63a3a3bf0baea2dbb8ec7c79f1@34.240.245.39:30303"]
  # Uncomment below `bootnodes` field for Mumbai bootnode
  # bootnodes = ["enode://bdcd4786a616a853b8a041f53496d853c68d99d54ff305615cd91c03cd56895e0a7f6e9f35dbf89131044e2114a9a782b792b5661e3aff07faf125a98606a071@43.200.206.40:30303", "enode://209aaf7ed549cf4a5700fd833da25413f80a1248bd3aa7fe2a87203e3f7b236dd729579e5c8df61c97bf508281bae4969d6de76a7393bcbd04a0af70270333b3@54.216.248.9:30303"]
  # bootnodesv4 = []

consensus/bor/heimdall/client.go

@@ -26,6 +26,7 @@ var (
  ErrNotSuccessfulResponse = errors.New("error while fetching data from Heimdall")
  ErrNotInRejectedList = errors.New("milestoneID doesn't exist in rejected list")
  ErrNotInMilestoneList = errors.New("milestoneID doesn't exist in Heimdall")
+ ErrServiceUnavailable = errors.New("service unavailable")
 )
 
 const (
@@ -277,10 +278,18 @@ func FetchWithRetry[T any](ctx context.Context, client http.Client, url *url.URL
  return result, nil
  }
 
+ // 503 (Service Unavailable) is thrown when an endpoint isn't activated
+ // yet in heimdall. E.g. when the hardfork hasn't hit yet but heimdall
+ // is upgraded.
+ if errors.Is(err, ErrServiceUnavailable) {
+ log.Debug("Heimdall service unavailable at the moment", "path", url.Path, "error", err)
+ return nil, err
+ }
+
  // attempt counter
  attempt := 1
 
- log.Warn("an error while trying fetching from Heimdall", "attempt", attempt, "error", err)
+ log.Warn("an error while trying fetching from Heimdall", "path", url.Path, "attempt", attempt, "error", err)
 
  // create a new ticker for retrying the request
  ticker := time.NewTicker(retryCall)
@@ -307,9 +316,14 @@ retryLoop:
  request = &Request{client: client, url: url, start: time.Now()}
  result, err = Fetch[T](ctx, request)
 
+ if errors.Is(err, ErrServiceUnavailable) {
+ log.Debug("Heimdall service unavailable at the moment", "path", url.Path, "error", err)
+ return nil, err
+ }
+
  if err != nil {
  if attempt%logEach == 0 {
- log.Warn("an error while trying fetching from Heimdall", "attempt", attempt, "error", err)
+ log.Warn("an error while trying fetching from Heimdall", "path", url.Path, "attempt", attempt, "error", err)
  }
 
  continue retryLoop
@@ -426,6 +440,10 @@ func internalFetch(ctx context.Context, client http.Client, u *url.URL) ([]byte,
 
  defer res.Body.Close()
 
+ if res.StatusCode == http.StatusServiceUnavailable {
+ return nil, fmt.Errorf("%w: response code %d", ErrServiceUnavailable, res.StatusCode)
+ }
+
  // check status code
  if res.StatusCode != 200 && res.StatusCode != 204 {
  return nil, fmt.Errorf("%w: response code %d", ErrNotSuccessfulResponse, res.StatusCode)

eth/backend.go

@@ -32,6 +32,7 @@ import (
  "github.com/ethereum/go-ethereum/consensus"
  "github.com/ethereum/go-ethereum/consensus/beacon"
  "github.com/ethereum/go-ethereum/consensus/bor"
+ "github.com/ethereum/go-ethereum/consensus/bor/heimdall"
  "github.com/ethereum/go-ethereum/consensus/clique"
  "github.com/ethereum/go-ethereum/core"
  "github.com/ethereum/go-ethereum/core/bloombits"
@@ -758,6 +759,10 @@ func (s *Ethereum) handleMilestone(ctx context.Context, ethHandler *ethHandler,
  ethHandler.downloader.ProcessFutureMilestone(num, hash)
  }
 
+ if errors.Is(err, heimdall.ErrServiceUnavailable) {
+ return nil
+ }
+
  if err != nil {
  return err
  }
@@ -770,7 +775,10 @@ func (s *Ethereum) handleMilestone(ctx context.Context, ethHandler *ethHandler,
 func (s *Ethereum) handleNoAckMilestone(ctx context.Context, ethHandler *ethHandler, bor *bor.Bor) error {
  milestoneID, err := ethHandler.fetchNoAckMilestone(ctx, bor)
 
- //If failed to fetch the no-ack milestone then it give the error.
+ if errors.Is(err, heimdall.ErrServiceUnavailable) {
+ return nil
+ }
+
  if err != nil {
  return err
  }

eth/handler_bor.go

@@ -6,6 +6,7 @@ import (
 
  "github.com/ethereum/go-ethereum/common"
  "github.com/ethereum/go-ethereum/consensus/bor"
+ "github.com/ethereum/go-ethereum/consensus/bor/heimdall"
  "github.com/ethereum/go-ethereum/log"
 )
 
@@ -63,6 +64,11 @@ func (h *ethHandler) fetchWhitelistMilestone(ctx context.Context, bor *bor.Bor,
 
  // fetch latest milestone
  milestone, err := bor.HeimdallClient.FetchMilestone(ctx)
+ if errors.Is(err, heimdall.ErrServiceUnavailable) {
+ log.Debug("Failed to fetch latest milestone for whitelisting", "err", err)
+ return num, hash, err
+ }
+
  if err != nil {
  log.Error("Failed to fetch latest milestone for whitelisting", "err", err)
  return num, hash, errMilestone
@@ -92,9 +98,13 @@ func (h *ethHandler) fetchNoAckMilestone(ctx context.Context, bor *bor.Bor) (str
 
  // fetch latest milestone
  milestoneID, err := bor.HeimdallClient.FetchLastNoAckMilestone(ctx)
+ if errors.Is(err, heimdall.ErrServiceUnavailable) {
+ log.Debug("Failed to fetch latest no-ack milestone", "err", err)
+ return milestoneID, err
+ }
+
  if err != nil {
  log.Error("Failed to fetch latest no-ack milestone", "err", err)
-
  return milestoneID, errMilestone
  }
 
@@ -104,6 +114,10 @@ func (h *ethHandler) fetchNoAckMilestone(ctx context.Context, bor *bor.Bor) (str
 func (h *ethHandler) fetchNoAckMilestoneByID(ctx context.Context, bor *bor.Bor, milestoneID string) error {
  // fetch latest milestone
  err := bor.HeimdallClient.FetchNoAckMilestone(ctx, milestoneID)
+ if errors.Is(err, heimdall.ErrServiceUnavailable) {
+ log.Debug("Failed to fetch no-ack milestone by ID", "milestoneID", milestoneID, "err", err)
+ return err
+ }
 
  // fixme: handle different types of errors
  if errors.Is(err, ErrNotInRejectedList) {