diff --git a/oracle/pkg/updater/updater.go b/oracle/pkg/updater/updater.go
index d5a717814..33070d2be 100644
--- a/oracle/pkg/updater/updater.go
+++ b/oracle/pkg/updater/updater.go
@@ -339,6 +339,19 @@ func (u *Updater) handleOpenedCommitment(
 				"revertible", revertableTxnsMap[commitmentTxnHashes[i]],
 			)
 
+			for _, opt := range opts.Options {
+				if sOpt := opt.GetShutterisedBidOption(); sOpt != nil {
+					u.logger.Info(
+						"shutterised bid option present, skipping slash",
+						"commitmentIdx", common.Bytes2Hex(update.CommitmentIndex[:]),
+						"txnHash", update.TxnHash,
+						"blockNumber", update.BlockNumber,
+						"shutter option", sOpt,
+					)
+					return nil
+				}
+			}
+
 			// The committer did not include the transactions in the block
 			// correctly, so this is a slash to be processed
 			return u.settle(
diff --git a/p2p/gen/go/bidderapi/v1/bidderapi_grpc.pb.go b/p2p/gen/go/bidderapi/v1/bidderapi_grpc.pb.go
index 1462cf44c..3badbf509 100644
--- a/p2p/gen/go/bidderapi/v1/bidderapi_grpc.pb.go
+++ b/p2p/gen/go/bidderapi/v1/bidderapi_grpc.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.5.1
+// - protoc-gen-go-grpc v1.6.0
 // - protoc             (unknown)
 // source: bidderapi/v1/bidderapi.proto
 
@@ -358,46 +358,46 @@ type BidderServer interface {
 type UnimplementedBidderServer struct{}
 
 func (UnimplementedBidderServer) SendBid(*Bid, grpc.ServerStreamingServer[Commitment]) error {
-	return status.Errorf(codes.Unimplemented, "method SendBid not implemented")
+	return status.Error(codes.Unimplemented, "method SendBid not implemented")
 }
 func (UnimplementedBidderServer) Deposit(context.Context, *DepositRequest) (*DepositResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Deposit not implemented")
+	return nil, status.Error(codes.Unimplemented, "method Deposit not implemented")
 }
 func (UnimplementedBidderServer) DepositEvenly(context.Context, *DepositEvenlyRequest) (*DepositEvenlyResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DepositEvenly not implemented")
+	return nil, status.Error(codes.Unimplemented, "method DepositEvenly not implemented")
 }
 func (UnimplementedBidderServer) EnableDepositManager(context.Context, *EnableDepositManagerRequest) (*EnableDepositManagerResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method EnableDepositManager not implemented")
+	return nil, status.Error(codes.Unimplemented, "method EnableDepositManager not implemented")
 }
 func (UnimplementedBidderServer) DisableDepositManager(context.Context, *DisableDepositManagerRequest) (*DisableDepositManagerResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DisableDepositManager not implemented")
+	return nil, status.Error(codes.Unimplemented, "method DisableDepositManager not implemented")
 }
 func (UnimplementedBidderServer) SetTargetDeposits(context.Context, *SetTargetDepositsRequest) (*SetTargetDepositsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method SetTargetDeposits not implemented")
+	return nil, status.Error(codes.Unimplemented, "method SetTargetDeposits not implemented")
 }
 func (UnimplementedBidderServer) DepositManagerStatus(context.Context, *DepositManagerStatusRequest) (*DepositManagerStatusResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method DepositManagerStatus not implemented")
+	return nil, status.Error(codes.Unimplemented, "method DepositManagerStatus not implemented")
 }
 func (UnimplementedBidderServer) RequestWithdrawals(context.Context, *RequestWithdrawalsRequest) (*RequestWithdrawalsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RequestWithdrawals not implemented")
+	return nil, status.Error(codes.Unimplemented, "method RequestWithdrawals not implemented")
 }
 func (UnimplementedBidderServer) GetValidProviders(context.Context, *GetValidProvidersRequest) (*GetValidProvidersResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetValidProviders not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetValidProviders not implemented")
 }
 func (UnimplementedBidderServer) GetDeposit(context.Context, *GetDepositRequest) (*DepositResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetDeposit not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetDeposit not implemented")
 }
 func (UnimplementedBidderServer) GetAllDeposits(context.Context, *GetAllDepositsRequest) (*GetAllDepositsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetAllDeposits not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetAllDeposits not implemented")
 }
 func (UnimplementedBidderServer) Withdraw(context.Context, *WithdrawRequest) (*WithdrawResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Withdraw not implemented")
+	return nil, status.Error(codes.Unimplemented, "method Withdraw not implemented")
 }
 func (UnimplementedBidderServer) GetBidInfo(context.Context, *GetBidInfoRequest) (*GetBidInfoResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetBidInfo not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetBidInfo not implemented")
 }
 func (UnimplementedBidderServer) ClaimSlashedFunds(context.Context, *EmptyMessage) (*wrapperspb.StringValue, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method ClaimSlashedFunds not implemented")
+	return nil, status.Error(codes.Unimplemented, "method ClaimSlashedFunds not implemented")
 }
 func (UnimplementedBidderServer) mustEmbedUnimplementedBidderServer() {}
 func (UnimplementedBidderServer) testEmbeddedByValue()                {}
@@ -410,7 +410,7 @@ type UnsafeBidderServer interface {
 }
 
 func RegisterBidderServer(s grpc.ServiceRegistrar, srv BidderServer) {
-	// If the following call pancis, it indicates UnimplementedBidderServer was
+	// If the following call panics, it indicates UnimplementedBidderServer was
 	// embedded by pointer and is nil.  This will cause panics if an
 	// unimplemented method is ever invoked, so we test this at initialization
 	// time to prevent it from happening at runtime later due to I/O.
diff --git a/p2p/gen/go/debugapi/v1/debugapi_grpc.pb.go b/p2p/gen/go/debugapi/v1/debugapi_grpc.pb.go
index 20f4ffc94..fb6c80f6e 100644
--- a/p2p/gen/go/debugapi/v1/debugapi_grpc.pb.go
+++ b/p2p/gen/go/debugapi/v1/debugapi_grpc.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.5.1
+// - protoc-gen-go-grpc v1.6.0
 // - protoc             (unknown)
 // source: debugapi/v1/debugapi.proto
 
@@ -109,13 +109,13 @@ type DebugServiceServer interface {
 type UnimplementedDebugServiceServer struct{}
 
 func (UnimplementedDebugServiceServer) GetTopology(context.Context, *EmptyMessage) (*TopologyResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetTopology not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetTopology not implemented")
 }
 func (UnimplementedDebugServiceServer) GetPendingTransactions(context.Context, *EmptyMessage) (*PendingTransactionsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetPendingTransactions not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetPendingTransactions not implemented")
 }
 func (UnimplementedDebugServiceServer) CancelTransaction(context.Context, *CancelTransactionReq) (*CancelTransactionResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method CancelTransaction not implemented")
+	return nil, status.Error(codes.Unimplemented, "method CancelTransaction not implemented")
 }
 func (UnimplementedDebugServiceServer) mustEmbedUnimplementedDebugServiceServer() {}
 func (UnimplementedDebugServiceServer) testEmbeddedByValue()                      {}
@@ -128,7 +128,7 @@ type UnsafeDebugServiceServer interface {
 }
 
 func RegisterDebugServiceServer(s grpc.ServiceRegistrar, srv DebugServiceServer) {
-	// If the following call pancis, it indicates UnimplementedDebugServiceServer was
+	// If the following call panics, it indicates UnimplementedDebugServiceServer was
 	// embedded by pointer and is nil.  This will cause panics if an
 	// unimplemented method is ever invoked, so we test this at initialization
 	// time to prevent it from happening at runtime later due to I/O.
diff --git a/p2p/gen/go/notificationsapi/v1/notifications_grpc.pb.go b/p2p/gen/go/notificationsapi/v1/notifications_grpc.pb.go
index e875dbaf6..b2982efc8 100644
--- a/p2p/gen/go/notificationsapi/v1/notifications_grpc.pb.go
+++ b/p2p/gen/go/notificationsapi/v1/notifications_grpc.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.5.1
+// - protoc-gen-go-grpc v1.6.0
 // - protoc             (unknown)
 // source: notificationsapi/v1/notifications.proto
 
@@ -82,7 +82,7 @@ type NotificationsServer interface {
 type UnimplementedNotificationsServer struct{}
 
 func (UnimplementedNotificationsServer) Subscribe(*SubscribeRequest, grpc.ServerStreamingServer[Notification]) error {
-	return status.Errorf(codes.Unimplemented, "method Subscribe not implemented")
+	return status.Error(codes.Unimplemented, "method Subscribe not implemented")
 }
 func (UnimplementedNotificationsServer) mustEmbedUnimplementedNotificationsServer() {}
 func (UnimplementedNotificationsServer) testEmbeddedByValue()                       {}
@@ -95,7 +95,7 @@ type UnsafeNotificationsServer interface {
 }
 
 func RegisterNotificationsServer(s grpc.ServiceRegistrar, srv NotificationsServer) {
-	// If the following call pancis, it indicates UnimplementedNotificationsServer was
+	// If the following call panics, it indicates UnimplementedNotificationsServer was
 	// embedded by pointer and is nil.  This will cause panics if an
 	// unimplemented method is ever invoked, so we test this at initialization
 	// time to prevent it from happening at runtime later due to I/O.
diff --git a/p2p/gen/go/providerapi/v1/providerapi_grpc.pb.go b/p2p/gen/go/providerapi/v1/providerapi_grpc.pb.go
index 3a45c4fc3..2cd982b6a 100644
--- a/p2p/gen/go/providerapi/v1/providerapi_grpc.pb.go
+++ b/p2p/gen/go/providerapi/v1/providerapi_grpc.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.5.1
+// - protoc-gen-go-grpc v1.6.0
 // - protoc             (unknown)
 // source: providerapi/v1/providerapi.proto
 
@@ -283,37 +283,37 @@ type ProviderServer interface {
 type UnimplementedProviderServer struct{}
 
 func (UnimplementedProviderServer) ReceiveBids(*EmptyMessage, grpc.ServerStreamingServer[Bid]) error {
-	return status.Errorf(codes.Unimplemented, "method ReceiveBids not implemented")
+	return status.Error(codes.Unimplemented, "method ReceiveBids not implemented")
 }
 func (UnimplementedProviderServer) SendProcessedBids(grpc.ClientStreamingServer[BidResponse, EmptyMessage]) error {
-	return status.Errorf(codes.Unimplemented, "method SendProcessedBids not implemented")
+	return status.Error(codes.Unimplemented, "method SendProcessedBids not implemented")
 }
 func (UnimplementedProviderServer) Stake(context.Context, *StakeRequest) (*StakeResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Stake not implemented")
+	return nil, status.Error(codes.Unimplemented, "method Stake not implemented")
 }
 func (UnimplementedProviderServer) GetStake(context.Context, *EmptyMessage) (*StakeResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetStake not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetStake not implemented")
 }
 func (UnimplementedProviderServer) GetMinStake(context.Context, *EmptyMessage) (*StakeResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetMinStake not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetMinStake not implemented")
 }
 func (UnimplementedProviderServer) WithdrawStake(context.Context, *EmptyMessage) (*WithdrawalResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method WithdrawStake not implemented")
+	return nil, status.Error(codes.Unimplemented, "method WithdrawStake not implemented")
 }
 func (UnimplementedProviderServer) Unstake(context.Context, *EmptyMessage) (*EmptyMessage, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method Unstake not implemented")
+	return nil, status.Error(codes.Unimplemented, "method Unstake not implemented")
 }
 func (UnimplementedProviderServer) GetProviderReward(context.Context, *EmptyMessage) (*RewardResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetProviderReward not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetProviderReward not implemented")
 }
 func (UnimplementedProviderServer) WithdrawProviderReward(context.Context, *EmptyMessage) (*WithdrawalResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method WithdrawProviderReward not implemented")
+	return nil, status.Error(codes.Unimplemented, "method WithdrawProviderReward not implemented")
 }
 func (UnimplementedProviderServer) GetCommitmentInfo(context.Context, *GetCommitmentInfoRequest) (*CommitmentInfoResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetCommitmentInfo not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetCommitmentInfo not implemented")
 }
 func (UnimplementedProviderServer) GetDecryptedTransaction(context.Context, *GetDecryptedTransactionRequest) (*GetDecryptedTransactionResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetDecryptedTransaction not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetDecryptedTransaction not implemented")
 }
 func (UnimplementedProviderServer) mustEmbedUnimplementedProviderServer() {}
 func (UnimplementedProviderServer) testEmbeddedByValue()                  {}
@@ -326,7 +326,7 @@ type UnsafeProviderServer interface {
 }
 
 func RegisterProviderServer(s grpc.ServiceRegistrar, srv ProviderServer) {
-	// If the following call pancis, it indicates UnimplementedProviderServer was
+	// If the following call panics, it indicates UnimplementedProviderServer was
 	// embedded by pointer and is nil.  This will cause panics if an
 	// unimplemented method is ever invoked, so we test this at initialization
 	// time to prevent it from happening at runtime later due to I/O.
diff --git a/p2p/gen/go/validatorapi/v1/validatorapi_grpc.pb.go b/p2p/gen/go/validatorapi/v1/validatorapi_grpc.pb.go
index 7346eb264..0f6e17675 100644
--- a/p2p/gen/go/validatorapi/v1/validatorapi_grpc.pb.go
+++ b/p2p/gen/go/validatorapi/v1/validatorapi_grpc.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.5.1
+// - protoc-gen-go-grpc v1.6.0
 // - protoc             (unknown)
 // source: validatorapi/v1/validatorapi.proto
 
@@ -69,7 +69,7 @@ type ValidatorServer interface {
 type UnimplementedValidatorServer struct{}
 
 func (UnimplementedValidatorServer) GetValidators(context.Context, *GetValidatorsRequest) (*GetValidatorsResponse, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetValidators not implemented")
+	return nil, status.Error(codes.Unimplemented, "method GetValidators not implemented")
 }
 func (UnimplementedValidatorServer) mustEmbedUnimplementedValidatorServer() {}
 func (UnimplementedValidatorServer) testEmbeddedByValue()                   {}
@@ -82,7 +82,7 @@ type UnsafeValidatorServer interface {
 }
 
 func RegisterValidatorServer(s grpc.ServiceRegistrar, srv ValidatorServer) {
-	// If the following call pancis, it indicates UnimplementedValidatorServer was
+	// If the following call panics, it indicates UnimplementedValidatorServer was
 	// embedded by pointer and is nil.  This will cause panics if an
 	// unimplemented method is ever invoked, so we test this at initialization
 	// time to prevent it from happening at runtime later due to I/O.