Fix proto imports

pokt-network · Dec 21, 2023 · 86cca4f · 86cca4f
1 parent 1d4e475
commit 86cca4f
Show file tree

Hide file tree

Showing 6 changed files with 199 additions and 10 deletions.
diff --git a/go.mod b/go.mod
@@ -24,7 +24,6 @@ require (
 	github.com/athanorlabs/go-dleq v0.1.0
 	github.com/cometbft/cometbft v0.37.2
 	github.com/cometbft/cometbft-db v0.8.0
-	github.com/cosmos/cosmos-proto v1.0.0-beta.2
 	github.com/cosmos/cosmos-sdk v0.47.3
 	github.com/cosmos/gogoproto v1.4.11
 	github.com/cosmos/ibc-go/v7 v7.1.0
@@ -46,7 +45,6 @@ require (
 	go.uber.org/multierr v1.11.0
 	golang.org/x/crypto v0.15.0
 	golang.org/x/sync v0.5.0
-	google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb
 	google.golang.org/grpc v1.59.0
 	gopkg.in/yaml.v2 v2.4.0
 )
@@ -90,6 +88,7 @@ require (
 	github.com/containerd/cgroups v1.1.0 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/cosmos/btcutil v1.0.5 // indirect
+	github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect
 	github.com/cosmos/go-bip39 v1.0.0 // indirect
 	github.com/cosmos/gogogateway v1.2.0 // indirect
 	github.com/cosmos/iavl v0.20.0 // indirect
@@ -285,6 +284,7 @@ require (
 	google.golang.org/api v0.143.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect

diff --git a/proto/pocket/supplier/params.proto b/proto/pocket/supplier/params.proto
@@ -8,5 +8,6 @@ option go_package = "github.com/pokt-network/poktroll/x/supplier/types";
 // Params defines the parameters for the module.
 message Params {
   option (gogoproto.goproto_stringer) = false;
-
+  // TODO_BLOCKER: Add proof related submission window params
+  // TODO_BLOCKER: Add claim related submission window params
 }
diff --git a/proto/pocket/tokenomics/genesis.proto b/proto/pocket/tokenomics/genesis.proto
@@ -1,8 +1,8 @@
 syntax = "proto3";
-package poktroll.tokenomics;
+package pocket.tokenomics;
 
 import "gogoproto/gogo.proto";
-import "poktroll/tokenomics/params.proto";
+import "pocket/tokenomics/params.proto";
 
 option go_package = "github.com/pokt-network/poktroll/x/tokenomics/types";
 

diff --git a/proto/pocket/tokenomics/params.proto b/proto/pocket/tokenomics/params.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package poktroll.tokenomics;
+package pocket.tokenomics;
 
 import "gogoproto/gogo.proto";
 
@@ -8,6 +8,194 @@ option go_package = "github.com/pokt-network/poktroll/x/tokenomics/types";
 // Params defines the parameters for the module.
 message Params {
   option (gogoproto.goproto_stringer) = false;
-  
+
   uint64 computeToTokensMultiplier = 1 [(gogoproto.moretags) = "yaml:\"compute_to_tokens_multiplier\""];
+  /* Ideas:
+    - RelayToTokensMultiplier
+    - Application.MaxuPOKTPerRelay
+    - Application.MinuPOKTPerRelay
+    - Suppler.MaxuPOKTPerRelay
+    - Suppler.MinuPOKTPerRelay
+    - PercentageCutToDAO
+    - PercentageCutToSequencer
+    - PercentageCutToOthers?
+  */
+}
+
+
+
+/*
+{
+  "app_params": [
+    {
+      "param_key": "application/ParticipationRateOn",
+      "param_value": "false"
+    },
+    {
+      "param_key": "application/ApplicationStakeMinimum",
+      "param_value": "1000000"
+    },
+    {
+      "param_key": "application/MaxApplications",
+      "param_value": "2295"
+    },
+    {
+      "param_key": "application/StabilityAdjustment",
+      "param_value": "0"
+    },
+    {
+      "param_key": "application/BaseRelaysPerPOKT",
+      "param_value": "200000"
+    },
+    {
+      "param_key": "application/AppUnstakingTime",
+      "param_value": "1814000000000000"
+    },
+    {
+      "param_key": "application/MaximumChains",
+      "param_value": "15"
+    }
+  ],
+  "auth_params": [
+    {
+      "param_key": "auth/MaxMemoCharacters",
+      "param_value": "75"
+    },
+    {
+      "param_key": "auth/FeeMultipliers",
+      "param_value": "{\"fee_multiplier\":null,\"default\":\"1\"}"
+    },
+    {
+      "param_key": "auth/TxSigLimit",
+      "param_value": "8"
+    }
+  ],
+  "gov_params": [
+    {
+      "param_key": "gov/daoOwner",
+      "param_value": "a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4"
+    },
+    {
+      "param_key": "gov/acl",
+      "param_value": "{\"type\":\"gov/non_map_acl\",\"value\":[{\"acl_key\":\"application/ApplicationStakeMinimum\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"application/AppUnstakingTime\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"application/BaseRelaysPerPOKT\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"application/MaxApplications\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"application/MaximumChains\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"application/ParticipationRateOn\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"application/StabilityAdjustment\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"auth/MaxMemoCharacters\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"auth/TxSigLimit\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"gov/acl\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"gov/daoOwner\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"gov/upgrade\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pocketcore/ClaimExpiration\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"auth/FeeMultipliers\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pocketcore/ReplayAttackBurnMultiplier\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/ProposerPercentage\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pocketcore/ClaimSubmissionWindow\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pocketcore/MinimumNumberOfProofs\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pocketcore/SessionNodeCount\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pocketcore/SupportedBlockchains\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/BlocksPerSession\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/DAOAllocation\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/DowntimeJailDuration\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/MaxEvidenceAge\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/MaximumChains\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/MaxJailedBlocks\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/MaxValidators\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/MinSignedPerWindow\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/RelaysToTokensMultiplier\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/SignedBlocksWindow\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/SlashFractionDoubleSign\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/SlashFractionDowntime\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/StakeDenom\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/StakeMinimum\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/UnstakingTime\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/ServicerStakeFloorMultiplier\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/ServicerStakeWeightMultiplier\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/ServicerStakeWeightCeiling\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pos/ServicerStakeFloorMultiplierExponent\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"},{\"acl_key\":\"pocketcore/BlockByteSize\",\"address\":\"a83172b67b5ffbfcb8acb95acc0fd0466a9d4bc4\"}]}"
+    },
+    {
+      "param_key": "gov/upgrade",
+      "param_value": "{\"type\":\"gov/upgrade\",\"value\":{\"Height\":\"102687\",\"Version\":\"0.10.4\",\"OldUpgradeHeight\":\"74616\",\"Features\":[\"BLOCK:102698\",\"CRVAL:102690\",\"MREL:69232\",\"NCUST:74620\",\"OEDIT:102695\",\"REDUP:57620\",\"RSCAL:69232\"]}}"
+    }
+  ],
+  "node_params": [
+    {
+      "param_key": "pos/MaxJailedBlocks",
+      "param_value": "37960"
+    },
+    {
+      "param_key": "pos/RelaysToTokensMultiplier",
+      "param_value": "435"
+    },
+    {
+      "param_key": "pos/UnstakingTime",
+      "param_value": "1814000000000000"
+    },
+    {
+      "param_key": "pos/SlashFractionDoubleSign",
+      "param_value": "0.000001000000000000"
+    },
+    {
+      "param_key": "pos/StakeMinimum",
+      "param_value": "15000000000"
+    },
+    {
+      "param_key": "pos/MaxEvidenceAge",
+      "param_value": "120000000000"
+    },
+    {
+      "param_key": "pos/MaximumChains",
+      "param_value": "15"
+    },
+    {
+      "param_key": "pos/ServicerStakeFloorMultiplier",
+      "param_value": "15000000000"
+    },
+    {
+      "param_key": "pos/SlashFractionDowntime",
+      "param_value": "0.000001000000000000"
+    },
+    {
+      "param_key": "pos/DowntimeJailDuration",
+      "param_value": "3600000000000"
+    },
+    {
+      "param_key": "pos/ServicerStakeFloorMultiplierExponent",
+      "param_value": "1.000000000000000000"
+    },
+    {
+      "param_key": "pos/StakeDenom",
+      "param_value": "upokt"
+    },
+    {
+      "param_key": "pos/DAOAllocation",
+      "param_value": "10"
+    },
+    {
+      "param_key": "pos/MaxValidators",
+      "param_value": "1000"
+    },
+    {
+      "param_key": "pos/ServicerStakeWeightMultiplier",
+      "param_value": "3.026000000000000000"
+    },
+    {
+      "param_key": "pos/BlocksPerSession",
+      "param_value": "4"
+    },
+    {
+      "param_key": "pos/MinSignedPerWindow",
+      "param_value": "0.600000000000000000"
+    },
+    {
+      "param_key": "pos/ServicerStakeWeightCeiling",
+      "param_value": "60000000000"
+    },
+    {
+      "param_key": "pos/ProposerPercentage",
+      "param_value": "5"
+    },
+    {
+      "param_key": "pos/SignedBlocksWindow",
+      "param_value": "10"
+    }
+  ],
+  "pocket_params": [
+    {
+      "param_key": "pocketcore/ClaimExpiration",
+      "param_value": "24"
+    },
+    {
+      "param_key": "pocketcore/SessionNodeCount",
+      "param_value": "24"
+    },
+    {
+      "param_key": "pocketcore/ClaimSubmissionWindow",
+      "param_value": "3"
+    },
+    {
+      "param_key": "pocketcore/MinimumNumberOfProofs",
+      "param_value": "10"
+    },
+    {
+      "param_key": "pocketcore/ReplayAttackBurnMultiplier",
+      "param_value": "3"
+    },
+    {
+      "param_key": "pocketcore/BlockByteSize",
+      "param_value": "8000000"
+    },
+    {
+      "param_key": "pocketcore/SupportedBlockchains",
+      "param_value": "[\"0001\",\"0003\",\"0004\",\"0005\",\"0006\",\"0009\",\"000A\",\"000B\",\"000C\",\"000F\",\"0010\",\"0012\",\"0021\",\"0022\",\"0024\",\"0025\",\"0026\",\"0027\",\"0028\",\"0040\",\"0044\",\"0046\",\"0047\",\"0048\",\"0049\",\"0050\",\"0051\",\"0052\",\"0053\",\"0054\",\"0056\",\"0057\",\"0058\",\"0059\",\"0060\",\"0061\",\"0063\",\"0065\",\"0066\",\"0067\",\"0068\",\"0069\",\"0070\",\"0071\",\"0072\",\"0074\",\"0075\",\"0076\",\"0077\",\"0078\",\"0079\",\"0080\",\"0081\",\"0082\",\"03DF\",\"C006\"]"
+    }
+  ]
 }
+
+*/
diff --git a/proto/pocket/tokenomics/query.proto b/proto/pocket/tokenomics/query.proto
@@ -1,10 +1,10 @@
 syntax = "proto3";
-package poktroll.tokenomics;
+package pocket.tokenomics;
 
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
-import "poktroll/tokenomics/params.proto";
+import "pocket/tokenomics/params.proto";
 
 option go_package = "github.com/pokt-network/poktroll/x/tokenomics/types";
 

diff --git a/proto/pocket/tokenomics/tx.proto b/proto/pocket/tokenomics/tx.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package poktroll.tokenomics;
+package pocket.tokenomics;
 
 option go_package = "github.com/pokt-network/poktroll/x/tokenomics/types";