Skip to content

Commit

Permalink
feat(satp-hermes): satp proto update (#3147)
Browse files Browse the repository at this point in the history 
* feat(satp-hermes): update protos

Signed-off-by: Carlos Amaro <carlosrscamaro@tecnico.ulisboa.pt>

* feat(satp-hermes): protos

Signed-off-by: Carlos Amaro <carlosrscamaro@tecnico.ulisboa.pt>

* feat(satp-hermes): protos

Signed-off-by: Carlos Amaro <carlosrscamaro@tecnico.ulisboa.pt>

---------

Signed-off-by: Carlos Amaro <carlosrscamaro@tecnico.ulisboa.pt>
  • Loading branch information
@LordKubaya
LordKubaya authored Mar 29, 2024
1 parent 32bcb45 commit a0ac1ac
Show file tree
Hide file tree
Showing 6 changed files with 405 additions and 117 deletions.
11 changes: 4 additions & 7 deletions ...ages/cactus-plugin-satp-hermes/src/main/proto/cacti/satp/v02/common/common_messages.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ message TransferClaims {
string beneficiary_pubkey = 6;
string sender_gateway_network_id = 7;
string recipient_gateway_network_id = 8;
string client_identity_pubkey = 9;
string server_identity_pubkey = 10;
string client_gateway_pubkey = 9;
string server_gateway_pubkey = 10;
string sender_gateway_owner_id = 11;
string receiver_gateway_owner_id = 12;
uint32 max_retries = 13;
Expand Down Expand Up @@ -110,17 +110,14 @@ message CommonSatp {
string transfer_context_id = 4;
uint64 sequence_number = 5;
string resource_url = 6;
string developer_urn = 7;
ActionResponse action_response = 8;
CredentialProfile credential_profile = 9;
string credential_block = 10;
PayloadProfile payload_profile = 11;
string application_profile = 12;
Payload payload = 13;
string payload_hash = 14;
string signature = 15;
string client_identity_pubkey = 16;
string server_identity_pubkey = 17;
string client_gateway_pubkey = 16;
string server_gateway_pubkey = 17;
string hash_previous_message = 18;
}

Expand Down
103 changes: 72 additions & 31 deletions packages/cactus-plugin-satp-hermes/src/main/proto/cacti/satp/v02/common/session.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,53 @@ import "google/protobuf/empty.proto";
import "cacti/satp/v02/common/common_messages.proto";



message SessionData {
message SessionData {
string id = 1;
string version = 2;
string transfer_context_id = 3;
MessageStagesHashes hashes = 4;
cacti.satp.v02.common.PayloadProfile payload_profile = 5;
MessageStagesSignatures signatures = 6;
string max_retries = 7;
string max_timeout = 8;
string logging_profile = 9;
string recipient_base_path = 10;
string source_base_path = 11;
string access_control_profile = 12;
string application_profile = 13;
int64 last_sequence_number = 14;
string sender_gateway_network_id = 15;
string recipient_gateway_network_id = 16;
string source_ledger_asset_id = 17;
string recipient_ledger_asset_id = 18;
string server_identity_pubkey = 19;
string source_gateway_pubkey = 20;
string verified_originator_entity_id = 21;
string verified_beneficiary_entity_id = 22;
string asset_profile_id = 23;
string digital_asset_id = 24;
string originator_pubkey = 25;
string beneficiary_pubkey = 26;
string sender_gateway_owner_id = 27;
string receiver_gateway_owner_id = 28;
string hash_transfer_init_claims = 29;
}
string id = 1;
string version = 2;
string transfer_context_id = 3;
MessageStagesHashes hashes = 4;
cacti.satp.v02.common.PayloadProfile payload_profile = 5;
MessageStagesSignatures signatures = 6;
string max_retries = 7;
string max_timeout = 8;
string logging_profile = 9;
string recipient_base_path = 10;
string source_base_path = 11;
string access_control_profile = 12;
string application_profile = 13;
int64 last_sequence_number = 14;
string sender_gateway_network_id = 15;
string recipient_gateway_network_id = 16;
string source_ledger_asset_id = 17;
string recipient_ledger_asset_id = 18;
string server_gateway_pubkey = 19;
string client_gateway_pubkey = 20;
string verified_originator_entity_id = 21;
string verified_beneficiary_entity_id = 22;
string asset_profile_id = 23;
string digital_asset_id = 24;
string originator_pubkey = 25;
string beneficiary_pubkey = 26;
string sender_gateway_owner_id = 27;
string receiver_gateway_owner_id = 28;
string hash_transfer_init_claims = 29;
cacti.satp.v02.common.SignatureAlgorithm signature_algorithm = 30;
cacti.satp.v02.common.LockType lock_type = 31;
uint64 lock_expiration_time = 32;
cacti.satp.v02.common.Permissions permitions = 33;
string developer_urn = 34;
cacti.satp.v02.common.CredentialProfile credential_profile = 35;
string subsequent_calls = 36;
string history = 37;
bool multiple_claims_allowed = 38;
bool multiple_cancels_allowed = 39;
string last_message_received_timestamp = 40;
MessageStagesTimestamps processed_timestamps = 41;
MessageStagesTimestamps received_timestamps = 42;
}


message MessageStagesHashes {
Stage1Hashes stage1 = 1;
Stage2Hashes stage2 = 2;
Expand Down Expand Up @@ -96,6 +109,34 @@ message Stage3Signatures {
string transfer_complete_response_message_server_signature = 6;
}

message MessageStagesTimestamps {
Stage1Timestamps stage1 = 1;
Stage2Timestamps stage2 = 2;
Stage3Timestamps stage3 = 3;
}

message Stage1Timestamps {
string transfer_proposal_request_message_timestamp = 1;
string transfer_proposal_receipt_message_timestamp = 2;
string transfer_proposal_reject_message_timestamp = 3;
string transfer_commence_request_message_timestamp = 4;
string transfer_commence_response_message_timestamp = 5;
}

message Stage2Timestamps {
string lock_assertion_request_message_timestamp = 1;
string lock_assertion_receipt_message_timestamp = 2;
}

message Stage3Timestamps {
string commit_preparation_request_message_timestamp = 1;
string commit_ready_response_message_timestamp = 2;
string commit_final_assertion_request_message_timestamp = 3;
string commit_final_acknoledgement_receipt_response_message_timestamp = 4;
string transfer_complete_request_message_timestamp = 5;
string transfer_complete_response_message_timestamp = 6;
}


message SendStatusRequest {
string status = 1;
Expand Down
1 change: 1 addition & 0 deletions packages/cactus-plugin-satp-hermes/src/main/typescript/core/constants.ts
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export const DEFAULT_PORT_GATEWAY_SERVER = 3010;
export const DEFAULT_PORT_GATEWAY_CLIENT = DEFAULT_PORT_GATEWAY_SERVER + 1;
export const DEFAULT_PORT_GATEWAY_UI = DEFAULT_PORT_GATEWAY_SERVER + 2;
export const SATP_VERSION = "v02";
42 changes: 12 additions & 30 deletions ...tp-hermes/src/main/typescript/generated/proto/cacti/satp/v02/common/common_messages_pb.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,14 +484,14 @@ export class TransferClaims extends Message<TransferClaims> {
recipientGatewayNetworkId = "";

/**
* @generated from field: string client_identity_pubkey = 9;
* @generated from field: string client_gateway_pubkey = 9;
*/
clientIdentityPubkey = "";
clientGatewayPubkey = "";

/**
* @generated from field: string server_identity_pubkey = 10;
* @generated from field: string server_gateway_pubkey = 10;
*/
serverIdentityPubkey = "";
serverGatewayPubkey = "";

/**
* @generated from field: string sender_gateway_owner_id = 11;
Expand Down Expand Up @@ -529,8 +529,8 @@ export class TransferClaims extends Message<TransferClaims> {
{ no: 6, name: "beneficiary_pubkey", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 7, name: "sender_gateway_network_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 8, name: "recipient_gateway_network_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 9, name: "client_identity_pubkey", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 10, name: "server_identity_pubkey", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 9, name: "client_gateway_pubkey", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 10, name: "server_gateway_pubkey", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 11, name: "sender_gateway_owner_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 12, name: "receiver_gateway_owner_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 13, name: "max_retries", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
Expand Down Expand Up @@ -956,21 +956,11 @@ export class CommonSatp extends Message<CommonSatp> {
*/
resourceUrl = "";

/**
* @generated from field: string developer_urn = 7;
*/
developerUrn = "";

/**
* @generated from field: cacti.satp.v02.common.ActionResponse action_response = 8;
*/
actionResponse?: ActionResponse;

/**
* @generated from field: cacti.satp.v02.common.CredentialProfile credential_profile = 9;
*/
credentialProfile = CredentialProfile.UNSPECIFIED;

/**
* @generated from field: string credential_block = 10;
*/
Expand All @@ -981,11 +971,6 @@ export class CommonSatp extends Message<CommonSatp> {
*/
payloadProfile?: PayloadProfile;

/**
* @generated from field: string application_profile = 12;
*/
applicationProfile = "";

/**
* @generated from field: cacti.satp.v02.common.Payload payload = 13;
*/
Expand All @@ -1002,14 +987,14 @@ export class CommonSatp extends Message<CommonSatp> {
signature = "";

/**
* @generated from field: string client_identity_pubkey = 16;
* @generated from field: string client_gateway_pubkey = 16;
*/
clientIdentityPubkey = "";
clientGatewayPubkey = "";

/**
* @generated from field: string server_identity_pubkey = 17;
* @generated from field: string server_gateway_pubkey = 17;
*/
serverIdentityPubkey = "";
serverGatewayPubkey = "";

/**
* @generated from field: string hash_previous_message = 18;
Expand All @@ -1030,17 +1015,14 @@ export class CommonSatp extends Message<CommonSatp> {
{ no: 4, name: "transfer_context_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 5, name: "sequence_number", kind: "scalar", T: 4 /* ScalarType.UINT64 */ },
{ no: 6, name: "resource_url", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 7, name: "developer_urn", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 8, name: "action_response", kind: "message", T: ActionResponse },
{ no: 9, name: "credential_profile", kind: "enum", T: proto3.getEnumType(CredentialProfile) },
{ no: 10, name: "credential_block", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 11, name: "payload_profile", kind: "message", T: PayloadProfile },
{ no: 12, name: "application_profile", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 13, name: "payload", kind: "message", T: Payload },
{ no: 14, name: "payload_hash", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 15, name: "signature", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 16, name: "client_identity_pubkey", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 17, name: "server_identity_pubkey", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 16, name: "client_gateway_pubkey", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 17, name: "server_gateway_pubkey", kind: "scalar", T: 9 /* ScalarType.STRING */ },
{ no: 18, name: "hash_previous_message", kind: "scalar", T: 9 /* ScalarType.STRING */ },
]);

Expand Down
Loading

0 comments on commit a0ac1ac

Please sign in to comment.