[Supplier] Implement supplier revenue share

config.yml

@@ -178,12 +178,18 @@ genesis:
                 - configs: []
                   rpc_type: JSON_RPC
                   url: http://relayminer1:8545
+              rev_share:
+                - address: pokt19a3t4yunp0dlpfjrp7qwnzwlrzd5fzs2gjaaaj
+                  rev_share_percentage: "100"
             - service:
                 id: ollama
               endpoints:
                 - configs: []
                   rpc_type: REST
                   url: http://relayminer1:8545
+              rev_share:
+                - address: pokt19a3t4yunp0dlpfjrp7qwnzwlrzd5fzs2gjaaaj
+                  rev_share_percentage: "100"
           stake:
             # NB: This value should be exactly 1upokt smaller than the value in
             # `application1_stake_config.yaml` so that the stake command causes a state change.

docusaurus/docs/operate/configs/supplier_staking_config.md

@@ -12,11 +12,13 @@ a stake transaction required to provide RPC services on Pocket Network._
 - [Usage](#usage)
 - [Configuration](#configuration)
   - [`stake_amount`](#stake_amount)
+  - [`default_rev_share_percent`](#default_rev_share_percent)
   - [`services`](#services)
     - [`service_id`](#service_id)
     - [`endpoints`](#endpoints)
       - [`publicly_exposed_url`](#publicly_exposed_url)
       - [`rpc_type`](#rpc_type)
+    - [`rev_share_percent`](#rev_share_percent)
 
 ## Reference Example
 
@@ -43,6 +45,8 @@ poktrolld tx supplier stake-supplier \
 
 ## Configuration
 
+<!-- TODO(#716): `owner_address` will be defined once non-custodial is merged -->
+
 ### `stake_amount`
 
 _`Required`_, _`Non-empty`_
@@ -72,6 +76,43 @@ sybil or flooding attacks on the network.
 
 :::
 
+### `default_rev_share_percent`
+
+_`Optional`_, _`Non-empty`_
+
+```yaml
+default_rev_share_percent:
+  <shareholder_address>: <float>
+```
+
+`default_rev_share_percent` is an optional map that defines the default the revenue
+share percentage for all the `service`s that do not have their specific `rev_share_percent`
+entry defined.
+
+This field is useful if the `Supplier` owner wants to set a default revenue share
+for all the `service`s entries that do not provide one. This way, the operator
+does not have repeat the same values for each `service` in the `services` section.
+
+This map cannot be empty but can be omitted, in which case the default revenue
+share falls back to `100%` of the rewards allocated to the `Supplier`'s `owner_address`.
+
+:::note
+
+The `shareholder_address`s MUST be valid Pocket addresses.
+
+The revenue share values MUST be strictly positive floats with a maximum value of
+100 and a total sum of 100 across all the `shareholder_address`es.
+
+:::
+
+:::warning
+
+If `default_rev_share_percent` is defined, then the `owner_address` of the `Supplier`
+MUST be **explicitly** defined in the map if they are to receive a share on the
+`service`s that fall back to the default.
+
+:::
+
 ### `services`
 
 _`Required`_, _`Non-empty`_
@@ -82,6 +123,8 @@ services:
     endpoints:
       - publicly_exposed_url: <protocol>://<hostname>:<port>
         rpc_type: <string>
+    rev_share_percent:
+      <shareholder_address>: <float>
 ```
 
 `services` define the list of services that the `Supplier` wants to provide.
@@ -154,3 +197,29 @@ endpoints:
 :::
 
 The `rpc_type` MUST be one of the [supported types found here](https://github.com/pokt-network/poktroll/tree/main/pkg/relayer/config/types.go#L8).
+
+#### `rev_share_percent`
+
+`rev_share_percent` is an optional map that defines the `service`'s specific revenue
+share percentage.
+
+It overrides the `default_rev_share_percent` if defined for the `service`.
+
+This map cannot be empty but can be omitted, in which case it falls back to the
+`default_rev_share_percent` top level configuration entry.
+
+:::note
+
+The `shareholder_address`s MUST be valid Pocket addresses.
+
+The revenue share values MUST be strictly positive decimals with a maximum value
+of 100 and a total sum of 100 across all the `shareholder_address`es.
+
+:::
+
+:::warning
+
+If `rev_share_percent` is defined for a `service`, then the `owner_address` of the
+`Supplier` MUST be **explicitly** defined in the map if they are to receive a share.
+
+:::

localnet/poktrolld/config/supplier1_stake_config.yaml

@@ -1,6 +1,14 @@
+owner_address: pokt1mrqt5f7qh8uxs27cjm9t7v9e74a9vvdnq5jva4
 # NB: The stake amount is exactly 1upokt greater than the value in genesis.json
 # so that the stake command causes a state change.
 stake_amount: 1000069upokt
+# If default_rev_share_percent is omitted, the owner receives 100% of the rewards.
+# default_rev_share_percent cannot be empty - it must either be omitted completely
+# or include at least one item.
+default_rev_share_percent:
+  # The sum of all shares must equal 100%. Staking will fail otherwise.
+  - pokt1mrqt5f7qh8uxs27cjm9t7v9e74a9vvdnq5jva4: 80.5
+  - pokt1eeeksh2tvkh7wzmfrljnhw4wrhs55lcuvmekkw: 19.5
 services:
   # The endpoint URL for the Anvil service is provided via the RelayMiner.
   # The RelayMiner acts as a proxy, forwarding requests to the actual Anvil data node behind it.
@@ -10,6 +18,12 @@ services:
       - publicly_exposed_url: http://relayminer1:8545
         rpc_type: JSON_RPC
   - service_id: ollama
+    # Service specific rev share, if rev_share_percent is omitted for a specific
+    # service, default_rev_share_percent is used.
+    # The sum of all shares must equal 100%. Staking will fail otherwise.
+    rev_share_percent:
+      - pokt1mrqt5f7qh8uxs27cjm9t7v9e74a9vvdnq5jva4: 50
+      - pokt1eeeksh2tvkh7wzmfrljnhw4wrhs55lcuvmekkw: 50
     endpoints:
       - publicly_exposed_url: http://relayminer1:8545
         rpc_type: REST

proto/poktroll/shared/service.proto

@@ -43,6 +43,7 @@ message SupplierServiceConfig {
   // TODO_MAINNET: Avoid embedding the full Service because we just need the ID.
   Service service = 1; // The Service for which the supplier is configured
   repeated SupplierEndpoint endpoints = 2; // List of endpoints for the service
+  repeated ServiceRevShare rev_share = 3; // List of revenue share configurations for the service
   // TODO_MAINNET: There is an opportunity for supplier to advertise the min
   // they're willing to earn for a certain configuration/price, but this is outside of scope.
 }
@@ -54,6 +55,12 @@ message SupplierEndpoint {
   repeated ConfigOption configs = 3; // Additional configuration options for the endpoint
 }
 
+// ServiceRevenueShare message to hold revenue share configuration details
+message ServiceRevenueShare {
+  string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // The Bech32 address of the revenue share recipient
+  float rev_share_percentage = 2; // The percentage of revenue share the recipient will receive
+}
+
 // Enum to define RPC types
 enum RPCType {
   UNKNOWN_RPC = 0; // Undefined RPC type

testutil/integration/app.go

@@ -534,6 +534,12 @@ func NewCompleteIntegrationApp(t *testing.T) *App {
 		Stake:           &supplierStake,
 		Services: []*sharedtypes.SupplierServiceConfig{
 			{
+				RevShare: []*sharedtypes.ServiceRevShare{
+					{
+						Address:            sample.AccAddress(),
+						RevSharePercentage: 100,
+					},
+				},
 				Service: &defaultService,
 			},
 		},

testutil/keeper/tokenomics.go

@@ -122,10 +122,22 @@ func TokenomicsKeeperWithActorAddrs(t testing.TB) (
 	}
 
 	// Prepare the test supplier.
+	supplierOwnerAddr := sample.AccAddress()
 	supplier := sharedtypes.Supplier{
-		OwnerAddress:    sample.AccAddress(),
-		OperatorAddress: sample.AccAddress(),
+		OwnerAddress:    supplierOwnerAddr,
+		OperatorAddress: supplierOwnerAddr,
 		Stake:           &sdk.Coin{Denom: "upokt", Amount: math.NewInt(100000)},
+		Services: []*sharedtypes.SupplierServiceConfig{
+			{
+				Service: service,
+				RevShare: []*sharedtypes.ServiceRevShare{
+					{
+						Address:            supplierOwnerAddr,
+						RevSharePercentage: 100,
+					},
+				},
+			},
+		},
 	}
 
 	ctrl := gomock.NewController(t)

x/shared/helpers/service_configs.go

@@ -3,9 +3,15 @@
 import (
 	"fmt"
 
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	sharedtypes "github.com/pokt-network/poktroll/x/shared/types"
 )
 
+const (
+	requiredRevSharePercentageSum = 100
+)
+
 // ValidateAppServiceConfigs returns an error if any of the application service configs are invalid
 func ValidateAppServiceConfigs(services []*sharedtypes.ApplicationServiceConfig) error {
 	if len(services) == 0 {
@@ -78,6 +84,60 @@
 			// 	return fmt.Errorf("endpoint.Configs must have at least one entry: %v", serviceConfig)
 			// }
 		}
+
+		if err := ValidateServiceRevShare(serviceConfig.RevShare); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// ValidateServiceRevShare validates the supplier's service revenue share,
+// ensuring that the sum of the revenue share percentages is 100.
+// This function is unit tested via the supplier staking config tests.
+func ValidateServiceRevShare(revShareList []*sharedtypes.ServiceRevShare) error {
+	revSharePercentageSum := float32(0)
+
+	if revShareList == nil || len(revShareList) == 0 {
+		return sharedtypes.ErrSharedInvalidRevShare.Wrap("no rev share configurations")
+	}
+
+	for _, revShare := range revShareList {
+		if revShare == nil {
+			return sharedtypes.ErrSharedInvalidRevShare.Wrap("rev share cannot be nil")
+		}
+
+		if len(revShare.Address) == 0 {
+			return sharedtypes.ErrSharedInvalidRevShare.Wrap("rev share address cannot be empty")
+		}
+
+		// Validate the revshare address
+		if revShare.Address == "" {
+			return sharedtypes.ErrSharedInvalidRevShare.Wrapf("rev share address cannot be empty: %v", revShare)
+		}
+
+		if _, err := sdk.AccAddressFromBech32(revShare.Address); err != nil {
+			return sharedtypes.ErrSharedInvalidRevShare.Wrapf("invalid rev share address %s; (%v)", revShare.Address, err)
+		}
+
+		if revShare.RevSharePercentage <= 0 || revShare.RevSharePercentage > 100 {
+			return sharedtypes.ErrSharedInvalidRevShare.Wrapf(
+				"invalid rev share value %v; must be between 0 and 100",
+				revShare.RevSharePercentage,
+			)
+		}
+
+		revSharePercentageSum += revShare.RevSharePercentage
 	}
+
+	if revSharePercentageSum != requiredRevSharePercentageSum {
+		return sharedtypes.ErrSharedInvalidRevShare.Wrapf(
+			"invalid rev share percentage sum %v; must be equal to %v",
+			revSharePercentageSum,
+			requiredRevSharePercentageSum,
+		)
+	}
+
 	return nil
 }

x/shared/types/errors.go

@@ -14,4 +14,5 @@ var (
 	ErrSharedParamInvalid               = sdkerrors.Register(ModuleName, 1103, "the provided param is invalid")
 	ErrSharedEmitEvent                  = sdkerrors.Register(ModuleName, 1104, "failed to emit event")
 	ErrSharedUnauthorizedSupplierUpdate = sdkerrors.Register(ModuleName, 1105, "unauthorized supplier update")
+	ErrSharedInvalidRevShare            = sdkerrors.Register(ModuleName, 1106, "invalid revenue share configuration")
 )