Fix accountId convert

itering · Feb 28, 2024 · a914e5c · a914e5c
1 parent c489233
commit a914e5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/types/base.go b/types/base.go
@@ -211,7 +211,7 @@ func EncodeWithOpt(typeString string, data interface{}, opt *ScaleDecoderOption)
 	}
 	out := value.MethodByName("Encode").Call([]reflect.Value{val})
 	if len(out) > 0 {
-		return out[0].String()
+		return strings.ToLower(out[0].String())
 	}
 	return ""
 }

diff --git a/types/scaleInfo.go b/types/scaleInfo.go
@@ -237,6 +237,11 @@ func (s *ScaleInfo) expandComposite(id int, SiTyp SiType, id2Portable map[int]Si
 	}
 
 	if len(SiTyp.Def.Composite.Fields) == 1 {
+		// Avoid accountId32 being converted to ascii
+		if len(SiTyp.Path) > 0 && SiTyp.Path[len(SiTyp.Path)-1] == "AccountId32" {
+			s.RegisteredSiType[id] = "AccountId"
+			return s.RegisteredSiType[id]
+		}
 		subTypeId := SiTyp.Def.Composite.Fields[0].Type
 		subType, ok := s.RegisteredSiType[subTypeId]
 		if !ok {