Merge remote-tracking branch 'origin/master' into rvagg/releases-to-m…

…aster
filecoin-project · Jul 25, 2024 · 718fc03 · 718fc03
2 parents 01e4922 + 9063b3b
commit 718fc03
Show file tree

Hide file tree

Showing 22 changed files with 1,272 additions and 455 deletions.
diff --git a/api/api_full.go b/api/api_full.go
@@ -829,6 +829,9 @@ type FullNode interface {
 	// Implmements OpenEthereum-compatible API method trace_transaction
 	EthTraceTransaction(ctx context.Context, txHash string) ([]*ethtypes.EthTraceTransaction, error) //perm:read
 
+	// Implements OpenEthereum-compatible API method trace_filter
+	EthTraceFilter(ctx context.Context, filter ethtypes.EthTraceFilterCriteria) ([]*ethtypes.EthTraceFilterResult, error) //perm:read
+
 	// CreateBackup creates node backup onder the specified file name. The
 	// method requires that the lotus daemon is running with the
 	// LOTUS_BACKUP_BASE_PATH environment variable set to some path, and that

diff --git a/api/api_gateway.go b/api/api_gateway.go
@@ -133,6 +133,7 @@ type Gateway interface {
 	EthTraceBlock(ctx context.Context, blkNum string) ([]*ethtypes.EthTraceBlock, error)
 	EthTraceReplayBlockTransactions(ctx context.Context, blkNum string, traceTypes []string) ([]*ethtypes.EthTraceReplayBlockTransaction, error)
 	EthTraceTransaction(ctx context.Context, txHash string) ([]*ethtypes.EthTraceTransaction, error)
+	EthTraceFilter(ctx context.Context, filter ethtypes.EthTraceFilterCriteria) ([]*ethtypes.EthTraceFilterResult, error)
 
 	GetActorEventsRaw(ctx context.Context, filter *types.ActorEventFilter) ([]*types.ActorEvent, error)
 	SubscribeActorEventsRaw(ctx context.Context, filter *types.ActorEventFilter) (<-chan *types.ActorEvent, error)

diff --git a/api/docgen/docgen.go b/api/docgen/docgen.go
@@ -372,6 +372,20 @@ func init() {
 		Address:   []ethtypes.EthAddress{ethaddr},
 	})
 
+	after := ethtypes.EthUint64(0)
+	count := ethtypes.EthUint64(100)
+
+	ethTraceFilterCriteria := ethtypes.EthTraceFilterCriteria{
+		FromBlock:   pstring("latest"),
+		ToBlock:     pstring("latest"),
+		FromAddress: ethtypes.EthAddressList{ethaddr},
+		ToAddress:   ethtypes.EthAddressList{ethaddr},
+		After:       &after,
+		Count:       &count,
+	}
+	addExample(&ethTraceFilterCriteria)
+	addExample(ethTraceFilterCriteria)
+
 	percent := types.Percent(123)
 	addExample(percent)
 	addExample(&percent)

diff --git a/api/eth_aliases.go b/api/eth_aliases.go
@@ -43,6 +43,7 @@ func CreateEthRPCAliases(as apitypes.Aliaser) {
 	as.AliasMethod("trace_block", "Filecoin.EthTraceBlock")
 	as.AliasMethod("trace_replayBlockTransactions", "Filecoin.EthTraceReplayBlockTransactions")
 	as.AliasMethod("trace_transaction", "Filecoin.EthTraceTransaction")
+	as.AliasMethod("trace_filter", "Filecoin.EthTraceFilter")
 
 	as.AliasMethod("net_version", "Filecoin.NetVersion")
 	as.AliasMethod("net_listening", "Filecoin.NetListening")

diff --git a/api/mocks/mock_full.go b/api/mocks/mock_full.go
diff --git a/api/proxy_gen.go b/api/proxy_gen.go