cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix: eth API: return correct txIdx around null blocks (#10419)

Browse Source
This commit is contained in:
Aayush Rajasekaran 2023-03-09 07:14:57 -05:00 committed by GitHub
parent 3e85591c6c
commit ab91ab100f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
node/impl/full/eth.go
View File

@ -1797,12 +1797,16 @@ func newEthBlockFromFilecoinTipSet(ctx context.Context, ts *types.TipSet, fullTx
return ethtypes.EthBlock{}, xerrors.Errorf("failed to compute state: %w", err) return ethtypes.EthBlock{}, xerrors.Errorf("failed to compute state: %w", err)
} }
for txIdx, msg := range compOutput.Trace { txIdx := 0
for _, msg := range compOutput.Trace {
// skip system messages like reward application and cron // skip system messages like reward application and cron
if msg.Msg.From == builtintypes.SystemActorAddr { if msg.Msg.From == builtintypes.SystemActorAddr {
continue continue
} }
ti := ethtypes.EthUint64(txIdx)
txIdx++
gasUsed += msg.MsgRct.GasUsed gasUsed += msg.MsgRct.GasUsed
smsgCid, err := getSignedMessage(ctx, cs, msg.MsgCid) smsgCid, err := getSignedMessage(ctx, cs, msg.MsgCid)
if err != nil { if err != nil {
@ -1813,8 +1817,6 @@ func newEthBlockFromFilecoinTipSet(ctx context.Context, ts *types.TipSet, fullTx
return ethtypes.EthBlock{}, xerrors.Errorf("failed to convert msg to ethTx: %w", err) return ethtypes.EthBlock{}, xerrors.Errorf("failed to convert msg to ethTx: %w", err)
} }
ti := ethtypes.EthUint64(txIdx)
tx.ChainID = ethtypes.EthUint64(build.Eip155ChainId) tx.ChainID = ethtypes.EthUint64(build.Eip155ChainId)
tx.BlockHash = &blkHash tx.BlockHash = &blkHash
tx.BlockNumber = &bn tx.BlockNumber = &bn