Add Custom Order Instructions

This commit is contained in:
Michael Harding committed 2019-05-02 12:14:50 -04:00
1 parent 0db037175f
commit 8d7a2f342e
4 files changed
+52 -46

No files matched your search

+43 -41
View File
@@ -33,7 +33,7 @@ message AdminData{
repeated BTSUserGroup user_groups = 10;
repeated BTSUser users = 20;
repeated BTSAccount accounts = 30;
repeated ExchangeConnection connections = 40;
repeated ExchangeConnection connections = 40;
}
/************************************************************************/
@@ -55,12 +55,12 @@ message BTSUser{
string name = 30;
string password = 40;
string full_name = 42;
string company = 44;
string company = 44;
bool is_active = 50;
bool can_create = 55;
LicenseData license_data = 60;
LicenseEntitlements license_entitlements = 70;
LicenseData license_data = 60;
LicenseEntitlements license_entitlements = 70;
BTSUserDerivableData user_data = 80;
}
@@ -77,7 +77,7 @@ message BTSUserDerivableData{
// b. else its overridden at the user level
UserAccountPermissions account_permissions = 70;
ExchangeUserData exchange_user_data = 80;
reserved 90; reserved "exchange_md_entitlement_data"; //ExchangeUserMarketDataEntitlementData exchange_md_entitlement_data = 90;
reserved 90; reserved "exchange_md_entitlement_data"; //ExchangeUserMarketDataEntitlementData exchange_md_entitlement_data = 90;
}
message LicenseData{
@@ -99,15 +99,15 @@ message LicenseEntitlements{
// }
message TradingPermissionUnit{
reserved 10; reserved "submit_market_orders"; //bool submit_market_orders = 10; //unused
reserved 20; reserved "submit_gtc_orders"; //bool submit_gtc_orders = 20; //unused
reserved 30; reserved "algo_trading_permission"; //AlgoTradingPermissionsUnit algo_trading_permission = 30; //unused
reserved 10; reserved "submit_market_orders"; //bool submit_market_orders = 10; //unused
reserved 20; reserved "submit_gtc_orders"; //bool submit_gtc_orders = 20; //unused
reserved 30; reserved "algo_trading_permission"; //AlgoTradingPermissionsUnit algo_trading_permission = 30; //unused
bool has_permissions = 5;
}
message AdminPermissionUnit{
// TODO: needs to be more ellaborate (account writing,
// TODO: needs to be more ellaborate (account writing,
// reading etc, routing etc)
bool has_permissions = 10;
bool has_md_permissions = 20;
@@ -121,14 +121,14 @@ message UserAccountPermissionUnit{
message UserAccountPermissions{
//uint32 = account_id
map<uint32, UserAccountPermissionUnit> account_permissions = 10;
map<uint32, UserAccountPermissionUnit> account_permissions = 10;
}
// // unused now
// message UserSecurityTradingLimit{
// SecurityScope security = 10;
// uint32 clip_size = 20;
// bool can_trade = 30;
// bool can_trade = 30;
// }
/************************************************************************/
@@ -153,7 +153,7 @@ message BTSAccount{
RiskLimitEnforcement risk_limit_enforcement=120;
}
message RiskLimitEnforcement{
message RiskLimitEnforcement{
bool product_limit_in_net_terms = 10;
}
@@ -199,7 +199,7 @@ message AccountExchangeConnections{
message CMEMicData{
api.CMEMics mic=10;
bool enabled=20;
// there are other things here
// there are other things here
}
message ICEMicData{
@@ -212,9 +212,9 @@ message ExchangeUserData{
CMEUserData cme_data = 10;
ICEUserData ice_data = 20;
SIMUserData sim_data = 30;
enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; }
AdminDisplay admin_display_flag = 120;
enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; }
AdminDisplay admin_display_flag = 120;
}
message ExchangeAccountData{
@@ -276,7 +276,7 @@ message CMEAccountData {
reserved 110; reserved "client_id"; //string client_id = 110;
api.orderman.CTICode cti = 10;
api.orderman.CustomerOrFirm origin = 20;
api.orderman.CustomerOrFirm origin = 20;
string clearing_account = 40;
map<string, string> misc_tags = 120;
}
@@ -304,18 +304,18 @@ message CMEUserData{
reserved 40; reserved "text_a"; //string text_a = 40;
reserved 50; reserved "text_b"; //string text_b = 50;
reserved 80; reserved "max_order_rate_per_connection"; //string max_order_rate_per_connection = 80;
//enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; }
reserved 120; reserved "admin_display_flag"; //AdminDisplay admin_display_flag = 120;
//enum AdminDisplay { All = 0; MD = 1; Routing = 2; None = 100; }
reserved 120; reserved "admin_display_flag"; //AdminDisplay admin_display_flag = 120;
repeated CMEMicData md_permissions = 1000;
string operator_id = 10;
string operator_id = 10;
string smp_id = 30;
map<string, string> misc_tags = 60;
string smp_instruction = 70;
string location = 90;
ProfessionalDesignation pro_nonpro = 100;
DisplayDesignation display_nondisplay = 110;
DisplayDesignation display_nondisplay = 110;
}
message SIMUserData {
@@ -329,10 +329,10 @@ message ICEConnection {
string sender_compid = 10;
}
message ICEAccountData {
message ICEAccountData {
reserved 10; reserved "nybit_house"; //string nybit_house = 10;
reserved 20; reserved "wce_house"; //int32 wce_house = 20;
reserved 30; reserved "clearing_account_override"; //string clearing_account_override = 30;
reserved 30; reserved "clearing_account_override"; //string clearing_account_override = 30;
reserved 40; reserved "direct_electronic_access"; //bool direct_electronic_access = 40;
reserved 50; reserved "trading_capacity"; //string trading_capacity = 50;
reserved 60; reserved "liquidity_provision"; //bool liquidity_provision = 60;
@@ -348,20 +348,22 @@ message ICEAccountData {
string clearing_account = 210;
string customer_account_ref_id = 220;
string account_code = 230;
map<string, string> misc_tags = 500;
map<string, string> misc_tags = 500;
}
message ICEUserData {
message ICEUserData {
reserved 20; reserved "memo_field"; //string memo_field = 20;
reserved 30; reserved "text_b"; //string text_b = 30;
reserved 40; reserved "max_order_rate"; //uint32 max_order_rate = 40;
int32 company_id = 3; //tag 109 clientid
string operator_id = 5; //tag 50
string authorized_trader = 10; //tag 553 user_name
string authorized_group = 15; //tag 553 user_name
string operator_id = 5; //tag 50
string authorized_trader = 10; //tag 553 user_name
string authorized_group = 15; //tag 553 user_name
string password = 21; //tag 96 raw data
string cust_order_handing_inst = 25;
//mifid
int32 mifid_direct_electronic_access = 500;
int32 mifid_trading_capacity = 510;
@@ -371,18 +373,18 @@ message ICEUserData {
int64 mifid_execution_decision = 550;
int64 mifid_client_id_code = 560;
int64 mifid_id = 570;
map<string, string> misc_tags = 60;
ProfessionalDesignation pro_nonpro = 100;
DisplayDesignation display_nondisplay = 110;
repeated ICEMicData md_permissions = 1000;
repeated ICEMicData md_permissions = 1000;
}
///////////////////////////////////////////////////////////
// Order Auxiliary Service ////////////////////////////////
message OrdersSummaryUnit{
message OrdersSummaryUnit{
string account = 10;
string user = 20;
uint32 total_orders = 30;
@@ -393,11 +395,11 @@ message OrdersSummary{
}
message OrderSummaryRequest{
}
// top level orders that have account
// top level orders that have account
// and user that are present here, will
// be cancelled. wild cards are not
// supported.
message OrderCancelRequest{
message OrderCancelRequest{
repeated string accounts = 10;
repeated string users = 20;
}
@@ -433,7 +435,7 @@ message AccountCreateAPIArgument{
string creator_user = 40;
}
message AccountUpdateAPIArgument{
BTSAccount complete_data=10;
BTSAccount complete_data=10;
}
message UserCreateAPIArgument{
uint32 parent_group_id = 20;
@@ -477,7 +479,7 @@ service AdminService {
// users
rpc create_user(UserCreateAPIArgument) returns (AdminServiceCreateEntityResult);
rpc update_user(UserUpdateAPIArgument) returns (AdminServiceOperationResult);
rpc delete_user(IDAPIArgument) returns (AdminServiceOperationResult);
rpc delete_user(IDAPIArgument) returns (AdminServiceOperationResult);
// subscription
rpc admin_data(bts.api.VoidMessage) returns (stream AdminData);
rpc get_admin_data(bts.api.VoidMessage) returns (AdminData);
+2
View File
@@ -74,6 +74,7 @@ let defaultScratchUser = {
authorizedTrader = ""
authorizedGroup = ""
password = ""
custOrderHandingInst = ""
mifidDirectElectronicAccess = -1
mifidTradingCapacity = -1
mifidLiquidityProvision = -1
@@ -208,6 +209,7 @@ let applyUpdate (field:UserField) (user:BTSUser) =
| ICEAuthorizedTrader oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with authorizedTrader = oid }
| ICEAuthorizedGroup oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with authorizedGroup = oid }
| ICEPassword oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with password = oid }
| ICECustOrderHandingInst oid -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with custOrderHandingInst = oid }
| MifidClientIdCode value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidClientIdCode = value }
| MifidCommodityDerivIndicator value -> updateICEExchangeUserData user { user.userData.exchangeUserData.iceData with mifidCommodityDerivIndicator = value }
+1
View File
@@ -23,6 +23,7 @@ type UserField =
| ICEAuthorizedTrader of string
| ICEAuthorizedGroup of string
| ICEPassword of string
| ICECustOrderHandingInst of string
| MifidClientIdCode of int64
| MifidCommodityDerivIndicator of int
+6 -5
View File
@@ -278,11 +278,12 @@ let orderRoutingTabView (model:Model) (dispatch:Msg->Unit) (readonly:bool) =
br []
h2 [Class "is-size-3"] [ str "ICE" ]
div [] [
Fields.number "Company ID" iceData.companyId [ MaxLength 18.0 ] (ICECompanyID >> UpdateField >> dispatch)
Fields.text "Operator ID" iceData.operatorId [ MaxLength 18.0 ] (ICEOperatorID >> UpdateField >> dispatch)
Fields.text "Authorized Trader" iceData.authorizedTrader [ MaxLength 18.0 ] (ICEAuthorizedTrader >> UpdateField >> dispatch)
Fields.text "Authorized Group" iceData.authorizedGroup [ MaxLength 18.0 ] (ICEAuthorizedGroup >> UpdateField >> dispatch)
Fields.text "Password" iceData.password [ MaxLength 18.0 ] (ICEPassword >> UpdateField >> dispatch)
Fields.number "Company ID" iceData.companyId [ ] (ICECompanyID >> UpdateField >> dispatch)
Fields.text "Operator ID" iceData.operatorId [ ] (ICEOperatorID >> UpdateField >> dispatch)
Fields.text "Authorized Trader" iceData.authorizedTrader [ ] (ICEAuthorizedTrader >> UpdateField >> dispatch)
Fields.text "Authorized Group" iceData.authorizedGroup [ ] (ICEAuthorizedGroup >> UpdateField >> dispatch)
Fields.text "Password" iceData.password [ ] (ICEPassword >> UpdateField >> dispatch)
Fields.text "Custom Order Instructions" iceData.custOrderHandingInst [ ] (ICECustOrderHandingInst >> UpdateField >> dispatch)
h2 [Class "is-size-4"] [ str "MIFID" ]
div [Style [MarginLeft "2em"]] [