Merge in main.

provenance-io · Nov 20, 2023 · ea818b0 · ea818b0
2 parents f667f9f + 9d436b6
commit ea818b0
Show file tree

Hide file tree

Showing 37 changed files with 8,160 additions and 180 deletions.
diff --git a/.github/workflows/proto-registry.yml b/.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.27.2
+        uses: bufbuild/buf-setup-action@v1.28.1
       - name: Buf push 'third_party/proto'
         uses: bufbuild/buf-push-action@v1
         with:

diff --git a/.github/workflows/proto.yml b/.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.27.2
+      - uses: bufbuild/buf-setup-action@v1.28.1
       - uses: bufbuild/[email protected]
         if: always()
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -158,7 +158,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Buf setup action
-        uses: bufbuild/buf-setup-action@v1.27.2
+        uses: bufbuild/buf-setup-action@v1.28.1
       - name: Buf push 'proto/'
         uses: bufbuild/buf-push-action@v1
         with:

diff --git a/.golangci.yml b/.golangci.yml
@@ -93,9 +93,9 @@ linters-settings:
           - github.com/CosmWasm/wasmvm/types
 
           # used for interchain queries
-          - github.com/strangelove-ventures/async-icq/v6
-          - github.com/strangelove-ventures/async-icq/v6/types
-          - github.com/strangelove-ventures/async-icq/v6/keeper
+          - github.com/cosmos/ibc-apps/modules/async-icq/v6
+          - github.com/cosmos/ibc-apps/modules/async-icq/v6/types
+          - github.com/cosmos/ibc-apps/modules/async-icq/v6/keeper
 
           - github.com/gogo/protobuf
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,75 +39,80 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Features
 
-* Add the (empty) `saffron-rc2` upgrade [#1699](https://github.com/provenance-io/provenance/issues/1699).
 * Add the ibcratelimit module [#1498](https://github.com/provenance-io/provenance/issues/1498).
 
 ### Improvements
 
-* Wrote unit tests on the keeper methods [#1699](https://github.com/provenance-io/provenance/issues/1699).
-* During `FillBids`, the seller settlement fee is now calculated on the total price instead of each order individually [#1699](https://github.com/provenance-io/provenance/issues/1699).
-* In the `OrderFeeCalc` query, ensure the market exists [#1699](https://github.com/provenance-io/provenance/issues/1699).
-
-### Bug Fixes
-
-* During `InitGenesis`, ensure LastOrderId is at least the largest order id [#1699](https://github.com/provenance-io/provenance/issues/1699).
-* Properly populate the permissions lists when reading access grants from state [#1699](https://github.com/provenance-io/provenance/issues/1699).
-* Fixed the paginated order queries to properly look up orders [#1699](https://github.com/provenance-io/provenance/issues/1699).
+* Add upgrade handler for 1.18 [#1756](https://github.com/provenance-io/provenance/pull/1756).
 
 ### Dependencies
 
-- Bump `bufbuild/buf-setup-action` from 1.27.1 to 1.27.2 ([#1724](https://github.com/provenance-io/provenance/pull/1724))
+- Bump `bufbuild/buf-setup-action` from 1.27.1 to 1.28.1 ([#1724](https://github.com/provenance-io/provenance/pull/1724), [#1744](https://github.com/provenance-io/provenance/pull/1744), [#1750](https://github.com/provenance-io/provenance/pull/1750))
 - Bump `github.com/google/uuid` from 1.3.1 to 1.4.0 ([#1723](https://github.com/provenance-io/provenance/pull/1723))
+- Bump `github.com/gorilla/mux` from 1.8.0 to 1.8.1 ([#1734](https://github.com/provenance-io/provenance/pull/1734))
 - Bump `golang.org/x/text` from 0.13.0 to 0.14.0 ([#1735](https://github.com/provenance-io/provenance/pull/1735))
+- Bump `github.com/spf13/cobra` from 1.7.0 to 1.8.0 ([#1733](https://github.com/provenance-io/provenance/pull/1733))
+- Bump `cosmossdk.io/math` from 1.1.2 to 1.2.0 ([#1739](https://github.com/provenance-io/provenance/pull/1739))
+- Update `async-icq` from `github.com/strangelove-ventures/async-icq/v6` to `github.com/cosmos/ibc-apps/modules/async-icq/v6.1.0` ([#1748](https://github.com/provenance-io/provenance/pull/1748))
 
 ---
 
-## [v1.17.0-rc1](https://github.com/provenance-io/provenance/releases/tag/v1.17.0-rc1) - 2023-10-18
+## [v1.17.0](https://github.com/provenance-io/provenance/releases/tag/v1.17.0) - 2023-11-13
 
 ### Features
 
-* Create the `x/exchange` module which facilitates the buying and selling of assets [#1658](https://github.com/provenance-io/provenance/issues/1658).
+* Create the `x/exchange` module which facilitates the buying and selling of assets [#1658](https://github.com/provenance-io/provenance/issues/1658), [#1699](https://github.com/provenance-io/provenance/issues/1699), [#1700](https://github.com/provenance-io/provenance/issues/1700).
   Assets and funds remain in their owner's account (with a hold on them) until the order is settled (or cancelled).
   Market's are created to manage order matching and define fees.
   The chain will receive a portion of the fees a market collects.
 * Allow marker's transfer authority to prevent transfer of restricted coin with deny list on send [#1518](https://github.com/provenance-io/provenance/issues/1518).
 * Add net asset value to markers [#1328](https://github.com/provenance-io/provenance/issues/1328).
 * Add ICQHost and Oracle module to allow cross chain oracle queries [#1497](https://github.com/provenance-io/provenance/issues/1497).
 * New `GetByAddr` metadata query [#1443](https://github.com/provenance-io/provenance/issues/1443).
-* Add Trigger module queries to stargate whitelist for smart contracts [#1636](https://github.com/provenance-io/provenance/issues/1636)
+* Add Trigger module queries to stargate whitelist for smart contracts [#1636](https://github.com/provenance-io/provenance/issues/1636).
 * Added the saffron upgrade handlers [PR 1648](https://github.com/provenance-io/provenance/pull/1648).
+  * Add the ICQ, Oracle, IBC Hooks, Hold, and Exchange modules.
+  * Run module migrations.
+  * Set IBC Hooks params [PR 1659](https://github.com/provenance-io/provenance/pull/1659).
+  * Remove inactive validators.
+  * Migrate marker max supplies to BigInt [#1292](https://github.com/provenance-io/provenance/issues/1292).
+  * Add initial marker NAVs [PR 1712](https://github.com/provenance-io/provenance/pull/1712).
+  * Create denom metadata for IBC markers [#1728](https://github.com/provenance-io/provenance/issues/1728).
 * Create the `x/hold` module which facilitates locking funds in an owners account [#1607](https://github.com/provenance-io/provenance/issues/1607).
   Funds with a hold on them cannot be transferred until the hold is removed.
   Management of holds is internal, but there are queries for looking up holds on accounts.
   Holds are also reflected in the `x/bank` module's `SpendableBalances` query.
-* Add new MaxSupply param to marker module and deprecate MaxTotalSupply. [#1292](https://github.com/provenance-io/provenance/issues/1292).
-* Add hidden docgen command to output documentation in different formats. [#1468](https://github.com/provenance-io/provenance/issues/1468).
+* Add new MaxSupply param to marker module and deprecate MaxTotalSupply [#1292](https://github.com/provenance-io/provenance/issues/1292).
+* Add hidden docgen command to output documentation in different formats [#1468](https://github.com/provenance-io/provenance/issues/1468).
 * Add ics20 marker creation for receiving marker via ibc sends [#1127](https://github.com/provenance-io/provenance/issues/1127).
 
 ### Improvements
 
-* Add IBC-Hooks module for Axelar GMP support [PR 1659](https://github.com/provenance-io/provenance/pull/1659)
-* Update ibcnet ports so they don't conflict with host machine. [#1622](https://github.com/provenance-io/provenance/issues/1622)
-* Replace custom ibc-go v6.1.1 fork with official module.  [#1616](https://github.com/provenance-io/provenance/issues/1616)
-* Migrate `msgfees` gov proposals to v1. [#1328](https://github.com/provenance-io/provenance/issues/1328)
+* Add IBC-Hooks module for Axelar GMP support [PR 1659](https://github.com/provenance-io/provenance/pull/1659).
+* Update ibcnet ports so they don't conflict with host machine [#1622](https://github.com/provenance-io/provenance/issues/1622).
+* Replace custom ibc-go v6.1.1 fork with official module [#1616](https://github.com/provenance-io/provenance/issues/1616).
+* Migrate `msgfees` gov proposals to v1 [#1328](https://github.com/provenance-io/provenance/issues/1328).
 * Updated metadata queries to optionally include the request and id info [#1443](https://github.com/provenance-io/provenance/issues/1443).
   The request is now omitted by default, but will be included if `include_request` is `true`.
   The id info is still included by default, but will be excluded if `exclude_id_info` is `true`.
 * Removed the quicksilver upgrade handlers [PR 1648](https://github.com/provenance-io/provenance/pull/1648).
 * Bump cometbft to v0.34.29 (from v0.34.28) [PR 1649](https://github.com/provenance-io/provenance/pull/1649).
-* Add genesis/init for Marker module send deny list addresses. [#1660](https://github.com/provenance-io/provenance/issues/1660)
-* Add automatic changelog entries for dependabot. [#1674](https://github.com/provenance-io/provenance/issues/1674)
-* Add publishing of docker arm64 container builds [#1634](https://github.com/provenance-io/provenance/issues/1634)
+* Add genesis/init for Marker module send deny list addresses [#1660](https://github.com/provenance-io/provenance/issues/1660).
+* Add automatic changelog entries for dependabot [#1674](https://github.com/provenance-io/provenance/issues/1674).
 * Ensure IBC marker has matching supply [#1706](https://github.com/provenance-io/provenance/issues/1706).
+* Add publishing of docker arm64 container builds [#1634](https://github.com/provenance-io/provenance/issues/1634).
+* Add additional logging to trigger module [#1718](https://github.com/provenance-io/provenance/issues/1718).
+* When the exchange module settles orders, update the marker net-asset-values [#1736](https://github.com/provenance-io/provenance/pull/1736).
+* Add the EventTriggerDetected and EventTriggerExecuted events [#1717](https://github.com/provenance-io/provenance/issues/1717).
 
 ### Bug Fixes
 
 * Fix ibcnet relayer creating multiple connections on restart [#1620](https://github.com/provenance-io/provenance/issues/1620).
 * Fix for incorrect resource-id type casting on contract specification [#1647](https://github.com/provenance-io/provenance/issues/1647).
 * Allow restricted coins to be quarantined [#1626](https://github.com/provenance-io/provenance/issues/1626).
 * Prevent marker forced transfers from module accounts [#1626](https://github.com/provenance-io/provenance/issues/1626).
-* Change config load order so custom.toml can override other config. [#1262](https://github.com/provenance-io/provenance/issues/1262)
-* Fix the saffron and saffron-rc1 upgrade handlers to add correct ibchooks store key [PR 1715](https://github.com/provenance-io/provenance/pull/1715).
+* Change config load order so custom.toml can override other config [#1262](https://github.com/provenance-io/provenance/issues/1262).
+* Fixed denom metadata source chain-id retrieval for new ibc markers [#1726](https://github.com/provenance-io/provenance/issues/1726).
 
 ### Client Breaking
 
@@ -147,7 +152,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Full Commit History
 
-* https://github.com/provenance-io/provenance/compare/v1.16.0...v1.17.0-rc1
+* https://github.com/provenance-io/provenance/compare/v1.16.0...v1.17.0
 
 ---
 
@@ -1287,4 +1292,4 @@ into new 0.40.x base.  Minimal unit test coverage and features in place to begin
 
 The Provenance Blockchain was started by Figure Technologies in 2018 using a Hyperledger Fabric derived private network.
 A subsequent migration was made to a new internal private network based on the 0.38-0.39 series of Cosmos SDK and
-Tendermint.  The Provence-IO/Provenance Cosmos SDK derived public network is the
+Tendermint.  The Provence-IO/Provenance Cosmos SDK derived public network is the
diff --git a/app/app.go b/app/app.go
@@ -17,9 +17,6 @@ import (
 	"github.com/rakyll/statik/fs"
 	"github.com/spf13/cast"
 	"github.com/spf13/viper"
-	icq "github.com/strangelove-ventures/async-icq/v6"
-	icqkeeper "github.com/strangelove-ventures/async-icq/v6/keeper"
-	icqtypes "github.com/strangelove-ventures/async-icq/v6/types"
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/log"
@@ -105,6 +102,9 @@ import (
 	upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client"
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+	icq "github.com/cosmos/ibc-apps/modules/async-icq/v6"
+	icqkeeper "github.com/cosmos/ibc-apps/modules/async-icq/v6/keeper"
+	icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v6/types"
 	ica "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts"
 	icahost "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host"
 	icahostkeeper "github.com/cosmos/ibc-go/v6/modules/apps/27-interchain-accounts/host/keeper"
@@ -588,7 +588,7 @@ func New(
 
 	app.ExchangeKeeper = exchangekeeper.NewKeeper(
 		appCodec, keys[exchange.StoreKey], authtypes.FeeCollectorName,
-		app.AccountKeeper, app.AttributeKeeper, app.BankKeeper, app.HoldKeeper,
+		app.AccountKeeper, app.AttributeKeeper, app.BankKeeper, app.HoldKeeper, app.MarkerKeeper,
 	)
 
 	pioMessageRouter := MessageRouterFunc(func(msg sdk.Msg) baseapp.MsgServiceHandler {
@@ -607,7 +607,7 @@ func New(
 	app.ICQKeeper = icqkeeper.NewKeeper(
 		appCodec, keys[icqtypes.StoreKey], app.GetSubspace(icqtypes.ModuleName),
 		app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper,
-		scopedICQKeeper, app.BaseApp,
+		scopedICQKeeper, app.BaseApp.GRPCQueryRouter(),
 	)
 	icqModule := icq.NewAppModule(app.ICQKeeper)
 	icqIBCModule := icq.NewIBCModule(app.ICQKeeper)