build: regenerate api routes and resolve merge error in catchup

catchup/service.go

@@ -310,7 +310,8 @@
 				return false
 			}
 			failureRank := peerRankDownloadFailed
-			if err == errNoBlockForRound {
+			var nbfe noBlockForRoundError
+			if errors.As(err, &nbfe) {
 				failureRank = peerRankNoBlockForRound
 				// remote peer doesn't have the block, try another peer
 				// quit if the the same peer peer encountered errNoBlockForRound more than errNoBlockForRoundThreshold times
@@ -730,30 +731,31 @@
 				return
 			default:
 			}
 			failureRank := peerRankDownloadFailed
-			if err == errNoBlockForRound {
+			var nbfe noBlockForRoundError
+			if errors.As(err, &nbfe) {
 				failureRank = peerRankNoBlockForRound
 				// If a peer does not have the block after few attempts it probably has not persisted the block yet.
 				// Give it some time to persist the block and try again.
 				// None, there is no exit condition on too many retries as per the function contract.
 				if count, ok := peerErrors[peer]; ok {
 					if count > errNoBlockForRoundThreshold {
 						time.Sleep(50 * time.Millisecond)
 					}
 					if count > errNoBlockForRoundThreshold*10 {
 						// for the low number of connected peers (like 2) the following scenatio is possible:
 						// - both peers do not have the block
 						// - peer selector punishes one of the peers more than the other
 						// - the punoshed peer gets the block, and the less punished peer stucks.
 						// It this case reset the peer selector to let it re-learn priorities.
 						peerSelector = createPeerSelector(s.net, s.cfg, false)
 					}
 				}
 				peerErrors[peer]++
 			}
 			// remote peer doesn't have the block, try another peer
 			logging.Base().Warnf("fetchRound could not acquire block, fetcher errored out: %v", err)
 			peerSelector.rankPeer(psp, failureRank)
 			continue
 		}
 

daemon/algod/api/algod.oas3.yml

@@ -7192,5 +7192,6 @@
     {
       "name": "private"
     }
-  ]
+  ],
+  "x-original-swagger-version": "2.0"
 }

data/transactions/logic/Makefile

@@ -19,7 +19,7 @@ fields_string.go:	fields.go
 	go generate
 
 README.md:	TEAL_opcodes.md README_in.md
-	python merge.py > README.md
+	python3 merge.py > README.md
 	@if [ -e $(SPECS)/dev/TEAL.md ]; then \
 		sed '/^$$/q' $(SPECS)/dev/TEAL.md | cat - README.md > teal.spec; \
 		mv teal.spec $(SPECS)/dev/TEAL.md; \