Merge remote-tracking branch 'upstream/master' into pavel/p2p-get-pee…

…rs-excl-self

.circleci/config.yml

@@ -49,14 +49,10 @@ executors:
     macos:
       xcode: 14.2.0
     resource_class: macos.m1.medium.gen1
-    environment:
-      HOMEBREW_NO_AUTO_UPDATE: "true"
   mac_arm64_large:
     macos:
       xcode: 14.2.0
     resource_class: macos.m1.large.gen1
-    environment:
-      HOMEBREW_NO_AUTO_UPDATE: "true"
 
 slack-fail-stop-step: &slack-fail-post-step
   post-steps:

.golangci-warnings.yml

@@ -7,7 +7,6 @@ linters:
   enable:
     - gosec
     - partitiontest
-    - unused
 
 linters-settings:
   gosec: # we are mostly only interested in G601

.golangci.yml

@@ -19,6 +19,7 @@ linters:
     - staticcheck
     - typecheck
     - paralleltest
+    - unused
 
 severity:
   default-severity: error
@@ -115,6 +116,14 @@ issues:
     - "^superfluous-else: if block ends with"
 
   exclude-rules:
+    - path: cmd/algofix/
+      linters: unused
+    - path: cmd/algocfg/
+      linters: unused
+    - path: cmd/catchpointdump/
+      linters: unused
+    - path: tools/
+      linters: unused
     - path: _test\.go
       linters:
         - errcheck
@@ -129,6 +138,7 @@ issues:
         # - revive
         # - staticcheck
         - typecheck
+        - unused
     - path: _test\.go
       linters:
         - staticcheck
@@ -206,3 +216,4 @@ issues:
         - govet
         - ineffassign
         - misspell
+        - unused

cmd/algod/main.go

@@ -194,6 +194,10 @@ func run() int {
 		log.Fatalf("Error validating DNSBootstrap input: %v", err)
 	}
 
+	// Apply network-specific consensus overrides, noting the configurable consensus protocols file
+	// takes precedence over network-specific overrides.
+	config.ApplyShorterUpgradeRoundsForDevNetworks(genesis.Network)
+
 	err = config.LoadConfigurableConsensusProtocols(absolutePath)
 	if err != nil {
 		// log is not setup yet, this will log to stderr

config/config_test.go

@@ -773,7 +773,8 @@ func TestLocal_ValidateP2PHybridConfig(t *testing.T) {
 
 	for i, test := range tests {
 		test := test
-		t.Run(fmt.Sprintf("test=%d", i), func(t *testing.T) {
+		name := fmt.Sprintf("test=%d", i)
+		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
 			c := Local{
@@ -782,7 +783,7 @@ func TestLocal_ValidateP2PHybridConfig(t *testing.T) {
 				NetAddress:          test.netAddress,
 			}
 			err := c.ValidateP2PHybridConfig()
-			require.Equal(t, test.err, err != nil, "test=%d", i)
+			require.Equal(t, test.err, err != nil, name)
 		})
 	}
 }

config/consensus.go

@@ -1560,6 +1560,23 @@ func initConsensusProtocols() {
 	vAlpha4.ApprovedUpgrades[protocol.ConsensusVAlpha5] = 10000
 }
 
+// ApplyShorterUpgradeRoundsForDevNetworks applies a shorter upgrade round time for the Devnet and Betanet networks.
+// This function should not take precedence over settings loaded via `PreloadConfigurableConsensusProtocols`.
+func ApplyShorterUpgradeRoundsForDevNetworks(id protocol.NetworkID) {
+	if id == Betanet || id == Devnet {
+		// Go through all approved upgrades and set to the MinUpgradeWaitRounds valid where MinUpgradeWaitRounds is set
+		for _, p := range Consensus {
+			if p.ApprovedUpgrades != nil {
+				for v := range p.ApprovedUpgrades {
+					if p.MinUpgradeWaitRounds > 0 {
+						p.ApprovedUpgrades[v] = p.MinUpgradeWaitRounds
+					}
+				}
+			}
+		}
+	}
+}
+
 // Global defines global Algorand protocol parameters which should not be overridden.
 type Global struct {
 	SmallLambda time.Duration // min amount of time to wait for leader's credential (i.e., time to propagate one credential)

config/consensus_test.go

@@ -59,6 +59,83 @@ func TestConsensusUpgradeWindow(t *testing.T) {
 	}
 }
 
+func TestConsensusUpgradeWindow_NetworkOverrides(t *testing.T) {
+	partitiontest.PartitionTest(t)
+
+	ApplyShorterUpgradeRoundsForDevNetworks(Devnet)
+	for _, params := range Consensus {
+		for toVersion, delay := range params.ApprovedUpgrades {
+			if params.MinUpgradeWaitRounds != 0 || params.MaxUpgradeWaitRounds != 0 {
+				require.NotZerof(t, delay, "From :%v\nTo :%v", params, toVersion)
+				require.Equalf(t, delay, params.MinUpgradeWaitRounds, "From :%v\nTo :%v", params, toVersion)
+				// This check is not really needed, but leaving for sanity
+				require.LessOrEqualf(t, delay, params.MaxUpgradeWaitRounds, "From :%v\nTo :%v", params, toVersion)
+			} else {
+				// If no MinUpgradeWaitRounds is set, leaving everything as zero value is expected
+				require.Zerof(t, delay, "From :%v\nTo :%v", params, toVersion)
+			}
+		}
+	}
+
+	// Should be no-ops for Mainnet
+	Consensus = make(ConsensusProtocols)
+	initConsensusProtocols()
+
+	origConsensus := Consensus.DeepCopy()
+	ApplyShorterUpgradeRoundsForDevNetworks(Mainnet)
+	require.EqualValues(t, origConsensus, Consensus)
+	for _, params := range Consensus {
+		for toVersion, delay := range params.ApprovedUpgrades {
+			if params.MinUpgradeWaitRounds != 0 || params.MaxUpgradeWaitRounds != 0 {
+				require.NotZerof(t, delay, "From :%v\nTo :%v", params, toVersion)
+				require.GreaterOrEqualf(t, delay, params.MinUpgradeWaitRounds, "From :%v\nTo :%v", params, toVersion)
+				require.LessOrEqualf(t, delay, params.MaxUpgradeWaitRounds, "From :%v\nTo :%v", params, toVersion)
+			} else {
+				require.Zerof(t, delay, "From :%v\nTo :%v", params, toVersion)
+
+			}
+		}
+	}
+
+	// reset consensus settings
+	Consensus = make(ConsensusProtocols)
+	initConsensusProtocols()
+
+	ApplyShorterUpgradeRoundsForDevNetworks(Betanet)
+	for _, params := range Consensus {
+		for toVersion, delay := range params.ApprovedUpgrades {
+			if params.MinUpgradeWaitRounds != 0 || params.MaxUpgradeWaitRounds != 0 {
+				require.NotZerof(t, delay, "From :%v\nTo :%v", params, toVersion)
+				require.Equalf(t, delay, params.MinUpgradeWaitRounds, "From :%v\nTo :%v", params, toVersion)
+				// This check is not really needed, but leaving for sanity
+				require.LessOrEqualf(t, delay, params.MaxUpgradeWaitRounds, "From :%v\nTo :%v", params, toVersion)
+			} else {
+				// If no MinUpgradeWaitRounds is set, leaving everything as zero value is expected
+				require.Zerof(t, delay, "From :%v\nTo :%v", params, toVersion)
+			}
+		}
+	}
+
+	// should be no-ops for Testnet
+	Consensus = make(ConsensusProtocols)
+	initConsensusProtocols()
+
+	ApplyShorterUpgradeRoundsForDevNetworks(Testnet)
+	require.EqualValues(t, origConsensus, Consensus)
+	for _, params := range Consensus {
+		for toVersion, delay := range params.ApprovedUpgrades {
+			if params.MinUpgradeWaitRounds != 0 || params.MaxUpgradeWaitRounds != 0 {
+				require.NotZerof(t, delay, "From :%v\nTo :%v", params, toVersion)
+				require.GreaterOrEqualf(t, delay, params.MinUpgradeWaitRounds, "From :%v\nTo :%v", params, toVersion)
+				require.LessOrEqualf(t, delay, params.MaxUpgradeWaitRounds, "From :%v\nTo :%v", params, toVersion)
+			} else {
+				require.Zerof(t, delay, "From :%v\nTo :%v", params, toVersion)
+
+			}
+		}
+	}
+}
+
 func TestConsensusStateProofParams(t *testing.T) {
 	partitiontest.PartitionTest(t)
 

config/localTemplate.go

@@ -170,6 +170,9 @@ type Local struct {
 	// EndpointAddress configures the address the node listens to for REST API calls. Specify an IP and port or just port. For example, 127.0.0.1:0 will listen on a random port on the localhost (preferring 8080).
 	EndpointAddress string `version[0]:"127.0.0.1:0"`
 
+	// Respond to Private Network Access preflight requests sent to the node. Useful when a public website is trying to access a node that's hosted on a local network.
+	EnablePrivateNetworkAccessHeader bool `version[34]:"false"`
+
 	// RestReadTimeoutSeconds is passed to the API servers rest http.Server implementation.
 	RestReadTimeoutSeconds int `version[4]:"15"`
 

config/local_defaults.go

@@ -78,6 +78,7 @@ var defaultLocal = Local{
 	EnableP2P:                                  false,
 	EnableP2PHybridMode:                        false,
 	EnablePingHandler:                          true,
+	EnablePrivateNetworkAccessHeader:           false,
 	EnableProcessBlockStats:                    false,
 	EnableProfiler:                             false,
 	EnableRequestLogger:                        false,

config/version.go

@@ -33,7 +33,7 @@ const VersionMajor = 3
 
 // VersionMinor is the Minor semantic version number (x.#.z) - changed when backwards-compatible features are introduced.
 // Not enforced until after initial public release (x > 0).
-const VersionMinor = 26
+const VersionMinor = 27
 
 // Version is the type holding our full version information.
 type Version struct {

daemon/algod/api/client/restClient.go

@@ -347,26 +347,6 @@ type pendingTransactionsByAddrParams struct {
 	Max uint64 `url:"max"`
 }
 
-type transactionsByAddrParams struct {
-	FirstRound uint64 `url:"firstRound"`
-	LastRound  uint64 `url:"lastRound"`
-	Max        uint64 `url:"max"`
-}
-
-type assetsParams struct {
-	AssetIdx uint64 `url:"assetIdx"`
-	Max      uint64 `url:"max"`
-}
-
-type appsParams struct {
-	AppIdx uint64 `url:"appIdx"`
-	Max    uint64 `url:"max"`
-}
-
-type rawblockParams struct {
-	Raw uint64 `url:"raw"`
-}
-
 type rawFormat struct {
 	Format string `url:"format"`
 }

daemon/algod/api/server/lib/middlewares/cors.go

@@ -31,3 +31,16 @@ func MakeCORS(tokenHeader string) echo.MiddlewareFunc {
 		AllowMethods: []string{http.MethodGet, http.MethodPost, http.MethodPut, http.MethodDelete, http.MethodOptions},
 	})
 }
+
+// MakePNA constructs the Private Network Access middleware function
+func MakePNA() echo.MiddlewareFunc {
+	return func(next echo.HandlerFunc) echo.HandlerFunc {
+		return func(ctx echo.Context) error {
+			req := ctx.Request()
+			if req.Method == http.MethodOptions && req.Header.Get("Access-Control-Request-Private-Network") == "true" {
+				ctx.Response().Header().Set("Access-Control-Allow-Private-Network", "true")
+			}
+			return next(ctx)
+		}
+	}
+}