@agoric/cosmos 0.35.0-u19.2 → 0.35.0-u21.0

package/.clang-format

@@ -0,0 +1,116 @@
+---
+Language: Proto
+BasedOnStyle: Google
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+AlignEscapedNewlines: Right
+AlignOperands: true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterClass: false
+  AfterControlStatement: false
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterObjCDeclaration: false
+  AfterStruct: false
+  AfterUnion: false
+  AfterExternBlock: false
+  BeforeCatch: false
+  BeforeElse: false
+  IndentBraces: false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit: 120
+CommentPragmas: '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat: false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks: Preserve
+IncludeCategories:
+  - Regex: '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority: 2
+  - Regex: '^(<|"(gtest|gmock|isl|json)/)'
+    Priority: 3
+  - Regex: '.*'
+    Priority: 1
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth: 2
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+RawStringFormats:
+  - Delimiters:
+      - pb
+    Language: TextProto
+    BasedOnStyle: Google
+ReflowComments: true
+SortIncludes: true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: Cpp11
+TabWidth: 8
+UseTab: Never
+---
+

package/CHANGELOG.md

@@ -3,23 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.35.0-u19.2](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.35.0-u19.1...@agoric/cosmos@0.35.0-u19.2) (2025-03-13)
-
-**Note:** Version bump only for package @agoric/cosmos
-
-
-
-
-
-## [0.35.0-u19.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.35.0-u19.0...@agoric/cosmos@0.35.0-u19.1) (2025-03-03)
-
-**Note:** Version bump only for package @agoric/cosmos
-
-
-
-
-
-## [0.35.0-u19.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.34.1...@agoric/cosmos@0.35.0-u19.0) (2025-02-24)
+## [0.35.0-u21.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmos@0.34.1...@agoric/cosmos@0.35.0-u21.0) (2025-06-19)
 
 
 ### ⚠ BREAKING CHANGES
@@ -54,6 +38,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **cosmos:** Add a vstorage package for decoding CapData ([8bdd7cb](https://github.com/Agoric/agoric-sdk/commit/8bdd7cb915f8e8d4103dc4d21b212aae67644b56))
 * **cosmos:** add hooking kv reader ([496a430](https://github.com/Agoric/agoric-sdk/commit/496a430c772a1f996e515ef9622e7668e00ea843))
 * **cosmos:** add required export-dir export cmd option ([3be2986](https://github.com/Agoric/agoric-sdk/commit/3be2986059c9f007d34518deef68e31956e9b45e))
+* **cosmos:** add Reserve withdrawal upgrade ([9e97cbd](https://github.com/Agoric/agoric-sdk/commit/9e97cbd7438e3df5aec96091d18ecdcde720978b))
 * **cosmos:** Always include alleged name and slot id in vstorage CapData remotable representations ([e2cbffa](https://github.com/Agoric/agoric-sdk/commit/e2cbffaccbd1da7f38c2358fd4d1fbbc2e1abd9c))
 * **cosmos:** clean up `OnStartHook` and `OnExitHook` signatures ([158d831](https://github.com/Agoric/agoric-sdk/commit/158d83156cf404d789882bb8bf34fe723d9704ec))
 * **cosmos:** encapsulate comms to agvm RPC ([e9a5c94](https://github.com/Agoric/agoric-sdk/commit/e9a5c943d2518c432329f9c1fe96e5a3f47608b4))
@@ -64,7 +49,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **cosmos:** impose defaults when sending VM actions ([a710d68](https://github.com/Agoric/agoric-sdk/commit/a710d68512cf9983bdf5230e2e99f267521c7210))
 * **cosmos:** KVEntry implements json Marshaler and Unmarshaller ([1bba859](https://github.com/Agoric/agoric-sdk/commit/1bba8592eee0e24e480c407095f0f63ccca4a242))
 * **cosmos:** make vm comms use `context.Context` ([fa1754c](https://github.com/Agoric/agoric-sdk/commit/fa1754c791ba6c848e6b94f3a75051c6b4cc69f6))
-* **cosmos:** Next Upgrade is agoric-upgrade-19 ([e224889](https://github.com/Agoric/agoric-sdk/commit/e2248899164cf58ecdd086801453a8290fe222df))
+* **cosmos:** new `IBCPacket` helpers to tame JSON ([f5a10b6](https://github.com/Agoric/agoric-sdk/commit/f5a10b6457501c9be9ae396bd1c7a8d43ea42dd6))
+* **cosmos:** Next upgrade is agoric-upgrade-21 ([39b5190](https://github.com/Agoric/agoric-sdk/commit/39b5190966dca03d8022ebd191c786647c8a3c3f))
 * **cosmos:** prevent VM port handlers from panicking ([afd6017](https://github.com/Agoric/agoric-sdk/commit/afd60170d453865cfa871a01e8d8a74ffef9221a))
 * **cosmos:** propagate and handle shutdown message ([ac12e6d](https://github.com/Agoric/agoric-sdk/commit/ac12e6d57b3a50e079744f7a6faced7f4bebb957))
 * **cosmos:** separate swing-store export data from genesis file ([f476bd5](https://github.com/Agoric/agoric-sdk/commit/f476bd50fb3ca5df0c4f43b20e059e05a2659b4c))
@@ -74,8 +60,10 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **cosmos:** support core proposals set by upgrade handler ([605eb4b](https://github.com/Agoric/agoric-sdk/commit/605eb4b8f33d7646c3a9084d43ecd51029e12b80))
 * **cosmos:** support snapshot export ([4386f8e](https://github.com/Agoric/agoric-sdk/commit/4386f8e67136f184b94febb5d65990a26e101cf3))
 * **cosmos:** un-wire x/crisis ([#8582](https://github.com/Agoric/agoric-sdk/issues/8582)) ([7153535](https://github.com/Agoric/agoric-sdk/commit/7153535c5c10fed309dc60f12f981c81841fdb93))
+* **cosmos:** upgrade IBC vat for next release ([c994490](https://github.com/Agoric/agoric-sdk/commit/c99449081560480e7e2dd6fc069b12dbcc630370))
 * **cosmos:** upgrade provisioning vat ([#8901](https://github.com/Agoric/agoric-sdk/issues/8901)) ([174e37d](https://github.com/Agoric/agoric-sdk/commit/174e37d7499b372c33ecaf6e05f82f43ebfff902))
 * **cosmos:** upgrade skips proposals with no variant ([4ce1372](https://github.com/Agoric/agoric-sdk/commit/4ce13721201d9a62a40352d909f97a44d8e5b25d))
+* **cosmos:** upgrade vat-bank ([8727b79](https://github.com/Agoric/agoric-sdk/commit/8727b79cf7b9e520630b793ea963a9f375d9707a))
 * **cosmos:** use `x/vbank` ConsensusVersion to upgrade monitoring ([0e367d3](https://github.com/Agoric/agoric-sdk/commit/0e367d3e9870622acc8a38afe57c2b6cbe629341))
 * **cosmos:** use operational artifact level for swingset state export/restore ([161ddd3](https://github.com/Agoric/agoric-sdk/commit/161ddd34ca6c16da0ad3ef716fa5da3d2ba86b68))
 * **cosmos:** wire in vlocalchain to the Cosmos app ([3ea527d](https://github.com/Agoric/agoric-sdk/commit/3ea527d9844dcf2b5f2c60d1bfb1760e064ec0f7))
@@ -138,17 +126,24 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **builders:** use proper `oracleBrand` subkey case ([52f02b7](https://github.com/Agoric/agoric-sdk/commit/52f02b75b6706ee455a32ff83617dd5afb7342a7))
 * **cosmic-swingset:** add missing bits for maxVatsOnline ([8c0c177](https://github.com/Agoric/agoric-sdk/commit/8c0c17752f7439db6f7aee9f88be1dedce2a1bf1))
 * **cosmic-swingset:** plumbing for maxVatsOnline ([45a759a](https://github.com/Agoric/agoric-sdk/commit/45a759a71c8abc724618a12dfd8ae72552b9783e))
+* **cosmos-vm:** allow interleaved client requests ([a2a1cec](https://github.com/Agoric/agoric-sdk/commit/a2a1cec831c4556add77e099621253526596a0f6))
+* **cosmos-vstorage:** split 'size_delta' counter into 'size_increase' and 'size_decrease' ([#11063](https://github.com/Agoric/agoric-sdk/issues/11063)) ([3825031](https://github.com/Agoric/agoric-sdk/commit/38250315cedf68dc801b75bee867818a3846fae7)), closes [#11062](https://github.com/Agoric/agoric-sdk/issues/11062) [#10938](https://github.com/Agoric/agoric-sdk/issues/10938) [/github.com/Agoric/agoric-sdk/pull/10997#discussion_r1956583919](https://github.com/Agoric//github.com/Agoric/agoric-sdk/pull/10997/issues/discussion_r1956583919)
 * **cosmos:** add action context to core evals ([7cfae88](https://github.com/Agoric/agoric-sdk/commit/7cfae88a1d2c31d91030a8742972d9f03d331059))
+* **cosmos:** add some missing pieces ([5cf1f52](https://github.com/Agoric/agoric-sdk/commit/5cf1f522d319434ec30cfb7961e2f3e607326b5f))
 * **cosmos:** Add support for iavl options ([c6770ec](https://github.com/Agoric/agoric-sdk/commit/c6770ece8dd7f3f56c40b3cb80be245a99e01c9d))
 * **cosmos:** correctly detect presence of Agoric VM ([c7e266e](https://github.com/Agoric/agoric-sdk/commit/c7e266e035cc454bf74e88e96959f862ece146f8))
 * **cosmos:** don't init controller before upgrade ([b4260af](https://github.com/Agoric/agoric-sdk/commit/b4260afd158c9f1c6faae8ee95019e1e7c385e5f))
 * **cosmos:** don't rerun store migrations on upgrade ([8738a9b](https://github.com/Agoric/agoric-sdk/commit/8738a9bee247096da1dc72e2d2ba9c338a0cb739))
 * **cosmos:** express dependency between proposals ([3cb85b8](https://github.com/Agoric/agoric-sdk/commit/3cb85b8a67fb69adf1bb0404cd101d205e05cd20))
+* **cosmos:** get `agd start` running again ([ff54e13](https://github.com/Agoric/agoric-sdk/commit/ff54e1369ac9dbbc79ec2e480ea8605201009746))
+* **cosmos:** ibc-go app migration up to `v7.2` ([ef4d95d](https://github.com/Agoric/agoric-sdk/commit/ef4d95d9a9c08a73b5622119a89707eaff6f41cf))
 * **cosmos:** make agd upgrade work ([1aa1d26](https://github.com/Agoric/agoric-sdk/commit/1aa1d26f05875c91fd47da1ad7386d8979f94b03))
 * **cosmos:** module order independent init and bootstrap ([e7f5b65](https://github.com/Agoric/agoric-sdk/commit/e7f5b658b67a18c0a13544515f61216598326265))
+* **cosmos:** more upgrade corrections for app ([11ac62e](https://github.com/Agoric/agoric-sdk/commit/11ac62e451216f9153218ab12ef6cadeec5d6b9b))
 * **cosmos:** no global state in `vm` ([ab02669](https://github.com/Agoric/agoric-sdk/commit/ab0266908ec9f36587d3521287808f7a30ed9207))
 * **cosmos:** only allow snapshot export at latest height ([#9601](https://github.com/Agoric/agoric-sdk/issues/9601)) ([6bc363b](https://github.com/Agoric/agoric-sdk/commit/6bc363b5624bab5fd151ec4889b5f5116f2cf53c)), closes [#9600](https://github.com/Agoric/agoric-sdk/issues/9600)
 * **cosmos:** prevent Golang error wrapping stack frame divergence ([3390d90](https://github.com/Agoric/agoric-sdk/commit/3390d902f42a96e502d459cad224d97c9971e307))
+* **cosmos:** resolve compilation errors ([607c136](https://github.com/Agoric/agoric-sdk/commit/607c136adddd5f9316b5be65cd861250f466bad4))
 * **cosmos:** return an error if version is unsupported ([d17e55b](https://github.com/Agoric/agoric-sdk/commit/d17e55b5d5c0a178e49ed9a0402ed52827074426))
 * **cosmos:** Support building on Linux aarch64 ([ff2e5ed](https://github.com/Agoric/agoric-sdk/commit/ff2e5ed20e52e6484a6cba126b0739b0b1fc6360))
 * **cosmos:** update more `vtransfer` app.go wiring ([a171561](https://github.com/Agoric/agoric-sdk/commit/a1715615a01fce060eb990e1b2bb9a6d6a2a3566))
@@ -161,9 +156,14 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **golang/cosmos:** fix-up a rebase ([59fdc6f](https://github.com/Agoric/agoric-sdk/commit/59fdc6ff6fbe6f167467c15c153c71b82a54bcf4))
 * govulncheck updates ([34d5056](https://github.com/Agoric/agoric-sdk/commit/34d505671509c6883f55cca150b610a18978d1f0))
 * handle hang-on-halt behavior from agoric-labs/cosmos-sdk[#305](https://github.com/Agoric/agoric-sdk/issues/305) ([a4fd510](https://github.com/Agoric/agoric-sdk/commit/a4fd51067ff86d84c084292d1f38b2ca3de639b9))
+* **libdaemon:** handle panics in `//export` functions` ([22d8d3f](https://github.com/Agoric/agoric-sdk/commit/22d8d3feb9f7bf09a31f5ed3c6999642726609a6))
 * **network:** introduce `Finalizer` to close network ([54b9b00](https://github.com/Agoric/agoric-sdk/commit/54b9b009fff3fd3ab54f731adee97195acaa238f))
 * pick up snapshot initiation fix ([38f6c3f](https://github.com/Agoric/agoric-sdk/commit/38f6c3f8dfd4a5ee35f6e7f85bc59853cb7325d9))
+* remove all error on app ([22a0a7d](https://github.com/Agoric/agoric-sdk/commit/22a0a7dc73d1c61e51db100a60086bf5608f75bb))
+* remove all errors from root ([982eedf](https://github.com/Agoric/agoric-sdk/commit/982eedf3b732a2a9b45bac0cd36b3ab24c9b0da9))
+* remove CometBFT committing client ([4df9f70](https://github.com/Agoric/agoric-sdk/commit/4df9f707bc5a1c7582624da3487a3bde511acbe2))
 * remove unesesary error checks and returns ([5f789e8](https://github.com/Agoric/agoric-sdk/commit/5f789e8ea8079f9176723ca318c6aeabb3b1ccfa))
+* simcli get flags ([a054b7e](https://github.com/Agoric/agoric-sdk/commit/a054b7e2ea1e3c570d1fd40f64ac044eb0e781ac))
 * unwrap account keeper for app module ([20a89f0](https://github.com/Agoric/agoric-sdk/commit/20a89f06061cae01166b1b2ca738815c58dc32ed))
 * update dependencies to fix tests ([75d6b1d](https://github.com/Agoric/agoric-sdk/commit/75d6b1dcc0d7286770679bd6d042b38fa76c4312))
 * update protobuf download and generation for ibc-go v4 ([9cdfaef](https://github.com/Agoric/agoric-sdk/commit/9cdfaefcf236711676a0f3ed6e47dbf3c6d77402))

package/Makefile

@@ -3,9 +3,10 @@
 NAME := $(shell sed -ne 's/.*"name": "\([^"]*\)".*/\1/p' package.json)
 VERSION := $(shell sed -ne 's/.*"version": "\([^"]*\)".*/\1/p' package.json)
 GIT_COMMIT = $(shell hash=`git rev-parse --short HEAD 2>/dev/null`; if test -n "$$hash"; then echo $$hash`git diff --quiet || echo -dirty`; else cat git-revision.txt; fi)
-PR_TARGET_REPO = ../../.git
+PR_TARGET_REPO = https://github.com/Agoric/agoric-sdk.git
 # TODO: figure out how to handle other branches like pismo-release
 PR_TARGET_BRANCH = master
+DOCKER := $(shell which docker)
 
 default: all
 
@@ -90,22 +91,38 @@ endif
 ###                           Protobuf                                    ###
 ###############################################################################
 
-proto-gen: proto-tools
-	PATH="${BIN}:$$PATH" ./scripts/protocgen.sh
+protoVer=0.15.3
+protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
+protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
 
-proto-lint: proto-tools
-	${BIN}/buf lint
+proto-all: proto-format proto-lint proto-gen
 
-proto-check-breaking: proto-tools
-	${BIN}/buf breaking --against $(PR_TARGET_REPO)#branch=$(PR_TARGET_BRANCH),subdir=golang/cosmos
+proto-gen:
+	@echo "Generating Protobuf files"
+	@$(protoImage) sh ./scripts/protocgen.sh
 
-GOGO_PROTO_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/gogo/protobuf)
+proto-format:
+	@$(protoImage) find ./proto -name "*.proto" -exec clang-format -i {} \;
+
+proto-lint:
+	@$(protoImage) buf lint --error-format=json ./proto
+
+proto-check-breaking:
+	@$(protoImage) buf breaking --against $(PR_TARGET_REPO)#branch=$(PR_TARGET_BRANCH),subdir=golang/cosmos
+
+GOGO_PROTO_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/gogoproto)
 # GOOGLE_API_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/googleapis/googleapis)/google/api
-IBC_PROTO_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/ibc-go/v6)/proto/ibc/core
+IBC_PROTO_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/ibc-go/v7)/proto/ibc/core
 COSMOS_PROTO_PROTO_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/cosmos-proto)/proto/cosmos_proto
 COSMOS_SDK_PROTO_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/cosmos-sdk)/proto/cosmos
+COSMOS_SDK_AMINO_URL = file://$(shell go list -m -f '{{ .Dir }}' github.com/cosmos/cosmos-sdk)/proto/amino
+
+# Needed for cosmic-proto.
+COSMOS_ICS23_URL = https://buf.build/cosmos/ics23/raw/main/-/cosmos/ics23/v1
 
 COSMOS_PROTO_TYPES = third_party/proto/cosmos_proto
+COSMOS_ICS23_TYPES = third_party/proto/cosmos/ics23/v1
+COSMOS_SDK_AMINO_TYPES = third_party/proto/amino
 GOGO_PROTO_TYPES  = third_party/proto/gogoproto
 GOOGLE_API_TYPES = third_party/proto/google/api
 GOOGLE_PROTO_TYPES = third_party/proto/google/protobuf
@@ -114,12 +131,17 @@ IBC_CLIENT_TYPES = third_party/proto/ibc/core/client/v1
 SDK_BASE_TYPES = third_party/proto/cosmos/base/v1beta1
 SDK_QUERY_TYPES = third_party/proto/cosmos/base/query/v1beta1
 SDK_UPGRADE_TYPES = third_party/proto/cosmos/upgrade/v1beta1
+SDK_MSG_TYPES = third_party/proto/cosmos/msg/v1
 
 proto-update-deps:
 	mkdir -p $(COSMOS_PROTO_TYPES)
 	url="$(COSMOS_PROTO_PROTO_URL)"; \
 	curl -sSL $$url/cosmos.proto > $(COSMOS_PROTO_TYPES)/cosmos.proto
 
+	mkdir -p $(COSMOS_ICS23_TYPES)
+	url="$(COSMOS_ICS23_URL)"; \
+	curl -sSL $$url/proofs.proto > $(COSMOS_ICS23_TYPES)/proofs.proto
+
 	mkdir -p $(GOGO_PROTO_TYPES)
 	url="$(GOGO_PROTO_URL)"; \
 	curl -sSL $$url/gogoproto/gogo.proto > $(GOGO_PROTO_TYPES)/gogo.proto
@@ -147,66 +169,15 @@ proto-update-deps:
 	mkdir -p $(SDK_QUERY_TYPES) && \
 	curl -sSL $$url/base/query/v1beta1/pagination.proto > $(SDK_QUERY_TYPES)/pagination.proto && \
 	mkdir -p $(SDK_UPGRADE_TYPES) && \
-	curl -sSL $$url/upgrade/v1beta1/upgrade.proto > $(SDK_UPGRADE_TYPES)/upgrade.proto
-
-UNAME_S ?= $(shell uname -s)
-UNAME_M ?= $(shell uname -m)
-
-BUF_VERSION ?= 1.0.0
-
-PROTOC_VERSION ?= 3.11.2
-ifeq ($(UNAME_S),Linux)
-  ifeq ($(UNAME_M),aarch64)
-    PROTOC_ZIP ?= protoc-${PROTOC_VERSION}-linux-aarch_64.zip
-  else
-    PROTOC_ZIP ?= protoc-${PROTOC_VERSION}-linux-x86_64.zip
-  endif
-endif
-ifeq ($(UNAME_S),Darwin)
-  PROTOC_ZIP ?= protoc-${PROTOC_VERSION}-osx-x86_64.zip
-endif
-
-proto-tools: proto-tools-stamp buf grpc-gateway-stamp
-
-proto-tools-stamp:
-	echo "Installing protoc compiler..."
-	mkdir -p "${BIN}"
-	(cd /tmp; \
-	curl -OL "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/${PROTOC_ZIP}"; \
-	unzip -o ${PROTOC_ZIP} -d "${BIN}/.." bin/protoc 'include/*'; \
-	rm -f ${PROTOC_ZIP})
-
-	echo "Installing protoc-gen-gocosmos..."
-	go install github.com/regen-network/cosmos-proto/protoc-gen-gocosmos
-
-	# Create dummy file to satisfy dependency and avoid
-	# rebuilding when this Makefile target is hit twice
-	# in a row
-	touch $@
-
-buf: buf-stamp
-
-buf-stamp:
-	echo "Installing buf..."
-	curl -sSL \
-    "https://github.com/bufbuild/buf/releases/download/v${BUF_VERSION}/buf-${UNAME_S}-${UNAME_M}" \
-    -o "${BIN}/buf" && \
-	chmod +x "${BIN}/buf"
-
-	touch $@
-
-GATEWAY_PKGS = \
-	github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway \
-	github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger \
-	google.golang.org/protobuf/cmd/protoc-gen-go
-
-grpc-gateway-stamp:
-	go install $(GATEWAY_PKGS)
-	touch $@
+	curl -sSL $$url/upgrade/v1beta1/upgrade.proto > $(SDK_UPGRADE_TYPES)/upgrade.proto && \
+	mkdir -p $(SDK_MSG_TYPES) && \
+	curl -sSL $$url/msg/v1/msg.proto > $(SDK_MSG_TYPES)/msg.proto
 
-tools-clean:
-	rm -f proto-tools-stamp buf-stamp grpc-gateway-stamp
+	url="$(COSMOS_SDK_AMINO_URL)"; \
+	mkdir -p $(COSMOS_SDK_AMINO_TYPES) && \
+	curl -sSL $$url/amino.proto > $(COSMOS_SDK_AMINO_TYPES)/amino.proto
 
+.PHONY: proto-all proto-format proto-lint proto-gen proto-check-breaking proto-update-deps
 
 lint:
 	golangci-lint run

package/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/v6/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
+	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
+	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
 )
 
 // HandlerOptions extend the SDK's AnteHandler options by requiring the IBC

package/ante/inbound_test.go

@@ -12,7 +12,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/tx"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
-	"github.com/gogo/protobuf/proto"
+	"github.com/cosmos/gogoproto/proto"
 )
 
 func TestInboundAnteHandle(t *testing.T) {