CNS-870: IPRPC part 2 - IPRPC pool implementation

app/app.go

@@ -270,6 +270,7 @@ var (
 		string(rewardsmoduletypes.ProviderRewardsDistributionPool):       {authtypes.Burner, authtypes.Staking},
 		string(rewardsmoduletypes.ProvidersRewardsAllocationPool):        {authtypes.Minter, authtypes.Staking},
 		dualstakingmoduletypes.ModuleName:                                {authtypes.Burner, authtypes.Staking},
+		string(rewardsmoduletypes.IprpcPoolName):                         nil,
 		// this line is used by starport scaffolding # stargate/app/maccPerms
 	}
 )

proto/lavanet/lava/dualstaking/delegator_reward.proto

@@ -10,5 +10,8 @@ message DelegatorReward {
     string delegator = 1;
     string provider = 2;
     string chain_id = 3;
-    cosmos.base.v1beta1.Coin amount = 4 [(gogoproto.nullable) = false];
+    repeated cosmos.base.v1beta1.Coin amount = 4 [
+        (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins",
+        (gogoproto.nullable)     = false
+    ];
 }

proto/lavanet/lava/dualstaking/query.proto

@@ -73,5 +73,8 @@ message QueryDelegatorRewardsResponse {
 message DelegatorRewardInfo {
   string provider = 1;
   string chain_id = 2;
-  cosmos.base.v1beta1.Coin amount = 3 [(gogoproto.nullable) = false];
+  repeated cosmos.base.v1beta1.Coin amount = 3 [
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins",
+    (gogoproto.nullable)     = false
+];
 }

proto/lavanet/lava/pairing/debug_query.proto

@@ -13,10 +13,10 @@ import "lavanet/lava/projects/project.proto";
 
 message QueryDebugQueryResponse {
 	uint64 block_reward = 1;
-	uint64 val_dist_pool_balance = 2;
-	uint64 val_alloc_pool_balance = 3;
-	uint64 provider_dist_pool_balance = 4;
-	uint64 provider_alloc_pool_balance = 5;
+	string val_dist_pool_balance = 2;
+	string val_alloc_pool_balance = 3;
+	string provider_dist_pool_balance = 4;
+	string provider_alloc_pool_balance = 5;
 	uint64 provider_full_reward = 6;
 	uint64 provider_reward_no_bonus = 7;
 	uint64 block = 8;

proto/lavanet/lava/rewards/base_pay.proto

@@ -20,6 +20,8 @@ message BasePay {
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable)   = false
     ];
+
+    uint64 iprpc_cu = 3;
 }
 
 // aggregated rewards for the provider through out the month

proto/lavanet/lava/rewards/genesis.proto

@@ -4,6 +4,7 @@ package lavanet.lava.rewards;
 import "gogoproto/gogo.proto";
 import "lavanet/lava/rewards/params.proto";
 import "lavanet/lava/rewards/base_pay.proto";
+import "lavanet/lava/rewards/iprpc.proto";
 import "lavanet/lava/timerstore/timer.proto";
 import "cosmos/base/v1beta1/coin.proto";
 // this line is used by starport scaffolding # genesis/proto/import
@@ -17,5 +18,7 @@ message GenesisState {
   repeated BasePayGenesis base_pays = 3 [(gogoproto.nullable) = false];
   repeated string iprpc_subscriptions = 4;
   cosmos.base.v1beta1.Coin min_iprpc_cost = 5 [(gogoproto.nullable) = false];
+  repeated IprpcReward iprpc_rewards = 6 [(gogoproto.nullable) = false];
+  uint64 iprpc_rewards_current = 7;
   // this line is used by starport scaffolding # genesis/proto/state
 }

proto/lavanet/lava/rewards/iprpc.proto

@@ -0,0 +1,20 @@
+syntax = "proto3";
+package lavanet.lava.rewards;
+
+option go_package = "github.com/lavanet/lava/x/rewards/types";
+import "gogoproto/gogo.proto"; 
+import "cosmos/base/v1beta1/coin.proto"; 
+
+// object that holds the list for iprpc funcs for a specific month id
+message IprpcReward {
+    uint64 id = 1; // month id
+    repeated Specfund spec_funds = 2 [(gogoproto.nullable) = false]; 
+}
+
+message Specfund {
+    string spec = 1;
+	repeated cosmos.base.v1beta1.Coin fund = 2 [
+        (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins",
+        (gogoproto.nullable)     = false
+    ];
+}

proto/lavanet/lava/rewards/query.proto

@@ -5,6 +5,7 @@ import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "lavanet/lava/rewards/params.proto";
+import "lavanet/lava/rewards/iprpc.proto";
 import "cosmos/base/v1beta1/coin.proto";
 // this line is used by starport scaffolding # 1
 
@@ -31,11 +32,21 @@ service Query {
   rpc ShowIprpcData(QueryShowIprpcDataRequest) returns (QueryShowIprpcDataResponse) {
     option (google.api.http).get = "/lavanet/lava/rewards/show_iprpc_data";
   }
+
   // ProviderReward queries for the providers reward for their services
   rpc ProviderReward(QueryProviderRewardRequest) returns (QueryProviderRewardResponse) {
     option (google.api.http).get = "/lavanet/lava/rewards/provider_reward";
   }
 
+  // IprpcProviderRewardEstimation queries for a provider's current IPRPC reward (relative to its serviced CU)
+  rpc IprpcProviderRewardEstimation(QueryIprpcProviderRewardEstimationRequest) returns (QueryIprpcProviderRewardEstimationResponse) {
+    option (google.api.http).get = "/lavanet/lava/rewards/iprpc_provider_reward/{provider}";
+  }
+
+  // IprpcSpecReward queries for a spec's IPRPC reward
+  rpc IprpcSpecReward(QueryIprpcSpecRewardRequest) returns (QueryIprpcSpecRewardResponse) {
+    option (google.api.http).get = "/lavanet/lava/rewards/iprpc_spec_reward/{spec}";
+  }
   // this line is used by starport scaffolding # 2
 }
 
@@ -53,7 +64,10 @@ message QueryPoolsRequest {}
 
 message PoolInfo {
   string name = 1; // pool name
-  cosmos.base.v1beta1.Coin balance = 2 [(gogoproto.nullable) = false]; // pool balance
+  repeated cosmos.base.v1beta1.Coin balance = 2 [
+    (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins",
+    (gogoproto.nullable)     = false
+  ]; // pool balance (all types of tokens)
 }
 
 // QueryPoolsResponse is response type for the Query/Pools RPC method.
@@ -99,4 +113,25 @@ message QueryProviderRewardResponse {
   repeated RewardInfo rewards = 1 [(gogoproto.nullable) = false];
 }
 
+// QueryIprpcProviderRewardEstimationRequest is request type for the Query/IprpcProviderRewardEstimation RPC method.
+message QueryIprpcProviderRewardEstimationRequest {
+  string provider = 1;
+}
+
+// QueryIprpcProviderRewardEstimationResponse is response type for the Query/IprpcProviderRewardEstimation RPC method.
+message QueryIprpcProviderRewardEstimationResponse {
+  repeated Specfund spec_funds = 1 [(gogoproto.nullable) = false]; 
+}
+
+// QueryIprpcSpecRewardRequest is request type for the Query/IprpcSpecReward RPC method.
+message QueryIprpcSpecRewardRequest {
+  string spec = 1;
+}
+
+// QueryIprpcSpecRewardResponse is response type for the Query/IprpcSpecReward RPC method.
+message QueryIprpcSpecRewardResponse {
+  repeated IprpcReward iprpc_rewards = 1 [(gogoproto.nullable) = false];
+  uint64 current_month_id = 2;
+}
+
 // this line is used by starport scaffolding # 3

proto/lavanet/lava/rewards/tx.proto

@@ -11,6 +11,7 @@ option go_package = "github.com/lavanet/lava/x/rewards/types";
 // Msg defines the Msg service.
 service Msg {
     rpc SetIprpcData(MsgSetIprpcData) returns (MsgSetIprpcDataResponse);
+    rpc FundIprpc(MsgFundIprpc) returns (MsgFundIprpcResponse);
     // this line is used by starport scaffolding # proto/tx/rpc
 }
 
@@ -23,4 +24,17 @@ message MsgSetIprpcData {
 message MsgSetIprpcDataResponse {
 }
 
+message MsgFundIprpc {
+    string creator = 1;
+    uint64 duration = 2; // vesting duration in months
+    repeated cosmos.base.v1beta1.Coin amounts = 3 [
+        (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins",
+        (gogoproto.nullable)     = false
+    ]; // tokens to be distributed as reward
+    string spec = 4; // spec on which the providers get incentive 
+}
+
+message MsgFundIprpcResponse {
+}
+
 // this line is used by starport scaffolding # proto/tx/message

scripts/cli_test.sh

@@ -183,6 +183,8 @@ echo "Testing rewards q commands"
 trace lavad q rewards pools >/dev/null
 trace lavad q rewards block-reward >/dev/null
 trace lavad q rewards show-iprpc-data > /dev/null
+trace lavad q rewards iprpc-provider-reward > /dev/null
+trace lavad q rewards iprpc-spec-reward > /dev/null
 trace lavad q rewards provider-reward >/dev/null
 
 echo "Testing events command"

scripts/init_chain.sh

@@ -113,6 +113,7 @@ if [ "$1" == "debug" ]; then
 else
     lavad add-genesis-account providers_rewards_allocation_pool 30000000000000ulava --module-account 
 fi
+lavad add-genesis-account iprpc_pool 0ulava --module-account
 lavad gentx alice 10000000000000ulava --chain-id $chainID
 lavad collect-gentxs
 lavad start --pruning=nothing

scripts/init_chain_commands.sh

@@ -107,6 +107,10 @@ sleep_until_next_epoch
 HEALTH_FILE="config/health_examples/health_template.yml"
 create_health_config $HEALTH_FILE $(lavad keys show user1 -a) $(lavad keys show servicer2 -a) $(lavad keys show servicer3 -a)
 
+lavad tx gov submit-legacy-proposal set-iprpc-data 1000000000ulava --min-cost 100ulava --add-subscriptions $(lavad keys show -a user1) --from alice -y
+wait_count_blocks 1
+lavad tx gov vote $(latest_vote) yes -y --from alice --gas-adjustment "1.5" --gas "auto" --gas-prices $GASPRICE
+
 if [[ "$1" != "--skip-providers" ]]; then
 . ${__dir}/setup_providers.sh
 echo "letting providers start and running health check"

testutil/common/tester.go

@@ -307,6 +307,10 @@ func (ts *Tester) GetBalance(accAddr sdk.AccAddress) int64 {
 	return ts.Keepers.BankKeeper.GetBalance(ts.Ctx, accAddr, denom).Amount.Int64()
 }
 
+func (ts *Tester) GetBalances(accAddr sdk.AccAddress) sdk.Coins {
+	return ts.Keepers.BankKeeper.GetAllBalances(ts.Ctx, accAddr)
+}
+
 func (ts *Tester) FindPlan(index string, block uint64) (planstypes.Plan, bool) {
 	return ts.Keepers.Plans.FindPlan(ts.Ctx, index, block)
 }
@@ -610,9 +614,14 @@ func (ts *Tester) TxPairingUnfreezeProvider(addr, chainID string) (*pairingtypes
 	return ts.Servers.PairingServer.UnfreezeProvider(ts.GoCtx, msg)
 }
 
-func (ts *Tester) TxRewardsSetIprpcDataProposal(ctx sdk.Context, authority string, cost sdk.Coin, subs []string) (*rewardstypes.MsgSetIprpcDataResponse, error) {
+func (ts *Tester) TxRewardsSetIprpcDataProposal(authority string, cost sdk.Coin, subs []string) (*rewardstypes.MsgSetIprpcDataResponse, error) {
 	msg := rewardstypes.NewMsgSetIprpcData(authority, cost, subs)
-	return ts.Servers.RewardsServer.SetIprpcData(sdk.WrapSDKContext(ctx), msg)
+	return ts.Servers.RewardsServer.SetIprpcData(ts.GoCtx, msg)
+}
+
+func (ts *Tester) TxRewardsFundIprpc(creator string, spec string, duration uint64, fund sdk.Coins) (*rewardstypes.MsgFundIprpcResponse, error) {
+	msg := rewardstypes.NewMsgFundIprpc(creator, spec, duration, fund)
+	return ts.Servers.RewardsServer.FundIprpc(ts.GoCtx, msg)
 }
 
 // TxCreateValidator: implement 'tx staking createvalidator' and bond its tokens
@@ -859,11 +868,26 @@ func (ts *Tester) QueryRewardsBlockReward() (*rewardstypes.QueryBlockRewardRespo
 	return ts.Keepers.Rewards.BlockReward(ts.GoCtx, msg)
 }
 
-func (ts *Tester) QueryShowIprpcData() (*rewardstypes.QueryShowIprpcDataResponse, error) {
+// QueryRewardsShowIprpcData implements 'q rewards show-iprpc-data'
+func (ts *Tester) QueryRewardsShowIprpcData() (*rewardstypes.QueryShowIprpcDataResponse, error) {
 	msg := &rewardstypes.QueryShowIprpcDataRequest{}
 	return ts.Keepers.Rewards.ShowIprpcData(ts.GoCtx, msg)
 }
 
+func (ts *Tester) QueryRewardsIprpcProviderRewardEstimation(provider string) (*rewardstypes.QueryIprpcProviderRewardEstimationResponse, error) {
+	msg := &rewardstypes.QueryIprpcProviderRewardEstimationRequest{
+		Provider: provider,
+	}
+	return ts.Keepers.Rewards.IprpcProviderRewardEstimation(ts.GoCtx, msg)
+}
+
+func (ts *Tester) QueryRewardsIprpcSpecReward(spec string) (*rewardstypes.QueryIprpcSpecRewardResponse, error) {
+	msg := &rewardstypes.QueryIprpcSpecRewardRequest{
+		Spec: spec,
+	}
+	return ts.Keepers.Rewards.IprpcSpecReward(ts.GoCtx, msg)
+}
+
 // block/epoch helpers
 // QueryRewardsProviderReward implements 'q rewards provider-reward'
 func (ts *Tester) QueryRewardsProviderReward(chainID string, provider string) (*rewardstypes.QueryProviderRewardResponse, error) {

testutil/e2e/paymentE2E.go

@@ -119,7 +119,7 @@ func (lt *lavaTest) getRewards(addresses []string) ([]sdk.Coin, error) {
 		}
 		total := sdk.NewCoin(commonconsts.TestTokenDenom, sdk.ZeroInt())
 		for _, r := range res.Rewards {
-			total = total.Add(r.Amount)
+			total = total.AddAmount(r.Amount.AmountOf(commonconsts.TestTokenDenom))
 		}
 		rewards = append(rewards, total)
 	}

testutil/keeper/mock_keepers.go

@@ -77,15 +77,9 @@ func (k mockBankKeeper) GetAllBalances(ctx sdk.Context, addr sdk.AccAddress) sdk
 }
 
 func (k mockBankKeeper) SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error {
-	// TODO support multiple coins
 	moduleAcc := GetModuleAddress(recipientModule)
-	if amt.Len() > 1 {
-		return fmt.Errorf("mockbankkeeper dont support more than 1 coin")
-	}
-	coin := amt[0]
-
-	accountCoin := k.GetBalance(ctx, senderAddr, coin.Denom)
-	if coin.Amount.GT(accountCoin.Amount) {
+	accountCoins := k.GetAllBalances(ctx, senderAddr)
+	if !accountCoins.IsAllGTE(amt) {
 		return fmt.Errorf("not enough coins")
 	}
 
@@ -99,47 +93,20 @@ func (k mockBankKeeper) UndelegateCoinsFromModuleToAccount(ctx sdk.Context, send
 }
 
 func (k mockBankKeeper) SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error {
-	// TODO support multiple coins
 	moduleAcc := GetModuleAddress(senderModule)
-
-	if amt.Len() > 1 {
-		return fmt.Errorf("mockbankkeeper doesn't support more than 1 coin")
-	}
-	coin := amt[0]
-
-	accountCoin := k.GetBalance(ctx, moduleAcc, coin.Denom)
-	if coin.Amount.GT(accountCoin.Amount) {
+	accountCoins := k.GetAllBalances(ctx, moduleAcc)
+	if !accountCoins.IsAllGTE(amt) {
 		return fmt.Errorf("not enough coins")
 	}
 
 	k.SubFromBalance(moduleAcc, amt)
-
 	k.AddToBalance(recipientAddr, amt)
-
 	return nil
 }
 
 func (k mockBankKeeper) SendCoinsFromModuleToModule(ctx sdk.Context, senderModule string, recipientModule string, amt sdk.Coins) error {
-	// TODO support multiple coins
-
 	senderModuleAcc := GetModuleAddress(senderModule)
-	recipientModuleAcc := GetModuleAddress(recipientModule)
-
-	if amt.Len() > 1 {
-		return fmt.Errorf("mockbankkeeper doesn't support more than 1 coin")
-	}
-	coin := amt[0]
-
-	senderAccountCoin := k.GetBalance(ctx, senderModuleAcc, coin.Denom)
-	if coin.Amount.GT(senderAccountCoin.Amount) {
-		return fmt.Errorf("not enough coins")
-	}
-
-	k.SubFromBalance(senderModuleAcc, amt)
-
-	k.AddToBalance(recipientModuleAcc, amt)
-
-	return nil
+	return k.SendCoinsFromAccountToModule(ctx, senderModuleAcc, recipientModule, amt)
 }
 
 func (k mockBankKeeper) DelegateCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error {

utils/time.go

@@ -41,3 +41,15 @@ func NextMonth(date time.Time) time.Time {
 		time.UTC,
 	)
 }
+
+func IsMiddleOfMonthPassed(date time.Time) bool {
+	// Get the total number of days in the current month
+	_, month, year := date.Date()
+	daysInMonth := time.Date(year, month+1, 0, 0, 0, 0, 0, time.UTC).Day()
+
+	// Calculate the middle day of the month
+	middleDay := daysInMonth / 2
+
+	// Check if the day of the given date is greater than the middle day
+	return date.Day() > middleDay
+}