fix: fix the logic and data type in fevm tasks (#1232)

* Fix the value encoding in transaction * Fix the logic of receipt --------- Co-authored-by: Terry <[email protected]>
filecoin-project · Jun 18, 2023 · c74c69c · c74c69c
1 parent 1469217
commit c74c69c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/lens/util/fevm.go b/lens/util/fevm.go
@@ -22,3 +22,19 @@ func IsEVMAddress(ctx context.Context, ds tasks.DataSource, addr address.Address
 	}
 	return builtin.IsEvmActor(act.Code)
 }
+
+func IsEVMMessage(ctx context.Context, ds tasks.DataSource, message *types.Message, tsk types.TipSetKey) bool {
+	if IsEVMAddress(ctx, ds, message.From, tsk) {
+		return true
+	}
+
+	if IsEVMAddress(ctx, ds, message.To, tsk) {
+		return true
+	}
+
+	if message.To == builtin.EthereumAddressManagerActorAddr {
+		return true
+	}
+
+	return false
+}
diff --git a/tasks/fevm/receipt/tasks.go b/tasks/fevm/receipt/tasks.go
@@ -64,7 +64,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		if message.Message == nil {
 			continue
 		}
-		if !util.IsEVMAddress(ctx, p.node, message.Message.To, current.Key()) {
+		if !util.IsEVMMessage(ctx, p.node, message.Message, current.Key()) {
 			continue
 		}
 

diff --git a/tasks/fevm/trace/task.go b/tasks/fevm/trace/task.go
@@ -13,7 +13,6 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"golang.org/x/sync/errgroup"
 
-	builtintypes "github.com/filecoin-project/go-state-types/builtin"
 	"github.com/filecoin-project/lily/lens"
 	"github.com/filecoin-project/lily/lens/util"
 	"github.com/filecoin-project/lily/model"
@@ -109,9 +108,7 @@ func (t *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 
 	for _, parentMsg := range mex {
 		// Only handle EVM related message
-		if !util.IsEVMAddress(ctx, t.node, parentMsg.Message.From, current.Key()) &&
-			!util.IsEVMAddress(ctx, t.node, parentMsg.Message.To, current.Key()) &&
-			parentMsg.Message.To != builtintypes.EthereumAddressManagerActorAddr {
+		if !util.IsEVMMessage(ctx, t.node, parentMsg.Message, current.Key()) {
 			continue
 		}
 		transactionHash, err := ethtypes.EthHashFromCid(parentMsg.Cid)

diff --git a/tasks/fevm/transaction/tasks.go b/tasks/fevm/transaction/tasks.go
@@ -62,7 +62,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 		if message.Message == nil {
 			continue
 		}
-		if !util.IsEVMAddress(ctx, p.node, message.Message.To, current.Key()) {
+		if !util.IsEVMMessage(ctx, p.node, message.Message, current.Key()) {
 			continue
 		}
 
@@ -90,7 +90,7 @@ func (p *Task) ProcessTipSets(ctx context.Context, current *types.TipSet, execut
 			ChainID:              uint64(txn.ChainID),
 			Nonce:                uint64(txn.Nonce),
 			From:                 txn.From.String(),
-			Value:                txn.Value.String(),
+			Value:                txn.Value.Int.String(),
 			Type:                 uint64(txn.Type),
 			Input:                txn.Input.String(),
 			Gas:                  uint64(txn.Gas),