fix parsing of asset strings in contractevents

stellar · Sep 14, 2023 · 377dbf6 · 377dbf6
1 parent 38dc8aa
commit 377dbf6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/support/contractevents/event.go b/support/contractevents/event.go
@@ -173,7 +173,7 @@ func parseCanonicalAsset(assetStr string) (*xdr.Asset, error) {
 		Ed25519: issuerKey.Ed25519,
 	})
 
-	if len(rawCode) == 4 {
+	if len(rawCode) <= 4 {
 		code := [4]byte{}
 		copy(code[:], rawCode[:])
 
@@ -182,7 +182,7 @@ func parseCanonicalAsset(assetStr string) (*xdr.Asset, error) {
 			AssetCode: xdr.AssetCode4(code),
 			Issuer:    accountId,
 		}
-	} else if len(rawCode) == 12 {
+	} else if len(rawCode) <= 12 {
 		code := [12]byte{}
 		copy(code[:], rawCode[:])
 

diff --git a/support/contractevents/generate.go b/support/contractevents/generate.go
@@ -169,22 +169,8 @@ func makeAsset(asset xdr.Asset) xdr.ScVal {
 			panic(err)
 		}
 
-	case xdr.AssetTypeAssetTypeCreditAlphanum4:
-		_, err := xdr.Marshal(buffer, asset.AlphaNum4.AssetCode)
-		if err != nil {
-			panic(err)
-		}
-		buffer.WriteString(":")
-		buffer.WriteString(asset.AlphaNum4.Issuer.Address())
-
-	case xdr.AssetTypeAssetTypeCreditAlphanum12:
-		_, err := xdr.Marshal(buffer, asset.AlphaNum12.AssetCode)
-		if err != nil {
-			panic(err)
-		}
-		buffer.WriteString(":")
-		buffer.WriteString(asset.AlphaNum12.Issuer.Address())
-
+	case xdr.AssetTypeAssetTypeCreditAlphanum4, xdr.AssetTypeAssetTypeCreditAlphanum12:
+		buffer.WriteString(asset.GetCode() + ":" + asset.GetIssuer())
 	default:
 		panic("unexpected asset type")
 	}