fix: make compatible actor

filecoin-project · Jul 21, 2022 · 7308f16 · 7308f16
1 parent bd8be91
commit 7308f16
Show file tree

Hide file tree

Showing 19 changed files with 392 additions and 601 deletions.
diff --git a/pkg/gen/genesis/f00_system.go b/pkg/gen/genesis/f00_system.go
@@ -10,8 +10,6 @@ import (
 
 	"github.com/filecoin-project/go-state-types/manifest"
 
-	"github.com/filecoin-project/venus/venus-shared/actors/builtin"
-
 	"github.com/filecoin-project/venus/venus-shared/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin/system"
@@ -53,9 +51,9 @@ func SetupSystemActor(ctx context.Context, bs bstore.Blockstore, av actors.Versi
 		return nil, err
 	}
 
-	actcid, err := builtin.GetSystemActorCodeID(av)
-	if err != nil {
-		return nil, err
+	actcid, found := actors.GetActorCodeID(av, actors.SystemKey)
+	if !found {
+		return nil, fmt.Errorf("failed to get system actor code ID for actors version %d", av)
 	}
 
 	act := &types.Actor{

diff --git a/pkg/gen/genesis/f01_init.go b/pkg/gen/genesis/f01_init.go
@@ -11,7 +11,6 @@ import (
 	"github.com/filecoin-project/go-state-types/big"
 
 	"github.com/filecoin-project/specs-actors/actors/util/adt"
-	"github.com/filecoin-project/venus/venus-shared/actors/builtin"
 
 	cbor "github.com/ipfs/go-ipld-cbor"
 	cbg "github.com/whyrusleeping/cbor-gen"
@@ -174,9 +173,9 @@ func SetupInitActor(ctx context.Context, bs bstore.Blockstore, netname string, i
 		return 0, nil, nil, err
 	}
 
-	actcid, err := builtin.GetInitActorCodeID(av)
-	if err != nil {
-		return 0, nil, nil, err
+	actcid, found := actors.GetActorCodeID(av, actors.InitKey)
+	if !found {
+		return 0, nil, nil, fmt.Errorf("failed to get init actor code ID for actors version %d", av)
 	}
 
 	act := &types.Actor{

diff --git a/pkg/gen/genesis/f02_reward.go b/pkg/gen/genesis/f02_reward.go
@@ -2,11 +2,11 @@ package genesis
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/venus/pkg/constants"
 	"github.com/filecoin-project/venus/venus-shared/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
-	"github.com/filecoin-project/venus/venus-shared/actors/builtin"
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin/reward"
 	"github.com/filecoin-project/venus/venus-shared/types"
 
@@ -29,9 +29,9 @@ func SetupRewardActor(ctx context.Context, bs bstore.Blockstore, qaPower big.Int
 		return nil, err
 	}
 
-	actcid, err := builtin.GetRewardActorCodeID(av)
-	if err != nil {
-		return nil, err
+	actcid, found := actors.GetActorCodeID(av, actors.RewardKey)
+	if !found {
+		return nil, fmt.Errorf("failed to get reward actor code ID for actors version %d", av)
 	}
 
 	act := &types.Actor{

diff --git a/pkg/gen/genesis/f03_cron.go b/pkg/gen/genesis/f03_cron.go
@@ -2,13 +2,13 @@ package genesis
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-state-types/big"
 	cbor "github.com/ipfs/go-ipld-cbor"
 
 	"github.com/filecoin-project/venus/venus-shared/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
-	"github.com/filecoin-project/venus/venus-shared/actors/builtin"
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin/cron"
 
 	bstore "github.com/filecoin-project/venus/pkg/util/blockstoreutil"
@@ -27,9 +27,9 @@ func SetupCronActor(ctx context.Context, bs bstore.Blockstore, av actors.Version
 		return nil, err
 	}
 
-	actcid, err := builtin.GetCronActorCodeID(av)
-	if err != nil {
-		return nil, err
+	actcid, found := actors.GetActorCodeID(av, actors.CronKey)
+	if !found {
+		return nil, fmt.Errorf("failed to get cron actor code ID for actors version %d", av)
 	}
 
 	act := &types.Actor{

diff --git a/pkg/gen/genesis/f04_power.go b/pkg/gen/genesis/f04_power.go
@@ -2,13 +2,13 @@ package genesis
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/venus/venus-shared/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin/power"
 
 	"github.com/filecoin-project/go-state-types/big"
 	"github.com/filecoin-project/specs-actors/actors/util/adt"
-	"github.com/filecoin-project/venus/venus-shared/actors/builtin"
 
 	cbor "github.com/ipfs/go-ipld-cbor"
 
@@ -29,9 +29,9 @@ func SetupStoragePowerActor(ctx context.Context, bs bstore.Blockstore, av actors
 		return nil, err
 	}
 
-	actcid, err := builtin.GetPowerActorCodeID(av)
-	if err != nil {
-		return nil, err
+	actcid, found := actors.GetActorCodeID(av, actors.PowerKey)
+	if !found {
+		return nil, fmt.Errorf("failed to get power actor code ID for actors version %d", av)
 	}
 
 	act := &types.Actor{

diff --git a/pkg/gen/genesis/f05_market.go b/pkg/gen/genesis/f05_market.go
@@ -2,13 +2,13 @@ package genesis
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/go-state-types/big"
 	cbor "github.com/ipfs/go-ipld-cbor"
 
 	"github.com/filecoin-project/venus/venus-shared/actors"
 	"github.com/filecoin-project/venus/venus-shared/actors/adt"
-	"github.com/filecoin-project/venus/venus-shared/actors/builtin"
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin/market"
 
 	bstore "github.com/filecoin-project/venus/pkg/util/blockstoreutil"
@@ -27,9 +27,9 @@ func SetupStorageMarketActor(ctx context.Context, bs bstore.Blockstore, av actor
 		return nil, err
 	}
 
-	actcid, err := builtin.GetMarketActorCodeID(av)
-	if err != nil {
-		return nil, err
+	actcid, found := actors.GetActorCodeID(av, actors.MarketKey)
+	if !found {
+		return nil, fmt.Errorf("failed to get market actor code ID for actors version %d", av)
 	}
 
 	act := &types.Actor{

diff --git a/pkg/gen/genesis/f06_vreg.go b/pkg/gen/genesis/f06_vreg.go
@@ -2,9 +2,9 @@ package genesis
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/filecoin-project/venus/venus-shared/actors"
-	"github.com/filecoin-project/venus/venus-shared/actors/builtin"
 	"github.com/filecoin-project/venus/venus-shared/actors/builtin/verifreg"
 
 	"github.com/filecoin-project/go-address"
@@ -42,9 +42,9 @@ func SetupVerifiedRegistryActor(ctx context.Context, bs bstore.Blockstore, av ac
 		return nil, err
 	}
 
-	actcid, err := builtin.GetVerifregActorCodeID(av)
-	if err != nil {
-		return nil, err
+	actcid, found := actors.GetActorCodeID(av, actors.VerifregKey)
+	if !found {
+		return nil, fmt.Errorf("failed to get verifreg actor code ID for actors version %d", av)
 	}
 
 	act := &types.Actor{

diff --git a/pkg/gen/genesis/genesis.go b/pkg/gen/genesis/genesis.go
@@ -385,9 +385,9 @@ func makeAccountActor(ctx context.Context, cst cbor.IpldStore, av actors.Version
 		return nil, err
 	}
 
-	actcid, err := builtin.GetAccountActorCodeID(av)
-	if err != nil {
-		return nil, err
+	actcid, found := actors.GetActorCodeID(av, actors.AccountKey)
+	if !found {
+		return nil, fmt.Errorf("failed to get account actor code ID for actors version %d", av)
 	}
 
 	act := &types.Actor{
@@ -467,9 +467,9 @@ func createMultisigAccount(ctx context.Context, cst cbor.IpldStore, state *tree.
 		return err
 	}
 
-	actcid, err := builtin.GetMultisigActorCodeID(av)
-	if err != nil {
-		return err
+	actcid, found := actors.GetActorCodeID(av, actors.MultisigKey)
+	if !found {
+		return fmt.Errorf("failed to get multisig actor code ID for actors version %d", av)
 	}
 
 	err = state.SetActor(ctx, ida, &types.Actor{

diff --git a/pkg/vm/vmcontext/invocation_context.go b/pkg/vm/vmcontext/invocation_context.go
@@ -327,9 +327,9 @@ func (ctx *invocationContext) resolveTarget(target address.Address) (*types.Acto
 		if err != nil {
 			panic(err)
 		}
-		actorCode, err := builtin.GetAccountActorCodeID(ver)
-		if err != nil {
-			panic(err)
+		actorCode, found := actors.GetActorCodeID(ver, actors.AccountKey)
+		if !found {
+			panic(fmt.Errorf("failed to get account actor code ID for actors version %d", ver))
 		}
 		ctx.CreateActor(actorCode, targetIDAddr)