[Utility] trustless relays servicer token validation

persistence/docs/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.0.56] - 2023-06-06
+
+- Add place-holder for servicer token usage support methods
+
 ## [0.0.0.55] - 2023-06-01
 
 - Integrate lazy loading SMT (release v0.5.0) into V1

persistence/servicer.go

@@ -2,6 +2,7 @@ package persistence
 
 import (
 	"encoding/hex"
+	"math/big"
 
 	"github.com/pokt-network/pocket/persistence/types"
 	coreTypes "github.com/pokt-network/pocket/shared/core/types"
@@ -79,3 +80,15 @@ func (p *PostgresContext) SetServicerPauseHeight(address []byte, height int64) e
 func (p *PostgresContext) GetServicerOutputAddress(operator []byte, height int64) (output []byte, err error) {
 	return p.GetActorOutputAddress(types.ServicerActor, operator, height)
 }
+
+// INCOMPLETE: implement this
+// DISCUSS: both the relay and the response can be large structures: we may need to truncate the stored values
+func (p *PostgresContext) RecordRelayService(applicationAddress string, key []byte, relay *coreTypes.Relay, response *coreTypes.RelayResponse) error {
+	return nil
+}
+
+// INCOMPLETE: implement this
+// GetServicerTokenUsage returns the number of tokens used by the servicer in the current session, i.e. for the application associated with the session
+func (p *PostgresContext) GetServicerTokenUsage(session *coreTypes.Session) (*big.Int, error) {
+	return nil, nil
+}

runtime/configs/config.go

@@ -121,7 +121,17 @@ func NewDefaultConfig(options ...func(*Config)) *Config {
 		},
 		Utility: &UtilityConfig{
 			ServicerConfig: &ServicerConfig{
-				Chains: []string{"0001"},
+				Chains: map[string]*ChainConfig{
+					"0021": {
+						Url:                 "http://chain-url.pokt.network",
+						UserAgent:           "user-agent",
+						TimeoutMilliseconds: 5000,
+						BasicAuth: &BasicAuth{
+							UserName: "user",
+							Password: "password",
+						},
+					},
+				},
 			},
 			MaxMempoolTransactionBytes: defaults.DefaultUtilityMaxMempoolTransactionBytes,
 			MaxMempoolTransactions:     defaults.DefaultUtilityMaxMempoolTransactions,

runtime/configs/proto/utility_config.proto

@@ -14,5 +14,18 @@ message UtilityConfig {
 message ServicerConfig {
   string public_key = 1;
   string address = 2;
-  repeated string chains = 3;
+  map<string, ChainConfig> chains = 3;
+}
+
+message ChainConfig {
+  string url = 1;
+  string user_agent = 2;
+  uint64 timeout_milliseconds = 3;
+  BasicAuth basic_auth = 4;
+}
+
+message BasicAuth {
+  string user_name = 1;
+  // DISCUSS: does this need to be encrypted?
+  string password = 2;
 }

runtime/docs/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.0.41] - 2023-06-06
+
+- Add a new ChainConfig configuration field to servicer config
+
 ## [0.0.0.40] - 2023-06-01
 
 - Add an Address field to Servicer configuration

shared/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.0.60] - 2023-06-06
+
+- Add place-holders for servicer token usage support
+- Add a TODO comment for supporting different relay payload types in core types
+
 ## [0.0.0.59] - 2023-06-01
 
 - Use ApplicationAddress in RelayMeta

shared/core/types/proto/relay.proto

@@ -10,6 +10,7 @@ message Relay {
     RelayMeta meta = 2;
 }
 
+// INCOMPLETE: add support for different payloads, e.g. JSON, GRPC, etc.
 message RelayPayload {
     string data = 1;
     string method = 2;

shared/modules/persistence_module.go

@@ -3,6 +3,8 @@ package modules
 //go:generate mockgen -destination=./mocks/persistence_module_mock.go github.com/pokt-network/pocket/shared/modules PersistenceModule,PersistenceRWContext,PersistenceReadContext,PersistenceWriteContext
 
 import (
+	"math/big"
+
 	"github.com/pokt-network/pocket/persistence/blockstore"
 	"github.com/pokt-network/pocket/persistence/indexer"
 	"github.com/pokt-network/pocket/runtime/genesis"
@@ -129,6 +131,8 @@ type PersistenceWriteContext interface {
 	// Flag Operations
 	InitFlags() error
 	SetFlag(paramName string, value any, enabled bool) error
+
+	RecordRelayService(applicationAddress string, key []byte, relay *coreTypes.Relay, response *coreTypes.RelayResponse) error
 }
 
 type PersistenceReadContext interface {
@@ -219,4 +223,7 @@ type PersistenceReadContext interface {
 	GetIntFlag(paramName string, height int64) (int, bool, error)
 	GetStringFlag(paramName string, height int64) (string, bool, error)
 	GetBytesFlag(paramName string, height int64) ([]byte, bool, error)
+
+	// Servicer application tokens
+	GetServicerTokenUsage(session *coreTypes.Session) (*big.Int, error)
 }

utility/doc/CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.0.44] - 2023-06-06
+
+- Add trustless relay validation: available service tokens for the application
+- Add relay execution logic to the servicer
+
 ## [0.0.0.43] - 2023-06-01
 
 - Add a place-holder Servicer implementation