fix bug

taikoxyz · Apr 29, 2024 · 78a6db6 · 78a6db6
1 parent a352b40
commit 78a6db6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/bindings/encoding/custom_error.go b/bindings/encoding/custom_error.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 )
 
@@ -21,7 +20,6 @@ type BlockHashContractCallerAndTransactionReader interface {
 func TryParsingCustomErrorFromReceipt(
 	ctx context.Context,
 	rpc BlockHashContractCallerAndTransactionReader,
-	from common.Address,
 	receipt *types.Receipt,
 ) error {
 	// Fetch the raw transaction.
@@ -32,7 +30,6 @@ func TryParsingCustomErrorFromReceipt(
 
 	// Call the contract at the block hash.
 	_, err = rpc.CallContractAtHash(ctx, ethereum.CallMsg{
-		From:          from,
 		To:            tx.To(),
 		Gas:           tx.Gas(),
 		GasFeeCap:     tx.GasFeeCap(),

diff --git a/proposer/proposer.go b/proposer/proposer.go
@@ -385,7 +385,7 @@ func (p *Proposer) ProposeTxLists(ctx context.Context, txListsBytes [][]byte) []
 				log.Error("Failed to fetch receipt", "txHash", txHash, "error", err)
 				continue
 			}
-			errors[i] = encoding.TryParsingCustomErrorFromReceipt(ctx, p.rpc.L1, p.proposerAddress, receipt)
+			errors[i] = encoding.TryParsingCustomErrorFromReceipt(ctx, p.rpc.L1, receipt)
 		}
 	}
 

diff --git a/proposer/proposer_test.go b/proposer/proposer_test.go
@@ -353,7 +353,7 @@ func (s *ProposerTestSuite) TestProposeTxLists() {
 				log.Error("Failed to fetch receipt", "txHash", txHash, "error", err)
 				continue
 			}
-			errors[i] = encoding.TryParsingCustomErrorFromReceipt(ctx, p.rpc.L1, p.proposerAddress, receipt)
+			errors[i] = encoding.TryParsingCustomErrorFromReceipt(ctx, p.rpc.L1, receipt)
 		}
 	}
 

diff --git a/prover/proof_submitter/transaction/sender.go b/prover/proof_submitter/transaction/sender.go
@@ -75,8 +75,8 @@ func (s *Sender) Send(
 			"Failed to submit proof",
 			"blockID", proofWithHeader.BlockID,
 			"tier", proofWithHeader.Tier,
-			"txHash", receipt.TxHash,
-			"error", encoding.TryParsingCustomErrorFromReceipt(ctx, s.rpc.L1, s.txmgr.From(), receipt),
+			"txHash", receipt.TxHash.String(),
+			"error", encoding.TryParsingCustomErrorFromReceipt(ctx, s.rpc.L1, receipt),
 		)
 		metrics.ProverSubmissionRevertedCounter.Add(1)
 		return ErrUnretryableSubmission