Compare commits

...

24 Commits

Author SHA1 Message Date
nfel db0bda6bae ci on tags 2024-11-20 16:53:02 +03:30
nfel 80ee3703f4 test deploy 2024-11-20 16:52:36 +03:30
nfel bec347d871 ci and README badge 2024-11-20 16:48:18 +03:30
nfel 04e0fcdc64 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-20 16:41:06 +03:30
nfel 1c3dcd1cbe v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-20 16:40:12 +03:30
nfel 4fa656c614 v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-19 10:25:43 +03:30
nfel c54adabf5e v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-19 10:14:39 +03:30
nfel f22f9faf4b v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-19 10:12:39 +03:30
nfel 23c65dcd04 v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-19 10:01:46 +03:30
nfel bddc2d2bdd v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-19 09:49:21 +03:30
nfel c3eabd4d76 v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-18 16:16:48 +03:30
nfel 49150af2fa v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-18 15:09:26 +03:30
nfel 4e55bb2d27 v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-18 15:01:41 +03:30
nfel e5499c7c0d v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-18 14:54:03 +03:30
nfel 23d67dccfe v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-18 14:51:22 +03:30
nfel 0b09b24301 v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-18 14:50:19 +03:30
nfel cc1e40921e v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-18 14:48:02 +03:30
nfel 9cf66797da v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-18 14:46:22 +03:30
nfel e1776d0c30 v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-18 14:26:58 +03:30
nfel caa69574dd v2: test ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-18 14:22:46 +03:30
nfel b7fe72b613 v2: new version added for easier deployment and ci/cd
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-18 12:15:04 +03:30
nfel 50024737a4 v2: changed directory
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-18 11:16:19 +03:30
nfel 211d6251f4 Removed old proto files 2024-11-17 16:24:34 +03:30
nfel 3f8ecc0cc8 Added versioning and correct packaging 2024-11-17 16:23:53 +03:30
13 changed files with 241 additions and 105 deletions
+38
View File
@@ -0,0 +1,38 @@
---
name: Buf CI
on:
push:
tags:
- v*
permissions:
contents: read
pull-requests: write
jobs:
buf:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v5
with:
go-version: '>=1.18.0'
- uses: bufbuild/buf-setup-action@v1.47.2
- run: ls -aRhl
# - 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: npm install --save-dev
# - run: buf --version
# - uses: actions/checkout@v4
# with:
# token: ${{ gitea.token }}
# path: ./
# - run: npx buf generate
# - run: |
# if [ -n ${{ gitea.ref_name }} ]; then
# 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
+6
View File
@@ -0,0 +1,6 @@
.idea
gen/go
stub
node_modules
yarn.lock
package-lock.json
+3
View File
@@ -0,0 +1,3 @@
# Protobuf with fangs
![Build Status](https://git.kahrobatoken.com/Kahroba/proto/actions/workflows/buf-ci.yaml/badge.svg?branch=v2)
@@ -1,6 +1,6 @@
syntax = "proto3"; syntax = "proto3";
package authorization; package auth.v1;
/* /*
Internal Internal
@@ -19,7 +19,7 @@ message InternalRoute {
message Role { message Role {
int64 id = 1; int64 id = 1;
string title = 2; string title = 2;
string Key = 3; string key = 3;
string type = 4; string type = 4;
} }
message Permission { message Permission {
+10 -10
View File
@@ -1,13 +1,13 @@
syntax = "proto3"; syntax = "proto3";
package authorization; package auth.v1;
import "authorization_message.proto"; import "auth/v1/msg.proto";
import "base_message.proto"; import "base/v1/msg.proto";
service AuthorizationService { service AuthorizationService {
rpc InternalAuthorizationDeleteCache(base.Empty) returns (base.StatusRes); rpc InternalAuthorizationDeleteCache(base.v1.Empty) returns (base.v1.StatusRes);
rpc InternalInitRoutes(InternalInitRoutesReq) returns (base.StatusRes) {} rpc InternalInitRoutes(InternalInitRoutesReq) returns (base.v1.StatusRes) {}
rpc InternalGetUserIdentityBasic(GetUserReq) returns (UserIdentityBasic) {} rpc InternalGetUserIdentityBasic(GetUserReq) returns (UserIdentityBasic) {}
rpc InternalGetUserIAM(GetUserReq) returns (InternalIAM) {} rpc InternalGetUserIAM(GetUserReq) returns (InternalIAM) {}
rpc CheckIAM(CheckIAMReq) returns (InternalIAM) {} rpc CheckIAM(CheckIAMReq) returns (InternalIAM) {}
@@ -20,19 +20,19 @@ service AuthorizationService {
rpc UserGetUserPermission(InternalIAM) returns (PermissionList) {} rpc UserGetUserPermission(InternalIAM) returns (PermissionList) {}
rpc UserGetIdentity(InternalIAM) returns (Identity) {} rpc UserGetIdentity(InternalIAM) returns (Identity) {}
rpc UserUpdateIdentity(UserUpdateIdentityReq) returns (base.StatusRes) {} rpc UserUpdateIdentity(UserUpdateIdentityReq) returns (base.v1.StatusRes) {}
rpc UserGetBankInfoList(ReqWithIAMAndParams) returns (BankInfoList) {} rpc UserGetBankInfoList(ReqWithIAMAndParams) returns (BankInfoList) {}
rpc UserUpdateBankInfo(UserUpdateBankInfoReq) returns (base.StatusRes) {} rpc UserUpdateBankInfo(UserUpdateBankInfoReq) returns (base.v1.StatusRes) {}
rpc UserRemoveBankInfo(IdReqWithIAM) returns (base.StatusRes) {} rpc UserRemoveBankInfo(IdReqWithIAM) returns (base.v1.StatusRes) {}
rpc GetUser(GetUserReq) returns (User) {} rpc GetUser(GetUserReq) returns (User) {}
// Two Factor Authentication // Two Factor Authentication
// For now it's only SMS-OTP - later will be Email-OTP or other methods can be // 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 // added For HMAC-OTP there won't be a need to call this api
rpc SendTFAReq(TFAReq) returns (base.StatusRes) {} rpc SendTFAReq(TFAReq) returns (base.v1.StatusRes) {}
// For HMAC-OTP an initialization step must be added to exchange keys // For HMAC-OTP an initialization step must be added to exchange keys
rpc InitTFAReq(InternalIAM) returns (TFAExRes) {} rpc InitTFAReq(InternalIAM) returns (TFAExRes) {}
rpc CheckTFACode(CheckTFAReq) returns (base.StatusRes) {} rpc CheckTFACode(CheckTFAReq) returns (base.v1.StatusRes) {}
} }
+1 -1
View File
@@ -1,6 +1,6 @@
syntax = "proto3"; syntax = "proto3";
package base; package base.v1;
message Empty {} message Empty {}
+56
View File
@@ -0,0 +1,56 @@
---
version: v2
clean: true
managed:
enabled: true
override:
- file_option: go_package_prefix
# FIXME: Change this to you're go.mod package name
value: github.com/nfel
plugins:
# NOTE: golang
# - remote: buf.build/grpc/go
# NOTE: grpc
# go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
- local: protoc-gen-go-grpc
out: stub/go
# NOTE: PB files
# go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
- local: protoc-gen-go
# - remote: buf.build/protocolbuffers/go:v1.30.0
out: stub/go
# NOTE: doc
# - local: protoc-gen-doc
# opt: html,index.html,source_relative
# out: stub/doc
# # NOTE: Gateway
# # - remote: buf.build/grpc-ecosystem/gateway:v2.16.2
# - local: protoc-gen-grpc-gateway
# out: stub/go
# # NOTE: SWAGGER json files
# # - remote: buf.build/grpc-ecosystem/openapiv2:v2.16.2
# - local: protoc-gen-openapiv2
# opt: import_prefix=github.com/nfel
# out: stub/go
# - local: protoc-gen-go-gin
# opt:
# # - plugin=handler
# # - plugin=service
# # - plugin=mix
# out: stub/go
# NOTE: Typescript
# - remote: buf.build/bufbuild/es:v2.2.2
# # opt: import_prefix=github.com/nfel
# out: stub/ts
- local: protoc-gen-es
out: stub/ts
opt: target=ts
# - local: protobuf-ts
# # opt: import_prefix=github.com/nfel
# out: stub/ts
inputs:
- directory: ./
# - git_repo: ssh://git@5.34.204.11/Kahroba/proto
# branch: v2
+11 -9
View File
@@ -1,12 +1,14 @@
--- ---
version: v1 version: v2
breaking:
use:
- FILE
- PACKAGE
lint: lint:
use: use:
- DEFAULT - BASIC
# disallow_comment_ignores: false - PACKAGE_SAME_GO_PACKAGE
# # The default behavior of this key has changed from v1 - PACKAGE_NO_IMPORT_CYCLE
# enum_zero_value_suffix: _UNSPECIFIED - IMPORT_USED
# rpc_allow_same_request_response: true modules:
# rpc_allow_google_protobuf_empty_requests: false - path: ./
# rpc_allow_google_protobuf_empty_responses: false
# service_suffix: Service
+7
View File
@@ -0,0 +1,7 @@
{
"devDependencies": {
"@bufbuild/buf": "^1.47.2",
"@bufbuild/protobuf": "^2.2.2",
"@bufbuild/protoc-gen-es": "^2.2.2"
}
}
+24
View File
@@ -0,0 +1,24 @@
---
version: v2
clean: true
managed:
enabled: true
override:
- file_option: go_package_prefix
value: <pkg_name>
plugins:
- remote: buf.build/grpc/go
out: stub/go
- remote: buf.build/protocolbuffers/go:v1.30.0
out: stub/go
- local: protoc-gen-doc
opt: html,index.html,source_relative
out: stub/doc
- local: protoc-gen-grpc-gateway
out: stub/go
- local: protoc-gen-openapiv2
out: stub/go
inputs:
- git_repo: ssh://git@5.34.204.11/Kahroba/proto
branch: v2
-42
View File
@@ -1,42 +0,0 @@
syntax = "proto3";
package wallet;
import "authorization_message.proto";
import "base_message.proto";
import "wallet_message.proto";
service WalletService {
rpc InternalWalletDeleteCache(base.Empty) returns (base.StatusRes);
rpc InternalCreateFederation(authorization.InternalIAM) returns (base.StatusRes);
rpc AdminGetFederation(GetFederationReq) returns (Federation);
rpc UserGetFederation(authorization.InternalIAM) returns (Federation);
rpc UserGetAssetList(base.Empty) returns (AssetList);
rpc AdminGetAssetList(base.Empty) returns (AssetList);
rpc GetAsset(GetAssetReq) returns (Asset);
rpc UserInitWallet(UserInitWalletReq) returns (base.StatusRes);
rpc UserGetWalletList(authorization.InternalIAM) returns (WalletList);
rpc UserTransferAsset(UserTransferAssetReq) returns (UserTransferRes);
rpc UserGetTransactionList(UserGetTransactionListReq) returns (TransactionList);
rpc SaleGetToken(SaleGetTokenReq) returns (SaleGetTokenRes);
rpc SaleConfirm(SaleConfirmReq) returns (SaleConfirmRes);
rpc AdminManualSaleDeposit(SaleManualReq) returns (base.StatusRes);
// BNPL
rpc GetBNPLList(base.Empty) returns (BNPLList);
rpc GetBNPLInfo(base.IdReq) returns (BNPLInfo);
rpc GetUserBNPLInfo(GetUserBNPLInfoReq) returns (UserBNPLResp);
rpc SubmitBNPLForm(UserBNPLReq) returns (base.StatusRes);
rpc UpdateBNPL(UserBNPLReq) returns (base.StatusRes);
rpc CancleBNPL(authorization.IdReqWithIAM) returns (base.StatusRes);
// Redeem Token
rpc CalculateRedeemToken(RedeemTokenReq) returns (CalculateRedeemTokenRes);
rpc RedeemToken(RedeemTokenReq) returns (base.StatusRes);
rpc RedeemTokenList(authorization.ReqWithIAMAndParams) returns (RedeemTokenResList);
}
+41 -41
View File
@@ -1,9 +1,9 @@
syntax = "proto3"; syntax = "proto3";
package wallet; package wallet.v1;
import "authorization_message.proto"; import "auth/v1/msg.proto";
import "base_message.proto"; import "base/v1/msg.proto";
/* /*
INTERNAL DATA INTERNAL DATA
@@ -109,17 +109,17 @@ message PropertyMeta {
// } // }
message GetUserBNPLInfoReq { message GetUserBNPLInfoReq {
authorization.InternalIAM iam = 1; auth.v1.InternalIAM iam = 1;
base.IdReq id = 2; base.v1.IdReq id = 2;
} }
enum BNPLPaymentsStatus { enum BNPLPaymentsStatus {
PENDING = 0; PENDING_PAYMENT = 0;
PAYED = 1; PAYED = 1;
OVER_DUE = 2; OVER_DUE = 2;
NOT_STARTED = 3; NOT_STARTED = 3;
NOT_YET_DUE = 4; NOT_YET_DUE = 4;
CANCLED = 5; CANCELED = 5;
} }
message BNPLPayments { message BNPLPayments {
uint64 id = 1; uint64 id = 1;
@@ -140,8 +140,8 @@ message UserBNPLResp {
optional bool accepted_terms = 6; optional bool accepted_terms = 6;
repeated BNPLPayments payments = 7; repeated BNPLPayments payments = 7;
optional string employee_id = 8; optional string employee_id = 8;
optional authorization.Company company = 10; optional auth.v1.Company company = 10;
authorization.InternalIAM iam = 11; auth.v1.InternalIAM iam = 11;
optional string updated_at = 12; optional string updated_at = 12;
optional string created_at = 13; optional string created_at = 13;
Asset selected_asset = 14; Asset selected_asset = 14;
@@ -150,7 +150,7 @@ message UserBNPLResp {
message UserBNPLReq { message UserBNPLReq {
uint64 id = 1; uint64 id = 1;
int64 bnpl_id = 2; int64 bnpl_id = 2;
authorization.InternalIAM iam = 6; auth.v1.InternalIAM iam = 6;
optional string created_at = 3; optional string created_at = 3;
optional string employee_id = 4; optional string employee_id = 4;
optional int64 company_id = 5; optional int64 company_id = 5;
@@ -175,7 +175,7 @@ message BNPLInfo {
float amount_end = 6; float amount_end = 6;
float amount_steps = 7; float amount_steps = 7;
repeated PaymentPeriodInfo payment_period = 8; repeated PaymentPeriodInfo payment_period = 8;
repeated authorization.Company possible_companies = 11; repeated auth.v1.Company possible_companies = 11;
string updated_at = 12; string updated_at = 12;
string created_at = 13; string created_at = 13;
string expires_at = 14; string expires_at = 14;
@@ -206,7 +206,7 @@ message Wallet {
} }
message UserInitWalletReq { message UserInitWalletReq {
authorization.InternalIAM iam = 1; auth.v1.InternalIAM iam = 1;
int64 asset_id = 2; int64 asset_id = 2;
} }
@@ -220,19 +220,19 @@ message TransactionList {
} }
enum TransactionType { enum TransactionType {
Unknown = 0; UNKNOWN = 0;
Buy = 1; BUY = 1;
Sell = 2; SELL = 2;
Transfer = 3; TRANSFER = 3;
Redeem = 4; REDEEM = 4;
} }
enum TransactionStatus { enum TransactionStatus {
Undetermined = 0; UNDETERMINED = 0;
Failed = -10; FAILED = -10;
Suspended = -9; SUSPENDED = -9;
Created = -1; CREATED = -1;
Pending = 1; PENDING_TRX = 1;
Successful = 2; SUCCESSFUL = 2;
} }
message Transaction { message Transaction {
@@ -240,11 +240,11 @@ message Transaction {
int64 asset_id = 2; int64 asset_id = 2;
// Asset asset_info = 3; //Causing network overloading // Asset asset_info = 3; //Causing network overloading
optional int64 from_user_id = 4; optional int64 from_user_id = 4;
optional authorization.UserIdentityBasic from_user_info = 5; optional auth.v1.UserIdentityBasic from_user_info = 5;
optional int64 from_federation_id = 6; optional int64 from_federation_id = 6;
optional Federation from_federation_info = 7; optional Federation from_federation_info = 7;
optional int64 to_user_id = 8; optional int64 to_user_id = 8;
optional authorization.UserIdentityBasic to_user_info = 9; optional auth.v1.UserIdentityBasic to_user_info = 9;
optional int64 to_federation_id = 10; optional int64 to_federation_id = 10;
optional Federation to_federation_info = 11; optional Federation to_federation_info = 11;
double amount = 12; double amount = 12;
@@ -256,7 +256,7 @@ message Transaction {
} }
message UserGetTransactionListReq { message UserGetTransactionListReq {
authorization.InternalIAM iam = 1; auth.v1.InternalIAM iam = 1;
optional int32 page_index = 2; optional int32 page_index = 2;
optional int32 page_size = 3; optional int32 page_size = 3;
optional int64 id = 4; optional int64 id = 4;
@@ -276,7 +276,7 @@ message UserGetTransactionListReq {
*/ */
message UserBuyAssetReq { message UserBuyAssetReq {
authorization.InternalIAM iam = 1; auth.v1.InternalIAM iam = 1;
int64 asset_id = 2; int64 asset_id = 2;
double amount = 3; double amount = 3;
} }
@@ -290,7 +290,7 @@ message UserBuyAssetReq {
*/ */
message UserTransferAssetReq { message UserTransferAssetReq {
authorization.InternalIAM iam = 1; auth.v1.InternalIAM iam = 1;
int64 asset_id = 2; int64 asset_id = 2;
double amount = 3; double amount = 3;
string to_wallet_address = 4; string to_wallet_address = 4;
@@ -304,7 +304,7 @@ message UserTransferRes {
// represent the information regarding the sale of the token // represent the information regarding the sale of the token
message SaleGetTokenReq { message SaleGetTokenReq {
authorization.InternalIAM iam = 1; auth.v1.InternalIAM iam = 1;
int64 asset_id = 2; int64 asset_id = 2;
double amount = 3; double amount = 3;
} }
@@ -319,21 +319,21 @@ message SaleGetTokenRes {
} }
message SaleConfirmReq { message SaleConfirmReq {
string RefId = 1; string ref_id = 1;
string ResCode = 2; string res_code = 2;
string SaleOrderId = 3; string sale_order_id = 3;
string SaleReferenceId = 4; string sale_reference_id = 4;
string CardHolderInfo = 5; string card_holder_info = 5;
string CardHolderPan = 6; string card_holder_pan = 6;
string FinalAmount = 7; string final_amount = 7;
} }
message SaleConfirmRes { message SaleConfirmRes {
string receiptLink = 1; string receipt_link = 1;
} }
message SaleManualReq { message SaleManualReq {
authorization.InternalIAM iam = 1; auth.v1.InternalIAM iam = 1;
int64 asset_id = 2; int64 asset_id = 2;
double amount = 3; double amount = 3;
string paid_at = 4; string paid_at = 4;
@@ -345,7 +345,7 @@ message SaleManualReq {
Redeem Token Redeem Token
*/ */
message RedeemTokenReq { message RedeemTokenReq {
authorization.InternalIAM iam = 1; auth.v1.InternalIAM iam = 1;
int64 asset_id = 2; int64 asset_id = 2;
uint64 bank_info_id = 3; uint64 bank_info_id = 3;
double amount = 4; double amount = 4;
@@ -358,7 +358,7 @@ message CalculateRedeemTokenRes {
double request_amount = 4; double request_amount = 4;
double profit_capital = 5; double profit_capital = 5;
double user_capital = 6; double user_capital = 6;
optional authorization.BankInfo bank_info = 7; optional auth.v1.BankInfo bank_info = 7;
} }
message RedeemTokenRes { message RedeemTokenRes {
uint64 id = 1; uint64 id = 1;
@@ -371,7 +371,7 @@ message RedeemTokenRes {
bool is_paied = 8; bool is_paied = 8;
// receipt.Receipt receipt = 8; // receipt.Receipt receipt = 8;
double calculated_profit = 9; double calculated_profit = 9;
optional authorization.BankInfo bank_info = 10; optional auth.v1.BankInfo bank_info = 10;
optional string receipt = 11; optional string receipt = 11;
} }
message RedeemTokenResList { message RedeemTokenResList {
+42
View File
@@ -0,0 +1,42 @@
syntax = "proto3";
package wallet.v1;
import "auth/v1/msg.proto";
import "base/v1/msg.proto";
import "wallet/v1/msg.proto";
service WalletService {
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 UserGetAssetList(base.v1.Empty) returns (AssetList);
rpc AdminGetAssetList(base.v1.Empty) returns (AssetList);
rpc GetAsset(GetAssetReq) returns (Asset);
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);
rpc SaleConfirm(SaleConfirmReq) returns (SaleConfirmRes);
rpc AdminManualSaleDeposit(SaleManualReq) returns (base.v1.StatusRes);
// BNPL
rpc GetBNPLList(base.v1.Empty) returns (BNPLList);
rpc GetBNPLInfo(base.v1.IdReq) returns (BNPLInfo);
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);
// Redeem Token
rpc CalculateRedeemToken(RedeemTokenReq) returns (CalculateRedeemTokenRes);
rpc RedeemToken(RedeemTokenReq) returns (base.v1.StatusRes);
rpc RedeemTokenList(auth.v1.ReqWithIAMAndParams) returns (RedeemTokenResList);
}