wip

Author: mschuwalow

golem-api-grpc/proto/golem/worker/public_oplog.proto

@@ -298,6 +298,7 @@ message QueuedCardEventCard {
 
 enum CardInstallFailure {
   CARD_INSTALL_FAILURE_UNSPECIFIED = 0;
+  CARD_INSTALL_FAILURE_CARD_REVOKED = 1;
   CARD_INSTALL_FAILURE_NOT_FOUND = 2;
   CARD_INSTALL_FAILURE_RECIPIENT_MISMATCH = 3;
   CARD_INSTALL_FAILURE_NOT_PERMITTED = 4;

golem-api-grpc/proto/golem/worker/raw_oplog.proto

@@ -336,6 +336,7 @@ message RawQueuedCardEventCard {
 
 enum RawCardInstallFailure {
   RAW_CARD_INSTALL_FAILURE_UNSPECIFIED = 0;
+  RAW_CARD_INSTALL_FAILURE_CARD_REVOKED = 1;
   RAW_CARD_INSTALL_FAILURE_NOT_FOUND = 2;
   RAW_CARD_INSTALL_FAILURE_RECIPIENT_MISMATCH = 3;
   RAW_CARD_INSTALL_FAILURE_NOT_PERMITTED = 4;

golem-common/src/base_model/mod.rs

@@ -1012,6 +1012,7 @@ impl From<QueuedCardEvent> for PublicQueuedCardEvent {
 #[cfg_attr(feature = "full", derive(desert_rust::BinaryCodec))]
 #[cfg_attr(feature = "full", desert(evolution()))]
 pub enum CardInstallFailure {
+    CardRevoked,
     NotFound,
     RecipientMismatch,
     NotPermitted,

golem-common/src/model/oplog/protobuf.rs

@@ -187,6 +187,9 @@ fn card_install_failure_from_proto(
         golem_api_grpc::proto::golem::worker::CardInstallFailure::Unspecified => {
             Err("Unspecified card install failure".to_string())
         }
+        golem_api_grpc::proto::golem::worker::CardInstallFailure::CardRevoked => {
+            Ok(CardInstallFailure::CardRevoked)
+        }
         golem_api_grpc::proto::golem::worker::CardInstallFailure::NotFound => {
             Ok(CardInstallFailure::NotFound)
         }
@@ -203,6 +206,9 @@ fn card_install_failure_to_proto(
     value: CardInstallFailure,
 ) -> golem_api_grpc::proto::golem::worker::CardInstallFailure {
     match value {
+        CardInstallFailure::CardRevoked => {
+            golem_api_grpc::proto::golem::worker::CardInstallFailure::CardRevoked
+        }
         CardInstallFailure::NotFound => {
             golem_api_grpc::proto::golem::worker::CardInstallFailure::NotFound
         }
@@ -222,6 +228,9 @@ fn raw_card_install_failure_from_proto(
         golem_api_grpc::proto::golem::worker::RawCardInstallFailure::Unspecified => {
             Err("Unspecified raw card install failure".to_string())
         }
+        golem_api_grpc::proto::golem::worker::RawCardInstallFailure::CardRevoked => {
+            Ok(CardInstallFailure::CardRevoked)
+        }
         golem_api_grpc::proto::golem::worker::RawCardInstallFailure::NotFound => {
             Ok(CardInstallFailure::NotFound)
         }
@@ -238,6 +247,9 @@ fn raw_card_install_failure_to_proto(
     value: CardInstallFailure,
 ) -> golem_api_grpc::proto::golem::worker::RawCardInstallFailure {
     match value {
+        CardInstallFailure::CardRevoked => {
+            golem_api_grpc::proto::golem::worker::RawCardInstallFailure::CardRevoked
+        }
         CardInstallFailure::NotFound => {
             golem_api_grpc::proto::golem::worker::RawCardInstallFailure::NotFound
         }

golem-worker-executor/src/durable_host/golem/v1x.rs

@@ -106,6 +106,7 @@ fn card_install_failure_to_wit(
     failure: CardInstallFailure,
 ) -> golem_api_1_x::host::CardInstallError {
     match failure {
+        CardInstallFailure::CardRevoked => golem_api_1_x::host::CardInstallError::Revoked,
         CardInstallFailure::NotFound => golem_api_1_x::host::CardInstallError::NotFound,
         CardInstallFailure::RecipientMismatch | CardInstallFailure::NotPermitted => {
             golem_api_1_x::host::CardInstallError::NotPermitted

golem-worker-executor/src/durable_host/mod.rs

@@ -797,7 +797,10 @@ impl<Ctx: WorkerCtx> DurableWorkerCtx<Ctx> {
                 .set_card_interest(self.owned_agent_id.clone(), &wallet_card_ids)
                 .await;
 
-            let reason = CardInstallFailure::NotFound;
+            let reason = match card_state {
+                Some(CardState::Revoked) => CardInstallFailure::CardRevoked,
+                _ => CardInstallFailure::NotFound,
+            };
 
             if let Some(queued_event_index) = queued_event_index {
                 self.public_state
@@ -845,10 +848,6 @@ impl<Ctx: WorkerCtx> DurableWorkerCtx<Ctx> {
         }
 
         if is_live {
-            self.state
-                .card_service
-                .record_revoked_cards(&[card_id])
-                .await;
             let wallet_card_ids = self
                 .state
                 .agent_wallet_cards
@@ -2707,7 +2706,7 @@ impl<Ctx: WorkerCtx> DurableWorkerCtx<Ctx> {
         Ok(())
     }
 
-    pub async fn update_state_to_new_component_revision(
+    async fn update_state_to_new_component_revision(
         &mut self,
         new_revision: ComponentRevision,
     ) -> Result<(), WorkerExecutorError> {
@@ -2797,16 +2796,6 @@ impl<Ctx: WorkerCtx> DurableWorkerCtx<Ctx> {
             self.state.cached_agent_config_retry_policies = None;
             self.state.agent_effective_surface = agent_effective_surface;
             self.state.agent_wallet_cards = initial_wallet_cards;
-            let wallet_card_ids = self
-                .state
-                .agent_wallet_cards
-                .keys()
-                .copied()
-                .collect::<Vec<_>>();
-            self.state
-                .card_service
-                .set_card_interest(self.owned_agent_id.clone(), &wallet_card_ids)
-                .await;
         };
 
         self.state.component_metadata = new_metadata;

golem-worker-executor/src/model/public_oplog/wit.rs

@@ -109,6 +109,7 @@ fn raw_queued_card_event_to_wit(value: QueuedCardEvent) -> oplog::QueuedCardEven
 
 fn card_install_failure_to_wit(value: CardInstallFailure) -> oplog::CardInstallFailure {
     match value {
+        CardInstallFailure::CardRevoked => oplog::CardInstallFailure::CardRevoked,
         CardInstallFailure::NotFound => oplog::CardInstallFailure::NotFound,
         CardInstallFailure::RecipientMismatch => oplog::CardInstallFailure::RecipientMismatch,
         CardInstallFailure::NotPermitted => oplog::CardInstallFailure::NotPermitted,
@@ -117,7 +118,7 @@ fn card_install_failure_to_wit(value: CardInstallFailure) -> oplog::CardInstallF
 
 fn card_install_failure_from_wit(value: oplog::CardInstallFailure) -> CardInstallFailure {
     match value {
-        oplog::CardInstallFailure::CardRevoked => CardInstallFailure::NotFound,
+        oplog::CardInstallFailure::CardRevoked => CardInstallFailure::CardRevoked,
         oplog::CardInstallFailure::NotFound => CardInstallFailure::NotFound,
         oplog::CardInstallFailure::RecipientMismatch => CardInstallFailure::RecipientMismatch,
         oplog::CardInstallFailure::NotPermitted => CardInstallFailure::NotPermitted,

golem-worker-executor/src/worker/status.rs

@@ -3372,7 +3372,7 @@ mod test {
                 OplogEntry::card_install_failed(
                     OplogIndex::from_u64(1),
                     card_id,
-                    CardInstallFailure::NotFound,
+                    CardInstallFailure::CardRevoked,
                 ),
             ),
         ]);