taprpc+rpcserver: populate GenesisInfo with asset type

Author: GeorgeTsagk

rpcserver.go

@@ -765,12 +765,12 @@ func (r *rpcServer) listBalancesByAsset(ctx context.Context,
 			AssetGenesis: &taprpc.GenesisInfo{
 				Version:      int32(balance.Version),
 				GenesisPoint: balance.GenesisPoint.String(),
+				AssetType:    taprpc.AssetType(balance.Type),
 				Name:         balance.Tag,
 				MetaHash:     balance.MetaHash[:],
 				AssetId:      balance.ID[:],
 			},
-			AssetType: taprpc.AssetType(balance.Type),
-			Balance:   balance.Balance,
+			Balance: balance.Balance,
 		}
 	}
 
@@ -1421,8 +1421,8 @@ func (r *rpcServer) marshalProof(ctx context.Context, p *proof.Proof,
 				MetaHash:     rpcGenesis.MetaHash[:],
 				AssetId:      decodedAssetID[:],
 				OutputIndex:  rpcGenesis.OutputIndex,
+				AssetType:    taprpc.AssetType(p.Asset.Type),
 			},
-			AssetType: taprpc.AssetType(p.Asset.Type),
 		}
 	}
 

taprpc/marshal.go

@@ -72,13 +72,13 @@ func MarshalAsset(ctx context.Context, a *asset.Asset,
 		Version: assetVersion,
 		AssetGenesis: &GenesisInfo{
 			GenesisPoint: a.Genesis.FirstPrevOut.String(),
+			AssetType:    AssetType(a.Type),
 			Name:         a.Genesis.Tag,
 			MetaHash:     a.Genesis.MetaHash[:],
 			AssetId:      assetID[:],
 			OutputIndex:  a.Genesis.OutputIndex,
 			Version:      int32(assetVersion),
 		},
-		AssetType:        AssetType(a.Type),
 		Amount:           a.Amount,
 		LockTime:         int32(a.LockTime),
 		RelativeLockTime: int32(a.RelativeLockTime),