Merge pull request #326 from multiversx/merge-rc-1-7-next1-into-sover…

…eign-7-oct-2024 Merge rc 1 7 next1 into sovereign 7 oct 2024
multiversx · Oct 11, 2024 · b884700 · b884700
2 parents 9028001 + 50ac1ae
commit b884700
Show file tree

Hide file tree

Showing 22 changed files with 975 additions and 1,070 deletions.
diff --git a/core/constants.go b/core/constants.go
@@ -210,6 +210,30 @@ const (
 	DynamicMeta
 )
 
+// String will convert number type in string
+func (t ESDTType) String() string {
+	switch t {
+	case Fungible:
+		return FungibleESDT
+	case NonFungible:
+		return NonFungibleESDT
+	case NonFungibleV2:
+		return NonFungibleESDTv2
+	case SemiFungible:
+		return SemiFungibleESDT
+	case MetaFungible:
+		return MetaESDT
+	case DynamicNFT:
+		return DynamicNFTESDT
+	case DynamicSFT:
+		return DynamicSFTESDT
+	case DynamicMeta:
+		return DynamicMetaESDT
+	default:
+		return "Unknown"
+	}
+}
+
 // FungibleESDT defines the string for the token type of fungible ESDT
 const FungibleESDT = "FungibleESDT"
 

diff --git a/data/alteredAccount/alteredAccount.pb.go b/data/alteredAccount/alteredAccount.pb.go
diff --git a/data/alteredAccount/alteredAccount.proto b/data/alteredAccount/alteredAccount.proto
@@ -22,6 +22,7 @@ message AccountTokenData {
   string                     Properties     = 4 [(gogoproto.jsontag) = "properties"];
   TokenMetaData              MetaData       = 5 [(gogoproto.jsontag) = "metaData,omitempty"];
   AdditionalAccountTokenData AdditionalData = 6 [(gogoproto.jsontag) = "additionalData,omitempty"];
+  string                     Type           = 7 [(gogoproto.jsontag) = "type,omitempty"];
 }
 
 message TokenMetaData {