From e4242e632640d35a996694d345d79ee48427105a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Negovanovi=C4=87?= Date: Wed, 9 Aug 2023 08:45:40 +0200 Subject: [PATCH] Remove not needed sender set and set it if not set from the outside --- txrelayer/txrelayer.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/txrelayer/txrelayer.go b/txrelayer/txrelayer.go index 3a9a1e91f3..4cc9201daa 100644 --- a/txrelayer/txrelayer.go +++ b/txrelayer/txrelayer.go @@ -101,15 +101,15 @@ func (t *TxRelayerImpl) sendTransactionLocked(txn *ethgo.Transaction, key ethgo. t.lock.Lock() defer t.lock.Unlock() - txn.From = key.Address() - nonce, err := t.client.Eth().GetNonce(key.Address(), ethgo.Pending) if err != nil { return ethgo.ZeroHash, fmt.Errorf("failed to get nonce: %w", err) } txn.Nonce = nonce - txn.From = key.Address() + if txn.From == ethgo.ZeroAddress { + txn.From = key.Address() + } if txn.Type != ethgo.TransactionDynamicFee && txn.GasPrice == 0 { gasPrice, err := t.Client().Eth().GasPrice()