dev to merge , release 1.2.8

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

@@ -344,7 +344,7 @@ export type TDataEntry = TDataEntryInteger | TDataEntryBoolean | TDataEntryBinar
 export interface TDataEntryInteger {
     type: 'integer';
     key: string;
-    value: number;
+    value: number | BigNumber;
 }
 
 export interface TDataEntryBoolean {

data-service/api/transactions/parse.ts

@@ -33,6 +33,7 @@ import { factory, IFactory } from '../matcher/getOrders';
 import { getSignatureApi } from '../../sign';
 import { pipe } from 'ramda';
 
+const SCRIPT_INVOCATION_NUMBER = 16;
 
 const parseAttachment: (data: string | number) => Uint8Array = pipe(
     String,
@@ -101,7 +102,7 @@ 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:
+                    case SCRIPT_INVOCATION_NUMBER:
                         return parseInvocationTx(transaction, hash, isUTX);
                     default:
                         return transaction;
@@ -127,6 +128,11 @@ export function getAssetsHashFromTx(transaction: T_API_TX, hash = Object.create(
             hash[normalizeAssetId(transaction.order1.assetPair.amountAsset)] = true;
             hash[normalizeAssetId(transaction.order1.assetPair.priceAsset)] = true;
             break;
+        case SCRIPT_INVOCATION_NUMBER:
+            transaction.payment.forEach(payment => {
+                hash[normalizeAssetId(payment.assetId)] = true;
+            });
+            break;
     }
     return hash;
 }
@@ -264,8 +270,16 @@ export function parseExchangeOrder(factory: IFactory, order: txApi.IExchangeOrde
 
 export function parseDataTx(tx: txApi.IData, assetsHash: IHash<Asset>, isUTX: boolean): IData {
     const fee = new Money(tx.fee, assetsHash[WAVES_ID]);
-    const stringifiedData = JSON.stringify(tx.data, null, 4);
-    return { ...tx, stringifiedData, fee, isUTX };
+    const data = tx.data.map((dataItem) => {
+        if (dataItem.type === 'integer') {
+            return { ...dataItem, value: new BigNumber(dataItem.value) };
+        } else {
+            return dataItem;
+        }
+    });
+    const txWithBigNumber = { ...tx, data };
+    const stringifiedData = JSON.stringify(txWithBigNumber.data, null, 4);
+    return { ...txWithBigNumber, stringifiedData, fee, isUTX };
 }
 
 export function parseInvocationTx(tx: txApi.IScriptInvocation, assetsHash: IHash<Asset>, isUTX: boolean): IScriptInvocation {

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

@@ -1,13 +1,15 @@
 {
   "PERMISSIONS": {
     "CAN_TRANSFER_COINOMAT": [
-      "BTC",
-      "ETH",
-      "LTC",
-      "ZEC",
-      "BCH",
-      "DASH",
-      "XMR"
+      "8LQW8f7P5d5PZM7GtZEBgaqRPGSzS3DfPuiXrURJ4AJS",
+      "474jTeYx2r2Va35794tCScAXWJG9hU2HcgxzMowaZUnu",
+      "HZk1mbfuJpmxU1Fs4AX5MWLVYtctsNcg6e2C6VKqK8zk",
+      "BrjUWjndUanm5VsJkbUip8VRYy6LWJePtxya3FNv4TQa",
+      "zMFqXuoyrn5w17PFurTqxB7GsS71fp9dfk6XFwxbPCy",
+      "B3uGHFRpSUuGEDWjqB9LWWxafQj8VTvpMucEyoxzws5H",
+      "5WvPKSJXzVE2orvbkJ8wsQmmQKqTv9sGBPksV4adViw3",
+      "Ft8X1v1LTa1ABafufpaCWyVj8KkaxUWE6xBhW6sNFJck",
+      "Gtb1WRznfchDnTh37ezoDTJ4wcoKaRsKqKjJjy7nm2zU"
     ],
     "CAN_TRANSFER_TRANSACTION": true,
     "CAN_SET_ASSET_SCRIPT_TRANSACTION": true,
@@ -57,5 +59,5 @@
       ]
     }
   },
-  "SERVICE_TEMPORARILY_UNAVAILABLE": true
+  "SERVICE_TEMPORARILY_UNAVAILABLE": false
 }

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

@@ -0,0 +1,53 @@
+{
+  "PERMISSIONS": {
+    "CAN_TRANSFER_COINOMAT": [
+      "DWgwcZTMhSvnyYCoWLRUXXSH1RSkzThXLJhww9gwkqdn",
+      "BrmjyAWT5jjr3Wpsiyivyvg5vDuzoX2s93WgiexXetB3",
+      "BNdAstuFogzSyN2rY3beJbnBYwYcu7RzTHFjW88g8roK",
+      "CFg2KQfkUgUVM2jFCMC5Xh8T8zrebvPc4HjHPfAugU1S",
+      "8HT8tXwrXAYqwm8XrZ2hywWWTUAXxobHB5DakVC1y6jn",
+      "DGgBtwVoXKAKKvV2ayUpSoPzTJxt7jo9KiXMJRzTH2ET",
+      "8oPbSCKFHkXBy1hCGSg9pJkSARE7zhTQTLpc8KZwdtr7",
+      "D6N2rAqWN6ZCWnCeNFWLGqqjS6nJLeK4m19XiuhdDenr",
+      "AsuWyM9MUUsMmWkK7jS48L3ky6gA1pxx7QtEYPbfLjAJ"
+    ],
+    "CAN_TRANSFER_TRANSACTION": true,
+    "CAN_SET_ASSET_SCRIPT_TRANSACTION": true,
+    "CAN_MASS_TRANSFER_TRANSACTION": true,
+    "CAN_CREATE_ALIAS_TRANSACTION": true,
+    "CAN_ISSUE_TRANSACTION": true,
+    "CAN_REISSUE_TRANSACTION": true,
+    "CAN_SET_SCRIPT_TRANSACTION": true,
+    "CAN_LEASE_TRANSACTION": true,
+    "CAN_CANCEL_LEASE_TRANSACTION": true,
+    "CAN_BURN_TRANSACTION": true,
+    "CAN_SPONSORSHIP_TRANSACTION": true,
+    "CAN_DATA_TRANSACTION": true,
+    "CAN_CREATE_ORDER": true,
+    "CAN_CANCEL_ORDER": true,
+    "CAN_PAIRING_WITH_MOBILE": true,
+    "CAN_ANY_TRANSACTION": true
+  },
+  "NOTIFICATIONS": [],
+  "SETTINGS": {
+    "DEX": {
+      "WATCH_LIST_PAIRS": [
+        "WAVES",
+        "AsuWyM9MUUsMmWkK7jS48L3ky6gA1pxx7QtEYPbfLjAJ",
+        "D6N2rAqWN6ZCWnCeNFWLGqqjS6nJLeK4m19XiuhdDenr",
+        "DWgwcZTMhSvnyYCoWLRUXXSH1RSkzThXLJhww9gwkqdn",
+        "BrmjyAWT5jjr3Wpsiyivyvg5vDuzoX2s93WgiexXetB3",
+        "BNdAstuFogzSyN2rY3beJbnBYwYcu7RzTHFjW88g8roK",
+        "CFg2KQfkUgUVM2jFCMC5Xh8T8zrebvPc4HjHPfAugU1S",
+        "8HT8tXwrXAYqwm8XrZ2hywWWTUAXxobHB5DakVC1y6jn",
+        "7itsmgdmomeTXvZzaaxqF3346h4FhciRoWceEw9asNV3",
+        "DGgBtwVoXKAKKvV2ayUpSoPzTJxt7jo9KiXMJRzTH2ET",
+        "FvKx3cerSVYGfXKFvUgp7koNuTAcLs8DmtmwRrFVCqJv",
+        "3P8gkhcLhFQvBkDzMnWeqqwvq3qxkpTNQPs4LUQ95tKD",
+        "8oPbSCKFHkXBy1hCGSg9pJkSARE7zhTQTLpc8KZwdtr7",
+        "6KSUNALdYEd1EVTE4dTcSHzNw1dA3Q6ieokSRVuEcALV"
+      ]
+    }
+  },
+  "SERVICE_TEMPORARILY_UNAVAILABLE": false
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "waves-client",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "The official client application for the Waves platform",
   "private": true,
   "repository": {

server.ts

@@ -1,7 +1,7 @@
 import { createSecureServer } from 'http2';
 import { createServer } from 'https';
 import { route, parseArguments, stat, loadLocales } from './ts-scripts/utils';
-import { readFileSync, existsSync,mkdirSync } from 'fs';
+import { readFileSync, existsSync, mkdirSync } from 'fs';
 import { serialize, parse as parserCookie } from 'cookie';
 import { compile } from 'handlebars';
 import { parse } from 'url';
@@ -73,7 +73,7 @@ function createMyServer(port) {
     console.log('Available urls:');
     console.log(url);
     const cachePath = join(process.cwd(), '.cache-download');
-    if (!existsSync(cachePath)){
+    if (!existsSync(cachePath)) {
         mkdirSync(cachePath);
     }
     loadLocales(cachePath);
@@ -141,13 +141,20 @@ function request(req, res) {
 }
 
 function wavesClientConfig(req, res, next) {
-    if (!req.url.includes('waves-client-config')) {
+    const parsedCookie = parseCookie(req.headers.cookie);
+    const connection: string | null = parsedCookie ? parsedCookie.connection : null;
+
+    if (!req.url.includes('waves-client-config') || !connection) {
         next();
         return null;
     }
     let response_json = { error: 'oops' };
 
-    const path = join(__dirname, 'mocks/waves-client-config/master/config.json');
+    const path = join(
+        __dirname,
+        `mocks/waves-client-config/master/${connection === 'mainnet' ? '' : 'testnet.'}config.json`
+    );
+
     if (fs.existsSync(path)) {
         response_json = JSON.parse(fs.readFileSync(path, 'utf8')) || '';
     }

src/modules/app/less/app-icons.less

@@ -402,6 +402,13 @@
   background-position: center center;
 }
 
+.icon-dex-tospread-active {
+  display: inline-block;
+  background-repeat: no-repeat;
+  background-position: center center;
+  background-image: @orderbook-to-spread-icon-active;
+}
+
 .apple-store-btn,
 .google-play-btn {
   width: 135px;

src/modules/app/services/DefaultSettings.js

@@ -31,6 +31,7 @@
                     lastOpenVersion: '',
                     whatsNewList: [],
                     closedNotification: [],
+                    dontShowSpam: true,
                     withScam: false,
                     scamListUrl: WavesApp.network.scamListUrl,
                     logoutAfterMin: 5,

src/modules/app/services/User.js

@@ -2,6 +2,8 @@
 (function () {
     'use strict';
 
+    const { equals } = require('ramda');
+
     /* global
         Mousetrap
      */
@@ -11,6 +13,7 @@
         'extraFee',
         'networkError',
         'changeScript',
+        'setScamSignal',
         'scam'
     ];
 
@@ -104,6 +107,10 @@
              * @type {Signal<void>}
              */
             changeScript = new tsUtils.Signal();
+            /**
+             * @type {Signal<void>}
+             */
+            setScamSignal = new tsUtils.Signal();
             /**
              * @type {Record<string, boolean>}
              */
@@ -174,7 +181,16 @@
                     setTimeout(() => {
                         this._scriptInfoPoll = new Poll(() => this.updateScriptAccountData(), () => null, 10000);
                     }, 30000);
+
                 });
+
+            }
+
+            setScam(hash) {
+                if (!equals(hash, this.scam)) {
+                    this.scam = hash;
+                    this.setScamSignal.dispatch();
+                }
             }
 
             /**
@@ -341,7 +357,8 @@
                         hasBackup,
                         lng: i18next.language,
                         theme: themes.getDefaultTheme(),
-                        candle: 'blue'
+                        candle: 'blue',
+                        dontShowSpam: true
                     }
                 }).then(() => {
                     if (restore) {

src/modules/app/services/waves/node/content/Assets.js

@@ -3,7 +3,6 @@
     'use strict';
 
     const entities = require('@waves/data-entities');
-    const { equals } = require('ramda');
 
     /**
      * @param {BaseNodeComponent} BaseNodeComponent
@@ -21,9 +20,10 @@
             constructor() {
                 super();
                 user.onLogin().then(() => {
-
-                    if (!user.getSetting('withScam')) {
+                    if (user.getSetting('scamListUrl')) {
                         this.stopScam();
+                    } else {
+                        this.giveMyScamBack();
                     }
                 });
             }
@@ -133,9 +133,9 @@
             }
 
             stopScam() {
-                if (this._pollScam) {
-                    return null;
-                }
+                // if (this._pollScam) {
+                //     return null;
+                // }
                 /**
                  * @type {Poll}
                  * @private
@@ -158,17 +158,16 @@
                             }
                         });
                         return hash;
-                    });
+                    })
+                    .catch(() => Object.create(null));
             }
 
             /**
              * @param hash
              * @private
              */
             _setScamAssetList(hash) {
-                if (!equals(hash, user.scam)) {
-                    user.scam = hash;
-                }
+                user.setScam(hash);
             }
 
             /**

src/modules/dex/directives/dexBlock/DexBlock.js

@@ -99,7 +99,8 @@
                 block: '@',
                 hasSearch: '@',
                 canCollapse: '@',
-                analyticsText: '<'
+                analyticsText: '<',
+                isActiveScroll: '<'
             },
             templateUrl: 'modules/dex/directives/dexBlock/dexBlock.html',
             transclude: true,

src/modules/dex/directives/dexBlock/dexBlock.html

@@ -18,7 +18,11 @@
         <div ng-if="$ctrl.canCollapse"
              ng-click="$ctrl.toggleCollapse()"
              class="dex-block-top-btn"><i class="collapse"></i></div>
-        <div ng-click="$ctrl.scrollToSpread()" class="dex-block-top-btn"><i class="tospread"></i></div>
+        <div ng-click="$ctrl.scrollToSpread()"
+             ng-class="{'active': $ctrl.isActiveScroll}"
+             class="dex-block-top-btn">
+            <i class="tospread"></i>
+        </div>
     </div>
     <div ng-if="!$ctrl.collapsed" class="dex-block-content" ng-transclude></div>
 </div>

src/modules/dex/directives/dexBlock/dexBlock.less

@@ -59,6 +59,14 @@ w-dex-block {
       i.tospread:hover {
         background-color: @color-basic-100;
       }
+
+      &.active {
+        cursor: default;
+        i.tospread {
+          background: @color-submit-400;
+          .icon-dex-tospread-active();
+        }
+      }
     }
 
     .dex-block-content {

src/modules/dex/directives/orderBook/OrderBook.js

@@ -107,6 +107,11 @@
                  * @private
                  */
                 this._dom = null;
+                /**
+                 * @type {boolean}
+                 * @public
+                 */
+                this.isScrolled = false;
 
                 this.receive(dexDataService.showSpread, () => {
                     this._dom.$box.stop().animate({ scrollTop: this._getSpreadScrollPosition() }, 300);
@@ -176,6 +181,11 @@
                     $lastPrice: { get: () => this._dom.$info.find(SECTIONS.LAST_PRICE) },
                     $spread: { get: () => this._dom.$info.find(SECTIONS.SPREAD) }
                 });
+                this._dom.$box.on('scroll', () => {
+                    const scrollPos = this._dom.$box[0].scrollTop;
+                    const spreadPos = this._getSpreadScrollPosition();
+                    this.isScrolled = Math.abs(scrollPos - spreadPos) >= 2;
+                });
             }
 
             nothingFound() {
@@ -470,6 +480,9 @@
 
     angular.module('app.dex').component('wDexOrderBook', {
         templateUrl: 'modules/dex/directives/orderBook/orderBook.html',
+        bindings: {
+            isScrolled: '='
+        },
         controller
     });
 })();