MarketTakers/arbiter
5
0
Fork 0
Code Issues 27 Pull Requests 4 Packages Projects Releases Wiki Activity

refactor(proto): align remaining ClientConnection protobuf pairs with SdkClient* naming

Browse Source
This commit is contained in:
CleverWild
2026-03-19 18:00:10 +01:00
parent f56668d9f6
commit e89983de3a
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
protobufs/user_agent.proto
View File

@@ -106,15 +106,15 @@ enum VaultState {
VAULT_STATE_ERROR = 4; VAULT_STATE_ERROR = 4;
} }
message ClientConnectionRequest { message SdkClientConnectionRequest {
bytes pubkey = 1; bytes pubkey = 1;
} }
message ClientConnectionResponse { message SdkClientConnectionResponse {
bool approved = 1; bool approved = 1;
} }
message ClientConnectionCancel {} message SdkClientConnectionCancel {}
message UserAgentRequest { message UserAgentRequest {
oneof payload { oneof payload {
@@ -128,7 +128,7 @@ message UserAgentRequest {
arbiter.evm.EvmGrantCreateRequest evm_grant_create = 8; arbiter.evm.EvmGrantCreateRequest evm_grant_create = 8;
arbiter.evm.EvmGrantDeleteRequest evm_grant_delete = 9; arbiter.evm.EvmGrantDeleteRequest evm_grant_delete = 9;
arbiter.evm.EvmGrantListRequest evm_grant_list = 10; arbiter.evm.EvmGrantListRequest evm_grant_list = 10;
ClientConnectionResponse client_connection_response = 11; SdkClientConnectionResponse sdk_client_connection_response = 11;
SdkClientApproveRequest sdk_client_approve = 12; SdkClientApproveRequest sdk_client_approve = 12;
SdkClientRevokeRequest sdk_client_revoke = 13; SdkClientRevokeRequest sdk_client_revoke = 13;
google.protobuf.Empty sdk_client_list = 14; google.protobuf.Empty sdk_client_list = 14;
@@ -146,8 +146,8 @@ message UserAgentResponse {
arbiter.evm.EvmGrantCreateResponse evm_grant_create = 8; arbiter.evm.EvmGrantCreateResponse evm_grant_create = 8;
arbiter.evm.EvmGrantDeleteResponse evm_grant_delete = 9; arbiter.evm.EvmGrantDeleteResponse evm_grant_delete = 9;
arbiter.evm.EvmGrantListResponse evm_grant_list = 10; arbiter.evm.EvmGrantListResponse evm_grant_list = 10;
ClientConnectionRequest client_connection_request = 11; SdkClientConnectionRequest sdk_client_connection_request = 11;
ClientConnectionCancel client_connection_cancel = 12; SdkClientConnectionCancel sdk_client_connection_cancel = 12;
SdkClientApproveResponse sdk_client_approve = 13; SdkClientApproveResponse sdk_client_approve = 13;
SdkClientRevokeResponse sdk_client_revoke = 14; SdkClientRevokeResponse sdk_client_revoke = 14;
SdkClientListResponse sdk_client_list = 15; SdkClientListResponse sdk_client_list = 15;

13
server/crates/arbiter-server/src/actors/user_agent/session.rs
View File

@@ -3,8 +3,8 @@ use std::{ops::DerefMut, sync::Mutex};
use arbiter_proto::proto::{ use arbiter_proto::proto::{
evm as evm_proto, evm as evm_proto,
user_agent::{ user_agent::{
ClientConnectionCancel, ClientConnectionRequest, SdkClientApproveRequest, SdkClientApproveRequest, SdkClientApproveResponse, SdkClientConnectionCancel,
SdkClientApproveResponse, SdkClientEntry, SdkClientError as ProtoSdkClientError, SdkClientConnectionRequest, SdkClientEntry, SdkClientError as ProtoSdkClientError,
SdkClientList, SdkClientListResponse, SdkClientRevokeRequest, SdkClientRevokeResponse, SdkClientList, SdkClientListResponse, SdkClientRevokeRequest, SdkClientRevokeResponse,
UnsealEncryptedKey, UnsealResult, UnsealStart, UnsealStartResponse, UserAgentRequest, UnsealEncryptedKey, UnsealResult, UnsealStart, UnsealStartResponse, UserAgentRequest,
UserAgentResponse, sdk_client_approve_response, sdk_client_list_response, UserAgentResponse, sdk_client_approve_response, sdk_client_list_response,
@@ -127,7 +127,7 @@ impl UserAgentSession {
ctx: &mut Context<Self, Result<bool, Error>>, ctx: &mut Context<Self, Result<bool, Error>>,
) -> Result<bool, Error> { ) -> Result<bool, Error> {
self.send_msg( self.send_msg(
UserAgentResponsePayload::ClientConnectionRequest(ClientConnectionRequest { UserAgentResponsePayload::SdkClientConnectionRequest(SdkClientConnectionRequest {
pubkey: client_pubkey.as_bytes().to_vec(), pubkey: client_pubkey.as_bytes().to_vec(),
}), }),
ctx, ctx,
@@ -135,8 +135,9 @@ impl UserAgentSession {
.await?; .await?;
let extractor = |msg| { let extractor = |msg| {
if let UserAgentRequestPayload::ClientConnectionResponse(client_connection_response) = if let UserAgentRequestPayload::SdkClientConnectionResponse(
msg client_connection_response,
) = msg
{ {
Some(client_connection_response) Some(client_connection_response)
} else { } else {
@@ -148,7 +149,7 @@ impl UserAgentSession {
_ = cancel_flag.changed() => { _ = cancel_flag.changed() => {
info!(actor = "useragent", "client connection approval cancelled"); info!(actor = "useragent", "client connection approval cancelled");
self.send_msg( self.send_msg(
UserAgentResponsePayload::ClientConnectionCancel(ClientConnectionCancel {}), UserAgentResponsePayload::SdkClientConnectionCancel(SdkClientConnectionCancel {}),
ctx, ctx,
).await?; ).await?;
Ok(false) Ok(false)