fix: sealing: improve gasEstimate logging (#11840)
* improve gasEstimate logging * use fmt for hex
This commit is contained in:
parent
485050ee7c
commit
c827cf1c0e
@ -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
|
||||
|
@ -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
|
||||
|
@ -1,7 +1,9 @@
|
||||
package sealing
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"fmt"
|
||||
"math/bits"
|
||||
|
||||
"github.com/ipfs/go-cid"
|
||||
@ -105,7 +107,17 @@ 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)
|
||||
}
|
||||
|
||||
gmsg, err := sa.GasEstimateMessageGas(ctx, &msg, nil, types.EmptyTSK)
|
||||
if err != nil {
|
||||
err = fmt.Errorf("message %x failed: %w", b.Bytes(), err)
|
||||
}
|
||||
return gmsg, err
|
||||
}
|
||||
|
||||
func sendMsg(ctx context.Context, sa interface {
|
||||
|
Loading…
Reference in New Issue
Block a user