simapp with ibc/wasmd

Finschia · Mar 25, 2024 · 277c838 · 277c838
1 parent c759d95
commit 277c838
Show file tree

Hide file tree

Showing 51 changed files with 4,322 additions and 5,893 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -47,8 +47,8 @@ jobs:
       - name: Find Ostracon version
         id: find_ostracon_version
         run: |
-          OST_VERSION=$(go list -m github.com/Finschia/ostracon | sed 's:.* ::')
-          echo "OST_VERSION=$OST_VERSION" >> $GITHUB_ENV
+          CMTVERSION=$(go list -m github.com/cometbft/cometbft | sed 's:.* ::')
+          echo "CMTVERSION=$CMTVERSION" >> $GITHUB_ENV
 
       - name: Parse tag
         id: tag
@@ -82,7 +82,7 @@ jobs:
             RUNNER_IMAGE=${{ env.RUNNER_BASE_IMAGE_ALPINE }}
             GIT_VERSION=${{ env.VERSION }}
             GIT_COMMIT=${{ github.sha }}
-            OST_VERSION=${{ env.OST_VERSION }}
+            CMTVERSION=${{ env.CMTVERSION }}
           tags: |
             ${{ env.DOCKER_REPOSITORY }}:${{ env.VERSION }}
           labels: ${{steps.meta.outputs.labels}}
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -22,13 +22,13 @@ builds:
       - -mod=readonly
       - -trimpath
     ldflags:
-      - -X github.com/Finschia/finschia-sdk/version.Name=finschia
-      - -X github.com/Finschia/finschia-sdk/version.AppName=fnsad
-      - -X github.com/Finschia/finschia-sdk/version.Version={{ .Version }}
-      - -X github.com/Finschia/finschia-sdk/version.Commit={{ .Commit }}
-      - -X github.com/Finschia/finschia-sdk/types.DBBackend=goleveldb
-      - -X github.com/Finschia/finschia-sdk/version.BuildTags=netgo,ledger,static_wasm
-      - -X github.com/Finschia/ostracon/version.TMCoreSemVer={{ .Env.OST_VERSION }}
+      - -X github.com/cosmos/cosmos-sdk/version.Name=finschia
+      - -X github.com/cosmos/cosmos-sdk/version.AppName=fnsad
+      - -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }}
+      - -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }}
+      - -X github.com/cosmos/cosmos-sdk/types.DBBackend=goleveldb
+      - -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,static_wasm
+      - -X github.com/cometbft/cometbft/version.TMCoreSemVer={{ .Env.CMTVERSION }}
       - -s -w
       - -linkmode=external
     tags:
@@ -59,13 +59,15 @@ builds:
       - -mod=readonly
       - -trimpath
     ldflags:
-      - -X github.com/Finschia/finschia-sdk/version.Name=finschia
-      - -X github.com/Finschia/finschia-sdk/version.AppName=fnsad
-      - -X github.com/Finschia/finschia-sdk/version.Version={{ .Version }}
-      - -X github.com/Finschia/finschia-sdk/version.Commit={{ .Commit }}
-      - -X github.com/Finschia/finschia-sdk/types.DBBackend=goleveldb
-      - -X "github.com/Finschia/finschia-sdk/version.BuildTags=netgo,osusergo,ledger,muslc"
-      - -X github.com/Finschia/ostracon/version.TMCoreSemVer={{ .Env.OST_VERSION }}
+      - -X github.com/cosmos/cosmos-sdk/version.Name=finschia
+      - -X github.com/cosmos/cosmos-sdk/version.AppName=fnsad
+      - -X github.com/cosmos/cosmos-sdk/version.Version={{ .Version }}
+      - -X github.com/cosmos/cosmos-sdk/version.Commit={{ .Commit }}
+      - -X github.com/cosmos/cosmos-sdk/types.DBBackend=goleveldb
+      - -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,static_wasm
+      - -X github.com/cometbft/cometbft/version.TMCoreSemVer={{ .Env.CMTVERSION }}
+      - -s -w
+      - -linkmode=external
       - -w -s
       - -linkmode=external
       - -extldflags '-Wl,-z,muldefs -static -lm'

diff --git a/Dockerfile b/Dockerfile
@@ -13,7 +13,7 @@ FROM golang:${GO_VERSION}-alpine3.17 AS build-env
 ARG FINSCHIA_BUILD_OPTIONS=""
 ARG GIT_VERSION
 ARG GIT_COMMIT
-ARG OST_VERSION
+ARG CMTVERSION
 
 # Set up OS dependencies
 RUN apk add --no-cache ca-certificates build-base linux-headers curl
@@ -44,13 +44,13 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
         -mod=readonly \
         -tags "netgo,ledger,muslc,goleveldb" \
         -ldflags \
-            "-X github.com/Finschia/finschia-sdk/version.Name=finschia \
-            -X github.com/Finschia/finschia-sdk/version.AppName=fnsad \
-    		-X github.com/Finschia/finschia-sdk/version.Version=${GIT_VERSION} \
-    		-X github.com/Finschia/finschia-sdk/version.Commit=${GIT_COMMIT} \
-    		-X github.com/Finschia/ostracon/version.TMCoreSemVer=${OST_VERSION} \
-    		-X github.com/Finschia/finschia-sdk/types.DBBackend=goleveldb \
-    		-X github.com/Finschia/finschia-sdk/version.BuildTags=netgo,ledger,muslc,goleveldb \
+            "-X github.com/cosmos/cosmos-sdk/version.Name=finschia \
+            -X github.com/cosmos/cosmos-sdk/version.AppName=fnsad \
+    		-X github.com/cosmos/cosmos-sdk/version.Version=${GIT_VERSION} \
+    		-X github.com/cosmos/cosmos-sdk/version.Commit=${GIT_COMMIT} \
+    		-X github.com/cometbft/cometbft/version.TMCoreSemVer=$(CMTVERSION) \
+    		-X github.com/cosmos/cosmos-sdk/types.DBBackend=goleveldb \
+    		-X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,muslc,goleveldb \
             -w -s -linkmode=external -extldflags '-Wl,-z,muldefs -static'" \
         -trimpath \
         -o /finschia-build/finschia/build/fnsad \

diff --git a/Makefile b/Makefile
@@ -1,7 +1,18 @@
 #!/usr/bin/make -f
 
-COMMIT ?= $(shell git log -1 --format='%H')
+PACKAGES_NOSIMULATION=$(shell go list ./... | grep -v '/simulation')
+PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation')
+export CMTVERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')
+export COMMIT := $(shell git log -1 --format='%H')
+LEDGER_ENABLED ?= true
+BINDIR ?= $(GOPATH)/bin
+BUILDDIR ?= $(CURDIR)/build
+SIMAPP = ./simapp
+MOCKS_DIR = $(CURDIR)/tests/mocks
+DOCKER := $(shell which docker)
+PROJECT_NAME = $(shell git remote get-url origin | xargs basename -s .git)
 
+HTTPS_GIT := https://github.com/Finschia/finschia.git
 # ascribe tag only if on a release/ branch, otherwise pick branch name and concatenate commit hash
 ifeq (,$(VERSION))
   BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
@@ -11,15 +22,9 @@ ifeq (,$(VERSION))
   endif
 endif
 
-PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation')
-SDK_PACK := $(shell go list -m github.com/Finschia/finschia-sdk | sed  's/ /\@/g')
 GO_VERSION := $(shell cat go.mod | grep -E 'go [0-9].[0-9]+' | cut -d ' ' -f 2)
-OST_VERSION := $(shell go list -m github.com/Finschia/ostracon | sed 's:.* ::') # grab everything after the space in "github.com/Finschia/ostracon v0.34.7"
 WASMVM_VERSION=$(shell go list -m github.com/Finschia/wasmvm | awk '{print $$2}')
 HEIGHLINER_VERSION=v1.5.3
-DOCKER := $(shell which docker)
-LEDGER_ENABLED ?= true
-BUILDDIR ?= $(CURDIR)/build
 ARCH ?= amd64
 TARGET_PLATFORM = linux/amd64
 TEMPDIR ?= $(CURDIR)/temp
@@ -35,12 +40,31 @@ endif
 
 build_tags = netgo
 ifeq ($(LEDGER_ENABLED),true)
-	build_tags += ledger
-endif
-ifeq ($(LINK_STATICALLY),true)
-	build_tags += static_wasm muslc
+  ifeq ($(OS),Windows_NT)
+    GCCEXE = $(shell where gcc.exe 2> NUL)
+    ifeq ($(GCCEXE),)
+      $(error gcc.exe not installed for ledger support, please install or set LEDGER_ENABLED=false)
+    else
+      build_tags += ledger
+    endif
+  else
+    UNAME_S = $(shell uname -s)
+    ifeq ($(UNAME_S),OpenBSD)
+      $(warning OpenBSD detected, disabling ledger support (https://github.com/cosmos/cosmos-sdk/issues/1988))
+    else
+      GCC = $(shell command -v gcc 2> /dev/null)
+      ifeq ($(GCC),)
+        $(error gcc not installed for ledger support, please install or set LEDGER_ENABLED=false)
+      else
+        build_tags += ledger
+      endif
+    endif
+  endif
 endif
 
+ifeq ($(WITH_CLEVELDB),yes)
+  build_tags += gcc
+endif
 build_tags += $(BUILD_TAGS)
 build_tags := $(strip $(build_tags))
 
@@ -51,16 +75,21 @@ build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))
 
 # process linker flags
 
-ldflags = -X github.com/Finschia/finschia-sdk/version.Name=finschia \
-		  -X github.com/Finschia/finschia-sdk/version.AppName=fnsad \
-		  -X github.com/Finschia/finschia-sdk/version.Version=$(VERSION) \
-		  -X github.com/Finschia/finschia-sdk/version.Commit=$(COMMIT) \
-		  -X github.com/Finschia/finschia-sdk/types.DBBackend=goleveldb \
-		  -X "github.com/Finschia/finschia-sdk/version.BuildTags=$(build_tags_comma_sep)" \
-		  -X github.com/Finschia/ostracon/version.TMCoreSemVer=$(OST_VERSION) \
-		  -linkmode=external \
+ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=finschia \
+		  -X github.com/cosmos/cosmos-sdk/version.AppName=fnsad \
+		  -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
+		  -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
+		  -X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)" \
+		  -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(CMTVERSION) \
 		  -w -s
 
+ifeq ($(WITH_CLEVELDB),yes)
+  ldflags += -X github.com/cosmos/cosmos-sdk/types.DBBackend=cleveldb
+endif
+ifeq ($(LINK_STATICALLY),true)
+	ldflags += -linkmode=external -extldflags "-Wl,-z,muldefs -static"
+endif
+
 ldflags += $(LDFLAGS)
 ldflags := $(strip $(ldflags))
 
@@ -128,7 +157,7 @@ build-reproducible: go.sum
 		--build-arg GO_VERSION=$(GO_VERSION) \
 		--build-arg GIT_VERSION=$(VERSION) \
 		--build-arg GIT_COMMIT=$(COMMIT) \
-		--build-arg OST_VERSION=$(OST_VERSION) \
+		--build-arg CMTVERSION=$(CMTVERSION) \
 		--build-arg RUNNER_IMAGE=alpine:3.17 \
 		--platform $(TARGET_PLATFORM) \
 		-t finschia/finschianode:local-$(ARCH) \
@@ -207,7 +236,7 @@ docker-build:
 		--build-arg RUNNER_IMAGE=$(RUNNER_BASE_IMAGE_ALPINE) \
 		--build-arg GIT_VERSION=$(VERSION) \
 		--build-arg GIT_COMMIT=$(COMMIT) \
-		--build-arg OST_VERSION=$(OST_VERSION) \
+		--build-arg CMTVERSION=$(CMTVERSION) \
 		--platform=$(TARGET_PLATFORM) \
 		-f Dockerfile .
 .PHONY: docker-build
@@ -239,7 +268,7 @@ localnet-docker-build:
     		--build-arg RUNNER_IMAGE=$(RUNNER_BASE_IMAGE_ALPINE) \
     		--build-arg GIT_VERSION=$(VERSION) \
     		--build-arg GIT_COMMIT=$(COMMIT) \
-    		--build-arg OST_VERSION=$(OST_VERSION) \
+    		--build-arg CMTVERSION=$(CMTVERSION) \
     		--platform=$(TARGET_PLATFORM) \
     		-f networks/local/finschianode/Dockerfile .
 
@@ -282,7 +311,7 @@ release:
 		--platform linux/amd64 \
 		-e GITHUB_TOKEN=$(GITHUB_TOKEN) \
 		-e WASMVM_VERSION=$(WASMVM_VERSION) \
-		-e OST_VERSION=$(OST_VERSION) \
+		-e CMTVERSION=$(CMTVERSION) \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-w /go/src/$(PACKAGE_NAME) \
@@ -300,7 +329,7 @@ release-dry-run:
 		--rm \
 		--platform linux/amd64 \
 		-e WASMVM_VERSION=$(WASMVM_VERSION) \
-		-e OST_VERSION=$(OST_VERSION) \
+		-e CMTVERSION=$(CMTVERSION) \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-w /go/src/$(PACKAGE_NAME) \
@@ -315,7 +344,7 @@ release-snapshot:
 		--rm \
 		--platform linux/amd64 \
 		-e WASMVM_VERSION=$(WASMVM_VERSION) \
-		-e OST_VERSION=$(OST_VERSION) \
+		-e CMTVERSION=$(CMTVERSION) \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-w /go/src/$(PACKAGE_NAME) \

diff --git a/ante/ante.go b/ante/ante.go