Merge pull request #414 from Zondax/dev

New Release

Author: ziscky

actors/v2/multisig/multisig.go

@@ -24,7 +24,21 @@ func (*Msig) MsigConstructor(network string, height int64, raw []byte) (map[stri
 		return nil, fmt.Errorf("constructorParams: %s not found", version.String())
 	}
 
-	return parseCBOR(raw, nil, params(), nil)
+	metadata, err := parseCBOR(raw, nil, params(), nil)
+	if err != nil {
+		versions := tools.GetSupportedVersions(network)
+		for _, version := range versions {
+			params, ok := constructorParams[version.String()]
+			if !ok {
+				continue
+			}
+			metadata, err = parseCBOR(raw, nil, params(), nil)
+			if err == nil {
+				break
+			}
+		}
+	}
+	return metadata, err
 }
 
 func (*Msig) Approve(network string, msg *parser.LotusMessage, height int64, key filTypes.TipSetKey, rawParams, rawReturn []byte) (map[string]interface{}, error) {

parser/helper/helpers.go

@@ -54,6 +54,14 @@ const (
 	// https://github.com/filecoin-project/lotus/releases/tag/v1.28.1
 	// https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0085.md
 	keylessAccountActor = "f090"
+	// ZeroAddressAccountActorRobust f3yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaby2smx7a is a zero address actor that existed until V10.
+	// Created: https://github.com/filecoin-project/lotus/blob/5750f49834deee9dfce752ff840630ae402a8b51/build/buildconstants/params_shared_vals.go#L56
+	// Terminated: https://github.com/filecoin-project/lotus/blob/5750f49834deee9dfce752ff840630ae402a8b51/chain/consensus/filcns/upgrades.go#L1054
+	ZeroAddressAccountActorRobust = "f3yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaby2smx7a"
+	// ZeroAddressAccountActorShort f067253 is a zero address actor that existed until V10.
+	// Created: https://github.com/filecoin-project/lotus/blob/5750f49834deee9dfce752ff840630ae402a8b51/build/buildconstants/params_shared_vals.go#L56
+	// Terminated: https://github.com/filecoin-project/lotus/blob/5750f49834deee9dfce752ff840630ae402a8b51/chain/consensus/filcns/upgrades.go#L1054
+	ZeroAddressAccountActorShort = "f067253"
 	// multisig actorcode for nv22
 	msigCidStr = "bafk2bzacedef4sqdsfebspu7dqnk7naj27ac4lyho4zmvjrei5qnf2wn6v64u"
 	// account actorcode for nv23
@@ -182,11 +190,17 @@ func (h *Helper) GetActorAddressInfo(add address.Address, key filTypes.TipSetKey
 
 	addInfo.Short, err = h.actorCache.GetShortAddress(add)
 	if err != nil {
+		if ok, _, _ := h.isZeroAddressAccountActor(add); ok {
+			addInfo.Short = ZeroAddressAccountActorShort
+		}
 		h.logger.Errorf("could not get short address for %s. Err: %v", add.String(), err)
 	}
 
 	addInfo.Robust, err = h.actorCache.GetRobustAddress(add)
 	if err != nil {
+		if ok, _, _ := h.isZeroAddressAccountActor(add); ok {
+			addInfo.Robust = ZeroAddressAccountActorRobust
+		}
 		h.logger.Errorf("could not get robust address for %s. Err: %v", add.String(), err)
 	}
 
@@ -199,10 +213,8 @@ func (h *Helper) GetActorNameFromAddress(add address.Address, height int64, key
 	if add == address.Undef {
 		return cid.Undef, "", errors.New("address is undefined")
 	}
-	// The f090 address was a multisig actor until V23 where it was converted to an account actor
-	// https://github.com/filecoin-project/lotus/releases/tag/v1.28.1
-	// https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0085.md
-	if ok, cid, actorName := h.isKeylessAccountActor(add, height); ok {
+
+	if ok, cid, actorName := h.isSpecialAccountActor(add, height); ok {
 		return cid, actorName, nil
 	}
 
@@ -233,6 +245,28 @@ func (h *Helper) GetActorNameFromAddress(add address.Address, height int64, key
 	}
 }
 
+// isSpecialAccountActor handles actor addresses that will fail to resolve from the node for reasons documented in each case.
+func (h *Helper) isSpecialAccountActor(add address.Address, height int64) (bool, cid.Cid, string) {
+	if ok, cid, actorName := h.isZeroAddressAccountActor(add); ok {
+		return true, cid, actorName
+	}
+	if ok, cid, actorName := h.isKeylessAccountActor(add, height); ok {
+		return true, cid, actorName
+	}
+	return false, cid.Undef, ""
+}
+
+// The f3yaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaby2smx7a(f067253) is a zero address actor that existed until V10.
+// Created: https://github.com/filecoin-project/lotus/blob/5750f49834deee9dfce752ff840630ae402a8b51/build/buildconstants/params_shared_vals.go#L56
+// Terminated: https://github.com/filecoin-project/lotus/blob/5750f49834deee9dfce752ff840630ae402a8b51/chain/consensus/filcns/upgrades.go#L1054
+func (h *Helper) isZeroAddressAccountActor(add address.Address) (bool, cid.Cid, string) {
+	if h.network != tools.MainnetNetwork || (add.String() != ZeroAddressAccountActorRobust && add.String() != ZeroAddressAccountActorShort) {
+		return false, cid.Undef, ""
+	}
+
+	return true, accountCid, manifest.AccountKey
+}
+
 // The f090 address was a multisig actor until V23 where it was converted to an account actor
 // https://github.com/filecoin-project/lotus/releases/tag/v1.28.1
 // https://github.com/filecoin-project/FIPs/blob/master/FIPS/fip-0085.md