add improved supply queries (#809)

* add improved supply queries * lint --------- Co-authored-by: Jacob Gadikian <[email protected]>
quicksilver-zone · Dec 11, 2023 · d0f8f3e · d0f8f3e
1 parent 5cdf155
commit d0f8f3e
Show file tree

Hide file tree

Showing 20 changed files with 1,183 additions and 125 deletions.
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -79,6 +79,7 @@ import (
 	"github.com/quicksilver-zone/quicksilver/x/participationrewards"
 	participationrewardskeeper "github.com/quicksilver-zone/quicksilver/x/participationrewards/keeper"
 	participationrewardstypes "github.com/quicksilver-zone/quicksilver/x/participationrewards/types"
+	supplykeeper "github.com/quicksilver-zone/quicksilver/x/supply/keeper"
 	tokenfactorykeeper "github.com/quicksilver-zone/quicksilver/x/tokenfactory/keeper"
 	tokenfactorytypes "github.com/quicksilver-zone/quicksilver/x/tokenfactory/types"
 )
@@ -118,6 +119,7 @@ type AppKeepers struct {
 	ParticipationRewardsKeeper *participationrewardskeeper.Keeper
 	AirdropKeeper              *airdropkeeper.Keeper
 	TokenFactoryKeeper         tokenfactorykeeper.Keeper
+	SupplyKeeper               supplykeeper.Keeper
 
 	// 		IBC keepers
 	IBCKeeper           *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly
@@ -343,6 +345,14 @@ func (appKeepers *AppKeepers) InitKeepers(
 		scopedTransferKeeper,
 	)
 
+	appKeepers.SupplyKeeper = supplykeeper.NewKeeper(
+		appCodec,
+		appKeepers.keys[icacontrollertypes.StoreKey],
+		appKeepers.AccountKeeper,
+		appKeepers.BankKeeper,
+		appKeepers.StakingKeeper,
+		utils.Keys[[]string](maccPerms),
+	)
 	appKeepers.PacketForwardKeeper.SetTransferKeeper(appKeepers.TransferKeeper)
 	appKeepers.TransferModule = transfer.NewAppModule(appKeepers.TransferKeeper)
 	appKeepers.PacketForwardModule = packetforward.NewAppModule(appKeepers.PacketForwardKeeper)

diff --git a/app/keepers/keys.go b/app/keepers/keys.go
@@ -31,6 +31,7 @@ import (
 	interchainstakingtypes "github.com/quicksilver-zone/quicksilver/x/interchainstaking/types"
 	minttypes "github.com/quicksilver-zone/quicksilver/x/mint/types"
 	participationrewardstypes "github.com/quicksilver-zone/quicksilver/x/participationrewards/types"
+	supplytypes "github.com/quicksilver-zone/quicksilver/x/supply/types"
 	tokenfactorytypes "github.com/quicksilver-zone/quicksilver/x/tokenfactory/types"
 )
 
@@ -66,6 +67,7 @@ func KVStoreKeys() []string {
 		airdroptypes.StoreKey,
 		wasm.StoreKey,
 		tokenfactorytypes.StoreKey,
+		supplytypes.StoreKey,
 	}
 }
 

diff --git a/app/modules.go b/app/modules.go
@@ -66,6 +66,7 @@ import (
 	"github.com/quicksilver-zone/quicksilver/x/participationrewards"
 	participationrewardsclient "github.com/quicksilver-zone/quicksilver/x/participationrewards/client"
 	participationrewardstypes "github.com/quicksilver-zone/quicksilver/x/participationrewards/types"
+	supplytypes "github.com/quicksilver-zone/quicksilver/x/supply/types"
 	"github.com/quicksilver-zone/quicksilver/x/tokenfactory"
 	tokenfactorytypes "github.com/quicksilver-zone/quicksilver/x/tokenfactory/types"
 )
@@ -262,6 +263,7 @@ func orderBeginBlockers() []string {
 		vestingtypes.ModuleName,
 		tokenfactorytypes.ModuleName,
 		wasm.ModuleName,
+		supplytypes.ModuleName,
 	}
 }
 
@@ -305,6 +307,7 @@ func orderEndBlockers() []string {
 		airdroptypes.ModuleName,
 		tokenfactorytypes.ModuleName,
 		wasm.ModuleName,
+		supplytypes.ModuleName,
 		// currently no-op.
 	}
 }
@@ -347,6 +350,7 @@ func orderInitBlockers() []string {
 		participationrewardstypes.ModuleName,
 		airdroptypes.ModuleName,
 		tokenfactorytypes.ModuleName,
+		supplytypes.ModuleName,
 		// wasmd
 		wasm.ModuleName,
 		// NOTE: crisis module must go at the end to check for invariants on each module

diff --git a/app/upgrades.go b/app/upgrades.go
@@ -9,6 +9,7 @@ import (
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 
 	"github.com/quicksilver-zone/quicksilver/app/upgrades"
+	supplytypes "github.com/quicksilver-zone/quicksilver/x/supply/types"
 )
 
 func (app *Quicksilver) setUpgradeHandlers() {
@@ -51,6 +52,11 @@ func (app *Quicksilver) setUpgradeStoreLoaders() {
 		storeUpgrades = &storetypes.StoreUpgrades{
 			Added: []string{packetforwardtypes.ModuleName},
 		}
+
+	case upgrades.V010405rc0UpgradeName:
+		storeUpgrades = &storetypes.StoreUpgrades{
+			Added: []string{supplytypes.ModuleName},
+		}
 	default:
 		// no-op
 	}

diff --git a/app/upgrades/types.go b/app/upgrades/types.go
@@ -40,6 +40,7 @@ const (
 	V010404rc2UpgradeName    = "v1.4.4-rc.2"
 	V010404rc3UpgradeName    = "v1.4.4-rc.3"
 	V010404rc4UpgradeName    = "v1.4.4-rc.4"
+	V010405rc0UpgradeName    = "v1.4.5-rc0"
 )
 
 // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal

diff --git a/docs/swagger.yml b/docs/swagger.yml
@@ -1647,7 +1647,10 @@ paths:
                         protobuf release, and it is not used for type URLs
                         beginning with
 
-                        type.googleapis.com.
+                        type.googleapis.com. As of May 2023, there are no widely
+                        used type server
+
+                        implementations and no plans to implement one.
 
 
                         Schemes other than `http`, `https` (or the empty scheme)
@@ -1692,6 +1695,10 @@ paths:
                         if (any.is(Foo.class)) {
                           foo = any.unpack(Foo.class);
                         }
+                        // or ...
+                        if (any.isSameTypeAs(Foo.getDefaultInstance())) {
+                          foo = any.unpack(Foo.getDefaultInstance());
+                        }
 
                      Example 3: Pack and unpack a message in Python.
 
@@ -1731,7 +1738,6 @@ paths:
                     name "y.z".
 
 
-
                     JSON
 
                     ====
@@ -1958,7 +1964,10 @@ paths:
                         protobuf release, and it is not used for type URLs
                         beginning with
 
-                        type.googleapis.com.
+                        type.googleapis.com. As of May 2023, there are no widely
+                        used type server
+
+                        implementations and no plans to implement one.
 
 
                         Schemes other than `http`, `https` (or the empty scheme)
@@ -2003,6 +2012,10 @@ paths:
                         if (any.is(Foo.class)) {
                           foo = any.unpack(Foo.class);
                         }
+                        // or ...
+                        if (any.isSameTypeAs(Foo.getDefaultInstance())) {
+                          foo = any.unpack(Foo.getDefaultInstance());
+                        }
 
                      Example 3: Pack and unpack a message in Python.
 
@@ -2042,7 +2055,6 @@ paths:
                     name "y.z".
 
 
-
                     JSON
 
                     ====

diff --git a/go.sum b/go.sum
@@ -493,6 +493,7 @@ github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHqu
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=

diff --git a/proto/Dockerfile b/proto/Dockerfile
@@ -1,5 +1,5 @@
 FROM bufbuild/buf:latest as BUILDER
-FROM 1.20.11-alpine
+FROM golang:1.20.11-alpine
 
 RUN apk add --no-cache \
   nodejs \

diff --git a/proto/quicksilver/supply/v1/query.proto b/proto/quicksilver/supply/v1/query.proto
@@ -0,0 +1,20 @@
+syntax = "proto3";
+package quicksilver.supply.v1;
+
+import "google/api/annotations.proto";
+
+option go_package = "github.com/ingenuity-build/quicksilver/x/supply/types";
+
+// Query defines the gRPC querier service.
+service Query {
+  // Supply provide running epochInfos
+  rpc Supply(QuerySupplyRequest) returns (QuerySupplyResponse) {
+    option (google.api.http).get = "/quicksilver/supply/v1/supply";
+  }
+}
+
+message QuerySupplyRequest {}
+message QuerySupplyResponse {
+  uint64 supply = 1;
+  uint64 circulating_supply = 2;
+}
diff --git a/x/airdrop/types/messages.pb.go b/x/airdrop/types/messages.pb.go
diff --git a/x/interchainquery/types/messages.pb.go b/x/interchainquery/types/messages.pb.go