feat: add new task: fevm_transaction (#1213)

Terryhung · Terry · web-flow · commit 744faa5338fc · 2023-05-29T15:42:33.000-07:00
* Add new task: fevm_transaction

* refactor the duplicate function

* Add new schema for fevm transaction

* Change the column schema

* Change the type of maxfeepergas

---------

Co-authored-by: Terry &lt;terry@TerrydeMacBook-Pro.local&gt;
diff --git a/chain/datasource/datasource.go b/chain/datasource/datasource.go
@@ -144,6 +144,10 @@ func (t *DataSource) EthGetBlockByHash(ctx context.Context, blkHash ethtypes.Eth
 	return t.node.EthGetBlockByHash(ctx, blkHash, fullTxInfo)
 }
 
+func (t *DataSource) EthGetTransactionByHash(ctx context.Context, txHash *ethtypes.EthHash) (*ethtypes.EthTx, error) {
+	return t.node.EthGetTransactionByHash(ctx, txHash)
+}
+
 func (t *DataSource) EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (*api.EthTxReceipt, error) {
 	return t.node.EthGetTransactionReceipt(ctx, txHash)
 }
diff --git a/chain/indexer/integrated/processor/state.go b/chain/indexer/integrated/processor/state.go
@@ -61,6 +61,7 @@ import (
 	// fevm task
 	fevmblockheadertask "github.com/filecoin-project/lily/tasks/fevm/blockheader"
 	fevmreceipttask "github.com/filecoin-project/lily/tasks/fevm/receipt"
+	fevmtransactiontask "github.com/filecoin-project/lily/tasks/fevm/transaction"
 	fevmactorstatstask "github.com/filecoin-project/lily/tasks/fevmactorstats"
 
 	"github.com/filecoin-project/lily/chain/indexer/tasktype"
@@ -647,6 +648,8 @@ func MakeProcessors(api tasks.DataSource, indexerTasks []string) (*IndexerProces
 			out.TipsetsProcessors[t] = fevmblockheadertask.NewTask(api)
 		case tasktype.FEVMReceipt:
 			out.TipsetsProcessors[t] = fevmreceipttask.NewTask(api)
+		case tasktype.FEVMTransaction:
+			out.TipsetsProcessors[t] = fevmtransactiontask.NewTask(api)
 
 		case BuiltinTaskName:
 			out.ReportProcessors[t] = indexertask.NewTask(api)
diff --git a/chain/indexer/integrated/processor/state_internal_test.go b/chain/indexer/integrated/processor/state_internal_test.go
@@ -54,7 +54,7 @@ func TestNewProcessor(t *testing.T) {
 	require.Equal(t, t.Name(), proc.name)
 	require.Len(t, proc.actorProcessors, 24)
 	require.Len(t, proc.tipsetProcessors, 10)
-	require.Len(t, proc.tipsetsProcessors, 11)
+	require.Len(t, proc.tipsetsProcessors, 12)
 	require.Len(t, proc.builtinProcessors, 1)
 
 	require.Equal(t, gasoutput.NewTask(nil), proc.tipsetsProcessors[tasktype.GasOutputs])
diff --git a/chain/indexer/integrated/processor/state_test.go b/chain/indexer/integrated/processor/state_test.go
@@ -408,6 +408,6 @@ func TestMakeProcessorsAllTasks(t *testing.T) {
 	require.NoError(t, err)
 	require.Len(t, proc.ActorProcessors, 24)
 	require.Len(t, proc.TipsetProcessors, 10)
-	require.Len(t, proc.TipsetsProcessors, 11)
+	require.Len(t, proc.TipsetsProcessors, 12)
 	require.Len(t, proc.ReportProcessors, 1)
 }
diff --git a/chain/indexer/tasktype/table_tasks.go b/chain/indexer/tasktype/table_tasks.go
@@ -47,6 +47,7 @@ const (
 	FEVMActorStats                 = "fevm_actor_stats"
 	FEVMBlockHeader                = "fevm_block_header"
 	FEVMReceipt                    = "fevm_receipt"
+	FEVMTransaction                = "fevm_transaction"
 )
 
 var AllTableTasks = []string{
@@ -95,6 +96,7 @@ var AllTableTasks = []string{
 	FEVMActorStats,
 	FEVMBlockHeader,
 	FEVMReceipt,
+	FEVMTransaction,
 }
 
 var TableLookup = map[string]struct{}{
@@ -143,6 +145,7 @@ var TableLookup = map[string]struct{}{
 	FEVMActorStats:                 {},
 	FEVMBlockHeader:                {},
 	FEVMReceipt:                    {},
+	FEVMTransaction:                {},
 }
 
 var TableComment = map[string]string{
@@ -191,6 +194,7 @@ var TableComment = map[string]string{
 	FEVMActorStats:                 ``,
 	FEVMBlockHeader:                ``,
 	FEVMReceipt:                    ``,
+	FEVMTransaction:                ``,
 }
 
 var TableFieldComments = map[string]map[string]string{
@@ -296,4 +300,5 @@ var TableFieldComments = map[string]map[string]string{
 	FEVMActorStats:                 {},
 	FEVMBlockHeader:                {},
 	FEVMReceipt:                    {},
+	FEVMTransaction:                {},
 }
diff --git a/chain/indexer/tasktype/tasks.go b/chain/indexer/tasktype/tasks.go
@@ -95,6 +95,7 @@ var TaskLookup = map[string][]string{
 		FEVMActorStats,
 		FEVMBlockHeader,
 		FEVMReceipt,
+		FEVMTransaction,
 	},
 }
 
diff --git a/chain/indexer/tasktype/tasks_test.go b/chain/indexer/tasktype/tasks_test.go
@@ -101,7 +101,7 @@ func TestMakeAllTaskAliasNames(t *testing.T) {
 }
 
 func TestMakeAllTaskNames(t *testing.T) {
-	const TotalTableTasks = 45
+	const TotalTableTasks = 46
 	actual, err := tasktype.MakeTaskNames(tasktype.AllTableTasks)
 	require.NoError(t, err)
 	// if this test fails it means a new task name was added, update the above test
diff --git a/lens/interface.go b/lens/interface.go
@@ -80,6 +80,7 @@ type VMAPI interface {
 type EthModuleAPI interface {
 	EthGetBlockByHash(ctx context.Context, blkHash ethtypes.EthHash, fullTxInfo bool) (ethtypes.EthBlock, error)
 	EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (*api.EthTxReceipt, error)
+	EthGetTransactionByHash(ctx context.Context, txHash *ethtypes.EthHash) (*ethtypes.EthTx, error)
 }
 
 type MessageExecution struct {
diff --git a/lens/lily/api.go b/lens/lily/api.go
@@ -58,6 +58,7 @@ type LilyAPI interface {
 	EthGetBlockByHash(ctx context.Context, blkHash ethtypes.EthHash, fullTxInfo bool) (ethtypes.EthBlock, error) //perm:read
 	EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (*api.EthTxReceipt, error)            //perm:read
 	ChainGetMessagesInTipset(ctx context.Context, tsk types.TipSetKey) ([]api.Message, error)                    //perm:read
+	EthGetTransactionByHash(ctx context.Context, txHash *ethtypes.EthHash) (*ethtypes.EthTx, error)              //perm:read
 
 	// trigger graceful shutdown
 	Shutdown(context.Context) error
diff --git a/lens/lily/impl.go b/lens/lily/impl.go
@@ -559,6 +559,10 @@ func (m *LilyNodeAPI) EthGetBlockByHash(ctx context.Context, blkHash ethtypes.Et
 	return m.EthModuleAPI.EthGetBlockByHash(ctx, blkHash, fullTxInfo)
 }
 
+func (m *LilyNodeAPI) EthGetTransactionByHash(ctx context.Context, txHash *ethtypes.EthHash) (*ethtypes.EthTx, error) {
+	return m.EthModuleAPI.EthGetTransactionByHash(ctx, txHash)
+}
+
 func (m *LilyNodeAPI) EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (*api.EthTxReceipt, error) {
 	return m.EthModuleAPI.EthGetTransactionReceipt(ctx, txHash)
 }
diff --git a/lens/lily/struct.go b/lens/lily/struct.go
@@ -67,6 +67,7 @@ type LilyAPIStruct struct {
 		EthGetBlockByHash         func(ctx context.Context, blkHash ethtypes.EthHash, fullTxInfo bool) (ethtypes.EthBlock, error) `perm:"read"`
 		EthGetTransactionReceipt  func(ctx context.Context, txHash ethtypes.EthHash) (*api.EthTxReceipt, error)                   `perm:"read"`
 		ChainGetMessagesInTipset  func(ctx context.Context, tsk types.TipSetKey) ([]api.Message, error)                           `perm:"read"`
+		EthGetTransactionByHash   func(ctx context.Context, txHash *ethtypes.EthHash) (*ethtypes.EthTx, error)                    `perm:"read"`
 
 		LogList          func(context.Context) ([]string, error)     `perm:"read"`
 		LogSetLevel      func(context.Context, string, string) error `perm:"read"`
@@ -284,3 +285,7 @@ func (s *LilyAPIStruct) EthGetTransactionReceipt(ctx context.Context, txHash eth
 func (s *LilyAPIStruct) ChainGetMessagesInTipset(ctx context.Context, tsk types.TipSetKey) ([]api.Message, error) {
 	return s.Internal.ChainGetMessagesInTipset(ctx, tsk)
 }
+
+func (s *LilyAPIStruct) EthGetTransactionByHash(ctx context.Context, txHash *ethtypes.EthHash) (*ethtypes.EthTx, error) {
+	return s.Internal.EthGetTransactionByHash(ctx, txHash)
+}
diff --git a/lens/util/fevm.go b/lens/util/fevm.go
@@ -0,0 +1,24 @@
+package util
+
+import (
+	"context"
+
+	"github.com/filecoin-project/go-address"
+	"github.com/filecoin-project/lily/tasks"
+	builtin "github.com/filecoin-project/lotus/chain/actors/builtin"
+	"github.com/filecoin-project/lotus/chain/types"
+)
+
+func IsSentToEVMAddress(ctx context.Context, ds tasks.DataSource, addr address.Address, tsk types.TipSetKey) bool {
+	act, err := ds.Actor(ctx, addr, tsk)
+	if err != nil {
+		// If actor not found, check if it's a placeholder address.
+		if addr.Protocol() == address.Delegated {
+			log.Debugf("Sent to Placeholder address: %v", addr)
+			return true
+		}
+		log.Errorf("Error at getting actor. address: %v, err: %v", addr, err)
+		return false
+	}
+	return builtin.IsEvmActor(act.Code)
+}
diff --git a/model/fevm/transaction.go b/model/fevm/transaction.go
@@ -0,0 +1,53 @@
+package fevm
+
+import (
+	"context"
+
+	"go.opencensus.io/tag"
+
+	"github.com/filecoin-project/lily/metrics"
+	"github.com/filecoin-project/lily/model"
+)
+
+type FEVMTransaction struct {
+	tableName struct{} `pg:"fevm_transaction"` // nolint: structcheck
+
+	// Height message was executed at.
+	Height int64 `pg:",pk,notnull,use_zero"`
+
+	Hash                 string `pg:",pk,notnull"`
+	ChainID              uint64 `pg:",use_zero"`
+	Nonce                uint64 `pg:",use_zero"`
+	BlockHash            string `pg:",notnull"`
+	BlockNumber          uint64 `pg:",use_zero"`
+	TransactionIndex     uint64 `pg:",use_zero"`
+	From                 string `pg:",notnull"`
+	To                   string `pg:",notnull"`
+	Value                string `pg:",notnull"`
+	Type                 uint64 `pg:",use_zero"`
+	Input                string `pg:",notnull"`
+	Gas                  uint64 `pg:",use_zero"`
+	MaxFeePerGas         string `pg:"type:numeric,notnull"`
+	MaxPriorityFeePerGas string `pg:"type:numeric,notnull"`
+	AccessList           string `pg:",type:jsonb"`
+	V                    string `pg:",notnull"`
+	R                    string `pg:",notnull"`
+	S                    string `pg:",notnull"`
+}
+
+func (f *FEVMTransaction) Persist(ctx context.Context, s model.StorageBatch, version model.Version) error {
+	ctx, _ = tag.New(ctx, tag.Upsert(metrics.Table, "fevm_transaction"))
+	metrics.RecordCount(ctx, metrics.PersistModel, 1)
+	return s.PersistModel(ctx, f)
+}
+
+type FEVMTransactionList []*FEVMTransaction
+
+func (f FEVMTransactionList) Persist(ctx context.Context, s model.StorageBatch, version model.Version) error {
+	if len(f) == 0 {
+		return nil
+	}
+	ctx, _ = tag.New(ctx, tag.Upsert(metrics.Table, "fevm_transaction"))
+	metrics.RecordCount(ctx, metrics.PersistModel, len(f))
+	return s.PersistModel(ctx, f)
+}
diff --git a/schemas/v1/24_fevm_transaction.go b/schemas/v1/24_fevm_transaction.go
@@ -0,0 +1,31 @@
+package v1
+
+func init() {
+	patches.Register(
+		24,
+		`
+	CREATE TABLE IF NOT EXISTS {{ .SchemaName | default "public"}}.fevm_transaction  (
+	    height               BIGINT NOT NULL,
+		hash                 TEXT,
+		transaction_index    BIGINT,
+		block_hash           TEXT,
+		block_number         BIGINT,
+		chain_id             BIGINT,
+		nonce                BIGINT,
+		type                 BIGINT,
+		"from"               TEXT,
+		"to"                 TEXT,
+		input                TEXT,
+		value                TEXT,
+		gas                  BIGINT,
+		max_fee_per_gas      numeric,
+		max_priority_fee_per_gas numeric,
+		v                    TEXT,
+		r                    TEXT,
+		s                    TEXT,
+		access_list          jsonb,
+		PRIMARY KEY(height, hash)
+	);
+`,
+	)
+}
diff --git a/storage/sql.go b/storage/sql.go
@@ -96,6 +96,7 @@ var Models = []interface{}{
 	(*fevm.FEVMActorStats)(nil),
 	(*fevm.FEVMBlockHeader)(nil),
 	(*fevm.FEVMReceipt)(nil),
+	(*fevm.FEVMTransaction)(nil),
 }
 
 var log = logging.Logger("lily/storage")
diff --git a/tasks/api.go b/tasks/api.go
@@ -73,4 +73,5 @@ type DataSource interface {
 	EthGetBlockByHash(ctx context.Context, blkHash ethtypes.EthHash, fullTxInfo bool) (ethtypes.EthBlock, error)
 	EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (*api.EthTxReceipt, error)
 	ChainGetMessagesInTipset(ctx context.Context, tsk types.TipSetKey) ([]api.Message, error)
+	EthGetTransactionByHash(ctx context.Context, txHash *ethtypes.EthHash) (*ethtypes.EthTx, error)
 }
diff --git a/tasks/fevm/receipt/tasks.go b/tasks/fevm/receipt/tasks.go
@@ -5,8 +5,6 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"github.com/filecoin-project/go-address"
-
 	"github.com/filecoin-project/lotus/chain/types"
 
 	"encoding/json"
@@ -15,10 +13,10 @@ import (
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 
+	"github.com/filecoin-project/lily/lens/util"
 	"github.com/filecoin-project/lily/model"
 	visormodel "github.com/filecoin-project/lily/model/visor"
 	"github.com/filecoin-project/lily/tasks"
-	"github.com/filecoin-project/lotus/chain/actors/builtin"
 
 	"github.com/filecoin-project/lily/model/fevm"
 	"github.com/filecoin-project/lotus/chain/types/ethtypes"
@@ -36,20 +34,6 @@ func NewTask(node tasks.DataSource) *Task {
 	}
 }
 
-func (p *Task) isSentToEVMAddress(ctx context.Context, addr address.Address, tsk types.TipSetKey) bool {
-	act, err := p.node.Actor(ctx, addr, tsk)
-	if err != nil {
-		// If actor not found, check if it's a placeholder address.
-		if addr.Protocol() == address.Delegated {
-			log.Debugf("Sent to Placeholder address: %v", addr)
-			return true
-		}
-		log.Errorf("Error at getting actor. address: %v, err: %v", addr, err)
-		return false
-	}
-	return builtin.IsEvmActor(act.Code)
-}
-
 func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, executed *types.TipSet) (model.Persistable, *visormodel.ProcessingReport, error) {
 	ctx, span := otel.Tracer("").Start(ctx, "ProcessTipSets")
 	if span.IsRecording() {
@@ -79,8 +63,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		if message.Message == nil {
 			continue
 		}
-
-		if !p.isSentToEVMAddress(ctx, message.Message.To, executed.Key()) {
+		if !util.IsSentToEVMAddress(ctx, p.node, message.Message.To, executed.Key()) {
 			continue
 		}
 
diff --git a/tasks/fevm/transaction/tasks.go b/tasks/fevm/transaction/tasks.go

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,10 @@ func (t *DataSource) EthGetBlockByHash(ctx context.Context, blkHash ethtypes.Eth`
`144`	`144`	`return t.node.EthGetBlockByHash(ctx, blkHash, fullTxInfo)`
`145`	`145`	`}`
`146`	`146`
	`147`	`+func (t DataSource) EthGetTransactionByHash(ctx context.Context, txHash ethtypes.EthHash) (*ethtypes.EthTx, error) {`
	`148`	`+ return t.node.EthGetTransactionByHash(ctx, txHash)`
	`149`	`+}`
	`150`	`+`
`147`	`151`	`func (t DataSource) EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (api.EthTxReceipt, error) {`
`148`	`152`	`return t.node.EthGetTransactionReceipt(ctx, txHash)`
`149`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -408,6 +408,6 @@ func TestMakeProcessorsAllTasks(t *testing.T) {`
`408`	`408`	`require.NoError(t, err)`
`409`	`409`	`require.Len(t, proc.ActorProcessors, 24)`
`410`	`410`	`require.Len(t, proc.TipsetProcessors, 10)`
`411`		`- require.Len(t, proc.TipsetsProcessors, 11)`
	`411`	`+ require.Len(t, proc.TipsetsProcessors, 12)`
`412`	`412`	`require.Len(t, proc.ReportProcessors, 1)`
`413`	`413`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ var TaskLookup = map[string][]string{`
`95`	`95`	`FEVMActorStats,`
`96`	`96`	`FEVMBlockHeader,`
`97`	`97`	`FEVMReceipt,`
	`98`	`+ FEVMTransaction,`
`98`	`99`	`},`
`99`	`100`	`}`
`100`	`101`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ func TestMakeAllTaskAliasNames(t *testing.T) {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`func TestMakeAllTaskNames(t *testing.T) {`
`104`		`- const TotalTableTasks = 45`
	`104`	`+ const TotalTableTasks = 46`
`105`	`105`	`actual, err := tasktype.MakeTaskNames(tasktype.AllTableTasks)`
`106`	`106`	`require.NoError(t, err)`
`107`	`107`	`// if this test fails it means a new task name was added, update the above test`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ type VMAPI interface {`
`80`	`80`	`type EthModuleAPI interface {`
`81`	`81`	`EthGetBlockByHash(ctx context.Context, blkHash ethtypes.EthHash, fullTxInfo bool) (ethtypes.EthBlock, error)`
`82`	`82`	`EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (*api.EthTxReceipt, error)`
	`83`	`+ EthGetTransactionByHash(ctx context.Context, txHash ethtypes.EthHash) (ethtypes.EthTx, error)`
`83`	`84`	`}`
`84`	`85`
`85`	`86`	`type MessageExecution struct {`
Original file line number	Diff line number	Diff line change
`@@ -559,6 +559,10 @@ func (m *LilyNodeAPI) EthGetBlockByHash(ctx context.Context, blkHash ethtypes.Et`
`559`	`559`	`return m.EthModuleAPI.EthGetBlockByHash(ctx, blkHash, fullTxInfo)`
`560`	`560`	`}`
`561`	`561`
	`562`	`+func (m LilyNodeAPI) EthGetTransactionByHash(ctx context.Context, txHash ethtypes.EthHash) (*ethtypes.EthTx, error) {`
	`563`	`+ return m.EthModuleAPI.EthGetTransactionByHash(ctx, txHash)`
	`564`	`+}`
	`565`	`+`
`562`	`566`	`func (m LilyNodeAPI) EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (api.EthTxReceipt, error) {`
`563`	`567`	`return m.EthModuleAPI.EthGetTransactionReceipt(ctx, txHash)`
`564`	`568`	`}`