Merge pull request #46 from streamingfast/blo-729-substreams-init-for-ethereum-prettify-written-abi-file

Fix: Prettify ABI JSON files when written to disk

Author: maoueh

convo.go

@@ -79,7 +79,7 @@ func (c *Conversation[X]) HandleSubstreamsConsumptionChoice(value string) loop.C
 
 	var sinkMessage *MsgWrap
 	var dockerComposeCmd loop.Cmd
-	
+
 	switch value {
 	case "postgres":
 		sinkMessage = c.Msg().Message(`Sink to Postgres:
@@ -235,7 +235,7 @@ func (c *Conversation[X]) CmdDownloadFiles(msg ReturnGenerate) loop.Cmd {
 
 func (c *Conversation[X]) generateDockerCompose(dbType string) loop.Cmd {
 	var dockerComposeContent string
-	
+
 	if dbType == "postgres" {
 		dockerComposeContent = `version: "3"
 services:
@@ -284,9 +284,9 @@ services:
       - "9000:9000"
       - "9005:9005"`
 	}
-	
+
 	downloadCmd := c.Action(InputSourceDownloaded{}).DownloadFiles()
 	downloadCmd.AddFile("docker-compose.yml", []byte(dockerComposeContent), "text/plain", "Docker Compose configuration for "+dbType+" database")
-	
+
 	return downloadCmd.Cmd()
 }

evm-events-calls/generate.go

@@ -31,11 +31,11 @@ func (p *Project) Generate() codegen.ReturnGenerate {
 	}
 
 	for _, contract := range p.Contracts {
-		res.ProjectFiles[fmt.Sprintf("abi/%s_contract.abi.json", contract.Name)] = []byte(contract.Abi.raw)
+		res.ProjectFiles[fmt.Sprintf("abi/%s_contract.abi.json", contract.Name)] = codegen.PrettifyJSON([]byte(contract.Abi.raw))
 	}
 
 	for _, dds := range p.DynamicContracts {
-		res.ProjectFiles[fmt.Sprintf("abi/%s_contract.abi.json", dds.Name)] = []byte(dds.Abi.raw)
+		res.ProjectFiles[fmt.Sprintf("abi/%s_contract.abi.json", dds.Name)] = codegen.PrettifyJSON([]byte(dds.Abi.raw))
 	}
 
 	return res

evm-hello-world/chain_configs.go

@@ -10,7 +10,7 @@ type ChainConfig struct {
 	DisplayName          string // Public
 	ExplorerLink         string
 	ApiEndpoint          string
-	ApiBaseURL           string // Base URL without query parameters
+	ApiBaseURL           string     // Base URL without query parameters
 	ApiQueryParams       url.Values // Query parameters to append (e.g. chainid=747474)
 	ApiEndpointDirect    bool
 	FirstStreamableBlock uint64

go.mod

@@ -2,6 +2,8 @@ module github.com/streamingfast/substreams-codegen
 
 go 1.24.2
 
+toolchain go1.24.9
+
 require (
 	connectrpc.com/connect v1.16.2
 	github.com/NethermindEth/juno v0.3.1

server/server.go

@@ -1,8 +1,8 @@
 package server
 
 import (
-	_ "embed"
 	"context"
+	_ "embed"
 	"net/http"
 	"regexp"
 	"strings"
@@ -58,7 +58,7 @@ func (s *server) Run() {
 		ctx := context.Background()
 		interval := 12 * time.Hour
 		s.logger.Info("scheduling firehose-networks registry updates", zap.Duration("interval", interval))
-		
+
 		networks.ScheduleUpdateLatestRegistry(ctx, interval, s.logger)
 	}()
 

sol-anchor/idl_fields_test.go

@@ -95,4 +95,4 @@ func TestUnmarshalOptionVecDefined(t *testing.T) {
 
 	assert.Equal(t, "vecDefined", optionType)
 	assert.Equal(t, "string", result)
-}
+}

starknet-events/state.go

@@ -38,7 +38,7 @@ func (p *Project) Generate() codegen.ReturnGenerate {
 	}
 
 	for _, contract := range p.Contracts {
-		res.ProjectFiles[fmt.Sprintf("abi/%s_contract.abi.json", contract.Name)] = []byte(contract.Abi.raw)
+		res.ProjectFiles[fmt.Sprintf("abi/%s_contract.abi.json", contract.Name)] = codegen.PrettifyJSON([]byte(contract.Abi.raw))
 	}
 
 	return res

utils.go

@@ -2,6 +2,7 @@ package codegen
 
 import (
 	"archive/zip"
+	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -75,3 +76,25 @@ func ZipFiles(files map[string][]byte) ([]byte, error) {
 
 	return zipFileB, nil
 }
+
+// PrettifyJSON takes raw JSON bytes and returns prettified JSON with proper indentation.
+// If the input is not valid JSON, it returns the original content unchanged.
+func PrettifyJSON(rawJSON []byte) []byte {
+	if len(rawJSON) == 0 {
+		return rawJSON
+	}
+
+	var jsonData interface{}
+	if err := json.Unmarshal(rawJSON, &jsonData); err != nil {
+		// If it's not valid JSON, return the original content
+		return rawJSON
+	}
+
+	prettified, err := json.MarshalIndent(jsonData, "", "  ")
+	if err != nil {
+		// If prettification fails, return the original content
+		return rawJSON
+	}
+
+	return prettified
+}