@dcl/protocol 1.0.0-16721006271.commit-e03db90 → 1.0.0-16800835851.commit-2ec49fe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcl/protocol",
-  "version": "1.0.0-16721006271.commit-e03db90",
+  "version": "1.0.0-16800835851.commit-2ec49fe",
   "description": "",
   "repository": "decentraland/protocol.git",
   "homepage": "https://github.com/decentraland/protocol#readme",
@@ -13,7 +13,7 @@
     "test": "./scripts/check-proto-compabitility.sh"
   },
   "devDependencies": {
-    "@protobuf-ts/protoc": "^2.11.0",
+    "@protobuf-ts/protoc": "^2.8.1",
     "proto-compatibility-tool": "^1.1.2-20220925163655.commit-25bd040",
     "typescript": "^5.0.4"
   },
@@ -30,5 +30,5 @@
     "out-js",
     "public"
   ],
-  "commit": "e03db907636e587c59a2034a48aaf55f2ae3bf8e"
+  "commit": "2ec49fe0b4036e3494ccf0bebdb3c529660661e9"
 }

package/proto/decentraland/kernel/comms/rfc4/comms.proto

@@ -55,11 +55,10 @@ message Movement {
   bool is_long_jump = 12;
   bool is_long_fall = 13;
   bool is_falling = 14;
+
   bool is_stunned = 15;
+  
   float rotation_y = 16;
-  // interpolation
-  bool is_instant = 17;
-  bool is_emoting = 18;
 }
 
 message MovementCompressed {
@@ -68,7 +67,7 @@ message MovementCompressed {
 }
 
 message PlayerEmote {
-  float timestamp = 1;
+  uint32 incremental_id = 1;
   string urn = 2;
 }
 
@@ -102,10 +101,6 @@ message ProfileResponse {
 message Chat {
   string message = 1;
   double timestamp = 2;
-
-  // Extension: optional forwarded_from to identify the original sender when
-  // messages are forwarded through an SFU
-  optional string forwarded_from = 3;
 }
 
 message Scene {

package/proto/decentraland/sdk/components/light_source.proto

@@ -6,12 +6,12 @@ import "decentraland/common/texture.proto";
 option (common.ecs_component_id) = 1079;
 
 message PBLightSource {
-  optional bool active = 1;                                           // default = true, whether the lightSource is active or not.
-  optional decentraland.common.Color3 color = 2;                      // default = Color.white, the tint of the light, in RGB format where each component is a floating point value with a range from 0 to 1.
-  optional float intensity = 3;                                       // default = 250, ranges from 1 (dim) to 100,000 (very bright), expressed in Lumens for Point and Spot.
-  optional float range = 4;                                           // default = 0, how far the light travels, expressed in meters. If left at 0 will be computed automatically
-  optional bool shadow = 5;                                           // default = false, whether the light casts shadows or not.
-  optional decentraland.common.TextureUnion shadow_mask_texture = 6;  // Texture mask through which shadows are cast to simulate caustics, soft shadows, and light shapes such as light entering from a window.
+  optional bool active = 1;                                          // default = true, whether the lightSource is active or not.
+  optional decentraland.common.Color3 color = 2;                     // default = white, the tint of the light, in RGB format where each component is a floating point value with a range from 0 to 1.
+  optional float intensity = 3;                                      // default = 16000, light intensity expressed in candels (lumens/m^2 at 1 m distance, or lumens divided by 4*pi)
+  optional float range = 4;                                          // default = -1, how far the light travels, expressed in meters. If negative will be computed automatically as pow(intensity, 0.25)
+  optional bool shadow = 5;                                          // default = false, whether the light casts shadows or not.
+  optional decentraland.common.TextureUnion shadow_mask_texture = 6; // Texture mask through which shadows are cast to simulate caustics, soft shadows, and light shapes such as light entering from a window.
 
   oneof type {
     Point point = 7;

package/proto/decentraland/sdk/components/virtual_camera.proto

@@ -10,9 +10,7 @@ option (common.ecs_component_id) = 1076;
 // an 'instant' transition (like using speed/time = 0)
 // * The lookAtEntity defines to which entity the Camera has to look at constantly (independent from 
 // the holding entity transform).
-// * The fov defines the Field of View of the virtual camera
 message PBVirtualCamera {
   optional common.CameraTransition default_transition = 1;
   optional uint32 look_at_entity = 2;
-  optional float fov = 3; // default: 60
 }

package/proto/decentraland/social_service/v2/social_service_v2.proto

@@ -2,36 +2,23 @@ syntax = "proto3";
 package decentraland.social_service.v2;
 
 import "google/protobuf/empty.proto";
-import "decentraland/social_service/errors.proto";
+
+// Errors
+message InvalidFriendshipAction {}
+message InternalServerError {}
 
 // Types
 message User { string address = 1; }
 
-message FriendProfile {
-  string address = 1;
-  string name = 2;
-  bool has_claimed_name = 3;
-  string profile_picture_url = 4;
-}
-
-message BlockedUserProfile {
-  string address = 1;
-  string name = 2;
-  bool has_claimed_name = 3;
-  string profile_picture_url = 4;
-  optional int64 blocked_at = 5;
-}
-
 message Pagination {
   int32 limit = 1;
   int32 offset = 2;
 }
 
 message FriendshipRequestResponse {
-  FriendProfile friend = 1;
+  User user = 1;
   int64 created_at = 2;
   optional string message = 3;
-  string id = 4;
 }
 
 message FriendshipRequests {
@@ -46,6 +33,7 @@ enum ConnectivityStatus {
 
 message GetFriendsPayload {
   optional Pagination pagination = 1;
+  optional ConnectivityStatus status = 2;
 }
 
 message GetFriendshipRequestsPayload {
@@ -81,8 +69,8 @@ message PaginatedResponse {
   int32 page = 2;
 }
 
-message PaginatedFriendsProfilesResponse {
-  repeated FriendProfile friends = 1;
+message PaginatedUsersResponse {
+  repeated User users = 1;
   PaginatedResponse pagination_data = 2;
 }
 
@@ -98,45 +86,29 @@ message UpsertFriendshipResponse {
   message Accepted {
     string id = 1;
     int64 created_at = 2;
-    FriendProfile friend = 3;
-    optional string message = 4;
   }
   oneof response {
     Accepted accepted = 1;
     InvalidFriendshipAction invalid_friendship_action = 2;
     InternalServerError internal_server_error = 3;
-    InvalidRequest invalid_request = 4;
   }
 }
 
 message FriendshipUpdate {
-  message RequestResponse {
-    FriendProfile friend = 1;
-    int64 created_at = 2;
-    optional string message = 3;
-    string id = 4;
-  }
   message AcceptResponse { User user = 1; }
   message RejectResponse { User user = 1; }
   message DeleteResponse { User user = 1; }
   message CancelResponse { User user = 1; }
-  message BlockResponse { User user = 1; }
 
   oneof update {
-    RequestResponse request = 1;
+    FriendshipRequestResponse request = 1;
     AcceptResponse accept = 2;
     RejectResponse reject = 3;
     DeleteResponse delete = 4;
     CancelResponse cancel = 5;
-    BlockResponse block = 6;
   }
 }
 
-message FriendConnectivityUpdate {
-  FriendProfile friend = 1;
-  ConnectivityStatus status = 2;
-}
-
 message GetFriendshipStatusPayload {
   User user = 1;
 }
@@ -149,8 +121,6 @@ enum FriendshipStatus {
   REJECTED = 4;
   DELETED = 5;
   BLOCKED = 6;
-  NONE = 7;
-  BLOCKED_BY = 8;
 }
 
 message GetFriendshipStatusResponse {
@@ -161,419 +131,15 @@ message GetFriendshipStatusResponse {
   oneof response {
     Ok accepted = 1;
     InternalServerError internal_server_error = 2;
-    InvalidRequest invalid_request = 3;
-  }
-}
-
-message BlockUserPayload {
-  User user = 1;
-}
-
-message BlockUserResponse {
-  message Ok {
-    BlockedUserProfile profile = 1;
-  }
-
-  oneof response {
-    Ok ok = 1;
-    InternalServerError internal_server_error = 2;
-    InvalidRequest invalid_request = 3;
-    ProfileNotFound profile_not_found = 4;
-  }
-}
-
-message UnblockUserPayload {
-  User user = 1;
-}
-
-message UnblockUserResponse {
-  message Ok {
-    BlockedUserProfile profile = 1;
-  }
-
-  oneof response {
-    Ok ok = 1;
-    InternalServerError internal_server_error = 2;
-    InvalidRequest invalid_request = 3;
-    ProfileNotFound profile_not_found = 4;
-  }
-}
-
-enum PrivateMessagePrivacySetting {
-  ALL = 0;
-  ONLY_FRIENDS = 1;
-}
-
-enum BlockedUsersMessagesVisibilitySetting {
-  SHOW_MESSAGES = 0;
-  DO_NOT_SHOW_MESSAGES = 1;
-}
-
-message SocialSettings {
-  PrivateMessagePrivacySetting private_messages_privacy = 1;
-  BlockedUsersMessagesVisibilitySetting blocked_users_messages_visibility = 2;
-}
-
-message GetSocialSettingsResponse {
-  message Ok {
-    SocialSettings settings = 1;
-  }
-
-  oneof response {
-    Ok ok = 1;
-    InternalServerError internal_server_error = 2;
-  }
-}
-
-message UpsertSocialSettingsPayload {
-  optional PrivateMessagePrivacySetting private_messages_privacy = 1;
-  optional BlockedUsersMessagesVisibilitySetting blocked_users_messages_visibility = 2;
-}
-
-message UpsertSocialSettingsResponse {
-  oneof response {
-    SocialSettings ok = 1;
-    InternalServerError internal_server_error = 2;
-    InvalidRequest invalid_request = 3;
-  }
-}
-
-message GetPrivateMessagesSettingsPayload {
-  repeated User user = 1;
-}
-
-message GetPrivateMessagesSettingsResponse {
-  message PrivateMessagesSettings {
-    User user = 1;
-    PrivateMessagePrivacySetting private_messages_privacy = 2;
-    bool is_friend = 3;
-  }
-
-  message Ok {
-    repeated PrivateMessagesSettings settings = 1;
-  }
-
-  oneof response {
-    Ok ok = 1;
-    InternalServerError internal_server_error = 2;
-    InvalidRequest invalid_request = 3;
-    ProfileNotFound profile_not_found = 4;
-  }
-}
-
-message GetBlockedUsersPayload {
-  optional Pagination pagination = 1;
-}
-
-message GetBlockedUsersResponse {
-  repeated BlockedUserProfile profiles = 1;
-  PaginatedResponse pagination_data = 2;
-}
-
-message GetBlockingStatusResponse {
-  repeated string blocked_users = 1;
-  repeated string blocked_by_users = 2;
-}
-
-message BlockUpdate {
-  string address = 1;
-  bool is_blocked = 2;
-}
-
-message CommunityMemberConnectivityUpdate {
-  string community_id = 1;
-  User member = 2;
-  ConnectivityStatus status = 3;
-}
-
-// Private voice chats
-
-// Starting a private voice chat
-
-message StartPrivateVoiceChatPayload {
-  User callee = 1;
-}
-
-message StartPrivateVoiceChatResponse {
-  message Ok {
-    string call_id = 1;
-  }
-  
-  oneof response {
-    Ok ok = 1;
-    InternalServerError internal_server_error = 2;
-    InvalidRequest invalid_request = 3;
-    ConflictingError conflicting_error = 4;
-    ForbiddenError forbidden_error = 5;
-  }
-}
-
-// Accepting a private voice chat
-
-message AcceptPrivateVoiceChatPayload {
-  string call_id = 1;
-}
-
-message AcceptPrivateVoiceChatResponse {
-  message Ok {
-    string call_id = 1;
-    PrivateVoiceChatCredentials credentials = 2;
-  }
-  
-  oneof response {
-    Ok ok = 1;
-    InternalServerError internal_server_error = 2;
-    InvalidRequest invalid_request = 3;
-    NotFoundError not_found = 4;
-    ForbiddenError forbidden_error = 5;
-  }
-}
-
-// Rejecting a private voice chat
-
-message RejectPrivateVoiceChatPayload {
-  string call_id = 1;
-}
-
-message RejectPrivateVoiceChatResponse {
-  message Ok {
-    string call_id = 1;
-  }
-  
-  oneof response {
-    Ok ok = 1;
-    InternalServerError internal_server_error = 2;
-    InvalidRequest invalid_request = 3;
-    NotFoundError not_found = 4;
-  }
-}
-
-// Private voice chat updates
-
-enum PrivateVoiceChatStatus {
-  VOICE_CHAT_REQUESTED = 0;
-  VOICE_CHAT_ACCEPTED = 1;
-  VOICE_CHAT_REJECTED = 2;
-  VOICE_CHAT_ENDED = 3;
-  VOICE_CHAT_EXPIRED = 4;
-}
-
-message PrivateVoiceChatCredentials {
-  string connection_url = 1;
-}
-
-message PrivateVoiceChatUpdate {
-  string call_id = 1;
-  PrivateVoiceChatStatus status = 2;
-  optional User caller = 3;
-  optional User callee = 4;
-  optional PrivateVoiceChatCredentials credentials = 5;
-}
-
-// Ending a private voice chat
-// This is sent from the client to the server whenever the user wants to end the voice chat
-// This could occur before the voice chat is accepted or after it is accepted
-
-message EndPrivateVoiceChatPayload {
-  string call_id = 1;
-}
-
-message EndPrivateVoiceChatResponse {
-  message Ok {
-    string call_id = 1;
-  }
-  
-  oneof response {
-    Ok ok = 1;
-    InternalServerError internal_server_error = 2;
-    NotFoundError not_found = 3;
-  }
-}
-
-// Get incoming private voice chat request
-
-message GetIncomingPrivateVoiceChatRequestResponse {
-  message Ok {
-    User caller = 1;
-    string call_id = 2;
-  }
-
-  oneof response {
-    Ok ok = 1;
-    NotFoundError not_found = 2;
-    InternalServerError internal_server_error = 3;
-  }
-}
-
-// Community Voice Chat messages
-
-// Community voice chat credentials - specific type for community chats
-message CommunityVoiceChatCredentials {
-  string connection_url = 1;
-}
-
-// Starting a community voice chat
-message StartCommunityVoiceChatPayload {
-  string community_id = 1;
-}
-
-message StartCommunityVoiceChatResponse {
-  message Ok {
-    CommunityVoiceChatCredentials credentials = 1;  // Moderator gets credentials immediately
-  }
-
-  oneof response {
-    Ok ok = 1;
-    InvalidRequest invalid_request = 2;
-    ForbiddenError forbidden_error = 3;
-    ConflictingError conflicting_error = 4;
-    InternalServerError internal_server_error = 5;
   }
 }
 
-// Joining a community voice chat
-message JoinCommunityVoiceChatPayload {
-  string community_id = 1;
-}
-
-message JoinCommunityVoiceChatResponse {
-  message Ok {
-    string voice_chat_id = 1;
-    CommunityVoiceChatCredentials credentials = 2;
-  }
-
-  oneof response {
-    Ok ok = 1;
-    InvalidRequest invalid_request = 2;
-    ForbiddenError forbidden_error = 3;
-    NotFoundError not_found_error = 4;
-    ConflictingError conflicting_error = 5;
-    InternalServerError internal_server_error = 6;
-  }
-}
-
-// Request to speak in community voice chat
-message RequestToSpeakInCommunityVoiceChatPayload {
-  string community_id = 1;
-}
-
-message RequestToSpeakInCommunityVoiceChatResponse {
-  message Ok {
-    string message = 1;
-  }
-
-  oneof response {
-    Ok ok = 1;
-    InvalidRequest invalid_request = 2;
-    ForbiddenError forbidden_error = 3;
-    NotFoundError not_found_error = 4;
-    InternalServerError internal_server_error = 5;
-  }
-}
-
-// Promote speaker in community voice chat
-message PromoteSpeakerInCommunityVoiceChatPayload {
-  string community_id = 1;
-  string user_address = 2;
-}
-
-message PromoteSpeakerInCommunityVoiceChatResponse {
-  message Ok {
-    string message = 1;
-  }
-
-  oneof response {
-    Ok ok = 1;
-    InvalidRequest invalid_request = 2;
-    ForbiddenError forbidden_error = 3;
-    NotFoundError not_found_error = 4;
-    InternalServerError internal_server_error = 5;
-  }
-}
-
-// Demote speaker in community voice chat
-message DemoteSpeakerInCommunityVoiceChatPayload {
-  string community_id = 1;
-  string user_address = 2;
-}
-
-message DemoteSpeakerInCommunityVoiceChatResponse {
-  message Ok {
-    string message = 1;
-  }
-
-  oneof response {
-    Ok ok = 1;
-    InvalidRequest invalid_request = 2;
-    ForbiddenError forbidden_error = 3;
-    NotFoundError not_found_error = 4;
-    InternalServerError internal_server_error = 5;
-  }
-}
-
-// Kick player from community voice chat
-message KickPlayerFromCommunityVoiceChatPayload {
-  string community_id = 1;
-  string user_address = 2;
-}
-
-message KickPlayerFromCommunityVoiceChatResponse {
-  message Ok {
-    string message = 1;
-  }
-
-  oneof response {
-    Ok ok = 1;
-    InvalidRequest invalid_request = 2;
-    ForbiddenError forbidden_error = 3;
-    NotFoundError not_found_error = 4;
-    InternalServerError internal_server_error = 5;
-  }
-}
-
-// End community voice chat (moderator/owner only)
-message EndCommunityVoiceChatPayload {
-  string community_id = 1;
-}
-
-message EndCommunityVoiceChatResponse {
-  message Ok {
-    string message = 1;
-  }
-
-  oneof response {
-    Ok ok = 1;
-    InvalidRequest invalid_request = 2;
-    ForbiddenError forbidden_error = 3;
-    NotFoundError not_found_error = 4;
-    InternalServerError internal_server_error = 5;
-  }
-}
-
-enum CommunityVoiceChatStatus {
-  COMMUNITY_VOICE_CHAT_STARTED = 0;
-  COMMUNITY_VOICE_CHAT_ENDED = 1;
-}
-
-// Community voice chat updates/events - 'started' and 'ended' status
-message CommunityVoiceChatUpdate {
-  string community_id = 1;
-  int64 created_at = 2;
-  CommunityVoiceChatStatus status = 3; // 'started' or 'ended'
-  optional int64 ended_at = 4; // Only present when status is 'ended'
-  repeated string positions = 5; // Positions/coordinates associated with the community (world: false)
-  bool is_member = 6; // Whether the receiving user is a member of the community
-  string community_name = 7; // Name of the community
-  optional string community_image = 8; // Image/picture of the community
-  repeated string worlds = 9; // World names associated with the community (world: true)
-}
-
 service SocialService {  
   // Get the list of friends for the authenticated user
-  rpc GetFriends(GetFriendsPayload) returns (PaginatedFriendsProfilesResponse) {}
+  rpc GetFriends(GetFriendsPayload) returns (PaginatedUsersResponse) {}
 
   // Get the list of mutual friends between the authenticated user and the one in the parameter
-  rpc GetMutualFriends(GetMutualFriendsPayload) returns (PaginatedFriendsProfilesResponse) {}
+  rpc GetMutualFriends(GetMutualFriendsPayload) returns (PaginatedUsersResponse) {}
 
   // Get the pending friendship requests for the authenticated user
   rpc GetPendingFriendshipRequests(GetFriendshipRequestsPayload) returns (PaginatedFriendshipRequestsResponse) {}
@@ -589,75 +155,5 @@ service SocialService {
   rpc SubscribeToFriendshipUpdates(google.protobuf.Empty)
       returns (stream FriendshipUpdate) {}
 
-  // Get the friendship status between the authenticated user and the one in the parameter
   rpc GetFriendshipStatus(GetFriendshipStatusPayload) returns (GetFriendshipStatusResponse) {}
-
-  // Subscribe to connectivity updates of friends: ONLINE, OFFLINE, AWAY
-  rpc SubscribeToFriendConnectivityUpdates(google.protobuf.Empty)
-      returns (stream FriendConnectivityUpdate) {}
-
-  rpc BlockUser(BlockUserPayload) returns (BlockUserResponse) {}
-
-  rpc UnblockUser(UnblockUserPayload) returns (UnblockUserResponse) {}
-
-  rpc GetBlockedUsers(GetBlockedUsersPayload) returns (GetBlockedUsersResponse) {}
-
-  rpc GetBlockingStatus(google.protobuf.Empty) returns (GetBlockingStatusResponse) {}
-
-  rpc SubscribeToBlockUpdates(google.protobuf.Empty) returns (stream BlockUpdate) {}
-  
-  // Get all the social settings for the authenticated user
-  rpc GetSocialSettings(google.protobuf.Empty) returns (GetSocialSettingsResponse) {}
-
-  // Insert or update the social settings for the authenticated user
-  rpc UpsertSocialSettings(UpsertSocialSettingsPayload) returns (UpsertSocialSettingsResponse) {}
-
-  // Get the private messages privacy settings for the requested users
-  rpc GetPrivateMessagesSettings(GetPrivateMessagesSettingsPayload) returns (GetPrivateMessagesSettingsResponse) {}
-
-  // Subscribe to community member connectivity updates: ONLINE, OFFLINE
-  rpc SubscribeToCommunityMemberConnectivityUpdates(google.protobuf.Empty)
-      returns (stream CommunityMemberConnectivityUpdate) {}
-
-  // Start a private voice chat
-  rpc StartPrivateVoiceChat(StartPrivateVoiceChatPayload) returns (StartPrivateVoiceChatResponse) {}
-
-  // Accept a private voice chat
-  rpc AcceptPrivateVoiceChat(AcceptPrivateVoiceChatPayload) returns (AcceptPrivateVoiceChatResponse) {}
-
-  // Reject a private voice chat
-  rpc RejectPrivateVoiceChat(RejectPrivateVoiceChatPayload) returns (RejectPrivateVoiceChatResponse) {}
-
-  // End a private voice chat
-  rpc EndPrivateVoiceChat(EndPrivateVoiceChatPayload) returns (EndPrivateVoiceChatResponse) {}
-
-  // Get the incoming private voice chat request
-  rpc GetIncomingPrivateVoiceChatRequest(google.protobuf.Empty) returns (GetIncomingPrivateVoiceChatRequestResponse) {}
-
-  // Subscribe to private voice chat updates
-  rpc SubscribeToPrivateVoiceChatUpdates(google.protobuf.Empty) returns (stream PrivateVoiceChatUpdate) {}
-
-  // Start a community voice chat (moderator/owner only)
-  rpc StartCommunityVoiceChat(StartCommunityVoiceChatPayload) returns (StartCommunityVoiceChatResponse) {}
-
-  // Join a community voice chat
-  rpc JoinCommunityVoiceChat(JoinCommunityVoiceChatPayload) returns (JoinCommunityVoiceChatResponse) {}
-
-  // Request to speak in community voice chat
-  rpc RequestToSpeakInCommunityVoiceChat(RequestToSpeakInCommunityVoiceChatPayload) returns (RequestToSpeakInCommunityVoiceChatResponse) {}
-
-  // Promote speaker in community voice chat (moderator only)
-  rpc PromoteSpeakerInCommunityVoiceChat(PromoteSpeakerInCommunityVoiceChatPayload) returns (PromoteSpeakerInCommunityVoiceChatResponse) {}
-
-  // Demote speaker in community voice chat (moderator only)
-  rpc DemoteSpeakerInCommunityVoiceChat(DemoteSpeakerInCommunityVoiceChatPayload) returns (DemoteSpeakerInCommunityVoiceChatResponse) {}
-
-  // Kick player from community voice chat (moderator only)
-  rpc KickPlayerFromCommunityVoiceChat(KickPlayerFromCommunityVoiceChatPayload) returns (KickPlayerFromCommunityVoiceChatResponse) {}
-
-  // End community voice chat (moderator/owner only)
-  rpc EndCommunityVoiceChat(EndCommunityVoiceChatPayload) returns (EndCommunityVoiceChatResponse) {}
-
-  // Subscribe to community voice chat updates (only 'started' events)
-  rpc SubscribeToCommunityVoiceChatUpdates(google.protobuf.Empty) returns (stream CommunityVoiceChatUpdate) {}
 }