fix: add maker_order_id to MakerOrder out

.gitea/actions/build-proto/action.yml

@@ -1,33 +0,0 @@
-name: Build Proto
-description: Install buf CLI, run buf lint and buf build
-inputs:
-  buf_version:
-    description: Buf CLI version to install
-    required: false
-    default: "1.72.0"
-runs:
-  using: composite
-  steps:
-    - name: Setup Buf CLI
-      shell: bash
-      env:
-        BUF_VERSION: ${{ inputs.buf_version }}
-      run: |
-        ARCH="$(uname -m)"
-        case "$ARCH" in
-          x86_64) BIN="buf-Linux-x86_64" ;;
-          aarch64) BIN="buf-Linux-aarch64" ;;
-          arm64) BIN="buf-Darwin-arm64" ;;
-          *) BIN="buf-Linux-x86_64" ;;
-        esac
-        curl -sSL "https://github.com/bufbuild/buf/releases/download/v${BUF_VERSION}/${BIN}.tar.gz" -o buf.tar.gz
-        tar -xzf buf.tar.gz
-        cp buf/bin/buf /usr/local/bin/buf
-        chmod +x /usr/local/bin/buf
-        rm -rf buf buf.tar.gz
-    - name: Lint
-      shell: bash
-      run: buf lint
-    - name: Build
-      shell: bash
-      run: buf build

.gitea/actions/setup-mirrors/action.yml

@@ -1,151 +0,0 @@
-name: Setup package mirrors
-description: Benchmark package mirrors and export the fastest reachable registry for each ecosystem
-inputs:
-  npm_mirrors:
-    description: Newline-separated npm-compatible registries
-    required: false
-    default: |
-      https://npm.reg.darano.ir/
-  pypi_mirrors:
-    required: false
-    default: |
-      https://package-mirror.liara.ir/repository/pypi/simple
-      https://pypi.reg.darano.ir
-      https://pypi-iran.ir/simple/
-      https://pypi.org/simple/
-  go_mirrors:
-    description: Newline-separated Go module proxies
-    required: false
-    default: |
-      https://go.devneeds.ir/
-      https://package-mirror.liara.ir/repository/go/
-      https://go.reg.darano.ir/
-      https://proxy.golang.org/
-  debian_mirrors:
-    description: Newline-separated Debian package repository base URLs
-    required: false
-    default: |
-      http://repo.iut.ac.ir/debian/
-      http://deb.debian.org/debian/
-  connect_timeout:
-    description: curl connection timeout in seconds
-    required: false
-    default: "3"
-  max_time:
-    description: curl request timeout in seconds
-    required: false
-    default: "10"
-outputs:
-  npm_registry:
-    description: Fastest reachable npm registry
-    value: ${{ steps.select.outputs.npm_registry }}
-  pypi_index:
-    description: Fastest reachable Python package index
-    value: ${{ steps.select.outputs.pypi_index }}
-  go_proxy:
-    description: Fastest reachable Go module proxy
-    value: ${{ steps.select.outputs.go_proxy }}
-  debian_mirror:
-    description: Fastest reachable Debian package repository
-    value: ${{ steps.select.outputs.debian_mirror }}
-runs:
-  using: composite
-  steps:
-    - name: Rate mirrors and export package environments
-      id: select
-      shell: bash
-      env:
-        NPM_MIRRORS: ${{ inputs.npm_mirrors }}
-        PYPI_MIRRORS: ${{ inputs.pypi_mirrors }}
-        GO_MIRRORS: ${{ inputs.go_mirrors }}
-        DEBIAN_MIRRORS: ${{ inputs.debian_mirrors }}
-        CONNECT_TIMEOUT: ${{ inputs.connect_timeout }}
-        MAX_TIME: ${{ inputs.max_time }}
-      run: |
-        set -euo pipefail
-
-        if [[ ! "$CONNECT_TIMEOUT" =~ ^[0-9]+([.][0-9]+)?$ ]] ||
-           [[ ! "$MAX_TIME" =~ ^[0-9]+([.][0-9]+)?$ ]]; then
-          echo "Mirror timeouts must be positive numbers" >&2
-          exit 1
-        fi
-
-        select_fastest() {
-          local ecosystem="$1"
-          local mirrors="$2"
-          local scores mirror result status duration fallback
-          scores="$(mktemp)"
-          fallback=""
-
-          while IFS= read -r mirror; do
-            mirror="$(printf '%s' "$mirror" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
-            [[ -z "$mirror" || "$mirror" == \#* ]] && continue
-
-            if [[ ! "$mirror" =~ ^https?:// ]]; then
-              echo "[$ecosystem] skipped invalid URL: $mirror" >&2
-              continue
-            fi
-            [[ -z "$fallback" ]] && fallback="$mirror"
-
-            if result="$(curl \
-              --location \
-              --silent \
-              --show-error \
-              --output /dev/null \
-              --connect-timeout "$CONNECT_TIMEOUT" \
-              --max-time "$MAX_TIME" \
-              --write-out '%{http_code} %{time_total}' \
-              "$mirror" 2>/dev/null)"; then
-              read -r status duration <<< "$result"
-              if [[ "$status" =~ ^[0-9]{3}$ ]] &&
-                 (((10#$status >= 200 && 10#$status < 400) || 10#$status == 404)) &&
-                 [[ "$duration" =~ ^[0-9]+([.][0-9]+)?$ ]]; then
-                printf '%s\t%s\t%s\n' "$duration" "$status" "$mirror" >> "$scores"
-                continue
-              fi
-            fi
-
-            echo "[$ecosystem] unavailable: $mirror" >&2
-          done <<< "$mirrors"
-
-          if [[ ! -s "$scores" ]]; then
-            rm -f "$scores"
-            if [[ -z "$fallback" ]]; then
-              echo "No valid $ecosystem mirror was configured" >&2
-              return 1
-            fi
-            echo "[$ecosystem] no mirror responded; falling back to $fallback" >&2
-            printf '%s\n' "$fallback"
-            return 0
-          fi
-
-          echo "[$ecosystem] mirror ranking (seconds, HTTP status, URL):" >&2
-          sort -n -k1,1 "$scores" >&2
-          sort -n -k1,1 "$scores" | head -n 1 | cut -f3-
-          rm -f "$scores"
-        }
-
-        npm_registry="$(select_fastest npm "$NPM_MIRRORS")"
-        pypi_index="$(select_fastest pypi "$PYPI_MIRRORS")"
-        go_proxy="$(select_fastest go "$GO_MIRRORS")"
-        debian_mirror="$(select_fastest debian "$DEBIAN_MIRRORS")"
-
-        {
-          echo "NPM_CONFIG_REGISTRY=$npm_registry"
-          echo "npm_config_registry=$npm_registry"
-          echo "COREPACK_NPM_REGISTRY=$npm_registry"
-          echo "YARN_REGISTRY=$npm_registry"
-          echo "PNPM_CONFIG_REGISTRY=$npm_registry"
-          echo "BUN_CONFIG_REGISTRY=$npm_registry"
-          echo "PIP_INDEX_URL=$pypi_index"
-          echo "UV_DEFAULT_INDEX=$pypi_index"
-          echo "GOPROXY=$go_proxy"
-          echo "DEBIAN_MIRROR=$debian_mirror"
-        } >> "$GITHUB_ENV"
-
-        {
-          echo "npm_registry=$npm_registry"
-          echo "pypi_index=$pypi_index"
-          echo "go_proxy=$go_proxy"
-          echo "debian_mirror=$debian_mirror"
-        } >> "$GITHUB_OUTPUT"

.gitea/workflows/ci-stage.yaml

@@ -1,52 +0,0 @@
----
-name: CI/CD Stage
-on:
-  push:
-    branches:
-      - stage
-jobs:
-  stage:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Git
-        uses: https://git.darano.ir/actions/checkout@v5
-        with:
-          token: ${{ gitea.token }}
-          path: ./
-          submodules: recursive
-      - name: Checkout Buf CLI
-        uses: https://git.darano.ir/actions/checkout@v5
-        with:
-          repository: actions/buf-bin
-          ref: main
-          path: buf-bin
-      - name: Setup package mirrors
-        uses: ./.gitea/actions/setup-mirrors
-      - name: Setup Buf CLI
-        run: |
-          BUF_VERSION=1.72.0
-          ARCH="$(uname -m)"
-          case "$ARCH" in
-            x86_64) BIN="buf-Linux-x86_64" ;;
-            aarch64) BIN="buf-Linux-aarch64" ;;
-            arm64) BIN="buf-Darwin-arm64" ;;
-            *) BIN="buf-Linux-x86_64" ;;
-          esac
-          curl -sSL "https://github.com/bufbuild/buf/releases/download/v${BUF_VERSION}/${BIN}.tar.gz" -o buf.tar.gz
-          tar -xzf buf.tar.gz
-          cp buf/bin/buf /usr/local/bin/buf
-          chmod +x /usr/local/bin/buf
-          rm -rf buf buf.tar.gz buf-bin
-      - name: Lint
-        run: buf lint
-      - name: Build
-        run: buf build
-      - name: Notify Telegram
-        if: always()
-        uses: ./.gitea/actions/notify-telegram
-        with:
-          bot_token: ${{ secrets.TELEGRAM_BOT_TOKEN }}
-          chat_id: ${{ secrets.TELEGRAM_CHAT_ID }}
-          status: ${{ job.status }}
-          repository: ${{ gitea.repository }}
-          sha: ${{ gitea.sha }}

auth/v1/msg.proto

@@ -34,7 +34,7 @@ message PermissionList {
   repeated Permission list = 1;
   uint32 page_no = 2;
   uint32 page_size = 3;
-  uint32 total_count = 4;
+   uint32 total_count = 4;
 }
 
 /*
@@ -43,7 +43,6 @@ message PermissionList {
 
 message UserSendOtpReq {
   string mobile = 1;
-  string referral_code = 2;
 }
 message UserSendOtpRes {
   int64 expired_at = 1;
@@ -56,7 +55,6 @@ message UserSendOtpRes {
 message UserLoginReq {
   string mobile = 1;
   string otp_code = 2;
-  string referral_code = 3;
 }
 message UserRefreshTokenReq {
   string refresh_token = 1;
@@ -81,7 +79,6 @@ message CheckIAMReq {
 message InternalIAM {
   User user = 1;
   IdentityBasic identity = 2;
-  repeated string role_keys = 3;
 }
 
 message IdReqWithIAM {
@@ -131,7 +128,6 @@ message User {
   string email = 4;
   UserStatus status = 5;
   repeated int64 roles = 6;
-  int64 referrer_user_id = 7;
 }
 
 message UserAddress {
@@ -189,7 +185,6 @@ message UserIdentityBasic {
   string first_name = 4;
   string last_name = 5;
   string wallet_address = 6;
-  bool is_identity_verified = 7;
 }
 
 message UserUpdateIdentityReq {
@@ -211,7 +206,7 @@ message BankInfoList {
   repeated BankInfo list = 1;
   uint32 page_no = 2;
   uint32 page_size = 3;
-  uint32 total_count = 4;
+   uint32 total_count = 4;
 }
 
 // Status 0: Fail Verify, 1: Verified, 2: Does not Match user's credential , 3:
@@ -271,8 +266,8 @@ enum TfaStateEnum {
   INTERNAL_TRANSFER = 2;
   EXTERNAL_TRANSFER = 3;
   REDEEM_TOKEN = 4;
-  MARKET_PLACE_MAKER = 5;
+  MARKET_PLACE_PURCHASE = 5;
-  MARKET_PLACE_TAKER = 6;
+  MARKET_PLACE_ORDER_CREATE = 6;
   MARKET_PLACE_ORDER_CANCEL = 7;
   IRT_WITHDRAWAL = 8;
   IRT_DEPOSIT = 9;
@@ -305,5 +300,5 @@ message BasicUserInfoList {
   repeated BasicUserInfo list = 1;
   uint32 page_no = 2;
   uint32 page_size = 3;
-  uint32 total_count = 4;
+   uint32 total_count = 4;
 }

errors/v1/msg.proto

@@ -39,7 +39,6 @@ enum ErrCode {
   INVALID_BUY_AMOUNT = 2015;
   INVALID_BUY_AMOUNT_MAX = 2016;
   INVALID_BUY_AMOUNT_MIN = 2017;
-  INVALID_ARGUMENT_TFA_REQUIRED = 2018;
 
   // Resource errors
   NOT_FOUND = 3000;
@@ -51,8 +50,6 @@ enum ErrCode {
   BANK_INFO_NOT_FOUND = 3007;
   RECIPIENT_NOT_FOUND = 3008;
   USER_NOT_FOUND = 3009;
-  INVALID_REFERRAL_CODE = 3011;
-  MARKET_AGREEMENT_ALREADY_ACCEPTED = 3010;
 
   // Resource state errors
   ASSET_NOT_ACTIVE = 4000;
@@ -86,7 +83,6 @@ enum ErrCode {
   MARKET_ORDER_CANCELED = 7023;
   MARKET_ORDER_FAILED = 7024;
   MARKET_ORDER_UNKNOWN = 7025;
-  MARKET_ORDER_UNSUPPORTED_PARTICIPANT_TYPE = 7045;
   ASSET_CAN_NOT_BUY = 7026;
   ASSET_BUY_PRICE_IS_ZERO = 7019;
   MARKET_ORDER_MATCHING_ERR_REFUND = 7128;
@@ -106,7 +102,6 @@ enum ErrCode {
   LOW_REQUEST_AMOUNT = 7014;
   AGREEMENT_ALREADY_ACCEPTED = 7015;
   CONTRACT_ALREADY_GENERATED = 7016;
-  CONTRACT_NOT_FOUND = 7080;
   NIL_AUTH = 7017;
   CAN_NOT_BUY_AND_DEPOSIT = 7018;
   WHITELIST_ALREADY_USED = 7027;
@@ -118,8 +113,6 @@ enum ErrCode {
   MOBILE_NATIONAL_ID_MISS_MATCH = 7033;
   NOT_ENOUGH_LOCKED_BALANCE = 7034;
   NOT_ENOUGH_BALANCE_TO_LOCK = 7035;
-  IPG_GEN_TOKEN_FAILED = 7036;
-  USER_INFO_NATIONAL_ID_BIRTHDATE_MISS_MATCH = 7037;
 
 
   // Server errors

ledger/v1/msg.proto

@@ -1,168 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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

@@ -35,7 +35,7 @@ message CalcMarketReq {
   double amount = 4;
   double unit_price = 5;
   MarketParticipantType participant_type = 6;
-  wallet.v1.BuyAssetSide req_side = 7; // For Calculation : can be from asset or irt
+  market.v1.MarketOrderSide req_side = 7; // For Calculation : can be from asset or irt
 }
 
 message CalcMarketRes {
@@ -71,7 +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;
+  optional uint64 maker_order_id = 23;
   // repeated string attachments = 14; // possible files included by
   // seller/buyer
 }
@@ -113,11 +113,6 @@ message MarketOrderList {
   uint32 total_count = 4;
 }
 
-/*
- * participant_type: IS Maker/Taker
- * side: IS Buying/Selling
- * req_side: IS input (amount) in irt/asset 
- * */
 message NewMarketReq {
   auth.v1.InternalIAM iam = 1;
   int64 asset_id = 2;
@@ -130,8 +125,6 @@ message NewMarketReq {
   wallet.v1.BuyAssetSide req_side = 7;
   MarketOrderSide side = 8;
   // TODO: maker market order as optional
-  optional uint64 maker_order_id = 9;
-  bool is_ico = 10;
 }
 
 enum MarketOrdersSortBy {
@@ -159,14 +152,13 @@ message OrderListFilter {
   optional uint64 order_id = 11;
   optional uint64 trx_id = 12;
   optional bool is_public = 13;
-  optional uint64 maker_order_id = 15;
+  optional bool has_source = 14;
+  optional uint64 source_order_id = 15;
   optional string from_date = 16;
   optional string to_date = 17;
-  optional MarketParticipantType participant_type = 18;
+  optional MarketOrdersSortBy sort_by = 18;
-  optional MarketOrdersSortBy sort_by = 19;
+  optional uint32 page_no = 19;
-  optional uint32 page_no = 21;
+  optional uint32 page_size = 20;
-  optional uint32 page_size = 22;
-  optional bool is_ico = 23;
 }
 
 /* Contract */

market/v1/srv.proto

@@ -5,9 +5,9 @@ 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);
 
   rpc GetMarketPubHistory(OrderListFilter) returns (MarketOrderList); // This is for public market
@@ -17,12 +17,10 @@ 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/internal_srv.proto

@@ -7,22 +7,10 @@ import "wallet/v1/msg.proto";
 
 service InternalWalletSrv {
   rpc InternalWalletSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
-
   // Lock And Release Assets
   rpc LockAsset(LockAssetReq) returns (base.v1.StatusRes);
   rpc ReleaseAsset(LockAssetReq) returns (base.v1.StatusRes);
 
   rpc CollectCommission(CommissionReq) returns (CommissionRes);
-  rpc RefundCommission(RefundCommissionReq) returns (CommissionRes);
+  rpc RefundCommission(CommissionReq) returns (CommissionRes);
-
-  // Calculate stellar pub-priv key based on national id
-  rpc GetPublicKeyByNationalID(NationalIDReq) returns (PubKeyRes);
-
-  // Commission Logs
-  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);
 }

wallet/v1/msg.proto

@@ -6,13 +6,34 @@ import "auth/v1/msg.proto";
 import "base/v1/msg.proto";
 
 /*
-   INTERNAL DATA;
+   INTERNAL DATA
 */
 
 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
 */
@@ -38,13 +59,15 @@ message Wallet {
   int64 user_id = 2;
   int64 asset_id = 3;
   Asset asset_info = 4;
-  double balance = 5;
+  int64 federation_id = 5;
-  double frozen_balance = 6;
+  Federation federation_info = 6;
-  string updated_at = 7;
+  double balance = 7;
-  string created_at = 8;
+  double frozen_balance = 8;
-  string wallet_code = 9;
+  string updated_at = 9;
-  bool accepted_terms = 10;
+  string created_at = 10;
-  bool is_locked = 11;
+  string wallet_code = 11;
+  bool accepted_terms = 12;
+  bool is_locked = 13;
 }
 
 message BalanceReq {
@@ -169,7 +192,6 @@ message AssetPrice {
   string updated_at = 1;
   double market_price = 2;
   double ico_price = 3;
-  double current_price = 4;
 }
 
 message GetAssetReq {
@@ -332,7 +354,6 @@ enum TransactionType {
   IRT_DEPOSIT = 13;
   IRT_WITHDRAWAL = 14;
   COMMISSION = 15;
-  REFERRAL_COMMISSION = 16;
 }
 
 enum TransactionStatus {
@@ -342,7 +363,6 @@ enum TransactionStatus {
   CREATED = -1;
   PENDING_TRX = 1;
   SUCCESSFUL = 2;
-  PENDING_ADMIN = 3;
 }
 
 message Transaction {
@@ -351,25 +371,23 @@ message Transaction {
   string asset_code = 3;
   optional int64 from_user_id = 4;
   optional auth.v1.UserIdentityBasic from_user_info = 5;
-  optional int64 to_user_id = 6;
+  optional int64 from_federation_id = 6;
-  optional auth.v1.UserIdentityBasic to_user_info = 7;
+  optional Federation from_federation_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 {
+  optional int64 to_user_id = 8;
-  NO_CHANGE = 0;
+  optional auth.v1.UserIdentityBasic to_user_info = 9;
-  INCREASE = 1;
+  optional int64 to_federation_id = 10;
-  DECREASE = 2;
+  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;
 }
 
 message TransactionListFilter {
@@ -379,14 +397,16 @@ message TransactionListFilter {
   optional int64 id = 4;
   optional int64 asset_id = 5;
   optional int64 from_user_id = 6;
-  optional int64 to_user_id = 7;
+  optional int64 from_federation_id = 7;
-  optional double amount_from = 8;
+  optional int64 to_user_id = 8;
-  optional double amount_to = 9;
+  optional int64 to_federation_id = 9;
-  optional string tracking_code = 10;
+  optional double amount_from = 10;
-  repeated TransactionType type = 11;
+  optional double amount_to = 11;
-  repeated TransactionStatus status = 12;
+  optional string tracking_code = 12;
-  optional string from_date = 13;
+  repeated TransactionType type = 13;
-  optional string to_date = 14;
+  repeated TransactionStatus status = 14;
+  optional string from_date = 15;
+  optional string to_date = 16;
 }
 
 /*
@@ -413,7 +433,7 @@ message TransferAssetRes {
 }
 
 /*
-   Redeem Token;
+   Redeem Token
 */
 message RedeemTokenReq {
   auth.v1.InternalIAM iam = 1;
@@ -468,7 +488,7 @@ message PubKeyRes {
 }
 
 /*
-   Network Details;
+   Network Details
 */
 enum NetworkType {
   UNKNOWN_NETWORK_TYPE = 0;
@@ -538,51 +558,12 @@ message EffectiveCommission {
   double total = 3;
 }
 
-message RefundCommissionReq {
-  auth.v1.UserIdentityBasic user = 3;
-  uint64 commission_log_id = 1;
-}
 message CommissionReq {
   uint64 commission_id = 1;
   double amount = 2;
   auth.v1.UserIdentityBasic user = 3;
 }
-
+message CommissionRes {}
-message CommissionRes {
-  uint64 commission_log_id = 1;
-}
-
-message InitReferrerCommissionLogIn {
-  int64 referrer_id = 1;
-  int64 user_id = 2;
-  double amount = 3;
-}
-
-message ReferrerCommissionLogOut {
-  double amount = 1;
-  string mobile = 2;
-  bool is_identity_verified = 3;
-  double commission_percentage = 4;
-}
-message ReferrerCommissionLogsList {
-  repeated ReferrerCommissionLogOut list = 1;
-  uint32 page_no = 2;
-  uint32 page_size = 3;
-  uint32 total_count = 4;
-}
-
-message TotalReferralCommissionIn {
-  int64 referrer_id = 1;
-}
-
-message TotalReferralCommissionOut {
-  double claimed = 1;
-  double unclaimed = 2;
-}
-
-message ClaimReferralCommissionIn {
-  auth.v1.User user = 1;
-}
 
 /*
  * IPG - Internet Payment Gateway
@@ -598,34 +579,6 @@ message ClaimReferralCommissionIn {
 //   auth.v1.BankInfo bank_info = 2; // BankInfo
 // }
 
-enum AccountingType {
-  ACCOUNTING_TYPE_WITHDRAW = 0;
-
-  // Deposits
-  ACCOUNTING_TYPE_DEPOSIT_IPG = 10;
-  ACCOUNTING_TYPE_DEPOSIT_BANK_ACCOUNT = 11;
-  ACCOUNTING_TYPE_DEPOSIT_IBAN = 12;
-  ACCOUNTING_TYPE_DEPOSIT_CARD = 13;
-  ACCOUNTING_TYPE_DEPOSIT_DIRECT_DEBIT = 14;
-
-  // Withdraw
-  ACCOUNTING_TYPE_WITHDRAW_IBAN = 20; // User request to receive irt via iban
-  ACCOUNTING_TYPE_WITHDRAW_CARD = 21; // User request to receive irt via card no
-  ACCOUNTING_TYPE_WITHDRAW_BANK_ACCOUNT = 22; // User request to receive irt via bank
-  ACCOUNTING_TYPE_WITHDRAW_IPG_REFUND = 23;
-
-  // ???
-}
-enum AccountingStatus {
-  ACCOUNTING_STATUS_UNKNOWN = 0;
-  ACCOUNTING_STATUS_CREATED = 1;
-  ACCOUNTING_STATUS_PENDING = 2;
-  ACCOUNTING_STATUS_SUCCESS = 3;
-  ACCOUNTING_STATUS_FAILED = 4;
-  ACCOUNTING_STATUS_CANCELLED = 5;
-  ACCOUNTING_STATUS_REJECTED = 6;
-}
-
 enum IPGStatus {
   IPG_SUCCESS = 0;
   IPG_FAILED = -1;
@@ -635,88 +588,33 @@ enum IPGStatus {
 // represent the information regarding the sale of the token
 message IPGGetTokenReq {
   auth.v1.InternalIAM iam = 1;
-  double amount = 2;
+  int64 asset_id = 2;
-  repeated string allowed_card_numbers = 3;
+  double amount = 3;
+  optional uint64 discount_code = 4;
 }
 
 // represent the information regarding the ipg gateway
 message IPGGetTokenRes {
   string url = 1;
-  int64 amount = 2;
+  int64 unit_price = 2;
+  int64 total_price = 3;
+  double amount = 4;
+  string asset = 5;
+  optional uint64 discount_code = 6;
 }
 
 message IPGConfirmReq {
-  string redirected_url = 1; // This field includes all of ipg's query params
-  // 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 amount = 7;
-}
-
-message WithdrawLog {
-  uint64 id = 1;
-  Accounting accounting = 2;
-  string rrn = 3;
-  int64 amount = 4;
-  AccountingStatus status = 5;
-  string created_at = 6;
-  string updated_at = 7;
-  optional Transaction transaction = 8;
-  optional auth.v1.BankInfo bankinfo_id = 10;
-  optional bool accepted_by_admin = 11;
-}
-
-enum PSP {
-  PSP_UNKNOWN = 0;
-
-  PSP_VANDAR_BP_MELLAT = 10;
-  PSP_VANDAR_SEP = 11;
-  PSP_VANDAR = 12;
-
-  PSP_BP_MELLAT = 20;
-}
-
-message Accounting {
-  uint64 id = 1;
-  int64 user_id = 2;
-  int64 balance = 3;
-  auth.v1.UserIdentityBasic user = 4;
-}
-
-message IPGGenTokenPayload {
-  int64 amount = 2;
-  string payer_id = 3;
-  string mobile = 4;
-  string national_id = 5;
-  int64 order_id = 6;
-  string callback_url = 7;
-  repeated string bank_cards = 8;
-}
-
-message IPGLog {
   string ref_id = 1;
-  Accounting accounting = 2;
+  string res_code = 2;
-  int64 amount = 4;
+  string sale_order_id = 3;
-  AccountingStatus status = 5;
+  string sale_reference_id = 4;
-  string created_at = 6;
+  string card_holder_info = 5;
-  string updated_at = 7;
+  string card_holder_pan = 6;
-  string token = 8;
+  string final_amount = 7;
-  PSP psp = 9;
-  optional int64 transaction_id = 10;
-  optional Transaction transaction = 11;
-}
-
-message IPGLogReq {
-  auth.v1.InternalIAM iam = 1;
-  string ref_id = 2;
 }
 
 message IPGConfirmRes {
-  string ref_id = 1;
+  string receipt_link = 1;
-  optional string error = 2;
 }
 
 message SaleManualReq {
@@ -742,14 +640,12 @@ message WithdrawIRTReq {
   auth.v1.InternalIAM iam = 1;
   double amount = 2;
   int64 bank_info_id = 3;
-  auth.v1.TFA tfa = 4;
 }
 
 message WithdrawIRTRes {
-  uint64 id = 1;
+  int64 transaction_id = 1;
   int64 amount = 2;
   string transaction_hash = 3;
-  auth.v1.BankInfo bank_info = 4;
 }
 
 message BuyAssetReq {
@@ -783,24 +679,22 @@ 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 */
 enum ContractType {
   CONTRACT_TYPE_ICO = 0;
-  CONTRACT_TYPE_MARKET = 1; // FIXME: Please remove this :)
+  CONTRACT_TYPE_MARKET = 1;
   CONTRACT_TYPE_BNPL = 2;
   CONTRACT_TYPE_REDEEM = 3;
-  CONTRACT_TYPE_MARKET_MAKER = 4;
+  CONTRACT_TYPE_MARKE_MAKER = 4;
-  CONTRACT_TYPE_MARKET_TAKER = 5;
+  CONTRACT_TYPE_MARKE_TAKER = 5;
 }
 
 // agreement_id
@@ -811,54 +705,3 @@ message ContractRes {
   string contract_hash = 4;
   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;
-}

wallet/v1/srv.proto

@@ -9,13 +9,19 @@ import "wallet/v1/msg.proto";
 service WalletService {
   rpc WalletSrvHealth(base.v1.Empty) returns (base.v1.StatusRes);
 
+  // Internal rpc
+  rpc InternalWalletDeleteCache(base.v1.Empty) returns (base.v1.StatusRes);
+  rpc InternalCreateFederation(auth.v1.InternalIAM) returns (base.v1.StatusRes);
+  rpc GetPublicKeyByNationalID(NationalIDReq) returns (PubKeyRes);
+
+  rpc UserGetFederation(auth.v1.InternalIAM) returns (Federation);
+
   rpc GetNetworkList(base.v1.Empty) returns (NetworkList);
 
   rpc GetAssetList(AssetFilter) returns (AssetList);
   rpc GetAsset(GetAssetReq) returns (Asset);
   rpc GetAssetCommissions(base.v1.IdReq) returns (CommissionList);
   rpc GetAssetPrice(base.v1.IdReq) returns (AssetPrice);
-  rpc AssetDiscount(AssetDiscountReq) returns (AssetDiscountRes);
 
   rpc UserInitWallet(UserInitWalletReq) returns (base.v1.StatusRes);
   rpc UserGetWalletList(auth.v1.InternalIAM) returns (WalletList);
@@ -24,19 +30,12 @@ service WalletService {
 
   rpc UserGetTransactionList(TransactionListFilter) returns (TransactionList);
 
-  // Commission Logs
-  rpc GetReferrerCommissionLogsList(auth.v1.InternalIAM) returns (ReferrerCommissionLogsList);
-  rpc GetTotalReferralCommission(TotalReferralCommissionIn) returns (TotalReferralCommissionOut);
-  rpc ClaimReferralCommission(ClaimReferralCommissionIn) returns (base.v1.StatusRes);
-
   // Get Token from IPG is and internal api
   rpc IPGGetToken(IPGGetTokenReq) returns (IPGGetTokenRes);
   // IPG Confirm is a public api
   rpc IPGConfirm(IPGConfirmReq) returns (IPGConfirmRes);
-  rpc GetIPGLog(IPGLogReq) returns (IPGLog);
-
   // Admin can increase user's balance as wish
-  // rpc AdminManualSaleDeposit(SaleManualReq) returns (base.v1.StatusRes);
+  rpc AdminManualSaleDeposit(SaleManualReq) returns (base.v1.StatusRes);
 
   // BNPL
   rpc GetBNPLList(base.v1.Empty) returns (BNPLList);
@@ -55,6 +54,8 @@ service WalletService {
   rpc InternalTransferAsset(TransferAssetReq) returns (TransferAssetRes);
   rpc ExternalTransferAsset(TransferAssetReq) returns (TransferAssetRes);
 
+  rpc AssetDiscount(AssetDiscountReq) returns (AssetDiscountRes);
+
   //  --- IRT ---
   rpc WithdrawIRT(WithdrawIRTReq) returns (WithdrawIRTRes);
   rpc DepositIRT(DepositIRTReq) returns (IPGGetTokenRes);