Upgrade to v0.5.0

Dockerfile

@@ -1,37 +1,61 @@
-# how to run
-# docker build -t firmachain .
-
-# docker run -it -p 26657:26657 -p 26656:26656 -v ~/.firmachain:/root/.firmachain firmachain firmachaind init
-# docker run -it -p 26657:26657 -p 26656:26656 -v ~/.firmachain:/root/.firmachain firmachain firmachaind start
-
-# to enter docker
-# docker exec -it firmachain bash
-
-# run container as a daemon (td option : -t -> Assign Termail to Container, -d: run on the background)
-# > docker run -td -p 26657:26657 -p 26656:26656 -v ~/.firmachain:/root/.firmachain firmachain firmachaind start
-
-# Use multi-stage build
-FROM golang:1.16 as builder
-
-RUN apt-get update && apt-get install -y git
-
-# Download from GitHub instead of using COPY
-RUN rm firmachain -rf
-RUN git clone https://github.com/firmachain/firmachain /firmachain
-WORKDIR "/firmachain"
-
-# Always run on latest version
-RUN LEDGER_ENABLED=false make 
-
-# Create final container
-FROM ubuntu:latest
-
-# It is ok to COPY files from a build container (when using multi-stage builds)
-COPY --from=builder /go/bin/firmachaind /usr/local/bin/firmachaind
-
-# rest server / grpc / tendermint p2p / tendermint rpc
-EXPOSE 1317 9090 26656 26657
-
-# Run firmachind by default 
-# ex) docker run firmachain
-CMD ["/usr/local/bin/firmachaind"]
+# syntax=docker/dockerfile:1
+
+ARG GO_VERSION="1.23"
+ARG RUNNER_IMAGE="alpine:3.20"
+
+# Use a minimal base image (Alpine Linux)
+FROM golang:${GO_VERSION}-alpine3.20 AS go-builder
+
+WORKDIR /app
+
+RUN apk add --no-cache ca-certificates build-base git linux-headers binutils-gold
+
+# Download dependencies and CosmWasm libwasmvm if found.
+ADD go.mod go.sum ./
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/root/go/pkg/mod \
+    go mod download
+
+# Cosmwasm - Download correct libwasmvm version
+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.$ARCH.a && \
+    # verify checksum
+    wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/checksums.txt -O /tmp/checksums.txt && \
+    sha256sum /lib/libwasmvm_muslc.$ARCH.a | grep $(cat /tmp/checksums.txt | grep libwasmvm_muslc.$ARCH | cut -d ' ' -f 1) 
+
+
+# Copy the repository
+COPY . ./
+
+ARG GIT_VERSION 
+ARG GIT_COMMIT
+ARG GIT_BRANCH
+
+RUN git checkout ${GIT_BRANCH}
+
+RUN --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=cache,target=/root/go/pkg/mod \
+    GOWORK=off go build \
+    -mod=readonly \
+    -tags "netgo,ledger,muslc" \
+    -ldflags \
+    "-X github.com/cosmos/cosmos-sdk/version.Name="firmachain" \
+    -X github.com/cosmos/cosmos-sdk/version.AppName="firmachaind" \
+    -X github.com/cosmos/cosmos-sdk/version.Version=${GIT_VERSION}@${GIT_BRANCH} \
+    -X github.com/cosmos/cosmos-sdk/version.Commit=${GIT_COMMIT} \
+    -w -s -linkmode=external -extldflags '-Wl,-z,muldefs -static'" \
+    -trimpath \
+    -o ./bin/firmachaind \
+    ./cmd/firmachaind
+
+# --------------------------------------------------------
+FROM ${RUNNER_IMAGE}
+
+COPY --from=go-builder /app/bin/firmachaind /usr/bin/firmachaind
+
+# rest server, tendermint p2p, tendermint rpc
+EXPOSE 1317 26656 26657
+
+ENV PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH"
+CMD ["/usr/bin/firmachaind", "version"]

Makefile

@@ -1,6 +1,7 @@
 PACKAGES=$(shell go list ./... | grep -v '/simulation')
 VERSION := $(shell echo $(shell git describe --tags --always) | sed 's/^v//')
 COMMIT := $(shell git log -1 --format='%H')
+BRANCH := $(shell git branch --show-current)
 
 include Makefile.ledger
 
@@ -21,11 +22,20 @@ else
 	BUILD_FLAGS := -ldflags '$(ldflags)' $(build_tags)
 endif
 
+DOCKER := $(shell which docker)
+
 all: install
 
 install: go.sum
 		go install -mod=readonly $(BUILD_FLAGS) ./cmd/firmachaind
 
+docker-img-from-current-branch:
+	docker build \
+		--build-arg GIT_VERSION=$(VERSION) \
+		--build-arg GIT_COMMIT=$(COMMIT) \
+		--build-arg GIT_BRANCH=$(BRANCH) \
+		-t firmachain .
+
 go.sum: go.mod
 		@echo "--> Ensure dependencies have not been modified"
 		GO111MODULE=on go mod verify
@@ -38,26 +48,24 @@ test:
 ###############################################################################
 
 # Variables for the image and version
-protoVer=v0.7
-protoImageName=tendermintdev/sdk-proto-gen-go-1.21-image
-GOLANG_VERSION=1.21.0
-containerProtoGen=firmachain-proto-gen-$(protoVer)-go-${GOLANG_VERSION}
-
-# Target to build the image if it doesn't exist
-build-proto-image:
-	@if [ -z "$$(docker images -q $(protoImageName))" ]; then \
-		echo "Building Docker image with Go $(GOLANG_VERSION)..."; \
-		docker build -t $(protoImageName) -f Dockerfile.proto-gen .; \
-	else \
-		echo "Image $(protoImageName) already exists."; \
-	fi
-
-# Generate Protobuf files using the image
-proto-gen: build-proto-image
-	@echo "Generating Protobuf files..."
-	@if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoGen}$$"; then \
-	    docker start -a $(containerProtoGen); \
-	else \
-	    docker run --name $(containerProtoGen) -v $(CURDIR):/firmachain --workdir /firmachain $(protoImageName) \
-	        sh ./scripts/protocgen.sh; \
-	fi
+protoVer=0.15.3
+protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
+protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
+
+proto-gen:
+	@echo "Generating Protobuf files"
+	@$(protoImage) sh ./scripts/protocgen.sh
+
+###############################################################################
+###                                  Docs                                   ###
+###############################################################################
+
+SWAGGER_DIR=./swagger-proto
+
+swagger:
+	@echo "Downloading go modules..."
+	@go mod tidy
+	@echo
+	@echo "Generating Swagger..."
+	@echo
+	@./scripts/generate-swagger.sh

app/ante.go

@@ -0,0 +1,76 @@
+package app
+
+import (
+	"errors"
+
+	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
+	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
+
+	corestoretypes "cosmossdk.io/core/store"
+	circuitante "cosmossdk.io/x/circuit/ante"
+	circuitkeeper "cosmossdk.io/x/circuit/keeper"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkante "github.com/cosmos/cosmos-sdk/x/auth/ante"
+
+	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
+	wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
+)
+
+// FirmachainHandlerOptions extends the SDK's AnteHandler options.
+type FirmachainHandlerOptions struct {
+	sdkante.HandlerOptions
+
+	IBCKeeper     *ibckeeper.Keeper
+	CircuitKeeper *circuitkeeper.Keeper
+
+	WasmKeeper     *wasmkeeper.Keeper
+	WasmNodeConfig *wasmTypes.NodeConfig
+
+	TXCounterStoreService corestoretypes.KVStoreService
+}
+
+// NewAnteHandler constructor
+func NewAnteHandler(options FirmachainHandlerOptions) (sdk.AnteHandler, error) {
+	if options.AccountKeeper == nil {
+		return nil, errors.New("account keeper is required for ante builder")
+	}
+	if options.BankKeeper == nil {
+		return nil, errors.New("bank keeper is required for ante builder")
+	}
+	if options.SignModeHandler == nil {
+		return nil, errors.New("sign mode handler is required for ante builder")
+	}
+	if options.WasmNodeConfig == nil {
+		return nil, errors.New("wasm config is required for ante builder")
+	}
+	if options.TXCounterStoreService == nil {
+		return nil, errors.New("wasm store service is required for ante builder")
+	}
+	if options.CircuitKeeper == nil {
+		return nil, errors.New("circuit keeper is required for ante builder")
+	}
+
+	anteDecorators := []sdk.AnteDecorator{
+		sdkante.NewSetUpContextDecorator(),                                                   // outermost AnteDecorator. SetUpContext must be called first
+		wasmkeeper.NewLimitSimulationGasDecorator(options.WasmNodeConfig.SimulationGasLimit), // after setup context to enforce limits early
+		wasmkeeper.NewCountTXDecorator(options.TXCounterStoreService),
+		wasmkeeper.NewGasRegisterDecorator(options.WasmKeeper.GetGasRegister()),
+		wasmkeeper.NewTxContractsDecorator(),
+		circuitante.NewCircuitBreakerDecorator(options.CircuitKeeper),
+		sdkante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
+		sdkante.NewValidateBasicDecorator(),
+		sdkante.NewTxTimeoutHeightDecorator(),
+		sdkante.NewValidateMemoDecorator(options.AccountKeeper),
+		sdkante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
+		sdkante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker),
+		sdkante.NewSetPubKeyDecorator(options.AccountKeeper), // SetPubKeyDecorator must be called before all signature verification decorators
+		sdkante.NewValidateSigCountDecorator(options.AccountKeeper),
+		sdkante.NewSigGasConsumeDecorator(options.AccountKeeper, options.SigGasConsumer),
+		sdkante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
+		sdkante.NewIncrementSequenceDecorator(options.AccountKeeper),
+		ibcante.NewRedundantRelayDecorator(options.IBCKeeper),
+	}
+
+	return sdk.ChainAnteDecorators(anteDecorators...), nil
+}