improve gasEstimate logging

filecoin-project · Apr 5, 2024 · 3e3344b · 3e3344b
1 parent 37c24bb
commit 3e3344b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/storage/pipeline/commit_batch.go b/storage/pipeline/commit_batch.go
@@ -449,9 +449,9 @@ func (b *CommitBatcher) processBatchV2(cfg sealiface.Config, sectors []abi.Secto
 	_, err = simulateMsgGas(b.mctx, b.api, from, b.maddr, builtin.MethodsMiner.ProveCommitSectors3, needFunds, maxFee, enc.Bytes())
 
 	if err != nil && (!api.ErrorIsIn(err, []error{&api.ErrOutOfGas{}}) || len(sectors) < miner.MinAggregatedSectors*2) {
-		log.Errorf("simulating CommitBatch message failed (%x): %s", enc.Bytes(), err)
+		log.Errorf("simulating CommitBatch %s", err)
 		res.Error = err.Error()
-		return []sealiface.CommitBatchRes{res}, xerrors.Errorf("simulating CommitBatch message failed: %w", err)
+		return []sealiface.CommitBatchRes{res}, xerrors.Errorf("simulating CommitBatch %w", err)
 	}
 
 	msgTooLarge := len(enc.Bytes()) > (messagepool.MaxMessageSize - 128)
@@ -590,9 +590,9 @@ func (b *CommitBatcher) processBatchV1(cfg sealiface.Config, sectors []abi.Secto
 	_, err = simulateMsgGas(b.mctx, b.api, from, b.maddr, builtin.MethodsMiner.ProveCommitAggregate, needFunds, maxFee, enc.Bytes())
 
 	if err != nil && (!api.ErrorIsIn(err, []error{&api.ErrOutOfGas{}}) || len(sectors) < miner.MinAggregatedSectors*2) {
-		log.Errorf("simulating CommitBatch message failed (%x): %s", enc.Bytes(), err)
+		log.Errorf("simulating CommitBatch %s", err)
 		res.Error = err.Error()
-		return []sealiface.CommitBatchRes{res}, xerrors.Errorf("simulating CommitBatch message failed: %w", err)
+		return []sealiface.CommitBatchRes{res}, xerrors.Errorf("simulating CommitBatch %w", err)
 	}
 
 	// If we're out of gas, split the batch in half and evaluate again

diff --git a/storage/pipeline/precommit_batch.go b/storage/pipeline/precommit_batch.go
@@ -291,7 +291,7 @@ func (b *PreCommitBatcher) processPreCommitBatch(cfg sealiface.Config, bf abi.To
 
 	if err != nil && (!api.ErrorIsIn(err, []error{&api.ErrOutOfGas{}}) || len(entries) == 1) {
 		res.Error = err.Error()
-		return []sealiface.PreCommitBatchRes{res}, xerrors.Errorf("simulating PreCommitBatch message failed: %w", err)
+		return []sealiface.PreCommitBatchRes{res}, xerrors.Errorf("simulating PreCommitBatch %w", err)
 	}
 
 	// If we're out of gas, split the batch in half and evaluate again

diff --git a/storage/pipeline/utils.go b/storage/pipeline/utils.go
@@ -1,7 +1,10 @@
 package sealing
 
 import (
+	"bytes"
 	"context"
+	"encoding/hex"
+	"fmt"
 	"math/bits"
 
 	"github.com/ipfs/go-cid"
@@ -105,7 +108,18 @@ func simulateMsgGas(ctx context.Context, sa interface {
 		Params: params,
 	}
 
-	return sa.GasEstimateMessageGas(ctx, &msg, nil, types.EmptyTSK)
+	var b bytes.Buffer
+	err := msg.MarshalCBOR(&b)
+	if err != nil {
+		return nil, xerrors.Errorf("failed to unmarshal the signed message: %w", err)
+	}
+	s := hex.EncodeToString(b.Bytes())
+
+	gmsg, err := sa.GasEstimateMessageGas(ctx, &msg, nil, types.EmptyTSK)
+	if err != nil {
+		err = fmt.Errorf("message %s failed: %w", s, err)
+	}
+	return gmsg, err
 }
 
 func sendMsg(ctx context.Context, sa interface {