Merge pull request #28 from bianjieai/cyl/v0.47.12-irita

feat: v0.47.12 cherry pick sm2
bianjieai · Jul 1, 2024 · 8699399 · 8699399
2 parents d684290 + f1d0032
commit 8699399
Show file tree

Hide file tree

Showing 38 changed files with 2,283 additions and 110 deletions.
diff --git a/Makefile b/Makefile
@@ -59,7 +59,8 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sim \
 		  -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=$(TMVERSION)
+		  -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(TMVERSION) \
+		  -X github.com/cometbft/cometbft/crypto/algo.Algo=sm2
 
 
 # DB backend selection

diff --git a/api/cosmos/auth/v1beta1/auth.pulsar.go b/api/cosmos/auth/v1beta1/auth.pulsar.go