fix: actually write address changes to genesis.json

fetchai · Apr 11, 2024 · 32e3a5c · 32e3a5c
1 parent 760f0ae
commit 32e3a5c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/cmd/fetchd/cmd/ASIGenesisUpgrade.go b/cmd/fetchd/cmd/ASIGenesisUpgrade.go
@@ -199,17 +199,21 @@ func replaceAddresses(addressTypePrefix string, jsonString *string) {
 		replacements[matchedAddr] = newAddress
 	}
 
-	crawlJson(jsonData, func(data *interface{}) {
-		if str, ok := (*data).(string); ok {
+	var count int
+	modified := crawlJson(jsonData, func(data interface{}) interface{} {
+		if str, ok := data.(string); ok {
 			if !re.MatchString(fmt.Sprintf(`"%s"`, str)) || len(str) > 200 {
-				return
+				return data
 			}
 
-			*data = replacements[str]
+			count++
+			fmt.Printf("%v: %s -> %s\n", count, str, replacements[str])
+			return replacements[str]
 		}
+		return data
 	})
 
-	modifiedJSON, err := json.Marshal(jsonData)
+	modifiedJSON, err := json.Marshal(modified)
 	if err != nil {
 		panic(err)
 	}
@@ -252,20 +256,21 @@ type regexPair struct {
 	replacement string
 }
 
-func crawlJson(data interface{}, strHandler func(*interface{})) {
+func crawlJson(data interface{}, strHandler func(interface{}) interface{}) interface{} {
 	switch value := data.(type) {
 	case string:
 		if strHandler != nil {
-			strHandler(&data)
+			return strHandler(data)
 		}
 	case []interface{}:
-		for _, item := range value {
-			crawlJson(item, strHandler)
+		for i := range value {
+			value[i] = crawlJson(value[i], strHandler)
 		}
 	case map[string]interface{}:
-		for _, item := range value {
-			crawlJson(item, strHandler)
+		for k := range value {
+			value[k] = crawlJson(value[k], strHandler)
 		}
 	default:
 	}
+	return data
 }
diff --git a/go.mod b/go.mod
@@ -16,6 +16,8 @@ require (
 	github.com/tendermint/tm-db v0.6.7
 )
 
+require github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
+
 require (
 	filippo.io/edwards25519 v1.0.0-beta.2 // indirect
 	github.com/99designs/keyring v1.1.6 // indirect

diff --git a/go.sum b/go.sum
@@ -122,6 +122,7 @@ github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+q
 github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts=
 github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ=
+github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
 github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
 github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
 github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=