Merge branch 'master' into updateBLST

yacovm · web-flow · commit 2204cf255514 · 2025-03-27T23:51:38.000+01:00
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -8,6 +8,8 @@ To start developing on AvalancheGo, you'll need a few things installed.
 - gcc
 - g++
 
+On MacOS, a modern version of bash is required (e.g. via [homebrew](https://brew.sh/) with `brew install bash`). The version installed by default is not compatible with AvalancheGo's [shell scripts](scripts).
+
 ## Issues
 
 ### Security
diff --git a/vms/platformvm/reward/calculator.go b/vms/platformvm/reward/calculator.go
@@ -63,11 +63,7 @@ func (c *calculator) Calculate(stakedDuration time.Duration, stakedAmount, curre
 	}
 
 	finalReward := reward.Uint64()
-	if finalReward > remainingSupply {
-		return remainingSupply
-	}
-
-	return finalReward
+	return min(remainingSupply, finalReward)
 }
 
 // Split [totalAmount] into [totalAmount * shares percentage] and the remainder.

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,7 @@ func (c *calculator) Calculate(stakedDuration time.Duration, stakedAmount, curre`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`finalReward := reward.Uint64()`
`66`		`- if finalReward > remainingSupply {`
`67`		`- return remainingSupply`
`68`		`- }`
`69`		`-`
`70`		`- return finalReward`
	`66`	`+ return min(remainingSupply, finalReward)`
`71`	`67`	`}`
`72`	`68`
`73`	`69`	`// Split [totalAmount] into [totalAmount * shares percentage] and the remainder.`