CNS-288 create basic pairing of project providers (lavanet#358)

* working pairing :) * verify pairing returns number of providers and cu * add compute units * fix cu validation * added tests * pr changes * bug fix * merge fixes * added vrfs to project developer keys * added scripts and come quality of life changes * getpairing tested * fix merge problems * solve test problem * fix e2e requirements in config.yml * support legacy * fixed issues with providers * PR review fixes * Delete rpcconsumer.yml * Update msg_server_relay_payment.go * fix a mistake in error handling --------- Co-authored-by: Yarom Swisa <[email protected] git config --global user.name Yarom> Co-authored-by: omer mishael <[email protected]> Co-authored-by: Omer <[email protected]>
tr991tr · Mar 16, 2023 · cfdf8e7 · cfdf8e7
1 parent 8ef954c
commit cfdf8e7
Show file tree

Hide file tree

Showing 55 changed files with 4,680 additions and 1,168 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,4 @@ testutil/debugging/
 
 # Misc
 scripts/vars/
+rpcconsumer.yml
diff --git a/app/app.go b/app/app.go
@@ -437,6 +437,14 @@ func New(
 	)
 	epochstorageModule := epochstoragemodule.NewAppModule(appCodec, app.EpochstorageKeeper, app.AccountKeeper, app.BankKeeper)
 
+	app.ProjectsKeeper = *projectsmodulekeeper.NewKeeper(
+		appCodec,
+		keys[projectsmoduletypes.StoreKey],
+		keys[projectsmoduletypes.MemStoreKey],
+		app.GetSubspace(projectsmoduletypes.ModuleName),
+	)
+	projectsModule := projectsmodule.NewAppModule(appCodec, app.ProjectsKeeper)
+
 	app.PairingKeeper = *pairingmodulekeeper.NewKeeper(
 		appCodec,
 		keys[pairingmoduletypes.StoreKey],
@@ -447,17 +455,10 @@ func New(
 		app.AccountKeeper,
 		app.SpecKeeper,
 		&app.EpochstorageKeeper,
+		app.ProjectsKeeper,
 	)
 	pairingModule := pairingmodule.NewAppModule(appCodec, app.PairingKeeper, app.AccountKeeper, app.BankKeeper)
 
-	app.ProjectsKeeper = *projectsmodulekeeper.NewKeeper(
-		appCodec,
-		keys[projectsmoduletypes.StoreKey],
-		keys[projectsmoduletypes.MemStoreKey],
-		app.GetSubspace(projectsmoduletypes.ModuleName),
-	)
-	projectsModule := projectsmodule.NewAppModule(appCodec, app.ProjectsKeeper)
-
 	app.SubscriptionKeeper = *subscriptionmodulekeeper.NewKeeper(
 		appCodec,
 		keys[subscriptionmoduletypes.StoreKey],

diff --git a/cookbook/plans/default.json b/cookbook/plans/default.json
@@ -4,22 +4,19 @@
         "description": "A proposal of a default plan",
         "plans": [
             {
-                "duration": "1",
+                "index": "DefaultPlan",
+                "description": "This plan has no restrictions",
+                "type": "rpc",
                 "price": {
                     "denom": "ulava",
-                    "amount": "2"
+                    "amount": "100000"
                 },
-                "allow_overuse": true,
-                "block": "10",
-                "index": "DefaultPlanID",
-                "compute_units": "25920",
-                "compute_units_per_epoch": "1",
-                "servicers_to_pair": "2",
-                "overuse_rate": "1",
-                "name": "DefaultPlan",
-                "description": "This plan has no restrictions",
-                "type": "rpc",
-                "annual_discount_percentage": "20"
+                "annual_discount_percentage": "20",
+                "compute_units": "10000000000",
+                "compute_units_per_epoch": "1000",
+                "max_providers_to_pair": "5",
+                "allow_overuse": false,
+                "overuse_rate": "0"
             }
         ]
     },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,3 +26,4 @@ testutil/debugging/

		# Misc
		scripts/vars/
		rpcconsumer.yml