[Supplier] Implement non-custodial staking

load-testing/tests/relays_stress_helpers_test.go

@@ -785,6 +785,7 @@ func (s *relaysSuite) addActor(actorAddress string, actorStakeAmount sdk.Coin) *
 // messages in a single supplier transaction.
 func (s *relaysSuite) addPendingStakeSupplierMsg(supplier *accountInfo) {
 	supplier.addPendingMsg(suppliertypes.NewMsgStakeSupplier(
+		supplier.address,
 		supplier.address,
 		supplier.amountToStake,
 		[]*sharedtypes.SupplierServiceConfig{

proto/poktroll/shared/supplier.proto

@@ -10,15 +10,24 @@ import "poktroll/shared/service.proto";
 
 // Supplier is the type defining the actor in Pocket Network that provides RPC services.
 message Supplier {
-  string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // The Bech32 address of the supplier using cosmos' ScalarDescriptor to ensure deterministic encoding
-  cosmos.base.v1beta1.Coin stake = 2; // The total amount of uPOKT the supplier has staked
-  repeated SupplierServiceConfig services = 3; // The service configs this supplier can support
+  // The address of the owner (i.e. staker, custodial) that owns the funds for staking.
+  // By default, this address is the one that receives all the rewards unless owtherwise specified.
+  // The owner can initially stake the supplier and unstake it.
+  // All other configurations are managed by the operator.
+  string owner_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // Bech32 cosmos address
+  // The operator address of the supplier that operates it.
+  // The operator address can update the supplier's configurations excluding the owner
+  // and operator addresses which do not change over the supplier's lifespan.
+  // TODO(red-0ne): Rename this to `operator_address` include all downstream
+  // variables, comments, docs, tests, etc...
+  string address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // Bech32 cosmos address
+  cosmos.base.v1beta1.Coin stake = 3; // The total amount of uPOKT the supplier has staked
+  repeated SupplierServiceConfig services = 4; // The service configs this supplier can support
   // The session end height at which an actively unbonding supplier unbonds its stake.
   // If the supplier did not unstake, this value will be 0.
-  uint64 unstake_session_end_height = 4;
+  uint64 unstake_session_end_height = 5;
   // services_activation_heights_map is a map of serviceIds to the height at
   // which the staked supplier will become active for that service.
   // Activation heights are session start heights.
-  map<string, uint64> services_activation_heights_map = 5;
+  map<string, uint64> services_activation_heights_map = 6;
 }
-

proto/poktroll/supplier/tx.proto

@@ -45,17 +45,30 @@ message MsgUpdateParams {
 message MsgUpdateParamsResponse {}
 
 message MsgStakeSupplier {
-  option (cosmos.msg.v1.signer) = "address"; // https://docs.cosmos.network/main/build/building-modules/messages-and-queries
-  string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // The Bech32 address of the supplier using cosmos' ScalarDescriptor to ensure deterministic deterministic encoding using cosmos' ScalarDescriptor to ensure deterministic deterministic encoding
-  cosmos.base.v1beta1.Coin stake = 2; // The total amount of uPOKT the supplier has staked. Must be ≥ to the current amount that the supplier has staked (if any)
-  repeated poktroll.shared.SupplierServiceConfig services = 3; // The list of services this supplier is staked to provide service for
+  option (cosmos.msg.v1.signer) = "sender"; // https://docs.cosmos.network/main/build/building-modules/messages-and-queries
+
+  string sender = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // The Bech32 address of the message sender (i.e. owner or operator) using cosmos' ScalarDescriptor to ensure deterministic deterministic encoding using cosmos' ScalarDescriptor to ensure deterministic deterministic encoding
+  string owner_address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // The Bech32 address of the owner (i.e. custodial, staker) using cosmos' ScalarDescriptor to ensure deterministic deterministic encoding using cosmos' ScalarDescriptor to ensure deterministic deterministic encoding
+  string address = 3 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // The Bech32 address of the operator (i.e. provider, non-custodial) using cosmos' ScalarDescriptor to ensure deterministic deterministic encoding using cosmos' ScalarDescriptor to ensure deterministic deterministic encoding
+  cosmos.base.v1beta1.Coin stake = 4; // The total amount of uPOKT the supplier has staked. Must be ≥ to the current amount that the supplier has staked (if any)
+  repeated poktroll.shared.SupplierServiceConfig services = 5; // The list of services this supplier is staked to provide service for
 }
 
 message MsgStakeSupplierResponse {}
 
 message MsgUnstakeSupplier {
-  option (cosmos.msg.v1.signer) = "address";
-  string address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // The Bech32 address of the supplier using cosmos' ScalarDescriptor to ensure deterministic deterministic encoding using cosmos' ScalarDescriptor to ensure deterministic deterministic encoding
+  option (cosmos.msg.v1.signer) = "owner_address";
+  // The address of the owner (i.e. staker, custodial) that owns the funds for staking.
+  // By default, this address is the one that receives all the rewards unless owtherwise specified.
+  // The owner can initially stake the supplier and unstake it.
+  // All other configurations are managed by the operator.
+  string owner_address = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // The Bech32 address
+  // The operator address of the supplier that operates it.
+  // The operator address can update the supplier's configurations excluding the owner
+  // and operator addresses which do not change over the supplier's lifespan.
+  // TODO(red-0ne): Rename this to `operator_address` include all downstream
+  // variables, comments, docs, tests, etc...
+  string address = 2 [(cosmos_proto.scalar) = "cosmos.AddressString"]; // The Bech32 address
 }
 
 message MsgUnstakeSupplierResponse {}

testutil/integration/app.go

@@ -398,12 +398,14 @@ func NewCompleteIntegrationApp(t *testing.T) *App {
 		sharedKeeper,
 		sessionKeeper,
 		serviceKeeper,
+		supplierKeeper,
 	)
 	tokenomicsModule := tokenomics.NewAppModule(
 		cdc,
 		tokenomicsKeeper,
 		accountKeeper,
 		bankKeeper,
+		supplierKeeper,
 	)
 
 	// Prepare the message & query routers

testutil/keeper/tokenomics.go

@@ -166,6 +166,10 @@ func TokenomicsKeeperWithActorAddrs(
 	mockSharedKeeper := mocks.NewMockSharedKeeper(ctrl)
 	mockSharedKeeper.EXPECT().GetProofWindowCloseHeight(gomock.Any(), gomock.Any()).AnyTimes()
 
+	// Mock the supplier keeper
+	mockSupplierKeeper := mocks.NewMockSupplierKeeper(ctrl)
+	mockSupplierKeeper.EXPECT().GetSupplier(gomock.Any(), gomock.Any()).AnyTimes()
+
 	// Mock the session keeper
 	mockSessionKeeper := mocks.NewMockSessionKeeper(ctrl)
 
@@ -198,6 +202,7 @@ func TokenomicsKeeperWithActorAddrs(
 		mockSharedKeeper,
 		mockSessionKeeper,
 		mockServiceKeeper,
+		mockSupplierKeeper,
 	)
 
 	sdkCtx := sdk.NewContext(stateStore, cmtproto.Header{}, false, log.NewNopLogger())
@@ -380,6 +385,7 @@ func NewTokenomicsModuleKeepers(
 		sharedKeeper,
 		sessionKeeper,
 		serviceKeeper,
+		supplierKeeper,
 	)
 
 	require.NoError(t, tokenomicsKeeper.SetParams(ctx, tokenomicstypes.DefaultParams()))

x/shared/types/errors.go

@@ -8,9 +8,10 @@ import (
 
 // x/shared module sentinel errors
 var (
-	ErrSharedInvalidSigner    = sdkerrors.Register(ModuleName, 1100, "expected gov account as only signer for proposal message")
-	ErrSharedInvalidAddress   = sdkerrors.Register(ModuleName, 1101, "invalid address")
-	ErrSharedParamNameInvalid = sdkerrors.Register(ModuleName, 1102, "the provided param name is invalid")
-	ErrSharedParamInvalid     = sdkerrors.Register(ModuleName, 1103, "the provided param is invalid")
-	ErrSharedEmitEvent        = sdkerrors.Register(ModuleName, 1104, "failed to emit event")
+	ErrSharedInvalidSigner              = sdkerrors.Register(ModuleName, 1100, "expected gov account as only signer for proposal message")
+	ErrSharedInvalidAddress             = sdkerrors.Register(ModuleName, 1101, "invalid address")
+	ErrSharedParamNameInvalid           = sdkerrors.Register(ModuleName, 1102, "the provided param name is invalid")
+	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")
 )

x/shared/types/supplier.go

@@ -31,3 +31,29 @@ func (s *Supplier) IsActive(queryHeight uint64, serviceId string) bool {
 
 	return true
 }
+
+// EnsureOwner returns an error if the given address does not match supplier's owner address.
+func (s *Supplier) EnsureOwner(ownerAddress string) error {
+	if s.OwnerAddress != ownerAddress {
+		return ErrSharedUnauthorizedSupplierUpdate.Wrapf(
+			"msg.OwnerAddress %q != provided address %q",
+			s.OwnerAddress,
+			ownerAddress,
+		)
+	}
+
+	return nil
+}
+
+// EnsureOperator returns an error if the given address does not match supplier's operator address.
+func (s *Supplier) EnsureOperator(operatorAddress string) error {
+	if s.Address != operatorAddress {
+		return ErrSharedUnauthorizedSupplierUpdate.Wrapf(
+			"msg.OperatorAddress %q != provided address %q",
+			s.OwnerAddress,
+			operatorAddress,
+		)
+	}
+
+	return nil
+}