Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/replace actors #4632

Merged
merged 3 commits into from
Dec 21, 2021
Merged

Feat/replace actors #4632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1c68c8
use actors from shared
simlecode Dec 20, 2021
aca27d3
update shared go.mod
simlecode Dec 20, 2021
fedc58e
fix build
simlecode Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion app/client/apiface/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/filecoin-project/venus/app/submodule/apitypes"
"github.com/filecoin-project/venus/pkg/chain"
"github.com/filecoin-project/venus/pkg/types"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin/miner"
"github.com/filecoin-project/venus/venus-shared/actors/builtin/miner"

"github.com/filecoin-project/go-state-types/big"
acrypto "github.com/filecoin-project/go-state-types/crypto"
Expand Down
2 changes: 1 addition & 1 deletion app/client/apiface/v0api/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/filecoin-project/venus/app/submodule/apitypes"
"github.com/filecoin-project/venus/pkg/chain"
"github.com/filecoin-project/venus/pkg/types"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin/miner"
"github.com/filecoin-project/venus/venus-shared/actors/builtin/miner"

"github.com/filecoin-project/go-state-types/big"
acrypto "github.com/filecoin-project/go-state-types/crypto"
Expand Down
2 changes: 1 addition & 1 deletion app/client/full.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/client/v0api/full.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions app/node/builder_opts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
package node

import (
"time"

"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/big"
"github.com/filecoin-project/venus/pkg/clock"
"github.com/filecoin-project/venus/pkg/config"
"github.com/filecoin-project/venus/pkg/constants"
"github.com/filecoin-project/venus/pkg/journal"
"github.com/filecoin-project/venus/pkg/types/specactors/policy"
"github.com/filecoin-project/venus/pkg/util/ffiwrapper"
"github.com/filecoin-project/venus/venus-shared/actors/policy"
"github.com/libp2p/go-libp2p"
"time"
)

// BuilderOpt is an option for building a filecoin node.
Expand Down
2 changes: 1 addition & 1 deletion app/node/test/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/filecoin-project/venus/build/project"
"github.com/filecoin-project/venus/pkg/clock"
"github.com/filecoin-project/venus/pkg/constants"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin"
gengen "github.com/filecoin-project/venus/tools/gengen/util"
"github.com/filecoin-project/venus/venus-shared/actors/builtin"
)

const blockTime = builtin.EpochDurationSeconds * time.Second
Expand Down
4 changes: 2 additions & 2 deletions app/submodule/apitypes/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/filecoin-project/venus/pkg/chain"
"github.com/filecoin-project/venus/pkg/types"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin/market"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin/power"
"github.com/filecoin-project/venus/venus-shared/actors/builtin/market"
"github.com/filecoin-project/venus/venus-shared/actors/builtin/power"
)

type Partition struct {
Expand Down
2 changes: 1 addition & 1 deletion app/submodule/apitypes/mining.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"github.com/filecoin-project/go-state-types/abi"
proof2 "github.com/filecoin-project/specs-actors/v2/actors/runtime/proof"
"github.com/filecoin-project/venus/pkg/types"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin"
"github.com/filecoin-project/venus/venus-shared/actors/builtin"
)

type MiningBaseInfo struct { //nolint
Expand Down
26 changes: 14 additions & 12 deletions app/submodule/chain/miner_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ package chain

import (
"context"

"github.com/filecoin-project/venus/app/client/apiface"
"github.com/filecoin-project/venus/pkg/types/specactors/policy"
"github.com/filecoin-project/venus/venus-shared/actors/policy"

"github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-bitfield"
Expand All @@ -16,11 +17,12 @@ import (
"github.com/filecoin-project/venus/pkg/chain"
"github.com/filecoin-project/venus/pkg/state/tree"
"github.com/filecoin-project/venus/pkg/types"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin/market"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin/miner"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin/power"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin/reward"
"github.com/filecoin-project/venus/venus-shared/actors/builtin"
"github.com/filecoin-project/venus/venus-shared/actors/builtin/market"
"github.com/filecoin-project/venus/venus-shared/actors/builtin/miner"
"github.com/filecoin-project/venus/venus-shared/actors/builtin/power"
"github.com/filecoin-project/venus/venus-shared/actors/builtin/reward"
types2 "github.com/filecoin-project/venus/venus-shared/chain"
)

var _ apiface.IMinerState = &minerStateAPI{}
Expand Down Expand Up @@ -357,7 +359,7 @@ func (msa *minerStateAPI) StateMinerPreCommitDepositForPower(ctx context.Context
var sectorWeight abi.StoragePower
if act, found, err := sTree.GetActor(ctx, market.Address); err != nil || !found {
return big.Int{}, xerrors.Errorf("loading market actor %s: %v", maddr, err)
} else if s, err := market.Load(store, act); err != nil {
} else if s, err := market.Load(store, (*types2.Actor)(act)); err != nil {
return big.Int{}, xerrors.Errorf("loading market actor state %s: %v", maddr, err)
} else if w, vw, err := s.VerifyDealsForActivation(maddr, pci.DealIDs, ts.Height(), pci.Expiration); err != nil {
return big.Int{}, xerrors.Errorf("verifying deals for activation: %v", err)
Expand All @@ -370,7 +372,7 @@ func (msa *minerStateAPI) StateMinerPreCommitDepositForPower(ctx context.Context
var powerSmoothed builtin.FilterEstimate
if act, found, err := sTree.GetActor(ctx, power.Address); err != nil || !found {
return big.Int{}, xerrors.Errorf("loading power actor: %v", err)
} else if s, err := power.Load(store, act); err != nil {
} else if s, err := power.Load(store, (*types2.Actor)(act)); err != nil {
return big.Int{}, xerrors.Errorf("loading power actor state: %v", err)
} else if p, err := s.TotalPowerSmoothed(); err != nil {
return big.Int{}, xerrors.Errorf("failed to determine total power: %v", err)
Expand All @@ -383,7 +385,7 @@ func (msa *minerStateAPI) StateMinerPreCommitDepositForPower(ctx context.Context
return big.Int{}, xerrors.Errorf("loading miner actor: %v", err)
}

rewardState, err := reward.Load(store, rewardActor)
rewardState, err := reward.Load(store, (*types2.Actor)(rewardActor))
if err != nil {
return big.Int{}, xerrors.Errorf("loading reward actor state: %v", err)
}
Expand Down Expand Up @@ -417,7 +419,7 @@ func (msa *minerStateAPI) StateMinerInitialPledgeCollateral(ctx context.Context,
var sectorWeight abi.StoragePower
if act, found, err := state.GetActor(ctx, market.Address); err != nil || !found {
return big.Int{}, xerrors.Errorf("loading miner actor %s: %v", maddr, err)
} else if s, err := market.Load(store, act); err != nil {
} else if s, err := market.Load(store, (*types2.Actor)(act)); err != nil {
return big.Int{}, xerrors.Errorf("loading market actor state %s: %v", maddr, err)
} else if w, vw, err := s.VerifyDealsForActivation(maddr, pci.DealIDs, ts.Height(), pci.Expiration); err != nil {
return big.Int{}, xerrors.Errorf("verifying deals for activation: %v", err)
Expand All @@ -433,7 +435,7 @@ func (msa *minerStateAPI) StateMinerInitialPledgeCollateral(ctx context.Context,
)
if act, found, err := state.GetActor(ctx, power.Address); err != nil || !found {
return big.Int{}, xerrors.Errorf("loading miner actor: %v", err)
} else if s, err := power.Load(store, act); err != nil {
} else if s, err := power.Load(store, (*types2.Actor)(act)); err != nil {
return big.Int{}, xerrors.Errorf("loading power actor state: %v", err)
} else if p, err := s.TotalPowerSmoothed(); err != nil {
return big.Int{}, xerrors.Errorf("failed to determine total power: %v", err)
Expand All @@ -449,7 +451,7 @@ func (msa *minerStateAPI) StateMinerInitialPledgeCollateral(ctx context.Context,
return big.Int{}, xerrors.Errorf("loading miner actor: %v", err)
}

rewardState, err := reward.Load(store, rewardActor)
rewardState, err := reward.Load(store, (*types2.Actor)(rewardActor))
if err != nil {
return big.Int{}, xerrors.Errorf("loading reward actor state: %v", err)
}
Expand Down
8 changes: 5 additions & 3 deletions app/submodule/mining/mining_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package mining
import (
"bytes"
"context"
"os"

"github.com/filecoin-project/venus/app/client/apiface"
cbor "github.com/ipfs/go-ipld-cbor"
"os"

"github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/abi"
Expand All @@ -22,8 +23,9 @@ import (
"github.com/filecoin-project/venus/pkg/crypto"
"github.com/filecoin-project/venus/pkg/state"
"github.com/filecoin-project/venus/pkg/types"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin/miner"
"github.com/filecoin-project/venus/pkg/wallet"
"github.com/filecoin-project/venus/venus-shared/actors/builtin/miner"
types2 "github.com/filecoin-project/venus/venus-shared/chain"
)

var _ apiface.IMining = &MiningAPI{}
Expand Down Expand Up @@ -82,7 +84,7 @@ func (miningAPI *MiningAPI) MinerGetBaseInfo(ctx context.Context, maddr address.
if err != nil {
return nil, xerrors.Errorf("failed to load miner actor: %v", err)
}
mas, err := miner.Load(chainStore.Store(ctx), act)
mas, err := miner.Load(chainStore.Store(ctx), (*types2.Actor)(act))
if err != nil {
return nil, xerrors.Errorf("failed to load miner actor state: %v", err)
}
Expand Down
28 changes: 15 additions & 13 deletions app/submodule/multisig/multisig_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package multisig

import (
"context"

"github.com/filecoin-project/venus/app/client/apiface"

"github.com/filecoin-project/go-address"
Expand All @@ -12,8 +13,9 @@ import (

"github.com/filecoin-project/venus/app/submodule/apitypes"
"github.com/filecoin-project/venus/pkg/types"
"github.com/filecoin-project/venus/pkg/types/specactors"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin/multisig"
"github.com/filecoin-project/venus/venus-shared/actors"
"github.com/filecoin-project/venus/venus-shared/actors/builtin/multisig"
types2 "github.com/filecoin-project/venus/venus-shared/chain"
)

var _ apiface.IMultiSig = &multiSig{}
Expand All @@ -40,7 +42,7 @@ func (a *multiSig) messageBuilder(ctx context.Context, from address.Address) (mu
if err != nil {
return nil, err
}
aver, err := specactors.VersionForNetwork(nver)
aver, err := actors.VersionForNetwork(nver)
if err != nil {
return nil, err
}
Expand All @@ -63,7 +65,7 @@ func (a *multiSig) MsigCreate(ctx context.Context, req uint64, addrs []address.A
}

return &apitypes.MessagePrototype{
Message: *msg,
Message: types.UnsignedMessage(*msg),
ValidNonce: false,
}, nil
}
Expand All @@ -81,7 +83,7 @@ func (a *multiSig) MsigPropose(ctx context.Context, msig address.Address, to add
}

return &apitypes.MessagePrototype{
Message: *msg,
Message: types.UnsignedMessage(*msg),
ValidNonce: false,
}, nil
}
Expand Down Expand Up @@ -212,7 +214,7 @@ func (a *multiSig) MsigGetVested(ctx context.Context, addr address.Address, star
return types.EmptyInt, xerrors.Errorf("failed to load multisig actor at end epoch: %w", err)
}

msas, err := multisig.Load(a.store.Store(ctx), act)
msas, err := multisig.Load(a.store.Store(ctx), (*types2.Actor)(act))
if err != nil {
return types.EmptyInt, xerrors.Errorf("failed to load multisig actor state: %w", err)
}
Expand Down Expand Up @@ -244,7 +246,7 @@ func (a *multiSig) msigApproveOrCancelSimple(ctx context.Context, operation Msig
return nil, err
}

var msg *types.Message
var msg *types2.Message
switch operation {
case MsigApprove:
msg, err = mb.Approve(msig, txID, nil)
Expand All @@ -257,7 +259,7 @@ func (a *multiSig) msigApproveOrCancelSimple(ctx context.Context, operation Msig
return nil, err
}

return &apitypes.MessagePrototype{Message: *msg, ValidNonce: false}, nil
return &apitypes.MessagePrototype{Message: types.UnsignedMessage(*msg), ValidNonce: false}, nil
}

func (a *multiSig) msigApproveOrCancelTxnHash(ctx context.Context, operation MsigProposeResponse, msig address.Address, txID uint64, proposer address.Address, to address.Address, amt types.BigInt, src address.Address, method uint64, params []byte) (*apitypes.MessagePrototype, error) {
Expand Down Expand Up @@ -290,7 +292,7 @@ func (a *multiSig) msigApproveOrCancelTxnHash(ctx context.Context, operation Msi
return nil, err
}

var msg *types.Message
var msg *types2.Message
switch operation {
case MsigApprove:
msg, err = mb.Approve(msig, txID, &p)
Expand All @@ -304,13 +306,13 @@ func (a *multiSig) msigApproveOrCancelTxnHash(ctx context.Context, operation Msi
}

return &apitypes.MessagePrototype{
Message: *msg,
Message: types.UnsignedMessage(*msg),
ValidNonce: false,
}, nil
}

func serializeAddParams(new address.Address, inc bool) ([]byte, error) {
enc, actErr := specactors.SerializeParams(&multisig2.AddSignerParams{
enc, actErr := actors.SerializeParams(&multisig2.AddSignerParams{
Signer: new,
Increase: inc,
})
Expand All @@ -322,7 +324,7 @@ func serializeAddParams(new address.Address, inc bool) ([]byte, error) {
}

func serializeSwapParams(old address.Address, new address.Address) ([]byte, error) {
enc, actErr := specactors.SerializeParams(&multisig2.SwapSignerParams{
enc, actErr := actors.SerializeParams(&multisig2.SwapSignerParams{
From: old,
To: new,
})
Expand All @@ -334,7 +336,7 @@ func serializeSwapParams(old address.Address, new address.Address) ([]byte, erro
}

func serializeRemoveParams(rem address.Address, dec bool) ([]byte, error) {
enc, actErr := specactors.SerializeParams(&multisig2.RemoveSignerParams{
enc, actErr := actors.SerializeParams(&multisig2.RemoveSignerParams{
Signer: rem,
Decrease: dec,
})
Expand Down
9 changes: 5 additions & 4 deletions cmd/dispute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ import (
"bytes"
"context"
"fmt"
"github.com/filecoin-project/venus/app/client/apiface"
"strconv"
"time"

"github.com/filecoin-project/venus/app/client/apiface"
"github.com/filecoin-project/venus/venus-shared/actors"

builtin3 "github.com/filecoin-project/specs-actors/v3/actors/builtin"
miner3 "github.com/filecoin-project/specs-actors/v3/actors/builtin/miner"

Expand All @@ -22,7 +24,6 @@ import (
"github.com/filecoin-project/venus/app/node"
chainpkg "github.com/filecoin-project/venus/pkg/chain"
"github.com/filecoin-project/venus/pkg/types"
"github.com/filecoin-project/venus/pkg/types/specactors"
)

var disputeLog = logging.Logger("disputer")
Expand Down Expand Up @@ -85,7 +86,7 @@ var disputerMsgCmd = &cmds.Command{
return err
}

dpp, aerr := specactors.SerializeParams(&miner3.DisputeWindowedPoStParams{
dpp, aerr := actors.SerializeParams(&miner3.DisputeWindowedPoStParams{
Deadline: deadline,
PoStIndex: postIndex,
})
Expand Down Expand Up @@ -352,7 +353,7 @@ func makeDisputeWindowedPosts(ctx context.Context, api apiface.ISyncer, dl miner

for i := uint64(0); i < postsSnapshotted; i++ {

dpp, aerr := specactors.SerializeParams(&miner3.DisputeWindowedPoStParams{
dpp, aerr := actors.SerializeParams(&miner3.DisputeWindowedPoStParams{
Deadline: dl.index,
PoStIndex: i,
})
Expand Down
2 changes: 1 addition & 1 deletion cmd/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"github.com/filecoin-project/venus/app/node"
"github.com/filecoin-project/venus/pkg/chain"
"github.com/filecoin-project/venus/pkg/types"
"github.com/filecoin-project/venus/pkg/types/specactors/builtin"
"github.com/filecoin-project/venus/pkg/vm"
"github.com/filecoin-project/venus/venus-shared/actors/builtin"
)

// MessageSendResult is the return type for message send command
Expand Down
Loading