working

chain/gen/genesis/genesis.go

@@ -8,8 +8,10 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/abi"
 	"github.com/filecoin-project/specs-actors/actors/builtin"
 	"github.com/filecoin-project/specs-actors/actors/builtin/account"
+	"github.com/filecoin-project/specs-actors/actors/builtin/multisig"
 	"github.com/filecoin-project/specs-actors/actors/builtin/verifreg"
 	"github.com/filecoin-project/specs-actors/actors/runtime"
+	"github.com/filecoin-project/specs-actors/actors/util/adt"
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
 	bstore "github.com/ipfs/go-ipfs-blockstore"
@@ -195,8 +197,8 @@ func MakeInitialStateTree(ctx context.Context, bs bstore.Blockstore, template ge
 
 	// Create accounts
 	for id, info := range template.Accounts {
-		if info.Type != genesis.TAccount {
-			return nil, xerrors.New("unsupported account type") // TODO: msigs
+		if info.Type != genesis.TAccount && info.Type != genesis.TMultisig {
+			return nil, xerrors.New("unsupported account type")
 		}
 
 		ida, err := address.NewIDAddress(uint64(AccountStart + id))
@@ -204,24 +206,57 @@ func MakeInitialStateTree(ctx context.Context, bs bstore.Blockstore, template ge
 			return nil, err
 		}
 
-		var ainfo genesis.AccountMeta
-		if err := json.Unmarshal(info.Meta, &ainfo); err != nil {
-			return nil, xerrors.Errorf("unmarshaling account meta: %w", err)
+		// var newAddress address.Address
+
+		if (info.Type == genesis.TAccount) {
+			var ainfo genesis.AccountMeta
+			if err := json.Unmarshal(info.Meta, &ainfo); err != nil {
+				return nil, xerrors.Errorf("unmarshaling account meta: %w", err)
+			}
+			st, err := cst.Put(ctx, &account.State{Address: ainfo.Owner})
+			if err != nil {
+				return nil, err
+			}
+			err = state.SetActor(ida, &types.Actor{
+				Code:    builtin.AccountActorCodeID,
+				Balance: info.Balance,
+				Head:    st,
+			})
+			if err != nil {
+				return nil, xerrors.Errorf("setting account from actmap: %w", err)
+			}
+		} else if (info.Type == genesis.TMultisig) {
+			var ainfo genesis.MultisigMeta
+			if err := json.Unmarshal(info.Meta, &ainfo); err != nil {
+				return nil, xerrors.Errorf("unmarshaling account meta: %w", err)
+			}
+
+			pending, err := adt.MakeEmptyMap(adt.WrapStore(ctx, cst)).Root()
+			if err != nil {
+				return nil, xerrors.Errorf("failed to create empty map: %v", err)
+			}
+
+			st, err := cst.Put(ctx, &multisig.State{
+				Signers: ainfo.Signers,
+				NumApprovalsThreshold: uint64(ainfo.Threshold),
+				StartEpoch: abi.ChainEpoch(ainfo.VestingStart),
+				UnlockDuration: abi.ChainEpoch(ainfo.VestingDuration),
+				PendingTxns: pending,
+				InitialBalance: info.Balance,
+			})
+			if err != nil {
+				return nil, err
+			}
+			err = state.SetActor(ida, &types.Actor{
+				Code:    builtin.MultisigActorCodeID,
+				Balance: info.Balance,
+				Head:    st,
+			})
+			if err != nil {
+				return nil, xerrors.Errorf("setting account from actmap: %w", err)
+			}
 		}
 
-		st, err := cst.Put(ctx, &account.State{Address: ainfo.Owner})
-		if err != nil {
-			return nil, err
-		}
-
-		err = state.SetActor(ida, &types.Actor{
-			Code:    builtin.AccountActorCodeID,
-			Balance: info.Balance,
-			Head:    st,
-		})
-		if err != nil {
-			return nil, xerrors.Errorf("setting account from actmap: %w", err)
-		}
 	}
 
 	vregroot, err := address.NewIDAddress(80)

chain/gen/genesis/t01_init.go

@@ -30,6 +30,10 @@ func SetupInitActor(bs bstore.Blockstore, netname string, initialActors []genesi
 	amap := hamt.NewNode(cst, hamt.UseTreeBitWidth(5)) // TODO: use spec adt map
 
 	for i, a := range initialActors {
+		if a.Type == genesis.TMultisig {
+			continue
+		}
+
 		if a.Type != genesis.TAccount {
 			return nil, xerrors.Errorf("unsupported account type: %s", a.Type) // TODO: Support msig (skip here)
 		}

go.mod

@@ -129,3 +129,5 @@ require (
 replace github.com/golangci/golangci-lint => github.com/golangci/golangci-lint v1.18.0
 
 replace github.com/filecoin-project/filecoin-ffi => ./extern/filecoin-ffi
+
+replace github.com/filecoin-project/specs-actors => /home/sami/specs-actors