Bump ini from 1.3.5 to 1.3.7

configs/mainnet.json

@@ -26,6 +26,14 @@
   "origin": "https://client.wavesplatform.com",
   "featuresConfigUrl": "https://raw.githubusercontent.com/wavesplatform/waves-client-config/master/config.json",
   "feeConfigUrl": "https://raw.githubusercontent.com/wavesplatform/waves-client-config/master/fee.json",
+  "migration": {
+    "webUrl": "https://waves.exchange/migration",
+    "desktopUrl": "http://localhost:8888/connect",
+    "desktopPort": 8888,
+    "origins": [
+      "https://waves.exchange"
+    ]
+  },
   "WESTNetworkByte": "V",
   "tokenrating": "https://tokenrating.wavesexplorer.com",
   "assets": {
@@ -60,5 +68,6 @@
     { "ticker": "DASH", "id": "B3uGHFRpSUuGEDWjqB9LWWxafQj8VTvpMucEyoxzws5H"},
     { "ticker": "Monero", "id": "5WvPKSJXzVE2orvbkJ8wsQmmQKqTv9sGBPksV4adViw3"},
     { "ticker": "ZEC", "id": "BrjUWjndUanm5VsJkbUip8VRYy6LWJePtxya3FNv4TQa"}
-  ]
+  ],
+  "wavesExchangeLink": "https://waves.exchange"
 }

configs/stagenet.json

@@ -26,6 +26,11 @@
   "origin": "https://testnet.wavesplatform.com",
   "featuresConfigUrl": "https://raw.githubusercontent.com/wavesplatform/waves-client-config/master/testnet.config.json",
   "feeConfigUrl": "https://raw.githubusercontent.com/wavesplatform/waves-client-config/master/fee.json",
+  "migration": {
+    "webUrl": "https://localhost:8080/migration",
+    "desktopUrl": "https://localhost:8888/connect",
+    "desktopPort": 8888
+  },
   "WESTNetworkByte": "S",
   "tokenrating": "https://dev.voting.wavesplatform.com",
   "assets": {
@@ -53,5 +58,6 @@
     { "ticker": "USD", "id": "HETgTyfn5grcHWGRKHi7p3hvMB4QxWVrPD8Fnfi9tfD9"},
     { "ticker": "EUR", "id": "EqZfxiqYKkByP42hqNsvuPdXxVYMHaQDwfKgFnAz5D1x"},
     { "ticker": "CNY", "id": "8CfhN5MmaiAW1kCG5tDXasVTSafJP8cf6TZqbPRkNGxQ"}
-  ]
+  ],
+  "wavesExchangeLink": "https://waves.exchange"
 }

configs/testnet.json

@@ -26,6 +26,11 @@
   "origin": "https://testnet.wavesplatform.com",
   "featuresConfigUrl": "https://raw.githubusercontent.com/wavesplatform/waves-client-config/master/testnet.config.json",
   "feeConfigUrl": "https://raw.githubusercontent.com/wavesplatform/waves-client-config/master/fee.json",
+  "migration": {
+    "webUrl": "https://localhost:8080/migration",
+    "desktopUrl": "https://localhost:8888/connect",
+    "desktopPort": 8888
+  },
   "WESTNetworkByte": "F",
   "tokenrating": "https://dev.voting.wavesplatform.com",
   "assets": {
@@ -53,5 +58,6 @@
     { "ticker": "USD", "id": "HyFJ3rrq5m7FxdkWtQXkZrDat1F7LjVVGfpSkUuEXQHj"},
     { "ticker": "EUR", "id": "2xnE3EdpqXtFgCP156qt1AbyjpqdZ5jGjWo3CwTawcux"},
     { "ticker": "CNY", "id": "6pmDivReTLikwYqQtJTv6dTcE59knriaodB3AK8T9cF8"}
-  ]
+  ],
+  "wavesExchangeLink": "https://waves.exchange"
 }

data-service/api/assets/assets.ts

@@ -69,17 +69,17 @@ export function getAssetFromNode(assetId: string): Promise<Asset> {
         return Promise.resolve(wavesAsset);
     }
 
-    return request<INodeAssetData>({ url: `${configGet('node')}/assets/details/${assetId}` })
+    return request<INodeAssetInfo>({ url: `${configGet('node')}/assets/details/${assetId}` })
         .then((data) => new Asset({
             id: data.assetId,
             name: data.name,
             description: data.description,
             height: data.issueHeight,
             precision: data.decimals,
             quantity: data.quantity,
-            hasScript: !!data.script,
+            hasScript: data.scripted,
             reissuable: data.reissuable,
-            minSponsoredFee: data.minSponsoredFee,
+            minSponsoredFee: data.minSponsoredAssetFee,
             sender: data.issuer,
             timestamp: new Date(data.issueTimestamp)
         }));
@@ -265,3 +265,17 @@ export interface INodeAssetData {
     reissuable: boolean;
     script: string | null;
 }
+
+export interface INodeAssetInfo {
+    assetId: string;
+    issueHeight: number;
+    issueTimestamp: number;
+    issuer: string;
+    name: string;
+    description: string;
+    decimals: number;
+    reissuable: boolean;
+    quantity: number;
+    scripted: boolean;
+    minSponsoredAssetFee: number | string;
+}

data-service/connect/ConnectProvider.ts

@@ -0,0 +1,5 @@
+export interface ConnectProvider {
+    send<T>(data: string, options: Record<string, unknown>): Promise<T>;
+    listen(cb: Function): Promise<void>;
+    destroy(): void
+}

data-service/connect/HttpConnectProvider.ts

@@ -0,0 +1,72 @@
+import { IncomingHttpHeaders, Server } from 'http';
+import { request } from '../utils/request';
+import { delay } from '../utils/utils';
+import { ConnectProvider } from './ConnectProvider';
+
+interface HttpConnectProviderOptions {
+    port: number;
+    url: string;
+    ttl?: number;
+}
+
+interface SendOptions {
+    timeout?: number;
+    attempts?: number;
+}
+
+type SimpleConnectCallback = (data: any, url: URL, headers: IncomingHttpHeaders) => Promise<any>;
+
+export class HttpConnectProvider implements ConnectProvider {
+    private active = true;
+    private server: Server;
+
+    constructor(private options: HttpConnectProviderOptions) {}
+
+    public async send<T>(data: string, options: SendOptions = {}): Promise<T> {
+        this.checkActive();
+
+        const { timeout = 1000, attempts = 1 } = options;
+
+        for (let i = attempts; i > 0; i--) {
+            try {
+                const res = await request<T>({
+                    url: this.options.url,
+                    fetchOptions: {
+                        method: 'POST',
+                        body: data
+                    }
+                });
+
+                return res;
+            } catch (e) {
+                await delay(timeout);
+            }
+        }
+
+        throw new Error('Could not connect');
+    }
+
+    public async listen(cb: SimpleConnectCallback): Promise<void> {
+        this.checkActive();
+        this.server = (window as any).SimpleConnect.listen(this.options.port, cb);
+
+        if (this.options.ttl) {
+            await delay(this.options.ttl);
+            this.server.close();
+        }
+    }
+
+    public destroy(): void {
+        this.active = false;
+
+        if (this.server) {
+            this.server.close();
+        }
+    }
+
+    private checkActive(): void {
+        if (!this.active) {
+            throw new Error('Provider was destroyed');
+        }
+    }
+}

data-service/connect/PostMessageConnectProvider.ts

@@ -0,0 +1,77 @@
+import { Bus, WindowAdapter, WindowProtocol, IOneArgFunction } from '@waves/waves-browser-bus';
+import { delay } from '../utils/utils';
+import { ConnectProvider } from './ConnectProvider';
+
+interface PostMessageConnectProviderOptioins {
+    win?: Window;
+    mode?: 'export' | 'import';
+    origins?: string[];
+}
+
+interface SendOptions {
+    event?: string;
+    timeout?: number;
+    attempts?: number;
+    mode?: 'listen' | 'dispatch'
+}
+
+export class PostMessageConnectProvider implements ConnectProvider {
+    private adapter: WindowAdapter;
+    private bus: Bus;
+    private active: boolean;
+
+    constructor(options: PostMessageConnectProviderOptioins = {}) {
+        this.adapter = new WindowAdapter(
+            [new WindowProtocol(window, WindowProtocol.PROTOCOL_TYPES.LISTEN)],
+            [new WindowProtocol(options.win, WindowProtocol.PROTOCOL_TYPES.DISPATCH)],
+            { origins: options.origins }
+        );
+        this.bus = new Bus(this.adapter);
+        this.active = true;
+    }
+
+    public async send<T>(data: string, options: SendOptions = {}): Promise<T> {
+        this.checkActive();
+
+        const { timeout = 5000, attempts = 1 } = options;
+
+        for (let i = attempts; i > 0; i--) {
+            try {
+                const res = await this.bus.request<string>(
+                    options.event,
+                    data,
+                    options.timeout
+                );
+
+                return JSON.parse(res) as T;
+            } catch (e) {
+                await delay(timeout);
+            }
+        }
+
+        throw new Error('Could not connect');
+    }
+
+    public async listen<T, R>(cb: IOneArgFunction<T, R>): Promise<void> {
+        this.checkActive();
+
+        this.bus.registerRequestHandler('data', (data) => {
+            return cb(JSON.parse(data));
+        });
+    }
+
+    public destroy(): void {
+        try {
+            this.bus.destroy();
+        } catch (e) {
+
+        }
+        this.active = false;
+    }
+
+    private checkActive(): void {
+        if (!this.active) {
+            throw new Error('Provider was destroyed');
+        }
+    }
+}

data-service/index.ts

@@ -3,6 +3,7 @@ import { DataManager } from './classes/DataManager';
 import * as configApi from './config';
 import * as sign from './sign';
 import * as utilsModule from './utils/utils';
+import { downloadFile, abortDownloading } from './utils/DownloadFile';
 import { request } from './utils/request';
 import { IFetchOptions } from './utils/request';
 import * as wavesDataEntitiesModule from '@waves/data-entities';
@@ -17,6 +18,8 @@ import * as signatureAdapters from '@waves/signature-adapter';
 import { SIGN_TYPE, isValidAddress as utilsIsValidAddress } from '@waves/signature-adapter';
 import { TTimeType } from './utils/utils';
 import { IUserData } from './sign';
+import { HttpConnectProvider } from './connect/HttpConnectProvider';
+import { PostMessageConnectProvider } from './connect/PostMessageConnectProvider';
 
 export { getAdapterByType, getAvailableList } from '@waves/signature-adapter';
 export { Seed } from './classes/Seed';
@@ -29,10 +32,14 @@ export const wavesDataEntities = {
 export const api = { ...apiMethods };
 export const dataManager = new DataManager();
 export const config = { ...configApi };
-export const utils = { ...utilsModule };
+export const utils = { ...utilsModule, downloadFile, abortDownloading };
 export const signature = {
     ...sign
 };
+export const connect = {
+    HttpConnectProvider,
+    PostMessageConnectProvider
+};
 
 export const signAdapters = signatureAdapters;
 export const isValidAddress = utilsIsValidAddress;