Handle event skipped in code generation (#2)

* Add schema for the skipped event * Add GQL queries for the skipped event * Suffix struct types in events to resolve GQL type conflicts
cerc-io · May 11, 2023 · 0d92a84 · 0d92a84
1 parent 6c66262
commit 0d92a84
Show file tree

Hide file tree

Showing 4 changed files with 128 additions and 1 deletion.
diff --git a/src/gql/queries/events.gql b/src/gql/queries/events.gql
@@ -125,6 +125,34 @@ query events($blockHash: String!, $contractAddress: String!, $name: String){
                 provider
                 taskSpecHash
             }
+            ... on LogTaskSubmittedEvent {
+                taskReceiptId
+                taskReceiptHash
+                taskReceipt{
+                    id
+                    userProxy
+                    index
+                    tasks {
+                        conditions {
+                            inst
+                            data
+                        }
+                        actions {
+                            addr
+                            data
+                            operation
+                            dataFlow
+                            value
+                            termsOkCheck
+                        }
+                        selfProviderGasLimit
+                        selfProviderGasPriceCeil
+                    }
+                    expiryDate
+                    cycleId
+                    submissionsLeft
+                }
+            }
             ... on OwnershipTransferredEvent {
                 previousOwner
                 newOwner

diff --git a/src/gql/queries/eventsInRange.gql b/src/gql/queries/eventsInRange.gql
@@ -125,6 +125,34 @@ query eventsInRange($fromBlockNumber: Int!, $toBlockNumber: Int!){
                 provider
                 taskSpecHash
             }
+            ... on LogTaskSubmittedEvent {
+                taskReceiptId
+                taskReceiptHash
+                taskReceipt{
+                    id
+                    userProxy
+                    index
+                    tasks {
+                        conditions {
+                            inst
+                            data
+                        }
+                        actions {
+                            addr
+                            data
+                            operation
+                            dataFlow
+                            value
+                            termsOkCheck
+                        }
+                        selfProviderGasLimit
+                        selfProviderGasPriceCeil
+                    }
+                    expiryDate
+                    cycleId
+                    submissionsLeft
+                }
+            }
             ... on OwnershipTransferredEvent {
                 previousOwner
                 newOwner

diff --git a/src/gql/subscriptions/onEvent.gql b/src/gql/subscriptions/onEvent.gql
@@ -125,6 +125,34 @@ subscription onEvent{
                 provider
                 taskSpecHash
             }
+            ... on LogTaskSubmittedEvent {
+                taskReceiptId
+                taskReceiptHash
+                taskReceipt{
+                    id
+                    userProxy
+                    index
+                    tasks {
+                        conditions {
+                            inst
+                            data
+                        }
+                        actions {
+                            addr
+                            data
+                            operation
+                            dataFlow
+                            value
+                            termsOkCheck
+                        }
+                        selfProviderGasLimit
+                        selfProviderGasPriceCeil
+                    }
+                    expiryDate
+                    cycleId
+                    submissionsLeft
+                }
+            }
             ... on OwnershipTransferredEvent {
                 previousOwner
                 newOwner

diff --git a/src/schema.gql b/src/schema.gql
@@ -39,7 +39,7 @@ type ResultEvent {
   proof: Proof
 }
 
-union Event = LogCanExecFailedEvent | LogExecRevertedEvent | LogExecSuccessEvent | LogExecutorAssignedExecutorEvent | LogExecutorBalanceWithdrawnEvent | LogExecutorStakedEvent | LogExecutorSuccessShareSetEvent | LogExecutorUnstakedEvent | LogFundsProvidedEvent | LogFundsUnprovidedEvent | LogGelatoGasPriceOracleSetEvent | LogGelatoMaxGasSetEvent | LogInternalGasRequirementSetEvent | LogMinExecutorStakeSetEvent | LogOracleRequestDataSetEvent | LogProviderAssignedExecutorEvent | LogProviderModuleAddedEvent | LogProviderModuleRemovedEvent | LogSysAdminFundsWithdrawnEvent | LogSysAdminSuccessShareSetEvent | LogTaskCancelledEvent | LogTaskSpecGasPriceCeilSetEvent | LogTaskSpecProvidedEvent | LogTaskSpecUnprovidedEvent | OwnershipTransferredEvent
+union Event = LogCanExecFailedEvent | LogExecRevertedEvent | LogExecSuccessEvent | LogExecutorAssignedExecutorEvent | LogExecutorBalanceWithdrawnEvent | LogExecutorStakedEvent | LogExecutorSuccessShareSetEvent | LogExecutorUnstakedEvent | LogFundsProvidedEvent | LogFundsUnprovidedEvent | LogGelatoGasPriceOracleSetEvent | LogGelatoMaxGasSetEvent | LogInternalGasRequirementSetEvent | LogMinExecutorStakeSetEvent | LogOracleRequestDataSetEvent | LogProviderAssignedExecutorEvent | LogProviderModuleAddedEvent | LogProviderModuleRemovedEvent | LogSysAdminFundsWithdrawnEvent | LogSysAdminSuccessShareSetEvent | LogTaskCancelledEvent | LogTaskSpecGasPriceCeilSetEvent | LogTaskSpecProvidedEvent | LogTaskSpecUnprovidedEvent | LogTaskSubmittedEvent | OwnershipTransferredEvent
 
 type LogCanExecFailedEvent {
   executor: String!
@@ -174,6 +174,49 @@ type LogTaskSpecUnprovidedEvent {
   taskSpecHash: String!
 }
 
+type LogTaskSubmittedEvent {
+  taskReceiptId: BigInt!
+  taskReceiptHash: String!
+  taskReceipt: TaskReceipt_!
+}
+
+type TaskReceipt_ {
+  id: BigInt!
+  userProxy: String!
+  provider: Provider_!
+  index: BigInt!
+  tasks: [Task_!]
+  expiryDate: BigInt!
+  cycleId: BigInt!
+  submissionsLeft: BigInt!
+}
+
+type Provider_ {
+  addr: String!
+  module: String!
+}
+
+type Task_ {
+  conditions: [Condition_!]
+  actions: [Action_!]
+  selfProviderGasLimit: BigInt!
+  selfProviderGasPriceCeil: BigInt!
+}
+
+type Condition_ {
+  inst: String!
+  data: String!
+}
+
+type Action_ {
+  addr: String!
+  data: String!
+  operation: BigInt!
+  dataFlow: BigInt!
+  value: BigInt!
+  termsOkCheck: Boolean!
+}
+
 type OwnershipTransferredEvent {
   previousOwner: String!
   newOwner: String!