Merge branch 'main' into feature/ibc-packet-forward

Dockerfile

@@ -1,26 +1,28 @@
-ARG GO_VERSION="1.20"
-ARG RUNNER_IMAGE="golang:${GO_VERSION}-alpine3.17"
+ARG GO_VERSION="1.22.5"
+FROM golang:${GO_VERSION}-bookworm AS build-env
+ARG GITHUB_USER
+ARG GITHUB_TOKEN
 
-FROM golang:${GO_VERSION}-bullseye AS build-env
-
-WORKDIR /go/src/github.com/sagaxyz/sagacli
+WORKDIR /root
 
 RUN apt-get update -y
 
 COPY . .
 
+RUN git config --global --add url."https://${GITHUB_USER}:${GITHUB_TOKEN}@github.com/".insteadOf "https://github.com/"
 RUN make build
 
-FROM ${RUNNER_IMAGE}
+FROM golang:${GO_VERSION}-alpine3.20
 
-COPY --from=build-env /go/src/github.com/sagaxyz/sagacli/build/sscd /usr/bin/sscd
+COPY --from=build-env /root/build/sscd /usr/bin/
+COPY --from=build-env /root/start.sh /root/
 
-RUN apk add gcompat bash
+RUN apk add gcompat bash curl
 
 EXPOSE 26656
 EXPOSE 26660
 EXPOSE 26657
 EXPOSE 1317
 EXPOSE 9090
 
-CMD ["sscd", "start"]
+CMD ["bash","/root/start.sh"]

Makefile

@@ -203,10 +203,10 @@ all: tools build lint test vulncheck
 # .PHONY: build build-linux-amd64 build-linux-arm64 cosmovisor
 
 
-# mocks: $(MOCKS_DIR)
-# 	@go install github.com/golang/mock/[email protected]
-# 	sh ./scripts/mockgen.sh
-# .PHONY: mocks
+mocks: $(MOCKS_DIR)
+	@go install github.com/golang/mock/[email protected]
+	sh ./scripts/mockgen.sh
+.PHONY: mocks
 
 
 # vulncheck: $(BUILDDIR)/
@@ -605,4 +605,4 @@ release:
 		ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
 		release --rm-dist --skip-validate
 
-.PHONY: release-dry-run release
+.PHONY: release-dry-run release

app/ante/ante.go

@@ -5,8 +5,8 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
-	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
+	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
+	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 	sagaante "github.com/sagaxyz/saga-sdk/ante"
 )