Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v1.8.x #448

Draft
wants to merge 16 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/gosec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: securego/gosec@master
with:
# we let the report trigger content trigger a failure using the GitHub Security features.
args: "-no-fail -fmt sarif -out results.sarif ./..."
args: "-no-fail -fmt sarif -out results.sarif ./... -exclude=./api"

- name: Upload SARIF file
uses: github/codeql-action/upload-sarif@v2
Expand Down
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
*.dll
*.so
*.dylib
*.dot
*.log
*.ign

.DS_Store

# IDE Config files
.idea/
Expand All @@ -29,4 +34,4 @@
.devcontainer

# ignore build dir
build
build
24 changes: 0 additions & 24 deletions .pre-commit-config.yaml

This file was deleted.

10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG BUILD_TAGS="netgo,ledger,muslc"
# Builder
# --------------------------------------------------------

FROM golang:${GO_VERSION}-alpine3.20 as builder
FROM golang:${GO_VERSION}-alpine3.20 AS builder

ARG GIT_VERSION
ARG GIT_COMMIT
Expand All @@ -27,12 +27,12 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
go mod download

# Cosmwasm - Download correct libwasmvm version
RUN ARCH=$(uname -m) && WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | sed 's/.* //') && \
RUN ARCH=$(uname -m) && WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm/v2 | sed 's/.* //') && \
wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/libwasmvm_muslc.$ARCH.a \
-O /lib/libwasmvm_muslc.a && \
-O /lib/libwasmvm_muslc.$ARCH.a && \
# verify checksum
wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/checksums.txt -O /tmp/checksums.txt && \
sha256sum /lib/libwasmvm_muslc.a | grep $(cat /tmp/checksums.txt | grep libwasmvm_muslc.$ARCH | cut -d ' ' -f 1)
sha256sum /lib/libwasmvm_muslc.$ARCH.a | grep $(cat /tmp/checksums.txt | grep libwasmvm_muslc.$ARCH | cut -d ' ' -f 1)

# Copy the remaining files
COPY . .
Expand Down Expand Up @@ -62,7 +62,7 @@ FROM ${RUNNER_IMAGE}

COPY --from=builder /sge/build/sged /bin/sged

ENV HOME /sge
ENV HOME=/sge
WORKDIR $HOME

EXPOSE 26656
Expand Down
11 changes: 7 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,11 @@ clean:
distclean: clean
rm -rf vendor/

mocks: $(MOCKS_DIR)
@go install github.com/golang/mock/mockgen@v1.6.0
sh ./scripts/mockgen.sh
.PHONY: mocks

###############################################################################
### Proto ###
###############################################################################
Expand All @@ -216,14 +221,12 @@ docs:
@echo
.PHONY: docs

protoVer=0.13.1
protoVer=0.15.1
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
# containerProtoGen=cosmos-sdk-proto-gen-$(protoVer)
# containerProtoFmt=cosmos-sdk-proto-fmt-$(protoVer)

proto-gen:
@echo "Generating Protobuf files"
@echo "Generating protobuf files..."
@$(protoImage) sh ./scripts/protocgen.sh

proto-swagger-gen:
Expand Down
Loading
Loading