Compare commits

..

5 Commits

Author SHA1 Message Date
nfel c79f1071d8 feat(market): add ICO scheduling and lifecycle RPCs 2026-09-22 13:59:56 +03:30
nfel 9863d40592 chore: update project changes
CI/CD Stage / stage (push) Failing after 3m24s
2026-09-21 15:33:47 +03:30
Navid d01c287550 feat: version ledger settlement contracts 2026-09-15 13:59:13 +03:30
nfel e316e225a0 feat(proto): add authenticated asset admin commands 2026-08-31 23:59:25 +03:30
nfel a719f8ff56 refactor(proto): remove federation wallet messages 2026-08-30 21:43:49 +03:30
11 changed files with 243 additions and 86 deletions
+1 -1
View File
@@ -7,8 +7,8 @@ import "base/v1/msg.proto";
service AlertSrv { service AlertSrv {
rpc NotificationSrvHealth(base.v1.Empty) returns (base.v1.StatusRes); rpc NotificationSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
rpc NotificationSMTPHealth(base.v1.Empty) returns (base.v1.StatusRes);
rpc Emit(LogEvent) returns (base.v1.StatusRes) {} rpc Emit(LogEvent) returns (base.v1.StatusRes) {}
// rpc Update(LogEvent) returns (base.v1.StatusRes) {} // rpc Update(LogEvent) returns (base.v1.StatusRes) {}
// rpc Get(AlertFilter) returns (base.v1.StatusRes) {} // rpc Get(AlertFilter) returns (base.v1.StatusRes) {}
} }
+5
View File
@@ -15,4 +15,9 @@ service InternalAuthorizationService {
rpc InitPermissionsForRoutes(InternalInitRoutesReq) returns (base.v1.StatusRes) {} rpc InitPermissionsForRoutes(InternalInitRoutesReq) returns (base.v1.StatusRes) {}
rpc GetUserIdentityBasic(GetUserReq) returns (UserIdentityBasic) {} rpc GetUserIdentityBasic(GetUserReq) returns (UserIdentityBasic) {}
rpc GetUserIAM(GetUserReq) returns (InternalIAM) {} rpc GetUserIAM(GetUserReq) returns (InternalIAM) {}
rpc ListRoles(InternalRoleListReq) returns (RoleList) {}
rpc ListPermissions(InternalPermissionListReq) returns (PermissionList) {}
rpc CreateRoleAndAssign(CreateRoleAndAssignReq) returns (InternalIAM) {}
rpc AssignRoleToUser(AssignRoleToUserReq) returns (InternalIAM) {}
rpc AssignPermissionToUser(AssignPermissionToUserReq) returns (InternalIAM) {}
} }
+39
View File
@@ -37,6 +37,44 @@ message PermissionList {
uint32 total_count = 4; uint32 total_count = 4;
} }
message RoleList {
repeated Role list = 1;
uint32 total_count = 2;
}
message InternalRoleListReq {
string type = 1;
}
message InternalPermissionListReq {
int64 role_id = 1;
}
message CreateRoleAndAssignReq {
int64 user_id = 1;
string title = 2;
string key = 3;
string type = 4;
int64 parent_id = 5;
repeated int64 permission_ids = 6;
}
message AssignRoleToUserReq {
int64 user_id = 1;
int64 role_id = 2;
bool assigned = 3;
}
// Users only carry role IDs in the authorization schema. When role_id is
// omitted, the service creates a private role for this user and grants the
// requested permission through that role.
message AssignPermissionToUserReq {
int64 user_id = 1;
int64 permission_id = 2;
int64 role_id = 3;
bool assigned = 4;
}
/* /*
UserSendOtp UserSendOtp
*/ */
@@ -132,6 +170,7 @@ message User {
UserStatus status = 5; UserStatus status = 5;
repeated int64 roles = 6; repeated int64 roles = 6;
int64 referrer_user_id = 7; int64 referrer_user_id = 7;
string referral_code = 8;
} }
message UserAddress { message UserAddress {
+3 -1
View File
@@ -31,7 +31,9 @@ service AuthorizationService {
rpc ProcessTFAReq(TFAReq) returns (base.v1.StatusRes) {} rpc ProcessTFAReq(TFAReq) returns (base.v1.StatusRes) {}
// For HMAC-OTP an initialization step must be added to exchange keys // For HMAC-OTP an initialization step must be added to exchange keys
rpc InitTFAReq(InternalIAM) returns (TFAExRes) {} // Deprecated: authenticator-app enrollment was never implemented. Darano
// currently supports the ProcessTFAReq/CheckTFACode OTP flow.
rpc InitTFAReq(InternalIAM) returns (TFAExRes) { option deprecated = true; }
rpc CheckTFACode(CheckTFAReq) returns (base.v1.StatusRes) {} rpc CheckTFACode(CheckTFAReq) returns (base.v1.StatusRes) {}
} }
+16 -12
View File
@@ -19,13 +19,13 @@ plugins:
- local: protoc-gen-go - local: protoc-gen-go
# - remote: buf.build/protocolbuffers/go:v1.30.0 # - remote: buf.build/protocolbuffers/go:v1.30.0
out: stub/go out: stub/go
# NOTE: doc # # NOTE: doc
- local: protoc-gen-doc # - local: protoc-gen-doc
opt: html,index.html,source_relative # opt: html,index.html,source_relative
out: stub/doc/html # out: stub/doc/html
- local: protoc-gen-doc # - local: protoc-gen-doc
opt: markdown,index.md,source_relative # opt: markdown,index.md,source_relative
out: stub/doc/md # out: stub/doc/md
# # NOTE: Gateway # # NOTE: Gateway
# # - remote: buf.build/grpc-ecosystem/gateway:v2.16.2 # # - remote: buf.build/grpc-ecosystem/gateway:v2.16.2
- local: protoc-gen-grpc-gateway - local: protoc-gen-grpc-gateway
@@ -48,15 +48,19 @@ plugins:
# - remote: buf.build/bufbuild/es:v2.2.2 # - remote: buf.build/bufbuild/es:v2.2.2
# # opt: import_prefix=github.com/nfel # # opt: import_prefix=github.com/nfel
# out: stub/ts # out: stub/ts
- local: protoc-gen-es # - local: protoc-gen-es
out: stub/ts # out: stub/ts
opt: target=ts # opt: target=ts
#
# - local: protobuf-ts # - local: protobuf-ts
# # opt: import_prefix=github.com/nfel # # opt: import_prefix=github.com/nfel
# out: stub/ts # out: stub/ts
- local: protoc-gen-prost
out: stub/rs
- local: protoc-gen-tonic
out: stub/rs
inputs: inputs:
- directory: ./ - directory: ./
# - git_repo: ssh://git@5.34.204.11/Kahroba/proto # - git_repo: ssh://git@5.34.204.11/Kahroba/proto
# branch: v2 # branch: v2
+50
View File
@@ -165,4 +165,54 @@ message ReplayJournalsResponse {
message HealthResponse { message HealthResponse {
bool serving = 1; bool serving = 1;
bool database_ready = 2; bool database_ready = 2;
bool settlement_enabled = 3;
bool settlement_ready = 4;
int64 settlement_pending = 5;
int64 settlement_retryable = 6;
int64 settlement_manual_review = 7;
int64 oldest_pending_seconds = 8;
}
message EnqueueSettlementRequest {
string source_service = 1;
string source_transaction_id = 2;
string idempotency_key = 3;
string network = 4;
// Signed transaction XDR. GL persists and submits this payload durably.
string signed_transaction_xdr = 5;
}
message EnqueueSettlementResponse {
string settlement_id = 1;
string status = 2;
bool already_existed = 3;
}
message GetSettlementRequest {
oneof lookup {
string settlement_id = 1;
string idempotency_key = 2;
}
}
message Settlement {
string settlement_id = 1;
string source_service = 2;
string source_transaction_id = 3;
string idempotency_key = 4;
string status = 5;
string network = 6;
string transaction_hash = 7;
uint32 attempts = 8;
string last_error = 9;
}
message RetrySettlementRequest {
string settlement_id = 1;
string actor_id = 2;
string reason = 3;
}
message RetrySettlementResponse {
Settlement settlement = 1;
} }
+4
View File
@@ -13,4 +13,8 @@ service GeneralLedgerService {
rpc ListEntries(ListEntriesRequest) returns (ListEntriesResponse); rpc ListEntries(ListEntriesRequest) returns (ListEntriesResponse);
rpc GetBalance(GetBalanceRequest) returns (GetBalanceResponse); rpc GetBalance(GetBalanceRequest) returns (GetBalanceResponse);
rpc ReplayJournals(ReplayJournalsRequest) returns (ReplayJournalsResponse); rpc ReplayJournals(ReplayJournalsRequest) returns (ReplayJournalsResponse);
rpc EnqueueSettlement(EnqueueSettlementRequest) returns (EnqueueSettlementResponse);
rpc GetSettlement(GetSettlementRequest) returns (Settlement);
// Restricted operator command. Requires the configured x-admin-token metadata.
rpc RetrySettlement(RetrySettlementRequest) returns (RetrySettlementResponse);
} }
+13
View File
@@ -72,6 +72,8 @@ message MarketOrder {
repeated string comment = 21; repeated string comment = 21;
optional MarketOrder source = 22; // purchase is done via this field optional MarketOrder source = 22; // purchase is done via this field
bool is_ico = 23; bool is_ico = 23;
optional string starts_at = 24; // RFC3339; absent means immediately available
optional string ends_at = 25; // RFC3339; absent means no scheduled end
// repeated string attachments = 14; // possible files included by // repeated string attachments = 14; // possible files included by
// seller/buyer // seller/buyer
} }
@@ -113,6 +115,15 @@ message MarketOrderList {
uint32 total_count = 4; uint32 total_count = 4;
} }
// AdminCancelOrderReq is used by trusted administrative tooling to cancel an
// order through the wallet service. The wallet service authenticates the
// caller with the administrative gRPC token; actor_user_id is retained for
// audit attribution.
message AdminCancelOrderReq {
uint64 order_id = 1;
int64 actor_user_id = 2;
}
/* /*
* participant_type: IS Maker/Taker * participant_type: IS Maker/Taker
* side: IS Buying/Selling * side: IS Buying/Selling
@@ -132,6 +143,8 @@ message NewMarketReq {
// TODO: maker market order as optional // TODO: maker market order as optional
optional uint64 maker_order_id = 9; optional uint64 maker_order_id = 9;
bool is_ico = 10; bool is_ico = 10;
optional string starts_at = 11; // RFC3339
optional string ends_at = 12; // RFC3339
} }
enum MarketOrdersSortBy { enum MarketOrdersSortBy {
+2
View File
@@ -20,6 +20,8 @@ service MarketplaceSrv {
rpc CalcICOBuy(wallet.v1.BuyAssetReq) returns (wallet.v1.CalcBuyAssetRes); rpc CalcICOBuy(wallet.v1.BuyAssetReq) returns (wallet.v1.CalcBuyAssetRes);
rpc CancelOrder(auth.v1.IdReqWithIAMAndTFA) returns (base.v1.StatusRes); // cancel an order rpc CancelOrder(auth.v1.IdReqWithIAMAndTFA) returns (base.v1.StatusRes); // cancel an order
rpc AdminCancelOrder(AdminCancelOrderReq) returns (base.v1.StatusRes); // cancel an order from trusted admin tooling
rpc DeleteOrder(auth.v1.IdReqWithIAMAndTFA) returns (base.v1.StatusRes); // delete a closed order
rpc NewMarketOrder(NewMarketReq) returns (MarketOrder); // insert new buy order to market rpc NewMarketOrder(NewMarketReq) returns (MarketOrder); // insert new buy order to market
rpc GenerateMarketContract(MarketContractReq) returns (ContractMarketRes); rpc GenerateMarketContract(MarketContractReq) returns (ContractMarketRes);
+10 -1
View File
@@ -15,9 +15,18 @@ service InternalWalletSrv {
rpc CollectCommission(CommissionReq) returns (CommissionRes); rpc CollectCommission(CommissionReq) returns (CommissionRes);
rpc RefundCommission(RefundCommissionReq) returns (CommissionRes); rpc RefundCommission(RefundCommissionReq) returns (CommissionRes);
// Calculate stellar pub-priv key based on national id // Deterministically derive the Stellar public key. This operation is local
// and has no database, Horizon, or GL side effects.
rpc GetPublicKeyByNationalID(NationalIDReq) returns (PubKeyRes); rpc GetPublicKeyByNationalID(NationalIDReq) returns (PubKeyRes);
// Create and enqueue the on-chain account activation transaction.
rpc ActivateAccount(NationalIDReq) returns (base.v1.StatusRes);
// Commission Logs // Commission Logs
rpc InitReferrerCommissionLog(InitReferrerCommissionLogIn) returns (base.v1.Empty); rpc InitReferrerCommissionLog(InitReferrerCommissionLogIn) returns (base.v1.Empty);
// Authenticated administrative asset lifecycle. Delete is represented as
// deactivation/locking so referenced financial history remains intact.
rpc AdminUpsertAsset(AdminUpsertAssetReq) returns (AdminAssetMutationRes);
rpc AdminDeactivateAsset(AdminDeactivateAssetReq) returns (base.v1.StatusRes);
} }
+89 -60
View File
@@ -9,31 +9,19 @@ import "base/v1/msg.proto";
INTERNAL DATA; INTERNAL DATA;
*/ */
message Foo {
string first = 1;
oneof some_oneof {
string second = 2;
string third = 3;
}
string d = 4;
}
message InternalTransactionData { message InternalTransactionData {
int64 transaction_id = 1; int64 transaction_id = 1;
} }
/*
Federation
*/
message Federation {
int64 id = 1;
int64 user_id = 2;
string ed_public = 3;
string ed_public_hash = 4;
int32 status = 5;
string created_at = 6;
string system_wallet_address = 7;
}
message GetFederationReq {
optional int64 federation_id = 1;
optional int64 user_id = 2;
optional string ed_public = 3;
optional string ed_public_hash = 4;
}
/* /*
Wallet Wallet
*/ */
@@ -59,15 +47,13 @@ message Wallet {
int64 user_id = 2; int64 user_id = 2;
int64 asset_id = 3; int64 asset_id = 3;
Asset asset_info = 4; Asset asset_info = 4;
int64 federation_id = 5; double balance = 5;
Federation federation_info = 6; double frozen_balance = 6;
double balance = 7; string updated_at = 7;
double frozen_balance = 8; string created_at = 8;
string updated_at = 9; string wallet_code = 9;
string created_at = 10; bool accepted_terms = 10;
string wallet_code = 11; bool is_locked = 11;
bool accepted_terms = 12;
bool is_locked = 13;
} }
message BalanceReq { message BalanceReq {
@@ -374,27 +360,22 @@ message Transaction {
string asset_code = 3; string asset_code = 3;
optional int64 from_user_id = 4; optional int64 from_user_id = 4;
optional auth.v1.UserIdentityBasic from_user_info = 5; optional auth.v1.UserIdentityBasic from_user_info = 5;
optional int64 from_federation_id = 6; optional int64 to_user_id = 6;
optional Federation from_federation_info = 7; optional auth.v1.UserIdentityBasic to_user_info = 7;
double amount = 8;
optional int64 to_user_id = 8; TransactionStatus status = 9;
optional auth.v1.UserIdentityBasic to_user_info = 9; TransactionType type = 10;
optional int64 to_federation_id = 10; string updated_at = 11;
optional Federation to_federation_info = 11; string created_at = 12;
double amount = 12; string tracking_code = 13;
TransactionStatus status = 13; optional string trx_hash = 14;
TransactionType type = 14; optional string from_public_key = 15;
string updated_at = 15; optional string to_public_key = 16;
string created_at = 16; double token_price = 17;
string tracking_code = 17; BalanceChange balance_change = 18;
optional string trx_hash = 18;
optional string from_public_key = 19;
optional string to_public_key = 20;
double token_price = 21;
BalanceChange balance_change = 22;
} }
enum BalanceChange{ enum BalanceChange {
NO_CHANGE = 0; NO_CHANGE = 0;
INCREASE = 1; INCREASE = 1;
DECREASE = 2; DECREASE = 2;
@@ -407,16 +388,14 @@ message TransactionListFilter {
optional int64 id = 4; optional int64 id = 4;
optional int64 asset_id = 5; optional int64 asset_id = 5;
optional int64 from_user_id = 6; optional int64 from_user_id = 6;
optional int64 from_federation_id = 7; optional int64 to_user_id = 7;
optional int64 to_user_id = 8; optional double amount_from = 8;
optional int64 to_federation_id = 9; optional double amount_to = 9;
optional double amount_from = 10; optional string tracking_code = 10;
optional double amount_to = 11; repeated TransactionType type = 11;
optional string tracking_code = 12; repeated TransactionStatus status = 12;
repeated TransactionType type = 13; optional string from_date = 13;
repeated TransactionStatus status = 14; optional string to_date = 14;
optional string from_date = 15;
optional string to_date = 16;
} }
/* /*
@@ -686,7 +665,6 @@ message IPGConfirmReq {
// string amount = 7; // string amount = 7;
} }
message WithdrawLog { message WithdrawLog {
uint64 id = 1; uint64 id = 1;
Accounting accounting = 2; Accounting accounting = 2;
@@ -842,3 +820,54 @@ message ContractRes {
string contract_hash = 4; string contract_hash = 4;
string contract_content = 5; string contract_content = 5;
} }
// Administrative asset commands are intentionally separate from the public
// Asset response. They contain the complete persistence-owned asset aggregate
// and are accepted only by the authenticated InternalWalletSrv boundary.
message AdminAssetInput {
int64 id = 1;
string name = 2;
string code = 3;
string issuer = 4;
string distributor = 5;
string network_code = 6;
string anchor = 7;
int32 decimal = 8;
string max_supply = 9;
optional string buy_min_amount = 10;
optional string buy_max_amount = 11;
string image = 12;
repeated string images = 13;
repeated string videos = 14;
string description = 15;
string url = 16;
string meta_json = 17;
bool is_active = 18;
bool is_locked = 19;
bool is_base_asset = 20;
bool show_if_empty = 21;
bool has_policy = 22;
bool has_whitelisting = 23;
bool can_buy = 24;
bool can_sell = 25;
bool can_deposit = 26;
bool can_withdraw = 27;
bool can_trade = 28;
AssetTokenType token_type = 29;
AssetType type = 30;
AssetStatus status = 31;
}
message AdminUpsertAssetReq {
AdminAssetInput asset = 1;
uint64 actor_user_id = 2;
}
message AdminDeactivateAssetReq {
int64 asset_id = 1;
uint64 actor_user_id = 2;
}
message AdminAssetMutationRes {
int64 asset_id = 1;
}