From 1619dd644d09ff202dde6db37c85662c2e839a4e Mon Sep 17 00:00:00 2001
From: Helder M <helder.moreira@voluzi.com>
Date: Wed, 19 Feb 2025 17:39:24 +0000
Subject: [PATCH] chore(build): include lib versions on cache

---
 CHANGELOG.md          |  1 +
 contrib/make/build.mk | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5c2e4c40..52778878b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 Simplify GitHub actions based on conditional paths, removing the need for files like ".github/workflows/skip-unit-tests.yml".
 - [#2211](https://github.com/NibiruChain/nibiru/pull/2211) - ci(chaosnet): avoid building on cache injected directories
 - [#2212](https://github.com/NibiruChain/nibiru/pull/2212) - fix(evm): proper eth tx logs emission for funtoken operations
+- [#2213](https://github.com/NibiruChain/nibiru/pull/2213) - chore(build): include lib versions on cache
 
 ## [v2.0.0-p1](https://github.com/NibiruChain/nibiru/releases/tag/v2.0.0-p1) - 2025-02-10
 
diff --git a/contrib/make/build.mk b/contrib/make/build.mk
index ef84a6df7..9e9c49a77 100644
--- a/contrib/make/build.mk
+++ b/contrib/make/build.mk
@@ -61,8 +61,8 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=nibiru \
 ldflags := $(strip $(ldflags))
 
 BUILD_FLAGS := -tags "$(build_tags)" -ldflags '$(ldflags)'
-CGO_CFLAGS  := -I$(TEMPDIR)/include
-CGO_LDFLAGS := -L$(TEMPDIR)/lib/$(OS_NAME)_$(ARCH_NAME)/
+CGO_CFLAGS  := -I$(TEMPDIR)/rocksdb/$(ROCKSDB_VERSION)/include
+CGO_LDFLAGS := -L$(TEMPDIR)/rocksdb/$(ROCKSDB_VERSION)/lib/$(OS_NAME)_$(ARCH_NAME)/ -L$(TEMPDIR)/wasmvm/$(WASMVM_VERSION)/lib/$(OS_NAME)_$(ARCH_NAME)/
 ifeq ($(OS_NAME),darwin)
 	CGO_LDFLAGS += -lrocksdb -lstdc++ -lz -lbz2
 else
@@ -78,30 +78,30 @@ $(TEMPDIR)/:
 
 # download required libs
 rocksdblib: $(TEMPDIR)/
-	@mkdir -p $(TEMPDIR)/include
-	@mkdir -p $(TEMPDIR)/lib/$(OS_NAME)_$(ARCH_NAME)/
-	@if [ ! -d $(TEMPDIR)/include/rocksdb ] ; \
+	@mkdir -p $(TEMPDIR)/rocksdb/$(ROCKSDB_VERSION)/include
+	@mkdir -p $(TEMPDIR)/rocksdb/$(ROCKSDB_VERSION)/lib/$(OS_NAME)_$(ARCH_NAME)/
+	@if [ ! -d $(TEMPDIR)/rocksdb/$(ROCKSDB_VERSION)/include/rocksdb ] ; \
 	then \
-	  wget https://github.com/NibiruChain/gorocksdb/releases/download/v$(ROCKSDB_VERSION)/include.$(ROCKSDB_VERSION).tar.gz -O - | tar -xz -C $(TEMPDIR)/include/; \
+	  wget https://github.com/NibiruChain/gorocksdb/releases/download/v$(ROCKSDB_VERSION)/include.$(ROCKSDB_VERSION).tar.gz -O - | tar -xz -C $(TEMPDIR)/rocksdb/$(ROCKSDB_VERSION)/include/; \
 	fi
-	@if [ ! -f $(TEMPDIR)/lib/$(OS_NAME)_$(ARCH_NAME)/librocksdb.a ] ; \
+	@if [ ! -f $(TEMPDIR)/rocksdb/$(ROCKSDB_VERSION)/lib/$(OS_NAME)_$(ARCH_NAME)/librocksdb.a ] ; \
 	then \
-	  wget https://github.com/NibiruChain/gorocksdb/releases/download/v$(ROCKSDB_VERSION)/librocksdb_$(ROCKSDB_VERSION)_$(OS_NAME)_$(ARCH_NAME).tar.gz -O - | tar -xz -C $(TEMPDIR)/lib/$(OS_NAME)_$(ARCH_NAME)/; \
+	  wget https://github.com/NibiruChain/gorocksdb/releases/download/v$(ROCKSDB_VERSION)/librocksdb_$(ROCKSDB_VERSION)_$(OS_NAME)_$(ARCH_NAME).tar.gz -O - | tar -xz -C $(TEMPDIR)/rocksdb/$(ROCKSDB_VERSION)/lib/$(OS_NAME)_$(ARCH_NAME)/; \
 	fi
 
 wasmvmlib: $(TEMPDIR)/
-	@mkdir -p $(TEMPDIR)/lib/$(OS_NAME)_$(ARCH_NAME)/
-	@if [ ! -f $(TEMPDIR)/lib/$(OS_NAME)_$(ARCH_NAME)/libwasmvm*.a ] ; \
+	@mkdir -p $(TEMPDIR)/wasmvm/$(WASMVM_VERSION)/lib/$(OS_NAME)_$(ARCH_NAME)/
+	@if [ ! -f $(TEMPDIR)/wasmvm/$(WASMVM_VERSION)/lib/$(OS_NAME)_$(ARCH_NAME)/libwasmvm*.a ] ; \
 	then \
 	  if [ "$(OS_NAME)" = "darwin" ] ; \
 	  then \
-	    wget https://github.com/CosmWasm/wasmvm/releases/download/v$(WASMVM_VERSION)/libwasmvmstatic_darwin.a -O $(TEMPDIR)/lib/$(OS_NAME)_$(ARCH_NAME)/libwasmvmstatic_darwin.a; \
+	    wget https://github.com/CosmWasm/wasmvm/releases/download/v$(WASMVM_VERSION)/libwasmvmstatic_darwin.a -O $(TEMPDIR)/wasmvm/$(WASMVM_VERSION)/lib/$(OS_NAME)_$(ARCH_NAME)/libwasmvmstatic_darwin.a; \
 	  else \
 		if [ "$(ARCH_NAME)" = "amd64" ] ; \
 		then \
-		  wget https://github.com/CosmWasm/wasmvm/releases/download/v$(WASMVM_VERSION)/libwasmvm_muslc.x86_64.a -O $(TEMPDIR)/lib/$(OS_NAME)_$(ARCH_NAME)/libwasmvm_muslc.a; \
+		  wget https://github.com/CosmWasm/wasmvm/releases/download/v$(WASMVM_VERSION)/libwasmvm_muslc.x86_64.a -O $(TEMPDIR)/wasmvm/$(WASMVM_VERSION)/lib/$(OS_NAME)_$(ARCH_NAME)/libwasmvm_muslc.a; \
 		else \
-		  wget https://github.com/CosmWasm/wasmvm/releases/download/v$(WASMVM_VERSION)/libwasmvm_muslc.aarch64.a -O $(TEMPDIR)/lib/$(OS_NAME)_$(ARCH_NAME)/libwasmvm_muslc.a; \
+		  wget https://github.com/CosmWasm/wasmvm/releases/download/v$(WASMVM_VERSION)/libwasmvm_muslc.aarch64.a -O $(TEMPDIR)/wasmvm/$(WASMVM_VERSION)/lib/$(OS_NAME)_$(ARCH_NAME)/libwasmvm_muslc.a; \
 		fi; \
 	  fi; \
 	fi