fix: replace eth.EthTransactionAPI with full.EthTransactionAPIV1 (#1358)

Terryhung · web-flow · commit 66213274e10e · 2025-06-03T10:18:14.000+08:00
* fix: replace eth.EthTransactionAPI with full.EthTransactionAPIV1
diff --git a/lens/interface.go b/lens/interface.go
@@ -24,7 +24,7 @@ type API interface {
 	StateAPI
 	VMAPI
 	ActorEventAPI
-	EthTransactionAPI
+	EthTransactionAPIV1
 
 	GetMessageExecutionsForTipSet(ctx context.Context, ts, pts *types.TipSet) ([]*MessageExecution, error)
 }
@@ -93,6 +93,12 @@ type EthTransactionAPI interface {
 	EthGetTransactionByHash(ctx context.Context, txHash *ethtypes.EthHash) (*ethtypes.EthTx, error)
 }
 
+type EthTransactionAPIV1 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 ActorEventAPI interface {
 	GetActorEventsRaw(ctx context.Context, filter *types.ActorEventFilter) ([]*types.ActorEvent, error)
 }
diff --git a/lens/lily/impl.go b/lens/lily/impl.go
@@ -44,7 +44,6 @@ import (
 	"github.com/filecoin-project/lotus/chain/types/ethtypes"
 	"github.com/filecoin-project/lotus/chain/vm"
 	"github.com/filecoin-project/lotus/node/impl/common"
-	"github.com/filecoin-project/lotus/node/impl/eth"
 	"github.com/filecoin-project/lotus/node/impl/full"
 	"github.com/filecoin-project/lotus/node/impl/net"
 )
@@ -60,7 +59,7 @@ type LilyNodeAPI struct {
 	full.StateAPI
 	full.SyncAPI
 
-	eth.EthTransactionAPI
+	full.EthTransactionAPIV1
 	full.ActorEventAPI
 	common.CommonAPI
 	Events    *events.Events
@@ -559,15 +558,15 @@ func (m *LilyNodeAPI) ComputeBaseFee(ctx context.Context, ts *types.TipSet) (abi
 }
 
 func (m *LilyNodeAPI) EthGetBlockByHash(ctx context.Context, blkHash ethtypes.EthHash, fullTxInfo bool) (ethtypes.EthBlock, error) {
-	return m.EthTransactionAPI.EthGetBlockByHash(ctx, blkHash, fullTxInfo)
+	return m.EthTransactionAPIV1.EthGetBlockByHash(ctx, blkHash, fullTxInfo)
 }
 
 func (m *LilyNodeAPI) EthGetTransactionByHash(ctx context.Context, txHash *ethtypes.EthHash) (*ethtypes.EthTx, error) {
-	return m.EthTransactionAPI.EthGetTransactionByHash(ctx, txHash)
+	return m.EthTransactionAPIV1.EthGetTransactionByHash(ctx, txHash)
 }
 
 func (m *LilyNodeAPI) EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (*api.EthTxReceipt, error) {
-	return m.EthTransactionAPI.EthGetTransactionReceipt(ctx, txHash)
+	return m.EthTransactionAPIV1.EthGetTransactionReceipt(ctx, txHash)
 }
 
 func (m *LilyNodeAPI) ChainGetMessagesInTipset(ctx context.Context, tsk types.TipSetKey) ([]api.Message, error) {

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ type API interface {`
`24`	`24`	`StateAPI`
`25`	`25`	`VMAPI`
`26`	`26`	`ActorEventAPI`
`27`		`- EthTransactionAPI`
	`27`	`+ EthTransactionAPIV1`
`28`	`28`
`29`	`29`	`GetMessageExecutionsForTipSet(ctx context.Context, ts, pts types.TipSet) ([]MessageExecution, error)`
`30`	`30`	`}`
`@@ -93,6 +93,12 @@ type EthTransactionAPI interface {`
`93`	`93`	`EthGetTransactionByHash(ctx context.Context, txHash ethtypes.EthHash) (ethtypes.EthTx, error)`
`94`	`94`	`}`
`95`	`95`
	`96`	`+type EthTransactionAPIV1 interface {`
	`97`	`+ EthGetBlockByHash(ctx context.Context, blkHash ethtypes.EthHash, fullTxInfo bool) (ethtypes.EthBlock, error)`
	`98`	`+ EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (*api.EthTxReceipt, error)`
	`99`	`+ EthGetTransactionByHash(ctx context.Context, txHash ethtypes.EthHash) (ethtypes.EthTx, error)`
	`100`	`+}`
	`101`	`+`
`96`	`102`	`type ActorEventAPI interface {`
`97`	`103`	`GetActorEventsRaw(ctx context.Context, filter types.ActorEventFilter) ([]types.ActorEvent, error)`
`98`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ import (`
`44`	`44`	`"github.com/filecoin-project/lotus/chain/types/ethtypes"`
`45`	`45`	`"github.com/filecoin-project/lotus/chain/vm"`
`46`	`46`	`"github.com/filecoin-project/lotus/node/impl/common"`
`47`		`- "github.com/filecoin-project/lotus/node/impl/eth"`
`48`	`47`	`"github.com/filecoin-project/lotus/node/impl/full"`
`49`	`48`	`"github.com/filecoin-project/lotus/node/impl/net"`
`50`	`49`	`)`
`@@ -60,7 +59,7 @@ type LilyNodeAPI struct {`
`60`	`59`	`full.StateAPI`
`61`	`60`	`full.SyncAPI`
`62`	`61`
`63`		`- eth.EthTransactionAPI`
	`62`	`+ full.EthTransactionAPIV1`
`64`	`63`	`full.ActorEventAPI`
`65`	`64`	`common.CommonAPI`
`66`	`65`	`Events *events.Events`
`@@ -559,15 +558,15 @@ func (m LilyNodeAPI) ComputeBaseFee(ctx context.Context, ts types.TipSet) (abi`
`559`	`558`	`}`
`560`	`559`
`561`	`560`	`func (m *LilyNodeAPI) EthGetBlockByHash(ctx context.Context, blkHash ethtypes.EthHash, fullTxInfo bool) (ethtypes.EthBlock, error) {`
`562`		`- return m.EthTransactionAPI.EthGetBlockByHash(ctx, blkHash, fullTxInfo)`
	`561`	`+ return m.EthTransactionAPIV1.EthGetBlockByHash(ctx, blkHash, fullTxInfo)`
`563`	`562`	`}`
`564`	`563`
`565`	`564`	`func (m LilyNodeAPI) EthGetTransactionByHash(ctx context.Context, txHash ethtypes.EthHash) (*ethtypes.EthTx, error) {`
`566`		`- return m.EthTransactionAPI.EthGetTransactionByHash(ctx, txHash)`
	`565`	`+ return m.EthTransactionAPIV1.EthGetTransactionByHash(ctx, txHash)`
`567`	`566`	`}`
`568`	`567`
`569`	`568`	`func (m LilyNodeAPI) EthGetTransactionReceipt(ctx context.Context, txHash ethtypes.EthHash) (api.EthTxReceipt, error) {`
`570`		`- return m.EthTransactionAPI.EthGetTransactionReceipt(ctx, txHash)`
	`569`	`+ return m.EthTransactionAPIV1.EthGetTransactionReceipt(ctx, txHash)`
`571`	`570`	`}`
`572`	`571`
`573`	`572`	`func (m *LilyNodeAPI) ChainGetMessagesInTipset(ctx context.Context, tsk types.TipSetKey) ([]api.Message, error) {`