Merge branch 'main' into nullpointer0x00/1328-migrate-msgfees-gov-pro…

…ps-v1
provenance-io · Aug 11, 2023 · 392421d · 392421d
2 parents 6cbff60 + 7835092
commit 392421d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 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@v3
       - name: Buf setup action
-        uses: bufbuild/buf-setup-action@v1.25.0
+        uses: bufbuild/buf-setup-action@v1.26.0
       - 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.25.0
+      - uses: bufbuild/buf-setup-action@v1.26.0
       - uses: bufbuild/buf-lint-action@v1.0.3
         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@v3
       - name: Buf setup action
-        uses: bufbuild/buf-setup-action@v1.25.0
+        uses: bufbuild/buf-setup-action@v1.26.0
       - name: Buf push 'proto/'
         uses: bufbuild/buf-push-action@v1
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -40,6 +40,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Features
 
 * 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 Trigger module queries to stargate whitelist for smart contracts [#1636](https://github.com/provenance-io/provenance/issues/1636)
 
 ### Improvements
 

diff --git a/go.mod b/go.mod
@@ -30,7 +30,7 @@ require (
 	github.com/tendermint/tendermint v0.34.28
 	github.com/tendermint/tm-db v0.6.7
 	golang.org/x/exp v0.0.0-20230310171629-522b1b587ee0
-	golang.org/x/text v0.11.0
+	golang.org/x/text v0.12.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130
 	google.golang.org/grpc v1.57.0

diff --git a/go.sum b/go.sum
@@ -1484,8 +1484,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
+golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

diff --git a/internal/provwasm/stargate_whitelist.go b/internal/provwasm/stargate_whitelist.go
@@ -21,6 +21,7 @@ import (
 	msgfeestypes "github.com/provenance-io/provenance/x/msgfees/types"
 	nametypes "github.com/provenance-io/provenance/x/name/types"
 	rewardtypes "github.com/provenance-io/provenance/x/reward/types"
+	triggertypes "github.com/provenance-io/provenance/x/trigger/types"
 )
 
 // stargateWhitelist keeps whitelist and its deterministic
@@ -119,6 +120,10 @@ func init() {
 	setWhitelistedQuery("/provenance.reward.v1.Query/ClaimPeriodRewardDistributions", &rewardtypes.QueryClaimPeriodRewardDistributionsResponse{})
 	setWhitelistedQuery("/provenance.reward.v1.Query/ClaimPeriodRewardDistributionsByID", &rewardtypes.QueryClaimPeriodRewardDistributionsByIDResponse{})
 	setWhitelistedQuery("/provenance.reward.v1.Query/RewardDistributionsByAddress", &rewardtypes.QueryRewardDistributionsByAddressResponse{})
+
+	// trigger
+	setWhitelistedQuery("/provenance.trigger.v1.Query/TriggerByID", &triggertypes.QueryTriggerByIDResponse{})
+	setWhitelistedQuery("/provenance.trigger.v1.Query/Triggers", &triggertypes.QueryTriggersResponse{})
 }
 
 // GetWhitelistedQuery returns the whitelisted query at the provided path.