From fda2fb37620582792228a5933a7500972f2f80f2 Mon Sep 17 00:00:00 2001 From: Warren He Date: Wed, 14 Feb 2024 14:02:39 -0800 Subject: [PATCH] coreapi: add ExecutionDiscrepancyDetectedEvent.Round cross-reference: https://github.com/oasisprotocol/oasis-core/pull/5431 Adding this as nilable so we can detect versions below 23.0.3 leaving it out. --- coreapi/v23.0/roothash/api/api.go | 2 ++ .../patches/v23.0/discrepancy_round.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 scripts/vendor-oasis-core/patches/v23.0/discrepancy_round.patch diff --git a/coreapi/v23.0/roothash/api/api.go b/coreapi/v23.0/roothash/api/api.go index e7653d7d2..e6a88db56 100644 --- a/coreapi/v23.0/roothash/api/api.go +++ b/coreapi/v23.0/roothash/api/api.go @@ -192,6 +192,8 @@ type ExecutorCommittedEvent struct { // ExecutionDiscrepancyDetectedEvent is an execute discrepancy detected event. type ExecutionDiscrepancyDetectedEvent struct { + // Round is the round in which the discrepancy was detected. + Round *uint64 `json:"round,omitempty"` // Rank is the rank of the transaction scheduler. Rank uint64 `json:"rank"` // Timeout signals whether the discrepancy was due to a timeout. diff --git a/scripts/vendor-oasis-core/patches/v23.0/discrepancy_round.patch b/scripts/vendor-oasis-core/patches/v23.0/discrepancy_round.patch new file mode 100644 index 000000000..1c772006a --- /dev/null +++ b/scripts/vendor-oasis-core/patches/v23.0/discrepancy_round.patch @@ -0,0 +1,13 @@ +diff --git a/coreapi/v23.0/roothash/api/api.go b/coreapi/v23.0/roothash/api/api.go +index e7653d7d..e6a88db5 100644 +--- a/coreapi/v23.0/roothash/api/api.go ++++ b/coreapi/v23.0/roothash/api/api.go +@@ -192,6 +192,8 @@ type ExecutorCommittedEvent struct { + + // ExecutionDiscrepancyDetectedEvent is an execute discrepancy detected event. + type ExecutionDiscrepancyDetectedEvent struct { ++ // Round is the round in which the discrepancy was detected. ++ Round *uint64 `json:"round,omitempty"` + // Rank is the rank of the transaction scheduler. + Rank uint64 `json:"rank"` + // Timeout signals whether the discrepancy was due to a timeout.