Merge pull request #4904 from filecoin-project/asr/genesis-remainder

Setup remainder msig signers when parsing genesis template
filecoin-project · Nov 24, 2020 · f850d77 · f850d77
2 parents 7c83110 + adee4b2
commit f850d77
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/chain/gen/genesis/f01_init.go b/chain/gen/genesis/f01_init.go
@@ -21,7 +21,7 @@ import (
 	bstore "github.com/filecoin-project/lotus/lib/blockstore"
 )
 
-func SetupInitActor(bs bstore.Blockstore, netname string, initialActors []genesis.Actor, rootVerifier genesis.Actor) (int64, *types.Actor, map[address.Address]address.Address, error) {
+func SetupInitActor(bs bstore.Blockstore, netname string, initialActors []genesis.Actor, rootVerifier genesis.Actor, remainder genesis.Actor) (int64, *types.Actor, map[address.Address]address.Address, error) {
 	if len(initialActors) > MaxAccounts {
 		return 0, nil, nil, xerrors.New("too many initial actors")
 	}
@@ -90,19 +90,10 @@ func SetupInitActor(bs bstore.Blockstore, netname string, initialActors []genesi
 		}
 	}
 
-	if rootVerifier.Type == genesis.TAccount {
-		var ainfo genesis.AccountMeta
-		if err := json.Unmarshal(rootVerifier.Meta, &ainfo); err != nil {
-			return 0, nil, nil, xerrors.Errorf("unmarshaling account meta: %w", err)
-		}
-		value := cbg.CborInt(80)
-		if err := amap.Put(abi.AddrKey(ainfo.Owner), &value); err != nil {
-			return 0, nil, nil, err
-		}
-	} else if rootVerifier.Type == genesis.TMultisig {
+	setupMsig := func(meta json.RawMessage) error {
 		var ainfo genesis.MultisigMeta
-		if err := json.Unmarshal(rootVerifier.Meta, &ainfo); err != nil {
-			return 0, nil, nil, xerrors.Errorf("unmarshaling account meta: %w", err)
+		if err := json.Unmarshal(meta, &ainfo); err != nil {
+			return xerrors.Errorf("unmarshaling account meta: %w", err)
 		}
 		for _, e := range ainfo.Signers {
 			if _, ok := keyToId[e]; ok {
@@ -112,16 +103,39 @@ func SetupInitActor(bs bstore.Blockstore, netname string, initialActors []genesi
 
 			value := cbg.CborInt(counter)
 			if err := amap.Put(abi.AddrKey(e), &value); err != nil {
-				return 0, nil, nil, err
+				return err
 			}
 			counter = counter + 1
 			var err error
 			keyToId[e], err = address.NewIDAddress(uint64(value))
 			if err != nil {
-				return 0, nil, nil, err
+				return err
 			}
 
 		}
+
+		return nil
+	}
+
+	if rootVerifier.Type == genesis.TAccount {
+		var ainfo genesis.AccountMeta
+		if err := json.Unmarshal(rootVerifier.Meta, &ainfo); err != nil {
+			return 0, nil, nil, xerrors.Errorf("unmarshaling account meta: %w", err)
+		}
+		value := cbg.CborInt(80)
+		if err := amap.Put(abi.AddrKey(ainfo.Owner), &value); err != nil {
+			return 0, nil, nil, err
+		}
+	} else if rootVerifier.Type == genesis.TMultisig {
+		err := setupMsig(rootVerifier.Meta)
+		if err != nil {
+			return 0, nil, nil, xerrors.Errorf("setting up root verifier msig: %w", err)
+		}
+	}
+
+	err := setupMsig(remainder.Meta)
+	if err != nil {
+		return 0, nil, nil, xerrors.Errorf("setting up remainder msig: %w", err)
 	}
 
 	amapaddr, err := amap.Root()

diff --git a/chain/gen/genesis/genesis.go b/chain/gen/genesis/genesis.go
@@ -134,7 +134,7 @@ func MakeInitialStateTree(ctx context.Context, bs bstore.Blockstore, template ge
 
 	// Create init actor
 
-	idStart, initact, keyIDs, err := SetupInitActor(bs, template.NetworkName, template.Accounts, template.VerifregRootKey)
+	idStart, initact, keyIDs, err := SetupInitActor(bs, template.NetworkName, template.Accounts, template.VerifregRootKey, template.RemainderAccount)
 	if err != nil {
 		return nil, nil, xerrors.Errorf("setup init actor: %w", err)
 	}