Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Eth JSON-RPC: from in eth_getTransactionByHash is not correctly popul… #10151

Merged
merged 4 commits into from
Jan 31, 2023
Merged

Eth JSON-RPC: from in eth_getTransactionByHash is not correctly popul… #10151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
070aca2
Eth JSON-RPC: from in eth_getTransactionByHash is not correctly popul…
maciejwitowski Jan 31, 2023
5f2ef98
Move assigning `from` address to the API level
maciejwitowski Jan 31, 2023
dcbfca5
Improve the error message
maciejwitowski Jan 31, 2023
99b879d
Add test for EthGetTransactionByHash
arajasek Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions itests/eth_transactions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ func TestValueTransferValidSignature(t *testing.T) {

// Success.
require.EqualValues(t, ethtypes.EthUint64(0x1), receipt.Status)

ethTx, err := client.EthGetTransactionByHash(ctx, &hash)
require.Nil(t, err)
require.EqualValues(t, ethAddr, ethTx.From)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's also assert against all tx fields? That way if something else fails to populate/breaks, we'll catch it too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't be able to do it today, but happy to land this later this week 🙂


}

func TestLegacyTransaction(t *testing.T) {
Expand Down
9 changes: 8 additions & 1 deletion node/impl/full/eth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1569,8 +1569,15 @@ func newEthTxFromSignedMessage(ctx context.Context, smsg *types.SignedMessage, s

tx.Hash, err = tx.TxHash()
if err != nil {
return ethtypes.EthTx{}, err
return ethtypes.EthTx{}, xerrors.Errorf("failed to calculate hash for ethTx: %w", err)
}

fromAddr, err := lookupEthAddress(ctx, smsg.Message.From, sa)
if err != nil {
return ethtypes.EthTx{}, xerrors.Errorf("failed to resolve Ethereum address: %w", err)
}

tx.From = fromAddr
} else if smsg.Signature.Type == crypto.SigTypeSecp256k1 { // Secp Filecoin Message
tx = ethTxFromNativeMessage(ctx, smsg.VMMessage(), sa)
tx.Hash, err = ethtypes.EthHashFromCid(smsg.Cid())
Expand Down