Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove VectorClock type #235

Merged
merged 5 commits into from
Jan 7, 2025
+3 −5
Merged

Remove VectorClock type #235

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfbdfa5
refactor: remove VectorClock type
richardhuaaa Dec 18, 2024
2fde7b1
chore: remove unnecessary comment
richardhuaaa Dec 18, 2024
37a8120
chore: fix lint
richardhuaaa Dec 18, 2024
8d3676b
Merge remote-tracking branch 'origin/main' into rich/remove-vector-clock
richardhuaaa Jan 3, 2025
bfbd510
refactor: avoid breaking change
richardhuaaa Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions proto/identity/api/v1/identity.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@ package xmtp.identity.api.v1;

import "google/api/annotations.proto";
import "identity/associations/association.proto";
import "identity/associations/signature.proto";
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated lint/auto-format changes

import "protoc-gen-openapiv2/options/annotations.proto";

option go_package = "github.com/xmtp/proto/v3/go/mls/api/v1";
option java_package = "org.xmtp.proto.mls.api.v1";
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
info: {
title: "IdentityApi";
version: "1.0";
};
title: "IdentityApi"
version: "1.0"
}
};

// RPCs for the new MLS API
Expand Down
7 changes: 1 addition & 6 deletions proto/mls_validation/v1/service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ package xmtp.mls_validation.v1;

import "identity/api/v1/identity.proto";
import "identity/associations/association.proto";
import "identity/associations/signature.proto";
import "identity/credential.proto";

option go_package = "github.com/xmtp/proto/v3/go/mls_validation/v1";
Expand All @@ -30,11 +29,7 @@ service ValidationApi {

// Verifies smart contracts
// This request is proxied from the node, so we'll reuse those messgaes.
rpc VerifySmartContractWalletSignatures(
xmtp.identity.api.v1.VerifySmartContractWalletSignaturesRequest
) returns (
xmtp.identity.api.v1.VerifySmartContractWalletSignaturesResponse
) {}
rpc VerifySmartContractWalletSignatures(xmtp.identity.api.v1.VerifySmartContractWalletSignaturesRequest) returns (xmtp.identity.api.v1.VerifySmartContractWalletSignaturesResponse) {}
}

// Contains a batch of serialized Key Packages
Expand Down
10 changes: 3 additions & 7 deletions proto/xmtpv4/envelopes/envelopes.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,13 @@ import "mls/api/v1/mls.proto";

option go_package = "github.com/xmtp/proto/v3/go/xmtpv4/envelopes";

// The last seen entry per originator. Originators that have not been seen are omitted.
// Entries MUST be sorted in ascending order, so that smaller node ID's appear first.
message VectorClock {
map<uint32, uint64> node_id_to_sequence_id = 1;
}

// Data visible to the server that has been authenticated by the client.
message AuthenticatedData {
uint32 target_originator = 1;
bytes target_topic = 2;
VectorClock last_seen = 3;
// The last seen entry per originator. Originators that have not been seen are omitted.
// Entries MUST be sorted in ascending order, so that smaller node ID's appear first.
map<uint32, uint64> last_seen = 3;
}

message ClientEnvelope {
Expand Down
4 changes: 3 additions & 1 deletion proto/xmtpv4/message_api/message_api.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ message EnvelopesQuery {
repeated bytes topics = 1;
// Node queries
repeated uint32 originator_node_ids = 2;
xmtp.xmtpv4.envelopes.VectorClock last_seen = 3;
// The last seen entry per originator. Originators that have not been seen are omitted.
// Entries MUST be sorted in ascending order, so that smaller node ID's appear first.
map<uint32, uint64> last_seen = 3;
}

// Batch subscribe to envelopes
Expand Down
Loading