Merge pull request #26 from taikoxyz/fix/ego_panic

Author: johntaiko

cmd/gaiko/server.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
+	"runtime/debug"
 	"sync"
 	"syscall"
 
@@ -48,6 +49,18 @@ const (
 	HeklaBlock    ProveMode = "hekla" // deprecated
 )
 
+func recoverMiddleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		defer func() {
+			if err := recover(); err != nil {
+				fmt.Printf("panic: %v\n%s", err, debug.Stack())
+				http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+			}
+		}()
+		next.ServeHTTP(w, r)
+	})
+}
+
 func proveHandler(ctx context.Context, args *flags.Arguments, sgxProver *prover.SGXProver, w http.ResponseWriter, r *http.Request, proveMode ProveMode) {
 	contentType := r.Header.Get("Content-Type")
 	if contentType != "application/json" {
@@ -112,7 +125,9 @@ func runServer(c *cli.Context) error {
 		port = "8080"
 	}
 	args := flags.NewArguments(c)
-	http.HandleFunc("POST /prove/{action}", func(w http.ResponseWriter, r *http.Request) {
+
+	mux := http.NewServeMux()
+	mux.HandleFunc("POST /prove/{action}", func(w http.ResponseWriter, r *http.Request) {
 		args := args.Copy()
 		defer r.Body.Close()
 		// override the proof writer to get the proof & return as response
@@ -136,7 +151,8 @@ func runServer(c *cli.Context) error {
 	})
 
 	server := &http.Server{
-		Addr: ":" + port,
+		Addr:    ":" + port,
+		Handler: recoverMiddleware(mux),
 	}
 
 	go func() {

ego/_enclave.conf

@@ -0,0 +1,7 @@
+Debug=1
+NumHeapPages=4194304
+NumStackPages=1024
+NumTCS=32
+ProductID=1
+SecurityVersion=1
+CapturePFGPExceptions=1

ego/enclave.json

@@ -2,7 +2,7 @@
     "exe": "gaiko-ego",
     "key": "private.pem",
     "debug": false,
-    "heapSize": 8192,
+    "heapSize": 16384,
     "executableHeap": false,
     "productID": 1,
     "securityVersion": 1,
@@ -50,7 +50,11 @@
         {
             "name": "HOME",
             "value": "/root"
+        },
+        {
+            "name": "GODEBUG",
+            "value": "madvdontneed=1"
         }
     ],
     "files": []
-}
+}

internal/prover/proof.go

@@ -76,7 +76,7 @@ func genAggregateProof(
 	if err != nil {
 		return err
 	}
-	log.Info("receive input: ", input)
+	log.Info("receive input: ", "input", input)
 	oldInstance := common.BytesToAddress(input.Proofs[0].Proof[4:24])
 	curInstance := oldInstance
 	for i, proof := range input.Proofs {

internal/types/access_list.go

@@ -3,11 +3,16 @@ package types
 import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/log"
 )
 
 type AccessList []*AccessTuple
 
 func (a AccessList) GethType() types.AccessList {
+	if a == nil {
+		log.Warn("missing AccessList when converting to GethType")
+		return nil
+	}
 	accessList := make(types.AccessList, len(a))
 	for i, accessTuple := range a {
 		accessList[i] = types.AccessTuple(*accessTuple)

internal/types/batch_proposed.go

@@ -4,6 +4,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/ethereum/go-ethereum/log"
 	"github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/pacaya"
 )
 
@@ -17,6 +18,10 @@ type BatchProposed struct {
 }
 
 func (b *BatchProposed) GethType() *pacaya.TaikoInboxClientBatchProposed {
+	if b == nil {
+		log.Warn("missing BatchProposed when converting to GethType")
+		return nil
+	}
 	blocks := make([]pacaya.ITaikoInboxBlockParams, len(b.Info.Blocks))
 	for i, block := range b.Info.Blocks {
 		blocks[i] = pacaya.ITaikoInboxBlockParams(*block)

internal/types/block.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/log"
 )
 
 type Block struct {
@@ -12,6 +13,10 @@ type Block struct {
 }
 
 func (b *Block) GethType() *types.Block {
+	if b == nil {
+		log.Warn("missing Block when converting to GethType")
+		return nil
+	}
 	return types.NewBlockWithHeader(b.Header.GethType()).WithBody(types.Body{
 		Transactions: b.Body.GethType(),
 		Uncles:       b.Ommers.GethType(),

internal/types/block_proposed.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/ethereum/go-ethereum/log"
 	"github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/ontake"
 )
 
@@ -20,6 +21,10 @@ type BlockProposed struct {
 }
 
 func (b *BlockProposed) GethType() *ontake.TaikoL1ClientBlockProposed {
+	if b == nil {
+		log.Warn("missing BlockProposed when converting to GethType")
+		return nil
+	}
 	deposits := make([]ontake.TaikoDataEthDeposit, len(b.DepositsProcessed))
 	for i, deposit := range b.DepositsProcessed {
 		deposits[i] = ontake.TaikoDataEthDeposit{

internal/types/block_proposed_v2.go

@@ -5,20 +5,25 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
+	"github.com/ethereum/go-ethereum/log"
 	"github.com/taikoxyz/taiko-mono/packages/taiko-client/bindings/ontake"
 )
 
 //go:generate go run github.com/fjl/gencodec -type BlockProposedV2 -field-override blockProposedV2Marshaling -out gen_block_proposed_v2.go
 
 // BlockProposedV2 represents a BlockProposed event raised by the TaikoL1Client contract.
 type BlockProposedV2 struct {
-	BlockId *big.Int         `json:"blockId" gencodec:"required"`
+	BlockID *big.Int         `json:"blockId" gencodec:"required"`
 	Meta    *BlockMetadataV2 `json:"meta"    gencodec:"required"`
 }
 
 func (b *BlockProposedV2) GethType() *ontake.TaikoL1ClientBlockProposedV2 {
+	if b == nil {
+		log.Warn("missing BlockProposedV2 when converting to GethType")
+		return nil
+	}
 	return &ontake.TaikoL1ClientBlockProposedV2{
-		BlockId: b.BlockId,
+		BlockId: b.BlockID,
 		Meta: ontake.TaikoDataBlockMetadataV2{
 			AnchorBlockHash:  b.Meta.AnchorBlockHash,
 			Difficulty:       b.Meta.Difficulty,
@@ -51,7 +56,7 @@ func (b *BlockProposedV2) GethType() *ontake.TaikoL1ClientBlockProposedV2 {
 }
 
 type blockProposedV2Marshaling struct {
-	BlockId *math.HexOrDecimal256 `json:"blockId" gencodec:"required"`
+	BlockID *math.HexOrDecimal256 `json:"blockId" gencodec:"required"`
 }
 
 //go:generate go run github.com/fjl/gencodec -type BlockMetadataV2 -field-override blockMetadataV2Marshaling -out gen_block_metadata_v2.go