Update protocol to support multiple results and initial payment support

OpenAgentsInc · May 23, 2024 · 70a7b24 · 70a7b24
1 parent 75b3088
commit 70a7b24
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 1 deletion.
diff --git a/proto/Job.proto b/proto/Job.proto
@@ -26,8 +26,17 @@ message Job {
 
   repeated string relays = 10;
 
+  /**
+  * Deprecated
+  */
   JobResult result = 12;
+
+  /**
+  * Deprecated
+  */
   JobState state = 11;
+
+  repeated JobState results = 18;
 
   uint64 maxExecutionTime = 13; // enforced by the provider
   string nodeId = 15;

diff --git a/proto/JobState.proto b/proto/JobState.proto
@@ -2,6 +2,7 @@ syntax = "proto3";
 
 import "Log.proto";
 import "JobStatus.proto";
+import "JobResult.proto";
 option php_namespace = 'App\\Grpc\\nostr';
 option php_metadata_namespace = 'App\\Grpc\\nostr\\GPBMetadata';
 
@@ -14,4 +15,7 @@ message JobState {
   JobStatus status = 15;
   repeated Log logs = 17;
   uint64 timestamp = 18;
+
+  JobResult result = 19;
+  string acceptedByNode = 20;
 }
diff --git a/proto/Payment.proto b/proto/Payment.proto
@@ -0,0 +1,13 @@
+
+syntax = "proto3";
+option php_namespace = 'App\\Grpc\\nostr';
+option php_metadata_namespace = 'App\\Grpc\\nostr\\GPBMetadata';
+
+message Payment {
+    string id = 1;
+    uint64 amount = 2;
+    string currency = 3;
+    string protocol = 4;
+    string status = 5;
+    optional string data = 6;
+}
diff --git a/proto/PaymentStatus.proto b/proto/PaymentStatus.proto
@@ -0,0 +1,13 @@
+
+syntax = "proto3";
+option php_namespace = 'App\\Grpc\\nostr';
+option php_metadata_namespace = 'App\\Grpc\\nostr\\GPBMetadata';
+
+enum PaymentStatus {
+    PAYMENT_SENT = 0;
+    PAYMENT_RECEIVED = 1;
+    PAYMENT_REFUNDED = 2;
+    PAYMENT_FAILED = 3;
+    PAYMENT_PENDING = 4;
+    PAYMENT_UNKNOWN_STATUS = 99;
+}
diff --git a/proto/rpc.proto b/proto/rpc.proto
@@ -7,6 +7,9 @@ import "JobParam.proto";
 import "JobInput.proto";
 import "JobResult.proto";
 import "Job.proto";
+import "Payment.proto";
+import "PaymentStatus.proto";
+
 option php_namespace = 'App\\Grpc\\nostr';
 option php_metadata_namespace = 'App\\Grpc\\nostr\\GPBMetadata';
 message RpcRequestJob {
@@ -20,12 +23,13 @@ message RpcRequestJob {
     optional string requestProvider = 9;
     optional bool encrypted = 10;
     optional string userId = 11;
+    optional uint32 minWorkers = 12;
 }
 
 message RpcGetJob {
     string jobId = 1;
     optional uint32 wait = 99; // max time to wait in ms , 0 or unset means no wait
-
+    optional uint32 nResultsToWait = 100; // max number of results to wait for
 }
 
 message RpcGetPendingJobs {
@@ -338,6 +342,15 @@ service PoolConnector {
     rpc cacheGet(RpcCacheGetRequest) returns (stream RpcCacheGetResponse);
 
 
+    // pay
+    // rpc requestPayment(RpcRequestPayment) returns (RpcRequestPaymentResponse);
+    // rpc cancelAndRefundPayment(RpcCancelAndRefundPayment) returns (RpcCancelAndRefundPaymentResponse);
+
+    // rpc getPayment(RpcGetPayment) returns (RpcGetPaymentResponse);
+    // rpc sendPayment(RpcSendPayment) returns (RpcSendPaymentResponse);
+
+
+
 
 }