refactor(proto): remove federation wallet messages

auth/v1/msg.proto

@@ -81,6 +81,7 @@ message CheckIAMReq {
 message InternalIAM {
   User user = 1;
   IdentityBasic identity = 2;
+  repeated string role_keys = 3;
 }
 
 message IdReqWithIAM {

ledger/v1/msg.proto

@@ -0,0 +1,168 @@
+syntax = "proto3";
+
+package ledger.v1;
+
+import "google/protobuf/timestamp.proto";
+
+enum AccountClass {
+  ACCOUNT_CLASS_UNSPECIFIED = 0;
+  ACCOUNT_CLASS_USER_AVAILABLE = 1;
+  ACCOUNT_CLASS_USER_FROZEN = 2;
+  ACCOUNT_CLASS_EXTERNAL_BLOCKCHAIN = 3;
+  ACCOUNT_CLASS_TREASURY = 4;
+  ACCOUNT_CLASS_MARKET_CLEARING = 5;
+  ACCOUNT_CLASS_IPG_CLEARING = 6;
+  ACCOUNT_CLASS_COMMISSION_REVENUE = 7;
+}
+
+enum TransactionState {
+  TRANSACTION_STATE_UNSPECIFIED = 0;
+  TRANSACTION_STATE_CREATED = 1;
+  TRANSACTION_STATE_PENDING_TRANSACTION = 2;
+  TRANSACTION_STATE_PENDING_ADMIN = 3;
+  TRANSACTION_STATE_SUCCESSFUL = 4;
+  TRANSACTION_STATE_FAILED = 5;
+  TRANSACTION_STATE_SUSPENDED = 6;
+}
+
+message AccountReference {
+  AccountClass account_class = 1;
+  string owner_type = 2;
+  string owner_id = 3;
+  int64 asset_id = 4;
+}
+
+message JournalEntry {
+  uint32 line_number = 1;
+  AccountReference account = 2;
+  // Canonical base-10 decimal. Positive is credit and negative is debit.
+  string amount = 3;
+  string description = 4;
+}
+
+message BlockchainReference {
+  string network = 1;
+  string transaction_hash = 2;
+  string ledger_sequence = 3;
+}
+
+message Journal {
+  string journal_id = 1;
+  string source_service = 2;
+  string idempotency_key = 3;
+  string source_transaction_id = 4;
+  string tracking_code = 5;
+  string effect_kind = 6;
+  uint32 event_version = 7;
+  repeated JournalEntry entries = 8;
+  optional string reversal_of_journal_id = 9;
+  google.protobuf.Timestamp occurred_at = 10;
+  google.protobuf.Timestamp recorded_at = 11;
+  string correlation_id = 12;
+  string actor_id = 13;
+  BlockchainReference blockchain = 14;
+  map<string, string> metadata = 15;
+  string payload_hash = 16;
+}
+
+message AppendJournalRequest {
+  string source_service = 1;
+  string idempotency_key = 2;
+  string source_transaction_id = 3;
+  string tracking_code = 4;
+  string effect_kind = 5;
+  uint32 event_version = 6;
+  repeated JournalEntry entries = 7;
+  optional string reversal_of_journal_id = 8;
+  google.protobuf.Timestamp occurred_at = 9;
+  string correlation_id = 10;
+  string actor_id = 11;
+  BlockchainReference blockchain = 12;
+  map<string, string> metadata = 13;
+}
+
+message AppendJournalResponse {
+  Journal journal = 1;
+  bool already_existed = 2;
+}
+
+message AppendTransactionEventRequest {
+  string source_service = 1;
+  string idempotency_key = 2;
+  string source_transaction_id = 3;
+  string tracking_code = 4;
+  uint32 event_version = 5;
+  TransactionState state = 6;
+  string error_code = 7;
+  string error_message = 8;
+  google.protobuf.Timestamp occurred_at = 9;
+  string correlation_id = 10;
+  string actor_id = 11;
+  BlockchainReference blockchain = 12;
+  map<string, string> metadata = 13;
+}
+
+message TransactionEvent {
+  string event_id = 1;
+  AppendTransactionEventRequest event = 2;
+  google.protobuf.Timestamp recorded_at = 3;
+  string payload_hash = 4;
+}
+
+message AppendTransactionEventResponse {
+  TransactionEvent event = 1;
+  bool already_existed = 2;
+}
+
+message GetJournalRequest {
+  oneof lookup {
+    string journal_id = 1;
+    string idempotency_key = 2;
+  }
+}
+
+message ListEntriesRequest {
+  optional AccountReference account = 1;
+  optional int64 asset_id = 2;
+  google.protobuf.Timestamp recorded_from = 3;
+  google.protobuf.Timestamp recorded_to = 4;
+  uint32 page_size = 5;
+  string page_token = 6;
+}
+
+message ListEntriesResponse {
+  repeated Journal journals = 1;
+  string next_page_token = 2;
+}
+
+message GetBalanceRequest {
+  AccountReference account = 1;
+  google.protobuf.Timestamp as_of = 2;
+}
+
+message GetBalanceResponse {
+  AccountReference account = 1;
+  // Canonical base-10 decimal reconstructed from immutable entries.
+  string balance = 2;
+  google.protobuf.Timestamp as_of = 3;
+}
+
+message ReplayJournalsRequest {
+  // Each item is independently atomic and uses normal append idempotency.
+  repeated AppendJournalRequest journals = 1;
+}
+
+message ReplayJournalResult {
+  string idempotency_key = 1;
+  Journal journal = 2;
+  bool already_existed = 3;
+}
+
+message ReplayJournalsResponse {
+  repeated ReplayJournalResult results = 1;
+}
+
+message HealthResponse {
+  bool serving = 1;
+  bool database_ready = 2;
+}

ledger/v1/srv.proto

@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+package ledger.v1;
+
+import "base/v1/msg.proto";
+import "ledger/v1/msg.proto";
+
+service GeneralLedgerService {
+  rpc Health(base.v1.Empty) returns (HealthResponse);
+  rpc AppendJournal(AppendJournalRequest) returns (AppendJournalResponse);
+  rpc AppendTransactionEvent(AppendTransactionEventRequest) returns (AppendTransactionEventResponse);
+  rpc GetJournal(GetJournalRequest) returns (Journal);
+  rpc ListEntries(ListEntriesRequest) returns (ListEntriesResponse);
+  rpc GetBalance(GetBalanceRequest) returns (GetBalanceResponse);
+  rpc ReplayJournals(ReplayJournalsRequest) returns (ReplayJournalsResponse);
+}

market/v1/msg.proto

@@ -71,6 +71,7 @@ message MarketOrder {
   repeated string tags = 20;
   repeated string comment = 21;
   optional MarketOrder source = 22; // purchase is done via this field
+  bool is_ico = 23;
   // repeated string attachments = 14; // possible files included by
   // seller/buyer
 }
@@ -130,6 +131,7 @@ message NewMarketReq {
   MarketOrderSide side = 8;
   // TODO: maker market order as optional
   optional uint64 maker_order_id = 9;
+  bool is_ico = 10;
 }
 
 enum MarketOrdersSortBy {
@@ -164,6 +166,7 @@ message OrderListFilter {
   optional MarketOrdersSortBy sort_by = 19;
   optional uint32 page_no = 21;
   optional uint32 page_size = 22;
+  optional bool is_ico = 23;
 }
 
 /* Contract */

market/v1/srv.proto

@@ -5,6 +5,7 @@ package market.v1;
 import "auth/v1/msg.proto";
 import "base/v1/msg.proto";
 import "market/v1/msg.proto";
+import "wallet/v1/msg.proto";
 
 service MarketplaceSrv {
   rpc MarketplaceSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
@@ -16,10 +17,12 @@ service MarketplaceSrv {
   rpc GetMarketAssetList(MarketAssetListReq) returns (MarketAssetList); //  assets that can be listed in marketplace
 
   rpc CalcMarketOrder(CalcMarketReq) returns (CalcMarketRes);
+  rpc CalcICOBuy(wallet.v1.BuyAssetReq) returns (wallet.v1.CalcBuyAssetRes);
 
   rpc CancelOrder(auth.v1.IdReqWithIAMAndTFA) returns (base.v1.StatusRes); // cancel an order
 
   rpc NewMarketOrder(NewMarketReq) returns (MarketOrder); // insert new buy order to market
   rpc GenerateMarketContract(MarketContractReq) returns (ContractMarketRes);
   rpc ConfirmMarketContract(ConfirmMarketContractReq) returns (base.v1.StatusRes);
+  rpc SettleICOBuy(wallet.v1.ConfirmBuyAssetReq) returns (wallet.v1.BuyAssetRes);
 }

wallet/v1/msg.proto

@@ -13,27 +13,6 @@ message InternalTransactionData {
   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
 */
@@ -59,15 +38,13 @@ message Wallet {
   int64 user_id = 2;
   int64 asset_id = 3;
   Asset asset_info = 4;
-  int64 federation_id = 5;
-  Federation federation_info = 6;
-  double balance = 7;
-  double frozen_balance = 8;
-  string updated_at = 9;
-  string created_at = 10;
-  string wallet_code = 11;
-  bool accepted_terms = 12;
-  bool is_locked = 13;
+  double balance = 5;
+  double frozen_balance = 6;
+  string updated_at = 7;
+  string created_at = 8;
+  string wallet_code = 9;
+  bool accepted_terms = 10;
+  bool is_locked = 11;
 }
 
 message BalanceReq {
@@ -374,24 +351,19 @@ message Transaction {
   string asset_code = 3;
   optional int64 from_user_id = 4;
   optional auth.v1.UserIdentityBasic from_user_info = 5;
-  optional int64 from_federation_id = 6;
-  optional Federation from_federation_info = 7;
-
-  optional int64 to_user_id = 8;
-  optional auth.v1.UserIdentityBasic to_user_info = 9;
-  optional int64 to_federation_id = 10;
-  optional Federation to_federation_info = 11;
-  double amount = 12;
-  TransactionStatus status = 13;
-  TransactionType type = 14;
-  string updated_at = 15;
-  string created_at = 16;
-  string tracking_code = 17;
-  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;
+  optional int64 to_user_id = 6;
+  optional auth.v1.UserIdentityBasic to_user_info = 7;
+  double amount = 8;
+  TransactionStatus status = 9;
+  TransactionType type = 10;
+  string updated_at = 11;
+  string created_at = 12;
+  string tracking_code = 13;
+  optional string trx_hash = 14;
+  optional string from_public_key = 15;
+  optional string to_public_key = 16;
+  double token_price = 17;
+  BalanceChange balance_change = 18;
 }
 
 enum BalanceChange{
@@ -407,16 +379,14 @@ message TransactionListFilter {
   optional int64 id = 4;
   optional int64 asset_id = 5;
   optional int64 from_user_id = 6;
-  optional int64 from_federation_id = 7;
-  optional int64 to_user_id = 8;
-  optional int64 to_federation_id = 9;
-  optional double amount_from = 10;
-  optional double amount_to = 11;
-  optional string tracking_code = 12;
-  repeated TransactionType type = 13;
-  repeated TransactionStatus status = 14;
-  optional string from_date = 15;
-  optional string to_date = 16;
+  optional int64 to_user_id = 7;
+  optional double amount_from = 8;
+  optional double amount_to = 9;
+  optional string tracking_code = 10;
+  repeated TransactionType type = 11;
+  repeated TransactionStatus status = 12;
+  optional string from_date = 13;
+  optional string to_date = 14;
 }
 
 /*
@@ -814,12 +784,14 @@ message CalcBuyAssetRes {
   double calculated_asset_amount = 3;
   EffectiveCommission commission = 4;
   optional AssetDiscountRes discount_detail = 5;
+  uint64 maker_order_id = 6;
 }
 
 message BuyAssetRes {
   bool success = 1;
   string irt_hash = 2;
   string asset_hash = 3;
+  uint64 order_id = 4;
 }
 
 /* Contract */