Merge pull request 'chore: add lan and lng map position and map link' (#22) from chore-add-lat-lng-link into v2

Reviewed-on: #22

.gitea/workflows/buf-ci.yaml

@@ -1,4 +1,3 @@
----
 name: Buf CI
 on:
   push:
@@ -8,33 +7,71 @@ on:
 permissions:
   contents: read
   pull-requests: write
+  packages: write
+
 jobs:
   buf:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '>=1.23.0'
+          go-version: ">=1.23.0"
       - uses: bufbuild/buf-setup-action@v1.47.2
       - uses: actions/checkout@v4
         with:
           token: ${{ gitea.token }}
           path: ./
+
+      - name: install tea cli and init 
+        run: |
+          mkdir tmp && cd tmp
+          curl -SsOL https://dl.gitea.com/tea/main/tea-main-linux-amd64.xz
+          apt install xz-utils -y >/dev/null
+          xz -d tea-main-linux-amd64.xz
+          mv tea-main-linux-amd64 /usr/bin/tea
+          chmod +x /usr/bin/tea
+          cd ..
+          rm -rf tmp
+          tea --version
+          tea login add \
+            --name ${{ gitea.server_url }} \
+            --token ${{ secrets.PROD_REG_TOKEN }} \
+            --url ${{ gitea.server_url }}
       - run: go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
       - run: go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
       - run: go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@latest
-      - run: npm install --save @bufbuild/protobuf @bufbuild/protoc-gen-es @bufbuild/buf 
+      - run: npm install --save @bufbuild/protobuf @bufbuild/protoc-gen-es @bufbuild/buf
       - run: buf --version
-      - run: |
+      - run: "export PATH=$PATH:./node_modules/.bin\nbuf generate \n"
-          export PATH=$PATH:./node_modules/.bin
+      - name: tar files
-          buf generate 
+        run: |
-      - run: |
+            ls -l ./stub
-          if [ -n ${{ gitea.ref_name }} ]; then
+            for out in go ts doc; do
-            mkdir .res
-            for out in go ts docs; do
               tar czf .res/${out}.tar.gz ./stub/${out}/
-              curl --user gitea:${{ gitea.token }} \
-                --upload-file .res/${out}.tar.gz \
-              ${{ gitea.api_url }}/packages/kahroba/generic/proto/${{ gitea.ref_name }}/${out}.tar.gz
             done
-          fi
+            tar czf ./.res/src.tar.gz $(find -type f -name "*.proto")
+            tea r c \
+              --title "${{ gitea.ref_name }}" \
+              --tag "${{ gitea.ref_name }}" \
+              -a ./.res/src.tar.gz \
+              -a ./.res/go.tar.gz \
+              -a ./.res/doc.tar.gz \
+              -a ./.res/ts.tar.gz \
+
+      # - run: |
+      #     if [ -n ${{ gitea.ref_name }} ]; then
+      #       mkdir .res
+      #       for out in go ts doc; do
+      #         echo releasing ${out} ...
+      #         tar czf .res/${out}.tar.gz ./stub/${out}/
+      #         curl -Ss --user nfel:${{ secrets.PROD_REG_TOKEN }}\
+      #           --upload-file .res/${out}.tar.gz \
+      #           ${{ gitea.server_url }}/api/packages/Kahroba/generic/proto/${{ gitea.ref_name }}/${out}.tar.gz
+      #       done
+      #         echo releasing proto ...
+      #         tar czf ./.res/src.tar.gz $(find -type f -name "*.proto")
+      #         curl -Ss --user nfel:${{ secrets.PROD_REG_TOKEN }}\
+      #           --upload-file ./.res/src.tar.gz \
+      #           ${{ gitea.server_url }}/api/packages/Kahroba/generic/proto/${{ gitea.ref_name }}/src.tar.gz
+      #     fi
+      # - run: | 

alert/v1/msg.proto

@@ -0,0 +1,65 @@
+syntax = "proto3";
+
+package alert.v1;
+
+import "base/v1/msg.proto";
+
+message AlertFilter {
+  base.v1.BaseQueryParam base_filter = 1;
+  Importance importance = 2;
+  LogSource source = 3;
+}
+
+//Importance of given event
+enum Importance {
+  LOW = 0; // Low Severity ( unimportant and can be ignored )
+  MEDIUM = 1; // MEDIUM Severity
+  HIGH = 2; // High Severity
+  CRITICAL = 3; // CRITICAL Severity ( can cause panics and data lost )
+}
+
+enum LogSource {
+  UNKNOWN = 0;
+  USER = 1;
+  SYSTEM = 2;
+  WALLET = 3;
+}
+
+message Meta {
+  uint32 created_at_ts = 1;
+  uint32 updated_at_ts = 2;
+  uint32 blamer_id = 3; // User ID of person who made the change
+}
+
+message LogEvent {
+  optional uint64 id = 1; // Record Id of Log stored in db
+  string content = 2;
+  string effective_user = 3;
+  optional LogSource source = 5;
+  Importance importance = 6;
+  Meta meta = 7;
+}
+
+message LogEventList {
+  repeated LogEvent events = 1;
+}
+/*
+   Internal Msg
+*/
+
+message SMSChangeLog {
+  uint32 when_ts = 1;
+  string what = 2;
+}
+
+message SMS {
+  string recipient = 1; //recipient
+  string text = 2;
+  optional string sender = 3;
+  Meta meta = 4;
+  repeated SMSChangeLog change_log = 5;
+}
+
+message SMSList {
+  repeated SMS sms = 1;
+}

alert/v1/srv.proto

@@ -0,0 +1,13 @@
+syntax = "proto3";
+
+package alert.v1;
+
+import "alert/v1/msg.proto";
+import "base/v1/msg.proto";
+
+service AlertSrv {
+  rpc NotificationSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
+  rpc Emit(LogEvent) returns (base.v1.StatusRes) {}
+  rpc Update(LogEvent) returns (base.v1.StatusRes) {}
+  rpc Get(AlertFilter) returns (base.v1.StatusRes) {}
+}

auth/v1/internal_srv.proto

@@ -0,0 +1,18 @@
+syntax = "proto3";
+
+package auth.v1;
+
+import "auth/v1/msg.proto";
+import "base/v1/msg.proto";
+
+service InternalAuthorizationService {
+  rpc InternalAuthorizationSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
+  rpc LookUpName(LookUpNameReq) returns (LookUpNameRes) {}
+  // This meant to only be used in a worker process
+  rpc FetchBasicUserInfoList(base.v1.Empty) returns (BasicUserInfoList) {}
+
+  // rpc AuthorizationDeleteCache(base.v1.Empty) returns (base.v1.StatusRes);
+  rpc InitPermissionsForRoutes(InternalInitRoutesReq) returns (base.v1.StatusRes) {}
+  rpc GetUserIdentityBasic(GetUserReq) returns (UserIdentityBasic) {}
+  rpc GetUserIAM(GetUserReq) returns (InternalIAM) {}
+}

auth/v1/msg.proto

@@ -2,6 +2,8 @@ syntax = "proto3";
 
 package auth.v1;
 
+import "base/v1/msg.proto";
+
 /*
    Internal
 */
@@ -60,6 +62,7 @@ message UserAccessTokenRes {
   string access_token = 1;
   int64 access_expired_at = 2;
   string refresh_token = 3;
+  InternalIAM iam = 4;
 }
 
 /*
@@ -75,17 +78,34 @@ message CheckIAMReq {
 message InternalIAM {
   User user = 1;
   IdentityBasic identity = 2;
-  repeated Company company = 3;
 }
+
 message IdReqWithIAM {
   int64 id = 1;
   InternalIAM iam = 2;
 }
+
+message IdReqWithIAMAndTFA {
+  int64 id = 1;
+  InternalIAM iam = 2;
+  TFA tfa = 6;
+}
+
+// Used for endpoints that need token and Query Param
+message IAMWithQP {
+  InternalIAM iam = 1;
+  base.v1.BaseQueryParam qp = 2;
+}
+
 message ReqWithIAMAndParams {
   InternalIAM iam = 1;
   optional bool accepted = 2;
 }
 
+message ReqWithOptioanlIAM {
+  optional InternalIAM iam = 1;
+}
+
 /*
    User
 */
@@ -110,6 +130,7 @@ message Company {
   bool can_provide_bnpl = 5;
 }
 
+// Identity is bound to current user's real identity
 message Identity {
   string national_id = 1;
   string national_serial_id = 2;
@@ -131,14 +152,17 @@ message Identity {
   string updated_at = 18;
   string created_at = 19;
   string email = 20;
-  string  mobile = 21;
+  string mobile = 21;
   optional Company company = 22;
   optional string employee_info = 23;
+  string pub_key = 24;
+  optional float balance = 25;
 }
 
 message IdentityBasic {
   string first_name = 1;
   string last_name = 2;
+  optional Company company = 3;
 }
 
 message UserIdentityBasic {
@@ -147,6 +171,7 @@ message UserIdentityBasic {
   string mobile = 3;
   string first_name = 4;
   string last_name = 5;
+  string wallet_address = 6;
 }
 
 message UserUpdateIdentityReq {
@@ -173,6 +198,7 @@ enum BankInfoStatusEnum {
   VERIFIED = 1;
   DOES_NOT_MATCH = 2;
 }
+
 message BankInfo {
   int64 id = 1;
   string deposit_number = 2;
@@ -184,16 +210,18 @@ message BankInfo {
 }
 
 /* Two Factor Authentication */
-message IdReqWithIAMAndTFA {
+// message IdReqWithIAMAndTFA {
-  int64 id = 1;
+//   int64 id = 1;
-  InternalIAM iam = 2;
+//   InternalIAM iam = 2;
-  string tfa_code = 3;
+//   string tfa_code = 3;
-}
+// }
 message TFAReq {
   InternalIAM iam = 1;
   optional string mobile = 2;
   optional string email = 3;
   optional string reason = 4; // issued jwt reason -> can be login, redeem, withdrawal
+  optional int64 id = 5;
+  optional TfaStateEnum state = 6;
 }
 
 // Two Factor Authentication Exchange Response
@@ -205,6 +233,55 @@ message TFAExRes {
 message CheckTFAReq {
   InternalIAM iam = 1;
   string code = 2;
-  optional string algorithm = 3;
+  TFAReq req = 3;
-  optional string reason = 4; // Can be later used as a lookup
+  // optional string algorithm = 3;
+  // optional string reason = 4; // Can be later used as a lookup
+  // optional string id = 5;
+  // optional TfaStateEnum state = 6;
+}
+
+message TFA {
+  TfaStateEnum state = 1;
+  int64 code = 2;
+  int64 id = 3;
+}
+
+enum TfaStateEnum {
+  TFA_STATE_ENUM_UNSPECIFIED = 0;
+  LOGIN = 1;
+  INTERNAL_TRANSFER = 2;
+  EXTERNAL_TRANSFER = 3;
+  REDEEM_TOKEN = 4;
+  MARKET_PALCE_PURCHASE = 5;
+  MARKET_PALCE_ORDER_CREATE = 6;
+  MARKET_PALCE_ORDER_CANCEL = 7;
+  IRT_WITHDRAWAL = 8;
+  IRT_DEPOSIT = 9;
+}
+
+message Recipient {
+  string key = 1;
+  optional string first_name = 2;
+  optional string last_name = 3;
+  optional int64 user_id = 4;
+  optional string public_key = 5;
+}
+
+message LookUpNameReq {
+  Recipient recipient = 1;
+}
+
+message LookUpNameRes {
+  Recipient recipient = 1;
+}
+
+message BasicUserInfo {
+  string name = 1;
+  string national_id = 2;
+  string pub_key = 3;
+  int64 user_id = 4;
+}
+
+message BasicUserInfoList {
+  repeated BasicUserInfo list = 1;
 }

auth/v1/srv.proto

@@ -6,33 +6,32 @@ import "auth/v1/msg.proto";
 import "base/v1/msg.proto";
 
 service AuthorizationService {
-  rpc InternalAuthorizationDeleteCache(base.v1.Empty) returns (base.v1.StatusRes);
+  rpc AuthorizationSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
-  rpc InternalInitRoutes(InternalInitRoutesReq) returns (base.v1.StatusRes) {}
+
-  rpc InternalGetUserIdentityBasic(GetUserReq) returns (UserIdentityBasic) {}
-  rpc InternalGetUserIAM(GetUserReq) returns (InternalIAM) {}
   rpc CheckIAM(CheckIAMReq) returns (InternalIAM) {}
 
-  rpc UserLoginSendOTP(UserSendOtpReq) returns (UserSendOtpRes) {}
+  rpc SendLoginOTP(UserSendOtpReq) returns (UserSendOtpRes) {}
-  rpc UserLoginWithOTP(UserLoginReq) returns (UserAccessTokenRes) {}
+  rpc LoginWithOTP(UserLoginReq) returns (UserAccessTokenRes) {}
-  rpc UserGetAccessTokenByRefreshToken(UserRefreshTokenReq)
+  rpc GetAccessTokenByRefreshToken(UserRefreshTokenReq) returns (UserAccessTokenRes) {}
-      returns (UserAccessTokenRes) {}
 
-  rpc UserGetUserPermission(InternalIAM) returns (PermissionList) {}
+  rpc GetUserPermission(InternalIAM) returns (PermissionList) {}
 
-  rpc UserGetIdentity(InternalIAM) returns (Identity) {}
+  rpc GetIdentity(InternalIAM) returns (Identity) {}
-  rpc UserUpdateIdentity(UserUpdateIdentityReq) returns (base.v1.StatusRes) {}
+  rpc UpdateIdentity(UserUpdateIdentityReq) returns (base.v1.StatusRes) {}
 
-  rpc UserGetBankInfoList(ReqWithIAMAndParams) returns (BankInfoList) {}
+  rpc GetBankInfoList(ReqWithIAMAndParams) returns (BankInfoList) {}
-  rpc UserUpdateBankInfo(UserUpdateBankInfoReq) returns (base.v1.StatusRes) {}
+  rpc UpdateBankInfo(UserUpdateBankInfoReq) returns (base.v1.StatusRes) {}
-  rpc UserRemoveBankInfo(IdReqWithIAM) returns (base.v1.StatusRes) {}
+  rpc RemoveBankInfo(IdReqWithIAM) returns (base.v1.StatusRes) {}
 
   rpc GetUser(GetUserReq) returns (User) {}
 
   // Two Factor Authentication
   // For now it's only SMS-OTP - later will be Email-OTP or other methods can be
   // added For HMAC-OTP there won't be a need to call this api
-  rpc SendTFAReq(TFAReq) returns (base.v1.StatusRes) {}
+  rpc ProcessTFAReq(TFAReq) returns (base.v1.StatusRes) {}
+
   // For HMAC-OTP an initialization step must be added to exchange keys
   rpc InitTFAReq(InternalIAM) returns (TFAExRes) {}
+
   rpc CheckTFACode(CheckTFAReq) returns (base.v1.StatusRes) {}
 }

base/v1/msg.proto

@@ -13,3 +13,21 @@ message IdRes {
 message IdReq {
   int64 id = 1;
 }
+
+
+message PaginationReq {
+  uint32 page = 1; // in query param it will be p
+  uint32 page_size = 2; // in query param it will be pz
+}
+
+
+message PaginationResp {
+  uint32 no = 1; 
+  uint32 size = 2; 
+  optional uint32 count = 3; 
+}
+
+message BaseQueryParam {
+  repeated string sort = 2; // sort by
+  optional PaginationReq page = 3;
+}

buf.gen.yaml

@@ -28,8 +28,11 @@ plugins:
     out: stub/doc/md
   # # NOTE: Gateway
   # # - remote: buf.build/grpc-ecosystem/gateway:v2.16.2
-  # - local: protoc-gen-grpc-gateway
+  - local: protoc-gen-grpc-gateway
-  #   out: stub/go
+    out: stub/go
+    opt:
+      - standalone=true
+      - generate_unbound_methods=true
   # # NOTE: SWAGGER json files
   # # - remote: buf.build/grpc-ecosystem/openapiv2:v2.16.2
   # - local: protoc-gen-openapiv2

market/v1/msg.proto

@@ -0,0 +1,110 @@
+syntax = "proto3";
+
+package market.v1;
+
+import "auth/v1/msg.proto";
+import "base/v1/msg.proto";
+import "wallet/v1/msg.proto";
+
+message MPHistoryFilter {}
+message MPListFilter {}
+message MarketOrder {
+  uint64 id = 1;
+  uint64 trx_id = 2;
+  wallet.v1.Asset asset = 3;
+  wallet.v1.Asset counter_asset = 4;
+  double amount = 5;
+  double unit_price = 6;
+  double total_price = 7;
+  MarketOrderSide side = 8;
+  MarketOrderStatus status = 9;
+  int64 from = 10;
+  auth.v1.UserIdentityBasic from_identity = 11;
+  wallet.v1.Commission commission = 12;
+  double completed_amount = 13;
+  string created_at = 14;
+  string updated_at = 15;
+  bool is_public = 16;
+  wallet.v1.TransactionList trx = 17;
+  repeated string tags = 18;
+  repeated string comment = 19;
+  optional MarketOrder source = 20; // purchase is done via this field
+  // repeated string attachments = 14; // possible files included by seller/buyer
+}
+
+message MarketAssetListReq {
+  base.v1.BaseQueryParam base = 1;
+  optional auth.v1.InternalIAM iam = 2; // If not set, will returns only public orders which are limited by a white list
+}
+
+message MarketAssetList {
+  repeated wallet.v1.Asset list = 1;
+}
+
+message PurchaseReq {
+  auth.v1.InternalIAM iam = 1;
+  uint64 order_id = 2;
+  double amount = 3;
+  optional bool accepted_contract = 4;
+  optional auth.v1.TFA tfa = 5;
+
+}
+message PurchaseRes {
+  uint64 order_id = 1;
+  optional uint64 trx_id = 2;
+  double req_amount = 3;
+  double commission_amount = 4;
+  double calculated_amount = 5;
+  MarketOrderStatus status = 6;
+}
+
+message MarketOrderList {
+  base.v1.PaginationResp page = 2;
+  repeated MarketOrder list = 1;
+}
+
+message NewMarketReq {
+  auth.v1.InternalIAM iam = 1;
+  // wallet.v1.Asset asset = 2;
+  int64 asset_id = 2;
+  int64 counter_asset_id = 3;
+  double amount = 4;
+  double unit_price = 5;
+  MarketOrderSide side = 6;
+  optional auth.v1.TFA tfa = 7;
+  optional bool accepted_contract = 8;
+}
+
+enum MarketOrderSide {
+  MO_UNKOWN = 0;
+  MO_BUY = 1;
+  MO_SELL = 2;
+}
+enum MarketOrderStatus {
+  MO_UNKOWN_MP_STATUS = 0; // Unknown
+  MO_CREATED = 1; // Order is just created and awaits confirmation
+  MO_OPEN = 2; // Order is open and waiting to be completed
+  MO_CANCEL = 3; // Cancelled by user
+  MO_COMPLETED = 4; // Order is completed
+  MO_FAILED = 5; // Order is failed - bad trx , etc.
+  MO_REFUNDED = 6; // Order is refunded by platform to user due to regulation
+  // MO_EXPIRED = 7; // Order is expired
+}
+
+message OrderListFilter {
+  optional auth.v1.InternalIAM iam = 1;
+  base.v1.BaseQueryParam base = 2;
+  optional string search = 3;
+  repeated MarketOrderSide side = 4;
+  repeated MarketOrderStatus status = 5;
+  repeated string from = 6;
+  repeated string to = 7;
+  optional double starting_price = 8;
+  optional double ending_price = 9;
+  repeated wallet.v1.Asset asset = 10;
+  optional uint64 order_id = 11;
+  optional uint64 trx_id = 12;
+  optional bool is_public = 13;
+  optional bool has_source = 14;
+  optional uint64 source_order_id = 15;
+}

market/v1/srv.proto

@@ -0,0 +1,25 @@
+syntax = "proto3";
+
+package market.v1;
+
+import "auth/v1/msg.proto";
+import "base/v1/msg.proto";
+import "market/v1/msg.proto";
+
+service MarketplaceSrv {
+  rpc MarketplaceSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
+
+  rpc GetMarketOrderDet(auth.v1.IdReqWithIAM) returns (MarketOrder); // details of an order by id
+  rpc GetAllOrderList(OrderListFilter) returns (MarketOrderList); // list of all orders (seller and buyer combined)
+
+  rpc GetMarketAssetList(MarketAssetListReq) returns (MarketAssetList); //  assets that can be listed in marketplace
+
+  rpc NewMarketOrder(NewMarketReq) returns (MarketOrder); // insert new buy order to market
+
+  rpc Purchase(PurchaseReq) returns (PurchaseRes); // purchase from an order
+
+  rpc CancelOrder(auth.v1.IdReqWithIAMAndTFA) returns (base.v1.StatusRes); // cancel an order
+
+  rpc GetMarketPubHistory(OrderListFilter) returns (MarketOrderList); // This is for public market
+  rpc GetUserMarketHistory(OrderListFilter) returns (MarketOrderList); // list of order + purchase related to buying an asset
+}

wallet/v1/msg.proto

@@ -9,9 +9,7 @@ import "base/v1/msg.proto";
    INTERNAL DATA
 */
 
-message InternalTransactionData {
+message InternalTransactionData { int64 transaction_id = 1; }
-  int64 transaction_id = 1;
-}
 
 /*
    Federation
@@ -35,13 +33,42 @@ message GetFederationReq {
 }
 
 /*
-   Asset
+   Wallet
 */
 
-message AssetList {
+message UserInitWalletReq {
-  repeated Asset list = 1;
+  auth.v1.InternalIAM iam = 1;
+  int64 asset_id = 2;
 }
 
+message WalletList {
+  repeated Wallet list = 1;
+  // optional base.v1.Pagination pagination = 2;
+  double available_balance = 3;
+  double locked_balance = 4;
+  double total_balance = 5;
+}
+
+message Wallet {
+  int64 id = 1;
+  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;
+}
+
+/*
+   Asset
+*/
+
 message Asset {
   int64 id = 1;
   string name = 2;
@@ -73,8 +100,81 @@ message Asset {
   string updated_at = 28;
   string created_at = 29;
   repeated string images = 30;
-  int32 status = 31;
+  repeated string videos = 31;
-  AssetMeta meta = 32;
+  AssetStatus status = 32;
+  AssetMeta meta = 33;
+  AssetTokenType token_type = 34;
+  AssetPrice price = 35;
+  bool is_base_asset = 36;
+  bool is_locked = 37;
+  Commission commission = 38;
+  AssetType type = 39;
+}
+
+enum AssetTokenType {
+  ASSET_NETWORK_TYPE_UNKNOWN = 0;
+  ASSET_NETWORK_TYPE_STELLAR_NATIVE = 1;
+  ASSET_NETWORK_TYPE_STELLAR_ALPHANUMERIC4 = 2;
+  ASSET_NETWORK_TYPE_STELLAR_ALPHANUMERIC12 = 3;
+  ASSET_NETWORK_TYPE_ERC20 = 4;
+}
+
+enum AssetStatus {
+  ASSET_STATUS_UNKNOWN = 0;
+  ASSET_STATUS_ACTIVE = 1;
+  ASSET_STATUS_INACTIVE = 2;
+  ASSET_STATUS_SOON = 3;
+  ASSET_STATUS_FINISHED = 4;
+  ASSET_STATUS_EVALUATION = 5;
+  ASSET_STATUS_SUSPENDED = 6;
+}
+
+enum AssetType {
+  ASSET_TYPE_UNKNOWN = 0;
+  ASSET_TYPE_PROJECT = 1;
+  ASSET_TYPE_CURRENCY = 2;
+  ASSET_TYPE_NETWORK_GAS = 3;
+}
+
+message AssetList { repeated Asset list = 1; }
+
+message AssetFilter {
+  repeated int64 ids = 1;
+  repeated AssetType type = 2;       // AssetType
+  repeated AssetType token_type = 3; // AssetType
+  repeated AssetStatus status = 4;
+  repeated string name = 5;
+  optional bool can_buy = 6;
+  optional bool can_sell = 7;
+  optional bool can_deposit = 8;
+  optional bool can_withdraw = 9;
+  optional bool is_active = 10;
+  optional string search = 11; // Not yet implemented !
+}
+
+message AssetDiscountReq {
+  auth.v1.InternalIAM iam = 1;
+  string code = 2;
+  int64 asset_id = 3;
+  optional double amount = 4; // calculate discount amount
+}
+
+message AssetDiscountRes {
+  uint64 id = 1;
+  string code = 2;
+  string expires_at = 3;
+  double static_amount = 4;
+  double percentage = 5;
+  double max_amount = 6;
+  double effective_amount =
+      7; // based of asset price and discount amount in req
+  optional int64 supported_asset = 8;
+}
+
+message AssetPrice {
+  string updated_at = 1;
+  double market_price = 2;
+  double admin_price = 3;
 }
 
 message GetAssetReq {
@@ -82,9 +182,7 @@ message GetAssetReq {
   optional string code = 3;
 }
 
-message AssetMeta {
+message AssetMeta { PropertyMeta property = 1; }
-  PropertyMeta property = 1;
-}
 
 message PropertyMeta {
   string description = 1;
@@ -98,6 +196,30 @@ message PropertyMeta {
   string usage_type = 9;
   string completion_date = 10;
   string user_agreement_url = 11;
+  string location_image = 12;
+  float lat = 13;
+  float lng = 14;
+  string map_link= 15;
+  PropertyDetail detail = 16;
+}
+
+message PropertyDetail {
+  repeated Content badge = 1;   // 2>
+  repeated Content content = 2; // 4>
+}
+
+message Content {
+  string label = 1;
+  string value = 2;
+  string value_type = 3;
+}
+
+// Used for both locking and releasing asset :)
+message LockAssetReq {
+  int64 asset_id = 1;
+  double amount = 2;
+  auth.v1.InternalIAM iam = 3;
+  optional auth.v1.TFA tfa = 4; // if request is not internal
 }
 
 /*
@@ -120,6 +242,7 @@ enum BNPLPaymentsStatus {
   NOT_STARTED = 3;
   NOT_YET_DUE = 4;
   CANCELED = 5;
+  REJECTED = 6;
 }
 message BNPLPayments {
   uint64 id = 1;
@@ -145,6 +268,7 @@ message UserBNPLResp {
   optional string updated_at = 12;
   optional string created_at = 13;
   Asset selected_asset = 14;
+  optional string rejection_reason = 15;
 }
 
 message UserBNPLReq {
@@ -157,7 +281,8 @@ message UserBNPLReq {
   optional float amount = 7;
   optional PaymentPeriodInfo payment_period = 8;
   optional bool has_agreed_contract = 9;
-  optional int32 current_step = 10; //Can be useful for admin to change the current step
+  optional int32 current_step =
+      10; // Can be useful for admin to change the current step
   optional int64 asset_id = 11;
 }
 
@@ -180,35 +305,8 @@ message BNPLInfo {
   string created_at = 13;
   string expires_at = 14;
 }
-message BNPLList {
-  repeated BNPLInfo list = 1;
-}
 
-/*
+message BNPLList { repeated BNPLInfo list = 1; }
-   Wallet
-*/
-
-message WalletList {
-  repeated Wallet list = 1;
-}
-
-message Wallet {
-  int64 id = 1;
-  int64 user_id = 2;
-  int64 asset_id = 3;
-  Asset asset_info = 4;
-  int64 federation_id = 5;
-  Federation federation_info = 6;
-  double balance = 7;
-  string updated_at = 8;
-  string created_at = 9;
-  string wallet_code = 10;
-}
-
-message UserInitWalletReq {
-  auth.v1.InternalIAM iam = 1;
-  int64 asset_id = 2;
-}
 
 /*
    Transaction
@@ -223,9 +321,20 @@ enum TransactionType {
   UNKNOWN = 0;
   BUY = 1;
   SELL = 2;
-  TRANSFER = 3;
+  INTERNAL_TRANSFER = 3;
-  REDEEM = 4;
+  EXTERNAL_TRANSFER = 4;
+  REDEEM = 5;
+  TRUST_LINE = 6;
+  WAGE = 7;
+  EXTERNAL_DEPOSIT = 8;
+  INTERNAL_DEPOSIT = 9;
+  MARKETPLACE_BUY = 10;
+  MARKETPLACE_SELL = 11;
+  LOCK = 12;
+  IRT_DEPOSIT = 13;
+  IRT_WITHDRAWAL = 14;
 }
+
 enum TransactionStatus {
   UNDETERMINED = 0;
   FAILED = -10;
@@ -238,11 +347,12 @@ enum TransactionStatus {
 message Transaction {
   int64 id = 1;
   int64 asset_id = 2;
-  // Asset asset_info = 3; //Causing network overloading
+  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;
@@ -253,6 +363,10 @@ message Transaction {
   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;
 }
 
 message UserGetTransactionListReq {
@@ -267,78 +381,34 @@ message UserGetTransactionListReq {
   optional int64 to_federation_id = 9;
   optional double amount_from = 10;
   optional double amount_to = 11;
-  optional TransactionStatus status = 12;
+  optional string tracking_code = 12;
-  optional TransactionType type = 13;
+  repeated TransactionType type = 13;
-  optional string tracking_code = 14;
+  repeated TransactionStatus status = 14;
+  optional string from_date = 15;
+  optional string to_date = 16;
 }
-/*
-   Buy
-*/
-
-message UserBuyAssetReq {
-  auth.v1.InternalIAM iam = 1;
-  int64 asset_id = 2;
-  double amount = 3;
-}
-
-/*
-   Sell
-*/
 
 /*
    Transfer
 */
 
-message UserTransferAssetReq {
+message TransferAssetReq {
   auth.v1.InternalIAM iam = 1;
-  int64 asset_id = 2;
+  auth.v1.Recipient recipient = 2;
   double amount = 3;
-  string to_wallet_address = 4;
+  optional int64 network_id = 4;
-  string to_wallet_memo = 5;
+  int64 asset_id = 5;
+  optional bool approval = 6;
+  optional auth.v1.TFA tfa = 7;
 }
 
-message UserTransferRes {
+message TransferAssetRes {
-  int64 transaction_id = 1;
+  auth.v1.Recipient recipient = 1;
-  string tracking_code = 2;
+  double amount = 2;
-}
+  // TODO: Change to Asset
-
+  int64 transaction_id = 3;
-// represent the information regarding the sale of the token
+  string transaction_hash = 4;
-message SaleGetTokenReq {
+  Asset asset = 5;
-  auth.v1.InternalIAM iam = 1;
-  int64 asset_id = 2;
-  double amount = 3;
-}
-
-// represent the information regarding the ipg gateway
-message SaleGetTokenRes {
-  string url = 1;
-  int64 unit_price = 2;
-  int64 total_price = 3;
-  double amount = 4;
-  string asset = 5;
-}
-
-message SaleConfirmReq {
-  string ref_id = 1;
-  string res_code = 2;
-  string sale_order_id = 3;
-  string sale_reference_id = 4;
-  string card_holder_info = 5;
-  string card_holder_pan = 6;
-  string final_amount = 7;
-}
-
-message SaleConfirmRes {
-  string receipt_link = 1;
-}
-
-message SaleManualReq {
-  auth.v1.InternalIAM iam = 1;
-  int64 asset_id = 2;
-  double amount = 3;
-  string paid_at = 4;
-  string rrn = 5;
-  string national_id = 6;
 }
 
 /*
@@ -351,6 +421,7 @@ message RedeemTokenReq {
   double amount = 4;
   optional string tfa_code = 5;
 }
+
 message CalculateRedeemTokenRes {
   Asset asset = 1;
   double free_balance = 2;
@@ -360,6 +431,7 @@ message CalculateRedeemTokenRes {
   double user_capital = 6;
   optional auth.v1.BankInfo bank_info = 7;
 }
+
 message RedeemTokenRes {
   uint64 id = 1;
   int64 user_id = 2;
@@ -374,6 +446,201 @@ message RedeemTokenRes {
   optional auth.v1.BankInfo bank_info = 10;
   optional string receipt = 11;
 }
-message RedeemTokenResList {
+message RedeemTokenResList { repeated RedeemTokenRes list = 1; }
-  repeated RedeemTokenRes list = 1;
+
+/*
+   Utility: Get Public Key from national id
+*/
+
+message NationalIDReq {
+  auth.v1.InternalIAM iam = 1;
+  string national_id = 2;
+}
+
+message PubKeyRes { string pub_key = 1; }
+
+/*
+   Network Details
+*/
+enum NetworkType {
+  UNKNOWN_NETWORK_TYPE = 0;
+  ETH = 1;
+  XLM = 2;
+  BTC = 3;
+}
+
+message Network {
+  int64 id = 1;
+  string name = 2;
+  string code = 3;
+  string explorer = 4;
+  int64 gas_asset_id = 5;
+  string description = 6;
+  NetworkType type = 7;
+  bool is_active = 8;
+  string image = 9;
+  string updated_at = 10;
+  string created_at = 11;
+}
+
+message NetworkList { repeated Network list = 1; }
+
+/*
+ * Commission
+ * */
+message Commission {
+  uint64 id = 1;
+  string name = 2;
+  double service_static = 3;
+  double service_percentage = 4;
+  double tax_static = 5;
+  double tax_percentage = 6;
+  optional string collector = 7;
+  optional string description = 8;
+  string updated_at = 9;
+  string created_at = 10;
+}
+
+message EffectiveCommission {
+  double service = 1;
+  double tax = 2;
+  double total = 3;
+}
+
+/*
+ * IPG - Internet Payment Gateway
+ * 1. Get Token
+ * 2. Confirm
+ * 3. Cancel
+ * 4. [optional] check balance
+ * */
+
+// represent the information regarding the withdraw in bank
+// message BalanceReq {
+//   auth.v1.InternalIAM iam = 1;
+//   auth.v1.BankInfo bank_info = 2; // BankInfo
+// }
+
+enum IPGStatus {
+  IPG_SUCCESS = 0;
+  IPG_FAILED = -1;
+  IPG_PENDING = 1;
+}
+
+// represent the information regarding the sale of the token
+message IPGGetTokenReq {
+  auth.v1.InternalIAM iam = 1;
+  int64 asset_id = 2;
+  double amount = 3;
+  optional uint64 discount_code = 4;
+}
+
+// represent the information regarding the ipg gateway
+message IPGGetTokenRes {
+  string url = 1;
+  int64 unit_price = 2;
+  int64 total_price = 3;
+  double amount = 4;
+  string asset = 5;
+  optional uint64 discount_code = 6;
+}
+
+message IPGConfirmReq {
+  string ref_id = 1;
+  string res_code = 2;
+  string sale_order_id = 3;
+  string sale_reference_id = 4;
+  string card_holder_info = 5;
+  string card_holder_pan = 6;
+  string final_amount = 7;
+}
+
+message IPGConfirmRes { string receipt_link = 1; }
+
+message SaleManualReq {
+  auth.v1.InternalIAM iam = 1;
+  int64 asset_id = 2;
+  double amount = 3;
+  string paid_at = 4;
+  string rrn = 5;
+  string national_id = 6;
+  optional uint64 discount_code = 7;
+}
+
+/* IRT
+ *
+ * */
+
+message DepositIRTReq {
+  auth.v1.InternalIAM iam = 1;
+  double amount = 3;
+}
+
+message WithdrawIRTReq {
+  auth.v1.InternalIAM iam = 1;
+  double amount = 2;
+  int64 bank_info_id = 3;
+}
+
+message WithdrawIRTRes {
+  int64 transaction_id = 1;
+  int64 amount = 2;
+  string transaction_hash = 3;
+}
+
+message BuyAssetReq {
+  auth.v1.InternalIAM iam = 1;
+  int64 asset_id = 2;
+  double amount_irt = 3;
+  double amount_asset = 4;
+  BuyAssetSide side = 5;
+  optional string discount_code = 6;
+}
+
+message DeclineBuyContractReq {
+  auth.v1.InternalIAM iam = 1;
+  uint64 agreement_id = 2;
+}
+
+message ConfirmBuyAssetReq {
+  auth.v1.InternalIAM iam = 1;
+  uint64 agreement_id = 2;      // Only in asset that require agreement contract
+  optional auth.v1.TFA tfa = 3; // This might be used in the future
+}
+
+enum BuyAssetSide {
+  BUY_ASSET_FROM_BASE = 0;
+  BUY_ASSET_TO_BASE = 1;
+}
+
+message CalcBuyAssetRes {
+  BuyAssetSide side = 1;
+  double calculated_irt_amount = 2;
+  double calculated_asset_amount = 3;
+  EffectiveCommission commission = 4;
+  optional AssetDiscountRes discount_detail = 5;
+}
+
+message BuyAssetRes {
+  bool success = 1;
+  string irt_hash = 2;
+  string asset_hash = 3;
+}
+
+/* Contract */
+
+enum ContractType {
+  CONTRACT_TYPE_ICO = 0;
+  CONTRACT_TYPE_MARKET = 1;
+  CONTRACT_TYPE_BNPL = 2;
+  CONTRACT_TYPE_REDEEM = 3;
+}
+
+// agreement_id
+message ContractRes {
+  string link = 1;
+  uint64 agreement_id = 2;
+  uint64 transaction_id = 3;
+  string contract_hash = 4;
+  string contract_content = 5;
 }

wallet/v1/srv.proto

@@ -7,24 +7,32 @@ import "base/v1/msg.proto";
 import "wallet/v1/msg.proto";
 
 service WalletService {
+  rpc WalletSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
+
   rpc InternalWalletDeleteCache(base.v1.Empty) returns (base.v1.StatusRes);
   rpc InternalCreateFederation(auth.v1.InternalIAM) returns (base.v1.StatusRes);
 
-  rpc AdminGetFederation(GetFederationReq) returns (Federation);
+  // rpc AdminGetFederation(GetFederationReq) returns (Federation);
   rpc UserGetFederation(auth.v1.InternalIAM) returns (Federation);
 
-  rpc UserGetAssetList(base.v1.Empty) returns (AssetList);
+  rpc GetNetworkList(base.v1.Empty) returns (NetworkList);
-  rpc AdminGetAssetList(base.v1.Empty) returns (AssetList);
+
+  rpc GetAssetList(AssetFilter) returns (AssetList);
+  // rpc UserGetAssetList(auth.v1.InternalIAM) returns (AssetList);
+  // rpc AdminGetAssetList(base.v1.Empty) returns (AssetList);
   rpc GetAsset(GetAssetReq) returns (Asset);
+  rpc GetAssetPrice(base.v1.IdReq) returns (AssetPrice);
 
   rpc UserInitWallet(UserInitWalletReq) returns (base.v1.StatusRes);
   rpc UserGetWalletList(auth.v1.InternalIAM) returns (WalletList);
-  rpc UserTransferAsset(UserTransferAssetReq) returns (UserTransferRes);
 
   rpc UserGetTransactionList(UserGetTransactionListReq) returns (TransactionList);
 
-  rpc SaleGetToken(SaleGetTokenReq) returns (SaleGetTokenRes);
+  // Get Token from IPG is and internal api
-  rpc SaleConfirm(SaleConfirmReq) returns (SaleConfirmRes);
+  rpc IPGGetToken(IPGGetTokenReq) returns (IPGGetTokenRes);
+  // IPG Confirm is a public api
+  rpc IPGConfirm(IPGConfirmReq) returns (IPGConfirmRes);
+  // Admin can increase user's balance as wish
   rpc AdminManualSaleDeposit(SaleManualReq) returns (base.v1.StatusRes);
 
   // BNPL
@@ -39,4 +47,28 @@ service WalletService {
   rpc CalculateRedeemToken(RedeemTokenReq) returns (CalculateRedeemTokenRes);
   rpc RedeemToken(RedeemTokenReq) returns (base.v1.StatusRes);
   rpc RedeemTokenList(auth.v1.ReqWithIAMAndParams) returns (RedeemTokenResList);
+
+  rpc GetPublicKeyByNationalID(NationalIDReq) returns (PubKeyRes);
+
+  // Assets routing
+  rpc InternalTransferAsset(TransferAssetReq) returns (TransferAssetRes);
+  rpc ExternalTransferAsset(TransferAssetReq) returns (TransferAssetRes);
+
+  rpc LockAsset(LockAssetReq) returns (base.v1.StatusRes);
+  rpc ReleaseAsset(LockAssetReq) returns (base.v1.StatusRes);
+
+  rpc AssetDiscount(AssetDiscountReq) returns (AssetDiscountRes);
+
+  //  --- IRT ---
+  rpc WithdrawIRT(WithdrawIRTReq) returns (WithdrawIRTRes);
+  rpc DepositIRT(DepositIRTReq) returns (IPGGetTokenRes);
+
+  // --- Buy Asset ---
+  rpc CalcBuyAsset(BuyAssetReq) returns (CalcBuyAssetRes);
+  rpc BuyAsset(ConfirmBuyAssetReq) returns (BuyAssetRes);
+
+  // -- Contract --
+  rpc GenerateBuyContract(BuyAssetReq) returns (ContractRes);
+  rpc DeclineBuyContract(DeclineBuyContractReq) returns (base.v1.StatusRes);
+  // rpc GenerateMarketContract(MarketContractReq) returns (ContractRes);
 }