Merge pull request #8527 from filecoin-project/fix/itests-nv16-msig

fix multisig for nv16

chain/actors/builtin/multisig/message.go.template

@@ -54,9 +54,17 @@ func (m message{{.v}}) Create(
 		return nil, actErr
 	}
 
+    {{if (le .v 7)}}
+    actorCodeID := builtin{{.v}}.MultisigActorCodeID
+    {{else}}
+    actorCodeID, ok := actors.GetActorCodeID(actors.Version{{.v}}, "multisig")
+    if !ok {
+      return nil, xerrors.Errorf("error getting actor multisig code id for actor version %d", {{.v}})
+    }
+    {{end}}
 	// new actors are created by invoking 'exec' on the init actor with the constructor params
 	execParams := &init{{.v}}.ExecParams{
-		CodeCID:           builtin{{.v}}.MultisigActorCodeID,
+		CodeCID:           actorCodeID,
 		ConstructorParams: enc,
 	}
 

chain/actors/builtin/multisig/message0.go

@@ -53,9 +53,11 @@ func (m message0) Create(
 		return nil, actErr
 	}
 
+	actorCodeID := builtin0.MultisigActorCodeID
+
 	// new actors are created by invoking 'exec' on the init actor with the constructor params
 	execParams := &init0.ExecParams{
-		CodeCID:           builtin0.MultisigActorCodeID,
+		CodeCID:           actorCodeID,
 		ConstructorParams: enc,
 	}
 

chain/actors/builtin/multisig/message2.go

@@ -50,9 +50,11 @@ func (m message2) Create(
 		return nil, actErr
 	}
 
+	actorCodeID := builtin2.MultisigActorCodeID
+
 	// new actors are created by invoking 'exec' on the init actor with the constructor params
 	execParams := &init2.ExecParams{
-		CodeCID:           builtin2.MultisigActorCodeID,
+		CodeCID:           actorCodeID,
 		ConstructorParams: enc,
 	}
 

chain/actors/builtin/multisig/message3.go

@@ -50,9 +50,11 @@ func (m message3) Create(
 		return nil, actErr
 	}
 
+	actorCodeID := builtin3.MultisigActorCodeID
+
 	// new actors are created by invoking 'exec' on the init actor with the constructor params
 	execParams := &init3.ExecParams{
-		CodeCID:           builtin3.MultisigActorCodeID,
+		CodeCID:           actorCodeID,
 		ConstructorParams: enc,
 	}
 

chain/actors/builtin/multisig/message4.go

@@ -50,9 +50,11 @@ func (m message4) Create(
 		return nil, actErr
 	}
 
+	actorCodeID := builtin4.MultisigActorCodeID
+
 	// new actors are created by invoking 'exec' on the init actor with the constructor params
 	execParams := &init4.ExecParams{
-		CodeCID:           builtin4.MultisigActorCodeID,
+		CodeCID:           actorCodeID,
 		ConstructorParams: enc,
 	}
 

chain/actors/builtin/multisig/message5.go

@@ -50,9 +50,11 @@ func (m message5) Create(
 		return nil, actErr
 	}
 
+	actorCodeID := builtin5.MultisigActorCodeID
+
 	// new actors are created by invoking 'exec' on the init actor with the constructor params
 	execParams := &init5.ExecParams{
-		CodeCID:           builtin5.MultisigActorCodeID,
+		CodeCID:           actorCodeID,
 		ConstructorParams: enc,
 	}
 

chain/actors/builtin/multisig/message6.go

@@ -50,9 +50,11 @@ func (m message6) Create(
 		return nil, actErr
 	}
 
+	actorCodeID := builtin6.MultisigActorCodeID
+
 	// new actors are created by invoking 'exec' on the init actor with the constructor params
 	execParams := &init6.ExecParams{
-		CodeCID:           builtin6.MultisigActorCodeID,
+		CodeCID:           actorCodeID,
 		ConstructorParams: enc,
 	}
 

chain/actors/builtin/multisig/message7.go

@@ -50,9 +50,11 @@ func (m message7) Create(
 		return nil, actErr
 	}
 
+	actorCodeID := builtin7.MultisigActorCodeID
+
 	// new actors are created by invoking 'exec' on the init actor with the constructor params
 	execParams := &init7.ExecParams{
-		CodeCID:           builtin7.MultisigActorCodeID,
+		CodeCID:           actorCodeID,
 		ConstructorParams: enc,
 	}
 

chain/actors/builtin/multisig/message8.go

@@ -50,9 +50,14 @@ func (m message8) Create(
 		return nil, actErr
 	}
 
+	actorCodeID, ok := actors.GetActorCodeID(actors.Version8, "multisig")
+	if !ok {
+		return nil, xerrors.Errorf("error getting actor multisig code id for actor version %d", 8)
+	}
+
 	// new actors are created by invoking 'exec' on the init actor with the constructor params
 	execParams := &init8.ExecParams{
-		CodeCID:           builtin8.MultisigActorCodeID,
+		CodeCID:           actorCodeID,
 		ConstructorParams: enc,
 	}