Client 1854 release 1.2.6

data-service/api/transactions/interface.d.ts

@@ -17,7 +17,8 @@ export type T_API_TX =
     txApi.IData |
     txApi.ISponsorship |
     txApi.ISetScript |
-    txApi.ISetAssetScript;
+    txApi.ISetAssetScript |
+    tx.Api.IScriptInvocation;
 
 export type T_TX =
     IIssue |
@@ -158,6 +159,14 @@ export module txApi {
         script: string;
     }
 
+    export interface IScriptInvocation extends IBaseTransaction {
+        type: 16;
+        version?: number;
+        call?: ICall;
+        dApp: string;
+        payment?: Array<{ amount: number; assetId: string; }>;
+    }
+
     export interface IExchangeOrder {
         amount: string;
         assetPair: IAssetPair;
@@ -318,6 +327,18 @@ export interface IExchangeOrder {
     timestamp: number;
 }
 
+export interface IScriptInvocation extends IBaseTransaction {
+    version?: number;
+    call?: ICall;
+    dApp: string;
+    payment?: Array<Money>;
+}
+
+export interface ICall {
+    args: Array<TCallArgs>;
+    function: string;
+}
+
 export type TDataEntry = TDataEntryInteger | TDataEntryBoolean | TDataEntryBinary | TDataEntryString;
 
 export interface TDataEntryInteger {
@@ -343,3 +364,25 @@ export interface TDataEntryString {
     key: string;
     value: string;
 }
+
+export type TCallArgs = TCallArgsInteger | TCallArgsBoolean | TCallArgsBinary | TCallArgsString;
+
+export interface TCallArgsInteger {
+    type: 'integer';
+    value: number;
+}
+
+export interface TCallArgsBoolean {
+    type: 'boolean';
+    value: boolean;
+}
+
+export interface TCallArgsBinary {
+    type: 'binary';
+    value: string; // base64
+}
+
+export interface TCallArgsString {
+    type: 'string';
+    value: string;
+}

data-service/api/transactions/parse.ts

@@ -15,6 +15,7 @@ import {
     ISetScript,
     ISponsorship,
     ISetAssetScript,
+    IScriptInvocation,
     ITransfer,
     T_API_TX,
     T_TX,
@@ -100,6 +101,8 @@ export function parseTx(transactions: Array<T_API_TX>, isUTX: boolean, isTokens?
                         return parseScriptTx(transaction, hash, isUTX);
                     case TRANSACTION_TYPE_NUMBER.SET_ASSET_SCRIPT:
                         return parseAssetScript(transaction, hash, isUTX);
+                    case 16:
+                        return parseInvocationTx(transaction, hash, isUTX);
                     default:
                         return transaction;
                 }
@@ -265,6 +268,12 @@ export function parseDataTx(tx: txApi.IData, assetsHash: IHash<Asset>, isUTX: bo
     return { ...tx, stringifiedData, fee, isUTX };
 }
 
+export function parseInvocationTx(tx: txApi.IScriptInvocation, assetsHash: IHash<Asset>, isUTX: boolean): IScriptInvocation {
+    const fee = new Money(tx.fee, assetsHash[WAVES_ID]);
+    const payment = tx.payment.map(payment => new Money(payment.amount, assetsHash[normalizeAssetId(payment.assetId)]));
+    return { ...tx, fee, payment, isUTX };
+}
+
 function parseSponsorshipTx(tx: txApi.ISponsorship, assetsHash: IHash<Asset>, isUTX: boolean): ISponsorship {
     const minSponsoredAssetFee = new Money(tx.minSponsoredAssetFee || 0, assetsHash[tx.assetId]);
     const fee = new Money(tx.fee, assetsHash[WAVES_ID]);

data-service/api/transactions/transactions.ts

@@ -22,13 +22,13 @@ import { pipe, prop, uniqBy, tap } from 'ramda';
 import { ExchangeTxFilters } from '@waves/data-service-client-js';
 
 
-export function list(address: string, limit = 100): Promise<Array<T_TX>> {
-    return request({ url: `${configGet('node')}/transactions/address/${address}/limit/${limit}` })
-        .then(pipe(
-            prop('0'),
-            uniqBy(prop('id')) as any,
-        ))
-        .then(transactions => parseTx(transactions as any, false));
+export function list(address: string, limit = 100, after: string): Promise<Array<T_TX>> {
+    return request({
+        url: `${configGet('node')}/transactions/address/${address}/limit/${limit}${after ? `?after=${after}` : ''}`
+    }).then(pipe(
+        prop('0'),
+        uniqBy(prop('id')) as any,
+    )).then(transactions => parseTx(transactions as any, false));
 }
 
 export function getExchangeTxList(options: ExchangeTxFilters = Object.create(null)): Promise<Array<IExchange>> {

data-service/broadcast/broadcast.ts

@@ -1,7 +1,8 @@
 import { request } from '../utils/request';
 import { parse } from '../api/matcher/getOrders';
 import { get } from '../config';
-import { stringifyJSON } from "../utils/utils";
+import { addOrderToStore, removeOrderFromStore } from '../store';
+import { stringifyJSON } from '../utils/utils';
 
 
 export function broadcast(data) {
@@ -38,6 +39,7 @@ export function createOrderSend(txData) {
                 filled: 0
             }]);
         })
+        .then(addOrderToStore);
 }
 
 export function cancelOrderSend(txData, amountId, priceId, type: 'cancel' | 'delete' = 'cancel') {
@@ -52,6 +54,7 @@ export function cancelOrderSend(txData, amountId, priceId, type: 'cancel' | 'del
             body: stringifyJSON(txData)
         }
     }).then((data) => {
+        removeOrderFromStore({ id: txData.orderId });
         return data;
     });
 }

data-service/classes/DataManager.ts

@@ -60,11 +60,10 @@ export class DataManager {
         return this.pollControl.getPollHash().aliases.lastData || [];
     }
 
-    public getOracleAssetData(id: string): TProviderAsset & { provider: string } {
+    public getOracleAssetDataByOracleName(id: string, oracleName: string = 'oracleWaves'): TProviderAsset & { provider: string } {
         let pollHash = this.pollControl.getPollHash();
-        const lastData = <any>path(['oracle', 'lastData'], pollHash);
+        const lastData = <any>path([oracleName, 'lastData'], pollHash);
         const assets = lastData && lastData.assets || Object.create(null);
-
         const WavesApp = (window as any).WavesApp;
 
         const gateways = {
@@ -108,8 +107,14 @@ export class DataManager {
         return assets[id] ? { ...assets[id], provider: lastData.oracle.name } : null;
     }
 
-    public getOracleData() {
-        return this.pollControl.getPollHash().oracle.lastData;
+    public getOraclesAssetData (id: string) {
+        const dataOracleWaves = this.getOracleAssetDataByOracleName(id, 'oracleWaves');
+        const dataOracleTokenomica = this.getOracleAssetDataByOracleName(id, 'oracleTokenomica');
+        return dataOracleWaves || dataOracleTokenomica;
+    }
+
+    public getOracleData(oracleName: string) {
+        return this.pollControl.getPollHash()[oracleName].lastData;
     }
 
     private _getPollBalanceApi(): IPollAPI<Array<IBalanceItem>> {
@@ -135,10 +140,9 @@ export class DataManager {
         };
     }
 
-    private _getPollOracleApi(): IPollAPI<IOracleData> {
+    private _getPollOracleApi(address: string): IPollAPI<IOracleData> {
         return {
             get: () => {
-                const address = get('oracleAddress');
                 return address ? getOracleData(address) : Promise.resolve({ assets: Object.create(null) }) as any;
             },
             set: () => null
@@ -149,15 +153,16 @@ export class DataManager {
         const balance = new Poll(this._getPollBalanceApi(), 1000);
         const orders = new Poll(this._getPollOrdersApi(), 1000);
         const aliases = new Poll(this._getPollAliasesApi(), 10000);
-        const oracle = new Poll(this._getPollOracleApi(), 30000);
+        const oracleWaves = new Poll(this._getPollOracleApi(get('oracleWaves')), 30000);
+        const oracleTokenomica = new Poll(this._getPollOracleApi(get('oracleTokenomica')), 30000);
 
         change.on((key) => {
-            if (key === 'oracleAddress') {
-                oracle.restart();
+            if (key === 'oracleWaves') {
+                oracleWaves.restart();
             }
         });
 
-        return { balance, orders, aliases, oracle };
+        return { balance, orders, aliases, oracleWaves, oracleTokenomica };
     }
 
 }
@@ -166,7 +171,8 @@ type TPollHash = {
     balance: Poll<Array<IBalanceItem>>;
     orders: Poll<IHash<Money>>;
     aliases: Poll<Array<string>>;
-    oracle: Poll<IOracleData>
+    oracleWaves: Poll<IOracleData>
+    oracleTokenomica: Poll<IOracleData>
 }
 
 export interface IOracleAsset {

data-service/config.ts

@@ -69,5 +69,7 @@ export interface IConfigParams {
     assets: IHash<string>;
     minimalSeedLength: number;
     remappedAssetNames: IHash<string>;
-    oracleAddress: string;
+    // oracleAddress: string;
+    oracleWaves: string;
+    oracleTokenomica: string;
 }

data-service/index.ts

@@ -21,6 +21,8 @@ import { TTimeType } from './utils/utils';
 export { getAdapterByType, getAvailableList } from '@waves/signature-adapter';
 export { Seed } from './classes/Seed';
 export { assetStorage } from './utils/AssetStorage';
+export * from './store';
+
 export const wavesDataEntities = {
     ...wavesDataEntitiesModule
 };

data-service/store.ts

@@ -0,0 +1,66 @@
+import { toArray } from './utils/utils';
+import { IOrder } from './api/matcher/interface';
+import { pipe, concat, eqProps, uniqBy, prop, differenceWith, tap } from 'ramda';
+
+export type TStore<T> = Array<IStoreContainerItem<T>>;
+
+const ordersStore: Array<IStoreContainerItem<IOrder>> = [];
+const toRemoveOrders: Array<IStoreContainerItem<IOrder>> = [];
+
+function createAddStore<T>(container: TStore<T>, timeout: number) {
+    return (item: T | Array<T>) => {
+        toArray(item).forEach((item) => {
+            const storeItem = {
+                data: item,
+                expiration: window.setTimeout(() => {
+                    container.splice(container.indexOf(storeItem), 1);
+                }, timeout)
+            };
+            container.push(storeItem);
+        });
+        return item;
+    };
+}
+
+function removeFromStoreById<T>(container: TStore<T>, idKey: keyof T, item: Partial<T>) {
+    const id = item[idKey];
+    for (let i = container.length - 1; i >= 0; i--) {
+        if (container[i].data[idKey] === id) {
+            window.clearTimeout(container[i].expiration);
+            container.splice(i, 1);
+            break;
+        }
+    }
+}
+
+function createClearStore<T>(addContainer: TStore<T>, addRemoveF: IRemoveOrderFunc<Partial<T>>, idKey: keyof T) {
+    return (item: Partial<T> | Array<Partial<T>>) => {
+        toArray(item).forEach((item) => {
+            removeFromStoreById(addContainer, idKey, item);
+        });
+        addRemoveF(item);
+        return item;
+    };
+}
+
+function createProcessStore<T>(toAddContainer: TStore<T>, toRemoveContainer: TStore<T>, idKey: string): (list: Array<T>) => Array<T> {
+    return pipe(
+        list => concat(toAddContainer.map(prop('data')), list),
+        list => differenceWith(eqProps(idKey), list, toRemoveContainer.map(prop('data'))) as any,
+        uniqBy(prop(idKey) as any)
+    );
+}
+
+const addToRemoveStore = createAddStore(toRemoveOrders, 3000);
+export const addOrderToStore = createAddStore(ordersStore, 3000);
+export const removeOrderFromStore = createClearStore(ordersStore, addToRemoveStore, 'id');
+export const processOrdersWithStore = createProcessStore(ordersStore, toRemoveOrders, 'id');
+
+export interface IStoreContainerItem<T> {
+    data: T;
+    expiration: number;
+}
+
+interface IRemoveOrderFunc<T> {
+    (item: T | Array<T>): T | Array<T>;
+}

gulpfile.ts

@@ -12,7 +12,7 @@ import {
     getScripts,
     getStyles,
     getInitScript,
-    getLocales
+    loadLocales
 } from './ts-scripts/utils';
 import { basename, extname, join, sep } from 'path';
 import {
@@ -292,7 +292,7 @@ task('concat-develop-vendors', function () {
 
 task('downloadLocales', ['concat-develop-sources'], function (done) {
     const dist = join(__dirname, 'dist');
-    getLocales(dist).then(() => done());
+    loadLocales(dist).then(() => done());
 });
 
 task('clean', function () {
@@ -431,7 +431,7 @@ task('electron-debug', function (done) {
         .then(excludeTypeScrip)
         .then(list => Promise.all(list.map(copyItem)))
         .then(makePackageJSON)
-        .then(() => getLocales(root))
+        .then(() => loadLocales(root))
         .then(() => renameLocaleDirectory())
         .then(copyNodeModules)
         .then(copyI18next)

mocks/waves-client-config/master/config.json

@@ -24,7 +24,8 @@
     "CAN_CREATE_ORDER": true,
     "CAN_CANCEL_ORDER": true,
     "CAN_PAIRING_WITH_MOBILE": true,
-    "CAN_ANY_TRANSACTION": true
+    "CAN_ANY_TRANSACTION": true,
+    "CAN_SET_ASSET_SCRIPT": true
   },
   "NOTIFICATIONS": [
     {