perf: removed individual POC calls made against contracts, added glob…

packages/bot-skeleton/src/scratch/dbot-store.js

@@ -21,7 +21,6 @@ class DBotStore extends DBotStoreInterface {
         this.is_dark_mode_on = store.is_dark_mode_on || false;
         this.client = store.client;
         this.flyout = store.flyout;
-        this.populateConfig = store.populateConfig;
         this.toolbar = store.toolbar;
         this.toolbox = store.toolbox;
         this.save_modal = store.save_modal;

packages/bot-skeleton/src/services/api/api-base.js

@@ -80,6 +80,7 @@ class APIBase {
     subscribe() {
         doUntilDone(() => this.api.send({ balance: 1, subscribe: 1 }));
         doUntilDone(() => this.api.send({ transaction: 1, subscribe: 1 }));
+        doUntilDone(() => this.api.send({ proposal_open_contract: 1, subscribe: 1 }));
     }
 
     getActiveSymbols = async () => {

packages/bot-skeleton/src/services/tradeEngine/trade/OpenContract.js

@@ -1,8 +1,6 @@
 import { getRoundedNumber } from '@deriv/shared';
 import { sell, openContractReceived } from './state/actions';
 import { contractStatus, contract as broadcastContract } from '../utils/broadcast';
-import { doUntilDone } from '../utils/helpers';
-import DBotStore from '../../../scratch/dbot-store';
 import { api_base } from '../../api/api-base';
 
 export default Engine =>
@@ -51,29 +49,6 @@ export default Engine =>
             });
         }
 
-        subscribeToOpenContract(contract_id = this.contractId) {
-            this.contractId = contract_id;
-            const request_object = {
-                proposal_open_contract: 1,
-                contract_id,
-                subscribe: 1,
-            };
-
-            doUntilDone(() => api_base.api.send(request_object))
-                .then(data => {
-                    const { populateConfig } = DBotStore.instance;
-                    populateConfig(data.proposal_open_contract);
-                    this.openContractId = data.proposal_open_contract.id;
-                })
-                .catch(error => {
-                    if (error.error.code !== 'AlreadySubscribed') {
-                        doUntilDone(() => api_base.api.send(request_object)).then(
-                            response => (this.openContractId = response.proposal_open_contract.id)
-                        );
-                    }
-                });
-        }
-
         setContractFlags(contract) {
             const { is_expired, is_valid_to_sell, is_sold, entry_tick } = contract;
 

packages/bot-skeleton/src/services/tradeEngine/trade/Proposal.js

@@ -55,12 +55,9 @@ export default Engine =>
         }
 
         renewProposalsOnPurchase() {
-            this.unsubscribeProposals().then(() => this.requestProposals());
-        }
-
-        clearProposals() {
             this.data.proposals = [];
             this.store.dispatch(clearProposals());
+            this.requestProposals();
         }
 
         requestProposals() {
@@ -98,11 +95,7 @@ export default Engine =>
             const subscription = api_base.api.onMessage().subscribe(response => {
                 if (response.data.msg_type === 'proposal') {
                     const { passthrough, proposal } = response.data;
-                    if (
-                        proposal &&
-                        this.data.proposals.findIndex(p => p.id === proposal.id) === -1 &&
-                        !this.data.forget_proposal_ids.includes(proposal.id)
-                    ) {
+                    if (proposal && this.data.proposals.findIndex(p => p.id === proposal.id) === -1) {
                         // Add proposals based on the ID returned by the API.
                         this.data.proposals.push({ ...proposal, ...passthrough });
                         this.checkProposalReady();
@@ -112,31 +105,6 @@ export default Engine =>
             api_base.pushSubscription(subscription);
         }
 
-        unsubscribeProposals() {
-            const { proposals } = this.data;
-            const removeForgetProposalById = forget_proposal_id =>
-                (this.data.forget_proposal_ids = this.data.forget_proposal_ids.filter(id => id !== forget_proposal_id));
-
-            this.clearProposals();
-
-            return Promise.all(
-                proposals.map(proposal => {
-                    if (!this.data.forget_proposal_ids.includes(proposal.id)) {
-                        this.data.forget_proposal_ids.push(proposal.id);
-                    }
-
-                    if (proposal.error) {
-                        removeForgetProposalById(proposal.id);
-                        return Promise.resolve();
-                    }
-
-                    return doUntilDone(() => api_base.api.forget(proposal.id)).then(() => {
-                        removeForgetProposalById(proposal.id);
-                    });
-                })
-            );
-        }
-
         checkProposalReady() {
             // Proposals are considered ready when the proposals in our memory match the ones
             // we've requested from the API, we determine this by checking the passthrough of the response.

packages/bot-skeleton/src/services/tradeEngine/trade/Purchase.js

@@ -29,7 +29,7 @@ export default Engine =>
                     buy,
                 });
 
-                this.subscribeToOpenContract(buy.contract_id);
+                this.contractId = buy.contract_id;
                 this.store.dispatch(purchaseSuccessful());
                 this.renewProposalsOnPurchase();
                 delayIndex = 0;

packages/bot-skeleton/src/services/tradeEngine/trade/index.js

@@ -71,7 +71,6 @@ export default class TradeEngine extends Balance(Purchase(Sell(OpenContract(Prop
         this.data = {
             contract: {},
             proposals: [],
-            forget_proposal_ids: [],
         };
         this.store = createStore(rootReducer, applyMiddleware(thunk));
     }

packages/bot-web-ui/src/stores/app-store.js

@@ -203,13 +203,12 @@ export default class AppStore {
         const { handleFileChange } = load_modal;
         const { toggleStrategyModal } = quick_strategy;
         const { startLoading, endLoading } = blockly_store;
-        const { populateConfig, setContractUpdateConfig } = summary_card;
+        const { setContractUpdateConfig } = summary_card;
 
         this.dbot_store = {
             is_mobile: false,
             client,
             flyout,
-            populateConfig,
             toolbar,
             save_modal,
             startLoading,

packages/bot-web-ui/src/stores/summary-card-store.js

@@ -44,7 +44,6 @@ export default class SummaryCardStore {
             getLimitOrder: action.bound,
             onBotContractEvent: action.bound,
             onChange: action.bound,
-            populateConfig: action.bound,
             populateContractUpdateConfig: action.bound,
             setContractUpdateConfig: action.bound,
             updateLimitOrder: action.bound,
@@ -141,14 +140,6 @@ export default class SummaryCardStore {
         this.validateProperty(name, this[name]);
     }
 
-    populateConfig(contract_info) {
-        this.contract_info = contract_info;
-
-        if (this.is_multiplier && contract_info.contract_id && contract_info.limit_order) {
-            this.populateContractUpdateConfig(this.contract_info);
-        }
-    }
-
     populateContractUpdateConfig(response) {
         const contract_update_config = getContractUpdateConfig(response);
 

packages/bot-web-ui/src/stores/transactions-store.js

@@ -1,5 +1,5 @@
 import { action, computed, observable, reaction, makeObservable } from 'mobx';
-import { formatDate, isEnded } from '@deriv/shared';
+import { formatDate, isEnded, isBot } from '@deriv/shared';
 import { log_types } from '@deriv/bot-skeleton';
 import { transaction_elements } from '../constants/transactions';
 import { getStoredItemsByKey, getStoredItemsByUser, setStoredItemsByKey } from '../utils/session-storage';
@@ -150,12 +150,6 @@ export default class TransactionsStore {
             }
         );
 
-        // Attempt to load cached transactions on client loginid change.
-        const disposeClientLoginIdListener = reaction(
-            () => client.loginid,
-            () => (this.elements = getStoredItemsByUser(this.TRANSACTION_CACHE, client.loginid, []))
-        );
-
         // User could've left the page mid-contract. On initial load, try
         // to recover any pending contracts so we can reflect accurate stats
         // and transactions.
@@ -166,7 +160,6 @@ export default class TransactionsStore {
 
         return () => {
             disposeTransactionElementsListener();
-            disposeClientLoginIdListener();
             disposeRecoverContracts();
         };
     }
@@ -213,13 +206,17 @@ export default class TransactionsStore {
         const { ws, core } = this.root_store;
         const positions = core.portfolio.positions;
 
-        ws.authorized.subscribeProposalOpenContract(contract_id, response => {
-            this.is_called_proposal_open_contract = true;
-            if (!response.error) {
-                const { proposal_open_contract } = response;
-                this.updateResultsCompletedContract(proposal_open_contract);
-            }
-        });
+        // TODO: the idea is to remove the POC calls completely
+        // but adding this check to prevent making POC calls only for bot as of now
+        if (!isBot()) {
+            ws.authorized.subscribeProposalOpenContract(contract_id, response => {
+                this.is_called_proposal_open_contract = true;
+                if (!response.error) {
+                    const { proposal_open_contract } = response;
+                    this.updateResultsCompletedContract(proposal_open_contract);
+                }
+            });
+        }
 
         if (!this.is_called_proposal_open_contract) {
             if (!this.elements.length) {