Merge branch 'main' into add-getBlockProvers

taikoxyz · Nov 25, 2022 · 46eb062 · 46eb062
2 parents 3aad438 + 4fe1fa4
commit 46eb062
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -5,7 +5,6 @@ on:
     branches: [main]
     paths:
       - "packages/relayer/**"
-
 jobs:
   push-docker-image:
     name: Build and push docker image

diff --git a/packages/relayer/http/routes.go b/packages/relayer/http/routes.go
@@ -2,6 +2,7 @@ package http
 
 func (srv *Server) configureRoutes() {
 	srv.echo.GET("/healthz", srv.Health)
+	srv.echo.GET("/", srv.Health)
 
 	srv.echo.GET("/events", srv.GetEventsByAddress)
 }
diff --git a/packages/relayer/http/server.go b/packages/relayer/http/server.go
@@ -55,8 +55,8 @@ func NewServer(opts NewServerOpts) (*Server, error) {
 		corsOrigins = []string{"*"}
 	}
 
-	srv.configureRoutes()
 	srv.configureMiddleware(corsOrigins)
+	srv.configureRoutes()
 
 	return srv, nil
 }
@@ -111,8 +111,6 @@ func (srv *Server) configureMiddleware(corsOrigins []string) {
 	}))
 
 	srv.configureAndStartPrometheus()
-
-	srv.configureRoutes()
 }
 
 func (srv *Server) configureAndStartPrometheus() {

diff --git a/packages/relayer/http/server_test.go b/packages/relayer/http/server_test.go
@@ -89,6 +89,19 @@ func Test_Health(t *testing.T) {
 	}
 }
 
+func Test_Root(t *testing.T) {
+	srv := newTestServer("")
+
+	req, _ := http.NewRequest(echo.GET, "/", nil)
+	rec := httptest.NewRecorder()
+
+	srv.ServeHTTP(rec, req)
+
+	if rec.Code != http.StatusOK {
+		t.Fatalf("Test_Root expected code %v, got %v", http.StatusOK, rec.Code)
+	}
+}
+
 func Test_Metrics(t *testing.T) {
 	srv := newTestServer("")
 

diff --git a/packages/website/faq/index.md b/packages/website/faq/index.md
@@ -60,3 +60,11 @@ Taiko implements a ZK-EVM that supports every EVM opcode, producing a validity p
 A zero-knowledge proof is a method by which one party (the prover) can prove to another party (the verifier) that something is true, without revealing any information apart from the fact that this specific statement is true.
 
 There are 2 types of zero-knowledge proofs: ZK-SNARKs and ZK-STARKs. Taiko uses ZK-SNARKs in its design.
+
+## What does "Taiko" mean?
+
+It comes from an old Chinese saying 一鼓作气 (Yīgǔzuòqì) meaning "Do it all at once". 
+
+The first drum beat cheers people up, the second weakens them, and the third devitalizes them. The first is the most powerful.
+Taiko is the "drum".
+