Merge pull request #527 from Zondax/dev

New Release

Author: ziscky

actors/actor_parser.go

@@ -19,12 +19,12 @@ import (
 
 type ActorParserInterface interface {
 	GetMetadata(ctx context.Context, actorName string, txType string, msg *parser.LotusMessage, mainMsgCid cid.Cid, msgRct *parser.LotusMessageReceipt,
-		height int64, key filTypes.TipSetKey) (string, map[string]interface{}, *types.AddressInfo, error)
+		height int64, key filTypes.TipSetKey, canonical bool) (string, map[string]interface{}, *types.AddressInfo, error)
 }
 
 type Actor interface {
 	Name() string
-	Parse(ctx context.Context, network string, height int64, txType string, msg *parser.LotusMessage, msgRct *parser.LotusMessageReceipt, mainMsgCid cid.Cid, key filTypes.TipSetKey) (map[string]interface{}, *types.AddressInfo, error)
+	Parse(ctx context.Context, network string, height int64, txType string, msg *parser.LotusMessage, msgRct *parser.LotusMessageReceipt, mainMsgCid cid.Cid, key filTypes.TipSetKey, canonical bool) (map[string]interface{}, *types.AddressInfo, error)
 	StartNetworkHeight() int64
 	TransactionTypes() map[string]any
 	Methods(ctx context.Context, network string, height int64) (map[abi.MethodNum]nonLegacyBuiltin.MethodMeta, error)

actors/address.go

@@ -13,7 +13,7 @@ import (
 // if the address is a zero address account actor, it returns the robust address of the zero address account actor
 // if the address is already a robust address, it returns the address
 // if the address is f2 evm, we consolidate f2 -> f0 -> f4
-func ConsolidateToRobustAddress(addr address.Address, h *helper.Helper, logger *logger.Logger, bestEffort bool) (string, error) {
+func ConsolidateToRobustAddress(addr address.Address, h *helper.Helper, logger *logger.Logger, bestEffort bool, canonical bool) (string, error) {
 	actorCache := h.GetActorsCache()
 	if ok, _, _ := h.IsZeroAddressAccountActor(addr); ok {
 		return helper.ZeroAddressAccountActorRobust, nil
@@ -22,18 +22,18 @@ func ConsolidateToRobustAddress(addr address.Address, h *helper.Helper, logger *
 	if isRobust, _ := common.IsRobustAddress(addr); isRobust {
 		// we need to handle cases where a f2 address for evm actors is used
 		// f2 -> f0 -> f4, as we want to consolidate the address to f4 style
-		shortAddressStr, err := actorCache.GetShortAddress(addr)
+		shortAddressStr, err := actorCache.GetShortAddress(addr, canonical)
 		if err == nil {
 			shortAddress, _ := address.NewFromString(shortAddressStr)
-			addrStr, err := actorCache.GetRobustAddress(shortAddress)
+			addrStr, err := actorCache.GetRobustAddress(shortAddress, canonical)
 			if err == nil {
 				addr, _ = address.NewFromString(addrStr)
 			}
 		}
 		return addr.String(), nil
 	}
 
-	robustAddress, err := actorCache.GetRobustAddress(addr)
+	robustAddress, err := actorCache.GetRobustAddress(addr, canonical)
 	if err != nil && !bestEffort {
 		logger.Warnf("Error converting address %s to robust format: %v", addr, err)
 		return "", fmt.Errorf("error converting address to robust format: %v", err) // Fallback