sync with upstream

.goreleaser.yaml

@@ -0,0 +1,4 @@
+version: 1
+before:
+  hooks:
+  - bash -c 'cat chains/*.yaml > chains.yaml'

Makefile

@@ -0,0 +1,8 @@
+build:
+	cat chains/*.yaml > chains.yaml
+	go build
+	rm -f chains.yaml
+install:
+	cat chains/*.yaml > chains.yaml
+	go install
+	rm -f chains.yaml

README.md

@@ -1,5 +1,3 @@
-[![Conforms to README.lint](https://img.shields.io/badge/README.lint-conforming-brightgreen)](https://github.com/strangelove-ventures/readme-dot-lint)
-
 
 🌌 Why use Heighliner?
 =============================
@@ -24,7 +22,7 @@ Heighliner container images are useful for anyone who's responsible for infrastr
 
 Heighliner images are minimally constructed from scratch images, packaging only the chain binary and a useful reduced set of busybox utilities.
 
-This repository has a CI/CD pipeline to automatically build images when new git tags are detected on the chain repos in [chains.yaml](./chains.yaml). These images are hosted as packages in the Github Container Registry (ghcr) [here](https://github.com/orgs/strangelove-ventures/packages?repo_name=heighliner)
+This repository has a CI/CD pipeline to automatically build images when new git tags are detected on the chain repos in [chains/](chains). These images are hosted as packages in the Github Container Registry (ghcr) [here](https://github.com/orgs/strangelove-ventures/packages?repo_name=heighliner)
 
 
 
@@ -33,7 +31,7 @@ This repository has a CI/CD pipeline to automatically build images when new git
 
 ## Add a New Chain
 
-To add a chain to the heighliner built-in configuration and have your chain images available on our repository's [ghcr](https://github.com/orgs/strangelove-ventures/packages?repo_name=heighliner), submit a PR adding it to [chains.yaml](./chains.yaml) so it will be included in the automatic builds.
+To add a chain to the heighliner built-in configuration and have your chain images available on our repository's [ghcr](https://github.com/orgs/strangelove-ventures/packages?repo_name=heighliner), submit a PR adding it to the [chains directory](chains) so it will be included in the automatic builds.
 
 For further instructions see: [addChain.md](./addChain.md)
 
@@ -47,9 +45,19 @@ If you would like to build the images yourself, heighliner is a CLI tool to help
 Download the latest [release](https://github.com/strangelove-ventures/heighliner/releases), or build it yourself with:
 
 ```shell
-go build
+make build
+```
+
+## Build and put binary in path. 
+
+If you would like to build an image and put it in your local path , you can do the following.
+
+```shell
+make install
 ```
 
+
+
 #### Example: build the docker image for gaia v6.0.0:
 
 ```shell
@@ -117,7 +125,7 @@ export GH_USER=github_username GH_PAT=github_personal_access_token
 heighliner build -r ghcr.io/strangelove-ventures/heighliner -n 3
 ```
 
-heighliner will fetch the last 3 release tags from github for all chains in [chains.yaml](./chains.yaml), build docker images, and push them.
+heighliner will fetch the last 3 release tags from github for all chains in [chains](chains), build docker images, and push them.
 
 
 

builder/builder.go

@@ -242,7 +242,7 @@ func getWasmvmVersion(modFile *modfile.File) string {
 	for _, item := range modFile.Require {
 		// Must have 2 tokens, repo & version
 		if (len(item.Syntax.Token) == 2) && (strings.Contains(item.Syntax.Token[0], wasmvmRepo)) {
-			wasmvmRepo = item.Syntax.Token[0]
+			wasmvmRepo = strings.TrimSuffix(item.Syntax.Token[0], "/v2")
 			wasmvmVersion = item.Syntax.Token[1]
 		}
 	}
@@ -251,7 +251,7 @@ func getWasmvmVersion(modFile *modfile.File) string {
 	for _, item := range modFile.Replace {
 		// Must have 3 or more tokens
 		if (len(item.Syntax.Token) > 2) && (strings.Contains(item.Syntax.Token[0], wasmvmRepo)) {
-			wasmvmRepo = item.Syntax.Token[len(item.Syntax.Token)-2]
+			wasmvmRepo = strings.TrimSuffix(item.Syntax.Token[len(item.Syntax.Token)-2], "/v2")
 			wasmvmVersion = item.Syntax.Token[len(item.Syntax.Token)-1]
 		}
 	}
@@ -410,6 +410,11 @@ func (h *HeighlinerBuilder) buildChainNodeDockerImage(
 		chainConfig.Build.BuildDir = "."
 	}
 
+	vendor := "false"
+	if vendorDir, err := os.Stat("vendor"); err == nil && vendorDir.IsDir() {
+		vendor = "true"
+	}
+
 	buildArgs := map[string]string{
 		"VERSION":             chainConfig.Ref,
 		"BASE_VERSION":        gv.Image,
@@ -429,6 +434,7 @@ func (h *HeighlinerBuilder) buildChainNodeDockerImage(
 		"BUILD_ENV":           buildEnv,
 		"BUILD_TAGS":          buildTagsEnvVar,
 		"BUILD_DIR":           chainConfig.Build.BuildDir,
+		"VENDOR":              vendor,
 		"BUILD_TIMESTAMP":     buildTimestamp,
 		"GO_VERSION":          gv.Version,
 		"WASMVM_VERSION":      wasmvmVersion,

builder/go_versions.go

@@ -12,12 +12,13 @@ const (
 	Go118Version = "1.18.10"
 	Go119Version = "1.19.13"
 	Go120Version = "1.20.14"
-	Go121Version = "1.21.7"
-	Go122Version = "1.22.0"
+	Go121Version = "1.21.13"
+	Go122Version = "1.22.7"
+	Go123Version = "1.23.4"
 	// ADD NEW GO VERSION [1] - latest patch release for each major/minor
 
 	// When updating alpine image, ensure all golang build image combinations below exist
-	LatestAlpineImageVersion = "3.19"
+	LatestAlpineImageVersion = "3.20"
 )
 
 var (
@@ -26,13 +27,14 @@ var (
 	// Find from https://hub.docker.com/_/golang
 	Go118Image = GolangAlpineImage(Go118Version, "3.17") // Go 1.18 is now deprecated, pinning to 3.17
 	Go119Image = GolangAlpineImage(Go119Version, "3.18") // Go 1.19 is now deprecated, pinning to 3.18
-	Go120Image = GolangAlpineImage(Go120Version, LatestAlpineImageVersion)
+	Go120Image = GolangAlpineImage(Go120Version, "3.19")
 	Go121Image = GolangAlpineImage(Go121Version, LatestAlpineImageVersion)
 	Go122Image = GolangAlpineImage(Go122Version, LatestAlpineImageVersion)
+	Go123Image = GolangAlpineImage(Go123Version, LatestAlpineImageVersion)
 
 	// ADD NEW GO VERSION [3] - update GoDefaultVersion and GoDefaultImage to latest
-	GoDefaultVersion = Go122Version
-	GoDefaultImage   = Go122Image // default image for cosmos go builds if go.mod parse fails
+	GoDefaultVersion = Go123Version
+	GoDefaultImage   = Go123Image // default image for cosmos go builds if go.mod parse fails
 )
 
 func GolangAlpineImage(goVersion, alpineVersion string) string {
@@ -51,6 +53,7 @@ var GoImageForVersion = map[string]GoVersion{
 	"1.20": GoVersion{Version: Go120Version, Image: Go120Image},
 	"1.21": GoVersion{Version: Go121Version, Image: Go121Image},
 	"1.22": GoVersion{Version: Go122Version, Image: Go122Image},
+	"1.23": GoVersion{Version: Go123Version, Image: Go123Image},
 	// ADD NEW GO VERSION [4]
 }