feat(proto): add authenticated asset admin commands

Reviewed-on: #36

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

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

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

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

alert/v1/msg.proto

@@ -2,15 +2,9 @@ syntax = "proto3";
 
 package alert.v1;
 
-import "base/v1/msg.proto";
+import "auth/v1/msg.proto";
 
-message AlertFilter {
+// Importance of given event
-  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
@@ -18,13 +12,29 @@ enum Importance {
   CRITICAL = 3; // CRITICAL Severity ( can cause panics and data lost )
 }
 
-enum LogSource {
+enum LogType {
-  UNKNOWN = 0;
+  TYPE_UNKNOWN = 0;
-  USER = 1;
+  TYPE_SMS = 1;
-  SYSTEM = 2;
+  TYPE_EMAIL = 2;
-  WALLET = 3;
+  TYPE_PUSH = 3;
 }
 
+enum LogLevel {
+  LVL_UNKNOWN = 0;
+  LVL_INFO = 1;
+  LVL_SUCCESS = 2;
+  LVL_WARN = 3;
+  LVL_ERROR = 4;
+}
+
+enum LogSource {
+  SRC_UNKNOWN = 0;
+  SRC_USER = 1;
+  SRC_SYSTEM = 2;
+  SRC_WALLET = 3;
+}
+
+
 message Meta {
   uint32 created_at_ts = 1;
   uint32 updated_at_ts = 2;
@@ -32,11 +42,12 @@ message Meta {
 }
 
 message LogEvent {
-  optional uint64 id = 1; // Record Id of Log stored in db
+  auth.v1.InternalIAM iam = 1;
-  string content = 2;
+  optional uint64 id = 2; // Record Id of Log stored in db
-  string effective_user = 3;
+  LogSource source = 3;
-  optional LogSource source = 5;
+  Importance importance = 4;
-  Importance importance = 6;
+  LogLevel level = 5;
+  string content = 6;
   Meta meta = 7;
 }
 
@@ -53,7 +64,7 @@ message SMSChangeLog {
 }
 
 message SMS {
-  string recipient = 1; //recipient
+  string recipient = 1; // recipient
   string text = 2;
   optional string sender = 3;
   Meta meta = 4;

alert/v1/srv.proto

@@ -8,6 +8,7 @@ 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 Update(LogEvent) returns (base.v1.StatusRes) {}
-  rpc Get(AlertFilter) returns (base.v1.StatusRes) {}
+  // rpc Get(AlertFilter) returns (base.v1.StatusRes) {}
 }
+

auth/v1/msg.proto

@@ -2,8 +2,6 @@ syntax = "proto3";
 
 package auth.v1;
 
-import "base/v1/msg.proto";
-
 /*
    Internal
 */
@@ -34,6 +32,9 @@ message Permission {
 
 message PermissionList {
   repeated Permission list = 1;
+  uint32 page_no = 2;
+  uint32 page_size = 3;
+  uint32 total_count = 4;
 }
 
 /*
@@ -42,6 +43,7 @@ message PermissionList {
 
 message UserSendOtpReq {
   string mobile = 1;
+  string referral_code = 2;
 }
 message UserSendOtpRes {
   int64 expired_at = 1;
@@ -54,6 +56,7 @@ message UserSendOtpRes {
 message UserLoginReq {
   string mobile = 1;
   string otp_code = 2;
+  string referral_code = 3;
 }
 message UserRefreshTokenReq {
   string refresh_token = 1;
@@ -78,6 +81,7 @@ message CheckIAMReq {
 message InternalIAM {
   User user = 1;
   IdentityBasic identity = 2;
+  repeated string role_keys = 3;
 }
 
 message IdReqWithIAM {
@@ -91,18 +95,12 @@ message IdReqWithIAMAndTFA {
   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 {
+message ReqWithOptionalIAM {
   optional InternalIAM iam = 1;
 }
 
@@ -114,12 +112,31 @@ message GetUserReq {
   string national_id = 2;
 }
 
+enum UserStatus {
+  USER_STATUS_CREATED = 0;
+
+  USER_STATUS_VALID_LV1 = 1;
+  USER_STATUS_VALID_LV2 = 2;
+  USER_STATUS_VALID_LV3 = 3;
+
+  USER_STATUS_DISABLED = -1;
+  USER_STATUS_BANNED = -2;
+  USER_STATUS_DELETED = -3;
+}
+
 message User {
   int64 id = 1;
   string national_id = 2;
   string mobile = 3;
   string email = 4;
-  repeated int64 roles = 5;
+  UserStatus status = 5;
+  repeated int64 roles = 6;
+  int64 referrer_user_id = 7;
+}
+
+message UserAddress {
+  string postal_code = 2;
+  string user_address = 3;
 }
 
 message Company {
@@ -156,7 +173,7 @@ message Identity {
   optional Company company = 22;
   optional string employee_info = 23;
   string pub_key = 24;
-  optional float balance = 25;
+  optional UserAddress user_address = 25;
 }
 
 message IdentityBasic {
@@ -172,6 +189,7 @@ message UserIdentityBasic {
   string first_name = 4;
   string last_name = 5;
   string wallet_address = 6;
+  bool is_identity_verified = 7;
 }
 
 message UserUpdateIdentityReq {
@@ -179,6 +197,7 @@ message UserUpdateIdentityReq {
   string national_id = 2;
   string birthdate = 3;
   string email = 4;
+  optional UserAddress user_address = 5;
 }
 
 message UserUpdateBankInfoReq {
@@ -190,13 +209,18 @@ message UserUpdateBankInfoReq {
 
 message BankInfoList {
   repeated BankInfo list = 1;
+  uint32 page_no = 2;
+  uint32 page_size = 3;
+  uint32 total_count = 4;
 }
 
-// Status 0: Fail Verify, 1: Verified, 2: Does not Match user's credential
+// Status 0: Fail Verify, 1: Verified, 2: Does not Match user's credential , 3:
+// Closed for potential fraud
 enum BankInfoStatusEnum {
   FAIL_VERIFY = 0;
   VERIFIED = 1;
   DOES_NOT_MATCH = 2;
+  CLOSED = 3;
 }
 
 message BankInfo {
@@ -210,11 +234,6 @@ message BankInfo {
 }
 
 /* Two Factor Authentication */
-// message IdReqWithIAMAndTFA {
-//   int64 id = 1;
-//   InternalIAM iam = 2;
-//   string tfa_code = 3;
-// }
 message TFAReq {
   InternalIAM iam = 1;
   optional string mobile = 2;
@@ -252,9 +271,9 @@ enum TfaStateEnum {
   INTERNAL_TRANSFER = 2;
   EXTERNAL_TRANSFER = 3;
   REDEEM_TOKEN = 4;
-  MARKET_PALCE_PURCHASE = 5;
+  MARKET_PLACE_MAKER = 5;
-  MARKET_PALCE_ORDER_CREATE = 6;
+  MARKET_PLACE_TAKER = 6;
-  MARKET_PALCE_ORDER_CANCEL = 7;
+  MARKET_PLACE_ORDER_CANCEL = 7;
   IRT_WITHDRAWAL = 8;
   IRT_DEPOSIT = 9;
 }
@@ -284,4 +303,7 @@ message BasicUserInfo {
 
 message BasicUserInfoList {
   repeated BasicUserInfo list = 1;
+  uint32 page_no = 2;
+  uint32 page_size = 3;
+  uint32 total_count = 4;
 }

base/v1/msg.proto

@@ -14,20 +14,13 @@ message IdReq {
   int64 id = 1;
 }
 
-
+message YesNoRes {
-message PaginationReq {
+  bool yes = 1;
-  uint32 page = 1; // in query param it will be p
-  uint32 page_size = 2; // in query param it will be pz
 }
 
+message PaginationRespSample {
 
-message PaginationResp {
+  uint32 page_no = 2;
-  uint32 no = 1; 
+  uint32 page_size = 3;
-  uint32 size = 2; 
+   uint32 total_count = 4;
-  optional uint32 count = 3; 
-}
-
-message BaseQueryParam {
-  repeated string sort = 2; // sort by
-  optional PaginationReq page = 3;
 }

errors/v1/msg.proto

@@ -0,0 +1,141 @@
+syntax = "proto3";
+
+package errors.v1;
+
+enum ErrCode {
+  // General errors
+  OK = 0;
+  FAILED = 1;
+  SERVER_ERROR = 2;
+  INTERNAL = 3;
+  UNAVAILABLE = 4;
+
+  // Authentication and authorization errors
+  UNAUTHENTICATED = 1000;
+  PERMISSION_DENIED = 1001;
+  ACCESS_DENIED = 1002;
+  FORBIDDEN = 1003;
+  BAD_AUTH = 1004;
+  SESSION_EXPIRED = 1005;
+  USER_KYC_LV1_NOT_FOUND = 1006;
+  USER_KYC_LV2_NOT_FOUND = 1007;
+
+  // Argument validation errors
+  INVALID_ARGUMENT = 2000;
+  INVALID_ARGUMENT_EMPTY_VALUE = 2001;
+  INVALID_ARGUMENT_INVALID_VALUE = 2002;
+  INVALID_ARGUMENT_INVALID_FORMAT = 2003;
+  INVALID_ARGUMENT_MISSING_RECIPIENT = 2004;
+  INVALID_ARGUMENT_EMPTY_ID = 2005;
+  INVALID_ARGUMENT_COMPANY_REQUIRED = 2006;
+  INVALID_ARGUMENT_UNKNOWN_TRX_TYPE = 2007;
+  INVALID_ARGUMENT_INVALID_CODE = 2008;
+  INVALID_ARGUMENT_RRN = 2009;
+  INVALID_ARGUMENT_MOBILE_NUMBER = 2010;
+  INVALID_ARGUMENT_IBAN_NUMBER = 2011;
+  INVALID_ARGUMENT_UNKNOWN_TYPE = 2012;
+  INVALID_ARGUMENT_BAD_STELLAR_ADDRESS = 2013;
+  INVALID_ARGUMENT_ZERO_AMOUNT = 2014;
+  INVALID_BUY_AMOUNT = 2015;
+  INVALID_BUY_AMOUNT_MAX = 2016;
+  INVALID_BUY_AMOUNT_MIN = 2017;
+  INVALID_ARGUMENT_TFA_REQUIRED = 2018;
+
+  // Resource errors
+  NOT_FOUND = 3000;
+  ALREADY_EXISTS = 3001;
+  ASSET_NOT_FOUND = 3002;
+  WALLET_NOT_FOUND = 3003;
+  AGREEMENT_NOT_FOUND = 3004;
+  DISCOUNT_NOT_FOUND = 3005;
+  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;
+  WALLET_NOT_ACTIVE = 4001;
+  DISCOUNT_NOT_ACTIVE = 4002;
+  RECIPIENT_NOT_ACTIVE = 4003;
+
+  // Transaction errors
+  TRX_STATUS_UNKNOWN = 5000;
+  TRX_STATUS_PENDING = 5001;
+  TRX_STATUS_FAILED = 5002;
+  TRX_STATUS_SUCCESS = 5003;
+  TRX_STATUS_CANCELED = 5004;
+  TRX_STATUS_EXPIRED = 5005;
+  TRX_STATUS_CREATED = 5006;
+  TRX_STATUS_SUSPENDED = 5007;
+
+  // Stellar errors
+  STELLAR_ERR_ESTABLISH_TRUST_LINE = 6000;
+  STELLAR_ERR_CREATE_ACCOUNT = 6001;
+  STELLAR_ERR_TRANSFER = 6002;
+  STELLAR_ERR_GET_ACCOUNT = 6003;
+  STELLAR_ERR_LOW_FEE = 6004;
+  STELLAR_ERR_LOW_RESERVE = 6005;
+
+  // Market-related errors
+  MARKET_ORDER_NOT_FOUND = 3006;
+  MARKET_ORDER_ALREADY_CREATED = 7020;
+  MARKET_ORDER_ALREADY_OPENED = 7021;
+  MARKET_ORDER_COMPLETED = 7022;
+  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;
+
+  // Specific errors
+  IBAN_MISS_MATCH = 7003;
+  SHAHKAR_FAILED = 7004;
+  SHAHKAR_SYSTEM_ERROR = 7005;
+  PENDING_OTP_ALREADY_EXISTS = 7006;
+  INVALID_OTP = 7007;
+  BAD_BANK_INFO = 7008;
+  NOT_ACCEPT_LEGAL = 7009;
+  NEED_TRUST_LINE = 7010;
+  EXPIRED = 7011;
+  INVALID_DISCOUNT_CODE = 7012;
+  ASSET_INVALID = 7013;
+  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;
+  NATIONAL_ID_IS_EMPTY = 7028;
+  NOT_ENOUGH_BALANCE = 7029;
+  ASSET_MAX_BALANCE_REACHED = 7030;
+  WALLET_IS_NOT_IN_WHITE_LIST = 7031;
+  RECIPIENT_IS_NOT_IN_WHITE_LIST = 7032;
+  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
+  SERVER_ERROR_FREEZED_BALANCE_NEGATIVE = 8000;
+  SERVER_ERROR_NIL_DB_TX = 8001;
+  SERVER_ERROR_TFA_TEMPLATE_NOT_FOUND = 8002;
+
+  // Person-related errors
+  GET_PERSON_FAILED = 9000;
+  USER_NOT_VERIFIED = 9001;
+  USER_BANNED = 9002;
+  USER_DELETED = 9003;
+  USER_DISABLED = 9004;
+}
+
+message ErrorMsg {
+  ErrCode code = 1;
+  map<string, string> details = 2;
+}

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

@@ -3,9 +3,49 @@ syntax = "proto3";
 package market.v1;
 
 import "auth/v1/msg.proto";
-import "base/v1/msg.proto";
 import "wallet/v1/msg.proto";
 
+enum MarketParticipantType {
+  MO_PT_UNKNOWN = 0;
+  MO_PT_MAKER = 1;
+  MO_PT_TAKER = 2;
+}
+
+enum MarketOrderSide {
+  MO_UNKNOWN = 0;
+  MO_BUY = 1;
+  MO_SELL = 2;
+}
+
+enum MarketOrderStatus {
+  MO_UNKNOWN_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 CalcMarketReq {
+  optional auth.v1.InternalIAM iam = 1; // For whitelist :')
+  int64 asset_id = 2;
+  int64 counter_asset_id = 3;
+  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
+}
+
+message CalcMarketRes {
+  double calculated_irt_amount = 1;
+  double calculated_asset_amount = 2;
+  wallet.v1.EffectiveCommission commission = 3;
+  MarketParticipantType participant_type = 4;
+  wallet.v1.BuyAssetSide req_side = 5; // For Calculation : can be from asset or irt
+}
+
 message MPHistoryFilter {}
 message MPListFilter {}
 message MarketOrder {
@@ -19,92 +59,141 @@ message MarketOrder {
   MarketOrderSide side = 8;
   MarketOrderStatus status = 9;
   int64 from = 10;
-  auth.v1.UserIdentityBasic from_identity = 11;
+  MarketParticipantType participant_type = 11;
-  wallet.v1.Commission commission = 12;
+  auth.v1.UserIdentityBasic from_identity = 12;
-  double completed_amount = 13;
+  wallet.v1.Commission commission = 13;
-  string created_at = 14;
+  double completed_amount = 14;
-  string updated_at = 15;
+  double available_amount = 15;
-  bool is_public = 16;
+  string created_at = 16;
-  wallet.v1.TransactionList trx = 17;
+  string updated_at = 17;
-  repeated string tags = 18;
+  bool is_public = 18;
-  repeated string comment = 19;
+  wallet.v1.TransactionList trx = 19;
-  optional MarketOrder source = 20; // purchase is done via this field
+  repeated string tags = 20;
-  // repeated string attachments = 14; // possible files included by seller/buyer
+  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
 }
 
 message MarketAssetListReq {
-  base.v1.BaseQueryParam base = 1;
+  optional auth.v1.InternalIAM iam = 1; // If not set, will returns only public orders which are limited by a
-  optional auth.v1.InternalIAM iam = 2; // If not set, will returns only public orders which are limited by a white list
+  optional uint32 page_no = 2;
+  optional uint32 page_size = 3;
 }
 
 message MarketAssetList {
   repeated wallet.v1.Asset list = 1;
+  uint32 page_no = 2;
+  uint32 page_size = 3;
+  uint32 total_count = 4;
 }
 
-message PurchaseReq {
+message MatchOrderReq {
   auth.v1.InternalIAM iam = 1;
   uint64 order_id = 2;
   double amount = 3;
+  wallet.v1.BuyAssetSide req_side = 7; // For Calculation : can be from asset or irt
   optional bool accepted_contract = 4;
   optional auth.v1.TFA tfa = 5;
-
 }
-message PurchaseRes {
+
+message MatchOrderRes {
   uint64 order_id = 1;
-  optional uint64 trx_id = 2;
+  double calculated_irt_amount = 2;
-  double req_amount = 3;
+  double calculated_asset_amount = 3;
-  double commission_amount = 4;
+  wallet.v1.EffectiveCommission commission = 4;
-  double calculated_amount = 5;
+  MarketOrderStatus status = 5;
-  MarketOrderStatus status = 6;
 }
 
 message MarketOrderList {
-  base.v1.PaginationResp page = 2;
   repeated MarketOrder list = 1;
+  uint32 page_no = 2;
+  uint32 page_size = 3;
+  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;
-  // wallet.v1.Asset asset = 2;
   int64 asset_id = 2;
   int64 counter_asset_id = 3;
   double amount = 4;
   double unit_price = 5;
-  MarketOrderSide side = 6;
+  // TODO: Change name
-  optional auth.v1.TFA tfa = 7;
+  MarketParticipantType participant_type = 6;
-  optional bool accepted_contract = 8;
+  // For Calculation : can be from asset or irt
+  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 MarketOrderSide {
+enum MarketOrdersSortBy {
-  MO_UNKOWN = 0;
+  MO_SORT_UNKNOWN = 0;
-  MO_BUY = 1;
+  MO_CREATED_AT_ASC = 1;
-  MO_SELL = 2;
+  MO_CREATED_AT_DESC = 2;
-}
+  MO_UNIT_PRICE_ASC = 3;
-enum MarketOrderStatus {
+  MO_UNIT_PRICE_DESC = 4;
-  MO_UNKOWN_MP_STATUS = 0; // Unknown
+  MO_TOTAL_PRICE_ASC = 5;
-  MO_CREATED = 1; // Order is just created and awaits confirmation
+  MO_TOTAL_PRICE_DESC = 6;
-  MO_OPEN = 2; // Order is open and waiting to be completed
+  MO_AVAILABLE_AMOUNT_ASC = 7;
-  MO_CANCEL = 3; // Cancelled by user
+  MO_AVAILABLE_AMOUNT_DESC = 8;
-  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;
+  optional 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;
+  repeated uint64 asset = 10;
   optional uint64 order_id = 11;
   optional uint64 trx_id = 12;
   optional bool is_public = 13;
-  optional bool has_source = 14;
+  optional uint64 maker_order_id = 15;
-  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 = 19;
+  optional uint32 page_no = 21;
+  optional uint32 page_size = 22;
+  optional bool is_ico = 23;
+}
+
+/* Contract */
+message ContractMarketRes {
+  string link = 1;
+  uint64 asset_id = 2;
+  uint64 agreement_id = 3;
+  uint64 transaction_id = 4;
+  string contract_hash = 5;
+  string contract_content = 6;
+}
+
+message DeclineMarketContractReq {
+  auth.v1.InternalIAM iam = 1;
+  uint64 agreement_id = 2;
+}
+
+message ConfirmMarketContractReq {
+  auth.v1.InternalIAM iam = 1;
+  uint64 agreement_id = 2;
+  optional auth.v1.TFA tfa = 3;
+}
+
+message MarketContractReq {
+  auth.v1.InternalIAM iam = 1;
+  // uint64 asset_id = 2;
+  uint64 order_id = 2; // Maker OrderID
+  // double amount = 4;
+  // wallet.v1.BuyAssetSide req_side = 5;
 }

market/v1/srv.proto

@@ -5,21 +5,24 @@ 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
+  rpc GetUserMarketHistory(OrderListFilter) returns (MarketOrderList); // list of order + purchase related to buying an asset
   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 CalcMarketOrder(CalcMarketReq) returns (CalcMarketRes);
-
+  rpc CalcICOBuy(wallet.v1.BuyAssetReq) returns (wallet.v1.CalcBuyAssetRes);
-  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 NewMarketOrder(NewMarketReq) returns (MarketOrder); // insert new buy order to market
-  rpc GetUserMarketHistory(OrderListFilter) returns (MarketOrderList); // list of order + purchase related to buying an asset
+  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

@@ -0,0 +1,28 @@
+syntax = "proto3";
+
+package wallet.v1;
+
+import "base/v1/msg.proto";
+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);
+
+  // 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,30 +6,11 @@ import "auth/v1/msg.proto";
 import "base/v1/msg.proto";
 
 /*
-   INTERNAL DATA
+   INTERNAL DATA;
 */
 
-message InternalTransactionData { int64 transaction_id = 1; }
+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;
 }
 
 /*
@@ -43,10 +24,13 @@ message UserInitWalletReq {
 
 message WalletList {
   repeated Wallet list = 1;
-  // optional base.v1.Pagination pagination = 2;
   double available_balance = 3;
   double locked_balance = 4;
   double total_balance = 5;
+
+  uint32 page_no = 6;
+  uint32 page_size = 7;
+  uint32 total_count = 8;
 }
 
 message Wallet {
@@ -54,15 +38,29 @@ message Wallet {
   int64 user_id = 2;
   int64 asset_id = 3;
   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 {
+  auth.v1.InternalIAM iam = 1;
+  int64 asset_id = 2;
+}
+message CheckBalanceReq {
+  auth.v1.InternalIAM iam = 1;
+  int64 asset_id = 2;
+  double amount = 3; // Checks if user have enough balance
+}
+
+message BalanceRes {
+  double available_balance = 1;
+  double locked_balance = 2;
+  double total_balance = 3;
 }
 
 /*
@@ -74,40 +72,31 @@ message Asset {
   string name = 2;
   string code = 3;
   string issuer = 4;
-  int32 decimal = 5;
+  string network_code = 5;
-  double limit_amount = 6;
+  int32 decimal = 6;
-  string anchor = 7;
+  double max_supply = 7;
   string image = 8;
   string description = 9;
   string url = 10;
-  int64 buy_unit_price = 11;
+  // int64 buy_unit_price = 11;
-  int64 sell_unit_price = 12;
+  double buy_min_amount = 12;
-  double buy_min_amount = 13;
+  double buy_max_amount = 13;
-  double buy_max_amount = 14;
+  bool is_active = 20;
-  double sell_min_amount = 15;
+  bool can_buy = 21;
-  double sell_max_amount = 16;
+  bool can_sell = 22;
-  double buy_fee_amount = 17;
+  bool can_deposit = 23;
-  int64 buy_fee_price = 18;
+  bool can_withdraw = 24;
-  double sell_fee_amount = 19;
+  bool can_trade = 25;
-  int64 sell_fee_price = 20;
+  string updated_at = 29;
-  double withdraw_min_amount = 21;
+  string created_at = 30;
-  double withdraw_max_amount = 22;
+  repeated string images = 31;
-  bool is_active = 23;
+  repeated string videos = 32;
-  bool can_buy = 24;
+  AssetStatus status = 33;
-  bool can_sell = 25;
+  AssetMeta meta = 34;
-  bool can_deposit = 26;
+  AssetTokenType token_type = 35;
-  bool can_withdraw = 27;
+  AssetPrice price = 36;
-  string updated_at = 28;
+  bool is_base_asset = 37;
-  string created_at = 29;
+  bool is_locked = 38;
-  repeated string images = 30;
-  repeated string videos = 31;
-  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;
 }
 
@@ -136,11 +125,16 @@ enum AssetType {
   ASSET_TYPE_NETWORK_GAS = 3;
 }
 
-message AssetList { repeated Asset list = 1; }
+message AssetList {
+  repeated Asset list = 1;
+  uint32 page_no = 2;
+  uint32 page_size = 3;
+  uint32 total_count = 4;
+}
 
 message AssetFilter {
   repeated int64 ids = 1;
-  repeated AssetType type = 2;       // AssetType
+  repeated AssetType type = 2; // AssetType
   repeated AssetType token_type = 3; // AssetType
   repeated AssetStatus status = 4;
   repeated string name = 5;
@@ -148,8 +142,9 @@ message AssetFilter {
   optional bool can_sell = 7;
   optional bool can_deposit = 8;
   optional bool can_withdraw = 9;
-  optional bool is_active = 10;
+  optional bool can_trade = 10;
-  optional string search = 11; // Not yet implemented !
+  optional bool is_active = 11;
+  optional string search = 12; // Not yet implemented !
 }
 
 message AssetDiscountReq {
@@ -166,15 +161,15 @@ message AssetDiscountRes {
   double static_amount = 4;
   double percentage = 5;
   double max_amount = 6;
-  double effective_amount =
+  double effective_amount = 7; // based of asset price and discount amount in req
-      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;
+  double ico_price = 3;
+  double current_price = 4;
 }
 
 message GetAssetReq {
@@ -182,7 +177,9 @@ message GetAssetReq {
   optional string code = 3;
 }
 
-message AssetMeta { PropertyMeta property = 1; }
+message AssetMeta {
+  PropertyMeta property = 1;
+}
 
 message PropertyMeta {
   string description = 1;
@@ -196,15 +193,14 @@ message PropertyMeta {
   string usage_type = 9;
   string completion_date = 10;
   string user_agreement_url = 11;
-  string location_image = 12;
+  float lat = 12;
-  float lat = 13;
+  float lng = 13;
-  float lng = 14;
+  string map_link = 14;
-  string map_link= 15;
+  PropertyDetail detail = 15;
-  PropertyDetail detail = 16;
 }
 
 message PropertyDetail {
-  repeated Content badge = 1;   // 2>
+  repeated Content badge = 1; // 2>
   repeated Content content = 2; // 4>
 }
 
@@ -226,10 +222,6 @@ message LockAssetReq {
    BNPL - not really but close name
 */
 
-// enum BNPLPgState {
-//
-// }
-
 message GetUserBNPLInfoReq {
   auth.v1.InternalIAM iam = 1;
   base.v1.IdReq id = 2;
@@ -237,7 +229,7 @@ message GetUserBNPLInfoReq {
 
 enum BNPLPaymentsStatus {
   PENDING_PAYMENT = 0;
-  PAYED = 1;
+  PAID = 1;
   OVER_DUE = 2;
   NOT_STARTED = 3;
   NOT_YET_DUE = 4;
@@ -248,7 +240,7 @@ message BNPLPayments {
   uint64 id = 1;
   double amount = 2;
   double amount_irr = 7;
-  bool is_paied = 3;
+  bool is_paid = 3;
   string due_date = 4;
   string settlement_date = 5;
   BNPLPaymentsStatus status = 6;
@@ -274,15 +266,14 @@ message UserBNPLResp {
 message UserBNPLReq {
   uint64 id = 1;
   int64 bnpl_id = 2;
-  auth.v1.InternalIAM iam = 6;
   optional string created_at = 3;
   optional string employee_id = 4;
   optional int64 company_id = 5;
+  auth.v1.InternalIAM iam = 6;
   optional float amount = 7;
   optional PaymentPeriodInfo payment_period = 8;
   optional bool has_agreed_contract = 9;
-  optional int32 current_step =
+  optional int32 current_step = 10; // Can be useful for admin to change the current step
-      10; // Can be useful for admin to change the current step
   optional int64 asset_id = 11;
 }
 
@@ -306,7 +297,12 @@ message BNPLInfo {
   string expires_at = 14;
 }
 
-message BNPLList { repeated BNPLInfo list = 1; }
+message BNPLList {
+  repeated BNPLInfo list = 1;
+  uint32 page_no = 2;
+  uint32 page_size = 3;
+  uint32 total_count = 4;
+}
 
 /*
    Transaction
@@ -314,7 +310,9 @@ message BNPLList { repeated BNPLInfo list = 1; }
 
 message TransactionList {
   repeated Transaction list = 1;
-  int64 total_count = 2;
+  uint32 page_no = 2;
+  uint32 page_size = 3;
+  uint32 total_count = 4;
 }
 
 enum TransactionType {
@@ -333,6 +331,8 @@ enum TransactionType {
   LOCK = 12;
   IRT_DEPOSIT = 13;
   IRT_WITHDRAWAL = 14;
+  COMMISSION = 15;
+  REFERRAL_COMMISSION = 16;
 }
 
 enum TransactionStatus {
@@ -342,6 +342,7 @@ enum TransactionStatus {
   CREATED = -1;
   PENDING_TRX = 1;
   SUCCESSFUL = 2;
+  PENDING_ADMIN = 3;
 }
 
 message Transaction {
@@ -350,42 +351,42 @@ 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 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;
 }
 
-message UserGetTransactionListReq {
+enum BalanceChange {
+  NO_CHANGE = 0;
+  INCREASE = 1;
+  DECREASE = 2;
+}
+
+message TransactionListFilter {
   auth.v1.InternalIAM iam = 1;
-  optional int32 page_index = 2;
+  optional uint32 page_no = 2;
-  optional int32 page_size = 3;
+  optional uint32 page_size = 3;
   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 = 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;
 }
 
 /*
@@ -412,7 +413,7 @@ message TransferAssetRes {
 }
 
 /*
-   Redeem Token
+   Redeem Token;
 */
 message RedeemTokenReq {
   auth.v1.InternalIAM iam = 1;
@@ -440,13 +441,18 @@ message RedeemTokenRes {
   double total_balance = 5;
   double request_amount = 6;
   string created_at = 7;
-  bool is_paied = 8;
+  bool is_paid = 8;
   // receipt.Receipt receipt = 8;
   double calculated_profit = 9;
   optional auth.v1.BankInfo bank_info = 10;
   optional string receipt = 11;
 }
-message RedeemTokenResList { repeated RedeemTokenRes list = 1; }
+message RedeemTokenResList {
+  repeated RedeemTokenRes list = 1;
+  uint32 page_no = 2;
+  uint32 page_size = 3;
+  uint32 total_count = 4;
+}
 
 /*
    Utility: Get Public Key from national id
@@ -457,10 +463,12 @@ message NationalIDReq {
   string national_id = 2;
 }
 
-message PubKeyRes { string pub_key = 1; }
+message PubKeyRes {
+  string pub_key = 1;
+}
 
 /*
-   Network Details
+   Network Details;
 */
 enum NetworkType {
   UNKNOWN_NETWORK_TYPE = 0;
@@ -483,11 +491,25 @@ message Network {
   string created_at = 11;
 }
 
-message NetworkList { repeated Network list = 1; }
+message NetworkList {
+  repeated Network list = 1;
+  uint32 page_no = 2;
+  uint32 page_size = 3;
+  uint32 total_count = 4;
+}
 
 /*
  * Commission
  * */
+
+enum CommissionType {
+  COMMISSION_TYPE_ICO = 0;
+  COMMISSION_TYPE_MARKET_MAKER = 1;
+  COMMISSION_TYPE_MARKET_TAKER = 2;
+  COMMISSION_TYPE_BNPL = 3;
+  COMMISSION_TYPE_REDEEM = 4;
+}
+
 message Commission {
   uint64 id = 1;
   string name = 2;
@@ -495,10 +517,19 @@ message Commission {
   double service_percentage = 4;
   double tax_static = 5;
   double tax_percentage = 6;
-  optional string collector = 7;
+  Asset asset = 7;
-  optional string description = 8;
+  CommissionType type = 8;
-  string updated_at = 9;
+  optional string collector = 9;
-  string created_at = 10;
+  optional string description = 10;
+  string updated_at = 11;
+  string created_at = 12;
+}
+
+message CommissionList {
+  repeated Commission list = 1;
+  uint32 page_no = 2;
+  uint32 page_size = 3;
+  uint32 total_count = 4;
 }
 
 message EffectiveCommission {
@@ -507,6 +538,52 @@ 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 {
+  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
  * 1. Get Token
@@ -521,6 +598,34 @@ message EffectiveCommission {
 //   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;
@@ -530,32 +635,89 @@ enum IPGStatus {
 // represent the information regarding the sale of the token
 message IPGGetTokenReq {
   auth.v1.InternalIAM iam = 1;
-  int64 asset_id = 2;
+  double amount = 2;
-  double amount = 3;
+  repeated string allowed_card_numbers = 3;
-  optional uint64 discount_code = 4;
 }
 
 // represent the information regarding the ipg gateway
 message IPGGetTokenRes {
   string url = 1;
-  int64 unit_price = 2;
+  int64 amount = 2;
-  int64 total_price = 3;
-  double amount = 4;
-  string asset = 5;
-  optional uint64 discount_code = 6;
 }
 
 message IPGConfirmReq {
-  string ref_id = 1;
+  string redirected_url = 1; // This field includes all of ipg's query params
-  string res_code = 2;
+  // string ref_id = 1;
-  string sale_order_id = 3;
+  // string res_code = 2;
-  string sale_reference_id = 4;
+  // string sale_order_id = 3;
-  string card_holder_info = 5;
+  // string sale_reference_id = 4;
-  string card_holder_pan = 6;
+  // string card_holder_info = 5;
-  string final_amount = 7;
+  // string card_holder_pan = 6;
+  // string amount = 7;
 }
 
-message IPGConfirmRes { string receipt_link = 1; }
+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;
+  int64 amount = 4;
+  AccountingStatus status = 5;
+  string created_at = 6;
+  string updated_at = 7;
+  string token = 8;
+  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;
+  optional string error = 2;
+}
 
 message SaleManualReq {
   auth.v1.InternalIAM iam = 1;
@@ -580,12 +742,14 @@ message WithdrawIRTReq {
   auth.v1.InternalIAM iam = 1;
   double amount = 2;
   int64 bank_info_id = 3;
+  auth.v1.TFA tfa = 4;
 }
 
 message WithdrawIRTRes {
-  int64 transaction_id = 1;
+  uint64 id = 1;
   int64 amount = 2;
   string transaction_hash = 3;
+  auth.v1.BankInfo bank_info = 4;
 }
 
 message BuyAssetReq {
@@ -604,7 +768,7 @@ message DeclineBuyContractReq {
 
 message ConfirmBuyAssetReq {
   auth.v1.InternalIAM iam = 1;
-  uint64 agreement_id = 2;      // Only in asset that require agreement contract
+  uint64 agreement_id = 2; // Only in asset that require agreement contract
   optional auth.v1.TFA tfa = 3; // This might be used in the future
 }
 
@@ -619,21 +783,24 @@ 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;
+  CONTRACT_TYPE_MARKET = 1; // FIXME: Please remove this :)
   CONTRACT_TYPE_BNPL = 2;
   CONTRACT_TYPE_REDEEM = 3;
+  CONTRACT_TYPE_MARKET_MAKER = 4;
+  CONTRACT_TYPE_MARKET_TAKER = 5;
 }
 
 // agreement_id
@@ -644,3 +811,54 @@ 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,31 +9,34 @@ 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 UserGetFederation(auth.v1.InternalIAM) returns (Federation);
-
   rpc GetNetworkList(base.v1.Empty) returns (NetworkList);
 
   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 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);
+  rpc GetBalance(BalanceReq) returns (BalanceRes);
+  rpc CheckBalance(CheckBalanceReq) returns (base.v1.Empty); // Throws an error if balance is not enough
 
-  rpc UserGetTransactionList(UserGetTransactionListReq) returns (TransactionList);
+  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);
@@ -41,24 +44,17 @@ service WalletService {
   rpc GetUserBNPLInfo(GetUserBNPLInfoReq) returns (UserBNPLResp);
   rpc SubmitBNPLForm(UserBNPLReq) returns (base.v1.StatusRes);
   rpc UpdateBNPL(UserBNPLReq) returns (base.v1.StatusRes);
-  rpc CancleBNPL(auth.v1.IdReqWithIAM) returns (base.v1.StatusRes);
+  rpc CancelBNPL(auth.v1.IdReqWithIAM) returns (base.v1.StatusRes);
 
   // Redeem Token
   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);