use go-ethereum Sender function to properly get the signer

initia-labs · Jul 15, 2024 · 387ff14 · 387ff14
1 parent fc241d6
commit 387ff14
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/x/evm/keeper/txutils.go b/x/evm/keeper/txutils.go
@@ -85,6 +85,12 @@ func (u *TxUtils) ConvertEthereumTxToCosmosTx(ctx context.Context, ethTx *corety
 	ethChainID := types.ConvertCosmosChainIDToEthereumChainID(chainID)
 	signer := coretypes.LatestSignerForChainID(ethChainID)
 
+	// get tx sender
+	ethSender, err := coretypes.Sender(signer, ethTx)
+	if err != nil {
+		return nil, err
+	}
+
 	// sig bytes
 	v, r, s := ethTx.RawSignatureValues()
 
@@ -126,7 +132,7 @@ func (u *TxUtils) ConvertEthereumTxToCosmosTx(ctx context.Context, ethTx *corety
 	}
 
 	// convert sender to string
-	sender, err := u.ac.BytesToString(compressedPubKey.Address().Bytes())
+	sender, err := u.ac.BytesToString(ethSender.Bytes())
 	if err != nil {
 		return nil, err
 	}