bd10bdf99a
* build: Bump version to v1.17.3-dev * build: set version to v1.18.0-dev * chore: actors: Allow builtin-actors to return a map of methods (#9342) * Allow builtin-actors to return a map of methods * go mod * Fix tests * Fix tests, check carefully please * Delete lotus-pond (#9352) * feat: add StateNetworkVersion to mpool API * chore: refactor: rename NewestNetworkVersion * feat: actors: Integrate datacap actor into lotus (#9348) * Integrate datacap actor * Implement datacap actor in chain/builtin * feat: support typed errors over RPC * chore: deps: update to go-jsonrpc 0.1.8 * remove duplicate import * fix: itest: check for closed connection * chore: refactor: move retry test to API * address magik supernit * Add ability to only have single partition per msg for partitions with recovery sectors * doc gen * Address comments * Return beneficiary info from miner state Info() * Update builtin-actors to dev/20220922-v9 which includes FIP-0045 changes in progress * Integrate verifreg changes to lotus * Setup datacap actor * Update builtin-actors to dev/20220922-v9-1 * Update datacap actor to query datacap instead of verifreg * update gst * update markets * update actors with hamt fix * update gst * Update datacap to parse tokens * Update bundles * datacap and verifreg actors use ID addresses without protocol byte * update builtin-actors to rc1 * update go-fil-markets * Update bundles to rc2 * Integrate the v9 migration * Add api for getting allocation * Add upgrade epoch for butterfly * Tweak PreSeal struct to be infra-friendly * docsgen * More tweaking of PreSeal for genesis * review fixes * Use fake cid for test * add butterfly artifacts for oct 5 upgrade * check datacaps for v8 verifreg match v9 datacap actor * Remove print statements * Update to go-state-types master * Update to go-state-types v0.9.0-rc1 * review fixes * use go-fil-markets v1.24.0-v17 * Add accessors for allocations and claims maps * fix: missing permissions tag * butterfly * update butterfly artifacts * sealing pipeline: Prepare deal assigning logic for FIP-45 * sealing pipeline: Get allocationId with StateApi * use NoAllocationID instead of nil AllocationId * address review * Add datacap actor to registry.go * Add cli for listing allocations and removing expired allocations * Update to go-state-types master * deps: upgrade go-merkledag to 0.8.0 * shark params * Update cli/filplus.go Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * revert change to verifreg util * docsgen-cli * miss the stuff * Update FFI * Update go-state-types to v0.9.0 * Update builtin-actors to v9.0.0 * add calib upgrade epcoh * update the upgrade envvar * kill shark * Remove fvm splash banner from nv17 upgrade * check invariance for pending deals and allocations * check pending verified deal proposal migrated to allocation * Add check for unsealed CID in precommit sectors * Fix counting of allocations in nv17 migration test * make gen * pass state trees as pointers * Add assertion that migrations with & without cache are the same * compare allocation to verified deal proposal * Fix miner state precommit info * fix migration test tool * add changelog * Update to go-state-types v0.9.1 * Integrate builtin-actors v9.0.1 * chore: ver: bump version for rc3 (#9512) * Bump version to 1.18.0-rc3 * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * Update CHANGELOG.md Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> Co-authored-by: Aayush Rajasekaran <arajasek94@gmail.com> * Migration: Use autobatch bs * Fix autobatch Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai> * Invoker: Use MethodMeta from go-state-types * Add a second premigration for nv17 * Add more shed tools for migration checking * address review * Lotus release v1.18.0-rc4 * fix: ci: fix app-image build on ci (#9527) * Remove old go version first * Add GO_VERSION file * Use GO_VERSION to set / verify go version * mv GO_VERSION GO_VERSION_MIN * Use GO_VERSION_MIN in Makefile check Co-authored-by: Ian Davis <jungziege@gmail.com> * Update to latest go-state-types for migration fixes * go mod tidy * fix: use api.ErrActorNotFound instead of types.ErrActorNotFound * fix: add fields to ForkUpgradeParams * docs: update actors_version_checklist.md * chore: fix lint * update to go state type v0.9.6 with market migration fix (#9545) * update go-state-types to v-0.9.7 * Add invariant checks to migration * fix invariant check: number of entries in datacap actor should include verifreg * Invariant checks: Only include not-activated deals * test: nv17 migration * Address review * add lotus-shed invariance method * Migration cli takes a stateroot cid and a height * make gen * Update to builtin-actors v9.0.2 * Failing test that shows that notaries can remove datacap from the verifreg actor * Test that should pass when the problem is solved * make gen * Review fixes * statemanager call function will return call information even if call errors * update go-state-types * update builtin-actors * bubble up errors properly from ApplyImplicitMessage * bump to rc5 * set new upgrade heights for calibnet * set new upgrade height for butterfly * tweak calibnet upgrade schedule * clarify changelog note about calibnet * butterfly * update calibnet artifacts * Allow setting local bundles for Debug FVM for av 9+ * fix: autobatch: remove potential deadlock when a block is missing Check the _underlying_ blockstore instead of recursing. Also, drop the lock before we do that. * fix imports * build: set shark mainnet epoch (#9640) * chore: build: Lotus release v1.18.0 (#9641) * Lotus release v1.18.0 * add changelog * address review * changelog improvement Co-authored-by: Jennifer Wang <jiayingw703@gmail.com> Co-authored-by: Jiaying Wang <42981373+jennijuju@users.noreply.github.com> Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai> Co-authored-by: Łukasz Magiera <magik6k@gmail.com> Co-authored-by: Łukasz Magiera <magik6k@users.noreply.github.com> Co-authored-by: Aayush <arajasek94@gmail.com> Co-authored-by: Geoff Stuart <geoff.vball@gmail.com> Co-authored-by: Shrenuj Bansal <shrenuj.bansal@protocol.ai> Co-authored-by: simlecode <69969590+simlecode@users.noreply.github.com> Co-authored-by: Rod Vagg <rod@vagg.org> Co-authored-by: Jakub Sztandera <kubuxu@protocol.ai> Co-authored-by: Ian Davis <jungziege@gmail.com> Co-authored-by: zenground0 <ZenGround0@users.noreply.github.com> Co-authored-by: Steven Allen <steven@stebalien.com>
284 lines
8.4 KiB
Go
284 lines
8.4 KiB
Go
package blockbuilder
|
|
|
|
import (
|
|
"context"
|
|
"math"
|
|
|
|
"go.uber.org/zap"
|
|
"golang.org/x/xerrors"
|
|
|
|
"github.com/filecoin-project/go-address"
|
|
"github.com/filecoin-project/go-state-types/abi"
|
|
actorstypes "github.com/filecoin-project/go-state-types/actors"
|
|
"github.com/filecoin-project/go-state-types/network"
|
|
|
|
"github.com/filecoin-project/lotus/build"
|
|
"github.com/filecoin-project/lotus/chain/actors/adt"
|
|
"github.com/filecoin-project/lotus/chain/actors/builtin"
|
|
"github.com/filecoin-project/lotus/chain/actors/builtin/account"
|
|
"github.com/filecoin-project/lotus/chain/consensus/filcns"
|
|
lrand "github.com/filecoin-project/lotus/chain/rand"
|
|
"github.com/filecoin-project/lotus/chain/state"
|
|
"github.com/filecoin-project/lotus/chain/stmgr"
|
|
"github.com/filecoin-project/lotus/chain/types"
|
|
"github.com/filecoin-project/lotus/chain/vm"
|
|
)
|
|
|
|
const (
|
|
// 0.25 is the default, but the number below is from the network.
|
|
gasOverestimation = 1.0 / 0.808
|
|
// The number of expected blocks in a tipset. We use this to determine how much gas a tipset
|
|
// has.
|
|
// 5 per tipset, but we effectively get 4 blocks worth of messages.
|
|
expectedBlocks = 4
|
|
)
|
|
|
|
// TODO: This will produce invalid blocks but it will accurately model the amount of gas
|
|
// we're willing to use per-tipset.
|
|
// A more correct approach would be to produce 5 blocks. We can do that later.
|
|
var targetGas = build.BlockGasTarget * expectedBlocks
|
|
|
|
type BlockBuilder struct {
|
|
ctx context.Context
|
|
logger *zap.SugaredLogger
|
|
|
|
parentTs *types.TipSet
|
|
parentSt *state.StateTree
|
|
vm *vm.LegacyVM
|
|
sm *stmgr.StateManager
|
|
|
|
gasTotal int64
|
|
messages []*types.Message
|
|
}
|
|
|
|
// NewBlockBuilder constructs a new block builder from the parent state. Use this to pack a block
|
|
// with messages.
|
|
//
|
|
// NOTE: The context applies to the life of the block builder itself (but does not need to be canceled).
|
|
func NewBlockBuilder(ctx context.Context, logger *zap.SugaredLogger, sm *stmgr.StateManager, parentTs *types.TipSet) (*BlockBuilder, error) {
|
|
parentState, _, err := sm.TipSetState(ctx, parentTs)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
parentSt, err := sm.StateTree(parentState)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
bb := &BlockBuilder{
|
|
ctx: ctx,
|
|
logger: logger.With("epoch", parentTs.Height()+1),
|
|
sm: sm,
|
|
parentTs: parentTs,
|
|
parentSt: parentSt,
|
|
}
|
|
|
|
// Then we construct a LegacyVM to execute messages for gas estimation.
|
|
//
|
|
// Most parts of this LegacyVM are "real" except:
|
|
// 1. We don't charge a fee.
|
|
// 2. The runtime has "fake" proof logic.
|
|
// 3. We don't actually save any of the results.
|
|
r := lrand.NewStateRand(sm.ChainStore(), parentTs.Cids(), sm.Beacon(), sm.GetNetworkVersion)
|
|
vmopt := &vm.VMOpts{
|
|
StateBase: parentState,
|
|
Epoch: parentTs.Height() + 1,
|
|
Rand: r,
|
|
Bstore: sm.ChainStore().StateBlockstore(),
|
|
Actors: filcns.NewActorRegistry(),
|
|
Syscalls: sm.VMSys(),
|
|
CircSupplyCalc: sm.GetVMCirculatingSupply,
|
|
NetworkVersion: sm.GetNetworkVersion(ctx, parentTs.Height()+1),
|
|
BaseFee: abi.NewTokenAmount(0),
|
|
LookbackState: stmgr.LookbackStateGetterForTipset(sm, parentTs),
|
|
}
|
|
bb.vm, err = vm.NewLegacyVM(bb.ctx, vmopt)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return bb, nil
|
|
}
|
|
|
|
// PushMessages tries to push the specified message into the block.
|
|
//
|
|
// 1. All messages will be executed in-order.
|
|
// 2. Gas computation & nonce selection will be handled internally.
|
|
// 3. The base-fee is 0 so the sender does not need funds.
|
|
// 4. As usual, the sender must be an account (any account).
|
|
// 5. If the message fails to execute, this method will fail.
|
|
//
|
|
// Returns ErrOutOfGas when out of gas. Check BlockBuilder.GasRemaining and try pushing a cheaper
|
|
// message.
|
|
func (bb *BlockBuilder) PushMessage(msg *types.Message) (*types.MessageReceipt, error) {
|
|
if bb.gasTotal >= targetGas {
|
|
return nil, new(ErrOutOfGas)
|
|
}
|
|
|
|
st := bb.StateTree()
|
|
store := bb.ActorStore()
|
|
|
|
// Copy the message before we start mutating it.
|
|
msgCpy := *msg
|
|
msg = &msgCpy
|
|
|
|
actor, err := st.GetActor(msg.From)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if !builtin.IsAccountActor(actor.Code) {
|
|
return nil, xerrors.Errorf(
|
|
"messags may only be sent from account actors, got message from %s (%s)",
|
|
msg.From, builtin.ActorNameByCode(actor.Code),
|
|
)
|
|
}
|
|
msg.Nonce = actor.Nonce
|
|
if msg.From.Protocol() == address.ID {
|
|
state, err := account.Load(store, actor)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
msg.From, err = state.PubkeyAddress()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
// TODO: Our gas estimation is broken for payment channels due to horrible hacks in
|
|
// gasEstimateGasLimit.
|
|
if msg.Value == types.EmptyInt {
|
|
msg.Value = abi.NewTokenAmount(0)
|
|
}
|
|
msg.GasPremium = abi.NewTokenAmount(0)
|
|
msg.GasFeeCap = abi.NewTokenAmount(0)
|
|
msg.GasLimit = build.BlockGasTarget
|
|
|
|
// We manually snapshot so we can revert nonce changes, etc. on failure.
|
|
err = st.Snapshot(bb.ctx)
|
|
if err != nil {
|
|
return nil, xerrors.Errorf("failed to take a snapshot while estimating message gas: %w", err)
|
|
}
|
|
defer st.ClearSnapshot()
|
|
|
|
ret, err := bb.vm.ApplyMessage(bb.ctx, msg)
|
|
if err != nil {
|
|
_ = st.Revert()
|
|
return nil, err
|
|
}
|
|
if ret.ActorErr != nil {
|
|
_ = st.Revert()
|
|
return nil, ret.ActorErr
|
|
}
|
|
|
|
// Sometimes there are bugs. Let's catch them.
|
|
if ret.GasUsed == 0 {
|
|
_ = st.Revert()
|
|
return nil, xerrors.Errorf("used no gas %v -> %v", msg, ret)
|
|
}
|
|
|
|
// Update the gas limit taking overestimation into account.
|
|
msg.GasLimit = int64(math.Ceil(float64(ret.GasUsed) * gasOverestimation))
|
|
|
|
// Did we go over? Yes, revert.
|
|
newTotal := bb.gasTotal + msg.GasLimit
|
|
if newTotal > targetGas {
|
|
_ = st.Revert()
|
|
return nil, &ErrOutOfGas{Available: targetGas - bb.gasTotal, Required: msg.GasLimit}
|
|
}
|
|
bb.gasTotal = newTotal
|
|
|
|
bb.messages = append(bb.messages, msg)
|
|
return &ret.MessageReceipt, nil
|
|
}
|
|
|
|
// ActorStore returns the LegacyVM's current (pending) blockstore.
|
|
func (bb *BlockBuilder) ActorStore() adt.Store {
|
|
return bb.vm.ActorStore(bb.ctx)
|
|
}
|
|
|
|
// StateTree returns the LegacyVM's current (pending) state-tree. This includes any changes made by
|
|
// successfully pushed messages.
|
|
//
|
|
// You probably want ParentStateTree
|
|
func (bb *BlockBuilder) StateTree() *state.StateTree {
|
|
return bb.vm.StateTree().(*state.StateTree)
|
|
}
|
|
|
|
// ParentStateTree returns the parent state-tree (not the paren't tipset's parent state-tree).
|
|
func (bb *BlockBuilder) ParentStateTree() *state.StateTree {
|
|
return bb.parentSt
|
|
}
|
|
|
|
// StateTreeByHeight will return a state-tree up through and including the current in-progress
|
|
// epoch.
|
|
//
|
|
// NOTE: This will return the state after the given epoch, not the parent state for the epoch.
|
|
func (bb *BlockBuilder) StateTreeByHeight(epoch abi.ChainEpoch) (*state.StateTree, error) {
|
|
now := bb.Height()
|
|
if epoch > now {
|
|
return nil, xerrors.Errorf(
|
|
"cannot load state-tree from future: %d > %d", epoch, bb.Height(),
|
|
)
|
|
} else if epoch <= 0 {
|
|
return nil, xerrors.Errorf(
|
|
"cannot load state-tree: epoch %d <= 0", epoch,
|
|
)
|
|
}
|
|
|
|
// Manually handle "now" and "previous".
|
|
switch epoch {
|
|
case now:
|
|
return bb.StateTree(), nil
|
|
case now - 1:
|
|
return bb.ParentStateTree(), nil
|
|
}
|
|
|
|
// Get the tipset of the block _after_ the target epoch so we can use its parent state.
|
|
targetTs, err := bb.sm.ChainStore().GetTipsetByHeight(bb.ctx, epoch+1, bb.parentTs, false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return bb.sm.StateTree(targetTs.ParentState())
|
|
}
|
|
|
|
// Messages returns all messages currently packed into the next block.
|
|
// 1. DO NOT modify the slice, copy it.
|
|
// 2. DO NOT retain the slice, copy it.
|
|
func (bb *BlockBuilder) Messages() []*types.Message {
|
|
return bb.messages
|
|
}
|
|
|
|
// GasRemaining returns the amount of remaining gas in the next block.
|
|
func (bb *BlockBuilder) GasRemaining() int64 {
|
|
return targetGas - bb.gasTotal
|
|
}
|
|
|
|
// ParentTipSet returns the parent tipset.
|
|
func (bb *BlockBuilder) ParentTipSet() *types.TipSet {
|
|
return bb.parentTs
|
|
}
|
|
|
|
// Height returns the epoch for the target block.
|
|
func (bb *BlockBuilder) Height() abi.ChainEpoch {
|
|
return bb.parentTs.Height() + 1
|
|
}
|
|
|
|
// NetworkVersion returns the network version for the target block.
|
|
func (bb *BlockBuilder) NetworkVersion() network.Version {
|
|
return bb.sm.GetNetworkVersion(bb.ctx, bb.Height())
|
|
}
|
|
|
|
// StateManager returns the stmgr.StateManager.
|
|
func (bb *BlockBuilder) StateManager() *stmgr.StateManager {
|
|
return bb.sm
|
|
}
|
|
|
|
// ActorsVersion returns the actors version for the target block.
|
|
func (bb *BlockBuilder) ActorsVersion() (actorstypes.Version, error) {
|
|
return actorstypes.VersionForNetwork(bb.NetworkVersion())
|
|
}
|
|
|
|
func (bb *BlockBuilder) L() *zap.SugaredLogger {
|
|
return bb.logger
|
|
}
|