Compare commits

..

62 Commits

Author SHA1 Message Date
nfel faf4ac4465 issue: /#11 image added
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-23 18:15:01 +03:30
nfel 0ab540e9c0 issue: /#11 network list added
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-23 17:41:45 +03:30
nfel 03aaf185f7 Merge pull request 'improve TransferAsset messages & add ExternalTransferAsset rpc' (#10) from wallet/#24 into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/10
2024-12-23 09:14:41 +00:00
hoessein_225 219a8e107d improve TransactionType 2024-12-23 11:25:57 +03:30
hoessein_225 ce274776a6 improve TransferAsset messages & add ExternalTransferAsset rpc 2024-12-21 16:46:42 +03:30
nfel aac5d5e784 Merge pull request 'add type to Asset' (#9) from wallet/#22 into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/9
2024-12-21 11:51:27 +00:00
hoessein_225 552bd3c428 add type to Asset 2024-12-21 15:17:26 +03:30
nfel 21c190e5a5 Merge pull request 'wallet/#14' (#8) from wallet/#14 into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/8
2024-12-21 11:16:42 +00:00
nfel fe1f8ca568 Merge pull request 'improve type and GetPublicKeyByNationalIDReq' (#7) from feat/#19 into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/7
2024-12-21 08:13:50 +00:00
hoessein_225 ecb8eed62c improve type and GetPublicKeyByNationalIDReq 2024-12-21 11:34:50 +03:30
hoessein_225 3d1e544c00 improve Identity message 2024-12-17 12:07:21 +03:30
nfel dd0c898404 wallet: /#14 :)
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-16 15:53:09 +03:30
nfel f496cb4d32 wallet: /#14 rejection reason for bnpl is optional
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-16 15:50:43 +03:30
nfel ff86d65eb3 wallet: /#14 removed multiple company from user + identity now is source of truth
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-16 15:29:25 +03:30
nfel f23d1251b5 v2: redeem added to tfa code state
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-14 17:35:52 +03:30
nfel 5eb260df3a v2: changed tfa check
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-14 17:09:24 +03:30
nfel 72cb1d8117 v2: changed tfa check
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-14 16:55:50 +03:30
nfel 0cd6107abe v2: changed TFAReq Msg to accept trx id and state
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-14 16:45:12 +03:30
nfel 4b1ff1c31d v2: user_id added to recepient msg
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-10 15:09:54 +03:30
nfel 5df728fd9c Merge pull request 'improve recipient' (#6) from recipient into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/6
2024-12-10 08:22:22 +00:00
hoessein_225 3e699c2082 improve recipient 2024-12-10 11:48:22 +03:30
nfel cc0bd514d5 Merge pull request 'add internal rpc file and LookUpName rpc' (#5) from auth into v2 2024-12-10 07:23:47 +00:00
hoessein_225 8a0c7451fb edit state enum name 2024-12-10 10:50:40 +03:30
hoessein_225 9d8a2d160a add internal rpc file and LookUpName rpc 2024-12-10 10:34:16 +03:30
nfel 88aefe7d13 Merge pull request 'add some items to optState enum' (#4) from tfa into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/4
2024-12-09 11:02:37 +00:00
hoessein_225 1b6a64aa46 add some items to optState enum 2024-12-09 14:30:56 +03:30
nfel 114de30b57 Merge pull request 'add enum for TFA message' (#3) from tfa into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/3
2024-12-09 10:58:36 +00:00
hoessein_225 434f74756f add enum for TFA message 2024-12-09 14:25:50 +03:30
nfel 32d46850a5 v2: str -> double
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-12-09 13:41:08 +03:30
nfel 254f1697d8 Merge pull request 'improve InternalTransferAsset rpc' (#2) from transfer into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/2
2024-12-09 09:02:32 +00:00
hoessein_225 36af98b186 add some optional feat & change key name in TFA 2024-12-09 12:13:55 +03:30
hoessein_225 6ecb53aecd add Recipient message 2024-12-09 12:05:30 +03:30
hoessein_225 e21e98568b change Otp name 2024-12-09 12:00:13 +03:30
hoessein_225 8e64e1ca1f improve InternalTransferAsset rpc 2024-12-09 11:56:34 +03:30
nfel 3779679504 Merge pull request 'add CheckWalletKey rpc' (#1) from wallet into v2
Reviewed-on: https://git.kahrobatoken.com/Kahroba/proto/pulls/1
2024-12-07 10:45:03 +00:00
hoessein_225 f7729a595b change CheckWalletKey rpc name to GetPublicKeyByNationalID 2024-12-07 14:14:32 +03:30
hoessein_225 6a95269cef add CheckWalletKey rpc 2024-12-07 13:32:20 +03:30
nfel 8b560247e4 v2: buf format
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-29 00:04:49 +03:30
nfel b3ceb01bfb v2: removed test ci + alert filter fixed
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 14:15:10 +03:30
nfel 46ac6fcea5 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:41:07 +03:30
nfel 2fdaac14c6 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:39:54 +03:30
nfel 53b8db78dd v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:38:52 +03:30
nfel 749a399197 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:37:42 +03:30
nfel 6396711ba7 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:24:40 +03:30
nfel b71c028f88 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:22:07 +03:30
nfel eeeedde123 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:19:30 +03:30
nfel 8660dea75b v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:18:54 +03:30
nfel 014cc162b2 v2:
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:15:24 +03:30
nfel 208bc84c74 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:08:28 +03:30
nfel 5affc6bb04 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 12:05:32 +03:30
nfel d0354d77f1 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:56:49 +03:30
nfel b6cd325104 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:44:00 +03:30
nfel 79d2cedc3e v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:42:02 +03:30
nfel 7b2eef8657 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:41:10 +03:30
nfel 22c5992046 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:38:00 +03:30
nfel c57abc00f6 v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:36:57 +03:30
nfel db54a552ac v2: test env
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-26 11:31:33 +03:30
nfel c92810ad5b v2: ci updates
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-23 16:25:03 +03:30
nfel cdd45c2707 v2: ci updates
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-23 16:24:03 +03:30
nfel 6f3d8b9b42 v2: ci updates
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-23 16:22:46 +03:30
nfel 01e0904fa6 v2: ci updates
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-23 16:17:21 +03:30
nfel 8d2bdaf352 v2: ci
Signed-off-by: nfel <nfilsaraee@gmail.com>
2024-11-23 14:53:05 +03:30
10 changed files with 256 additions and 26 deletions
+48 -8
View File
@@ -3,9 +3,12 @@ on:
push:
tags:
- v*
permissions:
contents: read
pull-requests: write
packages: write
jobs:
buf:
runs-on: ubuntu-latest
@@ -18,20 +21,57 @@ jobs:
with:
token: ${{ gitea.token }}
path: ./
- name: install tea cli and init
run: |
mkdir tmp && cd tmp
curl -SsOL https://dl.gitea.com/tea/main/tea-main-linux-amd64.xz
apt install xz-utils -y >/dev/null
xz -d tea-main-linux-amd64.xz
mv tea-main-linux-amd64 /usr/bin/tea
chmod +x /usr/bin/tea
cd ..
rm -rf tmp
tea --version
tea login add \
--name ${{ gitea.server_url }} \
--token ${{ secrets.PROD_REG_TOKEN }} \
--url ${{ gitea.server_url }}
- run: go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
- run: go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
- run: go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@latest
- run: npm install --save @bufbuild/protobuf @bufbuild/protoc-gen-es @bufbuild/buf
- run: buf --version
- run: "export PATH=$PATH:./node_modules/.bin\nbuf generate \n"
- run: |
if [ -n ${{ gitea.ref_name }} ]; then
mkdir .res
- name: tar files
run: |
ls -l ./stub
for out in go ts doc; do
echo releasing ${out} ...
tar czf .res/${out}.tar.gz ./stub/${out}/
curl -Ss --user nfel:${{ secrets.PROD_REG_TOKEN }}\
--upload-file .res/${out}.tar.gz \
${{ gitea.server_url }}/api/packages/Kahroba/generic/proto/${{ gitea.ref_name }}/${out}.tar.gz
done
fi
tar czf ./.res/src.tar.gz $(find -type f -name "*.proto")
tea r c \
--title "${{ gitea.ref_name }}" \
--tag "${{ gitea.ref_name }}" \
-a ./.res/src.tar.gz \
-a ./.res/go.tar.gz \
-a ./.res/doc.tar.gz \
-a ./.res/ts.tar.gz \
# - run: |
# if [ -n ${{ gitea.ref_name }} ]; then
# mkdir .res
# for out in go ts doc; do
# echo releasing ${out} ...
# tar czf .res/${out}.tar.gz ./stub/${out}/
# curl -Ss --user nfel:${{ secrets.PROD_REG_TOKEN }}\
# --upload-file .res/${out}.tar.gz \
# ${{ gitea.server_url }}/api/packages/Kahroba/generic/proto/${{ gitea.ref_name }}/${out}.tar.gz
# done
# echo releasing proto ...
# tar czf ./.res/src.tar.gz $(find -type f -name "*.proto")
# curl -Ss --user nfel:${{ secrets.PROD_REG_TOKEN }}\
# --upload-file ./.res/src.tar.gz \
# ${{ gitea.server_url }}/api/packages/Kahroba/generic/proto/${{ gitea.ref_name }}/src.tar.gz
# fi
# - run: |
+65
View File
@@ -0,0 +1,65 @@
syntax = "proto3";
package alert.v1;
import "base/v1/msg.proto";
message AlertFilter {
base.v1.Filter base_filter = 1;
Importance importance = 2;
LogSource source = 3;
}
//Importance of given event
enum Importance {
LOW = 0; // Low Severity ( unimportant and can be ignored )
MEDIUM = 1; // MEDIUM Severity
HIGH = 2; // High Severity
CRITICAL = 3; // CRITICAL Severity ( can cause panics and data lost )
}
enum LogSource {
UNKNOWN = 0;
USER = 1;
SYSTEM = 2;
WALLET = 3;
}
message Meta {
uint32 created_at_ts = 1;
uint32 updated_at_ts = 2;
uint32 blamer_id = 3; // User ID of person who made the change
}
message LogEvent {
optional uint64 id = 1; // Record Id of Log stored in db
string content = 2;
string effective_user = 3;
optional LogSource source = 5;
Importance importance = 6;
Meta meta = 7;
}
message LogEventList {
repeated LogEvent events = 1;
}
/*
Internal Msg
*/
message SMSChangeLog {
uint32 when_ts = 1;
string what = 2;
}
message SMS {
string recipient = 1; //recipient
string text = 2;
optional string sender = 3;
Meta meta = 4;
repeated SMSChangeLog change_log = 5;
}
message SMSList {
repeated SMS sms = 1;
}
+12
View File
@@ -0,0 +1,12 @@
syntax = "proto3";
package alert.v1;
import "alert/v1/msg.proto";
import "base/v1/msg.proto";
service AlertSrv {
rpc Emit(LogEvent) returns (base.v1.StatusRes) {}
rpc Update(LogEvent) returns (base.v1.StatusRes) {}
rpc Get(AlertFilter) returns (base.v1.StatusRes) {}
}
+9
View File
@@ -0,0 +1,9 @@
syntax = "proto3";
package auth.v1;
import "auth/v1/msg.proto";
service InternalAuthorizationService {
rpc LookUpName(LookUpNameReq) returns (LookUpNameRes) {}
}
+43 -4
View File
@@ -75,8 +75,8 @@ message CheckIAMReq {
message InternalIAM {
User user = 1;
IdentityBasic identity = 2;
repeated Company company = 3;
}
message IdReqWithIAM {
int64 id = 1;
InternalIAM iam = 2;
@@ -110,6 +110,7 @@ message Company {
bool can_provide_bnpl = 5;
}
// Identity is bound to current user's real identity
message Identity {
string national_id = 1;
string national_serial_id = 2;
@@ -131,14 +132,17 @@ message Identity {
string updated_at = 18;
string created_at = 19;
string email = 20;
string mobile = 21;
string mobile = 21;
optional Company company = 22;
optional string employee_info = 23;
string pub_key = 24;
optional float balance = 25;
}
message IdentityBasic {
string first_name = 1;
string last_name = 2;
optional Company company = 3;
}
message UserIdentityBasic {
@@ -194,6 +198,8 @@ message TFAReq {
optional string mobile = 2;
optional string email = 3;
optional string reason = 4; // issued jwt reason -> can be login, redeem, withdrawal
optional string transaction_id = 5;
optional TfaStateEnum state = 6;
}
// Two Factor Authentication Exchange Response
@@ -205,6 +211,39 @@ message TFAExRes {
message CheckTFAReq {
InternalIAM iam = 1;
string code = 2;
optional string algorithm = 3;
optional string reason = 4; // Can be later used as a lookup
TFAReq req = 3;
// optional string algorithm = 3;
// optional string reason = 4; // Can be later used as a lookup
// optional string transaction_id = 5;
// optional TfaStateEnum state = 6;
}
message TFA {
TfaStateEnum state = 1;
int64 code = 2;
string transaction_id = 3;
}
enum TfaStateEnum {
TFA_STATE_ENUM_UNSPECIFIED = 0;
LOGIN = 1;
INTERNAL_TRANSFER = 2;
EXTERNAL_TRANSFER = 3;
REDEEM_TOKEN = 4;
}
message Recipient {
string key = 1;
optional string first_name = 2;
optional string last_name = 3;
optional int64 user_id = 4;
optional string public_key = 5;
}
message LookUpNameReq {
Recipient recipient = 1;
}
message LookUpNameRes {
Recipient recipient = 1;
}
+1 -2
View File
@@ -14,8 +14,7 @@ service AuthorizationService {
rpc UserLoginSendOTP(UserSendOtpReq) returns (UserSendOtpRes) {}
rpc UserLoginWithOTP(UserLoginReq) returns (UserAccessTokenRes) {}
rpc UserGetAccessTokenByRefreshToken(UserRefreshTokenReq)
returns (UserAccessTokenRes) {}
rpc UserGetAccessTokenByRefreshToken(UserRefreshTokenReq) returns (UserAccessTokenRes) {}
rpc UserGetUserPermission(InternalIAM) returns (PermissionList) {}
+9
View File
@@ -13,3 +13,12 @@ message IdRes {
message IdReq {
int64 id = 1;
}
message Pagination {
uint32 page = 1; // in query param it will be p
uint32 page_size = 2; // in query param it will be pz
}
message Filter {
string query = 1; // q
string sort = 2; // s
optional Pagination page = 3;
}
+5 -2
View File
@@ -28,8 +28,11 @@ plugins:
out: stub/doc/md
# # NOTE: Gateway
# # - remote: buf.build/grpc-ecosystem/gateway:v2.16.2
# - local: protoc-gen-grpc-gateway
# out: stub/go
- local: protoc-gen-grpc-gateway
out: stub/go
opt:
- standalone=true
- generate_unbound_methods=true
# # NOTE: SWAGGER json files
# # - remote: buf.build/grpc-ecosystem/openapiv2:v2.16.2
# - local: protoc-gen-openapiv2
+56 -9
View File
@@ -75,6 +75,7 @@ message Asset {
repeated string images = 30;
int32 status = 31;
AssetMeta meta = 32;
string type = 33;
}
message GetAssetReq {
@@ -145,6 +146,7 @@ message UserBNPLResp {
optional string updated_at = 12;
optional string created_at = 13;
Asset selected_asset = 14;
optional string rejection_reason = 15;
}
message UserBNPLReq {
@@ -223,8 +225,11 @@ enum TransactionType {
UNKNOWN = 0;
BUY = 1;
SELL = 2;
TRANSFER = 3;
REDEEM = 4;
INTERNAL_TRANSFER = 3;
EXTERNAL_TRANSFER = 4;
REDEEM = 5;
TRUST_LINE = 6;
WAGE = 7;
}
enum TransactionStatus {
UNDETERMINED = 0;
@@ -289,17 +294,22 @@ message UserBuyAssetReq {
Transfer
*/
message UserTransferAssetReq {
message TransferAssetReq {
auth.v1.InternalIAM iam = 1;
int64 asset_id = 2;
auth.v1.Recipient recipient = 2;
double amount = 3;
string to_wallet_address = 4;
string to_wallet_memo = 5;
optional int64 network_id = 4;
int64 asset_id = 5;
optional bool approval = 6;
optional auth.v1.TFA tfa = 7;
}
message UserTransferRes {
int64 transaction_id = 1;
string tracking_code = 2;
message TransferAssetRes {
auth.v1.Recipient recipient = 1;
double amount = 2;
// TODO: Change to Asset
string transaction_id = 3;
string transaction_hash = 4;
}
// represent the information regarding the sale of the token
@@ -377,3 +387,40 @@ message RedeemTokenRes {
message RedeemTokenResList {
repeated RedeemTokenRes list = 1;
}
message GetPublicKeyByNationalIDReq {
auth.v1.InternalIAM iam = 1;
string national_id = 2;
}
message GetPublicKeyByNationalIDRes {
string pub_key = 1;
}
/*
Network Details
*/
enum NetworkType {
UNKNOWN_NETWORK_TYPE = 0;
ETH = 1;
XLM = 2;
BTC = 3;
}
message Network {
int64 id = 1;
string name = 2;
string code = 3;
string explorer = 4;
int64 gas_asset_id = 5;
string description = 6;
NetworkType type = 7;
bool is_active = 8;
string image = 9;
string updated_at = 10;
string created_at = 11;
}
message NetworkList {
repeated Network list = 1;
}
+8 -1
View File
@@ -13,13 +13,14 @@ service WalletService {
rpc AdminGetFederation(GetFederationReq) returns (Federation);
rpc UserGetFederation(auth.v1.InternalIAM) returns (Federation);
rpc GetNetworkList(base.v1.Empty) returns (NetworkList);
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);
@@ -39,4 +40,10 @@ service WalletService {
rpc CalculateRedeemToken(RedeemTokenReq) returns (CalculateRedeemTokenRes);
rpc RedeemToken(RedeemTokenReq) returns (base.v1.StatusRes);
rpc RedeemTokenList(auth.v1.ReqWithIAMAndParams) returns (RedeemTokenResList);
rpc GetPublicKeyByNationalID(GetPublicKeyByNationalIDReq) returns (GetPublicKeyByNationalIDRes);
// Assets routing
rpc InternalTransferAsset(TransferAssetReq) returns (TransferAssetRes);
rpc ExternalTransferAsset(TransferAssetReq) returns (TransferAssetRes);
}