Merge branch 'main' into 2063-update-swagger

.github/workflows/docker.yml

@@ -25,8 +25,6 @@ concurrency:
   cancel-in-progress: true
 jobs:
   heighliner-docker:
-    # temporarily disable heighliner docker build until issue fixed: https://github.com/strangelove-ventures/heighliner/issues/253
-    if: false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -51,24 +49,30 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      # use forked branch until https://github.com/strangelove-ventures/heighliner/issues/253 is fixed
+      # heighliner does not support the wasmvm pathing yet so a "pre-build" step is required
+      # lock to "linux/amd64" only for now due to differing "pre-build" steps
+      # https://github.com/CosmWasm/wasmvm/blob/main/docs/MIGRATING.md
       - uses: strangelove-ventures/heighliner-build-action@main
         with:
-          heighliner-tag: v1.5.5
+          heighliner-owner: ProvLabs
+          heighliner-tag: v1.6.3
           chain: provenance
           local: true
           tag: ${{ steps.meta.outputs.version }}
           registry: provenanceio
+          platform: linux/amd64
           dockerfile: cosmos
           build-target: |
             cd ..
             make install
           binaries: |
             - /go/bin/provenanced
+          pre-build: |
+            cp /lib/libwasmvm_muslc.a /lib/libwasmvm_muslc.x86_64.a
           build-env: |
             - "WITH_LEDGER=false"
-            - "WITH_CLEVELDB=false"
             - "BUILD_TAGS=muslc musl dynamic"
-          additional-args: "--alpine-version 3.18"
           skip: ${{ github.event_name == 'pull_request' }}
 
   docker:

.github/workflows/proto-registry.yml

@@ -30,7 +30,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Buf setup action
-        uses: bufbuild/buf-setup-action@v1.33.0
+        uses: bufbuild/buf-setup-action@v1.34.0
       - name: Buf push 'third_party/proto'
         uses: bufbuild/buf-push-action@v1
         with:

.github/workflows/proto.yml

@@ -40,7 +40,7 @@ jobs:
           fi
           echo "Setting output: base-branch=$branch"
           echo "base-branch=$branch" >> "$GITHUB_OUTPUT"
-      - uses: bufbuild/buf-setup-action@v1.33.0
+      - uses: bufbuild/buf-setup-action@v1.34.0
       - uses: bufbuild/[email protected]
         if: always()
         with:

.github/workflows/release.yml

@@ -119,7 +119,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Buf setup action
-        uses: bufbuild/buf-setup-action@v1.33.0
+        uses: bufbuild/buf-setup-action@v1.34.0
       - name: Buf push 'proto/'
         uses: bufbuild/buf-push-action@v1
         with:

CHANGELOG.md

@@ -45,6 +45,41 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Features
 
+* Create a script for updating links in the spec docs to proto messages [#2068](https://github.com/provenance-io/provenance/pull/2068).
+
+### Improvements
+
+* Update all the proto links in the spec docs to point to `v1.19.0` versions of the proto files [#2068](https://github.com/provenance-io/provenance/pull/2068).
+* Add the (empty) `umber-rc2` upgrade [#2069](https://github.com/provenance-io/provenance/pull/2069).
+
+### Dependencies
+
+- Bump `github.com/hashicorp/go-getter` from 1.7.4 to 1.7.5 ([#2057](https://github.com/provenance-io/provenance/pull/2057))
+- Bump `bufbuild/buf-setup-action` from 1.33.0 to 1.34.0 ([#2049](https://github.com/provenance-io/provenance/pull/2049))
+- Bump `google.golang.org/grpc` from 1.64.0 to 1.65.0 ([#2065](https://github.com/provenance-io/provenance/pull/2065))
+- Bump `github.com/cometbft/cometbft` from 0.38.7 to 0.38.9 ([#2061](https://github.com/provenance-io/provenance/pull/2061))
+- Bump `github.com/cosmos/ibc-go/modules/capability` from 1.0.0 to 1.0.1 ([#2064](https://github.com/provenance-io/provenance/pull/2064))
+- Bump `github.com/rs/cors` from 1.10.1 to 1.11.0 ([#2066](https://github.com/provenance-io/provenance/pull/2066))
+
+---
+
+## [v1.19.0-rc2](https://github.com/provenance-io/provenance/releases/tag/v1.19.0-rc2) - 2024-06-25
+
+### Bug Fixes
+
+* Fix the heighliner docker image build [#2052](https://github.com/provenance-io/provenance/pull/2052).
+
+### Full Commit History
+
+* https://github.com/provenance-io/provenance/compare/v1.19.0-rc1...v1.19.0-rc2
+* https://github.com/provenance-io/provenance/compare/v1.18.0...v1.19.0-rc2
+
+---
+
+## [v1.19.0-rc1](https://github.com/provenance-io/provenance/releases/tag/v1.19.0-rc1) - 2024-06-24
+
+### Features
+
 * Bump cosmos-SDK to `v0.50.2` (from `v0.46.13-pio-2`) [#1772](https://github.com/provenance-io/provenance/issues/1772).
 * Add store for crisis module for sdk v0.50 [#1760](https://github.com/provenance-io/provenance/issues/1760).
 * Add PreBlocker support for sdk v0.50 [#1760](https://github.com/provenance-io/provenance/issues/1760).

app/upgrades.go

@@ -56,7 +56,7 @@ type appUpgrade struct {
 // If something is happening in the rc upgrade(s) that isn't being applied in the non-rc,
 // or vice versa, please add comments explaining why in both entries.
 var upgrades = map[string]appUpgrade{
-	"umber-rc1": { // upgrade for v1.19.0-rc1
+	"umber-rc1": { // upgrade for v1.19.0-rc2
 		Added:   []string{crisistypes.ModuleName, circuittypes.ModuleName, consensusparamtypes.ModuleName},
 		Deleted: []string{"reward"},
 		Handler: func(ctx sdk.Context, app *App, vm module.VersionMap) (module.VersionMap, error) {
@@ -105,6 +105,7 @@ var upgrades = map[string]appUpgrade{
 			return vm, nil
 		},
 	},
+	"umber-rc2": {}, // upgrade for v1.19.0-rc3
 	"umber": { // upgrade for v1.19.0
 		Added:   []string{crisistypes.ModuleName, circuittypes.ModuleName, consensusparamtypes.ModuleName},
 		Deleted: []string{"reward"},

app/upgrades_test.go

@@ -402,6 +402,18 @@ func (s *UpgradeTestSuite) TestUmberRC1() {
 	s.AssertUpgradeHandlerLogs("umber-rc1", expInLog, nil)
 }
 
+func (s *UpgradeTestSuite) TestUmberRC2() {
+	key := "umber-rc2"
+	s.Assert().Contains(upgrades, key, "%q defined upgrades map", key)
+
+	entry := upgrades[key]
+	s.Assert().NotNil(entry, "%q entry in the upgrades map", key)
+	s.Assert().Empty(entry.Added, "%q.Added", key)
+	s.Assert().Empty(entry.Deleted, "%q.Deleted", key)
+	s.Assert().Empty(entry.Renamed, "%q.Renamed", key)
+	s.Assert().Nil(entry.Handler, "%q.Handler", key)
+}
+
 func (s *UpgradeTestSuite) TestUmber() {
 	expInLog := []string{
 		"INF Pruning expired consensus states for IBC.",

cmd/provenanced/cmd/config_test.go

@@ -323,7 +323,7 @@ priv_validator_key_file="config/priv_validator_key.json"
 priv_validator_laddr=""
 priv_validator_state_file="data/priv_validator_state.json"
 proxy_app="tcp://127.0.0.1:26658"
-version="0.38.7"
+version="0.38.9"
 blocksync.version="v0"
 consensus.create_empty_blocks=true
 consensus.create_empty_blocks_interval="0s"
@@ -352,6 +352,7 @@ mempool.max_batch_bytes=0
 mempool.max_tx_bytes=1048576
 mempool.max_txs_bytes=1073741824
 mempool.recheck=true
+mempool.recheck_timeout="1s"
 mempool.size=5000
 mempool.type="flood"
 mempool.wal_dir=""
@@ -387,6 +388,7 @@ rpc.laddr="tcp://127.0.0.1:26657"
 rpc.max_body_bytes=1000000
 rpc.max_header_bytes=1048576
 rpc.max_open_connections=900
+rpc.max_request_batch_size=10
 rpc.max_subscription_clients=100
 rpc.max_subscriptions_per_client=5
 rpc.pprof_laddr=""
@@ -521,6 +523,7 @@ func (s *ConfigTestSuite) TestConfigGetMulti() {
 				`mempool.max_tx_bytes=1048576`,
 				`mempool.max_txs_bytes=1073741824`,
 				`mempool.recheck=true`,
+				`mempool.recheck_timeout="1s"`,
 				`mempool.size=5000`,
 				`mempool.type="flood"`,
 				`mempool.wal_dir=""`,
@@ -699,6 +702,7 @@ func (s *ConfigTestSuite) TestConfigChanged() {
 				`mempool.max_tx_bytes=1048576 (same as default)`,
 				`mempool.max_txs_bytes=1073741824 (same as default)`,
 				`mempool.recheck=true (same as default)`,
+				`mempool.recheck_timeout="1s" (same as default)`,
 				`mempool.size=5000 (same as default)`,
 				`mempool.type="flood" (same as default)`,
 				`mempool.wal_dir="" (same as default)`,

go.mod

@@ -18,15 +18,15 @@ require (
 	cosmossdk.io/x/upgrade v0.1.3
 	github.com/CosmWasm/wasmd v0.51.0
 	github.com/CosmWasm/wasmvm/v2 v2.0.1
-	github.com/cometbft/cometbft v0.38.7
+	github.com/cometbft/cometbft v0.38.9
 	github.com/cometbft/cometbft-db v0.9.1
 	github.com/cosmos/cosmos-db v1.0.2
 	github.com/cosmos/cosmos-proto v1.0.0-beta.5
 	github.com/cosmos/cosmos-sdk v0.50.7
 	github.com/cosmos/go-bip39 v1.0.0
 	github.com/cosmos/gogoproto v1.5.0
 	github.com/cosmos/ibc-apps/modules/async-icq/v8 v8.0.0
-	github.com/cosmos/ibc-go/modules/capability v1.0.0
+	github.com/cosmos/ibc-go/modules/capability v1.0.1
 	github.com/cosmos/ibc-go/v8 v8.3.2
 	github.com/ghodss/yaml v1.0.0
 	github.com/golang/protobuf v1.5.4
@@ -42,16 +42,15 @@ require (
 	github.com/stretchr/testify v1.9.0
 	golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0
 	golang.org/x/text v0.16.0
-	google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237
-	google.golang.org/grpc v1.64.0
+	google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157
+	google.golang.org/grpc v1.65.0
 	google.golang.org/protobuf v1.34.2
 	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
 	cloud.google.com/go v0.112.1 // indirect
-	cloud.google.com/go/compute v1.25.1 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	cloud.google.com/go/compute/metadata v0.3.0 // indirect
 	cloud.google.com/go/iam v1.1.6 // indirect
 	cloud.google.com/go/storage v1.38.0 // indirect
 	cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
@@ -105,7 +104,7 @@ require (
 	github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
 	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/glog v1.2.0 // indirect
+	github.com/golang/glog v1.2.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
@@ -121,13 +120,14 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
 	github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
-	github.com/hashicorp/go-getter v1.7.4 // indirect
+	github.com/hashicorp/go-getter v1.7.5 // indirect
 	github.com/hashicorp/go-hclog v1.5.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-plugin v1.6.0 // indirect
 	github.com/hashicorp/go-safetemp v1.0.0 // indirect
 	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/yamux v0.1.1 // indirect
 	github.com/hdevalence/ed25519consensus v0.1.0 // indirect
@@ -165,7 +165,7 @@ require (
 	github.com/prometheus/procfs v0.13.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/rs/cors v1.10.1 // indirect
+	github.com/rs/cors v1.11.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -187,17 +187,16 @@ require (
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.22.0 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/oauth2 v0.18.0 // indirect
+	golang.org/x/crypto v0.23.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/oauth2 v0.20.0 // indirect
 	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/term v0.19.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
+	golang.org/x/term v0.20.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/api v0.171.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect