feat: add new task fevm contract (#1214)

* Add new task: fevm_contract

* Refine the util function name and height value

---------

Co-authored-by: Terry <[email protected]>

Author: Terryhung

chain/indexer/integrated/processor/state.go

@@ -60,6 +60,7 @@ import (
 
 	// fevm task
 	fevmblockheadertask "github.com/filecoin-project/lily/tasks/fevm/blockheader"
+	fevmcontracttask "github.com/filecoin-project/lily/tasks/fevm/contract"
 	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"
@@ -650,6 +651,8 @@ func MakeProcessors(api tasks.DataSource, indexerTasks []string) (*IndexerProces
 			out.TipsetsProcessors[t] = fevmreceipttask.NewTask(api)
 		case tasktype.FEVMTransaction:
 			out.TipsetsProcessors[t] = fevmtransactiontask.NewTask(api)
+		case tasktype.FEVMContract:
+			out.TipsetsProcessors[t] = fevmcontracttask.NewTask(api)
 
 		case BuiltinTaskName:
 			out.ReportProcessors[t] = indexertask.NewTask(api)

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, 12)
+	require.Len(t, proc.tipsetsProcessors, 13)
 	require.Len(t, proc.builtinProcessors, 1)
 
 	require.Equal(t, gasoutput.NewTask(nil), proc.tipsetsProcessors[tasktype.GasOutputs])

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, 12)
+	require.Len(t, proc.TipsetsProcessors, 13)
 	require.Len(t, proc.ReportProcessors, 1)
 }

chain/indexer/tasktype/table_tasks.go

@@ -48,6 +48,7 @@ const (
 	FEVMBlockHeader                = "fevm_block_header"
 	FEVMReceipt                    = "fevm_receipt"
 	FEVMTransaction                = "fevm_transaction"
+	FEVMContract                   = "fevm_contract"
 )
 
 var AllTableTasks = []string{
@@ -97,6 +98,7 @@ var AllTableTasks = []string{
 	FEVMBlockHeader,
 	FEVMReceipt,
 	FEVMTransaction,
+	FEVMContract,
 }
 
 var TableLookup = map[string]struct{}{
@@ -146,6 +148,7 @@ var TableLookup = map[string]struct{}{
 	FEVMBlockHeader:                {},
 	FEVMReceipt:                    {},
 	FEVMTransaction:                {},
+	FEVMContract:                   {},
 }
 
 var TableComment = map[string]string{
@@ -195,6 +198,7 @@ var TableComment = map[string]string{
 	FEVMBlockHeader:                ``,
 	FEVMReceipt:                    ``,
 	FEVMTransaction:                ``,
+	FEVMContract:                   ``,
 }
 
 var TableFieldComments = map[string]map[string]string{
@@ -301,4 +305,5 @@ var TableFieldComments = map[string]map[string]string{
 	FEVMBlockHeader:                {},
 	FEVMReceipt:                    {},
 	FEVMTransaction:                {},
+	FEVMContract:                   {},
 }

chain/indexer/tasktype/tasks.go

@@ -96,6 +96,7 @@ var TaskLookup = map[string][]string{
 		FEVMBlockHeader,
 		FEVMReceipt,
 		FEVMTransaction,
+		FEVMContract,
 	},
 }
 

chain/indexer/tasktype/tasks_test.go

@@ -101,7 +101,7 @@ func TestMakeAllTaskAliasNames(t *testing.T) {
 }
 
 func TestMakeAllTaskNames(t *testing.T) {
-	const TotalTableTasks = 46
+	const TotalTableTasks = 47
 	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

lens/util/fevm.go

@@ -9,7 +9,7 @@ import (
 	"github.com/filecoin-project/lotus/chain/types"
 )
 
-func IsSentToEVMAddress(ctx context.Context, ds tasks.DataSource, addr address.Address, tsk types.TipSetKey) bool {
+func IsEVMAddress(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.

model/fevm/contract.go

@@ -0,0 +1,46 @@
+package fevm
+
+import (
+	"context"
+
+	"go.opencensus.io/tag"
+
+	"github.com/filecoin-project/lily/metrics"
+	"github.com/filecoin-project/lily/model"
+)
+
+type FEVMContract struct {
+	tableName struct{} `pg:"fevm_contracts"` // nolint: structcheck
+
+	// Height message was executed at.
+	Height int64 `pg:",pk,notnull,use_zero"`
+
+	// Actor address.
+	ActorID string `pg:",notnull"`
+
+	// Actor Address in ETH
+	EthAddress string `pg:",notnull"`
+
+	ByteCode     string `pg:",notnull"`
+	ByteCodeHash string `pg:",notnull"`
+
+	Balance string `pg:"type:numeric,notnull"`
+	Nonce   uint64 `pg:",use_zero"`
+}
+
+func (f *FEVMContract) Persist(ctx context.Context, s model.StorageBatch, version model.Version) error {
+	ctx, _ = tag.New(ctx, tag.Upsert(metrics.Table, "fevm_contracts"))
+	metrics.RecordCount(ctx, metrics.PersistModel, 1)
+	return s.PersistModel(ctx, f)
+}
+
+type FEVMContractList []*FEVMContract
+
+func (f FEVMContractList) 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_contracts"))
+	metrics.RecordCount(ctx, metrics.PersistModel, len(f))
+	return s.PersistModel(ctx, f)
+}

schemas/v1/25_fevm_contract.go

@@ -0,0 +1,19 @@
+package v1
+
+func init() {
+	patches.Register(
+		25,
+		`
+	CREATE TABLE IF NOT EXISTS {{ .SchemaName | default "public"}}.fevm_contracts  (
+	    height               BIGINT NOT NULL,
+		actor_id             TEXT,
+		eth_address          TEXT,
+		byte_code            TEXT,
+		byte_code_hash       TEXT,
+		balance              NUMERIC,
+		nonce                BIGINT,
+		PRIMARY KEY(height, actor_id, nonce)
+	);
+`,
+	)
+}

storage/sql.go

@@ -97,6 +97,7 @@ var Models = []interface{}{
 	(*fevm.FEVMBlockHeader)(nil),
 	(*fevm.FEVMReceipt)(nil),
 	(*fevm.FEVMTransaction)(nil),
+	(*fevm.FEVMContract)(nil),
 }
 
 var log = logging.Logger("lily/storage")