From 76169e757c0c5c285286f30e5bf795def19ac64f Mon Sep 17 00:00:00 2001
From: mmsqe <mavis@crypto.com>
Date: Fri, 3 Jan 2025 22:47:23 +0800
Subject: [PATCH] fix: avoid simd not exist error when make localnet-build-env
 (#23164)

---
 Dockerfile                         | 2 +-
 contrib/images/simd-dlv/Dockerfile | 6 ++++--
 contrib/images/simd-env/Dockerfile | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9998f34c02..3e7d747e8e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,4 +68,4 @@ WORKDIR /root
 RUN apk add --no-cache curl make bash jq sed
 
 # Copy over binaries from the build-env
-COPY --from=build-env /go/src/github.com/cosmos/cosmos-sdk/build/simd /usr/bin/simd
+COPY --from=build-env /go/src/github.com/cosmos/cosmos-sdk/build/simdv2 /usr/bin/simd
diff --git a/contrib/images/simd-dlv/Dockerfile b/contrib/images/simd-dlv/Dockerfile
index 684eb55fed..c5dd2a06c2 100644
--- a/contrib/images/simd-dlv/Dockerfile
+++ b/contrib/images/simd-dlv/Dockerfile
@@ -11,10 +11,12 @@ COPY core/go.mod core/go.sum /work/core/
 COPY collections/go.mod collections/go.sum /work/collections/
 COPY store/go.mod store/go.sum /work/store/
 COPY x/tx/go.mod x/tx/go.sum /work/x/tx/
+COPY x/bank/go.mod x/bank/go.sum /work/x/bank/
+COPY x/staking/go.mod x/staking/go.sum /work/x/staking/
 RUN go mod download
 
 COPY ./ /work
-RUN LEDGER_ENABLED=false make COSMOS_BUILD_OPTIONS="debug,nostrip" clean build
+RUN LEDGER_ENABLED=false make COSMOS_BUILD_OPTIONS="v2,debug,nostrip" clean build
 
 
 FROM alpine AS run
@@ -27,5 +29,5 @@ VOLUME /simd
 WORKDIR /simd
 
 COPY contrib/images/simd-dlv/wrapper.sh /usr/bin/wrapper.sh
-COPY --from=build /work/build/simd /simd/
+COPY --from=build /work/build/simdv2 /simd/
 COPY --from=build /go/bin/dlv /usr/local/bin
diff --git a/contrib/images/simd-env/Dockerfile b/contrib/images/simd-env/Dockerfile
index 9839c032e3..be4a47229d 100644
--- a/contrib/images/simd-env/Dockerfile
+++ b/contrib/images/simd-env/Dockerfile
@@ -45,4 +45,4 @@ VOLUME /simd
 WORKDIR /simd
 
 COPY contrib/images/simd-env/wrapper.sh /usr/bin/wrapper.sh
-COPY --from=build /work/build/simd /simd/
+COPY --from=build /work/build/simdv2 /simd/