fix: handle chain ID panic

Author: minhd-vu

cmd/p2p/sensor/sensor.go

@@ -169,6 +169,7 @@ var SensorCmd = &cobra.Command{
 				ProjectID:                    inputSensorParams.ProjectID,
 				DatabaseID:                   inputSensorParams.DatabaseID,
 				SensorID:                     inputSensorParams.SensorID,
+				ChainID:                      inputSensorParams.NetworkID,
 				MaxConcurrency:               inputSensorParams.MaxDatabaseConcurrency,
 				ShouldWriteBlocks:            inputSensorParams.ShouldWriteBlocks,
 				ShouldWriteBlockEvents:       inputSensorParams.ShouldWriteBlockEvents,
@@ -180,6 +181,7 @@ var SensorCmd = &cobra.Command{
 		case "json":
 			db = database.NewJSONDatabase(database.JSONDatabaseOptions{
 				SensorID:                     inputSensorParams.SensorID,
+				ChainID:                      inputSensorParams.NetworkID,
 				MaxConcurrency:               inputSensorParams.MaxDatabaseConcurrency,
 				ShouldWriteBlocks:            inputSensorParams.ShouldWriteBlocks,
 				ShouldWriteBlockEvents:       inputSensorParams.ShouldWriteBlockEvents,

p2p/database/datastore.go

@@ -31,6 +31,7 @@ const (
 type Datastore struct {
 	client                       *datastore.Client
 	sensorID                     string
+	chainID                      *big.Int
 	maxConcurrency               int
 	shouldWriteBlocks            bool
 	shouldWriteBlockEvents       bool
@@ -118,6 +119,7 @@ type DatastoreOptions struct {
 	ProjectID                    string
 	DatabaseID                   string
 	SensorID                     string
+	ChainID                      uint64
 	MaxConcurrency               int
 	ShouldWriteBlocks            bool
 	ShouldWriteBlockEvents       bool
@@ -138,6 +140,7 @@ func NewDatastore(ctx context.Context, opts DatastoreOptions) Database {
 	return &Datastore{
 		client:                       client,
 		sensorID:                     opts.SensorID,
+		chainID:                      new(big.Int).SetUint64(opts.ChainID),
 		maxConcurrency:               opts.MaxConcurrency,
 		shouldWriteBlocks:            opts.ShouldWriteBlocks,
 		shouldWriteBlockEvents:       opts.ShouldWriteBlockEvents,
@@ -348,9 +351,14 @@ func (d *Datastore) newDatastoreTransaction(tx *types.Transaction, tfs time.Time
 	v, r, s := tx.RawSignatureValues()
 	var from, to string
 
-	address, err := types.Sender(types.LatestSignerForChainID(tx.ChainId()), tx)
+	chainID := tx.ChainId()
+	if tx.ChainId() == nil || tx.ChainId().Sign() <= 0 {
+		chainID = d.chainID
+	}
+
+	address, err := types.Sender(types.LatestSignerForChainID(chainID), tx)
 	if err == nil {
-		from = address.String()
+		from = address.Hex()
 	}
 
 	if tx.To() != nil {

p2p/database/json.go

@@ -20,6 +20,7 @@ import (
 // Each record is output as a single line of JSON (newline-delimited JSON).
 type JSONDatabase struct {
 	sensorID                     string
+	chainID                      *big.Int
 	shouldWriteBlocks            bool
 	shouldWriteBlockEvents       bool
 	shouldWriteTransactions      bool
@@ -30,6 +31,7 @@ type JSONDatabase struct {
 // JSONDatabaseOptions is used when creating a NewJSONDatabase.
 type JSONDatabaseOptions struct {
 	SensorID                     string
+	ChainID                      uint64
 	MaxConcurrency               int
 	ShouldWriteBlocks            bool
 	ShouldWriteBlockEvents       bool
@@ -42,6 +44,7 @@ type JSONDatabaseOptions struct {
 func NewJSONDatabase(opts JSONDatabaseOptions) Database {
 	return &JSONDatabase{
 		sensorID:                     opts.SensorID,
+		chainID:                      new(big.Int).SetUint64(opts.ChainID),
 		shouldWriteBlocks:            opts.ShouldWriteBlocks,
 		shouldWriteBlockEvents:       opts.ShouldWriteBlockEvents,
 		shouldWriteTransactions:      opts.ShouldWriteTransactions,
@@ -252,14 +255,22 @@ func (j *JSONDatabase) writeTxs(txs []*types.Transaction, tfs time.Time) {
 	}
 
 	for _, tx := range txs {
-		var from common.Address
-		from, _ = types.Sender(types.LatestSignerForChainID(tx.ChainId()), tx)
+		chainID := tx.ChainId()
+		if tx.ChainId() == nil || tx.ChainId().Sign() <= 0 {
+			chainID = j.chainID
+		}
+
+		var from string
+		addr, err := types.Sender(types.LatestSignerForChainID(chainID), tx)
+		if err == nil {
+			from = addr.Hex()
+		}
 
 		jsonTx := JSONTransaction{
 			Type:          "transaction",
 			SensorID:      j.sensorID,
 			Hash:          tx.Hash().Hex(),
-			From:          from.Hex(),
+			From:          from,
 			Value:         tx.Value().String(),
 			Gas:           tx.Gas(),
 			GasPrice:      tx.GasPrice().String(),