cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

v1.27.0-a #10

Closed
jonathanface wants to merge 473 commits from v1.27.0-a into master
pull from: v1.27.0-a
merge into: cerc-io:master
Conversation 0 Commits 473 Files Changed 452 +18 -6
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c827cf1c0e - Show all commits

8
storage/pipeline/commit_batch.go
View File

@ -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()) _, 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) { 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() 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) 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()) _, 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) { 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() 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 // If we're out of gas, split the batch in half and evaluate again

2
storage/pipeline/precommit_batch.go
View File

@ -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) { if err != nil && (!api.ErrorIsIn(err, []error{&api.ErrOutOfGas{}}) || len(entries) == 1) {
res.Error = err.Error() 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 // If we're out of gas, split the batch in half and evaluate again

14
storage/pipeline/utils.go
View File

@ -1,7 +1,9 @@
package sealing package sealing
import ( import (
"bytes"
"context" "context"
"fmt"
"math/bits" "math/bits"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
@ -105,7 +107,17 @@ func simulateMsgGas(ctx context.Context, sa interface {
Params: params, 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 { func sendMsg(ctx context.Context, sa interface {