From 3fbace3bc8e9e42e00e21e8a72414fe3943708b2 Mon Sep 17 00:00:00 2001 From: mirotincev Date: Thu, 25 Jul 2019 16:32:44 +0300 Subject: [PATCH 001/141] add deex gateway --- app/api/apiConfig.js | 5 +++++ app/branding.js | 3 ++- app/components/Modal/DepositModal.jsx | 24 ++++++++++++++++++++---- app/lib/common/gatewayUtils.js | 4 ++++ app/lib/common/gateways.js | 16 +++++++++++++++- 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 78763eca36..5c92a8250c 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -62,6 +62,11 @@ export const gdex2APIs = { TRADING_PAIRS: "/trading-pairs" }; +export const deexAPIs = { + BASE: "https://deex.exchange/gateway", + COINS_LIST: "/pay/get_coins" +}; + // Legacy Deposit/Withdraw export const gdexAPIs = { BASE: "https://api.gdex.io", diff --git a/app/branding.js b/app/branding.js index 3da8cd4974..8e5391ac46 100644 --- a/app/branding.js +++ b/app/branding.js @@ -377,7 +377,8 @@ export function allowedGateway(gateway) { "GDEX", "XBTSX", "SPARKDEX", - "CITADEL" + "CITADEL", + "DEEX" ].indexOf(gateway) >= 0 ); } diff --git a/app/components/Modal/DepositModal.jsx b/app/components/Modal/DepositModal.jsx index 6e0024a9b4..f9b520d060 100644 --- a/app/components/Modal/DepositModal.jsx +++ b/app/components/Modal/DepositModal.jsx @@ -69,6 +69,8 @@ class DepositModalContent extends DecimalChecker { } ); + console.log("selectedAsset", selectedAsset); + if (selectedGateway) { this._getDepositAddress(selectedAsset, selectedGateway); } @@ -86,19 +88,21 @@ class DepositModalContent extends DecimalChecker { } _setDepositAsset(asset) { + console.log("asset", asset); // DEEX let coinToGatewayMapping = _getCoinToGatewayMapping.call(this); this.setState({coinToGatewayMapping}); if (!asset) return; - let backedAsset = asset.split("."); + let backedAsset = asset.split("."); // [DEEX] + // this.state.gatewayStatus = {DEEX:{}} let usingGateway = this.state.gatewayStatus[backedAsset[0]] ? true - : false; + : false; // true if (usingGateway) { - let assetName = backedAsset[1]; - let assetGateway = backedAsset[0]; + let assetName = backedAsset[1] || asset; // undefined + let assetGateway = backedAsset[0]; // deex this._getDepositAddress(assetName, assetGateway); } else { this.setState({selectedAsset: "BTS"}); @@ -123,6 +127,11 @@ class DepositModalContent extends DecimalChecker { } _getDepositAddress(selectedAsset, selectedGateway) { + console.log( + "selectedAsset, selectedGateway", + selectedAsset, + selectedGateway + ); let {account} = this.props; let {gatewayStatus} = this.state; @@ -133,10 +142,17 @@ class DepositModalContent extends DecimalChecker { }); // Get Backing Asset for Gateway + console.log( + "this.props.backedCoins", + this.props.backedCoins.toJS(), + selectedGateway.toUpperCase() + ); let backingAsset = this.props.backedCoins .get(selectedGateway.toUpperCase(), []) .find(c => { + console.log("c", c); let backingCoin = c.backingCoinType || c.backingCoin; + console.log("backingCoin", backingCoin); if (backingCoin.toUpperCase().indexOf("EOS.") !== -1) { backingCoin = backingCoin.split(".")[1]; diff --git a/app/lib/common/gatewayUtils.js b/app/lib/common/gatewayUtils.js index d1c6f726eb..7ccbd86df7 100644 --- a/app/lib/common/gatewayUtils.js +++ b/app/lib/common/gatewayUtils.js @@ -102,6 +102,10 @@ export function updateGatewayBackers(chain = "4018d784") { // Walk all Gateways for (let gateway in availableGateways) { + console.log( + "availableGateways[gateway]", + availableGateways[gateway] + ); if (!!availableGateways[gateway].isEnabled) { if (!!availableGateways[gateway].isSimple) { GatewayActions.fetchCoinsSimple.defer({ diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index cc1978c31c..f622b1adc2 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -11,7 +11,8 @@ import { cryptoBridgeAPIs, gdex2APIs, xbtsxAPIs, - citadelAPIs + citadelAPIs, + deexAPIs } from "api/apiConfig"; import {allowedGateway} from "branding"; @@ -103,6 +104,19 @@ export const availableGateways = { enabled: false, selected: false } + }, + DEEX: { + id: "DEEX", + name: "DEEX", + baseAPI: deexAPIs, + isSimple: true, + simpleAssetGateway: true, + fixedMemo: {prepend: "dex:", append: ""}, + isEnabled: allowedGateway("DEEX"), + options: { + enabled: false, + selected: false + } } }; From 4901ef633f04a4833cedd0cd2fcad8bbc51694d0 Mon Sep 17 00:00:00 2001 From: mirotincev Date: Fri, 26 Jul 2019 13:59:12 +0300 Subject: [PATCH 002/141] change config --- app/api/apiConfig.js | 2 +- app/lib/common/gateways.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 5c92a8250c..6c533cffd9 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -63,7 +63,7 @@ export const gdex2APIs = { }; export const deexAPIs = { - BASE: "https://deex.exchange/gateway", + BASE: "http://192.168.40.64/gateway", COINS_LIST: "/pay/get_coins" }; diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index f622b1adc2..8a7388a925 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -113,6 +113,7 @@ export const availableGateways = { simpleAssetGateway: true, fixedMemo: {prepend: "dex:", append: ""}, isEnabled: allowedGateway("DEEX"), + addressValidatorMethod: "POST", options: { enabled: false, selected: false From d0a3985836849aa90f2b6cee16620d31fbcdd2a4 Mon Sep 17 00:00:00 2001 From: mirotincev Date: Fri, 26 Jul 2019 14:03:41 +0300 Subject: [PATCH 003/141] delete debug --- app/components/Modal/DepositModal.jsx | 24 ++++-------------------- app/lib/common/gatewayUtils.js | 4 ---- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/app/components/Modal/DepositModal.jsx b/app/components/Modal/DepositModal.jsx index f9b520d060..2a1779fe7f 100644 --- a/app/components/Modal/DepositModal.jsx +++ b/app/components/Modal/DepositModal.jsx @@ -69,8 +69,6 @@ class DepositModalContent extends DecimalChecker { } ); - console.log("selectedAsset", selectedAsset); - if (selectedGateway) { this._getDepositAddress(selectedAsset, selectedGateway); } @@ -88,21 +86,19 @@ class DepositModalContent extends DecimalChecker { } _setDepositAsset(asset) { - console.log("asset", asset); // DEEX let coinToGatewayMapping = _getCoinToGatewayMapping.call(this); this.setState({coinToGatewayMapping}); if (!asset) return; - let backedAsset = asset.split("."); // [DEEX] - // this.state.gatewayStatus = {DEEX:{}} + let backedAsset = asset.split("."); let usingGateway = this.state.gatewayStatus[backedAsset[0]] ? true - : false; // true + : false; if (usingGateway) { - let assetName = backedAsset[1] || asset; // undefined - let assetGateway = backedAsset[0]; // deex + let assetName = backedAsset[1] || asset; + let assetGateway = backedAsset[0]; this._getDepositAddress(assetName, assetGateway); } else { this.setState({selectedAsset: "BTS"}); @@ -127,11 +123,6 @@ class DepositModalContent extends DecimalChecker { } _getDepositAddress(selectedAsset, selectedGateway) { - console.log( - "selectedAsset, selectedGateway", - selectedAsset, - selectedGateway - ); let {account} = this.props; let {gatewayStatus} = this.state; @@ -142,17 +133,10 @@ class DepositModalContent extends DecimalChecker { }); // Get Backing Asset for Gateway - console.log( - "this.props.backedCoins", - this.props.backedCoins.toJS(), - selectedGateway.toUpperCase() - ); let backingAsset = this.props.backedCoins .get(selectedGateway.toUpperCase(), []) .find(c => { - console.log("c", c); let backingCoin = c.backingCoinType || c.backingCoin; - console.log("backingCoin", backingCoin); if (backingCoin.toUpperCase().indexOf("EOS.") !== -1) { backingCoin = backingCoin.split(".")[1]; diff --git a/app/lib/common/gatewayUtils.js b/app/lib/common/gatewayUtils.js index 7ccbd86df7..d1c6f726eb 100644 --- a/app/lib/common/gatewayUtils.js +++ b/app/lib/common/gatewayUtils.js @@ -102,10 +102,6 @@ export function updateGatewayBackers(chain = "4018d784") { // Walk all Gateways for (let gateway in availableGateways) { - console.log( - "availableGateways[gateway]", - availableGateways[gateway] - ); if (!!availableGateways[gateway].isEnabled) { if (!!availableGateways[gateway].isSimple) { GatewayActions.fetchCoinsSimple.defer({ From 5e54123bef1b20ff226fd6c017b0050bcf1505e4 Mon Sep 17 00:00:00 2001 From: mirotincev Date: Fri, 26 Jul 2019 16:38:00 +0300 Subject: [PATCH 004/141] change option gateway --- app/lib/common/gateways.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index 8a7388a925..19a6ce55c9 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -110,7 +110,7 @@ export const availableGateways = { name: "DEEX", baseAPI: deexAPIs, isSimple: true, - simpleAssetGateway: true, + simpleAssetGateway: false, fixedMemo: {prepend: "dex:", append: ""}, isEnabled: allowedGateway("DEEX"), addressValidatorMethod: "POST", From 65bdd39997449e8e952a155790a342d7c92795cc Mon Sep 17 00:00:00 2001 From: mirotincev Date: Fri, 26 Jul 2019 13:59:12 +0300 Subject: [PATCH 005/141] change config delete debug change option gateway --- app/api/apiConfig.js | 2 +- app/components/Modal/DepositModal.jsx | 24 ++++-------------------- app/lib/common/gatewayUtils.js | 4 ---- app/lib/common/gateways.js | 3 ++- 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 5c92a8250c..6c533cffd9 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -63,7 +63,7 @@ export const gdex2APIs = { }; export const deexAPIs = { - BASE: "https://deex.exchange/gateway", + BASE: "http://192.168.40.64/gateway", COINS_LIST: "/pay/get_coins" }; diff --git a/app/components/Modal/DepositModal.jsx b/app/components/Modal/DepositModal.jsx index f9b520d060..2a1779fe7f 100644 --- a/app/components/Modal/DepositModal.jsx +++ b/app/components/Modal/DepositModal.jsx @@ -69,8 +69,6 @@ class DepositModalContent extends DecimalChecker { } ); - console.log("selectedAsset", selectedAsset); - if (selectedGateway) { this._getDepositAddress(selectedAsset, selectedGateway); } @@ -88,21 +86,19 @@ class DepositModalContent extends DecimalChecker { } _setDepositAsset(asset) { - console.log("asset", asset); // DEEX let coinToGatewayMapping = _getCoinToGatewayMapping.call(this); this.setState({coinToGatewayMapping}); if (!asset) return; - let backedAsset = asset.split("."); // [DEEX] - // this.state.gatewayStatus = {DEEX:{}} + let backedAsset = asset.split("."); let usingGateway = this.state.gatewayStatus[backedAsset[0]] ? true - : false; // true + : false; if (usingGateway) { - let assetName = backedAsset[1] || asset; // undefined - let assetGateway = backedAsset[0]; // deex + let assetName = backedAsset[1] || asset; + let assetGateway = backedAsset[0]; this._getDepositAddress(assetName, assetGateway); } else { this.setState({selectedAsset: "BTS"}); @@ -127,11 +123,6 @@ class DepositModalContent extends DecimalChecker { } _getDepositAddress(selectedAsset, selectedGateway) { - console.log( - "selectedAsset, selectedGateway", - selectedAsset, - selectedGateway - ); let {account} = this.props; let {gatewayStatus} = this.state; @@ -142,17 +133,10 @@ class DepositModalContent extends DecimalChecker { }); // Get Backing Asset for Gateway - console.log( - "this.props.backedCoins", - this.props.backedCoins.toJS(), - selectedGateway.toUpperCase() - ); let backingAsset = this.props.backedCoins .get(selectedGateway.toUpperCase(), []) .find(c => { - console.log("c", c); let backingCoin = c.backingCoinType || c.backingCoin; - console.log("backingCoin", backingCoin); if (backingCoin.toUpperCase().indexOf("EOS.") !== -1) { backingCoin = backingCoin.split(".")[1]; diff --git a/app/lib/common/gatewayUtils.js b/app/lib/common/gatewayUtils.js index 7ccbd86df7..d1c6f726eb 100644 --- a/app/lib/common/gatewayUtils.js +++ b/app/lib/common/gatewayUtils.js @@ -102,10 +102,6 @@ export function updateGatewayBackers(chain = "4018d784") { // Walk all Gateways for (let gateway in availableGateways) { - console.log( - "availableGateways[gateway]", - availableGateways[gateway] - ); if (!!availableGateways[gateway].isEnabled) { if (!!availableGateways[gateway].isSimple) { GatewayActions.fetchCoinsSimple.defer({ diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index f622b1adc2..19a6ce55c9 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -110,9 +110,10 @@ export const availableGateways = { name: "DEEX", baseAPI: deexAPIs, isSimple: true, - simpleAssetGateway: true, + simpleAssetGateway: false, fixedMemo: {prepend: "dex:", append: ""}, isEnabled: allowedGateway("DEEX"), + addressValidatorMethod: "POST", options: { enabled: false, selected: false From abf3c502160d4a37a37e86186b4af7355701bdc9 Mon Sep 17 00:00:00 2001 From: mirotincev Date: Wed, 14 Aug 2019 13:04:02 +0300 Subject: [PATCH 006/141] change develop base --- app/api/apiConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 6c533cffd9..5c92a8250c 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -63,7 +63,7 @@ export const gdex2APIs = { }; export const deexAPIs = { - BASE: "http://192.168.40.64/gateway", + BASE: "https://deex.exchange/gateway", COINS_LIST: "/pay/get_coins" }; From d89d59f6e9b0d6b9a229d6e489b5d41ce6acdc23 Mon Sep 17 00:00:00 2001 From: mirotincev Date: Wed, 14 Aug 2019 13:52:17 +0300 Subject: [PATCH 007/141] change isEnabled gateways config --- app/branding.js | 3 ++- app/lib/common/gateways.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/branding.js b/app/branding.js index 8e5391ac46..4c2d85d062 100644 --- a/app/branding.js +++ b/app/branding.js @@ -350,7 +350,8 @@ export function getAssetNamespaces() { "GDEX.", "XBTSX.", "SPARKDEX.", - "CITADEL." + "CITADEL.", + "DEEX." ]; } diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index c707df30fb..3aed0335e4 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -128,7 +128,7 @@ export const availableGateways = { isSimple: true, simpleAssetGateway: false, fixedMemo: {prepend: "dex:", append: ""}, - isEnabled: allowedGateway("DEEX"), + isEnabled: _isEnabled("DEEX"), addressValidatorMethod: "POST", options: { enabled: false, From 3e59b8eb4a957ec6ae6d5906df60f8cb1e9d3de6 Mon Sep 17 00:00:00 2001 From: mirotincev Date: Mon, 26 Aug 2019 14:58:16 +0300 Subject: [PATCH 008/141] change config --- app/api/apiConfig.js | 2 +- app/components/Modal/DepositModal.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 5c92a8250c..192242ddd1 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -64,7 +64,7 @@ export const gdex2APIs = { export const deexAPIs = { BASE: "https://deex.exchange/gateway", - COINS_LIST: "/pay/get_coins" + COINS_LIST: "/compatibility/get_coins" }; // Legacy Deposit/Withdraw diff --git a/app/components/Modal/DepositModal.jsx b/app/components/Modal/DepositModal.jsx index 2a1779fe7f..6e0024a9b4 100644 --- a/app/components/Modal/DepositModal.jsx +++ b/app/components/Modal/DepositModal.jsx @@ -97,7 +97,7 @@ class DepositModalContent extends DecimalChecker { : false; if (usingGateway) { - let assetName = backedAsset[1] || asset; + let assetName = backedAsset[1]; let assetGateway = backedAsset[0]; this._getDepositAddress(assetName, assetGateway); } else { From 86bd9454891c79333660d90ab8a64d844a83fb9d Mon Sep 17 00:00:00 2001 From: mirotincev Date: Thu, 12 Dec 2019 18:10:10 +0300 Subject: [PATCH 009/141] add deex gateways --- app/api/apiConfig.js | 5 +++++ app/branding.js | 6 ++++-- app/lib/common/gateways.js | 17 ++++++++++++++++- package.json | 1 + 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index bc155ad982..17f67030b5 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -83,6 +83,11 @@ export const xbtsxAPIs = { COINS_LIST: "/coin" }; +export const deexAPIs = { + BASE: "https://deex.exchange/gateway", + COINS_LIST: "/compatibility/get_coins" +}; + export const nodeRegions = [ // region of the node follows roughly https://en.wikipedia.org/wiki/Subregion#/media/File:United_Nations_geographical_subregions.png "Northern Europe", diff --git a/app/branding.js b/app/branding.js index 89d480d0cc..1309eb57e1 100644 --- a/app/branding.js +++ b/app/branding.js @@ -374,7 +374,8 @@ export function getAssetNamespaces() { "GDEX.", "XBTSX.", "SPARKDEX.", - "CITADEL." + "CITADEL.", + "DEEX." ]; } @@ -401,7 +402,8 @@ export function allowedGateway(gateway) { "GDEX", "XBTSX", "SPARKDEX", - "CITADEL" + "CITADEL", + "DEEX" ]; if (!gateway) { // answers the question: are any allowed? diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index 253e22064a..001831c5d5 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -10,7 +10,8 @@ import { cryptoBridgeAPIs, gdex2APIs, xbtsxAPIs, - citadelAPIs + citadelAPIs, + deexAPIs } from "api/apiConfig"; import {allowedGateway} from "branding"; import {isGatewayTemporarilyDisabled} from "../chain/onChainConfig"; @@ -189,6 +190,20 @@ export const availableGateways = { }, landing: "https://citadel.li/", wallet: "https://citadel.li/wallet/" + }, + DEEX: { + id: "DEEX", + name: "DEEX", + baseAPI: deexAPIs, + isSimple: true, + simpleAssetGateway: false, + fixedMemo: {prepend: "dex:", append: ""}, + isEnabled: _isEnabled("DEEX"), + addressValidatorMethod: "POST", + options: { + enabled: false, + selected: false + } } }; diff --git a/package.json b/package.json index fe19e50a65..308a279c97 100644 --- a/package.json +++ b/package.json @@ -142,6 +142,7 @@ "alt": "git+https://github.com/bitshares/alt.git#b6b42ceb790ca321402e9add95b9f77af8a7657d", "alt-container": "git+https://github.com/bitshares/alt-container.git#cf4e2c690a54e49fc9fe2dc99ab8816e6c3e5a86", "alt-react": "git+https://github.com/bitshares/alt-react.git#d91addef51f58e41e9857ebb0dd9177cfbd3b583", + "antd": "^3.26.2", "bignumber.js": "^4.0.0", "bitshares-report": "git+https://github.com/bitshares/bitshares-report.git#bba397fc7b4eb903d1ca109ac33301e9d2e2d753", "bitshares-ui-style-guide": "git+https://github.com/bitshares/bitshares-ui-style-guide.git#23ca108d47442dc70634797fb113d1e751e9b1cb", From 4c985a8d2c0fa82112e4f3ea52184dc3ad2561e4 Mon Sep 17 00:00:00 2001 From: mirotincev Date: Thu, 12 Dec 2019 18:11:19 +0300 Subject: [PATCH 010/141] add deex gateways --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 308a279c97..fe19e50a65 100644 --- a/package.json +++ b/package.json @@ -142,7 +142,6 @@ "alt": "git+https://github.com/bitshares/alt.git#b6b42ceb790ca321402e9add95b9f77af8a7657d", "alt-container": "git+https://github.com/bitshares/alt-container.git#cf4e2c690a54e49fc9fe2dc99ab8816e6c3e5a86", "alt-react": "git+https://github.com/bitshares/alt-react.git#d91addef51f58e41e9857ebb0dd9177cfbd3b583", - "antd": "^3.26.2", "bignumber.js": "^4.0.0", "bitshares-report": "git+https://github.com/bitshares/bitshares-report.git#bba397fc7b4eb903d1ca109ac33301e9d2e2d753", "bitshares-ui-style-guide": "git+https://github.com/bitshares/bitshares-ui-style-guide.git#23ca108d47442dc70634797fb113d1e751e9b1cb", From 80a9bb19bcf620c43bc92bee79ddaa3d5e78f75f Mon Sep 17 00:00:00 2001 From: serdrdoor Date: Fri, 13 Dec 2019 12:48:53 +0300 Subject: [PATCH 011/141] add RuDEX's markets to getFeaturedMarkets --- app/branding.js | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/app/branding.js b/app/branding.js index 89d480d0cc..64721cf63e 100644 --- a/app/branding.js +++ b/app/branding.js @@ -189,14 +189,15 @@ export function getMyMarketsQuotes() { ], rudexTokens: [ "PPY", - "RUDEX.GBG", - "RUDEX.GOLOS", - "RUDEX.KRM", - "RUDEX.SBD", - "RUDEX.STEEM", "RUDEX.BTC", "RUDEX.ETH", + "RUDEX.USDT", "RUDEX.EOS", + "RUDEX.GOLOS", + "RUDEX.GBG", + "RUDEX.STEEM", + "RUDEX.SBD", + "RUDEX.KRM", "RUDEX.WLS", "RUDEX.SMOKE", "RUDEX.GRC" @@ -275,9 +276,14 @@ export function getFeaturedMarkets(quotes = []) { ["USD", "GDEX.EOS"], ["USD", "GDEX.BTO"], ["USD", "OPEN.EOSDAC"], - ["USD", "RUDEX.BTC"], + ["USD", "RUDEX.GOLOS"], ["USD", "RUDEX.STEEM"], ["USD", "RUDEX.EOS"], + ["USD", "RUDEX.BTC"], + ["USD", "RUDEX.ETH"], + ["USD", "RUDEX.USDT"], + ["USD", "RUDEX.WLS"], + ["USD", "RUDEX.SMOKE"], ["CNY", "BTS"], ["CNY", "OPEN.BTC"], ["CNY", "USD"], @@ -294,9 +300,13 @@ export function getFeaturedMarkets(quotes = []) { ["CNY", "GDEX.USDT"], ["CNY", "GDEX.GXC"], ["CNY", "RUDEX.GOLOS"], - ["CNY", "RUDEX.GBG"], - ["CNY", "RUDEX.BTC"], + ["CNY", "RUDEX.STEEM"], ["CNY", "RUDEX.EOS"], + ["CNY", "RUDEX.BTC"], + ["CNY", "RUDEX.ETH"], + ["CNY", "RUDEX.USDT"], + ["CNY", "RUDEX.WLS"], + ["CNY", "RUDEX.SMOKE"], ["OPEN.BTC", "BTS"], ["OPEN.BTC", "OPEN.ETH"], ["OPEN.BTC", "OPEN.DASH"], @@ -324,20 +334,26 @@ export function getFeaturedMarkets(quotes = []) { ["USD", "OPEN.MAID"], ["OPEN.USDT", "OPEN.BTC"], ["OPEN.BTC", "OPEN.MAID"], + ["RUDEX.USDT", "RUDEX.BTC"], + ["RUDEX.USDT", "RUDEX.ETH"], + ["RUDEX.USDT", "RUDEX.EOS"], + ["RUDEX.BTC", "RUDEX.ETH"], + ["RUDEX.BTC", "RUDEX.EOS"], + ["RUDEX.BTC", "RUDEX.STEEM"], + ["RUDEX.BTC", "RUDEX.GOLOS"], + ["RUDEX.BTC", "RUDEX.WLS"], ["BTS", "OPEN.MAID"], ["BTS", "OPEN.HEAT"], ["BTS", "OPEN.INCENT"], ["RUB", "RUDEX.GOLOS"], - ["RUB", "RUDEX.GBG"], + ["BTS", "RUDEX.GOLOS"], ["BTS", "RUDEX.STEEM"], - ["BTS", "RUDEX.SBD"], - ["BTS", "RUDEX.KRM"], ["BTS", "RUDEX.EOS"], ["BTS", "RUDEX.BTC"], ["BTS", "RUDEX.ETH"], + ["BTS", "RUDEX.USDT"], ["BTS", "RUDEX.WLS"], ["BTS", "RUDEX.SMOKE"], - ["BTS", "RUDEX.GRC"], ["BTS", "XBTSX.STH"], ["BTS", "XBTSX.WAVES"], ["BTS", "ZEPH"], From f8f6666514f9beb10affcf44e1093ed46a83c6cb Mon Sep 17 00:00:00 2001 From: sschiessl-bcp Date: Tue, 17 Dec 2019 21:48:59 +0100 Subject: [PATCH 012/141] update russian Signed-off-by: sschiessl-bcp --- app/assets/locales/locale-ru.json | 625 +++++++++++++++--------------- 1 file changed, 307 insertions(+), 318 deletions(-) diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json index ad5d32a81b..8eba0de6f6 100644 --- a/app/assets/locales/locale-ru.json +++ b/app/assets/locales/locale-ru.json @@ -9,7 +9,7 @@ "average_price": "Средняя цена", "bittrex_scam": "Этот аккаунт не является реальным аккаунтом Bittrex, пожалуйста, отправляйте на этот аккаунт: bittrex-deposit.", "bts_market": "Рынок", - "cancel_orders": "Cancel orders", + "cancel_orders": "Отменить ордера", "collaterals": "Маржинальные позиции", "confirm_asset_modal": { "are_you_sure": "Вы уверены, что хотите сохранить все изменения в данных вкладках?", @@ -60,22 +60,22 @@ "id": "Идентификатор аккаунта", "identicon": "Айдентикон", "ignore": "Скрыть", - "inCollateral": "In Collateral", - "inOrders": "In Orders", - "inVestingBalances": "In Vesting Balances", + "inCollateral": "В обеспечении", + "inOrders": "В ордерах", + "inVestingBalances": "В вестинговых балансах", "in_open": "Это количество %(asset)s, находящихся в ваших открытых ордерах.", "in_open_value": "Это оценочная стоимость %(asset)s, находящихся в ваших открытых ордерах.", "intro_text_1": "Ваша децентрализованная платформа", "intro_text_2": "DEX децентрализована по самой своей сути и позволяет вам торговать основным токеном BitShares (BTS) и разнообразными не требующими доверия активами со стабильной, привязанной к рынку ценой, такими как bitUSD, bitCNY, bitGold и многими другими. Все эти активы могут торговаться без риска, связанного с участием контрагентов, оставляя контроль над вашими средствами исключительно в ваших руках.", - "intro_text_3": "Также DEX дает возможность создавать выпускаемые пользователем активы (user-issued assets – UIA), которые могут торговаться против любого другого не требующего доверия/выпущенного пользователем актива на платформе. Самым известным эмитентом на платформе является OpenLedger, поддерживающий такие активы, как BTC, ETH, DASH, STEEM и многие другие", + "intro_text_3": "Также DEX дает возможность создавать выпускаемые пользователем активы (user-issued assets – UIA), которые могут торговаться против любого другого не требующего доверия/выпущенного пользователем актива на платформе. Самым известным эмитентом на платформе является OpenLedger, поддерживающий такие активы, как BTC, ETH, DASH, STEEM, LTC, DOGE и многие другие", "intro_text_4": "Это уникальный микс традиционной и децентрализованной торговли, и всё это в столь знакомом для криптовалютных трейдеров интерфейсе биржи. Удачной торговли!", "intro_text_title": "Добро пожаловать в %(wallet_name)s", "login_with": "Войти при помощи", "market_actions": "Рыночные операции", - "market_orders": "Market orders", + "market_orders": "Рыночные ордера", "market_value": "Рыночная стоимость", "member": { - "action": "Action", + "action": "Действие", "annual": "Годовой подписчик", "available": "Доступно к востребованию", "balance_type": "Тип", @@ -83,33 +83,33 @@ "cashback": "Остаток вестингового баланса", "claim": "Востребовать сейчас", "coindays": "монето-дней", - "days": "days", + "days": "дней", "earned": "Накоплено монето-дней", "expires": "Истекает", "fee_allocation": "Распределение комиссии", - "fee_division": "Fee Division", + "fee_division": "Распределение комиссии", "fee_division_text": { - "paragraph_1": "Every time %(account)s pays a transaction fee, that fee is divided among several different accounts. The network takes %(fee_share_network)s%. The Lifetime Member who referred %(account)s takes %(fee_share_ltm)s%.", - "paragraph_2": "The registrar is the account that paid the transaction fee to register %(account)s with the network and decide how to divide the remaining %(fee_share_registrar)s% between themselves and their own Affiliate Referrer program. %(account)s's registrar chose to share %(fee_share_affiliate)s% of the total fee with the Affiliate Referrer.", - "paragraph_3": "Fee shares, market rewards and other rewards is found on the Vesting Balances page" + "paragraph_1": "Каждый раз, когда %(account)s оплачивает комиссию за перевод, эта комиссия распределяется между несколькими отдельными аккаунтами. Сеть получает %(fee_share_network)s%. Пожизненный член, который привлёк в сеть %(account)s, получает %(fee_share_ltm)s%.", + "paragraph_2": "Регистратор – это аккаунт, оплативший комиссию за регистрацию в сети %(account)s, который имеет право решать, как будут распределяться оставшиеся %(fee_share_registrar)s% на него самого и его реферальную программу. Регистратор %(account)s решил выделить аффилированным реферерам %(fee_share_affiliate)s% от суммы комиссии.", + "paragraph_3": "На странице Вестинговых балансов вы найдёте доли комиссий, вознаграждения рынка и другие бонусы" }, - "fee_pending": "Pending Fees", - "fee_pending_text": "Fees paid by %(account)s are divided among the network, referrers, and registrars once every maintenance interval (%(maintenanceInterval)s seconds). The next maintenance time is %(nextMaintenanceTime)s.", - "fee_vesting": "Vesting Fees", - "fee_vesting_text": "Most fees are made available immediately, but fees over %(vestingThresholdAmount)s %(vestingThresholdAsset)s (such as those paid to upgrade your membership or register a premium account name) must vest for a total of %(vestingPeriod)s days.", + "fee_pending": "Комиссии в обработке", + "fee_pending_text": "Комиссии, оплачиваемые %(account)s, распределяются между сетью, реферерами и регистраторами один раз в каждый период обслуживания (%(maintenanceInterval)s секунд). Следующее время обслуживания наступит в %(nextMaintenanceTime)s.", + "fee_vesting": "Вестинговые комиссии", + "fee_vesting_text": "Большинство комиссий становятся доступны немедленно, однако комиссии свыше %(vestingThresholdAmount)s %(vestingThresholdAsset)s (например, плата за повышение уровня вашего членства или регистрацию премиум-имени) должны находиться в вестинге %(vestingPeriod)s дней.", "fees_cashback": "Статистика выплат", "fees_paid": "Всего выплачено комиссий", "join": "Присоединился ", "lifetime": "Пожизненный член", "lifetime_referrer": "Пожизненный реферер", - "lifetime_title": "Earn cashback", + "lifetime_title": "Получайте кэшбэк", "membership": "Членство", "membership_expiration": "Окончание членства", "network_percentage": "Сеть", - "ref_distribution": "Referral Fee Distribution", - "referal_fees": "Referral Fee Distribution", - "referral_info": "As a lifetime member (LTM) you are eligable for a %(feesCashback)s% cashback on all your fees. You will also recieve cashback from markets with a referral reward. The referral reward is based on your own and your referred members market orders.", - "referral_link": "Ваша реферальная ссылка", + "ref_distribution": "Распределение реферальных комиссий", + "referal_fees": "Распределение реферальных комиссий", + "referral_info": "Как пожизненный член (LTM) вы имеете право на кэшбэк в размере %(feesCashback)s% от всех ваших комиссий. Вы также будете получать кэшбэк с рынков с реферальным вознаграждением. Реферальное вознаграждение основано на ваших собственных рыночных ордерах и также ордерах ваших рефералов.", + "referral_link": "Ваша персональная реферальная ссылка", "referral_text": "Дайте эту ссылку людям, которых вы хотите пригласить в %(wallet_name)s", "referrals": "Рефералы", "referrer": "Аффилированный реферер", @@ -120,7 +120,7 @@ "stats": "Статистика членства", "subscribe": "Купить годовую подписку", "suspected_scammer": "Предполагаемый мошенник", - "total_ref": "Total referred %(total)s", + "total_ref": "Всего рефералов %(total)s", "unknown": "Неизвестный пользователь", "upgrade_lifetime": "Купить пожизненную подписку", "vested": "В вестинге" @@ -135,7 +135,7 @@ "premium_name_warning": "Это премиум имя, которое является более дорогостоящим, чем имя, содержащее дефис (-) или цифры." }, "new_user": "Новый пользователь?", - "no_order_history": "No order history", + "no_order_history": "История ордеров отсутствует", "no_orders": "Нет открытых ордеров", "no_price": "--", "open_orders": "Открытые ордера", @@ -156,7 +156,7 @@ "pay": "Отправить на", "pay_from": "Оплатить с аккаунта ", "payees": "Получатели", - "percent": "Процент от общего объёма предложения", + "percent": "% всего предложения", "perm": { "account_name_or_key": "Имя аккаунта или ключ", "acct_or_key": "Аккаунт / Ключ / Адрес", @@ -185,11 +185,11 @@ "private": "Приватный ключ (WIF – Wallet Import Format)", "public": "Публичный ключ", "publish": "Сохранить", - "publish_prediction": "Publish", + "publish_prediction": "Опубликовать", "remove_proxy": "Удалить прокси", "remove_text": "Удалить", "reset": "Сбросить", - "resolve_prediction_disabled_button": "The button will be enabled after resolution date has passed", + "resolve_prediction_disabled_button": "Кнопка будет активирована в момент наступления даты подведения итога", "save": "Сохранить изменения", "save_all": "Сохранить все изменения", "show": "Показать", @@ -210,12 +210,12 @@ "portfolio": "Портфель", "propose_from": "Предложить от", "proposed_transactions": { - "advanced_feature": "This is an advanced feature. Please answer the following questions", - "answered_no": "If your answer to any of the questions above is no, do NOT continue. You can also turn this on and off in Settings.", - "question1": "Do you know what a proposal is?", - "question2": "Are you expecting a proposal?", - "question3": "Are you aware that a proposal can steal your funds or lock you out of the account?", - "show_me_proposals": "Show me Proposals" + "advanced_feature": "Это расширенная функция. Пожалуйста, ответьте на представленные вопросы", + "answered_no": "Если ваш ответ на любой из приведенных выше вопросов – «нет», то НЕ продолжайте. Вы также можете включить и выключить это в настройках.", + "question1": "Знаете ли вы, что такое предложение в сети Bitshares?", + "question2": "Вы ожидаете предложения?", + "question3": "Знаете ли вы, что предложение может украсть ваши средства или заблокировать вход в ваш аккаунт?", + "show_me_proposals": "Показать предложения" }, "qty": "Кол-во", "quote": "Тикер", @@ -226,7 +226,7 @@ "see_open": "Отобразить открытые ордера", "select_placeholder": "Выберите аккаунт...", "settle": "Погасить", - "settle_orders": "Settle orders", + "settle_orders": "Ордера на погашение", "show_hidden": "Скрытые", "show_ignored": "Показать скрытые аккаунты", "show_visual": "Визуально", @@ -301,7 +301,7 @@ "flags": "Маркеры", "force_settlement_delay_sec": "Задержка для принудительного погашения (в минутах)", "force_settlement_offset_percent": "Процент смещения принудительного погашения", - "global_settle": "Позволить эмитенту форсировать принудительное погашение", + "global_settle": "Позволить владельцу актива форсировать принудительное погашение", "id": "ID", "invalid_backing_asset_change": "Вы не можете изменить залоговый актив того актива, текущее предложение которого не равно нулю", "invalid_market_pair": "Предпочтительная рыночная пара не может быть с того же рынка", @@ -317,9 +317,9 @@ "mpa": "SmartCoin", "name": "Имя актива", "need_asset": "Как минимум один из двух активов должен быть %(name)s", - "new_issuer": "Новый аккаунт владельца", + "new_issuer": "Новый аккаунт владельца актива", "optional": "Дополнительные настройки", - "override_authority": "Эмитент может возвращать активы самому себе", + "override_authority": "Владелец актива может переводить актив обратно самому себе", "perm_warning": "ПРЕДУПРЕЖДЕНИЕ: Права доступа могут быть только отключены; однажды отключив, вы не сможете активировать их повторно!", "pm": "Рынок бинарных прогнозов", "precision": "Точность", @@ -327,8 +327,8 @@ "primary": "Основные настройки", "quote": "Количество котируемого актива", "quote_name": "Котируемый актив", - "resolve_prediction": "Resolve prediction", - "resolve_prediction_text": "The asset prediction can be resolved here.", + "resolve_prediction": "Подвести итог прогноза", + "resolve_prediction_text": "Подвести итоги прогноза по активу можно здесь.", "reward_percent": "Процент вознаграждения", "reward_percent_tooltip": "Если была установлена рыночная комиссия, то процент вознаграждения указывает, какая часть этой комиссии будет распределяться через программу вознаграждения рефералов, помимо отчислений владельцу актива.", "short": "Короткое имя (максимум 32 символа)", @@ -336,7 +336,7 @@ "to": "Эмитировать на аккаунт", "too_large": "Максимальное предложение токенов слишком велико, пожалуйста, выберите меньшее количество", "too_many_feed": "Число производителей котировок превысило максимально допустимое (%(max)s).", - "transfer_restricted": "Эмитент должен утверждать все переводы", + "transfer_restricted": "Владелец актива должен утверждать все переводы", "update_owner": "Обновить владельца", "update_owner_text": "Владелец актива может передать владение другому аккаунту, используя данную форму:", "visible": "Не отображать актив в поиске и на рынках", @@ -349,11 +349,11 @@ "no_balances": "У этого аккаунта нет вестинговых балансов", "title": "Вестинговые балансы", "type": { - "cashback": "Cashback", - "market_fee_sharing": "Market fee sharing", - "unspecified": "Unspecified", - "witness": "Witness", - "worker": "Worker" + "cashback": "Кэшбэк", + "market_fee_sharing": "Разделение рыночной комиссии", + "unspecified": "Не указан", + "witness": "Заверитель", + "worker": "Работник" } }, "votes": { @@ -494,18 +494,18 @@ "errors": { "below": "Ваш коэффициент обеспечения ниже %(mr)s, что не допускается.", "below_info": "Поддерживающий коэффициент обеспечения вашей позиции находится ниже требуемого! Коэффициент обеспечения можно увеличить, тогда как долг можно только уменьшить.", - "below_mcr_tcr": "Any ratio below %(mr)s will be treated as %(mr)s by chain.", + "below_mcr_tcr": "Любой коэффициент ниже %(mr)s будет расцениваться блокчейном как %(mr)s.", "below_ratio_mcr_update": "Ваш коэффициент обеспечения ниже вашего оригинального %(ocr)s. Для попавших под маржин колл ордеров доступен только увеличенный коэффициент.", "close": "Ваш коэффициент обеспечения близок к %(mr)s, т.е. в случае падения цены данная позиция попадёт под маржин колл.", "collateral": "Недостаточный баланс залога", "increased_debt_on_margin_call": "Вы увеличили свой долг, что является недопустимым действием при обновлении попавшей под маржин колл позиции" }, - "lockedCR": "Locking Collateral Ratio will override other locked fields", + "lockedCR": "Фиксация коэффициента обеспечения будет приоритетнее других фиксированных полей", "maximize_debt_set_ratio_slider": "Прежде чем максимизировать долг, вы должны задать коэффициент залогового обеспечения", "no_valid": "Для %(asset_symbol)s нет действующих котировок", "pay_max_debt": "Выплатить максимальный долг", "target_collateral_ratio": "Целевой коэффициент обеспечения", - "target_collateral_ratio_explanation": "Когда позиция попадет под маржин колл, соответствующий ордер будет достаточно большим, чтобы привести коэффициент обеспечения позиции к целевому коэффициенту обеспечения (TCR) или превысить его.", + "target_collateral_ratio_explanation": "Соответствующий маржин коллу ордер будет настолько большим, чтобы привести коэффициент обеспечения позиции к целевому коэффициенту обеспечения (TCR).", "target_collateral_ratio_short": "Целевой коэффициент обеспечения (TCR)", "title": "%(asset_symbol)s маржа", "update": "Обновить", @@ -519,10 +519,10 @@ "connection": { "automatic_reconnect": " Повторная попытка соединения будет совершена автоматически через %(reconnect_in_seconds)s секунд.", "manual_ping": "Пинговать узлы", - "manual_ping_and_narrow_down": "Narrow down nodes and ping", + "manual_ping_and_narrow_down": "Сузить спектр узлов и пинга", "manual_reconnect": "Попробуйте присоединиться повторно", - "narrow_down_nodes": "Narrow down nodes", - "narrow_down_nodes_tooltip": "Restrict the ping and automatic selection process of the wallet to only the selected nodes/regions. Choose nodes/regions close to your geolocation, this may significantly increase your felt connectivity. Leave empty to consider all.", + "narrow_down_nodes": "Сузить спектр узлов", + "narrow_down_nodes_tooltip": "Ограничьте процесс пинга и автоматического выбора в кошельке только выбранными узлами/регионами. Выбирайте узлы/регионы, близкие к вашей геолокации, это может значительно улучшить связь. Оставьте это поле пустым, чтобы рассмотреть все доступные варианты.", "out_of_sync": "Ваше соединение рассинхронизировано %(out_of_sync_seconds)s секунд.", "title_out_of_sync": "Соединение рассинхронизировано", "want_to_reconnect": "Если соединение восстановится, данное сообщение исчезнет автоматически." @@ -538,7 +538,7 @@ } }, "customizable_table": { - "customize_the_columns": "Customize the Columns" + "customize_the_columns": "Кастомизировать столбцы" }, "dashboard": { "featured_markets": "Рекомендуемые рынки", @@ -547,11 +547,11 @@ "top_markets": "Лучшие рынки" }, "errors": { - "loading_from_blockchain": "Error fetching form the blockchain, please retry.", - "loading_from_es": "Error fetching from elastic search database." + "loading_from_blockchain": "Ошибка при извлечении данных из блокчейна, пожалуйста, повторите попытку.", + "loading_from_es": "Ошибка при извлечении из базы данных elasticsearch." }, "exchange": { - "actions": "Actions", + "actions": "Действия", "add_quote": "Добавить", "asks": "Ордера на продажу", "atr": "Средний истинный диапазон", @@ -566,15 +566,15 @@ "buy_sell": "Форма ордера", "buysell_formatter": "{direction} {asset}", "call": "Цена досрочного погашения", - "cancel_order_select_all": "Select all orders", + "cancel_order_select_all": "Выбрать все ордера", "cancel_selected_orders": "Отменить выбранный ордер(а)", "change": "Изменить", - "chart_error": "Chart already exist", + "chart_error": "График уже существует", "chart_height": "Высота графика (в пикселях)", "chart_hide": "Скрыть графики", - "chart_load": "Load", + "chart_load": "Загрузить", "chart_modal": "Параметры графика", - "chart_save": "Save", + "chart_save": "Сохранить", "chart_type": "Тип графика", "checking_for_worth_less_settlement": "Идёт поиск возможностей продать на рынке по лучшей цене, пожалуйста, подождите...", "confirm_buy": "Ваш ордер в %(diff)s раз выше, чем самое низкое предложение, вы уверены?", @@ -586,9 +586,9 @@ "deposit": "Внести депозит", "description": "Описание", "ema": "Экспоненциальная скользящая средняя", - "enter_chart_layout_name": "Enter Chart Layout Name", + "enter_chart_layout_name": "Введите имя схемы размещения графиков", "featured": "Лучшие рынки", - "fee": "Fee", + "fee": "Комиссия", "feed_price": "Цена котировок", "filter": "Фильтрация...", "flip": "Инвертировать", @@ -603,10 +603,10 @@ "invalid_price": "Недействительная цена", "invert": "Инвертировать цену", "latest": "Последние", - "layout_name": "Layout Name", + "layout_name": "Имя схемы размещения", "limit": "Лимит", - "load_chart_layout": "Load Chart Layout", - "load_custom_charts": "Load custom charts", + "load_chart_layout": "Загрузить схему размещения графиков", + "load_custom_charts": "Загрузить кастомные графики", "lowest_ask": "Самый низкий запрос", "maintenance": "Цена требования дополнительного обеспечения", "market": "Рынок", @@ -614,7 +614,7 @@ "market_frozen": "Владелец %(asset)s запретил торговлю на этом рынке.", "market_name": "Мои рынки", "market_picker": { - "filter_by_issuer": "Фильтровать по эмитенту", + "filter_by_issuer": "Фильтровать по владельцу актива", "find_by_asset": "Найти по активу", "results": "Результаты (%(total_assets)s)", "search": "Имя актива", @@ -625,7 +625,7 @@ "title": "Выбор рынка", "use": "Использовать" }, - "modified": "Modified", + "modified": "Модифицированный", "more": "Найти рынки", "move_down": "Вниз", "move_up": "Вверх", @@ -643,7 +643,7 @@ "order_book": "Биржевой стакан", "order_depth": "Глубина рынка", "order_grouping": "Группировка ордеров %(orderlimit)s%", - "orders": "Orders", + "orders": "Ордера", "others": "Другие", "overbought": "Перекуплен", "oversold": "Перепродан", @@ -672,26 +672,26 @@ "quick_deposit_gateway": "Разместите депозит в реальных %(asset)s с помощью шлюза, чтобы получить долговые расписки, которые обеспечиваются средствами соответствующего шлюза", "quick_deposit_gateway_button": "Использовать шлюз", "quick_deposit_tooltip": "Разместить депозит %(asset)s, нажмите для показа опций", - "quick_trade": "Quick trade", + "quick_trade": "Быстрая торговля", "quick_trade_details": { - "amount": "Amount", - "effective": "effective", - "feed_price": "Feed price", - "id": "Id", - "last_price": "Last market price", - "liquidity_penalty": "Liquidity penalty", - "market_fee": "Market fee", - "order": "Order", - "orders": "Orders", - "placeholder_receive": "Choose asset to receive", - "placeholder_sell": "Choose asset to sell", - "price": "Price", - "seller": "Seller", - "subscribe_to_market": "Subscribe to market", - "tooltip": "Enter at least three characters of an asset symbol to search", - "total": "Total", - "transaction_fee": "Transaction fee", - "your_price": "Your price" + "amount": "Сумма", + "effective": "фактический", + "feed_price": "Цена котировок", + "id": "ID", + "last_price": "Последняя рыночная цена", + "liquidity_penalty": "Взыскание за ликвидность", + "market_fee": "Рыночная комиссия", + "order": "Ордер", + "orders": "Ордера", + "placeholder_receive": "Выбрать актив для получения", + "placeholder_sell": "Выбрать актив для продажи", + "price": "Цена", + "seller": "Продавец", + "subscribe_to_market": "Подписаться на этот рынок", + "tooltip": "Для поиска нужно ввести как минимум три символа из названия актива", + "total": "Всего", + "transaction_fee": "Комиссия за транзакцию", + "your_price": "Ваша цена" }, "quote": "Котируемая валюта:", "quote_selection": "Изменить тикер валюты", @@ -699,8 +699,8 @@ "receive": "Получить", "remove": "Удалить", "rsi": "Индекс относительной силы", - "save_custom_charts": "Save custom charts", - "save_new_chart_layout": "Save New Chart Layout ", + "save_custom_charts": "Сохранить кастомные графики", + "save_new_chart_layout": "Сохранить новую схему размещения графиков", "scaled": "Масштабирован", "search": "Ищите другие рынки здесь", "sell": "Продать", @@ -719,8 +719,8 @@ "grouping_standalone": "Отдельная", "hidden_chart": "Скрыть график", "horizontal": "Горизонтальная", - "position_order_asset_opt1": "Ордера над активом", - "position_order_asset_opt2": "Актив над ордерами", + "position_order_asset_opt1": "Биржевой стакан выше Формы ордера", + "position_order_asset_opt2": "Форма ордера выше Биржевого стакана", "position_order_form_opt1": "Покупка - продажа", "position_order_form_opt2": "Продажа - покупка", "position_order_orders_opt1": "Покупка - продажа", @@ -758,12 +758,9 @@ "hide_function_buttons": "Скрыть все кнопки, которыми можно управлять из персонализированной формы", "increase_chart_height": " Увеличить высоту графика", "market_location": "На какую сторону прикрепить вертикальный биржевой стакан. Это поменяет его местами с панелью рынка", - "market_trades": "", - "my_trades": "", - "open_orders": "", "order_book_grouping": "Сгруппировать ордера, которые близки по заданному проценту", "order_style": "Использовать вертикальный биржевой стакан для прикрепления к боковой панели", - "orderbook_auto_scroll": "Автоматически прокручивать биржевой стакан, чтобы держаться центра при поступлении новых ордеров. Отключите, чтобы разрешить прокрутку", + "orderbook_auto_scroll": "Автоматически прокручивать биржевой стакан для просмотра новых ордеров. Отключите, чтобы разрешить прокрутку", "panel_grouping": "Задать группировку панелей", "position_order_asset": "Задать вертикальный порядок для формы ордера / биржевого стакана", "position_order_form": "Задать горизонтальный порядок для формы ордера", @@ -771,7 +768,6 @@ "reduce_scrollbars": "Отключить полосы прокрутки по умолчанию", "reload": "Изменение этой опции вступит в силу только после ручной перезагрузки", "reverse_order_book": "Отобразить биржевой стакан в обратном порядке, чтобы ордера на покупку отображались сверху", - "settlements": "", "show_market_depth": "Показывать глубину рынка", "show_price_chart": " Показывать график цен", "single_colum_order_form": "Закрепить цену, количество, общую сумму и т.п. в одной колонке (неподвижно)" @@ -786,10 +782,10 @@ "settle_globally_settled_tooltip": "Этот актив попал под глобальное погашение. Вы можете провести мгновенное погашение по цене глобального погашения (смотрите информацию на бирже или в подробностях об активе)", "settle_offset": "Смещение расчетной цены: %(offset)s%", "settle_orders": "Ордера на погашение", - "settlement_date": "Settlement date", - "settlement_description": "Settlement of %(quoteAsset)s %(quoteName)s", + "settlement_date": "Дата погашения", + "settlement_description": "Погашение %(quoteAsset)s %(quoteName)s", "settlement_hint": "Вы пытаетесь погасить {long}. Текущая цена на {market_link}", - "settlement_of": "Settlement of", + "settlement_of": "Погашение ", "short": "Шорт", "show_all_orders": "Отобразить все %(rowcount)s ордера", "show_all_trades": "Отобразить все %(rowcount)s сделки", @@ -835,7 +831,7 @@ "bid": "Цена предложения", "collateral": "Дополнительное залоговое обеспечение", "debt": "Покрытый долг", - "empty": "No collateral bids", + "empty": "Нет залоговых ставок", "included": { "no": "Нет", "partial": "Частично", @@ -848,25 +844,25 @@ "claim_balance": "Востребовать остаток пула комиссий", "claim_fees": "Востребовать комиссии", "claim_pool_text": "Владелец актива может выводить средства из пула комиссий, используя эту форму:", - "claim_text": "Эмитент актива может востребовать любые накопленные комиссии здесь.", + "claim_text": "Владелец актива может востребовать любые накопленные комиссии здесь.", "core_exchange_rate": "Основной обменный курс (CER)", "fund": "Пополнить пул комиссий", "fund_text": "Любой желающий может добавлять %(core)s в пул комиссий, используя эту форму:", "pool_balance": "Баланс пула", "pool_text": "Пул комиссий используется для оплаты комиссий в %(core)s путём конвертации комиссии в %(asset)s в %(core)s. Если в пуле комиссий заканчиваются средства, то комиссии становится невозможно платить в %(asset)s, и они начнут по умолчанию выплачиваться в %(core)s.

Основной обменный курс – это цена, по которой %(asset)s конвертируются в %(core)s.", - "select_fee_asset": "Select asset to pay fee", + "select_fee_asset": "Выберите актив для оплаты комиссии", "title": "Пул комиссий", - "unclaimed_issuer_income": "Невостребованный доход эмитента", - "use_asset_as_default_fee": "Make selected asset default for paying fees", - "use_selected_asset": "Use selected asset" + "unclaimed_issuer_income": "Невостребованный доход владельца актива", + "use_asset_as_default_fee": "Сделать выбранный актив приоритетным для оплаты комиссий", + "use_selected_asset": "Использовать выбранный актив" }, "feed_producer": "Производитель котировок", "feed_producer_text": "Утвержденные производители котировок могут публиковать новые котировки посредством представленной ниже формы:", "info": "Информация об активе", "invalid": "%(name)s – недопустимое имя актива", "margin_positions": { - "click_to_switch_to_cumulative": "Click to switch between cumulative and position values", - "empty": "No margin positions", + "click_to_switch_to_cumulative": "Нажмите, чтобы переключиться между кумулятивным и позиционным значением.", + "empty": "Маржинальные позиции отсутствуют", "ratio_danger": "Позиция находится ниже поддерживающего коэффициента обеспечения (MCR) и попадёт под маржин колл", "ratio_warning": "Позиция находится близко к поддерживающему коэффициенту обеспечения (MCR) и рискует попасть под маржин колл", "title": "Маржинальные позиции" @@ -883,16 +879,16 @@ "whitelist_markets": "Рынки белого списка" }, "prediction_market_asset": { - "prediction": "Prediction", - "resolution_date": "Resolution date", - "tooltip_prediction": "The prediction is a statement defined by the asset owner. If the statement is true, this prediction market asset should be resolved to a settlement price of 1 by the asset owner.", - "tooltip_resolution_date": "The resolution date is an informal statement when the asset owner intends to resolve this betting market." + "prediction": "Прогноз", + "resolution_date": "Дата подведения итога", + "tooltip_prediction": "Прогноз – это утверждение, созданное владельцем актива. Если данное утверждение верно, этот актив прогнозного рынка должен быть рассчитан по цене 1:1 владельцем актива.", + "tooltip_resolution_date": "Дата подведения итога – это неофициальное заявление о том, когда владелец актива намеревается подвести итог этого рынка ставок." }, "price_feed": { "external_feed_price": "Цена в котировках (медиана котировок заверителей)", "feed_lifetime": "Срок действия котировок (в часах)", "feed_price": "Цена котировок", - "global_settlement_price": "Global settlement Price will be", + "global_settlement_price": "Цена глобального погашения составит ", "global_settlement_trigger": "Глобальное погашение запускается при цене", "maintenance_collateral_ratio": "Поддерживающий коэффициент обеспечения (MCR)", "maximum_short_squeeze_price": "Максимальная цена короткого сжатия (MSSP)", @@ -903,7 +899,7 @@ }, "price_feed_data": { "core_exchange_rate": "CER (основной обменный курс)", - "empty": "No valid feed producers", + "empty": "Нет подходящих производителей котировок", "feed_price": "Цена котировок", "maintenance_collateral_ratio": "MCR (поддерживающий коэффициент обеспечения)", "maximum_short_squeeze_ratio": "MSSR (максимальный коэффициент короткого сжатия)", @@ -923,7 +919,7 @@ "gs_or": "или", "gs_place_bid": "нажмите здесь, чтобы разместить предложение", "gs_revert": "Восстановление", - "gs_revive": "Актив будет восстановлен автоматически, когда цена автовосстановления (включая заявки) превысит цену в котировках или же долг будет принудительно погашен. ", + "gs_revive": "Актив будет восстановлен автоматически, когда цена котировок превысит цену автовосстановления (включая заявки) или же долг будет принудительно погашен. ", "gs_see_actions": "показать действия с активом", "max_settle_volume": "Максимальный объем погашения на каждый период обслуживания", "offset": "включая смещение", @@ -937,7 +933,7 @@ "summary": { "asset_type": "Тип актива", "current_supply": "Текущее предложение", - "issuer": "Эмитент", + "issuer": "Владелец актива", "market_fee": "Рыночная комиссия", "market_fee_referral_reward_percent": "Реферальное вознаграждение с рыночной комиссии", "stealth_supply": "Стелс предложение" @@ -955,9 +951,8 @@ }, "assets": { "backing_asset": "Актив обеспечения", - "blacklisted": "This asset is blacklisted, beware of scam attempts!", "id": "ID", - "issuer": "Эмитент", + "issuer": "Владелец актива", "market": "SmartCoins", "precision": "Точность", "prediction": "Активы рынка прогнозов", @@ -971,14 +966,14 @@ "asset_issue": "Количество к выпуску", "asset_update": "Обновляемый актив", "authorizing_account": "Авторизующий аккаунт", - "call_limit": "Предел колла, %(price)s", + "call_limit": "Предел колла %(price)s", "common_options": "Общие параметры", "count": "Количество транзакций", "date": "Дата", "fee_payer": "Оплачивающий комиссии аккаунт", "feed_price": "Цена котировок, %(price)s", "go_to": "Перейти к блоку", - "gs_support": "Global settlement limit, %(price)s", + "gs_support": "Предел глобального погашения, %(price)s ", "id": "ID блока", "key": "Публичный ключ", "lifetime": "Обновить до пожизненного членства", @@ -1075,40 +1070,38 @@ }, "external_service_provider": { "bridge": { - "description": "Bridges are external service providers that allow you to swap assets in and out of the BitShares Blockchain. For example, you can send your BTC on the Bitcoin Blockchain to a Bridge, who will swap it and give you an equivalent amount of BTS or another Gateways UIA on the BitShares Blockchain (for a fee of course). Normally, a Bridge does not hold your funds, but trust is required that they send you back the proper amount of the target asset. As it is an external service providers you implicitly agree to their Terms and Conditions by using any of their services or assets.", - "short": "Bridge", - "what_is": "What is a Bridge?" + "description": "Мосты – это провайдеры внешних сервисов, которые позволяют менять активы в блокчейне BitShares. Например, вы можете отправить свои BTC в блокчейне Bitcoin на мост, который поменяет их и выдаст вам эквивалентное количество BTS или другого шлюзового UIA в блокчейне BitShares (с оплатой комиссии). Обычно мост не удерживает ваши средства у себя, но вам всё же приходится доверять им в том, что они вернут вам нужную сумму целевого актива. Поскольку это сторонние провайдеры, вы косвенно соглашаетесь с их условиями использования услуг или активов.", + "short": "Мост", + "what_is": "Что такое мост?" }, - "disabled_asset_1": "This asset is managed by an external service provider (gateway). Currently deposits and withdrawals for this asset are disabled", - "disabled_asset_2": "For more information visit Settings -> Entry External Service Providers. For any issues or questions please contact the gateway operator directly.", - "expect_more": "If you expect to see more deposit and withdraw options for your assets, please check the External Service Providers in Settings > General.", + "expect_more": "Если вы хотите увидеть больше возможностей депозита и вывода для своих активов, ознакомьтесь с провайдерами внешних сервисов в разделе Настройки > Общие.", "gateway": { - "description": "Gateways are external service providers that allow you to deposit, trade and withdraw assets into the BitShares Blockchain that are not native to it. For example, you can send your BTC on the Bitcoin Blockchain to a Gateway, who will in turn give you an UIA (user issued asset) on the BitShares Blockchain, with the promise that you can withdraw it again (for a fee of course). While you are holding such an UIA on the BitShares Blockchain, the Gateway becomes the custodian of your funds. As it is external service providers you implicitly agree to their Terms and Conditions by using any of their services or assets.", - "prefix": "Prefix", - "short": "Gateway", - "what_is": "What is a Gateway?" + "description": "Шлюзы – это провайдеры внешних сервисов, которые позволяют вам вносить депозиты, торговать и выводить не нативные активы в блокчейне BitShares. Например, вы можете отправить свои BTC в блокчейне Bitcoin на шлюз, который, в свою очередь, выдаст вам UIA (выпущенный пользователем актив) в блокчейне BitShares, с возможностью вывести его снова (с оплатой комиссии). Пока вы держите такой UIA в блокчейне BitShares, шлюз является хранителем ваших средств. Поскольку это внешние провайдеры, вы косвенно соглашаетесь с их условиями использования сервисов или активов.", + "prefix": "Префикс", + "short": "Шлюз", + "what_is": "Что такое шлюз?" }, - "is_down": "The external provider that offers this service is currently not working correctly. You can check the status in the Settings (General > External Service Provider).", + "is_down": "Внешний провайдер, который предоставляет этот сервис, в настоящее время испытывает сбои в работе. Вы можете проверить его статус в Настройках (Общие > Провайдер внешних сервисов).", "selector": { - "cancel": "Cancel", - "choose_services": "Choose Services", - "landing": "Landing Page", - "name": "Name", - "not_now": "Not now", - "table_description": "The table below lists all Gateways and Bridges that are currently integrated with the BitShares UI, this does not reflect any kind of endorsement. It lists the Name (sorted alphabetically), the type (Bridge or Gateway, and if Gateway the asset prefix, e.g. RUDEX.BTC), a link to their landing page with further information and an affiliate link to the Gateways wallet (if exists, usually a branded version of this UI). Please do your own due dilligence.", - "title": "Choose your preferred Service Providers", - "type": "Type", - "use_none": "Use none", - "use_selected": "Use selected", - "wallet": "Wallet" + "cancel": "Отменить", + "choose_services": "Выбрать сервисы", + "landing": "Лендинг", + "name": "Имя", + "not_now": "Не сейчас", + "table_description": "В приведенной ниже таблице перечислены все шлюзы и мосты, которые в настоящее время интегрированы с пользовательским интерфейсом BitShares, однако это не выражает одобрения кого-либо из них. В ней перечислены имена (в алфавитном порядке), типы (мост или шлюз и наличие у шлюза префикса актива, например, RUDEX.BTC), ссылка на их веб-сайт с дополнительной информацией и партнерская ссылка на кошелек шлюза (если таковой существует, обычно это фирменный вариант данного интерфейса). Пожалуйста, проведите собственную оценку перед использованием.", + "title": "Выберите предпочтительных провайдеров сервисов", + "type": "Тип", + "use_none": "Не использовать никакой", + "use_selected": "Использовать выбранный", + "wallet": "Кошелек" }, "welcome": { - "explanation_dex": "BitShares offers a native decentralized exchange, the BitShares DEX. It is running completely on the blockchain with no need for centralized services, even the order matching is transparently on-chain.", - "explanation_later": "If you want to adjust this later on, you can also choose the external service providers in the Settings.", - "explanation_service_providers": "You can trade anything against everything, as long as the asset (token) is available on the BitShares Blockchain. For tokens that are not native to it there exist external service providers (so called Gateways and Bridges), that allow you to trade tokens like BTC on the BitShares DEX by providing you their own IOU ('I owe you') of it.", - "explanation_what_to_do": "You may choose which of those service providers you want to see readily available in the BitShares UI. To do so, click 'Choose Services'. If you want to keep using the BitShares UI just like before, lick 'Not now'.", - "first_line": "today, we want to give you some insight on the BitShares Blockchain and services around it.", - "hello": "Dear BitShares' User" + "explanation_dex": "BitShares предоставляет собственную децентрализованную биржу, BitShares DEX. Она полностью автономно работает на блокчейне без необходимости в централизованных сервисах, даже сопоставление ордеров выполняется в рамках блокчейна совершенно прозрачно.", + "explanation_later": "Если вы хотите сделать это позже, вы также можете выбрать провайдеров внешних сервисов в Настройках.", + "explanation_service_providers": "Вы можете торговать всем против всего, если только актив (токен) доступен в блокчейне BitShares. Для токенов, которые не являются нативными, существуют провайдеры внешних сервисов (т.н. шлюзы и мосты), позволяющие вам торговать токенами, такими как BTC, на BitShares DEX, предоставляя вам собственный IOU (I owe you), или долговое обязательство.", + "explanation_what_to_do": "Вы можете выбрать, каких из этих провайдеров вы хотите видеть доступными в пользовательском интерфейсе BitShares. Для этого нажмите «Выбрать сервисы». Если вы хотите продолжать использовать интерфейс BitShares, как и раньше, нажмите «Не сейчас».", + "first_line": "Мы хотим дать вам некоторое представление о блокчейне BitShares и дополнительных сервисах этой экосистемы.", + "hello": "Уважаемый пользователь BitShares!" } }, "fees": { @@ -1155,7 +1148,6 @@ "open": "Актив %(asset)s обеспечивается реальными %(backed)s в соотношении 1:1 и может быть депонирован или выведен с помощью сервиса шлюза от OpenLedger.", "rudex": "Актив %(asset)s обеспечивается реальными %(backed)s в соотношении 1:1 и может быть депонирован или выведен с помощью сервиса шлюза от Rudex.", "trade": "Актив %(asset)s обеспечивается реальными %(backed)s в соотношении 1:1 и может быть депонирован или выведен с помощью сервиса шлюза от Blocktrades.", - "win": "", "xbtsx": "Актив %(asset)s обеспечен реальными %(backed)s в соотношении 1:1 и может быть введён/выведен с помощью сервиса шлюза от XBTS." }, "balance": "Текущий баланс", @@ -1203,13 +1195,13 @@ "deposit_warning_memo": "Депозит %(asset)s должен содержать мемо (примечание), иначе он не будет зачислен", "fee": "Комиссия шлюза", "fiat": "Фиат", - "fiat_text": "Примечание: Фиатные шлюзы будут закрыты до дальнейшего уведомления. Приносим извинения за неудобства! Пожалуйста, следите за нашими последними новостями и обновлениями здесь blog.openledger.info", + "fiat_text": "Примечание: фиатные шлюзы закрыты до дальнейшего уведомления. Приносим извинения за неудобства! Пожалуйста, следите за последними новостями и обновлениями данного шлюза здесь: Blog.openledger.info", "frozen": "Аккаунт пользователя %(account)s был заморожен", "gateway": "Шлюз", "gateway_deposit": { "confirmations": { - "last_irreversible": "Средства будут зачислены на счет после того, как транзакция станет необратимой", - "n_blocks": "Средства будут зачислены на счет после %(blocks)s подтверждений сети" + "last_irreversible": "Ваш депозит будет размещён после того, как транзакция станет необратимой", + "n_blocks": "Ваш депозит будет размещён после %(blocks)s подтверждений от сети" } }, "gateway_text": "Здесь выберите, хотите ли вы разместить депозит или вывести средства", @@ -1225,7 +1217,7 @@ "limit_withdraw_asset_max": "Максимальная сумма вывода: %(min)s %(coin)s", "limit_withdraw_asset_min": "Минимальная сумма вывода: %(min)s %(coin)s", "limit_withdraw_asset_none": "Нет", - "logout_now": "Logout now", + "logout_now": "Выйти из аккаунта сейчас", "memo": "Мемо", "meta": { "open_website": "Открыть веб-сайт" @@ -1312,7 +1304,7 @@ "account_notify": "В настоящее время активен аккаунт %(account)s", "account_value": "Стоимость аккаунта", "accounts_manage": "Управление аккаунтами", - "advanced": "Advanced", + "advanced": "Расширенный", "collateral_ratio": "Коэффициент обеспечения", "create_account": "Создать аккаунт", "create_asset": "Создать актив", @@ -1323,7 +1315,7 @@ "exchange": "Биржа", "explorer": "Обозреватель", "help": "Помощь", - "insight": "Insight", + "insight": "Инсайт", "lock": "Выйти (заблокировать локальный кошелек)", "lock_short": "Выйти", "locked_tip": "
Нажмите, чтобы войти.

Закрыв окно браузера, вы также выйдете из аккаунта.", @@ -1468,52 +1460,52 @@ "warning": "Если вы закроете браузер без резервного копирования вашего кошелька, вы потеряете этот аккаунт навсегда." }, "invoice": { - "amount": "Amount", - "date": "Date", - "invalid_format": "Invoice has invalid format", - "invoice_data_found": "Invoice data found", - "items": "Items", - "memo": "Memo", - "note": "Note", - "paid_by": "Paid by", + "amount": "Сумма", + "date": "Дата", + "invalid_format": "Инвойс имеет недопустимый формат", + "invoice_data_found": "Найдены данные инвойса", + "items": "Элементы", + "memo": "Мемо", + "note": "Примечание", + "paid_by": "Оплачен ", "pay": { - "barcode": "Barcode", - "invoice_qr_code": "Invoice QR code", - "payment_qr_code": "Payment QR code", - "title": "Pay" - }, - "pay_button": "Pay %(asset)s to %(name)s", - "pay_invoice": "Pay Invoice", - "pay_to": "Pay To", - "payment_proof": "Payment proof", - "payment_request": "Payment request", - "print_receipt": "Print receipt", - "raw_invoice_data": "raw invoice data", - "receipt_total": "Receipt Total", + "barcode": "Штрих-код", + "invoice_qr_code": "QR-код инвойса", + "payment_qr_code": "QR-код оплаты", + "title": "Оплатить" + }, + "pay_button": "Оплатить %(asset)s %(name)s", + "pay_invoice": "Оплатить инвойс", + "pay_to": "Оплатить на", + "payment_proof": "Доказательство оплаты", + "payment_request": "Запрос на оплату", + "print_receipt": "Распечатать чек", + "raw_invoice_data": "Необработанные данные инвойса", + "receipt_total": "Итого", "request": { - "action": "Action", - "create_invoice_string": "Create invoice string", - "currency": "Currency", - "identifier": "Identifier", - "identifier_tooltip": "The identifier needs to be used as the memo/message when the request is paid.", - "items": "Items", - "note": "Note", - "note_tooltip": "You can attach a note to this payment request, this can be any additional information.", - "payment_asset": "Payment Asset", - "payment_asset_tooltip": "This payment request will be paid with one transfer, and will be requesting to be paid in the indicated asset.", - "price": "Price", - "quantity": "Quantity", - "recipient_account": "Recipient Account", - "recipient_name": "Recipient Name", - "recipient_name_tooltip": "You can define an arbitrary plaintext name for yourself to indicate who is being paid. Must not be a BitShares account name.", - "submit": "Submit", - "title": "Request" - }, - "tooltip_payment_proof": "Your account history has been searched for a match of sender, recipient and asset. This is an educated guess, but there is no direct link between this transfer and the shown invoice written on-chain.", - "total": "Total", - "transaction": "Transaction", - "unit": "Unit", - "use_invoice_data": "Use invoice data" + "action": "Действие", + "create_invoice_string": "Создать строку инвойса", + "currency": "Валюта", + "identifier": "ID", + "identifier_tooltip": "При оплате запроса необходимо использовать ID в поле мемо/сообщения.", + "items": "Пункты", + "note": "Примечание", + "note_tooltip": "Вы можете прикрепить к этому запросу на оплату примечание, которое может содержать любую дополнительную информацию.", + "payment_asset": "Актив оплаты", + "payment_asset_tooltip": "Этот запрос на оплату будет оплачен одним переводом в указанном активе.", + "price": "Цена", + "quantity": "Количество", + "recipient_account": "Аккаунт получателя", + "recipient_name": "Имя получателя", + "recipient_name_tooltip": "Для удобства вы можете задать произвольное имя в виде простого текста, чтобы быстро определять, кому платите. Для этого нельзя использовать имя аккаунта BitShares.", + "submit": "Отправить запрос", + "title": "Запрос" + }, + "tooltip_payment_proof": "В вашей истории аккаунта был произведён поиск совпадений по имени отправителя, получателя и актива. Это лишь предположение, но между этим переводом и отображаемым инвойсом, записанным в блокчейне, нет прямой связи.", + "total": "Всего", + "transaction": "Транзакция", + "unit": "Ед. измерения", + "use_invoice_data": "Использовать данные инвойса" }, "languages": { "de": "Deutsch", @@ -1534,7 +1526,7 @@ "invalidFormat": "Неподходящий формат!", "loginButton": "Войти", "selectDifferent": "Выбрать другой файл", - "supportWarning": "Внимание! Ваш браузер не поддерживает некоторые операции с файлами, необходимые для восстановления из резервной копии, мы рекомендуем вам воспользоваться для этого браузерами Chrome или Firefox.", + "supportWarning": "Внимание! Ваш браузер не поддерживает операции с файлами, необходимые для восстановления из резервной копии. Мы рекомендуем вам воспользоваться для этого браузерами Chrome или Firefox.", "title": "Выберите тип входа", "withoutBinFile": "У меня нет bin-файла" }, @@ -1627,9 +1619,9 @@ "copyLog": "Скопировать журнал", "copyScreenshot": "Щелкните правой кнопкой мыши в превью изображения -> Копировать", "copySuccess": "Конец копирования", - "explanatory_text_1": "Этот отчет собирает последние записи в консольном журнале и делает скриншот текущего вида перед открытием модального окна. Нажмите на любую запись, чтобы увидеть детали.", + "explanatory_text_1": "Этот отчёт собирает последние записи в журнале ошибок и делает скриншот текущего представления без открытого диалогового окна. Нажмите на запись, чтобы увидеть детали.", "explanatory_text_2": "Пожалуйста, сообщите о найденной проблеме на GitHub:", - "explanatory_text_3": "Вы можете скопировать и вставить (CTRL + V) скриншот и записи журнала непосредственно в текстовую область содержимого проблемы. Вставка скриншота также работает в Telegram-чате.", + "explanatory_text_3": "Вы можете скопировать и вставить (CTRL+C и CTRL+V) скриншот и записи журнала непосредственно в текстовую область содержимого проблемы. Вставка скриншота также работает в Telegram-чате.", "explanatory_text_4": "Если обнаруженная вами проблема затрагивает безопасность пользователей, вы можете претендовать на вознаграждение. В таком случае не сообщайте о ней публично, а воспользуйтесь данным способом: ", "hideLog": "Скрыть журнал", "hideScreenshot": "Скрыть скриншот", @@ -1798,89 +1790,89 @@ }, "prediction": { "add_opinion_modal": { - "amount": "Amount", - "condition": "Condition", - "no": "NO", - "probability": "Probability (0...1)", - "resolution": "Resolution", - "symbol": "Symbol", - "title": "Add Prediction Offer", - "warning": "Set amount", - "yes": "YES" + "amount": "Сумма", + "condition": "Состояние", + "no": "НЕТ", + "probability": "Вероятность (0...1)", + "resolution": "Итог", + "symbol": "Тикер", + "title": "Добавить прогнозное предложение", + "warning": "Указать сумму", + "yes": "ДА" }, "create_market_modal": { - "backing_asset": "Backing asset", - "commission": "Commission", - "condition": "Condition", - "description": "Description", - "resolution_date": "Resolution date", - "select_date_and_time": "Select date and time", - "symbol": "Symbol", - "title": "Create prediction market", - "tooltip_backing_asset": "The backing asset will be used to pay the premium, i.e. it is the leverage that participants use.", - "tooltip_commission": "Every participant pays the commission when opposing opinions on the prediction are being matched. On the blockchain, the commission is the market fee of this new asset.", - "tooltip_condition": "The condition is a statement that can be resolved unambiguous to correct or incorrect at the resolution state.", - "tooltip_description": "The description gives background information that help the user understand the significance of the prediction.", - "tooltip_resolution_date": "The point in time at which the prediction will be resolved. This needs to be done manually by you as the asset owner.", - "tooltip_symbol": "A prediction market asset has a symbol just like any other assets. Pick a symbol with 5 or more letters to minimize the creation fee.", - "warning": "Fill all blanks" + "backing_asset": "Актив обеспечения", + "commission": "Комиссия (в %)", + "condition": "Условие", + "description": "Описание", + "resolution_date": "Дата подведения итога", + "select_date_and_time": "Указать дату и время", + "symbol": "Тикер", + "title": "Создать рынок прогнозов", + "tooltip_backing_asset": "Актив обеспечения будет использоваться для оплаты премии, т.е. это левередж, который используют участники.", + "tooltip_commission": "При сопоставлении противоположных мнений о прогнозе каждый участник платит комиссию. Комиссия в блокчейне – рыночная комиссия этого нового актива.", + "tooltip_condition": "Условие – это заявление, которое при подведении итога можно разрешить однозначно: верно оно или неверно.", + "tooltip_description": "Описание даёт справочную информацию, которая помогает пользователю понять значение прогноза.", + "tooltip_resolution_date": "Момент времени, в который будет подведён итог прогноза. Это должен сделать вручную владелец актива.", + "tooltip_symbol": "Актив прогнозного рынка имеет тикер, как и любой другой актив. Выберите тикер из 5 или более букв, чтобы минимизировать комиссию за создание.", + "warning": "Заполните все поля" }, "details": { - "add_prediction": "Add prediction", - "all": "All", - "amount": "Amount", - "cancel": "Cancel", - "commission": "Commission", - "fee": "Fee", - "i_think_that": "I think that the prediction", - "incorrect": "Is incorrect", - "list_of_current_prediction_offers": "List of current prediction offers", - "oppose": "Oppose", - "potential_profit": "Potential Winnings", - "predicated_likelihood": "Predicated Likelihood", - "prediction": "Prediction", - "predictor": "Predictor", - "premium": "Premium", - "proves_true": "Proves true" + "add_prediction": "Добавить прогноз", + "all": "Все", + "amount": "Сумма", + "cancel": "Отменить", + "commission": "Комиссия", + "fee": "Комиссия", + "i_think_that": "Я полагаю, что прогноз ", + "incorrect": "неверный", + "list_of_current_prediction_offers": "Список текущих предложенных прогнозов", + "oppose": "Противопоставить", + "potential_profit": "Потенциальный выигрыш", + "predicated_likelihood": "Прогнозируемая вероятность", + "prediction": "Прогноз", + "predictor": "Прогнозист", + "premium": "Премиум", + "proves_true": "Оказался верным" }, "overview": { - "action": "Action", - "all": "All", - "create_market": "Create Prediction Market", - "description": "Description", - "expiry": "Resolution date", - "hide_invalid_asset": "Hide invalid assets", - "hide_unknown_houses": "Hide unknown houses", - "issuer": "House", - "loading": "Loading...", - "market_confidence": "Market confidence", - "market_predicated_likelihood": "Market predicated likelihood", - "no": "No", - "odds": "Odds", - "open": "Open", - "past_resolution_date": "Past Resolution Time", - "prediction": "Prediction", - "resolve": "Resolve", - "yes": "Yes" + "action": "Действие", + "all": "Все", + "create_market": "Создать рынок прогнозов", + "description": "Описание", + "expiry": "Дата подведения итога", + "hide_invalid_asset": "Скрыть недействительные активы", + "hide_unknown_houses": "Скрыть неизвестные дома", + "issuer": "Дом", + "loading": "Загрузка...", + "market_confidence": "Доверие участников рынка", + "market_predicated_likelihood": "Прогнозируемая рынком вероятность", + "no": "Нет", + "odds": "Шансы", + "open": "Открытый", + "past_resolution_date": "Прошлая дата подведения итога", + "prediction": "Прогноз", + "resolve": "Подвести итог", + "yes": "Да" }, "resolve_modal": { - "prediction": "Prediction", - "proven_true": "... has proven true", - "resolution": "Resolution", - "symbol": "Symbol", - "the_prediction_has": "The prediction ...", - "title": "Resolve Prediction Market Asset", - "was_incorrect": "... was incorrect" + "prediction": "Прогноз", + "proven_true": "... оказался верным", + "resolution": "Итог", + "symbol": "Тикер", + "the_prediction_has": "Прогноз ... ", + "title": "Подвести итог по активу рынка прогнозов", + "was_incorrect": "... был неверным" }, "tooltips": { - "add_prediction": "A prediction is reflected as a limit order on the market of the prediction market asset with its collateral. This lets you create a buy order (you agree with the prediction), or a sell order with previous borrowing of the prediction market asset (you disagree with the prediction). You can also oppose one of the existing predictions listed below, which correlates to matching one of the existing limit orders on the blockchain.", - "create_prediction_market_asset": "A prediction market is a special kind of SmartCoin. This lets you create such a prediction market asset with inputs tailored for this purpose.", - "hide_invalid_asset": "Per default the table below only shows prediction market assets that meet common standards required for a consistent user experience (prediction and resolution date are given, and reasonable market fee). Uncheck this to show all assets that exist on the blockchain, and make sure you know what you are doing.", - "hide_unknown_houses": "Per default the table below only shows prediction market assets of known asset owners that meet requirements to increase their trustworthiness. As a participant, you need trust in the asset owner such that the asset will be resolved according to the real world outcome. Uncheck this to show all asset owners that exist on the blockchain, and make sure you know what you are doing. If you are the owner of a prediction market asset and want to be included in the default list, please contact the BitShares community.", - "oppose_is_incorrect": "You are opposing someone that thinks the prediction is incorrect. That means, you think the prediction will prove true. On the blockchain that reflects as buying and hodling the prediction market asset.", - "oppose_proves_true": "You are opposing someone that thinks the prediction proves true. That means, you think the prediction will be incorrect. On the blockchain that reflects as borrowing and selling the prediction market asset.", - "what_is_a_prediction_market_asset": "A prediction market asset is a special kind of asset that allows you to agree or disagree with the prediction statement of the asset and put collateral behind your opinion. It can be created by any user, and if you are participating you need to trust the asset owner to properly reflects the real world outcome on the blockchain.", - "what_is_a_prediction_offer": "A prediction offer reflects limit orders on the market of the prediction market asset and its collateral. Agreement with the prediction (Prediction proves true) means that you want to buy the prediction market asset, disagreement (Prediction is incorrect) means that you borrow the prediction market asset and sell it" + "add_prediction": "Прогноз отображается как лимитный ордер на рынке прогнозного актива вместе с его обеспечением. Это позволяет создать ордер на покупку (вы соглашаетесь с прогнозом) или ордер на продажу с предшествующим заимствованием актива прогнозного рынка (вы не согласны с прогнозом). Вы также можете противопоставить позицию одному из существующих прогнозов, перечисленных ниже, что соответствует сопоставлению с одним из существующих лимитных ордеров в блокчейне.", + "create_prediction_market_asset": "Прогнозный рынок – это особый вид SmartCoin. Он позволяет вам создать актив прогнозного рынка с исходными данными, специально предназначенными для этой цели.", + "hide_invalid_asset": "По умолчанию в приведенной ниже таблице показаны только активы прогнозного рынка, соответствующие стандартам качественного пользовательского опыта (указаны даты прогноза и подведения итога и разумная комиссия). Снимите этот флажок, чтобы просмотреть все активы, которые существуют в блокчейне, если вы знаете, что делаете.", + "hide_unknown_houses": "По умолчанию в таблице ниже представлены только активы прогнозного рынка известных владельцев активов, которые отвечают требованиям надежности. Вам, как участнику, необходимо доверять владельцу актива в том, что итог по активу будет подведён в соответствии с результатом в реальном мире. Снимите этот флажок, чтобы просмотреть всех владельцев активов, существующих в блокчейне, если вы знаете, что делаете. Если вы являетесь владельцем актива прогнозного рынка и хотите быть включённым в список по умолчанию, обратитесь к сообществу BitShares.", + "oppose_is_incorrect": "Вы противопоставляете позицию тому, кто считает, что прогноз неверен. Это означает, что вы считаете прогноз верным. В блокчейне это отображается как покупка и удержание актива прогнозного рынка.", + "oppose_proves_true": "Вы противопоставляете позицию тому, кто считает, что прогноз верен. Это означает, что вы считаете прогноз неверным. В блокчейне это отображается как заимствование и продажа актива прогнозного рынка.", + "what_is_a_prediction_market_asset": "Актив прогнозного рынка – это особый вид актива, который позволяет вам соглашаться или не соглашаться с прогнозным заявлением актива и размещать обеспечение в соответствии со своим мнением. Он может быть создан любым пользователем, и если вы участвуете, вам нужно доверять владельцу актива в том, что он правильно отобразит реальный результат в блокчейне.", + "what_is_a_prediction_offer": "Прогнозное предложение отражает лимитные ордера на рынке прогнозного актива и его обеспечения. Согласие с прогнозом (прогноз верен) означает, что вы хотите купить актив прогнозного рынка, несогласие (прогноз неверен) означает, что вы заимствуете актив прогнозного рынка и продаёте его." } }, "proposal": { @@ -1970,7 +1962,7 @@ "checkboxRemember": "Я запомнил или иным образом зафиксировал свой пароль и сохранил .bin-файл в безопасном месте.", "checkboxUploaded": "Я осознаю, что в процессе входа в аккаунт нужно загрузить .bin-файл, и что без этого файла я потеряю доступ к своим средствам.", "continue": "Продолжить", - "copyPassword": "Скопируйте и сохраните свой пароль.", + "copyPassword": "Скопировать пароль", "createAccountTitle": "Создать аккаунт из .bin-файла", "createByPassword": "Создать аккаунт с именем и паролем", "downloadFile": "Загрузить файл", @@ -1982,7 +1974,7 @@ "securityWalletModel": "Высокий", "select": "Выбрать", "title": "Регистрация", - "walletDescription": "bin-файл будет создан автоматически. Пожалуйста, скачайте и сохраните его в безопасном месте. В будущем вам нужно будет загрузить этот файл, чтобы войти в свой аккаунт. ", + "walletDescription": "Ваш bin-файл будет создан автоматически. Пожалуйста, скачайте и сохраните его в безопасном месте. В будущем вам нужно будет загрузить этот файл, чтобы войти в свой аккаунт. ", "walletLoginByValue": "bin-файл + пароль", "walletModelTitle": "с bin-файлом", "walletNote": "Пожалуйста, имейте в виду, что BitShares не хранит пароли пользователей и не может восстановить их аккаунты в случае утери пароля.", @@ -2014,7 +2006,6 @@ }, "settings": { "access": "Узлы", - "access_text": "", "accounts": "Аккаунты", "accounts_text": "Список ваших аккаунтов", "activate": "Активировать", @@ -2047,27 +2038,27 @@ "browser_notifications_additional_transfer_to_me": "Уведомлять о переводах на мой аккаунт", "browser_notifications_allow": "Включить уведомления", "browser_notifications_disabled_by_browser_notify": "В вашем браузере отключены уведомления. Нажмите, чтобы узнать, как их включить", - "can_change_default_fee_asset_tooltip": "The default asset used to pay transaction fees can be changed in the settings", - "change": "Change", - "change_default": "Change default", - "change_default_fee_asset": "Change default fee asset", - "change_default_fee_asset_tooltip": "Change the default asset that is used to pay the transaction fee", + "can_change_default_fee_asset_tooltip": "Актив, по умолчанию используемый для оплаты комиссий за транзакции, можно изменить в настройках", + "change": "Изменить", + "change_default": "Изменить по умолчанию", + "change_default_fee_asset": "Изменить актив оплаты комиссий по умолчанию", + "change_default_fee_asset_tooltip": "Изменить актив, используемый для оплаты комиссий по умолчанию", "cloud_login": "Вход в облачный кошелек", "confirmMarketOrder": "Запрашивать подтверждение рыночных ордеров", "confirm_no": "Никогда", "confirm_remove": "Вы уверены, что хотите удалить %(name)s из вашего списка доступных узлов?", "confirm_yes": "Всегда", "connection_error": "Не удается подключиться к узлу API %(url)s, возврат к известным рабочим узлам. Ошибка: %(error)s", - "current_fee_asset": "Current fee asset is: ", - "custom": "Custom", + "current_fee_asset": "Текущий актив комиссий:", + "custom": "Специальные", "darkTheme": "Тёмная тема", "delete_select": "Выберите локальный кошелёк для удаления", "disabled": "Отключен", "enable_wallet": "Переключиться на локальный кошелёк", "faucet_address": "Адрес сервера-крана (faucet)", "faucet_address_text": "Адрес сервера-крана, который используется для оплаты регистрационного сбора для новых пользователей.", - "fee_asset": "Default fee paying asset", - "filteredServiceProviders": "External service providers (Gateways, Bridges)", + "fee_asset": "Актив оплаты комиссий по умолчанию", + "filteredServiceProviders": "Провайдеры внешних сервисов (шлюзы, мосты)", "general": "Общие", "general_text": "Изменить основные настройки.", "global_settings": "Общие настройки по умолчанию", @@ -2115,7 +2106,7 @@ "scrollbars_hide": "Сократить полосы прокрутки", "show": "Показать", "showAssetPercent": "Показать процентное соотношение активов на странице аккаунтов", - "showProposedTx": "Показывать предложенные транзакции", + "showProposedTx": "Показывать предложенные транзакции на панели", "showSettles": "Показать ордера на погашение на графике глубины", "skipped": "Пропущенные", "switch": "Сменить узел", @@ -2200,8 +2191,7 @@ }, "steps_costs": { "text": "Более длинный текст Более длинный текст Более длинный текст Более длинный текст Более длинный текст Более длинный текст Более длинный текст Более длинный текст Более длинный текст", - "title": "Погашение", - "title_within": "" + "title": "Погашение" }, "steps_introduction": { "text": "Используйте это нативное децентрализованное приложение на базе блокчейна BitShares для управления обеспечением депозита и генерацией SmartCoins.", @@ -2238,7 +2228,7 @@ "limit": "лимит", "limit_per_period": "Максимальная сумма за период", "num_of_periods": "Количество периодов", - "payer_balance_not_sufficient": "There are not enough funds in the payer's account to claim the full limit amount of {limit}. The limit has been adjusted to reflect the currently available balance!", + "payer_balance_not_sufficient": "На аккаунте плательщика недостаточно средств, чтобы востребовать полную сумму лимита {limit}. Лимит был скорректирован с учётом текущего доступного баланса!", "period": "Укажите определённый период", "start_date": "Первый период начнётся ", "title": "Прямой дебет", @@ -2294,20 +2284,20 @@ } }, "instant_trade": { - "description": "Instantly execute market orders in a simplified interface.", - "title": "Instant trade" + "description": "Мгновенное выполнение рыночных ордеров в упрощенном интерфейсе.", + "title": "Мгновенная сделка" }, "merchant_protocol": { - "description": "Create, view and pay remittance requests or invoices", - "title": "Merchant Protocol" + "description": "Создание, просмотр и оплата запросов на переводы или инвойсов", + "title": "Торговый протокол" }, "paper_wallet": { "description": "Создайте PDF-файл с напечатанными ключами вашего аккаунта (простой текст и штрих-код). Если кошелек разблокирован, в файл также добавляются приватные ключи.", "title": "Бумажный кошелёк" }, "prediction_market": { - "description": "Create a prediction into the future that others can agree or disagree with, leveraged with collateral.", - "title": "Prediction Markets" + "description": "Создайте прогноз на будущее, с которым другие могут согласиться или не согласиться, используя залоговое обеспечение.", + "title": "Рынки прогнозов" }, "timed_transfer": { "description": "Инициируйте перевод, который будет выполнен в указанное время.", @@ -2391,7 +2381,7 @@ "nodes_popup": "Нажмите здесь, чтобы открыть всплывающее окно настроек доступа, позволяющее вам при необходимости переключаться между узлами", "over_limit": "Мост не обладает достаточным количеством желаемого актива для данного ордера на покупку", "own_account": "Вы обладаете ключами от этого аккаунта", - "print_receipt": "Click here to create pdf receipt", + "print_receipt": "Нажмите здесь, чтобы создать чек в формате pdf", "propose_scam": "Это предложение было создано известным мошенником или человеком из вашего чёрного списка – подтверждение невозможно!", "propose_tip": "Предложить другому пользователю инициировать транзакцию", "propose_unhide": "Не снимайте эту галочку, если не уверены в своих действиях", @@ -2409,14 +2399,14 @@ "scam_account": "Аккаунт подозревается в мошенничестве", "self_help": "В зависимости от используемой в данный момент панели это откроет справочное руководство с пояснениями о том, что вы видите в данный момент, или общий справочный раздел кошелька.", "settle": "Погашение позволит вам обменять ваши %(asset)s на %(backingAsset)s с задержкой в %(settleDelay)s часа по цене, равной цене котировок на момент погашения.", - "settle_market_prediction": "Settling a prediction market asset is only possible after its resolution.", + "settle_market_prediction": "Расчёт актива прогнозного рынка возможен только после подведения итога.", "settle_price": "Это цена, при которой будут исполняться ордера на погашение.", "show_asset": "Нажмите здесь, чтобы отобразить этот актив в основном списке.", "show_block": "Нажмите здесь, чтобы увидеть блок #%(block)s, в котором произведена транзакция.", "sign_owner": "Если вы – владелец данного аккаунта, пожалуйста, подтвердите это, чтобы обеспечить правильность подписи транзакции. Это необходимо только если вы используете аккаунт владельца, и этот аккаунт не включен в активные права доступа.", "sync_no": "Данный узел не синхронизирован с блокчейном, попробуйте переключиться на другой", "sync_yes": "Данный узел синхронизирован с блокчейном", - "target_collateral_ratio": "Установление целевого коэффициента обеспечения (TCR) позволит блокчейну автоматически продавать необходимое количество вашего залога, дабы удерживать ваш коэффициент обеспечения равным или выше указанного вами TCR, когда ценность вашего залогового обеспечения падает.

Чтобы совершать частые продажи небольших сумм, установите низкую цель (напр. < 2)

. Чтобы совершать нечастые продажи более крупных сумм, установите высокую цель (напр. > 3)", + "target_collateral_ratio": "Установление целевого коэффициента обеспечения (TCR) позволит блокчейну автоматически продавать необходимое количество вашего залога, дабы удерживать ваш коэффициент обеспечения равным или выше указанного вами TCR, когда ценность вашего залогового обеспечения падает. Чтобы совершать частые продажи небольших сумм, установите низкую цель (напр. < 2). Чтобы совершать нечастые продажи более крупных сумм, установите высокую цель (напр. > 3)", "transfer_actions": "Нажмите здесь, чтобы совершить перевод или разместить депозит/вывести те активы, которые это позволяют.", "unlock_account_name": "Нажмите, чтобы изменить имя аккаунта, например, когда ваш аккаунт установлен в списке прав доступа другого аккаунта.", "update_position": "Нажмите здесь, чтобы обновить вашу позицию. Вы в любой момент сможете изменить уровни долга и/или обеспечения вашей позиции.", @@ -2475,7 +2465,7 @@ "fee": "Обычная комиссия за транзакцию", "fee_per_day": "Цена за день", "fee_per_kb": "Цена за Кбайт размера транзакции", - "long_symbol": "Длинные символы", + "long_symbol": "Длинные тикеры", "membership_annual_fee": "Годовое членство", "membership_lifetime_fee": "Пожизненное членство", "premium_fee": "Комиссия для премиум имён", @@ -2493,14 +2483,14 @@ "fund_pool": "пополнил пул комиссий %(asset)s на", "funding_account": "Аккаунт финансирования", "global_parameters_update": "Обновил глобальные параметры", - "hide": "Hide", + "hide": "Скрыть", "inputs": "Входы", "market_fee": "Рыночная комиссия", "max_market_fee": "Максимальная рыночная комиссия", "min_receive": "Минимальное принимаемое количество", "new_url": "Веб-сайт", "obtain": "получить", - "operations": "Operations", + "operations": "Действия", "order_id": "ID ордера", "outputs": "Выходы", "paid": "оплачена", @@ -2509,7 +2499,7 @@ "seller": "Продавец", "sent": "отправлена", "settlement_date": "Дата погашения", - "show_more": "Show more", + "show_more": "Показать больше", "to": "кому", "transaction_confirmed": "Транзакция подтверждена", "trxTypes": { @@ -2535,7 +2525,7 @@ "asset_update": "Обновить актив", "asset_update_bitasset": "Обновить SmartCoin", "asset_update_feed_producers": "Обновить производителей котировок актива", - "asset_update_issuer": "Обновить эмитента актива", + "asset_update_issuer": "Обновить владельца актива", "balance_claim": "Востребовать баланс", "bid_collateral": "Залоговая ставка", "blind_transfer": "Слепой перевод", @@ -2573,7 +2563,7 @@ "worker_create": "Создание работника" }, "vesting_balance_create": "создал вестинговый баланс", - "view_json": "Show raw json", + "view_json": "Показать необработанный json", "waiting": "Ожидание подтверждения...", "whitelist_states": { "black_listed": "В чёрном списке", @@ -2588,7 +2578,7 @@ }, "transfer": { "again": "СДЕЛАТЬ НОВЫЙ ПЕРЕВОД", - "amount": "Количество", + "amount": "Сумма", "available": "Доступно", "back": "НАЗАД", "balances": "Балансы", @@ -2601,7 +2591,7 @@ "copy_address": "Скопировать адрес", "copy_memo": "Скопировать мемо", "errors": { - "asset_unsupported": "Asset %(currency)s is not supported by this blockchain.", + "asset_unsupported": "Актив %(currency)s не поддерживается данным блокчейном.", "balance": "Итоговый баланс должен быть больше нуля", "insufficient": "Недостаточно средств", "memo_error": "Произошла ошибка считывания мемо перевода, пожалуйста, повторите попытку позже.", @@ -2610,11 +2600,11 @@ "noFeeBalance": "Средств на вашем балансе недостаточно для оплаты комиссии с использованием данного актива, пожалуйста, выберите другой актив для оплаты комиссии", "noFunds": "Нет средств", "noPoolBalance": "Средств на балансе пула комиссий этого актива недостаточно для оплаты комиссий. Пожалуйста, сообщите об этом владельцу актива или выберите другой актив для оплаты комиссий.", - "noPoolBalanceShort": "Fee pool empty", + "noPoolBalanceShort": "Пул комиссий пуст", "pos": "Сумма должна быть положительной", "precision": "Минимальное значение точности для вывода: %(precision)s", "req": "Обязательно для заполнения", - "unknown": "Unknown error", + "unknown": "Неизвестная ошибка", "valid": "Пожалуйста, введите правильное, положительное число" }, "explict_price": "Заданная цена:", @@ -2631,8 +2621,8 @@ "phase_out_warning": "Мы рекомендуем использовать новое {modal_link} модальное окно, поскольку эта страница будет упразднена", "see": "ПОКАЗАТЬ МОИ ПЕРЕВОДЫ", "send": "Отправить", - "to": "To", - "total": "Total: ", + "to": "Кому", + "total": "Итого:", "warn_name_unable_read_memo": "Предупреждение: %(name)s не сможет прочесть это мемо" }, "trx_error": { @@ -2643,10 +2633,10 @@ "asset_select_placeholder": "Выберите актив", "total_x_assets": "Всего %(count)s активов", "total_x_items": "Всего %(count)s позиций", - "total_x_items_y_hidden": "Total of %(totelCount)s items loaded, %(count)s of those shown in pagination", + "total_x_items_y_hidden": "Всего загружено %(totelCount)s элементов, %(count)s из которых отображены в нумерации страниц", "total_x_markets": "Всего %(count)s рынков", "total_x_operations": "Всего %(count)s операций", - "x_assets_hidden": "%(count)s of %(total)s assets filtered out" + "x_assets_hidden": "Отфильтровано %(count)s из %(total)s активов " }, "validation": { "messages": { @@ -2669,7 +2659,6 @@ "rangeNamed": "%(name)s должен быть в диапазоне от %(min)s до %(max)s", "required": "Поле обязательно для заполнения", "requiredNamed": "%(name)s обязательно", - "test": "", "types": { "array": "Поле должно содержать массив", "arrayNamed": "%(name)s должен быть массивом", @@ -2735,7 +2724,7 @@ "ask_to_select_wallet": "Пожалуйста, выберите файл резервной копии ключей", "back": "Назад", "backup_brainkey": "Резервный Brainkey", - "backup_explain": "Нажав на кнопку ниже, вы создадите резервную копию с расширением .bin. Этот файл зашифрован паролем вашего кошелька и содержит все приватные ключи вашего аккаунта. Он может быть использован для восстановления вашего кошелька или его перемещения на другой компьютер/браузер.", + "backup_explain": "Нажав на кнопку ниже, вы создадите файл резервной копии с расширением .bin. Этот файл зашифрован паролем вашего кошелька и содержит все приватные ключи вашего аккаунта. Он может быть использован для восстановления вашего кошелька или его перемещения на другой компьютер/браузер.", "backup_login": "Резервное копирование и вход в систему", "backup_new_account": "Поздравляем, вы только что создали новый аккаунт в %(wallet_name)s, работающем на базе блокчейна BitShares! Настоятельно рекомендуем вам сразу же создать резервную копию кошелька. Без резервной копии восстановить ваш аккаунт в случае повреждения компьютера будет невозможно.", "backup_types": "Типы резервных копий", @@ -2801,7 +2790,7 @@ "has_wallet": "Как только вы создадите ваш первый аккаунт %(wallet_name)s, будет автоматически создан локальный кошелек %(wallet_name)s, который будет храниться в вашем браузере. Этот локальный кошелек зашифрован вашим паролем и содержит все приватные ключи, принадлежащие вашим аккаунтам. Не забудьте создать резервную копию этого кошелька!", "import_20_notice1": "Сначала импортируйте вашу резервную копию BTS 2.0+", "import_20_notice2": "(если таковая имеется)", - "import_backup": "Импортировать резервную копию %(wallet_name)s 2.0 (.bin-файл)", + "import_backup": "Импортировать резервную копию %(wallet_name)s 2.0 (.bin)", "import_backup_choose": "Пожалуйста, выберите вашу резервную копию в окне ниже. Это абсолютно безопасно, так как файл копии никуда не загружается и никогда не покидает ваш браузер.", "import_balance": "Импортировать баланс(ы)", "import_bts": "Импортировать ключи, экспортированные с BTS 0.9.3c", @@ -2814,7 +2803,7 @@ "import_private_key": "Импортировать приватный ключ", "invalid_format": "Недопустимый формат", "key_file": "Файл копии ключей", - "key_file_bin": "Файл резервной копии ключей (.bin)", + "key_file_bin": "Файл ключа или .bin-файл", "last_backup": "Последняя резервная копия", "link_account": "Аккаунт", "link_deposit": "Депозиты", @@ -2905,8 +2894,8 @@ "wallet_move": "Резервная копия также может использоваться для перемещения вашего локального кошелька на другие компьютеры или браузеры. Для восстановления локального кошелька из резервной копии вам также понадобится ваш пароль!", "wallet_password": "Входите откуда угодно, используя пароль", "wallet_types": "Типы кошельков", - "wif_associated_accounts": "Associated Account(s): ", - "wif_import_error": "Please enter a valid WIF", - "wif_length_error": "Incorrect input length" + "wif_associated_accounts": "Связанный аккаунт(ы):", + "wif_import_error": "Пожалуйста, введите действительный WIF", + "wif_length_error": "Неверная длина введённого WIF" } } From 0b87b742b1cf3cfc8eb0555c6716ae2df7af3791 Mon Sep 17 00:00:00 2001 From: sschiessl-bcp Date: Tue, 17 Dec 2019 21:57:18 +0100 Subject: [PATCH 013/141] sync language files Signed-off-by: sschiessl-bcp --- app/assets/locales/locale-ru.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json index 8eba0de6f6..f07e0016d2 100644 --- a/app/assets/locales/locale-ru.json +++ b/app/assets/locales/locale-ru.json @@ -758,6 +758,9 @@ "hide_function_buttons": "Скрыть все кнопки, которыми можно управлять из персонализированной формы", "increase_chart_height": " Увеличить высоту графика", "market_location": "На какую сторону прикрепить вертикальный биржевой стакан. Это поменяет его местами с панелью рынка", + "market_trades": "", + "my_trades": "", + "open_orders": "", "order_book_grouping": "Сгруппировать ордера, которые близки по заданному проценту", "order_style": "Использовать вертикальный биржевой стакан для прикрепления к боковой панели", "orderbook_auto_scroll": "Автоматически прокручивать биржевой стакан для просмотра новых ордеров. Отключите, чтобы разрешить прокрутку", @@ -768,6 +771,7 @@ "reduce_scrollbars": "Отключить полосы прокрутки по умолчанию", "reload": "Изменение этой опции вступит в силу только после ручной перезагрузки", "reverse_order_book": "Отобразить биржевой стакан в обратном порядке, чтобы ордера на покупку отображались сверху", + "settlements": "", "show_market_depth": "Показывать глубину рынка", "show_price_chart": " Показывать график цен", "single_colum_order_form": "Закрепить цену, количество, общую сумму и т.п. в одной колонке (неподвижно)" @@ -951,6 +955,7 @@ }, "assets": { "backing_asset": "Актив обеспечения", + "blacklisted": "This asset is blacklisted, beware of scam attempts!", "id": "ID", "issuer": "Владелец актива", "market": "SmartCoins", @@ -1074,6 +1079,8 @@ "short": "Мост", "what_is": "Что такое мост?" }, + "disabled_asset_1": "This asset is managed by an external service provider (gateway). Currently deposits and withdrawals for this asset are disabled", + "disabled_asset_2": "For more information visit Settings -> Entry External Service Providers. For any issues or questions please contact the gateway operator directly.", "expect_more": "Если вы хотите увидеть больше возможностей депозита и вывода для своих активов, ознакомьтесь с провайдерами внешних сервисов в разделе Настройки > Общие.", "gateway": { "description": "Шлюзы – это провайдеры внешних сервисов, которые позволяют вам вносить депозиты, торговать и выводить не нативные активы в блокчейне BitShares. Например, вы можете отправить свои BTC в блокчейне Bitcoin на шлюз, который, в свою очередь, выдаст вам UIA (выпущенный пользователем актив) в блокчейне BitShares, с возможностью вывести его снова (с оплатой комиссии). Пока вы держите такой UIA в блокчейне BitShares, шлюз является хранителем ваших средств. Поскольку это внешние провайдеры, вы косвенно соглашаетесь с их условиями использования сервисов или активов.", @@ -1148,6 +1155,7 @@ "open": "Актив %(asset)s обеспечивается реальными %(backed)s в соотношении 1:1 и может быть депонирован или выведен с помощью сервиса шлюза от OpenLedger.", "rudex": "Актив %(asset)s обеспечивается реальными %(backed)s в соотношении 1:1 и может быть депонирован или выведен с помощью сервиса шлюза от Rudex.", "trade": "Актив %(asset)s обеспечивается реальными %(backed)s в соотношении 1:1 и может быть депонирован или выведен с помощью сервиса шлюза от Blocktrades.", + "win": "", "xbtsx": "Актив %(asset)s обеспечен реальными %(backed)s в соотношении 1:1 и может быть введён/выведен с помощью сервиса шлюза от XBTS." }, "balance": "Текущий баланс", @@ -2006,6 +2014,7 @@ }, "settings": { "access": "Узлы", + "access_text": "", "accounts": "Аккаунты", "accounts_text": "Список ваших аккаунтов", "activate": "Активировать", @@ -2191,7 +2200,8 @@ }, "steps_costs": { "text": "Более длинный текст Более длинный текст Более длинный текст Более длинный текст Более длинный текст Более длинный текст Более длинный текст Более длинный текст Более длинный текст", - "title": "Погашение" + "title": "Погашение", + "title_within": "" }, "steps_introduction": { "text": "Используйте это нативное децентрализованное приложение на базе блокчейна BitShares для управления обеспечением депозита и генерацией SmartCoins.", @@ -2659,6 +2669,7 @@ "rangeNamed": "%(name)s должен быть в диапазоне от %(min)s до %(max)s", "required": "Поле обязательно для заполнения", "requiredNamed": "%(name)s обязательно", + "test": "", "types": { "array": "Поле должно содержать массив", "arrayNamed": "%(name)s должен быть массивом", From 9996d636773e540b2f877ff34d7223f3eab31fb1 Mon Sep 17 00:00:00 2001 From: startail Date: Mon, 30 Dec 2019 17:33:54 +0100 Subject: [PATCH 014/141] Always view settle orders - Settle orders that aren't settled should still display --- app/components/Exchange/OpenSettleOrders.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/Exchange/OpenSettleOrders.jsx b/app/components/Exchange/OpenSettleOrders.jsx index 91eba041a7..e17488d810 100644 --- a/app/components/Exchange/OpenSettleOrders.jsx +++ b/app/components/Exchange/OpenSettleOrders.jsx @@ -154,14 +154,14 @@ class OpenSettleOrders extends React.Component { return a.isBefore(b) ? -1 : 1; }) .map(order => { - return Date.now() < order.settlement_date ? ( + return ( - ) : null; + ); }) .toArray(); } From 0fab9039b758a505936dbd3b7f98329008b2883d Mon Sep 17 00:00:00 2001 From: startail Date: Wed, 1 Jan 2020 20:40:49 +0100 Subject: [PATCH 015/141] Depth Chart Fix Markets without Asks/Bids would crash DepthChart rendering Example: SGD_BTS --- app/stores/MarketsStore.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/stores/MarketsStore.js b/app/stores/MarketsStore.js index ea45e92148..9d187c3413 100644 --- a/app/stores/MarketsStore.js +++ b/app/stores/MarketsStore.js @@ -1227,7 +1227,7 @@ class MarketsStore { 1000 ); - if (flat_bids.length) { + if (flat_bids.length > 0) { flat_bids.unshift([0, flat_bids[0][1]]); } @@ -1237,7 +1237,8 @@ class MarketsStore { false, 1000 ); - if (flat_asks.length) { + + if (flat_asks.length > 0) { flat_asks.push([ flat_asks[flat_asks.length - 1][0] * 1.5, flat_asks[flat_asks.length - 1][1] @@ -1287,7 +1288,7 @@ class MarketsStore { 1000 ); if ( - flat_asks.length && + flat_asks.length > 0 && flat_calls[flat_calls.length - 1][0] < flat_asks[flat_asks.length - 1][0] ) { @@ -1333,7 +1334,7 @@ class MarketsStore { if (!this.feedPrice.inverted) { flat_settles.unshift([0, flat_settles[0][1]]); - } else { + } else if (flat_asks.length > 0) { flat_settles.push([ flat_asks[flat_asks.length - 1][0], flat_settles[0][1] @@ -1381,7 +1382,7 @@ class MarketsStore { 1000 ); - if (flat_bids.length) { + if (flat_bids.length > 0) { flat_bids.unshift([0, flat_bids[0][1]]); } @@ -1391,7 +1392,7 @@ class MarketsStore { false, 1000 ); - if (flat_asks.length) { + if (flat_asks.length > 0) { flat_asks.push([ flat_asks[flat_asks.length - 1][0] * 1.5, flat_asks[flat_asks.length - 1][1] From 00a8c233352c9c5cced26c21a431f437f99e08bf Mon Sep 17 00:00:00 2001 From: froooze <40874087+froooze@users.noreply.github.com> Date: Thu, 9 Jan 2020 01:29:12 +0100 Subject: [PATCH 016/141] remove margin for top-bar --- app/assets/stylesheets/components/_header.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/components/_header.scss b/app/assets/stylesheets/components/_header.scss index d2e6024675..e722ef1cde 100644 --- a/app/assets/stylesheets/components/_header.scss +++ b/app/assets/stylesheets/components/_header.scss @@ -85,6 +85,10 @@ div.header-right-menu { } } +ul.top-stats { + margin-bottom: 0px !important; // remove margin for top-bar +} + .grp-menu-items-group { flex-flow: row nowrap; display: flex; From 7c84c44eeb9e88c511e2c482d4778a6d99e9ac66 Mon Sep 17 00:00:00 2001 From: mirotincev Date: Fri, 17 Jan 2020 17:47:30 +0300 Subject: [PATCH 017/141] fixed gateways fixedMemo --- app/lib/common/gateways.js | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index 98eda74051..60979a3bfb 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -197,21 +197,10 @@ export const availableGateways = { baseAPI: deexAPIs, isSimple: true, simpleAssetGateway: false, - fixedMemo: {prepend: "dex:", append: ""}, - isEnabled: _isEnabled("DEEX"), - addressValidatorMethod: "POST", - options: { - enabled: false, - selected: false - } - }, - DEEX: { - id: "DEEX", - name: "DEEX", - baseAPI: deexAPIs, - isSimple: true, - simpleAssetGateway: false, - fixedMemo: {prepend: "dex:", append: ""}, + fixedMemo: { + prepend_default: "dex:", + append: "" + }, isEnabled: _isEnabled("DEEX"), addressValidatorMethod: "POST", options: { From d089f5009311338bb46f248604fc30b48e35449a Mon Sep 17 00:00:00 2001 From: mirotincev Date: Mon, 3 Feb 2020 13:07:43 +0300 Subject: [PATCH 018/141] Add landing and wallet links --- app/lib/common/gateways.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index 60979a3bfb..c215b933e1 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -206,7 +206,9 @@ export const availableGateways = { options: { enabled: false, selected: false - } + }, + landing: "https://deex.one/", + wallet: "https://deex.exchnage/" } }; From 9f149010440bda9d169556b34a190f83e71c2496 Mon Sep 17 00:00:00 2001 From: mirotincev Date: Tue, 4 Feb 2020 10:13:56 +0300 Subject: [PATCH 019/141] =?UTF-8?q?=F0=9F=A4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/lib/common/gateways.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index c215b933e1..277c5f8219 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -208,7 +208,7 @@ export const availableGateways = { selected: false }, landing: "https://deex.one/", - wallet: "https://deex.exchnage/" + wallet: "https://deex.exchange/" } }; From 70cf33deb97eb015956539f45e4e414c4aa84bd7 Mon Sep 17 00:00:00 2001 From: froooze <40874087+froooze@users.noreply.github.com> Date: Wed, 19 Feb 2020 15:28:47 +0100 Subject: [PATCH 020/141] Use BTS as find market basic pair --- app/components/Exchange/MyMarkets.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/Exchange/MyMarkets.jsx b/app/components/Exchange/MyMarkets.jsx index a5271acc96..34a9c99088 100644 --- a/app/components/Exchange/MyMarkets.jsx +++ b/app/components/Exchange/MyMarkets.jsx @@ -336,8 +336,8 @@ class MyMarkets extends React.Component { lookupBase: null, inputValue: "", minWidth: "100%", - findBaseInput: "USD", - activeFindBase: "USD" + findBaseInput: "BTS", + activeFindBase: "BTS" }; this._setMinWidth = this._setMinWidth.bind(this); From 84b454d9e2d4fadf8416305cb2c34c9e115feb72 Mon Sep 17 00:00:00 2001 From: froooze <40874087+froooze@users.noreply.github.com> Date: Wed, 19 Feb 2020 16:55:17 +0100 Subject: [PATCH 021/141] Remove SPARKDEX and BRIDGE --- app/branding.js | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/app/branding.js b/app/branding.js index 64721cf63e..fffc19f1c9 100644 --- a/app/branding.js +++ b/app/branding.js @@ -202,17 +202,6 @@ export function getMyMarketsQuotes() { "RUDEX.SMOKE", "RUDEX.GRC" ], - sparkTokens: [ - "ZEPH", - "PEG.PHP", - "SPARKDEX.ETH", - "SPARKDEX.BTC", - "SPARKDEX.HKD", - "SPARKDEX.SGD", - "SPARKDEX.AUD", - "SPARKDEX.EUR", - "SPARKDEX.GBP" - ], xbtsxTokens: [ "XBTSX.STH", "XBTSX.POST", @@ -356,18 +345,7 @@ export function getFeaturedMarkets(quotes = []) { ["BTS", "RUDEX.SMOKE"], ["BTS", "XBTSX.STH"], ["BTS", "XBTSX.WAVES"], - ["BTS", "ZEPH"], ["BTS", "HERTZ"], - ["BTS", "SPARKDEX.BTC"], - ["BTS", "SPARKDEX.ETH"], - ["BTS", "SPARKDEX.HKD"], - ["SPARKDEX.HKD", "SPARKDEX.BTC"], - ["SPARKDEX.HKD", "SPARKDEX.ETH"], - ["BTS", "SPARKDEX.SGD"], - ["BTS", "SPARKDEX.AUD"], - ["BTS", "SPARKDEX.EUR"], - ["BTS", "SPARKDEX.GBP"], - ["BTS", "PEG.PHP"] ].filter(a => { if (!quotes.length) return true; return quotes.indexOf(a[0]) !== -1; @@ -386,10 +364,8 @@ export function getAssetNamespaces() { return [ "OPEN.", "RUDEX.", - "BRIDGE.", "GDEX.", "XBTSX.", - "SPARKDEX.", "CITADEL." ]; } @@ -413,10 +389,8 @@ export function allowedGateway(gateway) { "TRADE", "OPEN", "RUDEX", - "BRIDGE", "GDEX", "XBTSX", - "SPARKDEX", "CITADEL" ]; if (!gateway) { From 2fafde7988b572d7db6d533658460a9851e4f6ce Mon Sep 17 00:00:00 2001 From: froooze <40874087+froooze@users.noreply.github.com> Date: Wed, 19 Feb 2020 17:29:05 +0100 Subject: [PATCH 022/141] Remove Bridge tokens --- app/branding.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/branding.js b/app/branding.js index 64721cf63e..4ec9dc706c 100644 --- a/app/branding.js +++ b/app/branding.js @@ -136,7 +136,6 @@ export function getMyMarketsQuotes() { "SILVER", "USD" ], - bridgeTokens: ["BRIDGE.BCO", "BRIDGE.BTC", "BRIDGE.MONA", "BRIDGE.ZNY"], gdexTokens: [ "GDEX.BTC", "GDEX.BTO", From 1349fc5968ba8f09932367ec7df0db79279641a1 Mon Sep 17 00:00:00 2001 From: litepresence Date: Wed, 19 Feb 2020 18:39:53 -0500 Subject: [PATCH 023/141] Use BTC as default market search instead of OPEN This would eliminate behavior of pointing at defunct OPEN markets and make the default behavior gateway uia and mpa agnostic --- app/components/Exchange/MyMarkets.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/Exchange/MyMarkets.jsx b/app/components/Exchange/MyMarkets.jsx index a5271acc96..b8f76d9ad7 100644 --- a/app/components/Exchange/MyMarkets.jsx +++ b/app/components/Exchange/MyMarkets.jsx @@ -354,7 +354,7 @@ class MyMarkets extends React.Component { nextState.activeTab === "find-market" && !nextProps.searchAssets.size ) { - this._lookupAssets("OPEN.", true); + this._lookupAssets("BTC", true); } if (this.state.activeTab !== nextState.activeTab) { @@ -419,7 +419,7 @@ class MyMarkets extends React.Component { this._setMinWidth(); if (this.state.activeTab === "find-market") { - this._lookupAssets("OPEN.", true); + this._lookupAssets("BTC", true); } if (this.state.activeTab !== this.props.activeTab) { From 21876ed80d14a236adbd2d6b1eb60c175fd8ac7d Mon Sep 17 00:00:00 2001 From: froooze <40874087+froooze@users.noreply.github.com> Date: Fri, 21 Feb 2020 05:55:42 +0100 Subject: [PATCH 024/141] Collateral is not part of total value --- app/components/Account/AccountPortfolioList.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/components/Account/AccountPortfolioList.jsx b/app/components/Account/AccountPortfolioList.jsx index 1e034503f7..ff2b90bd08 100644 --- a/app/components/Account/AccountPortfolioList.jsx +++ b/app/components/Account/AccountPortfolioList.jsx @@ -1071,8 +1071,7 @@ class AccountPortfolioList extends React.Component { const totalValue = balanceToAsset(balanceObject).amount + (orders[asset.get("id")] ? orders[asset.get("id")] : 0) + - this._sumVestingBalances(vestingBalances) + - this._sumCollateralBalances(collateralBalances); + this._sumVestingBalances(vestingBalances); balances.push({ key: asset.get("symbol"), From f8b4177d53bc8279639326bea13387a54cf5203a Mon Sep 17 00:00:00 2001 From: froooze <40874087+froooze@users.noreply.github.com> Date: Mon, 24 Feb 2020 18:38:55 +0100 Subject: [PATCH 025/141] Remove OPEN.Assets from showalways --- app/components/Account/AccountOverview.jsx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/components/Account/AccountOverview.jsx b/app/components/Account/AccountOverview.jsx index 673d2821b5..57f31a67bd 100644 --- a/app/components/Account/AccountOverview.jsx +++ b/app/components/Account/AccountOverview.jsx @@ -29,13 +29,7 @@ class AccountOverview extends React.Component { alwaysShowAssets: [ "BTS" // "USD", - // "CNY", - // "OPEN.BTC", - // "OPEN.USDT", - // "OPEN.ETH", - // "OPEN.MAID", - // "OPEN.STEEM", - // "OPEN.DASH" + // "CNY" ], hideFishingProposals: true, question1: false, From 0759eb5718fc75a4b0bf071071c5aafbce15153a Mon Sep 17 00:00:00 2001 From: Stefan Schiessl Date: Wed, 26 Feb 2020 12:56:20 +0100 Subject: [PATCH 026/141] mark CB as shutdown Signed-off-by: Stefan Schiessl --- .../Gateways/GatewaySelectorModal.jsx | 48 +++++++++++-------- app/lib/common/gateways.js | 4 +- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/app/components/Gateways/GatewaySelectorModal.jsx b/app/components/Gateways/GatewaySelectorModal.jsx index 9ad0bef472..8795f06b04 100644 --- a/app/components/Gateways/GatewaySelectorModal.jsx +++ b/app/components/Gateways/GatewaySelectorModal.jsx @@ -142,16 +142,20 @@ class GatewaySelectorModal extends React.Component { align: "left", render: row => { if (!row.landing) return "-"; - return ( - - External Link - - ); + if (row.landing.startsWith("http")) { + return ( + + External Link + + ); + } else { + return {row.landing}; + } } }, { @@ -162,16 +166,20 @@ class GatewaySelectorModal extends React.Component { align: "left", render: row => { if (!row.wallet) return "-"; - return ( - - External Link - - ); + if (row.wallet.startsWith("http")) { + return ( + + External Link + + ); + } else { + return {row.wallet}; + } } } ]; diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index 253e22064a..6288fd20d5 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -147,8 +147,8 @@ export const availableGateways = { enabled: false, selected: false }, - landing: "https://crypto-bridge.org/", - wallet: "https://wallet.crypto-bridge.org/" + landing: "Shutdown", + wallet: "Shutdown" }, GDEX: { id: "GDEX", From f72c97ab37052d786bfab1fc67c675e589011fb5 Mon Sep 17 00:00:00 2001 From: Stefan Schiessl Date: Wed, 26 Feb 2020 13:11:39 +0100 Subject: [PATCH 027/141] use 2048 bit certificate for dev server #3205 #3206 Signed-off-by: Stefan Schiessl --- ssl/server.crt | 41 +++++++++++++++++++++----------- ssl/server.key | 63 +++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 78 insertions(+), 26 deletions(-) diff --git a/ssl/server.crt b/ssl/server.crt index 3c744066a1..96a6061ad5 100644 --- a/ssl/server.crt +++ b/ssl/server.crt @@ -1,15 +1,30 @@ -----BEGIN CERTIFICATE----- -MIICWTCCAcICCQCbBM5rROyQVzANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJC -VDESMBAGA1UECAwJQml0c2hhcmVzMRIwEAYDVQQHDAlCaXRzaGFyZXMxEjAQBgNV -BAoMCUJpdHNoYXJlczESMBAGA1UECwwJQml0c2hhcmVzMRIwEAYDVQQDDAlCaXRz -aGFyZXMwHhcNMTgwMzI0MTcxNDI3WhcNMTkwMzI0MTcxNDI3WjBxMQswCQYDVQQG -EwJCVDESMBAGA1UECAwJQml0c2hhcmVzMRIwEAYDVQQHDAlCaXRzaGFyZXMxEjAQ -BgNVBAoMCUJpdHNoYXJlczESMBAGA1UECwwJQml0c2hhcmVzMRIwEAYDVQQDDAlC -aXRzaGFyZXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAP7p6jDucc2fCwVI -d+19Uvc3Vrdp4zw1Q0zR4e4ezlGOZ4lr28xnE4j7CqsbXURBlXImh8avYSJroS+A -RwB5UdL8UsT3qcF2WdOL/58g0xX4ErLjOXhZWN/Ujh0Yw8nFQ2B26PDmL9h7KMx7 -46oHzKiXEqdyCE7lzsnD97urPMgrAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEARTtM -OcHgdGDdokeNhUobW4tRF1BOFQge2fcKMsrAdTiIuKI3QDVYnKoFyZLDCqSkvVAA -gr6/nVxDV+yQ/2t+OKPJ4vxLVLz0DbG9HCFX6nfYuFfYWjg7Tf/NgyUexwufsL6c -Gw7VVc1NYd3E/Wyket8gyC1oGFKob0/kfmIxtyo= +MIIFODCCAyCgAwIBAgIUeiRFjkwnGu+dLMuKLkjeFXvEAeYwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wHhcNMjAwMjIzMTczMTUyWhcNMzAw +MjIwMTczMTUyWjAWMRQwEgYDVQQDDAtleGFtcGxlLmNvbTCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBAMxP6WPlqVhNG6kLbPzYhVMfpHHK9lP0rGAlheXG +C+iPzUW2dz/2kiKp1OjwricXwCyqK48cH+h9s95u96cmmYl6mwzI9my3Bm6t368X +OUpaic4NQAEcLMlfuKD9hzRMh4vHAghE3amWOn9rNYPgc4dOBQqR6mb7ZhxgLxWK ++0wvYHwAkuClnkon4eM7xV20XKiBziOjuS1OxFxuUcmfsOm/Oei39/dUL/FbAPll +K24mHVqsEiptfWfFWWifIsFepUHYEyS23xMxGBcKXAvDX1xg8ZwEAul3vXt/d0L7 +0CN+YKwWnYoNGFwQsQJsEww4VLu1YICFxrWVz77qEOwTXwHF3pKLiRpBKdG2c0LS +tDZ5r2CFcBPFiRioZpkvFGQ0SVLx4lSbovv+ZXOEF3S4mWTxasQ/J+/5fBjtht53 +3p3oMLFwFLM02jSnjYrYJlP3M+xqMY65ISAtrPuuyEmqsIdma4ASxryU/d8+jQ+p +Tj38Zu/ZLTVMnalncihN/gVA0SMPCXIlTjD+J1RBlfJizNK4dP0C+JyRQcezv5bK +I28UMWcMdanxOeXn2AoCh3F7MLZNyeo9yzYYpLR2GDDw+A4CdnONW6RzdIh+RE58 +RFyZqPMRn/JOuMBCA+IDgfjIaIwscTN0xLwGeDDY9LyU7e4QQ+yhQ6HQcXwNnft4 +jb0RAgMBAAGjfjB8MB0GA1UdDgQWBBQo9Aa7/ZebFXlbdaGbxXPEdefSZzAfBgNV +HSMEGDAWgBQo9Aa7/ZebFXlbdaGbxXPEdefSZzAPBgNVHRMBAf8EBTADAQH/MCkG +A1UdEQQiMCCCC2V4YW1wbGUuY29tggtleGFtcGxlLm5ldIcEfwAAATANBgkqhkiG +9w0BAQsFAAOCAgEATnMbM9CoKjEdiPAnmj/96TsNN+yuGA/rTIYGnTSTLrASsm+J +M8nevBL350vXSrDH+eN3SpmCUk3ZtA0vP9k/hIVhxz9qoRiKpRMLF6L5fXUdotVF +0JcN0AqNaYFbBXNVT2tDXTHkNCeqEEbkXELIf+kKOl3Na2hiFHRy1VwQtKb6otEs +MIKzdXezi4dy07C66HBholR3GBaEky1zeeAOLMFbJbJETZI5kBxQRMae6DI2jGjI +U5A65bz4XuuCjVGXWdddDMQt0PVdfgOtpNiu8cWdj8OzpGZvDUE9rCcHR9q/Nm6s +MSAkodNkmCPSQrnmR/DGhwADTE9+Xo9686EFd0cvo44HoXxYbXNCbcsxr+elg+tF +Hdq3GvCFwcwLo3xhrwBBoqVLbXLB/IgeSOmyaKDJ/w5X8btBMsLZsItHhvsdZFPD +D2+ajoI9YmqpRQiwQs2PEt2VIyWTrKdfoKzBsn0lBNZ0ggBWDNK/SKwhXCPTvkZJ +i/f1gWh77Cy3hBFXtUHKWvR/MwCza77Q0URQ34QJEZp2u3/emjhH6wTRCO2Hks5V +ZZYSjpTo+evTvhsGvB87dkFlCY+hDOLet4Y34dxzTwhhB92arIC25Wu6PkNS73pj +h1GcDl8508f3tePSub/Rl9hmm/sYsqDhae0rgdls07qIOqEA/a9DggKAnGo= -----END CERTIFICATE----- diff --git a/ssl/server.key b/ssl/server.key index 79d0758053..cde7b7f3ff 100644 --- a/ssl/server.key +++ b/ssl/server.key @@ -1,15 +1,52 @@ -----BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQD+6eow7nHNnwsFSHftfVL3N1a3aeM8NUNM0eHuHs5RjmeJa9vM -ZxOI+wqrG11EQZVyJofGr2Eia6EvgEcAeVHS/FLE96nBdlnTi/+fINMV+BKy4zl4 -WVjf1I4dGMPJxUNgdujw5i/YeyjMe+OqB8yolxKncghO5c7Jw/e7qzzIKwIDAQAB -AoGBAL0T/jzLMKiHFqKVjTcf5UEvz+d96CoJi+DYMQ/x07FUwmGBGmiz8B6DrvcZ -9gUh7FreT4nFHnRshwN3z7J/SnuM65NjeagsB58ZPGJQoCTL+ienFANdl+DMqxJy -AXlmkh9W51bve23RUNHFyG6mjmKuaHLPa6FOsRsBMmIOu0KRAkEA//x2hKjlYhLW -acIp1iGrIIcvCzt1zel8gmVea2wuuQb72J3f6uG1dvLZ+6ZYsBJh+QQ6Os//uZnx -8nUilm0vmQJBAP7tb+EhxqGYHubppbyEMYSG/kNKHxRc4qmTOpD9J6RUP/WhllHr -CLUWJh42KfC3+n6BWhV8rCnMK/TZqLi6YGMCQQCyrdVIWd/q6f0xyu6K4etiBBop -O/LJrO1U007pqpSeYCqQk/pFKBETGwZeqkkDdYFfYL0IakE0mykPtQVUfJgZAkAa -wxJbsBAKJs4Xr6+Weso3/3Px3HYmzRl+c9ZSIkFnHvEX+D6vmtzvJcQap9T/UFEb -trieSNhKCwUST0dHHUnBAkB49e+o94JYL782sWILZPVcNIjBTWQOtUAimOWMo5np -yp8Dv+vmTOomy5WwnmryMWXE7TcT0qGajRRfq61xQYub +MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDMT+lj5alYTRup +C2z82IVTH6RxyvZT9KxgJYXlxgvoj81Ftnc/9pIiqdTo8K4nF8AsqiuPHB/ofbPe +bvenJpmJepsMyPZstwZurd+vFzlKWonODUABHCzJX7ig/Yc0TIeLxwIIRN2pljp/ +azWD4HOHTgUKkepm+2YcYC8VivtML2B8AJLgpZ5KJ+HjO8VdtFyogc4jo7ktTsRc +blHJn7Dpvznot/f3VC/xWwD5ZStuJh1arBIqbX1nxVlonyLBXqVB2BMktt8TMRgX +ClwLw19cYPGcBALpd717f3dC+9AjfmCsFp2KDRhcELECbBMMOFS7tWCAhca1lc++ +6hDsE18Bxd6Si4kaQSnRtnNC0rQ2ea9ghXATxYkYqGaZLxRkNElS8eJUm6L7/mVz +hBd0uJlk8WrEPyfv+XwY7Ybed96d6DCxcBSzNNo0p42K2CZT9zPsajGOuSEgLaz7 +rshJqrCHZmuAEsa8lP3fPo0PqU49/Gbv2S01TJ2pZ3IoTf4FQNEjDwlyJU4w/idU +QZXyYszSuHT9AvickUHHs7+WyiNvFDFnDHWp8Tnl59gKAodxezC2TcnqPcs2GKS0 +dhgw8PgOAnZzjVukc3SIfkROfERcmajzEZ/yTrjAQgPiA4H4yGiMLHEzdMS8Bngw +2PS8lO3uEEPsoUOh0HF8DZ37eI29EQIDAQABAoICAHD0HQvlhGIU/x3N+0suSUdT +Tw66LsTrmADvvb7yZtMD7XCFGBh8sP4I9nRx21Yxg0UuLzbHTbyzAiYPI0t9w5SF +/AJteA9SgHPgHLIoHLxGobkRCjmS4g/So7gdcgov5SAZvb3klMeVDnIzSzrFdBlx +wMe/M+ALTMCTTHSUians52Kmzoz0AzbsJa4C9XKArFlcqiJ5+X5a9aREOWNGrgAM +gG9whd5u5LKCpV87127mE4R1bPWX4qTkLjHxCL3vHV3xn2PE1j89/Rt/1rOKJ8Zi +sjCW5yU71b3ZEo4tuTxmOfvp5N7Vron3kGTOaxluayn7dIaZbuolEN1zejeJ3hOX +Mu2FBjdQsZ5R4ySnYrIWSPVzrGPN5KEJh14mxysncf8XFKUkntnsifrcNsIqFT2j +EhUYpwNmYIZf7Lhf6GIge9DdNcSjXQxBhmuE7TUj4+hDxraZ9hZISWlvL3tvxzrh +bOSJJdn04ROO0b6tpm/VUiFXEJ1Mn2YF2+cIlQRKN1TB+nzmlYqHmFK5i7tQKkeq +cqPasaOaaH1VTjT372JEtKokTSuDwUur3iMyXgrbKoT9bpWeSRn2LcacXwksjwEw +QsXX44l5gKPLvTYQgSgLE7V0OSssLx27YkEQVxf8stXU+FdUjkUfdXcrsxwREA48 +HEuii96CuZc/3YYPq/chAoIBAQD3SLX8YrFEB9EhYS2/46inHtGKxSRAR/cqAov1 +hb1d71r68SjC8METFOlRLNShIGnIo8PHfL6q3xcDWxr+JReemiKXb959qXn3QyuX +5I0nK3MGSLAGoVJ4plTfn1ngqycDEKcK48gCLRVqC932P/yJ+Rpwl47MQs7+VYBP +7/zvWWLoMzYdjd8V7Rw8ZsH7O+c1Y2xlQOqOScOpu8CEs/zPOoEuAGYeBXET4Dlv +pXAfhPlNR9NFWKxOXpHMl8xGwb8F3Hz7J+z9lEJmI+dd8r5eGR4ZRL2eHlcSJV7H +wHUS03foULv/T53FAson2gLbTLjcuD2kyAff72JIoRqDAxh/AoIBAQDTg3UtDa2e +DUPD61EVs7dN/jCbWqyiwdhOrmJAPv6vtW+QJ2eydRSvQgRq+jzUGXTaxn3uyygr +JQdWgbxDoBL4mlXrMZBtBKSKg16pgCpJx5xwEdVdrd6QHhjfJl/h9/YeADJagjhF +TISIGjlVpBBM8HizIHGrnpuEoDYB0Dd3FmwlmUCZ6Br8RgQeEOoA/ayuAtLwNGaU +Q8K2VWLN99Mfqm2iYJQG5BUYaBRJZF7l1eeQu9YaM5/ldtNmQP1s8C1qkgGwCYom +DGHRH+GfmJvxF6glh3gHhZimZsMWgUzah41JZYJj1rlujAVKqmmoIm2VXzNRjk2y +nO+Xgh82auJvAoIBAQDDqL2OEEzwZjr77Vd0oF6etQzZfzk6v3Z6v/8b6pE2VSAo +tE4rSLGMNpyRxSYMw4fP4HwVSMfYjaI43opSEulIbe724eYqicFeesBwc7+YAZIG +o9bbuCN4ISvAsOY9lU7N5ww02pwz1JZADVm38VMRnI9mDRVI24fKx746AcqhW5md +3n9wDQQ55h3UUP4lmnVL0fo/d4jfws/VaiBfH8bl9QWnb1tdX7LkJiNsCnvYBK/5 +jN5G3W2gqMU2G9nfFofdzGL7mtCyp++Nv9TeiiZEcB1XowNhq+H7EqSW6tn3ZmlW +4SKPVeCgtJ9dvutJt8ABrKnhywAoGNIsY4SFqxpjAoIBAGuLCYcQz1fvUqdI/H9W +UztapQg4gFJ40SygSeB0pzZbwA/BmV4JXa0Gmgxyk38cOmgKSHmj3hahyytW54xS +1ZKFlm3xU4e6tpae2QDB476DuazZxGzPPLx2MRs0/cd9Nixm2TNfxpClqTUycDh1 +JLyaACTDuEgUaupyM0OUxL7OLcqoM0qN0zq1tt46p2A9mxEW6n2rhwSXt2bR31zu +RvBwzTGkfV9LlNZGBRqT6BRgQE880k2cNg6L7kyteq1rKQxolGcXUqCp5wpXdXaa +N5/L8XizenoImWbyFPtaXuM1zMam0DdHNB1bIE2oe/Q7HRC3yPYMrsDEPqYASTJ4 +Ag0CggEAZmb+fGC9tXoHs1WffIM453+2OgCC3QWSiiA68exkSYnzmC5YvbSLC4Xr +9AqiJjeSlTCiviUyS4BLLAVv/Cx46PDiVxAbjo85iGwAjzTU0U2Pv/SDyEzceeQ6 +/klpELR4tnP8KHoq7MLl4WSu1VgPOpT+oUbdm+6ql1hurmtVGJDDEhgVOVSV2rBX +UK6JbXg9wEjWGsgv+C2txlocv1D2YvVnow65Dm+2IaUdwZDQolTYjDIvwmg0pIrl +jA2FxdhLNpM8aQXId2dYkFMkADf3SgJbC8Kl7U6Bp14RlbStI2u2K/ZbDh2qujLk +xAWEFLxKgPGMX0dBLp4DEe0EtSsJhw== -----END RSA PRIVATE KEY----- From a53d136699a68af3e2130c88364077534298f754 Mon Sep 17 00:00:00 2001 From: serdrdoor Date: Thu, 27 Feb 2020 14:13:12 +0300 Subject: [PATCH 028/141] - add rudex.usdt icon - add some translates - update RuDEX help - add some markets --- app/assets/asset-symbols/rudex.usdt.png | Bin 0 -> 6909 bytes app/assets/asset-symbols/symbols.js | 1 + app/assets/locales/locale-ru.json | 6 +++--- app/branding.js | 19 +++++++++---------- app/help/en/gateways/rudex.md | 7 ++++++- app/help/ru/gateways/introduction.md | 10 ++++++++++ app/help/ru/gateways/rudex.md | 7 ++++++- app/help/ru/toc.md | 2 +- 8 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 app/assets/asset-symbols/rudex.usdt.png create mode 100644 app/help/ru/gateways/introduction.md diff --git a/app/assets/asset-symbols/rudex.usdt.png b/app/assets/asset-symbols/rudex.usdt.png new file mode 100644 index 0000000000000000000000000000000000000000..1f5798c905ef073f7060a5996e4cb1f5678a747c GIT binary patch literal 6909 zcmZu$Wl)?;vwrc#2~P0f?rw{_L-4R0Jh&uiU>A3SJHg#aARBCfAi>=h2_E1834}m` zT~2+s>bpPgkDjjTuIcJ|W~!&3nK%PIbwa$ScmMzpYHFw$J?g}N1%&-LHX;?}9~G{b zhJ`Nx;FJ9;Xh2>8H2~o0yC^Fg7&v?SdHOngdNFA#D>HfdcsjbcIRHSwYN4@{iSZ$& z+||Y}CGA*PhPI~>1&GN=DFH^F%FfM27BGho0+71-NI|-o2jU~8Tx&E~BpT8$ zRZ<%SBL~1i$x4*~SPczUn8R)i6k`IAF}s&LfB_!>;RxHG17L;Mxxr|FRR%K!T5&4C zMCK5y0yxV6^;6H|RRMEBfZS30ixjZT2MB7KIcfmS9RPBY1iuvk5deaQu~A$AW-tI5 zVPOdXB69(9wR1DspFE8u2i%WH<+jQqSfy0qRvXYP3g z+MdE>uwm}^rEI5|&M)wbUtc9Swi1Is0>y``W*1)nVxwB}4zaSbx4XNn^+m}FI%@Xz z-l^XfX?ExKCsg+K>hfF9HY;4%2Cj~I{jGoemre!UR2pvN%eDO!_1g~ohgm;!ErGaM?hpy=G9oVm+|H-$snrSsB7jv4NTGmR;I79RL-vyP` zUpDgBx>nGZbgKCGdQ_d}6!pA-73p|ZZ3K27{H1#5>u7GAjv$rBs5i_!73u;Mf#EC9L);p{_?nCZFW$f7O%MwE!Und*&W6saCshc&biKNwMW=!0pY31UYdUC}_m;6yjqUF3 zZ=p^vshm0n8wXC)yVKu(ew%bBheH^%LR3d@NgwL_!G~P>x%5WfWWlMz+reL1hXPLK zQzTQ%B0KG5V_aWc3XSvU)SalD5WW!?u?cb7;bZ*S^8ERxgqVKtiEJS>#2S${?8Sc#};J?olblt2E)mPSsJAFK05wH_T zHEURE?x^suy@H-m$^Vx3dA}pSBP+2XykTKGE`jVA=@`==@GP>8+Efl>d9Z&7dYA#K zU~Fhk7;$h#xE1=%bx;U%Z?b|k%HenG%86oPF+!0-F(teqe6O#8*?HujcMZ%}2RW0e zlP*M22BF^^rf2k zw8XgOYx!Tvu1b6s{j4y=?`Sc;U|wjh>84F5#n0U+?%~$6d3$mZvt782zY|QABQRp) z6<9La|0}ABvWB0OS2_!<6RRhg@k5b>yP7hQ?VQY?Eg3JcpT6JenZS(rOzg6!!Cm z9Xahgz8R}`h-$qb^hoFsV93Pz>e}|M9?OCcuU)C~yNM;|5;sn(lY^OK??l|FR90OP z&&0`i+bHUtM8VnnhZE9%(yg@iifC;!K6>;0?)q0!t+L*MD7+mCES~7+*!8lX;@i31 z7xe2+%(5FpyV-+uUEweKM#K9)qPZU9o8s+7y**xAIlyfNGnef7vD&Z zqROTSTjpE~*rSc{9PQ0r%lJ@J_XS};N8q>4*U1SP1(R}bkm<|Js8xMKjf1a9nV>(Y$H9QfQ2;J-p7kakpvEbN4;cnZ=`xpj&kmBXNPKtVN*Kg~?Z!)x+?)bf@#F#KO$Nx1s!h z)*z_T_TU4%$<0^9o@bv){I+IQ9}*5^x@0D;&p-K{x1#pQ%s!drHA&mLANd{0-lxy$ z4|f)H<~1U$T@j~2-5-M;uMTO8BqrB?bqD^Wd{|s4l9F5Rz6kQX8oavPq+Ad6;kcU| z>s;~YIBn?C@3Q>`K2cmzUXNK&u)1GcK3fZWh4e4Jm|0W5!j6iVx=+1KAy&pp$xRuH zCX7BVl9ZQ{+E(znJG`w@p0b}}FQU3Hy&r3&q7(?dUN~NwoXMFf$v)3c?{yEUxI01~ z(=?%m`iB^Lz6OX0z4-O~=A_Sm&7c0PY?D}jH-ssS^TGK~%cb#j)lE80dinz&MV3g{WJPz{>yXs4`>C%ck`ZKW0(YI+1-=S zRgKGp(!_OBpKZpMD#AmZ3#F5oR+0;slUbzN?X5mkM@ZL1kR!(I&UWM+|3YokTp#QH zR@%+!q^)HdY4({+!JqCa*^6;m5fu;`SB<5r1BHerq?}dIh?JTOH!%ZKO-l=%g$v~`*&U9tquKVdF?jNX_1#ICtD<`7Bx$xp%!Na(-%c$Fo+o$MN;4k z^<~Cvy6xOo;a39sCUov!LLGm*(mpspVBzXSd_PLv^ut+v-92-+T*O@In)JNu_26#* z@_Z*p=vrIYrhoYy3TRe&^DAlajk~LgIRI=V$1dLC1oz6l{bx5!6S7E}HPCyQBsZ_H z@f)$>JP^DXS$sSbbMLnwq5sf1`ZWt#|BUw-bw!Yf6SSkaM4m_DColVJVOQPho(guV z=2e{ll{!8<{n6R@BeK};ELoxGZg*`82v}Rho{wsF^W)<+eYLqB=Jh+h?EwR(2|2h937D6WJWtoA**{i z7{FxQ_dlk6<96(N-y!Q^jlH3M!8aR)W%s9_7$+>87U7PYlTPW3?*j=5>EKm_1Y?uSUSVU%*4?>(R(}3kt2(gtk6zP3H^%4nWI$1% z*2C787EV?1x!YY)R0qTSUD(J2urjM)2UTv!&A|G}z#ZeYv=v#Fswz&0e2drqEEI4z ze-XqCui=gi&|q#YJNp?mmmLbv8+3#m3A*LxG4oOo{e?(DN918NjPzQVN2+txY~sAXSA~KB;|iQ@}QTE zCnYN!o+RGIJpIK*8g&D6wEqF#{<7R;iAybfcmI_Goi^yjj8ZFY5Lo-dAd~i!;5LzTv_kGCzaUytH-@}N;gID4!Icv8(w@Dq{8dhkyj@nFF(G` zGreGJqz^nxy=GB93wQ~Ay;s9AlIuXuS60$G0RrCF_BDO~_L|!wq;gml zUJVZ3Ng?PqBQ^($$N31pd~V^V#;U;VLL(w9i-h^Y+-w3ivxM&g#(b6 zNFBPMVKUm&u(}t`AZ7zm!o**0L+~US?my9l5GN2Q5=gdY7|dPa!W1J0)!0%|Fw)#^ z&vy>no~|gIm)5~&!tbdfjywA=yJGkx!}F5g*zWL+T+|hrwgqh6PY66lKX3@yqorAr z?%vqAe!p<%!j8#?3SWmDnBf6zD0GVoSWgGb_JR`p>~m1YZcPpwf(N6Dfkf9ABfhol^D{s?58^S~r-x?|Q`$&Mr&t*ACq4Df4rxypoUuJ?n z=Ukfc%q~OFY(%k)y#1S)M34T$H`7zO2GeE&a@{h=5$clWDDVa+oRk~xLdTfGR2}qV zF;j@HJCp&lyi%}h&>cWt+}->b-?zC6c@Sty-1-q^xJ)w5*?B{qu87Pt6XS-p*ys~IE!W`@b<{6XS| z4~(wseB-YapbM@Bn3$0y%~&{8=ZGIcw2;ZeWwACKcp)rAie9PmPP)MxBVj90cod1Kq1b z+(;q1O_;ERA{eqvIl2}OwGwovjdt%Nr7Q4-0f~au8Hy$ITz0;Ii6_LlTiP2Ph7T8( zfcg??(RAskYFzbK)%*~me_0Mwpl1I5W2wFBr5RJ=R^w%}Bo6Zz z_+0oF(ny#u!;MUJ4BW?E2Fc+xcgWzyZ*R_qv3Xr(ZC~P45|NT{qQpU%x3$Ud_EkrA z)aQ4Umyeaf3nfAnktF8rNv-ZB_PLxE*!vB#T3K=RhDu+>XAX&>PW4wsS6xN913znc zAc@T7fh9b6A@SHvwan!=#UfaE6(mZxh1_Rk)V!NqMqG*=CN;-qcOp3F~a0dZYZc@-XA_uX!ryT#7W=* ze-b|bcQtw&zXE-7LVuu{FCYhxi0B{psBcu|i zbnS#YfPwZB6V*yH$ss0qO|&Wq-UtRwxzh|m>ZzO#Jhs2@1}08TFq!g$!C)2wJYyth zl$ohwap->Bi}(Q&u){|h#Y|yL6Z-bjeqU`mHA#VVtDLV6UMy`e;wVD&@ao}|dvgf} z+YSnSPlo=u!#YVHZ}J+W8MwbGPC~;R8?K@EtECRrpV{xjuxVFc1{^Lk({;aLV1i8r zes*OulV!SFXtJ`3dxBjFSekx(x;Au^PW7{I-XSFLf~iOBoQ>e))i$F-0HN=oEOkZW zQBgH5F990Fhe(a<&4(+9vK0Z=95O@*2cHhFLNBrW=NAxMiIW#<*O-Grg?`uK;g<3m z4RD*JZJk`=_v%m*E0#=;-?^B}8Lyb81?>!~zaOmIVchCIJ`gI@kBCsN!1JpGLn#B*kBFL_U+>?bnAS;yA72k1He#{TiU#GiwD&qDH zMq%>vvvT(#GvAAQz0S68%Hi@WtzQzkxbC}A_wpL!mqnB?+R|>M9Nb)Ot*z-66!gU7 z*U+quJG>Le<3v$@A}MBKii8>B;cXMtVO1APdS3{00)ucJX1_lfe3MW-q6FW90tDJz zI}|^;OAzASvkMd8Kd+2L4v*dIZcC}dw+H@^a0&kRO0DlY zn+_9ijyi1!#^V=p*vPHDto1m4%o(fyJpJfR@aETcNirdIvM2H&`0qOr?M!BOsgxSG zry_qu9TTL=wF1k>*vNG-R8iosq7XbBx@jl%4vKW%-9mpIvK&2)mE)!RmYq6_~@v8eg!&+WT`1#-P z41?;#$Mg4Xcic2_N`I%YZs$8;bW0Ck{3)1P4lcObjaHAZR$_>iVPxJORqF8k*@t$l z1XQ!+u#!|t)JwFiW~fY=AiOq$2^X$Jz4})15e#yU>na`sY2z(JQO-ytCAtGjrBC$T z_<^9bFTF8B)WiNjD7SFfS}3N}1#W~abG|&5I4Y3Z8r>r#FHZ~QmK<%5iqj#@HpX?< zf!oeKS?mS{hr|YA#0H^*j^#056L%#${NT3S>#j}aOO+ITbM}hUg5B}lg`AJfVgOuf z055~kjL@)gXk-tBw7^ViV19_$0*mNDcLSwjA?)5tQ_?kSy5ok2=FfVsS(v~ecsAD$ z?xR^&yBS^Gc4RR8iuqxZeQ?wpT9yrl$K5cgv9T|H2OHB-U}Hhffehpb;q1R zGqM+pm)MRAQ=ycZ>WI-}c1R@b30@NaJ@I3?E3W1>tyYvbRi3AfL|(_W$(f zHJ!2ZQmLJ%NOOmXF-L1Ti>O&$GYsSLeJ2Nz#^lHe!#wS~=>=qYLdE-$N^AN(s@bSZ z+rRx&HiSCNqybXdUnv}X7gs)m;40!*;m3s=aOe5F{lz5&pG|HMH{u<`W|zxduh<}` zi?-zLdo!Pv-W`7%W`T%);#!2xn;@c)Pc_jCZ%d~Ao9x@df}ONkBv2t>a}Rc2-(#?- z-KkoerFGE^e)@mgnCwE3)^DO{kX_gq}UdQHc<;cb@5UmtbJ z`K6xGE1PuHZxqf(zbnBgg=y5TI2j2DkJq7dNpZZz{$Ss8d+nAy@>9Yc6S@isiP1`% zM}wG1uUDnW(-j2e)r+=zc#pw#aP}xIk|&=_a--&RC!GThEVG~!jJf{?GV{spZ8<^NFGvTD zmrqVMS8pu@nLj-M3O;Pw8h3W6<*jw5sZDllLtO?uon&4MrY?MZJdJ?Rxg8tF_IR259gOE7&e&wX+jnUTLOGneJMu&4h zH3H07vKpY-&eGE%oeRa9<+FA_y}mPxR@ZG#y9V7TZ87TYwr;vmIFlZZ9|lN%pyK)D zYo?911HRC20Ca^5rO1ds$|Xv>_0Jn2O%yKNiNdTup(lFW2NRx#2>IxUR^z z(yzp3j`Gr3`&J%Nj_id}n>0ixudae@I>M4&jU6773wwmb){9nD+iM-C-1!n>A_I(9Q+v zNSGJ17CV(@I%HPD4PciVVjz2^n{X&0KOIe0UQ9bdQ zQ>uA>4*f4l{{L9D1=fEl_kWo6|E1ixi6%UU4>*9iL>30ux@O_y`vRb;s;APZ1PT8i DQak3Q literal 0 HcmV?d00001 diff --git a/app/assets/asset-symbols/symbols.js b/app/assets/asset-symbols/symbols.js index 3b5e055ee4..33c70c7227 100644 --- a/app/assets/asset-symbols/symbols.js +++ b/app/assets/asset-symbols/symbols.js @@ -87,6 +87,7 @@ require("file-loader?name=asset-symbols/[name].png!./nmc.png"); // 3rd party assets (RuDEX) require("file-loader?name=asset-symbols/[name].png!./ppy.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.btc.png"); +require("file-loader?name=asset-symbols/[name].png!./rudex.usdt.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.eos.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.eth.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.gbg.png"); diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json index f07e0016d2..4ff92d9c60 100644 --- a/app/assets/locales/locale-ru.json +++ b/app/assets/locales/locale-ru.json @@ -701,7 +701,7 @@ "rsi": "Индекс относительной силы", "save_custom_charts": "Сохранить кастомные графики", "save_new_chart_layout": "Сохранить новую схему размещения графиков", - "scaled": "Масштабирован", + "scaled": "Масштабирование", "search": "Ищите другие рынки здесь", "sell": "Продать", "sell_description": "Продать %(baseAsset)s %(baseName)s за %(quoteAsset)s %(quoteName)s", @@ -1079,8 +1079,8 @@ "short": "Мост", "what_is": "Что такое мост?" }, - "disabled_asset_1": "This asset is managed by an external service provider (gateway). Currently deposits and withdrawals for this asset are disabled", - "disabled_asset_2": "For more information visit Settings -> Entry External Service Providers. For any issues or questions please contact the gateway operator directly.", + "disabled_asset_1": "Этой монетой управляет внешний поставщик услуг (шлюз). В настоящий момент пополнение и снятие средств этой монеты недоступно", + "disabled_asset_2": "Для получения дополнительной информации посетите: Настройки -> Entry External Service Providers. По любым проблемам и вопросам, пожалуйста, связывайтесь со службой поддержки шлюза, напрямую", "expect_more": "Если вы хотите увидеть больше возможностей депозита и вывода для своих активов, ознакомьтесь с провайдерами внешних сервисов в разделе Настройки > Общие.", "gateway": { "description": "Шлюзы – это провайдеры внешних сервисов, которые позволяют вам вносить депозиты, торговать и выводить не нативные активы в блокчейне BitShares. Например, вы можете отправить свои BTC в блокчейне Bitcoin на шлюз, который, в свою очередь, выдаст вам UIA (выпущенный пользователем актив) в блокчейне BitShares, с возможностью вывести его снова (с оплатой комиссии). Пока вы держите такой UIA в блокчейне BitShares, шлюз является хранителем ваших средств. Поскольку это внешние провайдеры, вы косвенно соглашаетесь с их условиями использования сервисов или активов.", diff --git a/app/branding.js b/app/branding.js index e8ea443aff..c504b6b484 100644 --- a/app/branding.js +++ b/app/branding.js @@ -325,15 +325,21 @@ export function getFeaturedMarkets(quotes = []) { ["RUDEX.USDT", "RUDEX.BTC"], ["RUDEX.USDT", "RUDEX.ETH"], ["RUDEX.USDT", "RUDEX.EOS"], + ["RUDEX.USDT", "PPY"], + ["RUDEX.USDT", "RUBLE"], ["RUDEX.BTC", "RUDEX.ETH"], ["RUDEX.BTC", "RUDEX.EOS"], ["RUDEX.BTC", "RUDEX.STEEM"], ["RUDEX.BTC", "RUDEX.GOLOS"], ["RUDEX.BTC", "RUDEX.WLS"], + ["RUDEX.BTC", "PPY"], ["BTS", "OPEN.MAID"], ["BTS", "OPEN.HEAT"], ["BTS", "OPEN.INCENT"], - ["RUB", "RUDEX.GOLOS"], + ["RUBLE", "RUDEX.BTC"], + ["RUBLE", "RUDEX.ETH"], + ["RUBLE", "RUDEX.USDT"], + ["RUBLE", "RUDEX.GOLOS"], ["BTS", "RUDEX.GOLOS"], ["BTS", "RUDEX.STEEM"], ["BTS", "RUDEX.EOS"], @@ -344,7 +350,7 @@ export function getFeaturedMarkets(quotes = []) { ["BTS", "RUDEX.SMOKE"], ["BTS", "XBTSX.STH"], ["BTS", "XBTSX.WAVES"], - ["BTS", "HERTZ"], + ["BTS", "HERTZ"] ].filter(a => { if (!quotes.length) return true; return quotes.indexOf(a[0]) !== -1; @@ -360,14 +366,7 @@ export function getAssetNamespaces() { if (_isTestnet()) { return []; } - return [ - "OPEN.", - "RUDEX.", - "GDEX.", - "XBTSX.", - "CITADEL.", - "DEEX." - ]; + return ["OPEN.", "RUDEX.", "GDEX.", "XBTSX.", "CITADEL.", "DEEX."]; } /** diff --git a/app/help/en/gateways/rudex.md b/app/help/en/gateways/rudex.md index 5b64725893..ad8e8a7099 100644 --- a/app/help/en/gateways/rudex.md +++ b/app/help/en/gateways/rudex.md @@ -1,10 +1,15 @@ # Rudex Gateway Service -Rudex is a gateway service built on the Bitshares Exchange. A gateway service is responsible for moving cryptocurrencies to and from the Bitshares Exchange. They support a wide range of popular assets. You can easily identify those supported by RuDEX because they are prefixed with the word RUDEX.*. For example RUDEX.STEEM, RUDEX.GOLOS etc. +Rudex is a gateway service built on the Bitshares Exchange. A gateway service is responsible for moving cryptocurrencies to and from the Bitshares Exchange. They support a wide range of popular assets. You can easily identify those supported by RuDEX because they are prefixed with the word RUDEX.*. For example RUDEX.BTC, RUDEX.EOS, RUDEX.USDT, RUDEX.GOLOS etc. ## Website [https://rudex.org](https://rudex.org) +## Public audit of gateway funds: + +- [Audit](https://audit.rudex.org/) + ## Support +- [Gateway Service Agreement](https://rudex.freshdesk.com/support/solutions/articles/35000138245-gateway-service-agreement) - [Open a Ticket](https://rudex.freshdesk.com) - [Telegram Chat](https://t.me/BitSharesDEX_RU) diff --git a/app/help/ru/gateways/introduction.md b/app/help/ru/gateways/introduction.md new file mode 100644 index 0000000000..935a84daaa --- /dev/null +++ b/app/help/ru/gateways/introduction.md @@ -0,0 +1,10 @@ +# Шлюзы BitShares + +Шлюзы и Мосты являются внешними поставщиками услуг, позволяющими вносить депозиты, +торговать и выводить из блокчейна BitShares активы, которые были созданы в других блокчейнах. +Например, вы можете отправить свой BTC из блокчейна Биткойн на шлюз, который +в свою очередь выдаст вам эквивалентный UIA (выпущенный пользователем актив) в блокчейне BitShares с +обещанием, что вы можете вывести его снова (за комиссию, конечно). +Пока вы держите такие UIA в блокчейне BitShares, именно шлюз является хранителем ваших средств. +Используя услуги сторонних поставщиков, вы безоговорочно соглашаетесь с их условиями использования +любых сервисов или активов. \ No newline at end of file diff --git a/app/help/ru/gateways/rudex.md b/app/help/ru/gateways/rudex.md index 67ff52da53..21f456813c 100644 --- a/app/help/ru/gateways/rudex.md +++ b/app/help/ru/gateways/rudex.md @@ -1,12 +1,17 @@ # Шлюз от RuDEX -RuDEX предоставляет сервис шлюза, построенный на бирже BitShares. Сервис шлюза отвечает за ввод и вывод криптовалют с биржи BitShares. Он поддерживает обширный список популярных активов. Вы легко можете определить, какие из них поддерживает RuDEX, так как они обладают префиксом вида RUDEX.*. Например, RUDEX.STEEM, RUDEX.GOLOS и т.п. +RuDEX предоставляет сервис шлюза, построенный на бирже BitShares. Сервис шлюза отвечает за ввод и вывод криптовалют с биржи BitShares. Он поддерживает обширный список популярных активов. Вы легко можете определить, какие из них поддерживает RuDEX, так как они обладают префиксом вида RUDEX.*. Например, RUDEX.BTC, RUDEX.EOS, RUDEX.USDT, RUDEX.GOLOS и т.п. ## Веб-сайт [RuDEX.org](https://rudex.org) +## Публичный аудит шлюза: + +- [Аудит](https://audit.rudex.org/) + ## Поддержка +- [Cоглашение об оказании услуг шлюза](https://rudex.freshdesk.com/support/solutions/articles/35000138247-cоглашение-об-оказании-услуг-шлюза) - [Открыть тикет](https://rudex.freshdesk.com) - [Telegram Чат](https://t.me/BitSharesDEX_RU) diff --git a/app/help/ru/toc.md b/app/help/ru/toc.md index 129c5b4c60..cb8f2f1c14 100644 --- a/app/help/ru/toc.md +++ b/app/help/ru/toc.md @@ -17,7 +17,7 @@ - [Децентрализованная биржа](dex/introduction.md) - [Торговля](dex/trading.md) - [Короткая продажа BitAssets](dex/shorting.md) -- Шлюзы +- [Шлюзы](gateways/introduction.md) - [OpenLedger](gateways/openledger.md) - [Rudex](gateways/rudex.md) - [CryptoBridge](gateways/cryptobridge.md) From 4a67cdf3a5364c3cf5a3de03adbfd2a4b4c9c1b1 Mon Sep 17 00:00:00 2001 From: serdrdoor Date: Thu, 27 Feb 2020 16:15:03 +0300 Subject: [PATCH 029/141] - HELP: change link to market.rudex.org --- app/help/en/gateways/rudex.md | 2 +- app/help/ru/gateways/rudex.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/help/en/gateways/rudex.md b/app/help/en/gateways/rudex.md index ad8e8a7099..0876f044ca 100644 --- a/app/help/en/gateways/rudex.md +++ b/app/help/en/gateways/rudex.md @@ -3,7 +3,7 @@ Rudex is a gateway service built on the Bitshares Exchange. A gateway service is responsible for moving cryptocurrencies to and from the Bitshares Exchange. They support a wide range of popular assets. You can easily identify those supported by RuDEX because they are prefixed with the word RUDEX.*. For example RUDEX.BTC, RUDEX.EOS, RUDEX.USDT, RUDEX.GOLOS etc. ## Website -[https://rudex.org](https://rudex.org) +[market.rudex.org](https://market.rudex.org) ## Public audit of gateway funds: diff --git a/app/help/ru/gateways/rudex.md b/app/help/ru/gateways/rudex.md index 21f456813c..c87d0e6f7f 100644 --- a/app/help/ru/gateways/rudex.md +++ b/app/help/ru/gateways/rudex.md @@ -4,7 +4,7 @@ RuDEX предоставляет сервис шлюза, построенный ## Веб-сайт -[RuDEX.org](https://rudex.org) +[market.rudex.org](https://market.rudex.org) ## Публичный аудит шлюза: From 22251ec20898085a1447440f5e457728608f1793 Mon Sep 17 00:00:00 2001 From: serdrdoor Date: Thu, 27 Feb 2020 16:21:55 +0300 Subject: [PATCH 030/141] - formatting From 511354bcc54937e6bad42440e053294fdee759ac Mon Sep 17 00:00:00 2001 From: Stefan Schiessl Date: Fri, 28 Feb 2020 15:29:13 +0100 Subject: [PATCH 031/141] deactivate default search without quote asset Signed-off-by: Stefan Schiessl --- app/components/Exchange/MyMarkets.jsx | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/app/components/Exchange/MyMarkets.jsx b/app/components/Exchange/MyMarkets.jsx index 34a9c99088..85ec76cc11 100644 --- a/app/components/Exchange/MyMarkets.jsx +++ b/app/components/Exchange/MyMarkets.jsx @@ -348,15 +348,6 @@ class MyMarkets extends React.Component { } shouldComponentUpdate(nextProps, nextState) { - /* Trigger a lookup when switching tabs to find-market */ - if ( - this.state.activeTab !== "find-market" && - nextState.activeTab === "find-market" && - !nextProps.searchAssets.size - ) { - this._lookupAssets("OPEN.", true); - } - if (this.state.activeTab !== nextState.activeTab) { this._changeTab(nextState.activeTab); } else if ( @@ -418,10 +409,6 @@ class MyMarkets extends React.Component { this._setMinWidth(); - if (this.state.activeTab === "find-market") { - this._lookupAssets("OPEN.", true); - } - if (this.state.activeTab !== this.props.activeTab) { setTimeout(() => { this._changeTab(this.props.activeTab); From 440e5129b3752a44ed52661bbe5554788517f68d Mon Sep 17 00:00:00 2001 From: Stefan Schiessl Date: Fri, 28 Feb 2020 15:29:39 +0100 Subject: [PATCH 032/141] deal with potentially undefined lists of orders and balances Signed-off-by: Stefan Schiessl --- app/components/Account/AccountPortfolioList.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/Account/AccountPortfolioList.jsx b/app/components/Account/AccountPortfolioList.jsx index 1e034503f7..20397d887a 100644 --- a/app/components/Account/AccountPortfolioList.jsx +++ b/app/components/Account/AccountPortfolioList.jsx @@ -895,7 +895,7 @@ class AccountPortfolioList extends React.Component { let balances = []; const emptyCell = "-"; - balanceList.forEach(balance => { + (balanceList || []).forEach(balance => { let balanceObject = ChainStore.getObject(balance); if (!balanceObject) return; let asset_type = balanceObject.get("asset_type"); @@ -982,7 +982,7 @@ class AccountPortfolioList extends React.Component { // Collateral let collateralBalances = []; - this.props.callOrders.forEach(order => { + (this.props.callOrders || []).forEach(order => { let collateralObject = ChainStore.getObject(order); if ( collateralObject.getIn([ From a5b7fc9adebca47981bcf475c278efcab9d20497 Mon Sep 17 00:00:00 2001 From: serdrdoor Date: Mon, 16 Mar 2020 13:58:12 +0300 Subject: [PATCH 033/141] fix 2 not working buttons: - show the brain key - confirm the password (in the password change section in options) --- app/components/Wallet/BackupBrainkey.jsx | 25 +++++++++---------- .../Wallet/WalletChangePassword.jsx | 6 ++++- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/app/components/Wallet/BackupBrainkey.jsx b/app/components/Wallet/BackupBrainkey.jsx index 41952da286..540a12c2a3 100644 --- a/app/components/Wallet/BackupBrainkey.jsx +++ b/app/components/Wallet/BackupBrainkey.jsx @@ -4,7 +4,8 @@ import Translate from "react-translate-component"; import WalletActions from "actions/WalletActions"; import WalletDb from "stores/WalletDb"; import {hash} from "bitsharesjs"; -import {Card, Input, Button} from "bitshares-ui-style-guide"; +import {Card, Input, Button, Notification} from "bitshares-ui-style-guide"; +import counterpart from "counterpart"; export default class BackupBrainkey extends Component { constructor() { @@ -113,20 +114,14 @@ export default class BackupBrainkey extends Component { id="password" onChange={this.onPassword.bind(this)} /> -

- {this.state.invalid_password ? ( - Invalid password - ) : ( - - - - )} -

{brainkey_backup_time}
- @@ -165,10 +160,14 @@ export default class BackupBrainkey extends Component { var brainkey = WalletDb.getBrainKey(); if (was_locked) WalletDb.onLock(); this.setState({brainkey}); - } else this.setState({invalid_password: true}); + } else { + Notification.error({ + message: counterpart.translate("notifications.invalid_password") + }); + } } onPassword(event) { - this.setState({password: event.target.value, invalid_password: false}); + this.setState({password: event.target.value}); } } diff --git a/app/components/Wallet/WalletChangePassword.jsx b/app/components/Wallet/WalletChangePassword.jsx index b68a3ec632..5a51c47709 100644 --- a/app/components/Wallet/WalletChangePassword.jsx +++ b/app/components/Wallet/WalletChangePassword.jsx @@ -168,7 +168,11 @@ class WalletPassword extends Component { value={this.state.password} /> - From ec54ffe7865e4613909f432b618e60a6007e7828 Mon Sep 17 00:00:00 2001 From: mateusz Date: Fri, 27 Mar 2020 15:25:11 +0100 Subject: [PATCH 034/141] Make bridge withdrawals based on mapping data --- .../BlockTradesBridgeDepositRequest.jsx | 9 +- .../blocktrades/WithdrawModalBlocktrades.jsx | 98 ++++++++++--------- app/lib/common/gatewayMethods.js | 49 ++++++++++ 3 files changed, 108 insertions(+), 48 deletions(-) diff --git a/app/components/DepositWithdraw/blocktrades/BlockTradesBridgeDepositRequest.jsx b/app/components/DepositWithdraw/blocktrades/BlockTradesBridgeDepositRequest.jsx index 80f5b44605..3182f16701 100644 --- a/app/components/DepositWithdraw/blocktrades/BlockTradesBridgeDepositRequest.jsx +++ b/app/components/DepositWithdraw/blocktrades/BlockTradesBridgeDepositRequest.jsx @@ -75,8 +75,8 @@ class ButtonConversion extends React.Component { let feeID = balances.has(defaultFeeAssetId) ? defaultFeeAssetId : balance - ? balance.get("asset_type") - : "1.3.0"; + ? balance.get("asset_type") + : "1.3.0"; return feeID; } @@ -421,6 +421,7 @@ class ButtonWithdraw extends React.Component { asset={this.props.asset.get("id")} output_coin_name={this.props.output_coin_name} output_coin_symbol={this.props.output_coin_symbol} + input_coin_type={this.props.input_coin_type} output_coin_type={this.props.output_coin_type} output_supports_memos={this.props.output_supports_memos} amount_to_withdraw={this.props.amount_to_withdraw} @@ -460,6 +461,7 @@ class ButtonWithdrawContainer extends React.Component { asset={this.props.asset} output_coin_name={this.props.output_coin_name} output_coin_symbol={this.props.output_coin_symbol} + input_coin_type={this.props.input_coin_type} output_coin_type={this.props.output_coin_type} output_supports_memos={this.props.output_supports_memos} amount_to_withdraw={this.props.amount_to_withdraw} @@ -2414,6 +2416,9 @@ class BlockTradesBridgeDepositRequest extends React.Component { this.state.withdraw_output_coin_type ].symbol } + input_coin_type={ + this.state.withdraw_input_coin_type + } output_coin_type={ this.state.withdraw_output_coin_type } diff --git a/app/components/DepositWithdraw/blocktrades/WithdrawModalBlocktrades.jsx b/app/components/DepositWithdraw/blocktrades/WithdrawModalBlocktrades.jsx index 2b75eab99d..658b641383 100644 --- a/app/components/DepositWithdraw/blocktrades/WithdrawModalBlocktrades.jsx +++ b/app/components/DepositWithdraw/blocktrades/WithdrawModalBlocktrades.jsx @@ -7,7 +7,11 @@ import BalanceComponent from "components/Utility/BalanceComponent"; import counterpart from "counterpart"; import AmountSelector from "components/Utility/AmountSelector"; import AccountActions from "actions/AccountActions"; -import {validateAddress, WithdrawAddresses} from "common/gatewayMethods"; +import { + validateAddress, + WithdrawAddresses, + getMappingData +} from "common/gatewayMethods"; import {ChainStore} from "bitsharesjs"; import {checkFeeStatusAsync, checkBalance} from "common/trxHelper"; import {debounce} from "lodash-es"; @@ -272,8 +276,7 @@ class WithdrawModalBlocktrades extends React.Component { onSubmit() { if ( !this.state.withdraw_address_check_in_progress && - (this.state.withdraw_address && - this.state.withdraw_address.length) && + this.state.withdraw_address && this.state.withdraw_address.length && this.state.withdraw_amount !== null ) { if (!this.state.withdraw_address_is_valid) { @@ -357,20 +360,24 @@ class WithdrawModalBlocktrades extends React.Component { sendAmount = balanceAmount; } - AccountActions.transfer( - this.props.account.get("id"), - this.props.issuer.get("id"), - sendAmount.getAmount(), - asset.get("id"), - this.props.output_coin_type + - ":" + - this.state.withdraw_address + - (this.state.memo - ? ":" + new Buffer(this.state.memo, "utf-8") - : ""), - null, - feeAmount ? feeAmount.asset_id : "1.3.0" - ); + getMappingData( + this.props.input_coin_type, + this.props.output_coin_type, + this.state.withdraw_address + ).then(result => { + AccountActions.transfer( + this.props.account.get("id"), + this.props.issuer.get("id"), + sendAmount.getAmount(), + asset.get("id"), + result["memo"] + + (this.state.memo + ? ":" + new Buffer(this.state.memo, "utf-8") + : ""), + null, + feeAmount ? feeAmount.asset_id : "1.3.0" + ); + }); this.setState({ empty_withdraw_value: false @@ -419,20 +426,24 @@ class WithdrawModalBlocktrades extends React.Component { const {feeAmount, fee_asset_id} = this.state; - AccountActions.transfer( - this.props.account.get("id"), - this.props.issuer.get("id"), - parseInt(amount * precision, 10), - asset.get("id"), - this.props.output_coin_type + - ":" + - this.state.withdraw_address + - (this.state.memo - ? ":" + new Buffer(this.state.memo, "utf-8") - : ""), - null, - feeAmount ? feeAmount.asset_id : fee_asset_id - ); + getMappingData( + this.props.input_coin_type, + this.props.output_coin_type, + this.state.withdraw_address + ).then(result => { + AccountActions.transfer( + this.props.account.get("id"), + this.props.issuer.get("id"), + parseInt(amount * precision, 10), + asset.get("id"), + result["memo"] + + (this.state.memo + ? ":" + new Buffer(this.state.memo, "utf-8") + : ""), + null, + feeAmount ? feeAmount.asset_id : fee_asset_id + ); + }); } onDropDownList() { @@ -602,7 +613,7 @@ class WithdrawModalBlocktrades extends React.Component { if ( !this.state.withdraw_address_check_in_progress && - (this.state.withdraw_address && this.state.withdraw_address.length) + this.state.withdraw_address && this.state.withdraw_address.length ) { if (!this.state.withdraw_address_is_valid) { invalid_address_message = ( @@ -865,18 +876,13 @@ class WithdrawModalBlocktrades extends React.Component { WithdrawModalBlocktrades = BindToChainState(WithdrawModalBlocktrades); -export default connect( - WithdrawModalBlocktrades, - { - listenTo() { - return [SettingsStore]; - }, - getProps(props) { - return { - fee_asset_symbol: SettingsStore.getState().settings.get( - "fee_asset" - ) - }; - } +export default connect(WithdrawModalBlocktrades, { + listenTo() { + return [SettingsStore]; + }, + getProps(props) { + return { + fee_asset_symbol: SettingsStore.getState().settings.get("fee_asset") + }; } -); +}); diff --git a/app/lib/common/gatewayMethods.js b/app/lib/common/gatewayMethods.js index e5048558c3..091740f3a1 100644 --- a/app/lib/common/gatewayMethods.js +++ b/app/lib/common/gatewayMethods.js @@ -2,6 +2,9 @@ import ls from "./localStorage"; import {blockTradesAPIs, openledgerAPIs} from "api/apiConfig"; import {availableGateways} from "common/gateways"; const blockTradesStorage = new ls(""); +let oidcStorage = new ls( + "oidc.user:https://blocktrades.us/:10ecf048-b982-467b-9965-0b0926330869" +); let fetchInProgess = {}; let fetchCache = {}; @@ -333,6 +336,52 @@ export function requestDepositAddress({ }); } +export function getMappingData(inputCoinType, outputCoinType, outputAddress) { + let body = JSON.stringify({ + inputCoinType, + outputCoinType, + outputAddress: { + address: outputAddress + } + }); + let mapping = inputCoinType + outputCoinType + outputAddress; + if (blockTradesStorage.has(`history_mapping_${mapping}`)) { + return Promise.resolve( + blockTradesStorage.get(`history_mapping_${mapping}`) + ); + } else { + return new Promise((resolve, reject) => { + let headers = { + Accept: "application/json", + "Content-Type": "application/json", + Authorization: `Bearer ${oidcStorage.get("")["access_token"]}` + }; + fetch(`${blockTradesAPIs.BASE}/mappings`, { + method: "post", + headers: headers, + body: body + }) + .then(reply => { + reply.json().then(result => { + if (result["inputAddress"]) { + blockTradesStorage.set( + `history_mapping_${mapping}`, + result["inputAddress"] + ); + resolve(result && result["inputAddress"]); + } else { + reject(); + } + }); + }) + .catch(error => { + console.log("Error: ", error); + reject(); + }); + }); + } +} + export function getBackedCoins({allCoins, tradingPairs, backer}) { let gatewayStatus = availableGateways[backer]; let coins_by_type = {}; From e03dcca87ffe1738c4eb930522cd082ee5d66fd0 Mon Sep 17 00:00:00 2001 From: Stefan Schiessl Date: Sat, 28 Mar 2020 09:14:20 +0100 Subject: [PATCH 035/141] fix bug in issuemodal Signed-off-by: Stefan Schiessl --- app/components/Modal/IssueModal.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/app/components/Modal/IssueModal.jsx b/app/components/Modal/IssueModal.jsx index 8e88d40b83..cc0d240181 100644 --- a/app/components/Modal/IssueModal.jsx +++ b/app/components/Modal/IssueModal.jsx @@ -116,6 +116,7 @@ class IssueModal extends React.Component { onAccountChanged={this.onToAccountChanged.bind( this )} + typeahead={true} onChange={this.onToChanged.bind(this)} account={this.state.to} tabIndex={tabIndex++} From 8768210593adbbe16d4592419fda276952517658 Mon Sep 17 00:00:00 2001 From: Stefan Schiessl Date: Wed, 8 Apr 2020 14:01:45 +0200 Subject: [PATCH 036/141] fix WSOD error "ReferenceError: counterpart is not defined" Signed-off-by: Stefan Schiessl --- app/components/Settings/AccessSettings.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/app/components/Settings/AccessSettings.jsx b/app/components/Settings/AccessSettings.jsx index f95ff80a2a..ff00d9480b 100644 --- a/app/components/Settings/AccessSettings.jsx +++ b/app/components/Settings/AccessSettings.jsx @@ -10,6 +10,7 @@ import Icon from "../Icon/Icon"; import LoadingButton from "../Utility/LoadingButton"; import {Switch, Button} from "bitshares-ui-style-guide"; import NodeSelector from "../Utility/NodeSelector"; +import counterpart from "counterpart"; const autoSelectionUrl = "wss://fake.automatic-selection.com"; From e9462b97c2b3253c0e04f39cbccb8a37fa60da21 Mon Sep 17 00:00:00 2001 From: technolog Date: Mon, 20 Apr 2020 19:23:11 +0300 Subject: [PATCH 037/141] branding:remove XBTSX.XSPEC --- app/branding.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/branding.js b/app/branding.js index e8ea443aff..d259778617 100644 --- a/app/branding.js +++ b/app/branding.js @@ -210,7 +210,6 @@ export function getMyMarketsQuotes() { "XBTSX.BCH", "XBTSX.LTC", "XBTSX.DASH", - "XBTSX.XSPEC", "XBTSX.NVC", "XBTSX.UNI", "XBTSX.NMC", @@ -344,7 +343,7 @@ export function getFeaturedMarkets(quotes = []) { ["BTS", "RUDEX.SMOKE"], ["BTS", "XBTSX.STH"], ["BTS", "XBTSX.WAVES"], - ["BTS", "HERTZ"], + ["BTS", "HERTZ"] ].filter(a => { if (!quotes.length) return true; return quotes.indexOf(a[0]) !== -1; @@ -360,14 +359,7 @@ export function getAssetNamespaces() { if (_isTestnet()) { return []; } - return [ - "OPEN.", - "RUDEX.", - "GDEX.", - "XBTSX.", - "CITADEL.", - "DEEX." - ]; + return ["OPEN.", "RUDEX.", "GDEX.", "XBTSX.", "CITADEL.", "DEEX."]; } /** From 38ec5552635d500f8150835f6a41edded555d16e Mon Sep 17 00:00:00 2001 From: technolog Date: Mon, 20 Apr 2020 19:35:54 +0300 Subject: [PATCH 038/141] spellcheck:off --- app/assets/index.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/index.hbs b/app/assets/index.hbs index cf9156a95e..0a771e9dda 100644 --- a/app/assets/index.hbs +++ b/app/assets/index.hbs @@ -51,7 +51,7 @@ {{/if}} - +

Loading...

From 0d4a6598d8d392d09016bc8205556e00837b6cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Mon, 27 Apr 2020 08:18:12 +0200 Subject: [PATCH 039/141] // disable auto search --- app/components/Exchange/MyMarkets.jsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/components/Exchange/MyMarkets.jsx b/app/components/Exchange/MyMarkets.jsx index b8f76d9ad7..b9215987dc 100644 --- a/app/components/Exchange/MyMarkets.jsx +++ b/app/components/Exchange/MyMarkets.jsx @@ -354,7 +354,8 @@ class MyMarkets extends React.Component { nextState.activeTab === "find-market" && !nextProps.searchAssets.size ) { - this._lookupAssets("BTC", true); + // disable auto search + // this._lookupAssets("BTC", true); } if (this.state.activeTab !== nextState.activeTab) { @@ -419,7 +420,8 @@ class MyMarkets extends React.Component { this._setMinWidth(); if (this.state.activeTab === "find-market") { - this._lookupAssets("BTC", true); + // disable auto search + // this._lookupAssets("BTC", true); } if (this.state.activeTab !== this.props.activeTab) { From fe31f07fb0e2156ca4b36dcba73184d8a21f273e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Mon, 27 Apr 2020 08:27:28 +0200 Subject: [PATCH 040/141] Update gateways.js --- app/lib/common/gateways.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index ecbb40e6c0..09448113d9 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -91,14 +91,14 @@ export const availableGateways = { id: "OPEN", name: "OpenLedger", baseAPI: openledgerAPIs, - isEnabled: _isEnabled("OPEN"), + isEnabled: false, selected: false, options: { enabled: false, selected: false }, - landing: "http://dex.openledger.io", - wallet: "https://openledger.io/" + landing: "https://dex.openledger.io/news/ol-dex-is-closing-all-activities/", + wallet: "Shutdown" }, RUDEX: { id: "RUDEX", From b11e94791372253f13b1fee8150bd73c6d6de94e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Mon, 27 Apr 2020 08:30:33 +0200 Subject: [PATCH 041/141] remove unused assets --- app/branding.js | 68 ++----------------------------------------------- 1 file changed, 2 insertions(+), 66 deletions(-) diff --git a/app/branding.js b/app/branding.js index 39ecbe0d63..a851a746f3 100644 --- a/app/branding.js +++ b/app/branding.js @@ -159,32 +159,7 @@ export function getMyMarketsQuotes() { "GDEX.USDT" ], openledgerTokens: [ - "OBITS", - "OPEN.BTC", - "OPEN.DASH", - "OPEN.DGD", - "OPEN.DOGE", - "OPEN.EOS", - "OPEN.EOSDAC", - "OPEN.ETH", - "OPEN.EURT", - "OPEN.GRC", - "OPEN.INCNT", - "OPEN.KRM", - "OPEN.LISK", - "OPEN.LTC", - "OPEN.MAID", - "OPEN.MKR", - "OPEN.NEO", - "OPEN.OMG", - "OPEN.SBD", - "OPEN.STEEM", - "OPEN.TUSD", - "OPEN.USDT", - "OPEN.WAVES", - "OPEN.XMR", - "OPEN.ZEC", - "OPEN.ZRX" + "OBITS" ], rudexTokens: [ "PPY", @@ -220,17 +195,6 @@ export function getMyMarketsQuotes() { "XBTSX.EXR" ], otherTokens: [ - "BTWTY", - "TWENTIX", - - "CVCOIN", - "HERO", - "OCT", - "HERTZ", - "ICOO", - "SMOKE", - "STEALTH", - "YOYOW" ] }; @@ -252,17 +216,12 @@ export function getFeaturedMarkets(quotes = []) { } return [ ["USD", "BTS"], - ["USD", "OPEN.BTC"], - ["USD", "OPEN.USDT"], - ["USD", "OPEN.ETH"], - ["USD", "OPEN.DASH"], ["USD", "GOLD"], ["USD", "HERO"], ["USD", "GDEX.BTC"], ["USD", "GDEX.ETH"], ["USD", "GDEX.EOS"], ["USD", "GDEX.BTO"], - ["USD", "OPEN.EOSDAC"], ["USD", "RUDEX.GOLOS"], ["USD", "RUDEX.STEEM"], ["USD", "RUDEX.EOS"], @@ -272,11 +231,7 @@ export function getFeaturedMarkets(quotes = []) { ["USD", "RUDEX.WLS"], ["USD", "RUDEX.SMOKE"], ["CNY", "BTS"], - ["CNY", "OPEN.BTC"], ["CNY", "USD"], - ["CNY", "OPEN.ETH"], - ["CNY", "YOYOW"], - ["CNY", "OCT"], ["CNY", "GDEX.BTC"], ["CNY", "GDEX.ETH"], ["CNY", "GDEX.EOS"], @@ -294,33 +249,18 @@ export function getFeaturedMarkets(quotes = []) { ["CNY", "RUDEX.USDT"], ["CNY", "RUDEX.WLS"], ["CNY", "RUDEX.SMOKE"], - ["OPEN.BTC", "BTS"], - ["OPEN.BTC", "OPEN.ETH"], - ["OPEN.BTC", "OPEN.DASH"], - ["OPEN.BTC", "OPEN.DGD"], - ["OPEN.BTC", "OPEN.STEEM"], - ["BTS", "OPEN.ETH"], - ["BTS", "OPEN.EOS"], ["BTS", "PPY"], - ["BTS", "OPEN.STEEM"], ["BTS", "OBITS"], ["BTS", "RUBLE"], ["BTS", "HERO"], ["BTS", "OCT"], ["BTS", "SILVER"], ["BTS", "GOLD"], - ["BTS", "BTWTY"], - ["BTS", "SMOKE"], ["BTS", "GDEX.BTC"], ["BTS", "GDEX.ETH"], ["BTS", "GDEX.EOS"], ["BTS", "GDEX.BTO"], ["BTS", "GDEX.USDT"], - ["BTS", "OPEN.EOSDAC"], - ["USD", "OPEN.STEEM"], - ["USD", "OPEN.MAID"], - ["OPEN.USDT", "OPEN.BTC"], - ["OPEN.BTC", "OPEN.MAID"], ["RUDEX.USDT", "RUDEX.BTC"], ["RUDEX.USDT", "RUDEX.ETH"], ["RUDEX.USDT", "RUDEX.EOS"], @@ -332,9 +272,6 @@ export function getFeaturedMarkets(quotes = []) { ["RUDEX.BTC", "RUDEX.GOLOS"], ["RUDEX.BTC", "RUDEX.WLS"], ["RUDEX.BTC", "PPY"], - ["BTS", "OPEN.MAID"], - ["BTS", "OPEN.HEAT"], - ["BTS", "OPEN.INCENT"], ["RUBLE", "RUDEX.BTC"], ["RUBLE", "RUDEX.ETH"], ["RUBLE", "RUDEX.USDT"], @@ -348,8 +285,7 @@ export function getFeaturedMarkets(quotes = []) { ["BTS", "RUDEX.WLS"], ["BTS", "RUDEX.SMOKE"], ["BTS", "XBTSX.STH"], - ["BTS", "XBTSX.WAVES"], - ["BTS", "HERTZ"] + ["BTS", "XBTSX.WAVES"] ].filter(a => { if (!quotes.length) return true; return quotes.indexOf(a[0]) !== -1; From 3ed7209e8692bdff495f2094ac485578cbc14689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Mon, 27 Apr 2020 08:33:26 +0200 Subject: [PATCH 042/141] Update branding.js --- app/branding.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/branding.js b/app/branding.js index a851a746f3..79265a3d5f 100644 --- a/app/branding.js +++ b/app/branding.js @@ -217,7 +217,6 @@ export function getFeaturedMarkets(quotes = []) { return [ ["USD", "BTS"], ["USD", "GOLD"], - ["USD", "HERO"], ["USD", "GDEX.BTC"], ["USD", "GDEX.ETH"], ["USD", "GDEX.EOS"], @@ -252,8 +251,6 @@ export function getFeaturedMarkets(quotes = []) { ["BTS", "PPY"], ["BTS", "OBITS"], ["BTS", "RUBLE"], - ["BTS", "HERO"], - ["BTS", "OCT"], ["BTS", "SILVER"], ["BTS", "GOLD"], ["BTS", "GDEX.BTC"], From 0f8ca5479e37fb556effa03ff0641784a45445ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Mon, 27 Apr 2020 08:34:24 +0200 Subject: [PATCH 043/141] remove deex --- app/api/apiConfig.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 17f67030b5..bc155ad982 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -83,11 +83,6 @@ export const xbtsxAPIs = { COINS_LIST: "/coin" }; -export const deexAPIs = { - BASE: "https://deex.exchange/gateway", - COINS_LIST: "/compatibility/get_coins" -}; - export const nodeRegions = [ // region of the node follows roughly https://en.wikipedia.org/wiki/Subregion#/media/File:United_Nations_geographical_subregions.png "Northern Europe", From bb998ff55d18d1a3ee40ec4d7f1e03185a58aa38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Mon, 27 Apr 2020 08:34:58 +0200 Subject: [PATCH 044/141] Update branding.js --- app/branding.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/branding.js b/app/branding.js index 79265a3d5f..25262c4476 100644 --- a/app/branding.js +++ b/app/branding.js @@ -298,7 +298,7 @@ export function getAssetNamespaces() { if (_isTestnet()) { return []; } - return ["OPEN.", "RUDEX.", "GDEX.", "XBTSX.", "CITADEL.", "DEEX."]; + return ["OPEN.", "RUDEX.", "GDEX.", "XBTSX.", "CITADEL."]; } /** @@ -322,7 +322,6 @@ export function allowedGateway(gateway) { "RUDEX", "GDEX", "XBTSX", - "DEEX", "CITADEL" ]; if (!gateway) { From 6648f35c44f00777345176a85d7a9e3cb14a8fb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Mon, 27 Apr 2020 08:35:57 +0200 Subject: [PATCH 045/141] Update gateways.js --- app/lib/common/gateways.js | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index 09448113d9..bea4a56840 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -10,8 +10,7 @@ import { cryptoBridgeAPIs, gdex2APIs, xbtsxAPIs, - citadelAPIs, - deexAPIs + citadelAPIs } from "api/apiConfig"; import {allowedGateway} from "branding"; import {isGatewayTemporarilyDisabled} from "../chain/onChainConfig"; @@ -190,25 +189,6 @@ export const availableGateways = { }, landing: "https://citadel.li/", wallet: "https://citadel.li/wallet/" - }, - DEEX: { - id: "DEEX", - name: "DEEX", - baseAPI: deexAPIs, - isSimple: true, - simpleAssetGateway: false, - fixedMemo: { - prepend_default: "dex:", - append: "" - }, - isEnabled: _isEnabled("DEEX"), - addressValidatorMethod: "POST", - options: { - enabled: false, - selected: false - }, - landing: "https://deex.one/", - wallet: "https://deex.exchange/" } }; From aff4bb5fbdc25a925e1f89800fa12795fba550e4 Mon Sep 17 00:00:00 2001 From: Agorise <31280836+Agorise@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:48:49 -0500 Subject: [PATCH 046/141] added 2 more scam accounts that submit bs Proposals --- app/lib/common/scamAccounts.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 9c6ad069f5..9e19895683 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1230,5 +1230,9 @@ export const scamAccountsOther = [ "committee-security-update", "1.2.1592605", "committee-accounr", - "1.2.500266" + "1.2.500266", + "committee-delegate", + "1.2.1621188", + "binance-witness", + "1.2.1700190" ]; From c475b48fb8e072f5c2541621cc50fb2b7dde99d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Fri, 1 May 2020 00:32:01 +0200 Subject: [PATCH 047/141] restore some assets, remove gdex delisting --- app/branding.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/app/branding.js b/app/branding.js index 25262c4476..b41076dcb5 100644 --- a/app/branding.js +++ b/app/branding.js @@ -141,13 +141,8 @@ export function getMyMarketsQuotes() { "GDEX.BTO", "GDEX.EOS", "GDEX.ETH", - "GDEX.BTM", - "GDEX.NEO", - "GDEX.GAS", - "GDEX.QTUM", "GDEX.BKBT", "GDEX.GXC", - "GDEX.HPB", "GDEX.SEER", "GDEX.FOTA", "GDEX.JRC", @@ -195,6 +190,11 @@ export function getMyMarketsQuotes() { "XBTSX.EXR" ], otherTokens: [ + "CVCOIN", + "HERO", + "OCT", + "HERTZ", + "YOYOW" ] }; @@ -217,6 +217,7 @@ export function getFeaturedMarkets(quotes = []) { return [ ["USD", "BTS"], ["USD", "GOLD"], + ["USD", "HERO"], ["USD", "GDEX.BTC"], ["USD", "GDEX.ETH"], ["USD", "GDEX.EOS"], @@ -231,11 +232,12 @@ export function getFeaturedMarkets(quotes = []) { ["USD", "RUDEX.SMOKE"], ["CNY", "BTS"], ["CNY", "USD"], + ["CNY", "YOYOW"], + ["CNY", "OCT"], ["CNY", "GDEX.BTC"], ["CNY", "GDEX.ETH"], ["CNY", "GDEX.EOS"], ["CNY", "GDEX.BTO"], - ["CNY", "GDEX.BTM"], ["CNY", "GDEX.SEER"], ["CNY", "GDEX.BKBT"], ["CNY", "GDEX.USDT"], @@ -249,8 +251,9 @@ export function getFeaturedMarkets(quotes = []) { ["CNY", "RUDEX.WLS"], ["CNY", "RUDEX.SMOKE"], ["BTS", "PPY"], - ["BTS", "OBITS"], ["BTS", "RUBLE"], + ["BTS", "HERO"], + ["BTS", "OCT"], ["BTS", "SILVER"], ["BTS", "GOLD"], ["BTS", "GDEX.BTC"], @@ -282,7 +285,8 @@ export function getFeaturedMarkets(quotes = []) { ["BTS", "RUDEX.WLS"], ["BTS", "RUDEX.SMOKE"], ["BTS", "XBTSX.STH"], - ["BTS", "XBTSX.WAVES"] + ["BTS", "XBTSX.WAVES"], + ["BTS", "HERTZ"] ].filter(a => { if (!quotes.length) return true; return quotes.indexOf(a[0]) !== -1; From b1b7b5969fb388986d856b00724ddb77a301ee5f Mon Sep 17 00:00:00 2001 From: serdrdoor Date: Fri, 1 May 2020 12:11:07 +0300 Subject: [PATCH 048/141] =?UTF-8?q?-=20add=20RUDEX.PZM,=20icon=20and=20mar?= =?UTF-8?q?kets=20=E2=80=A6=20-=20add=20custom=20field=20for=20public=20ke?= =?UTF-8?q?y=20PZM=20(for=20withdrawals)=20-=20change=20endpoint=20RuDEX?= =?UTF-8?q?=20gateApi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/apiConfig.js | 2 +- app/assets/asset-symbols/rudex.pzm.png | Bin 0 -> 2208 bytes app/assets/asset-symbols/symbols.js | 1 + app/assets/locales/locale-en.json | 1 + app/assets/locales/locale-ru.json | 1 + app/branding.js | 23 +++--- .../DepositWithdraw/rudex/RuDexGateway.jsx | 3 + .../rudex/RuDexGatewayDepositRequest.jsx | 4 + .../rudex/RuDexWithdrawModal.jsx | 76 ++++++++++++++++-- app/components/Modal/WithdrawModalNew.jsx | 51 +++++++++++- app/lib/common/RuDexMethods.js | 2 +- app/lib/common/gatewayMethods.js | 4 +- 12 files changed, 142 insertions(+), 26 deletions(-) create mode 100644 app/assets/asset-symbols/rudex.pzm.png diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index bc155ad982..44aec93e14 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -22,7 +22,7 @@ export const openledgerAPIs = { }; export const rudexAPIs = { - BASE: "https://gateway.rudex.org/api/v3_0", + BASE: "https://gateway.rudex.org/api/rudex", COINS_LIST: "/coins", NEW_DEPOSIT_ADDRESS: "/simple-api/initiate-trade" }; diff --git a/app/assets/asset-symbols/rudex.pzm.png b/app/assets/asset-symbols/rudex.pzm.png new file mode 100644 index 0000000000000000000000000000000000000000..1275b9ccb72b4deed9db705b03eb586b1392271e GIT binary patch literal 2208 zcma)8`#%$k8{WurJ#+gqLyft&vD{O+HMhBxp)8S!owWFdqHuYUBP!>;>>nZ+Fe20 zQIkarVtw<@G(59RFZEwlh4VeNptF84ejI0HAN6lM^xgQxh!b;`j>^qFokFWtrNJq4 zT^mm7s_p0ZcLcYx$-OKfE7MB%;jwDg0g2*tkl z#cexKjA7g2UZE@Dr4s!m&Mrl?|6yMq?mSlSnVO>)l8kwSt;T91-lJw>-$bqsYglaw zE=-q1uowHaA?*3j4gk$zdq8K`sGvuwP1)4sktYQ<VZIIOM3Tu5<(Ad(>st@r{BbmeY+tfBspDILl19U96RLck~Ys6`Fr` zx`I-(cu0Vp*-*RHnYfdAC4h~}8h$Gu$m-tQoXIi8Z-~T23)*}XH7UTy;7g_7>rXAn zI3y4RC7%{dWc$FsWO^UHzI$rzBGuZdHNn+|+Ys+jg&M?VRi|#)&SxCDkxi^b!Lr_@ zD&_)I`B@_TR%BtRK^D}XDsH+QT#dcT^a7hN zccA?PRs7T5R!j^p?_YSbIm_*d@FK(-e_OIicps}JqbVi7jzO5;0Uvk?GJQRhFF^mL{{guoGH$7u0a}H!wkesKs`->K`>M`X&d7KaIL3g^w&}v8Sar8J zs@^1Nv}pA$pqkbF8(|VQBL!r%JoIrSkCh(ga7pp@epTO{rp3)frU(w^9@cu{+F@T7 z>Q|8{)e@4h#&G)ZTjN*(neKPOEX$^Lve|O{R`Ur-Yk1#rlNH}jFpemK8<7Hn^r?I! zn6l1f?1T;bwbz-ibu=un%w=((;=$rci`$>u<|UYTh1Hi4x@Xk-cJQz?nnA#s>(N(M zeCP5eJ!xNkW7F0q$5;L5%vRT|upz**lbv-dANvh5U*8Dy6R0ejtp&6g|LB?O`YTW2CEAXE6r-fDvW>qa9p95L7~6%e1; z`H$$Rz*_%o!_@#a@DnL7XkpyFYRU{vWBV7k^qxs;+Xbtn9An|&Yiv9^uhhRUr@@-J z|JSj;yiaS7A}_yyRl4b%!M5$z#d|{t`tEPoE;h9>M)rBrOn46P!2)W*OZ{XU=E{^= zXkgJ2K~Ji{RwZ)d1-r{)F-D0h8P-QVyqn^51Y8xu&n{g&e*OJ7!^wR&S_TIJ+ccmN zE9_3%Tpz^$oHC5c5Sz!IkIL1leZ|(*7tmS3z_x9?CC1B-(0HlBztaB>UnDZ@T|~~n z!LiqGwVxFuYGSa=;KHrsUZmVW$Ju30nR3{i2Z10WiUX7!EXDckdQ>aL$cm!UO+$y! z*73?ZT!1+b;4#{8FB3t^McG!a_qr+dct9SG%DUnJu6SE7*XQ0!J?9~R=8U59#2S=9 zrn#oCLV%wsKz9uW07nwXlg38HGsUQKAWMA)3`f$#le|X7v&E@}XQRnOB7KsgXbjv}33d?z!$AM$0@ir|xlv1))QzB;+SXu>RY&OjBWZbyhLy&1 v$abNv$@})C=~k;Oocoqh^{)=I%BB%ZG*RT#fU2?Zp#Zozc%a$#f%pFpYnAfz literal 0 HcmV?d00001 diff --git a/app/assets/asset-symbols/symbols.js b/app/assets/asset-symbols/symbols.js index 33c70c7227..41b7c04d80 100644 --- a/app/assets/asset-symbols/symbols.js +++ b/app/assets/asset-symbols/symbols.js @@ -98,3 +98,4 @@ require("file-loader?name=asset-symbols/[name].png!./rudex.sbd.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.smoke.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.steem.png"); require("file-loader?name=asset-symbols/[name].png!./rudex.wls.png"); +require("file-loader?name=asset-symbols/[name].png!./rudex.pzm.png"); diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json index a96666e006..989e70466c 100644 --- a/app/assets/locales/locale-en.json +++ b/app/assets/locales/locale-en.json @@ -1675,6 +1675,7 @@ "no_assets": "No withdrawable assets available", "no_estimate": "No estimate available for this object", "no_gateways": "Sorry, but there are no gateways available to handle this withdrawal", + "public_key": "Public key", "quantity": "Quantity", "submit": "Withdraw", "withdraw": "Withdraw" diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json index 4ff92d9c60..40f8ef3a1c 100644 --- a/app/assets/locales/locale-ru.json +++ b/app/assets/locales/locale-ru.json @@ -1675,6 +1675,7 @@ "no_assets": "Нет доступных активов для вывода", "no_estimate": "Для этого объекта нет доступных оценок", "no_gateways": "Извините, для обработки этой операции вывода нет доступных шлюзов", + "public_key": "Public key", "quantity": "Количество", "submit": "Вывести", "withdraw": "Вывод" diff --git a/app/branding.js b/app/branding.js index b41076dcb5..7410634e84 100644 --- a/app/branding.js +++ b/app/branding.js @@ -153,9 +153,7 @@ export function getMyMarketsQuotes() { "GDEX.NULS", "GDEX.USDT" ], - openledgerTokens: [ - "OBITS" - ], + openledgerTokens: ["OBITS"], rudexTokens: [ "PPY", "RUDEX.BTC", @@ -169,7 +167,8 @@ export function getMyMarketsQuotes() { "RUDEX.KRM", "RUDEX.WLS", "RUDEX.SMOKE", - "RUDEX.GRC" + "RUDEX.GRC", + "RUDEX.PZM" ], xbtsxTokens: [ "XBTSX.STH", @@ -189,13 +188,7 @@ export function getMyMarketsQuotes() { "XBTSX.ETH", "XBTSX.EXR" ], - otherTokens: [ - "CVCOIN", - "HERO", - "OCT", - "HERTZ", - "YOYOW" - ] + otherTokens: ["CVCOIN", "HERO", "OCT", "HERTZ", "YOYOW"] }; let allTokens = []; @@ -232,7 +225,7 @@ export function getFeaturedMarkets(quotes = []) { ["USD", "RUDEX.SMOKE"], ["CNY", "BTS"], ["CNY", "USD"], - ["CNY", "YOYOW"], + ["CNY", "YOYOW"], ["CNY", "OCT"], ["CNY", "GDEX.BTC"], ["CNY", "GDEX.ETH"], @@ -252,7 +245,7 @@ export function getFeaturedMarkets(quotes = []) { ["CNY", "RUDEX.SMOKE"], ["BTS", "PPY"], ["BTS", "RUBLE"], - ["BTS", "HERO"], + ["BTS", "HERO"], ["BTS", "OCT"], ["BTS", "SILVER"], ["BTS", "GOLD"], @@ -264,6 +257,7 @@ export function getFeaturedMarkets(quotes = []) { ["RUDEX.USDT", "RUDEX.BTC"], ["RUDEX.USDT", "RUDEX.ETH"], ["RUDEX.USDT", "RUDEX.EOS"], + ["RUDEX.USDT", "RUDEX.PZM"], ["RUDEX.USDT", "PPY"], ["RUDEX.USDT", "RUBLE"], ["RUDEX.BTC", "RUDEX.ETH"], @@ -276,6 +270,8 @@ export function getFeaturedMarkets(quotes = []) { ["RUBLE", "RUDEX.ETH"], ["RUBLE", "RUDEX.USDT"], ["RUBLE", "RUDEX.GOLOS"], + ["RUDEX.BTC", "RUDEX.PZM"], + ["RUB", "RUDEX.GOLOS"], ["BTS", "RUDEX.GOLOS"], ["BTS", "RUDEX.STEEM"], ["BTS", "RUDEX.EOS"], @@ -284,6 +280,7 @@ export function getFeaturedMarkets(quotes = []) { ["BTS", "RUDEX.USDT"], ["BTS", "RUDEX.WLS"], ["BTS", "RUDEX.SMOKE"], + ["BTS", "RUDEX.PZM"], ["BTS", "XBTSX.STH"], ["BTS", "XBTSX.WAVES"], ["BTS", "HERTZ"] diff --git a/app/components/DepositWithdraw/rudex/RuDexGateway.jsx b/app/components/DepositWithdraw/rudex/RuDexGateway.jsx index c41b6665d3..1bfb953743 100644 --- a/app/components/DepositWithdraw/rudex/RuDexGateway.jsx +++ b/app/components/DepositWithdraw/rudex/RuDexGateway.jsx @@ -195,6 +195,9 @@ class RuDexGateway extends React.Component { receive_asset={coin.symbol} receive_coin_type={coin.symbol.toLowerCase()} supports_output_memos={coin.supportsMemos} + supportsPublicKey={ + coin.supportsPublicKey || false + } memoType={coin.memoType} min_amount={coin.minAmount} gateFee={coin.gateFee} diff --git a/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx b/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx index 7855b53a2f..36e6213c33 100644 --- a/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx +++ b/app/components/DepositWithdraw/rudex/RuDexGatewayDepositRequest.jsx @@ -33,6 +33,7 @@ class RuDexGatewayDepositRequest extends React.Component { deprecated_message: PropTypes.string, action: PropTypes.string, supports_output_memos: PropTypes.bool.isRequired, + supportsPublicKey: PropTypes.bool.isRequired, memoType: PropTypes.string, min_amount: PropTypes.number, gateFee: PropTypes.number, @@ -572,6 +573,9 @@ class RuDexGatewayDepositRequest extends React.Component { output_supports_memos={ this.props.supports_output_memos } + output_supportsPublicKey={ + this.props.supportsPublicKey + } memo_prefix={withdraw_memo_prefix} modal_id={withdraw_modal_id} min_amount={this.props.min_amount} diff --git a/app/components/DepositWithdraw/rudex/RuDexWithdrawModal.jsx b/app/components/DepositWithdraw/rudex/RuDexWithdrawModal.jsx index 5e116a052b..f0245c690f 100644 --- a/app/components/DepositWithdraw/rudex/RuDexWithdrawModal.jsx +++ b/app/components/DepositWithdraw/rudex/RuDexWithdrawModal.jsx @@ -28,6 +28,7 @@ class RuDexWithdrawModal extends React.Component { url: PropTypes.string, output_wallet_type: PropTypes.string, output_supports_memos: PropTypes.bool.isRequired, + output_supportsPublicKey: PropTypes.bool.isRequired, amount_to_withdraw: PropTypes.string, balance: ChainTypes.ChainObject, min_amount: PropTypes.number, @@ -50,6 +51,10 @@ class RuDexWithdrawModal extends React.Component { withdraw_address_selected: WithdrawAddresses.getLast( props.output_wallet_type ), + withdraw_publicKey: "", + withdraw_publicKey_not_empty: this.props.output_supportsPublicKey + ? false + : true, memo: "", withdraw_address_first: true, empty_withdraw_value: false, @@ -245,16 +250,37 @@ class RuDexWithdrawModal extends React.Component { this._validateAddress(new_withdraw_address); } + onWithdrawPublicKeyChanged(e) { + let new_withdraw_publicKey = e.target.value.trim(); + this.setState({ + withdraw_publicKey: new_withdraw_publicKey, + withdraw_publicKey_not_empty: + new_withdraw_publicKey != "" ? true : false + }); + } + _validateAddress(new_withdraw_address, props = this.props) { validateAddress({ url: props.url, walletType: props.output_wallet_type, newAddress: new_withdraw_address - }).then(isValid => { + }).then(json => { + if (typeof json === "undefined") { + json = {isValid: false}; + } if (this.state.withdraw_address === new_withdraw_address) { this.setState({ withdraw_address_check_in_progress: false, - withdraw_address_is_valid: isValid + withdraw_address_is_valid: json.isValid, + withdraw_publicKey: json.hasOwnProperty("publicKey") + ? json.publicKey + : "", + withdraw_publicKey_not_empty: this.props + .output_supportsPublicKey + ? json.hasOwnProperty("publicKey") + ? true + : false + : true }); } }); @@ -283,12 +309,12 @@ class RuDexWithdrawModal extends React.Component { withdraw_amount < this.props.min_amount / utils.get_asset_precision(this.props.asset_precision); - console.log( + /* console.log( "X", withdraw_amount, this.props.min_amount / - utils.get_asset_precision(this.props.asset_precision) - ); + utils.get_asset_precision(this.props.asset_precision) + );*/ this.setState({minAmountError: lessThanMinimum}); return lessThanMinimum; } @@ -353,6 +379,9 @@ class RuDexWithdrawModal extends React.Component { this.props.output_coin_type + ":" + this.state.withdraw_address + + (this.props.output_supportsPublicKey + ? ":" + this.state.withdraw_publicKey + : "") + (this.state.memo ? ":" + new Buffer(this.state.memo, "utf-8") : ""), @@ -415,6 +444,9 @@ class RuDexWithdrawModal extends React.Component { this.props.output_coin_type + ":" + this.state.withdraw_address + + (this.props.output_supportsPublicKey + ? ":" + this.state.withdraw_publicKey + : "") + (this.state.memo ? ":" + new Buffer(this.state.memo, "utf-8") : ""), @@ -483,6 +515,7 @@ class RuDexWithdrawModal extends React.Component { _getAvailableAssets(state = this.state) { const {from_account, feeStatus} = state; + function hasFeePoolBalance(id) { if (feeStatus[id] === undefined) return true; return feeStatus[id] && feeStatus[id].hasPoolBalance; @@ -552,7 +585,7 @@ class RuDexWithdrawModal extends React.Component { } render() { - let {withdraw_address_selected, memo} = this.state; + let {withdraw_address_selected, withdraw_publicKey, memo} = this.state; let storedAddress = WithdrawAddresses.get( this.props.output_wallet_type ); @@ -842,6 +875,34 @@ class RuDexWithdrawModal extends React.Component { {invalid_address_message} + {/* for PublicKey input (ex.PRIZM) */} + {this.props.output_supportsPublicKey ? ( +
+ +
+
+ +
+
+
+ ) : null} + {/* Memo input */} {withdraw_memo} @@ -851,7 +912,8 @@ class RuDexWithdrawModal extends React.Component { disabled={ this.state.error || this.state.balanceError || - this.state.minAmountError + this.state.minAmountError || + !this.state.withdraw_publicKey_not_empty } type="primary" onClick={this.onSubmit.bind(this)} diff --git a/app/components/Modal/WithdrawModalNew.jsx b/app/components/Modal/WithdrawModalNew.jsx index beade2962b..2ed027d528 100644 --- a/app/components/Modal/WithdrawModalNew.jsx +++ b/app/components/Modal/WithdrawModalNew.jsx @@ -62,6 +62,8 @@ class WithdrawModalNew extends React.Component { quantity: 0, address: "", memo: "", + withdraw_publicKey: "", + withdraw_publicKey_not_empty: false, userEstimate: null, addressError: false, gatewayStatus: availableGateways, @@ -581,8 +583,20 @@ class WithdrawModalNew extends React.Component { : null, method: gatewayStatus[selectedGateway].addressValidatorMethod || null - }).then(isValid => { - this.setState({addressError: isValid ? false : true}); + }).then(json => { + if (typeof json === "undefined") { + json = {isValid: false}; + } + + this.setState({addressError: json.isValid ? false : true}); + this.setState({ + withdraw_publicKey: json.hasOwnProperty("publicKey") + ? json.publicKey + : "", + withdraw_publicKey_not_empty: json.hasOwnProperty("publicKey") + ? true + : false + }); }); } @@ -600,6 +614,15 @@ class WithdrawModalNew extends React.Component { this.setState({memo: e.target.value}); } + onWithdrawPublicKeyChanged(e) { + let new_withdraw_publicKey = e.target.value.trim(); + this.setState({ + withdraw_publicKey: new_withdraw_publicKey, + withdraw_publicKey_not_empty: + new_withdraw_publicKey != "" ? true : false + }); + } + onClickAvailableBalance(available) { this.setState({quantity: available}); } @@ -714,6 +737,9 @@ class WithdrawModalNew extends React.Component { assetName + ":" + address + + (this.state.withdraw_publicKey_not_empty + ? ":" + this.state.withdraw_publicKey + : "") + (memo ? ":" + new Buffer(memo, "utf-8") : ""); to = intermediateAccount.get("id"); } @@ -1176,6 +1202,27 @@ class WithdrawModalNew extends React.Component { ) : null} + {/*PUBLIC key - custom field (PRIZM) */} + {backingAsset && + backingAsset.supportsPublicKey !== undefined ? ( +
+ + { + + } +
+ ) : null} + {/*MEMO*/} {isBTS || (backingAsset && backingAsset.supportsMemos) ? ( diff --git a/app/lib/common/RuDexMethods.js b/app/lib/common/RuDexMethods.js index 70a2b13192..0007f981a5 100644 --- a/app/lib/common/RuDexMethods.js +++ b/app/lib/common/RuDexMethods.js @@ -81,7 +81,7 @@ export function validateAddress({ }), body: JSON.stringify({address: newAddress}) }) - .then(reply => reply.json().then(json => json.isValid)) + .then(reply => reply.json().then(json => json)) .catch(err => { console.log("validate error:", err); }); diff --git a/app/lib/common/gatewayMethods.js b/app/lib/common/gatewayMethods.js index 091740f3a1..0a704bb0f3 100644 --- a/app/lib/common/gatewayMethods.js +++ b/app/lib/common/gatewayMethods.js @@ -472,7 +472,7 @@ export function validateAddress({ "Content-Type": "application/json" }) }) - .then(reply => reply.json().then(json => json.isValid)) + .then(reply => reply.json().then(json => json)) .catch(err => { console.log("validate error:", err); }); @@ -485,7 +485,7 @@ export function validateAddress({ }), body: JSON.stringify({address: newAddress}) }) - .then(reply => reply.json().then(json => json.isValid)) + .then(reply => reply.json().then(json => json)) .catch(err => { console.log("validate error:", err); }); From 307b8480742ba2922c154d3272464fcf39ff60b0 Mon Sep 17 00:00:00 2001 From: serdrdoor Date: Fri, 1 May 2020 12:43:52 +0300 Subject: [PATCH 049/141] fix bug in claim asset fees (feePoolOperations) --- app/components/Account/FeePoolOperation.jsx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/components/Account/FeePoolOperation.jsx b/app/components/Account/FeePoolOperation.jsx index a7ba9774c4..943333529a 100644 --- a/app/components/Account/FeePoolOperation.jsx +++ b/app/components/Account/FeePoolOperation.jsx @@ -260,7 +260,20 @@ class FeePoolOperation extends React.Component { this.state.claimFeesAmountAsset.getAmount() <= unclaimedBalance; let unclaimedBalanceText = ( - + { + this.state.claimFeesAmountAsset.setAmount({ + sats: dynamicObject.get("accumulated_fees") + }); + this.setState({ + claimFeesAmount: this.state.claimFeesAmountAsset.getAmount( + { + real: true + } + ) + }); + }} + > :  Date: Sun, 10 May 2020 09:10:36 +0200 Subject: [PATCH 050/141] - add getSteemNewsTag - add BRIDGE again to display the warning icon, permanently disabled in gateways.js - remove bitshares.fdn as news feed in BitShares UI - fix dependencies Signed-off-by: Stefan Schiessl --- app/branding.js | 9 +- .../Gateways/GatewaySelectorModal.jsx | 14 +- app/components/News.jsx | 9 +- app/lib/common/gateways.js | 7 +- package-lock.json | 3463 +++++++++-------- package.json | 9 +- 6 files changed, 1912 insertions(+), 1599 deletions(-) diff --git a/app/branding.js b/app/branding.js index 7410634e84..59b9c68132 100644 --- a/app/branding.js +++ b/app/branding.js @@ -319,11 +319,12 @@ export function getAssetHideNamespaces() { export function allowedGateway(gateway) { const allowedGateways = [ "TRADE", - "OPEN", + "OPEN", // keep to display the warning icon, permanently disabled in gateways.js "RUDEX", "GDEX", "XBTSX", - "CITADEL" + "CITADEL", + "BRIDGE" // keep to display the warning icon, permanently disabled in gateways.js ]; if (!gateway) { // answers the question: are any allowed? @@ -355,3 +356,7 @@ export function getConfigurationAsset() { "This asset is used for decentralized configuration of the BitShares UI placed under bitshares.org." }; } + +export function getSteemNewsTag() { + return null; +} diff --git a/app/components/Gateways/GatewaySelectorModal.jsx b/app/components/Gateways/GatewaySelectorModal.jsx index 8795f06b04..089ba0ce0d 100644 --- a/app/components/Gateways/GatewaySelectorModal.jsx +++ b/app/components/Gateways/GatewaySelectorModal.jsx @@ -214,9 +214,10 @@ class GatewaySelectorModal extends React.Component { name: item.name, prefix: item.id, landing: !!item.landing ? item.landing : undefined, - wallet: !!item.wallet - ? item.wallet + this._getReferrerLink() - : undefined, + wallet: + !!item.wallet && item.wallet.startsWith("http") + ? item.wallet + this._getReferrerLink() + : item.wallet, isEnabled: item.isEnabled }; }); @@ -226,9 +227,10 @@ class GatewaySelectorModal extends React.Component { type: "bridge", name: item.name, landing: !!item.landing ? item.landing : undefined, - wallet: !!item.wallet - ? item.wallet + this._getReferrerLink() - : undefined, + wallet: + !!item.wallet && item.wallet.startsWith("http") + ? item.wallet + this._getReferrerLink() + : item.wallet, isEnabled: item.isEnabled }; }); diff --git a/app/components/News.jsx b/app/components/News.jsx index d52fef6772..c61b0234e9 100644 --- a/app/components/News.jsx +++ b/app/components/News.jsx @@ -4,8 +4,9 @@ import {api} from "steem-js-api"; import Translate from "react-translate-component"; import LoadingIndicator from "./LoadingIndicator"; import utils from "common/utils"; +import {getSteemNewsTag} from "../branding"; -const query = {tag: "bitshares.fdn", limit: 20}; +const query = {tag: getSteemNewsTag(), limit: 20}; const alignRight = {textAlign: "right"}; const alignLeft = {textAlign: "left"}; @@ -152,6 +153,12 @@ class News extends React.Component { componentDidMount() { this.updateDimensions(); window.addEventListener("resize", this.updateDimensions); + if (!query.tag) { + setTimeout(() => { + this.setState({isLoading: false, isWrong: false}); + }, 100); + return; + } api.getDiscussionsByBlog(query) .then(discussions => { this.orderDiscussions(discussions); diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index bea4a56840..effbe4c6a8 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -90,13 +90,14 @@ export const availableGateways = { id: "OPEN", name: "OpenLedger", baseAPI: openledgerAPIs, - isEnabled: false, + isEnabled: () => false, selected: false, options: { enabled: false, selected: false }, - landing: "https://dex.openledger.io/news/ol-dex-is-closing-all-activities/", + landing: + "https://dex.openledger.io/news/ol-dex-is-closing-all-activities/", wallet: "Shutdown" }, RUDEX: { @@ -137,7 +138,7 @@ export const availableGateways = { id: "BRIDGE", name: "CryptoBridge", baseAPI: cryptoBridgeAPIs, - isEnabled: _isEnabled("BRIDGE"), + isEnabled: () => false, selected: false, singleWallet: true, // Has no coresponging coinType == backingCoinType specific wallet addressValidatorAsset: true, // Address validator requires output_asset parameter diff --git a/package-lock.json b/package-lock.json index 31f40c59b9..718ede3949 100644 --- a/package-lock.json +++ b/package-lock.json @@ -246,9 +246,9 @@ "dev": true }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, "ms": { @@ -359,6 +359,12 @@ "@babel/types": "7.0.0-beta.44" } }, + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==", + "dev": true + }, "@babel/helpers": { "version": "7.4.4", "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.4.4.tgz", @@ -716,9 +722,9 @@ }, "dependencies": { "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true } } @@ -1437,17 +1443,6 @@ } } }, - "@jest/fake-timers": { - "version": "24.7.1", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.7.1.tgz", - "integrity": "sha512-4vSQJDKfR2jScOe12L9282uiwuwQv9Lk7mgrCSZHA9evB9efB/qx8i0KJxsAKtp8fgJYBJdYY7ZU6u3F4/pyjA==", - "dev": true, - "requires": { - "@jest/types": "^24.7.0", - "jest-message-util": "^24.7.1", - "jest-mock": "^24.7.0" - } - }, "@jest/reporters": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz", @@ -1801,17 +1796,6 @@ } } }, - "@jest/test-result": { - "version": "24.7.1", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.7.1.tgz", - "integrity": "sha512-3U7wITxstdEc2HMfBX7Yx3JZgiNBubwDqQMh+BXmZXHa3G13YWF3p6cK+5g0hGkN3iufg/vGPl3hLxQXD74Npg==", - "dev": true, - "requires": { - "@jest/console": "^24.7.1", - "@jest/types": "^24.7.0", - "@types/istanbul-lib-coverage": "^2.0.0" - } - }, "@jest/test-sequencer": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz", @@ -2077,28 +2061,113 @@ } }, "@jest/transform": { - "version": "24.7.1", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.7.1.tgz", - "integrity": "sha512-EsOUqP9ULuJ66IkZQhI5LufCHlTbi7hrcllRMUEV/tOgqBVQi93+9qEvkX0n8mYpVXQ8VjwmICeRgg58mrtIEw==", + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz", + "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/types": "^24.7.0", + "@jest/types": "^24.9.0", "babel-plugin-istanbul": "^5.1.0", "chalk": "^2.0.1", "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", "graceful-fs": "^4.1.15", - "jest-haste-map": "^24.7.1", - "jest-regex-util": "^24.3.0", - "jest-util": "^24.7.1", + "jest-haste-map": "^24.9.0", + "jest-regex-util": "^24.9.0", + "jest-util": "^24.9.0", "micromatch": "^3.1.10", + "pirates": "^4.0.1", "realpath-native": "^1.1.0", "slash": "^2.0.0", "source-map": "^0.6.1", "write-file-atomic": "2.4.1" }, "dependencies": { + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", + "dev": true, + "requires": { + "@babel/highlight": "^7.8.3" + } + }, + "@babel/highlight": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.9.0", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@jest/console": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", + "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", + "dev": true, + "requires": { + "@jest/source-map": "^24.9.0", + "chalk": "^2.0.1", + "slash": "^2.0.0" + } + }, + "@jest/fake-timers": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz", + "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==", + "dev": true, + "requires": { + "@jest/types": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-mock": "^24.9.0" + } + }, + "@jest/source-map": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz", + "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==", + "dev": true, + "requires": { + "callsites": "^3.0.0", + "graceful-fs": "^4.1.15", + "source-map": "^0.6.0" + } + }, + "@jest/test-result": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz", + "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==", + "dev": true, + "requires": { + "@jest/console": "^24.9.0", + "@jest/types": "^24.9.0", + "@types/istanbul-lib-coverage": "^2.0.0" + } + }, + "@jest/types": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", + "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^13.0.0" + } + }, + "@types/yargs": { + "version": "13.0.8", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.8.tgz", + "integrity": "sha512-XAvHLwG7UQ+8M4caKIH0ZozIOYay5fQkAgyIXegXT9jPtdIGdhga+sUEdAr1CiG46aB+c64xQEYyEzlwWVTNzA==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, "ansi-styles": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", @@ -2108,6 +2177,12 @@ "color-convert": "^1.9.0" } }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -2119,10 +2194,129 @@ "supports-color": "^5.3.0" } }, + "ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dev": true + }, "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "is-ci": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", + "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "dev": true, + "requires": { + "ci-info": "^2.0.0" + } + }, + "jest-haste-map": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz", + "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==", + "dev": true, + "requires": { + "@jest/types": "^24.9.0", + "anymatch": "^2.0.0", + "fb-watchman": "^2.0.0", + "fsevents": "^1.2.7", + "graceful-fs": "^4.1.15", + "invariant": "^2.2.4", + "jest-serializer": "^24.9.0", + "jest-util": "^24.9.0", + "jest-worker": "^24.9.0", + "micromatch": "^3.1.10", + "sane": "^4.0.3", + "walker": "^1.0.7" + } + }, + "jest-message-util": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz", + "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", + "@types/stack-utils": "^1.0.1", + "chalk": "^2.0.1", + "micromatch": "^3.1.10", + "slash": "^2.0.0", + "stack-utils": "^1.0.1" + } + }, + "jest-mock": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz", + "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==", + "dev": true, + "requires": { + "@jest/types": "^24.9.0" + } + }, + "jest-regex-util": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", + "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", + "dev": true + }, + "jest-serializer": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz", + "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==", + "dev": true + }, + "jest-util": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz", + "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==", + "dev": true, + "requires": { + "@jest/console": "^24.9.0", + "@jest/fake-timers": "^24.9.0", + "@jest/source-map": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", + "callsites": "^3.0.0", + "chalk": "^2.0.1", + "graceful-fs": "^4.1.15", + "is-ci": "^2.0.0", + "mkdirp": "^0.5.1", + "slash": "^2.0.0", + "source-map": "^0.6.0" + } + }, + "jest-worker": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", + "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==", + "dev": true, + "requires": { + "merge-stream": "^2.0.0", + "supports-color": "^6.1.0" + }, + "dependencies": { + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, "slash": { @@ -2388,262 +2582,178 @@ "dev": true }, "@webassemblyjs/ast": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.5.13.tgz", - "integrity": "sha512-49nwvW/Hx9i+OYHg+mRhKZfAlqThr11Dqz8TsrvqGKMhdI2ijy3KBJOun2Z4770TPjrIJhR6KxChQIDaz8clDA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", + "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==", "dev": true, "requires": { - "@webassemblyjs/helper-module-context": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/wast-parser": "1.5.13", - "debug": "^3.1.0", - "mamacro": "^0.0.3" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0" } }, "@webassemblyjs/floating-point-hex-parser": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz", - "integrity": "sha512-vrvvB18Kh4uyghSKb0NTv+2WZx871WL2NzwMj61jcq2bXkyhRC+8Q0oD7JGVf0+5i/fKQYQSBCNMMsDMRVAMqA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz", + "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==", "dev": true }, "@webassemblyjs/helper-api-error": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz", - "integrity": "sha512-dBh2CWYqjaDlvMmRP/kudxpdh30uXjIbpkLj9HQe+qtYlwvYjPRjdQXrq1cTAAOUSMTtzqbXIxEdEZmyKfcwsg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz", + "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==", "dev": true }, "@webassemblyjs/helper-buffer": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz", - "integrity": "sha512-v7igWf1mHcpJNbn4m7e77XOAWXCDT76Xe7Is1VQFXc4K5jRcFrl9D0NrqM4XifQ0bXiuTSkTKMYqDxu5MhNljA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz", + "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==", + "dev": true + }, + "@webassemblyjs/helper-code-frame": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz", + "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==", "dev": true, "requires": { - "debug": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "@webassemblyjs/helper-code-frame": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz", - "integrity": "sha512-yN6ScQQDFCiAXnVctdVO/J5NQRbwyTbQzsGzEgXsAnrxhjp0xihh+nNHQTMrq5UhOqTb5LykpJAvEv9AT0jnAQ==", - "dev": true, - "requires": { - "@webassemblyjs/wast-printer": "1.5.13" + "@webassemblyjs/wast-printer": "1.9.0" } }, "@webassemblyjs/helper-fsm": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz", - "integrity": "sha512-hSIKzbXjVMRvy3Jzhgu+vDd/aswJ+UMEnLRCkZDdknZO3Z9e6rp1DAs0tdLItjCFqkz9+0BeOPK/mk3eYvVzZg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz", + "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==", "dev": true }, "@webassemblyjs/helper-module-context": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz", - "integrity": "sha512-zxJXULGPLB7r+k+wIlvGlXpT4CYppRz8fLUM/xobGHc9Z3T6qlmJD9ySJ2jknuktuuiR9AjnNpKYDECyaiX+QQ==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz", + "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==", "dev": true, "requires": { - "debug": "^3.1.0", - "mamacro": "^0.0.3" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "@webassemblyjs/ast": "1.9.0" } }, "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz", - "integrity": "sha512-0n3SoNGLvbJIZPhtMFq0XmmnA/YmQBXaZKQZcW8maGKwLpVcgjNrxpFZHEOLKjXJYVN5Il8vSfG7nRX50Zn+aw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz", + "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==", "dev": true }, "@webassemblyjs/helper-wasm-section": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz", - "integrity": "sha512-IJ/goicOZ5TT1axZFSnlAtz4m8KEjYr12BNOANAwGFPKXM4byEDaMNXYowHMG0yKV9a397eU/NlibFaLwr1fbw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz", + "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-buffer": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/wasm-gen": "1.5.13", - "debug": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0" } }, "@webassemblyjs/ieee754": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz", - "integrity": "sha512-TseswvXEPpG5TCBKoLx9tT7+/GMACjC1ruo09j46ULRZWYm8XHpDWaosOjTnI7kr4SRJFzA6MWoUkAB+YCGKKg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz", + "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==", "dev": true, "requires": { - "ieee754": "^1.1.11" + "@xtuc/ieee754": "^1.2.0" } }, "@webassemblyjs/leb128": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.5.13.tgz", - "integrity": "sha512-0NRMxrL+GG3eISGZBmLBLAVjphbN8Si15s7jzThaw1UE9e5BY1oH49/+MA1xBzxpf1OW5sf9OrPDOclk9wj2yg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz", + "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==", "dev": true, "requires": { - "long": "4.0.0" - }, - "dependencies": { - "long": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", - "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==", - "dev": true - } + "@xtuc/long": "4.2.2" } }, "@webassemblyjs/utf8": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.5.13.tgz", - "integrity": "sha512-Ve1ilU2N48Ew0lVGB8FqY7V7hXjaC4+PeZM+vDYxEd+R2iQ0q+Wb3Rw8v0Ri0+rxhoz6gVGsnQNb4FjRiEH/Ng==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz", + "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==", "dev": true }, "@webassemblyjs/wasm-edit": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz", - "integrity": "sha512-X7ZNW4+Hga4f2NmqENnHke2V/mGYK/xnybJSIXImt1ulxbCOEs/A+ZK/Km2jgihjyVxp/0z0hwIcxC6PrkWtgw==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-buffer": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/helper-wasm-section": "1.5.13", - "@webassemblyjs/wasm-gen": "1.5.13", - "@webassemblyjs/wasm-opt": "1.5.13", - "@webassemblyjs/wasm-parser": "1.5.13", - "@webassemblyjs/wast-printer": "1.5.13", - "debug": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz", + "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/helper-wasm-section": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0", + "@webassemblyjs/wasm-opt": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0", + "@webassemblyjs/wast-printer": "1.9.0" } }, "@webassemblyjs/wasm-gen": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz", - "integrity": "sha512-yfv94Se8R73zmr8GAYzezFHc3lDwE/lBXQddSiIZEKZFuqy7yWtm3KMwA1uGbv5G1WphimJxboXHR80IgX1hQA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz", + "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/ieee754": "1.5.13", - "@webassemblyjs/leb128": "1.5.13", - "@webassemblyjs/utf8": "1.5.13" + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/ieee754": "1.9.0", + "@webassemblyjs/leb128": "1.9.0", + "@webassemblyjs/utf8": "1.9.0" } }, "@webassemblyjs/wasm-opt": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz", - "integrity": "sha512-IkXSkgzVhQ0QYAdIayuCWMmXSYx0dHGU8Ah/AxJf1gBvstMWVnzJnBwLsXLyD87VSBIcsqkmZ28dVb0mOC3oBg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz", + "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-buffer": "1.5.13", - "@webassemblyjs/wasm-gen": "1.5.13", - "@webassemblyjs/wasm-parser": "1.5.13", - "debug": "^3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-buffer": "1.9.0", + "@webassemblyjs/wasm-gen": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0" } }, "@webassemblyjs/wasm-parser": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz", - "integrity": "sha512-XnYoIcu2iqq8/LrtmdnN3T+bRjqYFjRHqWbqK3osD/0r/Fcv4d9ecRzjVtC29ENEuNTK4mQ9yyxCBCbK8S/cpg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz", + "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-api-error": "1.5.13", - "@webassemblyjs/helper-wasm-bytecode": "1.5.13", - "@webassemblyjs/ieee754": "1.5.13", - "@webassemblyjs/leb128": "1.5.13", - "@webassemblyjs/utf8": "1.5.13" + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-api-error": "1.9.0", + "@webassemblyjs/helper-wasm-bytecode": "1.9.0", + "@webassemblyjs/ieee754": "1.9.0", + "@webassemblyjs/leb128": "1.9.0", + "@webassemblyjs/utf8": "1.9.0" } }, "@webassemblyjs/wast-parser": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz", - "integrity": "sha512-Lbz65T0LQ1LgzKiUytl34CwuhMNhaCLgrh0JW4rJBN6INnBB8NMwUfQM+FxTnLY9qJ+lHJL/gCM5xYhB9oWi4A==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz", + "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/floating-point-hex-parser": "1.5.13", - "@webassemblyjs/helper-api-error": "1.5.13", - "@webassemblyjs/helper-code-frame": "1.5.13", - "@webassemblyjs/helper-fsm": "1.5.13", - "long": "^3.2.0", - "mamacro": "^0.0.3" + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/floating-point-hex-parser": "1.9.0", + "@webassemblyjs/helper-api-error": "1.9.0", + "@webassemblyjs/helper-code-frame": "1.9.0", + "@webassemblyjs/helper-fsm": "1.9.0", + "@xtuc/long": "4.2.2" } }, "@webassemblyjs/wast-printer": { - "version": "1.5.13", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz", - "integrity": "sha512-QcwogrdqcBh8Z+eUF8SG+ag5iwQSXxQJELBEHmLkk790wgQgnIMmntT2sMAMw53GiFNckArf5X0bsCA44j3lWQ==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz", + "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==", "dev": true, "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/wast-parser": "1.5.13", - "long": "^3.2.0" + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/wast-parser": "1.9.0", + "@xtuc/long": "4.2.2" } }, "@webpack-contrib/schema-utils": { @@ -2730,6 +2840,18 @@ } } }, + "@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true + }, + "@xtuc/long": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true + }, "abab": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz", @@ -2753,20 +2875,11 @@ } }, "acorn": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", - "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==", + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz", + "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==", "dev": true }, - "acorn-dynamic-import": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz", - "integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==", - "dev": true, - "requires": { - "acorn": "^5.0.0" - } - }, "acorn-globals": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz", @@ -2778,9 +2891,9 @@ }, "dependencies": { "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", "dev": true } } @@ -3330,9 +3443,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, "micromatch": { @@ -3705,17 +3818,10 @@ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", "dev": true }, - "async": { - "version": "1.0.0", - "resolved": "http://registry.npmjs.org/async/-/async-1.0.0.tgz", - "integrity": "sha1-+PwEyjoTeErenhZBr5hXjPvWR6k=", - "dev": true, - "optional": true - }, "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", "dev": true }, "async-exit-hook": { @@ -5129,9 +5235,9 @@ "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==" }, "binary-extensions": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", "dev": true }, "bitshares-report": { @@ -6101,105 +6207,29 @@ "dev": true }, "chokidar": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", - "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", "dev": true, "requires": { "anymatch": "^2.0.0", - "async-each": "^1.0.0", - "braces": "^2.3.0", - "fsevents": "^1.2.2", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", "glob-parent": "^3.1.0", - "inherits": "^2.0.1", + "inherits": "^2.0.3", "is-binary-path": "^1.0.0", "is-glob": "^4.0.0", - "lodash.debounce": "^4.0.8", - "normalize-path": "^2.1.1", + "normalize-path": "^3.0.0", "path-is-absolute": "^1.0.0", - "readdirp": "^2.0.0", - "upath": "^1.0.5" + "readdirp": "^2.2.1", + "upath": "^1.1.1" }, "dependencies": { - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } - } - } - }, - "is-number": { + "normalize-path": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true } } @@ -6210,9 +6240,9 @@ "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=" }, "chrome-trace-event": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz", - "integrity": "sha512-xDbVgyfDTT2piup/h8dK/y4QZfJRSa73bw1WZ8b4XM1o7fsFubUVGYcE+1ANtOzJJELGpYoG2961z0Z6OAld9A==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", + "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", "dev": true, "requires": { "tslib": "^1.9.0" @@ -6404,9 +6434,9 @@ } }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true } } @@ -7108,13 +7138,6 @@ "array-find-index": "^1.0.1" } }, - "cycle": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz", - "integrity": "sha1-IegLK+hYD5i0aPN5QwZisEbDStI=", - "dev": true, - "optional": true - }, "cyclist": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", @@ -7267,9 +7290,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true } } @@ -7775,9 +7798,9 @@ }, "dependencies": { "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, "path-exists": { @@ -7815,9 +7838,9 @@ } }, "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true } } @@ -7934,14 +7957,26 @@ } }, "enhanced-resolve": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", - "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz", + "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==", "dev": true, "requires": { "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", + "memory-fs": "^0.5.0", "tapable": "^1.0.0" + }, + "dependencies": { + "memory-fs": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", + "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", + "dev": true, + "requires": { + "errno": "^0.1.3", + "readable-stream": "^2.0.1" + } + } } }, "enquire.js": { @@ -8756,15 +8791,36 @@ } }, "extract-zip": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", - "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", + "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "debug": "2.6.9", - "mkdirp": "0.5.1", - "yauzl": "2.4.1" + "concat-stream": "^1.6.2", + "debug": "^2.6.9", + "mkdirp": "^0.5.4", + "yauzl": "^2.10.0" + }, + "dependencies": { + "fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", + "dev": true, + "requires": { + "pend": "~1.2.0" + } + }, + "yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", + "dev": true, + "requires": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" + } + } } }, "extsprintf": { @@ -8772,13 +8828,6 @@ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, - "eyes": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz", - "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=", - "dev": true, - "optional": true - }, "fast-deep-equal": { "version": "1.1.0", "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", @@ -8850,14 +8899,11 @@ } } }, - "fd-slicer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", - "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", - "dev": true, - "requires": { - "pend": "~1.2.0" - } + "figgy-pudding": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", + "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==", + "dev": true }, "figures": { "version": "2.0.0", @@ -8950,26 +8996,15 @@ } }, "findup-sync": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz", - "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz", + "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==", "dev": true, "requires": { "detect-file": "^1.0.0", - "is-glob": "^3.1.0", + "is-glob": "^4.0.0", "micromatch": "^3.0.4", "resolve-dir": "^1.0.1" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "^2.1.0" - } - } } }, "flat-cache": { @@ -9755,9 +9790,9 @@ } }, "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, "get-stdin": { @@ -9823,34 +9858,72 @@ "path-is-absolute": "^1.0.0" } }, - "global": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz", - "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=", + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", "dev": true, "requires": { - "min-document": "^2.19.0", - "process": "~0.5.1" - } - }, - "global-dirs": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", - "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", - "dev": true, + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, + "global": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz", + "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=", + "dev": true, + "requires": { + "min-document": "^2.19.0", + "process": "~0.5.1" + } + }, + "global-dirs": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", + "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", + "dev": true, "requires": { "ini": "^1.3.4" } }, "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", + "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", "dev": true, "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" + "global-prefix": "^3.0.0" + }, + "dependencies": { + "global-prefix": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", + "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", + "dev": true, + "requires": { + "ini": "^1.3.5", + "kind-of": "^6.0.2", + "which": "^1.3.1" + } + }, + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + } } }, "global-prefix": { @@ -9886,13 +9959,13 @@ } }, "globule": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", - "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz", + "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==", "dev": true, "requires": { "glob": "~7.1.1", - "lodash": "~4.17.10", + "lodash": "~4.17.12", "minimatch": "~3.0.2" } }, @@ -9951,28 +10024,31 @@ "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=" }, "handlebars": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz", - "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==", - "dev": true, + "version": "4.7.6", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz", + "integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==", "requires": { + "minimist": "^1.2.5", "neo-async": "^2.6.0", - "optimist": "^0.6.1", "source-map": "^0.6.1", - "uglify-js": "^3.1.4" + "uglify-js": "^3.1.4", + "wordwrap": "^1.0.0" }, "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, "neo-async": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", - "dev": true + "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==" }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, @@ -10135,17 +10211,6 @@ "minimalistic-assert": "^1.0.1" } }, - "hasha": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz", - "integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=", - "dev": true, - "optional": true, - "requires": { - "is-stream": "^1.0.1", - "pinkie-promise": "^2.0.0" - } - }, "he": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", @@ -10246,6 +10311,12 @@ "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", "dev": true }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, "html-loader": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.5.5.tgz", @@ -10562,9 +10633,9 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, "in-publish": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", - "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.1.tgz", + "integrity": "sha512-oDM0kUSNFC31ShNxHKUyfZKy8ZeXZBWMjMdZHKLOk13uvT27VTL/QzRGfRUcevJhpkZAvlhPYuXkF7eNWrtyxQ==", "dev": true }, "indent-string": { @@ -10592,6 +10663,12 @@ "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=" }, + "infer-owner": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", + "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", + "dev": true + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -10747,9 +10824,9 @@ } }, "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", + "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", "dev": true }, "ipaddr.js": { @@ -11408,12 +11485,12 @@ } }, "istanbul-reports": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz", - "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==", + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz", + "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==", "dev": true, "requires": { - "handlebars": "^4.1.2" + "html-escaper": "^2.0.0" } }, "jdenticon": { @@ -11852,9 +11929,9 @@ } }, "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -12912,34 +12989,6 @@ "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", "dev": true }, - "jest-haste-map": { - "version": "24.7.1", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.7.1.tgz", - "integrity": "sha512-g0tWkzjpHD2qa03mTKhlydbmmYiA2KdcJe762SbfFo/7NIMgBWAA0XqQlApPwkWOF7Cxoi/gUqL0i6DIoLpMBw==", - "dev": true, - "requires": { - "@jest/types": "^24.7.0", - "anymatch": "^2.0.0", - "fb-watchman": "^2.0.0", - "fsevents": "^1.2.7", - "graceful-fs": "^4.1.15", - "invariant": "^2.2.4", - "jest-serializer": "^24.4.0", - "jest-util": "^24.7.1", - "jest-worker": "^24.6.0", - "micromatch": "^3.1.10", - "sane": "^4.0.3", - "walker": "^1.0.7" - }, - "dependencies": { - "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", - "dev": true - } - } - }, "jest-jasmine2": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz", @@ -13345,88 +13394,6 @@ } } }, - "jest-message-util": { - "version": "24.7.1", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.7.1.tgz", - "integrity": "sha512-dk0gqVtyqezCHbcbk60CdIf+8UHgD+lmRHifeH3JRcnAqh4nEyPytSc9/L1+cQyxC+ceaeP696N4ATe7L+omcg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@jest/test-result": "^24.7.1", - "@jest/types": "^24.7.0", - "@types/stack-utils": "^1.0.1", - "chalk": "^2.0.1", - "micromatch": "^3.1.10", - "slash": "^2.0.0", - "stack-utils": "^1.0.1" - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz", - "integrity": "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==", - "dev": true, - "requires": { - "@babel/highlight": "^7.0.0" - } - }, - "@babel/highlight": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz", - "integrity": "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - } - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "slash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", - "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "jest-mock": { - "version": "24.7.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.7.0.tgz", - "integrity": "sha512-6taW4B4WUcEiT2V9BbOmwyGuwuAFT2G8yghF7nyNW1/2gq5+6aTqSPcS9lS6ArvEkX55vbPAS/Jarx5LSm4Fng==", - "dev": true, - "requires": { - "@jest/types": "^24.7.0" - } - }, "jest-pnp-resolver": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz", @@ -14344,9 +14311,9 @@ } }, "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -14355,12 +14322,6 @@ } } }, - "jest-serializer": { - "version": "24.4.0", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.4.0.tgz", - "integrity": "sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==", - "dev": true - }, "jest-snapshot": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz", @@ -14549,96 +14510,6 @@ } } }, - "jest-util": { - "version": "24.7.1", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.7.1.tgz", - "integrity": "sha512-/KilOue2n2rZ5AnEBYoxOXkeTu6vi7cjgQ8MXEkih0oeAXT6JkS3fr7/j8+engCjciOU1Nq5loMSKe0A1oeX0A==", - "dev": true, - "requires": { - "@jest/console": "^24.7.1", - "@jest/fake-timers": "^24.7.1", - "@jest/source-map": "^24.3.0", - "@jest/test-result": "^24.7.1", - "@jest/types": "^24.7.0", - "callsites": "^3.0.0", - "chalk": "^2.0.1", - "graceful-fs": "^4.1.15", - "is-ci": "^2.0.0", - "mkdirp": "^0.5.1", - "slash": "^2.0.0", - "source-map": "^0.6.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", - "dev": true - }, - "graceful-fs": { - "version": "4.1.15", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz", - "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", - "dev": true - }, - "is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", - "dev": true, - "requires": { - "ci-info": "^2.0.0" - } - }, - "slash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", - "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, "jest-validate": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz", @@ -14946,9 +14817,9 @@ } }, "js-base64": { - "version": "2.4.8", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.8.tgz", - "integrity": "sha512-hm2nYpDrwoO/OzBhdcqs/XGT6XjSuSSCVEpia+Kl2J6x4CYt5hISlVL/AYU1khoDXv0AQVgxtdJySb9gjAn56Q==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz", + "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==", "dev": true }, "js-sha256": { @@ -15029,22 +14900,19 @@ "dev": true }, "jshint": { - "version": "2.9.6", - "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.6.tgz", - "integrity": "sha512-KO9SIAKTlJQOM4lE64GQUtGBRpTOuvbrRrSZw3AhUxMNG266nX9hK2cKA4SBhXOj0irJGyNyGSLT62HGOVDEOA==", + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz", + "integrity": "sha512-ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q==", "dev": true, "requires": { "cli": "~1.0.0", "console-browserify": "1.1.x", "exit": "0.1.x", "htmlparser2": "3.8.x", - "lodash": "~4.17.10", + "lodash": "~4.17.11", "minimatch": "~3.0.2", - "phantom": "~4.0.1", - "phantomjs-prebuilt": "~2.1.7", "shelljs": "0.3.x", - "strip-json-comments": "1.0.x", - "unicode-5.2.0": "^0.7.5" + "strip-json-comments": "1.0.x" }, "dependencies": { "strip-json-comments": { @@ -15148,13 +15016,6 @@ "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=", "dev": true }, - "kew": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz", - "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=", - "dev": true, - "optional": true - }, "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", @@ -15204,12 +15065,12 @@ } }, "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", + "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", "dev": true, "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "^2.0.0" } }, "left-pad": { @@ -15260,9 +15121,9 @@ } }, "loader-runner": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", - "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz", + "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==", "dev": true }, "loader-utils": { @@ -15536,12 +15397,6 @@ "tmpl": "1.0.x" } }, - "mamacro": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz", - "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==", - "dev": true - }, "map-age-cleaner": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.2.tgz", @@ -15654,6 +15509,25 @@ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", "dev": true }, + "mem": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", + "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", + "dev": true, + "requires": { + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" + }, + "dependencies": { + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + } + } + }, "memory-fs": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", @@ -15683,9 +15557,9 @@ }, "dependencies": { "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true } } @@ -15733,9 +15607,9 @@ }, "dependencies": { "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true } } @@ -15839,7 +15713,8 @@ "minimist": { "version": "0.0.8", "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true }, "mississippi": { "version": "2.0.0", @@ -15903,11 +15778,18 @@ "integrity": "sha512-tilCZOvIhRETXJuTmxxpz8mgplF7gmFhcH05JuR/YL+JLO98gLRQ1Mk4XpYQxxbPMKupSOv+Bidw7EKv8wds1w==" }, "mkdirp": { - "version": "0.5.1", - "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "requires": { - "minimist": "0.0.8" + "minimist": "^1.2.5" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + } } }, "mocha": { @@ -15944,6 +15826,15 @@ "ms": "2.0.0" } }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, "supports-color": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", @@ -16003,6 +15894,12 @@ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", "dev": true }, + "nan": { + "version": "2.14.1", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", + "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", + "dev": true + }, "nanomatch": { "version": "1.2.13", "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", @@ -16035,9 +15932,9 @@ "dev": true }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true } } @@ -16205,9 +16102,9 @@ } }, "node-sass": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz", - "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==", + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", + "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", "dev": true, "requires": { "async-foreach": "^0.1.3", @@ -16217,25 +16114,25 @@ "get-stdin": "^4.0.1", "glob": "^7.0.3", "in-publish": "^2.0.0", - "lodash": "^4.17.11", + "lodash": "^4.17.15", "meow": "^3.7.0", "mkdirp": "^0.5.1", "nan": "^2.13.2", "node-gyp": "^3.8.0", "npmlog": "^4.0.0", "request": "^2.88.0", - "sass-graph": "^2.2.4", + "sass-graph": "2.2.5", "stdout-stream": "^1.4.0", "true-case-path": "^1.0.2" }, "dependencies": { "ajv": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", - "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", + "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", + "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" @@ -16252,9 +16149,9 @@ } }, "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", "dev": true }, "har-validator": { @@ -16279,22 +16176,22 @@ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", "dev": true }, - "nan": { - "version": "2.13.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz", - "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw==", - "dev": true - }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", "dev": true }, + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "dev": true + }, "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -16304,7 +16201,7 @@ "extend": "~3.0.2", "forever-agent": "~0.6.1", "form-data": "~2.3.2", - "har-validator": "~5.1.0", + "har-validator": "~5.1.3", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", @@ -16314,19 +16211,19 @@ "performance-now": "^2.1.0", "qs": "~6.5.2", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", + "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" } }, "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "dev": true, "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" + "psl": "^1.1.28", + "punycode": "^2.1.1" } } } @@ -16453,9 +16350,9 @@ }, "dependencies": { "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true } } @@ -16671,24 +16568,6 @@ "mimic-fn": "^1.0.0" } }, - "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", - "dev": true, - "requires": { - "minimist": "~0.0.1", - "wordwrap": "~0.0.2" - }, - "dependencies": { - "wordwrap": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", - "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=", - "dev": true - } - } - }, "optionator": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", @@ -16714,6 +16593,66 @@ "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true }, + "os-locale": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", + "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", + "dev": true, + "requires": { + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "dev": true, + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + }, + "get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + } + } + }, "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", @@ -16968,64 +16907,6 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, - "phantom": { - "version": "4.0.12", - "resolved": "https://registry.npmjs.org/phantom/-/phantom-4.0.12.tgz", - "integrity": "sha512-Tz82XhtPmwCk1FFPmecy7yRGZG2btpzY2KI9fcoPT7zT9det0CcMyfBFPp1S8DqzsnQnm8ZYEfdy528mwVtksA==", - "dev": true, - "optional": true, - "requires": { - "phantomjs-prebuilt": "^2.1.16", - "split": "^1.0.1", - "winston": "^2.4.0" - } - }, - "phantomjs-prebuilt": { - "version": "2.1.16", - "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz", - "integrity": "sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=", - "dev": true, - "optional": true, - "requires": { - "es6-promise": "^4.0.3", - "extract-zip": "^1.6.5", - "fs-extra": "^1.0.0", - "hasha": "^2.2.0", - "kew": "^0.7.0", - "progress": "^1.1.8", - "request": "^2.81.0", - "request-progress": "^2.0.1", - "which": "^1.2.10" - }, - "dependencies": { - "es6-promise": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz", - "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==", - "dev": true, - "optional": true - }, - "fs-extra": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz", - "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=", - "dev": true, - "optional": true, - "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^2.1.0", - "klaw": "^1.0.0" - } - }, - "progress": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz", - "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=", - "dev": true, - "optional": true - } - } - }, "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", @@ -17568,9 +17449,9 @@ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "psl": { - "version": "1.1.31", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz", - "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", + "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", "dev": true }, "public-encrypt": { @@ -17781,9 +17662,9 @@ } }, "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "requires": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" @@ -17922,9 +17803,9 @@ }, "dependencies": { "minimist": { - "version": "1.2.0", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true } } @@ -19240,9 +19121,9 @@ } }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true } } @@ -19330,15 +19211,14 @@ } }, "readdirp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", - "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "minimatch": "^3.0.2", - "readable-stream": "^2.0.2", - "set-immediate-shim": "^1.0.1" + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" } }, "realpath-native": { @@ -19609,25 +19489,6 @@ "uuid": "^3.1.0" } }, - "request-progress": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz", - "integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=", - "dev": true, - "optional": true, - "requires": { - "throttleit": "^1.0.0" - }, - "dependencies": { - "throttleit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", - "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=", - "dev": true, - "optional": true - } - } - }, "request-promise-core": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", @@ -19728,6 +19589,19 @@ "requires": { "expand-tilde": "^2.0.0", "global-modules": "^1.0.0" + }, + "dependencies": { + "global-modules": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", + "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", + "dev": true, + "requires": { + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" + } + } } }, "resolve-from": { @@ -19914,9 +19788,9 @@ } }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, "pump": { @@ -19941,86 +19815,154 @@ } }, "sass-graph": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", - "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.5.tgz", + "integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==", "dev": true, "requires": { "glob": "^7.0.0", "lodash": "^4.0.0", "scss-tokenizer": "^0.2.3", - "yargs": "^7.0.0" + "yargs": "^13.3.2" }, "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wrap-ansi": "^2.0.0" + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" } }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", "dev": true, "requires": { - "lcid": "^1.0.0" + "locate-path": "^3.0.0" } }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "yargs": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", - "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", - "decamelize": "^1.1.1", - "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", - "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" } }, - "yargs-parser": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", - "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { - "camelcase": "^3.0.0" + "p-try": "^2.0.0" } - } - } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, + "yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "requires": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + } + } }, "sass-loader": { "version": "7.1.0", @@ -20197,12 +20139,6 @@ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, "set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -20535,16 +20471,6 @@ "integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0=", "dev": true }, - "split": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", - "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", - "dev": true, - "optional": true, - "requires": { - "through": "2" - } - }, "split-string": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", @@ -20589,13 +20515,6 @@ "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", "dev": true }, - "stack-trace": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", - "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", - "dev": true, - "optional": true - }, "stack-utils": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz", @@ -21187,18 +21106,122 @@ "execa": "^0.7.0" } }, - "test-exclude": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.1.0.tgz", - "integrity": "sha512-gwf0S2fFsANC55fSeSqpb8BYk6w3FDvwZxfNjeF6FRgvFa43r+7wRiA/Q0IxoRU37wB/LE8IQ4221BsNucTaCA==", + "terser": { + "version": "4.6.13", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.13.tgz", + "integrity": "sha512-wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw==", "dev": true, "requires": { - "arrify": "^1.0.1", - "minimatch": "^3.0.4", - "read-pkg-up": "^4.0.0", - "require-main-filename": "^1.0.1" + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" + }, + "dependencies": { + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + } + } + }, + "terser-webpack-plugin": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz", + "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==", + "dev": true, + "requires": { + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", + "is-wsl": "^1.1.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^2.1.2", + "source-map": "^0.6.1", + "terser": "^4.1.2", + "webpack-sources": "^1.4.0", + "worker-farm": "^1.7.0" }, "dependencies": { + "ajv": { + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", + "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "dev": true + }, + "cacache": { + "version": "12.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", + "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", + "dev": true, + "requires": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + } + }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, + "fast-deep-equal": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", + "dev": true + }, + "find-cache-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", + "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" + } + }, "find-up": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", @@ -21208,18 +21231,32 @@ "locate-path": "^3.0.0" } }, - "load-json-file": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", - "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0", - "strip-bom": "^3.0.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, "locate-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", @@ -21230,10 +21267,47 @@ "path-exists": "^3.0.0" } }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + } + }, + "mississippi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", + "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", + "dev": true, + "requires": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + } + }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -21249,56 +21323,231 @@ } }, "p-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, - "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true + }, + "pkg-dir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", + "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", "dev": true, "requires": { - "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" + "find-up": "^3.0.0" } }, - "read-pkg": { + "pump": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", - "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, "requires": { - "load-json-file": "^4.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^3.0.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, - "read-pkg-up": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz", - "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", "dev": true, "requires": { - "find-up": "^3.0.0", - "read-pkg": "^3.0.0" + "glob": "^7.1.3" } }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - } - } - }, - "tether": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/tether/-/tether-1.4.4.tgz", - "integrity": "sha512-bagKeRRo3vEynHnO3GB7/jB3Q4YIf0mN7gXM/nR0wZvNHkPrwmZemg1w0C32JZP0prHZUwxGwoX5CdA7tuIDEw==" - }, - "text-table": { + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "serialize-javascript": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz", + "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "ssri": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "dev": true, + "requires": { + "figgy-pudding": "^3.5.1" + } + }, + "unique-filename": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", + "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", + "dev": true, + "requires": { + "unique-slug": "^2.0.0" + } + }, + "webpack-sources": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", + "dev": true, + "requires": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + } + }, + "worker-farm": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", + "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", + "dev": true, + "requires": { + "errno": "~0.1.7" + } + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + } + } + }, + "test-exclude": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.1.0.tgz", + "integrity": "sha512-gwf0S2fFsANC55fSeSqpb8BYk6w3FDvwZxfNjeF6FRgvFa43r+7wRiA/Q0IxoRU37wB/LE8IQ4221BsNucTaCA==", + "dev": true, + "requires": { + "arrify": "^1.0.1", + "minimatch": "^3.0.4", + "read-pkg-up": "^4.0.0", + "require-main-filename": "^1.0.1" + }, + "dependencies": { + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "load-json-file": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz", + "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + } + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", + "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "p-try": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", + "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", + "dev": true + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "read-pkg": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz", + "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", + "dev": true, + "requires": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + } + }, + "read-pkg-up": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz", + "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", + "dev": true, + "requires": { + "find-up": "^3.0.0", + "read-pkg": "^3.0.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, + "tether": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/tether/-/tether-1.4.4.tgz", + "integrity": "sha512-bagKeRRo3vEynHnO3GB7/jB3Q4YIf0mN7gXM/nR0wZvNHkPrwmZemg1w0C32JZP0prHZUwxGwoX5CdA7tuIDEw==" + }, + "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", @@ -21521,9 +21770,9 @@ } }, "tslib": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", - "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.2.tgz", + "integrity": "sha512-tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg==", "dev": true }, "tty-browserify": { @@ -21578,7 +21827,6 @@ "version": "3.4.6", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.6.tgz", "integrity": "sha512-O1D7L6WcOzS1qW2ehopEm4cWm5yA6bQBozlks8jO8ODxYCy4zv+bR/la4Lwp01tpkYGNonnpXvUpYtrvSu8Yzg==", - "dev": true, "requires": { "commander": "~2.16.0", "source-map": "~0.6.1" @@ -21587,112 +21835,365 @@ "commander": { "version": "2.16.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz", - "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==", - "dev": true + "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==" }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" } } }, "uglifyjs-webpack-plugin": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz", - "integrity": "sha512-1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.2.0.tgz", + "integrity": "sha512-mHSkufBmBuJ+KHQhv5H0MXijtsoA1lynJt1lXOaotja8/I0pR4L9oGaPIZw+bQBOFittXZg9OC1sXSGO9D9ZYg==", "dev": true, "requires": { - "cacache": "^10.0.4", - "find-cache-dir": "^1.0.0", - "schema-utils": "^0.4.5", - "serialize-javascript": "^1.4.0", + "cacache": "^12.0.2", + "find-cache-dir": "^2.1.0", + "is-wsl": "^1.1.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^1.7.0", "source-map": "^0.6.1", - "uglify-es": "^3.3.4", - "webpack-sources": "^1.1.0", - "worker-farm": "^1.5.2" + "uglify-js": "^3.6.0", + "webpack-sources": "^1.4.0", + "worker-farm": "^1.7.0" }, "dependencies": { + "ajv": { + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", + "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "dev": true + }, + "cacache": { + "version": "12.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz", + "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==", + "dev": true, + "requires": { + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "infer-owner": "^1.0.3", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" + } + }, + "chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "dev": true + }, "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "fast-deep-equal": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", "dev": true }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", + "find-cache-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", + "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", "dev": true, "requires": { - "commander": "~2.13.0", - "source-map": "~0.6.1" + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" } - } - } - }, - "ultron": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", - "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==" - }, - "unicode-5.2.0": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/unicode-5.2.0/-/unicode-5.2.0-0.7.5.tgz", - "integrity": "sha512-KVGLW1Bri30x00yv4HNM8kBxoqFXr0Sbo55735nvrlsx4PYBZol3UtoWgO492fSwmsetzPEZzy73rbU8OGXJcA==", - "dev": true - }, - "union-value": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", - "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, - "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" - } - }, - "uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true - }, - "unique-filename": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", - "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", - "requires": { - "unique-slug": "^2.0.0" - } - }, - "unique-slug": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz", - "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", - "requires": { - "imurmurhash": "^0.1.4" - } - }, - "unique-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", - "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", - "dev": true, - "requires": { - "crypto-random-string": "^1.0.0" - } - }, - "universalify": { + }, + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "dev": true, + "requires": { + "locate-path": "^3.0.0" + } + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "locate-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz", + "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==", + "dev": true, + "requires": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + } + }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "requires": { + "pify": "^4.0.1", + "semver": "^5.6.0" + } + }, + "mississippi": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", + "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", + "dev": true, + "requires": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^3.0.0", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + } + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz", + "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==", + "dev": true, + "requires": { + "p-limit": "^2.0.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true + }, + "pkg-dir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", + "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", + "dev": true, + "requires": { + "find-up": "^3.0.0" + } + }, + "pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "requires": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "serialize-javascript": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz", + "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "ssri": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "dev": true, + "requires": { + "figgy-pudding": "^3.5.1" + } + }, + "uglify-js": { + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz", + "integrity": "sha512-zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q==", + "dev": true, + "requires": { + "commander": "~2.20.3" + } + }, + "unique-filename": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", + "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", + "dev": true, + "requires": { + "unique-slug": "^2.0.0" + } + }, + "webpack-sources": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", + "dev": true, + "requires": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + } + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + } + } + }, + "ultron": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==" + }, + "union-value": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", + "dev": true, + "requires": { + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^2.0.1" + } + }, + "uniq": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", + "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", + "dev": true + }, + "unique-filename": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", + "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", + "requires": { + "unique-slug": "^2.0.0" + } + }, + "unique-slug": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz", + "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", + "requires": { + "imurmurhash": "^0.1.4" + } + }, + "unique-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", + "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", + "dev": true, + "requires": { + "crypto-random-string": "^1.0.0" + } + }, + "universalify": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", @@ -21769,9 +22270,9 @@ "dev": true }, "upath": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", - "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", "dev": true }, "update-notifier": { @@ -21950,9 +22451,9 @@ "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" }, "v8-compile-cache": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz", - "integrity": "sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz", + "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==", "dev": true }, "validate-npm-package-license": { @@ -22022,12 +22523,12 @@ } }, "watchpack": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", - "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz", + "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==", "dev": true, "requires": { - "chokidar": "^2.0.2", + "chokidar": "^2.1.8", "graceful-fs": "^4.1.2", "neo-async": "^2.5.0" } @@ -22039,91 +22540,66 @@ "dev": true }, "webpack": { - "version": "4.16.5", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.16.5.tgz", - "integrity": "sha512-i5cHYHonzSc1zBuwB5MSzW4v9cScZFbprkHK8ZgzPDCRkQXGGpYzPmJhbus5bOrZ0tXTcQp+xyImRSvKb0b+Kw==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.5.13", - "@webassemblyjs/helper-module-context": "1.5.13", - "@webassemblyjs/wasm-edit": "1.5.13", - "@webassemblyjs/wasm-opt": "1.5.13", - "@webassemblyjs/wasm-parser": "1.5.13", - "acorn": "^5.6.2", - "acorn-dynamic-import": "^3.0.0", - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0", - "chrome-trace-event": "^1.0.0", + "version": "4.43.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz", + "integrity": "sha512-GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.9.0", + "@webassemblyjs/helper-module-context": "1.9.0", + "@webassemblyjs/wasm-edit": "1.9.0", + "@webassemblyjs/wasm-parser": "1.9.0", + "acorn": "^6.4.1", + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1", + "chrome-trace-event": "^1.0.2", "enhanced-resolve": "^4.1.0", - "eslint-scope": "^4.0.0", + "eslint-scope": "^4.0.3", "json-parse-better-errors": "^1.0.2", - "loader-runner": "^2.3.0", - "loader-utils": "^1.1.0", - "memory-fs": "~0.4.1", - "micromatch": "^3.1.8", - "mkdirp": "~0.5.0", - "neo-async": "^2.5.0", - "node-libs-browser": "^2.0.0", - "schema-utils": "^0.4.4", - "tapable": "^1.0.0", - "uglifyjs-webpack-plugin": "^1.2.4", - "watchpack": "^1.5.0", - "webpack-sources": "^1.0.1" + "loader-runner": "^2.4.0", + "loader-utils": "^1.2.3", + "memory-fs": "^0.4.1", + "micromatch": "^3.1.10", + "mkdirp": "^0.5.3", + "neo-async": "^2.6.1", + "node-libs-browser": "^2.2.1", + "schema-utils": "^1.0.0", + "tapable": "^1.1.3", + "terser-webpack-plugin": "^1.4.3", + "watchpack": "^1.6.1", + "webpack-sources": "^1.4.1" }, "dependencies": { + "acorn": { + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz", + "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==", + "dev": true + }, "ajv": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", - "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", + "version": "6.12.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", + "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", + "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.1" + "uri-js": "^4.2.2" } }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", + "ajv-keywords": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz", + "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==", "dev": true }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, "browserify-zlib": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", @@ -22133,271 +22609,82 @@ "pako": "~1.0.5" } }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true + }, "eslint-scope": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.0.tgz", - "integrity": "sha512-1G6UTDi7Jc1ELFwnR58HV4fK9OQK4S6N985f166xqXxpjU6plxFISJa2Ba9KCQuFa8RCnj/lSFJbHo7UFDBnUA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", "dev": true, "requires": { "esrecurse": "^4.1.0", "estraverse": "^4.1.1" } }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, - "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^0.1.6", - "is-data-descriptor": "^0.1.4", - "kind-of": "^5.0.0" - } - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } + "events": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz", + "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==", + "dev": true }, "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", "dev": true }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } - } - }, "https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "^1.1.5" - } - } - } - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "requires": { - "arr-diff": "^4.0.0", - "array-unique": "^0.3.2", - "braces": "^2.3.1", - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "extglob": "^2.0.4", - "fragment-cache": "^0.2.1", - "kind-of": "^6.0.2", - "nanomatch": "^1.2.9", - "object.pick": "^1.3.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.2" + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", + "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" } }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "neo-async": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", + "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", + "dev": true + }, "node-libs-browser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", - "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz", + "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==", "dev": true, "requires": { "assert": "^1.1.1", @@ -22407,10 +22694,10 @@ "constants-browserify": "^1.0.0", "crypto-browserify": "^3.11.0", "domain-browser": "^1.1.1", - "events": "^1.0.0", + "events": "^3.0.0", "https-browserify": "^1.0.0", "os-browserify": "^0.3.0", - "path-browserify": "0.0.0", + "path-browserify": "0.0.1", "process": "^0.11.10", "punycode": "^1.2.4", "querystring-es3": "^0.2.0", @@ -22421,8 +22708,8 @@ "timers-browserify": "^2.0.4", "tty-browserify": "0.0.0", "url": "^0.11.0", - "util": "^0.10.3", - "vm-browserify": "0.0.4" + "util": "^0.11.0", + "vm-browserify": "^1.0.1" } }, "os-browserify": { @@ -22432,9 +22719,15 @@ "dev": true }, "pako": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", - "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true + }, + "path-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", + "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==", "dev": true }, "process": { @@ -22443,40 +22736,88 @@ "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", "dev": true }, + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "tapable": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", + "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", + "dev": true + }, "timers-browserify": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", - "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", + "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", "dev": true, "requires": { "setimmediate": "^1.0.4" } + }, + "util": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", + "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", + "dev": true, + "requires": { + "inherits": "2.0.3" + } + }, + "vm-browserify": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", + "dev": true + }, + "webpack-sources": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", + "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", + "dev": true, + "requires": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + } } } }, "webpack-cli": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.2.3.tgz", - "integrity": "sha512-Ik3SjV6uJtWIAN5jp5ZuBMWEAaP5E4V78XJ2nI+paFPh8v4HPSwo/myN0r29Xc/6ZKnd2IdrAlpSgNOu2CDQ6Q==", - "dev": true, - "requires": { - "chalk": "^2.4.1", - "cross-spawn": "^6.0.5", - "enhanced-resolve": "^4.1.0", - "findup-sync": "^2.0.0", - "global-modules": "^1.0.0", - "import-local": "^2.0.0", - "interpret": "^1.1.0", - "loader-utils": "^1.1.0", - "supports-color": "^5.5.0", - "v8-compile-cache": "^2.0.2", - "yargs": "^12.0.4" + "version": "3.3.11", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz", + "integrity": "sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==", + "dev": true, + "requires": { + "chalk": "2.4.2", + "cross-spawn": "6.0.5", + "enhanced-resolve": "4.1.0", + "findup-sync": "3.0.0", + "global-modules": "2.0.0", + "import-local": "2.0.0", + "interpret": "1.2.0", + "loader-utils": "1.2.3", + "supports-color": "6.1.0", + "v8-compile-cache": "2.0.3", + "yargs": "13.2.4" }, "dependencies": { "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", "dev": true }, "ansi-styles": { @@ -22488,10 +22829,10 @@ "color-convert": "^1.9.0" } }, - "camelcase": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz", - "integrity": "sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==", + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", "dev": true }, "chalk": { @@ -22503,6 +22844,28 @@ "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", "supports-color": "^5.3.0" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } + } + }, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "requires": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" } }, "cross-spawn": { @@ -22518,19 +22881,15 @@ "which": "^1.2.9" } }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "enhanced-resolve": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", + "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", "dev": true, "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "graceful-fs": "^4.1.2", + "memory-fs": "^0.4.0", + "tapable": "^1.0.0" } }, "find-up": { @@ -22542,19 +22901,10 @@ "locate-path": "^3.0.0" } }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "invert-kv": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz", - "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==", + "interpret": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", + "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", "dev": true }, "is-fullwidth-code-point": { @@ -22563,13 +22913,24 @@ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "lcid": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz", - "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==", + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "dev": true, "requires": { - "invert-kv": "^2.0.0" + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz", + "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^2.0.0", + "json5": "^1.0.1" } }, "locate-path": { @@ -22582,44 +22943,16 @@ "path-exists": "^3.0.0" } }, - "mem": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-4.2.0.tgz", - "integrity": "sha512-5fJxa68urlY0Ir8ijatKa3eRz5lwXnRCTvo9+TbTGAuTFJOwpGcY0X05moBd0nW45965Njt4CDI2GFQoG8DvqA==", - "dev": true, - "requires": { - "map-age-cleaner": "^0.1.1", - "mimic-fn": "^2.0.0", - "p-is-promise": "^2.0.0" - } - }, - "mimic-fn": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.0.0.tgz", - "integrity": "sha512-jbex9Yd/3lmICXwYT6gA/j2mNQGU48wCh/VzRd+/Y/PjYQtlg1gLMdZqvu9s/xH7qKvngxRObl56XZR609IMbA==", - "dev": true - }, - "os-locale": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", - "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==", - "dev": true, - "requires": { - "execa": "^1.0.0", - "lcid": "^2.0.0", - "mem": "^4.0.0" - } - }, - "p-is-promise": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz", - "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==", + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "dev": true }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "requires": { "p-try": "^2.0.0" @@ -22635,77 +22968,74 @@ } }, "p-try": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz", - "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } + "require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true }, "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { + "emoji-regex": "^7.0.1", "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "strip-ansi": "^5.1.0" } }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^4.1.0" } }, "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "dev": true, "requires": { "has-flag": "^3.0.0" } }, + "wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + } + }, "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "version": "13.2.4", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz", + "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", + "cliui": "^5.0.0", "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", + "get-caller-file": "^2.0.1", + "os-locale": "^3.1.0", "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", + "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^2.0.0", + "string-width": "^3.0.0", "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" - } - }, - "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "y18n": "^4.0.0", + "yargs-parser": "^13.1.0" } } } @@ -22913,39 +23243,15 @@ } } }, - "winston": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/winston/-/winston-2.4.3.tgz", - "integrity": "sha512-GYKuysPz2pxYAVJD2NPsDLP5Z79SDEzPm9/j4tCjkF/n89iBNGBMJcR+dMUqxgPNgoSs6fVygPi+Vl2oxIpBuw==", - "dev": true, - "optional": true, - "requires": { - "async": "~1.0.0", - "colors": "1.0.x", - "cycle": "1.0.x", - "eyes": "0.1.x", - "isstream": "0.1.x", - "stack-trace": "0.0.x" - }, - "dependencies": { - "colors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz", - "integrity": "sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=", - "dev": true, - "optional": true - } - } - }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" }, "worker-farm": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz", - "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", + "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", "dev": true, "requires": { "errno": "~0.1.7" @@ -23251,9 +23557,9 @@ } }, "yargs-parser": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz", - "integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==", + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "dev": true, "requires": { "camelcase": "^5.0.0", @@ -23268,15 +23574,6 @@ } } }, - "yauzl": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", - "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=", - "dev": true, - "requires": { - "fd-slicer": "~1.0.1" - } - }, "zip-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-2.0.1.tgz", diff --git a/package.json b/package.json index fe19e50a65..a659da8050 100644 --- a/package.json +++ b/package.json @@ -155,6 +155,7 @@ "file-saver": "^1.3.8", "foundation-apps": "git+https://github.com/zurb/foundation-apps.git", "fractional": "^1.0.0", + "handlebars": "^4.7.6", "hirestime": "^3.2.1", "ifvisible": "^1.1.0", "immutable": "3.8.2", @@ -256,7 +257,7 @@ "mini-css-extract-plugin": "^0.4.0", "mocha": "^5.1.1", "node-libs-browser": "^1.0.0", - "node-sass": "^4.12.0", + "node-sass": "^4.14.1", "null-loader": "^0.1.1", "postcss-loader": "^3.0.0", "prettier": "^1.10.2", @@ -271,10 +272,10 @@ "svg-loader": "0.0.2", "svgo": "^1.2.0", "svgo-loader": "^2.1.0", - "uglifyjs-webpack-plugin": "^1.2.7", + "uglifyjs-webpack-plugin": "^2.2.0", "url-loader": "^1.0.1", - "webpack": "^4.16.5", - "webpack-cli": "^3.2.3", + "webpack": "^4.43.0", + "webpack-cli": "^3.3.11", "webpack-dev-middleware": "^3.1.3", "webpack-hot-middleware": "^2.22.1", "worker-loader": "^1.1.1" From 4a3b89c2902293b29350ae13ef21438507eabee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Wed, 13 May 2020 08:17:12 +0200 Subject: [PATCH 051/141] Update toc.md --- app/help/en/toc.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/help/en/toc.md b/app/help/en/toc.md index 9bfcbff686..9a554e9123 100644 --- a/app/help/en/toc.md +++ b/app/help/en/toc.md @@ -20,8 +20,5 @@ * [Short Selling BitAssets](dex/shorting.md) * [Gateways](gateways/introduction.md) * [Citadel](gateways/citadel.md) - * [OpenLedger](gateways/openledger.md) * [Rudex](gateways/rudex.md) - * [CryptoBridge](gateways/cryptobridge.md) - * [Xbts](gateways/xbtsx.md) - * [SparkDEX](gateways/spark.md) + * [Xbts](gateways/xbtsx.md) From 6d2498d07943f0e83124a3d6c8d295fbcc44dc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Wed, 13 May 2020 08:17:55 +0200 Subject: [PATCH 052/141] Update toc.md --- app/help/ru/toc.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/help/ru/toc.md b/app/help/ru/toc.md index cb8f2f1c14..6ae8b8280b 100644 --- a/app/help/ru/toc.md +++ b/app/help/ru/toc.md @@ -18,8 +18,5 @@ - [Торговля](dex/trading.md) - [Короткая продажа BitAssets](dex/shorting.md) - [Шлюзы](gateways/introduction.md) - - [OpenLedger](gateways/openledger.md) - [Rudex](gateways/rudex.md) - - [CryptoBridge](gateways/cryptobridge.md) - - [XBTSX](gateways/xbtsx.md) - - [SparkDEX](gateways/spark.md) \ No newline at end of file + - [XBTSX](gateways/xbtsx.md) From da5088a793fe7ccabe8d778c92dae21fc0293ba4 Mon Sep 17 00:00:00 2001 From: Stefan Schiessl Date: Wed, 13 May 2020 08:26:07 +0200 Subject: [PATCH 053/141] Signed-off-by: Stefan Schiessl --- app/assets/locales/locale-de.json | 1 + app/assets/locales/locale-es.json | 1 + app/assets/locales/locale-fr.json | 1 + app/assets/locales/locale-it.json | 1 + app/assets/locales/locale-ja.json | 1 + app/assets/locales/locale-ko.json | 1 + app/assets/locales/locale-tr.json | 1 + app/assets/locales/locale-zh.json | 1 + 8 files changed, 8 insertions(+) diff --git a/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json index 509be3126c..8bc684194f 100644 --- a/app/assets/locales/locale-de.json +++ b/app/assets/locales/locale-de.json @@ -1675,6 +1675,7 @@ "no_assets": "No withdrawable assets available", "no_estimate": "Kein geschätzter Wert für diese Anlage verfügbar", "no_gateways": "Entschuldigung, aber es gibt kein Gateway, um diese Auszahlung vorzunehmen.", + "public_key": "Public key", "quantity": "Menge", "submit": "Auszahlung", "withdraw": "Auszahlung" diff --git a/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json index 7f1e153f3a..aa4175a3a0 100644 --- a/app/assets/locales/locale-es.json +++ b/app/assets/locales/locale-es.json @@ -1675,6 +1675,7 @@ "no_assets": "No withdrawable assets available", "no_estimate": "No hay presupuesto disponible para este objeto.", "no_gateways": "Lo sentimos, pero no hay puertas de enlace disponibles para manejar este retiro", + "public_key": "Public key", "quantity": "Cantidad", "submit": "Retirar", "withdraw": "Retirar" diff --git a/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json index f91070b6ba..f871c9280e 100644 --- a/app/assets/locales/locale-fr.json +++ b/app/assets/locales/locale-fr.json @@ -1669,6 +1669,7 @@ "no_assets": "No withdrawable assets available", "no_estimate": "No estimate available for this object", "no_gateways": "Sorry, but there are no gateways available to handle this withdrawal", + "public_key": "Public key", "quantity": "Quantity", "submit": "Withdraw", "withdraw": "Withdraw" diff --git a/app/assets/locales/locale-it.json b/app/assets/locales/locale-it.json index a4e2ee9be0..bfd616b3b7 100644 --- a/app/assets/locales/locale-it.json +++ b/app/assets/locales/locale-it.json @@ -1669,6 +1669,7 @@ "no_assets": "No withdrawable assets available", "no_estimate": "No estimate available for this object", "no_gateways": "Sorry, but there are no gateways available to handle this withdrawal", + "public_key": "Public key", "quantity": "Quantity", "submit": "Preleva", "withdraw": "Withdraw" diff --git a/app/assets/locales/locale-ja.json b/app/assets/locales/locale-ja.json index ce2937d483..d20e6a1a6c 100644 --- a/app/assets/locales/locale-ja.json +++ b/app/assets/locales/locale-ja.json @@ -1669,6 +1669,7 @@ "no_assets": "No withdrawable assets available", "no_estimate": "No estimate available for this object", "no_gateways": "申し訳ありませんが、この引き出しを処理するゲートウェイはありません", + "public_key": "Public key", "quantity": "数量", "submit": "出金", "withdraw": "出金" diff --git a/app/assets/locales/locale-ko.json b/app/assets/locales/locale-ko.json index 65e9fe0a9e..998c62b9db 100644 --- a/app/assets/locales/locale-ko.json +++ b/app/assets/locales/locale-ko.json @@ -1669,6 +1669,7 @@ "no_assets": "No withdrawable assets available", "no_estimate": "No estimate available for this object", "no_gateways": "Sorry, but there are no gateways available to handle this withdrawal", + "public_key": "Public key", "quantity": "Quantity", "submit": "Withdraw", "withdraw": "Withdraw" diff --git a/app/assets/locales/locale-tr.json b/app/assets/locales/locale-tr.json index c92a9b254c..9fa55f00ca 100644 --- a/app/assets/locales/locale-tr.json +++ b/app/assets/locales/locale-tr.json @@ -1669,6 +1669,7 @@ "no_assets": "No withdrawable assets available", "no_estimate": "No estimate available for this object", "no_gateways": "Sorry, but there are no gateways available to handle this withdrawal", + "public_key": "Public key", "quantity": "Quantity", "submit": "Çek", "withdraw": "Withdraw" diff --git a/app/assets/locales/locale-zh.json b/app/assets/locales/locale-zh.json index b83452f9fe..dc73e71611 100644 --- a/app/assets/locales/locale-zh.json +++ b/app/assets/locales/locale-zh.json @@ -1675,6 +1675,7 @@ "no_assets": "无提现资产可用", "no_estimate": "此项目无可用估值", "no_gateways": "很遗憾,没有网关处理此提币", + "public_key": "Public key", "quantity": "数量", "submit": "提币", "withdraw": "提币" From e6cd0714b027b8858c425542662c2f6e623f7d2f Mon Sep 17 00:00:00 2001 From: Stefan Schiessl Date: Tue, 9 Jun 2020 17:44:22 +0200 Subject: [PATCH 054/141] upgrade dependencies Signed-off-by: Stefan Schiessl --- package-lock.json | 277 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 220 insertions(+), 57 deletions(-) diff --git a/package-lock.json b/package-lock.json index 718ede3949..8474ba8950 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3822,7 +3822,8 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", - "dev": true + "dev": true, + "optional": true }, "async-exit-hook": { "version": "2.0.1", @@ -5175,8 +5176,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true } } @@ -5235,10 +5235,11 @@ "integrity": "sha512-eJzYkFYy9L4JzXsbymsFn3p54D+llV27oTQ+ziJG7WFRheJcNZilgVXMG0LoZtlQSKBsJdWtLFqOD0u+U0jZKA==" }, "binary-extensions": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", - "dev": true + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", + "dev": true, + "optional": true }, "bitshares-report": { "version": "git+https://github.com/bitshares/bitshares-report.git#bba397fc7b4eb903d1ca109ac33301e9d2e2d753", @@ -6207,30 +6208,93 @@ "dev": true }, "chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz", + "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==", "dev": true, + "optional": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.4.0" }, "dependencies": { + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "dev": true, + "optional": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "optional": true, + "requires": { + "fill-range": "^7.0.1" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "optional": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "fsevents": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "dev": true, + "optional": true + }, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, + "optional": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "optional": true + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true + "dev": true, + "optional": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "optional": true, + "requires": { + "is-number": "^7.0.0" + } } } }, @@ -7002,8 +7066,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true }, "normalize-path": { @@ -8784,8 +8847,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true } } @@ -9859,22 +9921,23 @@ } }, "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", "dev": true, + "optional": true, "requires": { - "is-glob": "^3.1.0", - "path-dirname": "^1.0.0" + "is-glob": "^4.0.1" }, "dependencies": { "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", "dev": true, + "optional": true, "requires": { - "is-extglob": "^2.1.0" + "is-extglob": "^2.1.1" } } } @@ -10851,12 +10914,13 @@ "dev": true }, "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, + "optional": true, "requires": { - "binary-extensions": "^1.0.0" + "binary-extensions": "^2.0.0" } }, "is-buffer": { @@ -15465,8 +15529,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true } } @@ -16833,7 +16896,8 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", - "dev": true + "dev": true, + "optional": true }, "path-exists": { "version": "3.0.0", @@ -16907,6 +16971,13 @@ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "dev": true, + "optional": true + }, "pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", @@ -19211,14 +19282,13 @@ } }, "readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz", + "integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==", "dev": true, + "optional": true, "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" + "picomatch": "^2.2.1" } }, "realpath-native": { @@ -20378,8 +20448,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true } } @@ -22273,7 +22342,8 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", - "dev": true + "dev": true, + "optional": true }, "update-notifier": { "version": "2.5.0", @@ -22523,14 +22593,107 @@ } }, "watchpack": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz", - "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.2.tgz", + "integrity": "sha512-ymVbbQP40MFTp+cNMvpyBpBtygHnPzPkHqoIwRRj/0B8KhqQwV8LaKjtbaxF2lK4vl8zN9wCxS46IFCU5K4W0g==", "dev": true, "requires": { - "chokidar": "^2.1.8", + "chokidar": "^3.4.0", "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" + "neo-async": "^2.5.0", + "watchpack-chokidar2": "^2.0.0" + } + }, + "watchpack-chokidar2": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz", + "integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==", + "dev": true, + "optional": true, + "requires": { + "chokidar": "^2.1.8" + }, + "dependencies": { + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true, + "optional": true + }, + "chokidar": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "dev": true, + "optional": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "optional": true, + "requires": { + "is-glob": "^3.1.0", + "path-dirname": "^1.0.0" + }, + "dependencies": { + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "optional": true, + "requires": { + "is-extglob": "^2.1.0" + } + } + } + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "optional": true, + "requires": { + "binary-extensions": "^1.0.0" + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "optional": true + }, + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, + "optional": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } + } } }, "webidl-conversions": { From 1767fe5192b9c80e4aba59654ac15d49e88c6d1c Mon Sep 17 00:00:00 2001 From: liondani Date: Tue, 9 Jun 2020 21:47:20 +0300 Subject: [PATCH 055/141] Update apiConfig.js Add API api-bts.liondani.com --- app/api/apiConfig.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 44aec93e14..5222560ee3 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -350,6 +350,14 @@ export const settingsAPIs = { operator: "CITADEL", contact: "email:citadel.li;support" }, + { + url: "wss://api-bts.liondani.com/ws", + region: "Western Europe", + country: "Germany", + location: "Falkenstein", + operator: "Witness: liondani", + contact: "telegram:liondani" + }, // Testnet { From 1097b398ad8f6d7003825bfe6a6b37e2438f2bd9 Mon Sep 17 00:00:00 2001 From: technolog Date: Thu, 11 Jun 2020 01:15:22 +0300 Subject: [PATCH 056/141] Add XBTS Public Nodes --- app/api/apiConfig.js | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 5222560ee3..3442f359fd 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -358,6 +358,30 @@ export const settingsAPIs = { operator: "Witness: liondani", contact: "telegram:liondani" }, + { + url: "wss://public.xbts.io/ws", + region: "Europe", + country: "Germany", + location: "Nürnberg", + operator: "Witness: xbtsio-wallet", + contact: "telegram: xbtsio" + }, + { + url: "wss://cloud.xbts.io/ws", + region: "Northern America", + country: "U.S.A.", + location: "VG, Ashburn", + operator: "Witness: xbtsio-wallet", + contact: "telegram: xbtsio" + }, + { + url: "wss://node.xbts.io/ws", + region: "Europe", + country: "Germany", + location: "Falkenstein", + operator: "Witness: xbtsio-wallet", + contact: "telegram: xbtsio" + }, // Testnet { @@ -391,6 +415,14 @@ export const settingsAPIs = { location: "Fremont, CA", operator: "Witness: gbac-ety001", contact: "email:work@domyself.me" + }, + { + url: "wss://testnet.xbts.io/ws", + region: "TESTNET - Europe", + country: "Germany", + location: "Nürnberg", + operator: "Witness: xbtsio-wallet", + contact: "telegram: xbtsio" } ], ES_WRAPPER_LIST: [ From 4f0d75f89674fba54179f0d573cfe432e31a24d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Mon, 15 Jun 2020 12:52:24 +0200 Subject: [PATCH 057/141] update apiconfig --- app/api/apiConfig.js | 53 ++++---------------------------------------- 1 file changed, 4 insertions(+), 49 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 3442f359fd..231e21d6a1 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -203,27 +203,6 @@ export const settingsAPIs = { operator: "Witness: delegate-zhaomu", contact: "telegram:lzmlam;wechat:lzmlam" }, - { - url: "wss://eu.nodes.bitshares.ws", - region: "Western Europe", - country: "Germany", - operator: "Infrastructure Worker", - contact: "email:info@blockchainprojectsbv.com" - }, - { - url: "wss://us.nodes.bitshares.ws", - region: "Northern America", - country: "U.S.A.", - operator: "Infrastructure Worker", - contact: "email:info@blockchainprojectsbv.com" - }, - { - url: "wss://hk.nodes.bitshares.ws", - region: "Eastern Asia", - country: "Hong Kong", - operator: "Infrastructure Worker", - contact: "email:info@blockchainprojectsbv.com" - }, { url: "wss://api.bts.mobi/ws", region: "Northern America", @@ -232,14 +211,6 @@ export const settingsAPIs = { operator: "Witness: in.abit", contact: "telegram:abitmore" }, - // { - // url: "wss://api.bts.network/", // check - // region: "Northern America", - // country: "U.S.A.", - // location: "Virginia", - // operator: "Witness: fox", - // contact: "telegram:ryanRfox" - // }, { url: "wss://btsws.roelandp.nl/ws", region: "Northern Europe", @@ -255,14 +226,6 @@ export const settingsAPIs = { operator: "Witness: bhuz", contact: "telegram:bhuzor" }, - //{ - // url: "wss://bts-api.lafona.net/ws", - // region: "Northern America", - // country: "Canada", - // location: "Montreal", - // operator: "Witness: delegate-1.lafona", - // contact: "telegram:lafona" - //}, { url: "wss://kimziv.com/ws", region: "Northern America", @@ -360,9 +323,9 @@ export const settingsAPIs = { }, { url: "wss://public.xbts.io/ws", - region: "Europe", + region: "Western Europe", country: "Germany", - location: "Nürnberg", + location: "Nuremberg", operator: "Witness: xbtsio-wallet", contact: "telegram: xbtsio" }, @@ -376,7 +339,7 @@ export const settingsAPIs = { }, { url: "wss://node.xbts.io/ws", - region: "Europe", + region: "Western Europe", country: "Germany", location: "Falkenstein", operator: "Witness: xbtsio-wallet", @@ -392,14 +355,6 @@ export const settingsAPIs = { operator: "BitShares Europe", contact: "telegram:xeroc" }, - { - url: "wss://testnet.nodes.bitshares.ws", - region: "TESTNET - Western Europe", - country: "Germany", - location: "Nuremberg", - operator: "Infrastructure Worker", - contact: "email:info@blockchainprojectsbv.com" - }, { url: "wss://testnet.dex.trading/", region: "TESTNET - Western Europe", @@ -420,7 +375,7 @@ export const settingsAPIs = { url: "wss://testnet.xbts.io/ws", region: "TESTNET - Europe", country: "Germany", - location: "Nürnberg", + location: "Nuremberg", operator: "Witness: xbtsio-wallet", contact: "telegram: xbtsio" } From 5b394e9e3eb430879d913de8cd97882de50ee5db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Mon, 15 Jun 2020 12:57:03 +0200 Subject: [PATCH 058/141] Update apiConfig.js - remove ES nodes - add bitshares.org node --- app/api/apiConfig.js | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 231e21d6a1..75c2d7833e 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -305,6 +305,14 @@ export const settingsAPIs = { operator: "Witness: zapata42-witness", contact: "telegram:Zapata_42" }, + { + url: "wss://api.bitshares.org/ws", + region: "Western Europe", + country: "France", + location: "", + operator: "bitshares.org", + contact: "telegram:Zapata_42" + }, { url: "wss://citadel.li/node", region: "Western Europe", @@ -381,34 +389,6 @@ export const settingsAPIs = { } ], ES_WRAPPER_LIST: [ - { - url: "https://eu.wrapper.elasticsearch.bitshares.ws", - region: "Western Europe", - country: "Germany", - operator: "Infrastructure Worker", - contact: "email:info@blockchainprojectsbv.com" - }, - { - url: "https://us.wrapper.elasticsearch.bitshares.ws", - region: "Northern America", - country: "U.S.A.", - operator: "Infrastructure Worker", - contact: "email:info@blockchainprojectsbv.com" - }, - { - url: "https://hk.wrapper.elasticsearch.bitshares.ws", - region: "Hong Kong", - country: "China", - operator: "Infrastructure Worker", - contact: "email:info@blockchainprojectsbv.com" - }, - { - url: "https://explorer.bitshares-kibana.info", - region: "N/A", - country: "N/A", - operator: "N/A", - contact: "N/A" - } ], DEFAULT_FAUCET: getFaucet().url, TESTNET_FAUCET: getTestFaucet().url From ee8578c3d232ed224e140f5488830ac147b43ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schie=C3=9Fl?= Date: Mon, 15 Jun 2020 13:01:05 +0200 Subject: [PATCH 059/141] Update apiConfig.js --- app/api/apiConfig.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 75c2d7833e..e72029cd93 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -311,7 +311,23 @@ export const settingsAPIs = { country: "France", location: "", operator: "bitshares.org", - contact: "telegram:Zapata_42" + contact: "" + }, + { + url: "wss://us.api.bitshares.org/ws", + region: "Western Europe", + country: "France", + location: "", + operator: "bitshares.org", + contact: "" + }, + { + url: "wss://asia.api.bitshares.org/ws", + region: "Western Europe", + country: "France", + location: "", + operator: "bitshares.org", + contact: "" }, { url: "wss://citadel.li/node", From 4b8c386e31dce07aed3a834a75096fef00369e09 Mon Sep 17 00:00:00 2001 From: Abit Date: Thu, 2 Jul 2020 11:10:41 +0200 Subject: [PATCH 060/141] Remove OpenLedger API --- app/api/apiConfig.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 231e21d6a1..398e85bbf0 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -131,21 +131,6 @@ export const settingsAPIs = { operator: "Witness: iobanker-core", contact: "email:admin@iobanker.com" }, - { - url: "wss://bitshares.openledger.info/ws", - location: "Nuremberg", - region: "Western Europe", - country: "Germany", - operator: "Witness: openledger-dc", - contact: "telegram:v1pby" - }, - { - url: "wss://openledger.hk/ws", - region: "Southeastern Asia", - country: "Singapore", - operator: "Witness: openledger-dc", - contact: "telegram:v1pby" - }, { url: "wss://bit.btsabc.org/ws", region: "Eastern Asia", From 4f21ee639266af8a4872adb3c9b5e5942b2a6aa2 Mon Sep 17 00:00:00 2001 From: Abit Date: Tue, 7 Jul 2020 10:20:48 +0200 Subject: [PATCH 061/141] Remove broken API nodes --- app/api/apiConfig.js | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 398e85bbf0..05602bb2dd 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -155,31 +155,6 @@ export const settingsAPIs = { operator: "Witness: btspp-witness", contact: "telegram:btsplusplus" }, - { - url: "wss://dexnode.net/ws", - region: "Northern America", - country: "U.S.A.", - location: "Dallas", - operator: "Witness: Sahkan", - contact: "telegram:Sahkan_bitshares" - }, - { - url: "wss://kc-us-dex.xeldal.com/ws", // check - region: "Northern America", - country: "U.S.A.", - location: "Kansas City", - operator: "Witness: xeldal", - contact: "telegram:xeldal" - }, - { - url: "wss://api-ru.bts.blckchnd.com", - region: "Eastern Europe", - country: "Russia", - location: "Moscow", - operator: "Witness: blckchnd", - contact: - "email:admin@blckchnd.com;telegram:ruslansalikhov;github:blckchnd" - }, { url: "wss://blockzms.xyz/ws", region: "Northern America", From f923065227bf464f2c2e8f9217c036cfad89d574 Mon Sep 17 00:00:00 2001 From: Abit Date: Tue, 7 Jul 2020 10:34:44 +0200 Subject: [PATCH 062/141] Move GBAC API to mainnet section --- app/api/apiConfig.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 05602bb2dd..0041baffa7 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -305,6 +305,14 @@ export const settingsAPIs = { operator: "Witness: xbtsio-wallet", contact: "telegram: xbtsio" }, + { + url: "wss://api.gbacenter.org/ws", + region: "Northern America", + country: "U.S.A.", + location: "Fremont, CA", + operator: "Witness: gbac-ety001", + contact: "email:work@domyself.me" + }, // Testnet { @@ -323,14 +331,6 @@ export const settingsAPIs = { operator: "Witness: zapata42-witness", contact: "telegram:Zapata_42" }, - { - url: "wss://api.gbacenter.org/ws", - region: "Northern America", - country: "U.S.A.", - location: "Fremont, CA", - operator: "Witness: gbac-ety001", - contact: "email:work@domyself.me" - }, { url: "wss://testnet.xbts.io/ws", region: "TESTNET - Europe", From 0acd4aa4d30fec62c4f55cffdd994980a9796fab Mon Sep 17 00:00:00 2001 From: Abit Date: Tue, 7 Jul 2020 10:35:32 +0200 Subject: [PATCH 063/141] Remove btsabc's API node --- app/api/apiConfig.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 0041baffa7..a54b88e193 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -131,14 +131,6 @@ export const settingsAPIs = { operator: "Witness: iobanker-core", contact: "email:admin@iobanker.com" }, - { - url: "wss://bit.btsabc.org/ws", - region: "Eastern Asia", - country: "China", - location: "Hong Kong", - operator: "Witness: abc123", - contact: "QQ:58291;email:58291@qq.com" - }, { url: "wss://ws.gdex.top", region: "Eastern Asia", From cd696c1572bacd94c8370df2c21a5f89605178ba Mon Sep 17 00:00:00 2001 From: Abit Date: Tue, 7 Jul 2020 10:46:43 +0200 Subject: [PATCH 064/141] Add cnvote API node --- app/api/apiConfig.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index a54b88e193..655454de91 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -305,6 +305,14 @@ export const settingsAPIs = { operator: "Witness: gbac-ety001", contact: "email:work@domyself.me" }, + { + url: "wss://api.cnvote.vip:888/", + region: "Eastern Asia", + country: "China", + location: "Zhejiang", + operator: "Witness: ioex", + contact: "wechat:xiaoyuan_409" + }, // Testnet { From c15d7941f0070e0f820568502411ca8f9d798feb Mon Sep 17 00:00:00 2001 From: Abit Date: Tue, 7 Jul 2020 11:13:54 +0200 Subject: [PATCH 065/141] Add ptschina API node --- app/api/apiConfig.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 655454de91..a82efa1184 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -313,6 +313,14 @@ export const settingsAPIs = { operator: "Witness: ioex", contact: "wechat:xiaoyuan_409" }, + { + url: "wss://fujian.cnvote.vip:81/", + region: "Eastern Asia", + country: "China", + location: "Fujian", + operator: "ptschina", + contact: "wechat:planetlife" + }, // Testnet { From 4eaf4828a5e9be6e608d642d6ebcbefae1686438 Mon Sep 17 00:00:00 2001 From: ioBanker <37595908+ioBanker@users.noreply.github.com> Date: Sun, 19 Jul 2020 22:30:04 +0300 Subject: [PATCH 066/141] Fix Local wallet creation is broken #3274 --- app/components/Account/CreateAccount.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/Account/CreateAccount.jsx b/app/components/Account/CreateAccount.jsx index 654a4fb47d..e12e0bdc15 100644 --- a/app/components/Account/CreateAccount.jsx +++ b/app/components/Account/CreateAccount.jsx @@ -4,7 +4,7 @@ import classNames from "classnames"; import AccountActions from "actions/AccountActions"; import AccountStore from "stores/AccountStore"; import AccountNameInput from "./../Forms/AccountNameInputStyleGuide"; -import PasswordInput from "./../Forms/PasswordInputStyleGuide"; +import PasswordInput from "./../Forms/PasswordInput"; import WalletDb from "stores/WalletDb"; import {Link} from "react-router-dom"; import AccountSelect from "../Forms/AccountSelect"; @@ -284,7 +284,7 @@ class CreateAccount extends React.Component { From 256219c22058925a1d409def1ba9cb5fbc9fb776 Mon Sep 17 00:00:00 2001 From: Stefan Schiessl Date: Fri, 31 Jul 2020 16:13:40 +0200 Subject: [PATCH 067/141] allow empty ES WRAPPER list Signed-off-by: Stefan Schiessl --- app/components/Account/AccountReferralsTable.jsx | 2 +- app/components/Account/RecentTransactions.jsx | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/components/Account/AccountReferralsTable.jsx b/app/components/Account/AccountReferralsTable.jsx index b7da5603ee..c00d1e46ae 100644 --- a/app/components/Account/AccountReferralsTable.jsx +++ b/app/components/Account/AccountReferralsTable.jsx @@ -52,7 +52,7 @@ class AccountReferralsTable extends React.Component { if (settingsAPIs.ES_WRAPPER_LIST.length == 0) return; // fixme access to ES could be wrapped in a store or something else - const esNode = settingsAPIs.ES_WRAPPER_LIST[3].url; + const esNode = settingsAPIs.ES_WRAPPER_LIST[0].url; if (isAccountChanged) { referralsCount = null; diff --git a/app/components/Account/RecentTransactions.jsx b/app/components/Account/RecentTransactions.jsx index 43e1ec2c73..5fa6a0f408 100644 --- a/app/components/Account/RecentTransactions.jsx +++ b/app/components/Account/RecentTransactions.jsx @@ -283,7 +283,10 @@ class RecentTransactions extends React.Component { fetchingAccountHistory: false, accountHistoryError: err, esNodeCustom: false, - esNode: settingsAPIs.ES_WRAPPER_LIST[0].url + esNode: + settingsAPIs.ES_WRAPPER_LIST.length > 0 + ? settingsAPIs.ES_WRAPPER_LIST[0].url + : null }); } } From b0191101ce4ca22b0865141ee0f4bf7f298a03d0 Mon Sep 17 00:00:00 2001 From: Stefan Schiessl Date: Fri, 31 Jul 2020 17:13:17 +0200 Subject: [PATCH 068/141] add ticket create with 1 BTS in voting section Signed-off-by: Stefan Schiessl --- app/api/ApplicationApi.js | 96 ++++++++++++++++++- app/assets/locales/locale-en.json | 17 +++- .../stylesheets/components/_voting.scss | 3 + app/components/Account/AccountVoting.jsx | 45 +++++++++ app/components/Blockchain/OperationAnt.js | 34 +++++++ .../Blockchain/operations/TicketCreate.jsx | 33 +++++++ app/components/Blockchain/operations/index.js | 4 + package-lock.json | 35 ++++--- package.json | 2 +- 9 files changed, 252 insertions(+), 17 deletions(-) create mode 100644 app/components/Blockchain/operations/TicketCreate.jsx diff --git a/app/api/ApplicationApi.js b/app/api/ApplicationApi.js index 5500832118..a053e3233d 100644 --- a/app/api/ApplicationApi.js +++ b/app/api/ApplicationApi.js @@ -7,7 +7,8 @@ import { TransactionBuilder, TransactionHelper, FetchChain, - ChainStore + ChainStore, + ChainTypes } from "bitsharesjs"; import counterpart from "counterpart"; import {Notification} from "bitshares-ui-style-guide"; @@ -761,6 +762,99 @@ const ApplicationApi = { } ); + transactionBuilder.add_operation(op); + await WalletDb.process_transaction(transactionBuilder, null, broadcast); + if (!transactionBuilder.tr_buffer) { + throw "Something went finalization the transaction, this should not happen"; + } + }, + + async createVestingBalance( + creator, + owner, + asset, + amount, + policy, + feeAsset = "1.3.0", + broadcast = true + ) { + // account must be unlocked + await WalletUnlockActions.unlock(); + + // ensure all arguments are chain objects + let objects = { + creator: await this._ensureAccount(creator), + owner: await this._ensureAccount(owner), + asset: await this._ensureAsset(asset), + feeAsset: await this._ensureAsset(feeAsset) + }; + + let transactionBuilder = new TransactionBuilder(); + let op = transactionBuilder.get_type_operation( + "vesting_balance_create", + { + fee: { + amount: 0, + asset_id: objects.feeAsset.get("id") + }, + creator: objects.creator.get("id"), + owner: objects.owner.get("id"), + amount: { + amount: amount, + asset_id: objects.asset.get("id") + }, + // fixme should be given + policy: [ + 0, + { + begin_timestamp: parseInt(new Date().getTime() / 1000), + vesting_cliff_seconds: 100, + vesting_duration_seconds: 100 + } + ] + } + ); + + transactionBuilder.add_operation(op); + await WalletDb.process_transaction(transactionBuilder, null, broadcast); + if (!transactionBuilder.tr_buffer) { + throw "Something went finalization the transaction, this should not happen"; + } + }, + + async createTicket( + account, + asset, + amount, + targetType = ChainTypes.ticket_type.lock_forever, + feeAsset = "1.3.0", + broadcast = true + ) { + // account must be unlocked + await WalletUnlockActions.unlock(); + + // ensure all arguments are chain objects + let objects = { + account: await this._ensureAccount(account), + asset: await this._ensureAsset(asset), + feeAsset: await this._ensureAsset(feeAsset) + }; + + let transactionBuilder = new TransactionBuilder(); + let op = transactionBuilder.get_type_operation("ticket_create", { + fee: { + amount: 0, + asset_id: objects.feeAsset.get("id") + }, + account: objects.account.get("id"), + target_type: targetType, + amount: { + amount: amount, + asset_id: objects.asset.get("id") + }, + extensions: {} + }); + transactionBuilder.add_operation(op); await WalletDb.process_transaction(transactionBuilder, null, broadcast); if (!transactionBuilder.tr_buffer) { diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json index 989e70466c..3b367194ad 100644 --- a/app/assets/locales/locale-en.json +++ b/app/assets/locales/locale-en.json @@ -1784,7 +1784,15 @@ "witness_pay": "Withdrew witness pay to account", "witness_receive": "Received witness from witness", "witness_update": "{account} update its witness info", - "worker_create": "{account} created a worker proposal with daily pay of {pay}" + "worker_create": "{account} created a worker proposal with daily pay of {pay}", + "ticket_create": "{account} locked away {amount} in a ticket", + "ticket_types": { + "liquid": "Liquid", + "lock_180_days": "Locked for 180 days", + "lock_360_days": "Locked for 360 days", + "lock_720_days": "Locked for 720 days", + "lock_forever": "Locked forever" + } }, "page404": { "asset_not_found_subtitle": "That asset does not exist", @@ -2571,7 +2579,8 @@ "witness_create": "Create witness", "witness_update": "Update witness", "witness_withdraw_pay": "Witness pay withdrawal", - "worker_create": "Create worker" + "worker_create": "Create worker", + "ticket_create": "Create ticket" }, "vesting_balance_create": "created vesting balance of", "view_json": "Show raw json", @@ -2697,7 +2706,9 @@ }, "voting": { "description": "The BitShares blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).", - "title": "Voting" + "title": "Voting", + "ticket_explanation": "TBD", + "create_ticket": "Lock 1 {asset}" }, "walkthrough": { "buy_form": "Place buy orders using this form.", diff --git a/app/assets/stylesheets/components/_voting.scss b/app/assets/stylesheets/components/_voting.scss index af96f46fb9..2cad799859 100644 --- a/app/assets/stylesheets/components/_voting.scss +++ b/app/assets/stylesheets/components/_voting.scss @@ -1,6 +1,9 @@ .voting { .proxy-row { } + .ticket-row { + padding-bottom: 20px; + } .ant-radio-group { padding-top: 4px !important; padding-left: 26px !important; diff --git a/app/components/Account/AccountVoting.jsx b/app/components/Account/AccountVoting.jsx index f676b86564..407b73e326 100644 --- a/app/components/Account/AccountVoting.jsx +++ b/app/components/Account/AccountVoting.jsx @@ -17,6 +17,7 @@ import AccountStore from "stores/AccountStore"; import Witnesses from "./Voting/Witnesses"; import Committee from "./Voting/Committee"; import Workers from "./Voting/Workers"; +import TranslateWithLinks from "../Utility/TranslateWithLinks"; const WITNESSES_KEY = "witnesses"; const COMMITTEE_KEY = "committee"; @@ -270,6 +271,10 @@ class AccountVoting extends React.Component { this.publish(this.state.proxy_account_id); } + onCreateTicket() { + ApplicationApi.createTicket(this.props.account, "1.3.0", 100000); + } + publish(new_proxy_id) { let updated_account = this.props.account.toJS(); let updateObject = {account: updated_account.id}; @@ -594,6 +599,39 @@ class AccountVoting extends React.Component { this.props.history.push(value); }; + const increase_voting_power = ( + +
+ +
+ + ); + return (
@@ -605,6 +643,13 @@ class AccountVoting extends React.Component { component="p" />
+
+ {increase_voting_power} + +
{proxyInput} {actionButtons} diff --git a/app/components/Blockchain/OperationAnt.js b/app/components/Blockchain/OperationAnt.js index 252ce506f6..ac4c83be73 100644 --- a/app/components/Blockchain/OperationAnt.js +++ b/app/components/Blockchain/OperationAnt.js @@ -1544,6 +1544,40 @@ class Operation { ); + break; + case "ticket_create": + const ticket_type = Object.keys( + grapheneChainTypes.ticket_type + ).find( + key => + grapheneChainTypes.ticket_type[key] === + op[1].target_type + ); + column = ( + + +   ( + {counterpart.translate( + "operation.ticket_types." + ticket_type + )} + ) + + ); + break; default: console.log("unimplemented op '" + ops[op[0]] + "':", op); diff --git a/app/components/Blockchain/operations/TicketCreate.jsx b/app/components/Blockchain/operations/TicketCreate.jsx new file mode 100644 index 0000000000..5f83ee0d35 --- /dev/null +++ b/app/components/Blockchain/operations/TicketCreate.jsx @@ -0,0 +1,33 @@ +import React from "react"; +import Translate from "react-translate-component"; +import FormattedAsset from "../../Utility/FormattedAsset"; +import TranslateWithLinks from "../../Utility/TranslateWithLinks"; +import counterpart from "counterpart"; +import {ChainTypes} from "bitsharesjs"; + +export const TicketCreate = ({op, linkToAccount, fromComponent}) => { + const ticket_type = Object.keys(ChainTypes.ticket_type).find( + key => ChainTypes.ticket_type[key] === op[1].target_type + ); + return ( + + +   ( + {counterpart.translate("operation.ticket_types." + ticket_type)}) + + ); +}; diff --git a/app/components/Blockchain/operations/index.js b/app/components/Blockchain/operations/index.js index 624006990f..897a2d35ec 100644 --- a/app/components/Blockchain/operations/index.js +++ b/app/components/Blockchain/operations/index.js @@ -57,6 +57,7 @@ import {HtlcExtend} from "./HtlcExtend"; import {HtlcRedeem} from "./HtlcRedeem"; import {HtlcRedeemed} from "./HtlcRedeemed"; import {HtlcRefund} from "./HtlcRefund"; +import {TicketCreate} from "./TicketCreate"; export default function opComponents(opType, props, opts) { switch (opType) { @@ -236,6 +237,9 @@ export default function opComponents(opType, props, opts) { case "htlc_refund": return ; + case "ticket_create": + return ; + default: return ; } diff --git a/package-lock.json b/package-lock.json index 8474ba8950..31911f4608 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5176,15 +5176,16 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } }, "base-x": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.7.tgz", - "integrity": "sha512-zAKJGuQPihXW22fkrfOclUUZXM2g92z5GzlSMHxhO6r6Qj+Nm0ccaGNBzDZojzwOMkpjAv4J0fOv1U4go+a4iw==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz", + "integrity": "sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==", "requires": { "safe-buffer": "^5.0.1" } @@ -5374,9 +5375,8 @@ } }, "bitsharesjs": { - "version": "3.3.0-rc1", - "resolved": "https://registry.npmjs.org/bitsharesjs/-/bitsharesjs-3.3.0-rc1.tgz", - "integrity": "sha512-qHrLTT/PJCNnFng/QzVt4OwP51hPEK4ivnlgzPQZ3kDNg4oUKxRoqvUiTTL/Q1vYQvarh+0UYPjy9EiMAQHsSA==", + "version": "git+https://github.com/bitshares/bitsharesjs.git#c11e86ade64e1d3bc3b61e86ff10796492c10172", + "from": "git+https://github.com/bitshares/bitsharesjs.git#c11e86ade64e1d3bc3b61e86ff10796492c10172", "requires": { "bigi": "1.4.2", "bitsharesjs-ws": "^3.1.1", @@ -5389,8 +5389,15 @@ "ecurve": "1.0.6", "event-emitter": "0.3.5", "immutable": "3.8.2", - "safe-buffer": "^5.1.2", + "safe-buffer": "^5.2.1", "secure-random": "1.1.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + } } }, "bitsharesjs-ws": { @@ -7066,7 +7073,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, "normalize-path": { @@ -8847,7 +8855,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } @@ -15529,7 +15538,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } } @@ -20448,7 +20458,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } diff --git a/package.json b/package.json index a659da8050..f9f1d228bc 100644 --- a/package.json +++ b/package.json @@ -145,7 +145,7 @@ "bignumber.js": "^4.0.0", "bitshares-report": "git+https://github.com/bitshares/bitshares-report.git#bba397fc7b4eb903d1ca109ac33301e9d2e2d753", "bitshares-ui-style-guide": "git+https://github.com/bitshares/bitshares-ui-style-guide.git#23ca108d47442dc70634797fb113d1e751e9b1cb", - "bitsharesjs": "^3.3.0-rc1", + "bitsharesjs": "git+https://github.com/bitshares/bitsharesjs.git#c11e86ade64e1d3bc3b61e86ff10796492c10172", "browser-locale": "^1.0.3", "classnames": "^2.2.1", "cookies-js": "^1.2.1", From b054478e7b98eba2918c031d5740873ce10ef860 Mon Sep 17 00:00:00 2001 From: ioBanker <37595908+ioBanker@users.noreply.github.com> Date: Tue, 11 Aug 2020 00:10:56 +0300 Subject: [PATCH 069/141] Fixing pop-up code bugs --- .../Blockchain/operations/TicketCreate.jsx | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/app/components/Blockchain/operations/TicketCreate.jsx b/app/components/Blockchain/operations/TicketCreate.jsx index 5f83ee0d35..e1006da9fa 100644 --- a/app/components/Blockchain/operations/TicketCreate.jsx +++ b/app/components/Blockchain/operations/TicketCreate.jsx @@ -6,28 +6,28 @@ import counterpart from "counterpart"; import {ChainTypes} from "bitsharesjs"; export const TicketCreate = ({op, linkToAccount, fromComponent}) => { - const ticket_type = Object.keys(ChainTypes.ticket_type).find( - key => ChainTypes.ticket_type[key] === op[1].target_type - ); - return ( - - -   ( - {counterpart.translate("operation.ticket_types." + ticket_type)}) - - ); + return ( + + +   ( + {counterpart.translate( + "operation.ticket_types." + op[1].target_type + )} + ) + + ); }; From cb45b013604c2c30b9972b8c063d9e23d986086b Mon Sep 17 00:00:00 2001 From: ioBanker <37595908+ioBanker@users.noreply.github.com> Date: Tue, 11 Aug 2020 00:14:53 +0300 Subject: [PATCH 070/141] Update locale-en.json --- app/assets/locales/locale-en.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json index 3b367194ad..664669f1d9 100644 --- a/app/assets/locales/locale-en.json +++ b/app/assets/locales/locale-en.json @@ -1787,6 +1787,11 @@ "worker_create": "{account} created a worker proposal with daily pay of {pay}", "ticket_create": "{account} locked away {amount} in a ticket", "ticket_types": { + "0": "Liquid", + "1": "Locked for 180 days", + "2": "Locked for 360 days", + "3": "Locked for 720 days", + "4": "Locked forever", "liquid": "Liquid", "lock_180_days": "Locked for 180 days", "lock_360_days": "Locked for 360 days", From da7b66912d4004c86186edc9dbbe6e6b4d0a2d31 Mon Sep 17 00:00:00 2001 From: xiao93 <42384581+xiao93@users.noreply.github.com> Date: Thu, 27 Aug 2020 21:47:47 +0800 Subject: [PATCH 071/141] Update apiConfig.js --- app/api/apiConfig.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 8bbf713ad1..05fa30880a 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -345,6 +345,14 @@ export const settingsAPIs = { operator: "ptschina", contact: "wechat:planetlife" }, + { + url: "wss://api.bitshares.im/ws", + region: "Eastern Asia", + country: "Japan", + location: "Tokyo", + operator: "Witness: clone", + contact: "telegram: yexiao" + }, // Testnet { From fcf788baff99837ac8fa1144a2a16f352983652f Mon Sep 17 00:00:00 2001 From: xiao93 <42384581+xiao93@users.noreply.github.com> Date: Sat, 19 Sep 2020 18:46:12 +0800 Subject: [PATCH 072/141] Update apiConfig.js --- app/api/apiConfig.js | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 05fa30880a..cc50d4f015 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -346,14 +346,37 @@ export const settingsAPIs = { contact: "wechat:planetlife" }, { - url: "wss://api.bitshares.im/ws", + url: "wss://tokyo.bitshares.im/ws", region: "Eastern Asia", country: "Japan", location: "Tokyo", operator: "Witness: clone", contact: "telegram: yexiao" }, - + { + url: "wss://singapore.bitshares.im/ws", + region: "Southeast Asia", + country: "Singapore", + location: "Singapore", + operator: "Witness: clone", + contact: "telegram: yexiao" + }, + { + url: "wss://bangalore.bitshares.im/ws", + region: "South Asia", + country: "India", + location: "Bangalore", + operator: "Witness: clone", + contact: "telegram: yexiao" + }, + { + url: "wss://newyork.bitshares.im/ws", + region: "Northern America", + country: "U.S.A.", + location: "New York", + operator: "Witness: clone", + contact: "telegram: yexiao" + }, // Testnet { url: "wss://node.testnet.bitshares.eu", @@ -378,7 +401,16 @@ export const settingsAPIs = { location: "Nuremberg", operator: "Witness: xbtsio-wallet", contact: "telegram: xbtsio" + }, + { + url: "wss://testnet.bitshares.im/ws", + region: "Eastern Asia", + country: "Japan", + location: "Tokyo", + operator: "Witness: clone", + contact: "telegram: yexiao" } + ], ES_WRAPPER_LIST: [ ], From 0ac06bb40f00e8a86272de8854addb88ef8006da Mon Sep 17 00:00:00 2001 From: ioBanker <37595908+ioBanker@users.noreply.github.com> Date: Sun, 27 Sep 2020 22:45:54 +0300 Subject: [PATCH 073/141] Update apiConfig.js --- app/api/apiConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index cc50d4f015..3ec5410af9 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -124,7 +124,7 @@ export const settingsAPIs = { location: "Locally hosted" }, { - url: "wss://dex.iobanker.com:9090", + url: "wss://dex.iobanker.com/ws", region: "Western Europe", country: "Germany", location: "Frankfurt", From dfe057a5095d3b3d6071893dee8ce1b9a2dabda9 Mon Sep 17 00:00:00 2001 From: Stefan Schiessl Date: Tue, 29 Sep 2020 16:03:35 +0200 Subject: [PATCH 074/141] update dependencies --- package-lock.json | 1194 +++++++++++++++++++++------------------------ package.json | 38 +- 2 files changed, 565 insertions(+), 667 deletions(-) diff --git a/package-lock.json b/package-lock.json index 31911f4608..167f0602c4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "BitShares2-light", - "version": "3.3.191120-rc1", + "version": "4.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -19,24 +19,19 @@ } }, "@ant-design/create-react-context": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@ant-design/create-react-context/-/create-react-context-0.2.4.tgz", - "integrity": "sha512-8sw+/w6r+aEbd+OJ62ojoSE4zDt/3yfQydmbWFznoftjr8v/opOswGjM+/MU0rSaREbluqzOmZ6xdecHpSaS2w==", + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/@ant-design/create-react-context/-/create-react-context-0.2.5.tgz", + "integrity": "sha512-1rMAa4qgP2lfl/QBH9i78+Gjxtj9FTMpMyDGZsEBW5Kih72EuUo9958mV8PgpRkh4uwPSQ7vVZWXeyNZXVAFDg==", "requires": { "gud": "^1.0.0", "warning": "^4.0.3" - }, - "dependencies": { - "warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "requires": { - "loose-envify": "^1.0.0" - } - } } }, + "@ant-design/css-animation": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/@ant-design/css-animation/-/css-animation-1.7.3.tgz", + "integrity": "sha512-LrX0OGZtW+W6iLnTAqnTaoIsRelYeuLZWsrmBJFUXDALQphPsN8cE5DCsmoSlL0QYb94BQxINiuS70Ar/8BNgA==" + }, "@ant-design/icons": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-2.1.1.tgz", @@ -240,9 +235,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, "minimist": { @@ -525,9 +520,9 @@ "dev": true }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, "ms": { @@ -617,17 +612,17 @@ } }, "@babel/runtime": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.4.tgz", - "integrity": "sha512-r24eVUUr0QqNZa+qrImUk8fn5SPhHq+IfYvIoIMg0do3GdK9sMdiLKP3GYVVaxpPKORgm8KRKaNTEhAjgIpLMw==", + "version": "7.11.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz", + "integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==", "requires": { - "regenerator-runtime": "^0.13.2" + "regenerator-runtime": "^0.13.4" }, "dependencies": { "regenerator-runtime": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", - "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==" + "version": "0.13.7", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz", + "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==" } } }, @@ -2388,9 +2383,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, "to-fast-properties": { @@ -2422,9 +2417,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, "to-fast-properties": { @@ -2457,9 +2452,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, "to-fast-properties": { @@ -2491,9 +2486,9 @@ } }, "lodash": { - "version": "4.17.14", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", - "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, "to-fast-properties": { @@ -2547,12 +2542,12 @@ "dev": true }, "@types/react": { - "version": "16.9.13", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.13.tgz", - "integrity": "sha512-LikzRslbiufJYHyzbHSW0GrAiff8QYLMBFeZmSxzCYGXKxi8m/1PHX+rsVOwhr7mJNq+VIu2Dhf7U6mjFERK6w==", + "version": "16.9.49", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.49.tgz", + "integrity": "sha512-DtLFjSj0OYAdVLBbyjhuV9CdGVHCkHn2R+xr3XkBvK2rS1Y1tkc14XSGjYgm5Fjjr90AxH9tiSzc1pCFMGO06g==", "requires": { "@types/prop-types": "*", - "csstype": "^2.2.0" + "csstype": "^3.0.2" } }, "@types/react-slick": { @@ -3050,9 +3045,9 @@ "dev": true }, "antd": { - "version": "3.25.3", - "resolved": "https://registry.npmjs.org/antd/-/antd-3.25.3.tgz", - "integrity": "sha512-qTegXllFsswzfSUyZHS8hebfUSqJ7uriDRcbE4Iwsa+/+IioHwDqha8cSzdbqrUqdjnozVV2vFDiGvRrI5fwEA==", + "version": "3.26.18", + "resolved": "https://registry.npmjs.org/antd/-/antd-3.26.18.tgz", + "integrity": "sha512-TPuacNJJNPji+LnapU46uWGqi+6JlyH75paMNs95IH0F7gGYtp4oSkua88gGsoAaUbDxTIF+cWI9mdIsr7ywlw==", "requires": { "@ant-design/create-react-context": "^0.2.4", "@ant-design/icons": "~2.1.1", @@ -3065,18 +3060,19 @@ "css-animation": "^1.5.0", "dom-closest": "^0.2.0", "enquire.js": "^2.1.6", + "is-mobile": "^2.1.0", "lodash": "^4.17.13", "moment": "^2.24.0", "omit.js": "^1.0.2", "prop-types": "^15.7.2", "raf": "^3.4.1", "rc-animate": "^2.10.2", - "rc-calendar": "~9.15.5", + "rc-calendar": "~9.15.7", "rc-cascader": "~0.17.4", "rc-checkbox": "~2.1.6", "rc-collapse": "~1.11.3", - "rc-dialog": "~7.5.2", - "rc-drawer": "~3.0.0", + "rc-dialog": "~7.6.0", + "rc-drawer": "~3.1.1", "rc-dropdown": "~2.4.1", "rc-editor-mention": "^1.1.13", "rc-form": "^2.4.10", @@ -3084,7 +3080,7 @@ "rc-mentions": "~0.4.0", "rc-menu": "~7.5.1", "rc-notification": "~3.3.1", - "rc-pagination": "~1.20.5", + "rc-pagination": "~1.20.11", "rc-progress": "~2.5.0", "rc-rate": "~2.5.0", "rc-resize-observer": "^0.1.0", @@ -3092,7 +3088,7 @@ "rc-slider": "~8.7.1", "rc-steps": "~3.5.0", "rc-switch": "~1.9.0", - "rc-table": "~6.9.4", + "rc-table": "~6.10.5", "rc-tabs": "~9.7.0", "rc-time-picker": "~3.7.1", "rc-tooltip": "~3.7.3", @@ -3100,7 +3096,7 @@ "rc-tree-select": "~2.9.1", "rc-trigger": "^2.6.2", "rc-upload": "~2.9.1", - "rc-util": "^4.10.0", + "rc-util": "^4.16.1", "react-lazy-load": "^3.0.13", "react-lifecycles-compat": "^3.0.4", "react-slick": "~0.25.2", @@ -3117,14 +3113,6 @@ "object-assign": "4.x" } }, - "copy-to-clipboard": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.2.0.tgz", - "integrity": "sha512-eOZERzvCmxS8HWzugj4Uxl8OJxa7T2k1Gi0X5qavwydHIfuSHq2dTD09LOg/XyGq4Zpb5IsR/2OJ5lbOegz78w==", - "requires": { - "toggle-selection": "^1.0.6" - } - }, "css-animation": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/css-animation/-/css-animation-1.6.1.tgz", @@ -3135,9 +3123,9 @@ } }, "moment": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.0.tgz", + "integrity": "sha512-z6IJ5HXYiuxvFTI6eiQ9dm77uE0gyy1yXNApVHqTcnIKfY9tIwEjlzsZ6u1LQXvVgKeTnv9Xm7NDvJ7lso3MtA==" }, "prop-types": { "version": "15.7.2", @@ -3150,9 +3138,9 @@ } }, "rc-animate": { - "version": "2.10.2", - "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.10.2.tgz", - "integrity": "sha512-cE/A7piAzoWFSgUD69NmmMraqCeqVBa51UErod8NS3LUEqWfppSVagHfa0qHAlwPVPiIBg3emRONyny3eiH0Dg==", + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.11.1.tgz", + "integrity": "sha512-1NyuCGFJG/0Y+9RKh5y/i/AalUCA51opyyS/jO2seELpgymZm2u9QV3xwODwEuzkmeQ1BDPxMLmYLcTJedPlkQ==", "requires": { "babel-runtime": "6.x", "classnames": "^2.2.6", @@ -3164,23 +3152,22 @@ } }, "rc-util": { - "version": "4.15.7", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.15.7.tgz", - "integrity": "sha512-9pn2NU7IafaP0Hbtll7Ufu9eF9odDOMGMI/WD9lgD4yrm3xR4yCAWZ0cqQGIhKMqdkg3I7et7/dTekrftMeqJQ==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz", + "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==", "requires": { "add-dom-event-listener": "^1.1.0", - "babel-runtime": "6.x", "prop-types": "^15.5.10", + "react-is": "^16.12.0", "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.1.0" - } - }, - "warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "requires": { - "loose-envify": "^1.0.0" + }, + "dependencies": { + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + } } } } @@ -3622,9 +3609,9 @@ } }, "lodash": { - "version": "4.17.14", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", - "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -5176,8 +5163,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true } } @@ -5268,8 +5254,8 @@ } }, "bitshares-ui-style-guide": { - "version": "git+https://github.com/bitshares/bitshares-ui-style-guide.git#23ca108d47442dc70634797fb113d1e751e9b1cb", - "from": "git+https://github.com/bitshares/bitshares-ui-style-guide.git#23ca108d47442dc70634797fb113d1e751e9b1cb", + "version": "git+https://github.com/bitshares/bitshares-ui-style-guide.git#a17a9f6a89932f288a543b1922af0107aea06218", + "from": "git+https://github.com/bitshares/bitshares-ui-style-guide.git#a17a9f6a89932f288a543b1922af0107aea06218", "requires": { "antd": "^3.15.2", "normalize.css": "^8.0.1", @@ -5279,27 +5265,6 @@ "react-router-dom": "^5.1.2" }, "dependencies": { - "history": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz", - "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==", - "requires": { - "@babel/runtime": "^7.1.2", - "loose-envify": "^1.2.0", - "resolve-pathname": "^3.0.0", - "tiny-invariant": "^1.0.2", - "tiny-warning": "^1.0.0", - "value-equal": "^1.0.1" - } - }, - "hoist-non-react-statics": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", - "integrity": "sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==", - "requires": { - "react-is": "^16.7.0" - } - }, "prop-types": { "version": "15.7.2", "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", @@ -5309,77 +5274,16 @@ "object-assign": "^4.1.1", "react-is": "^16.8.1" } - }, - "react": { - "version": "16.12.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.12.0.tgz", - "integrity": "sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2" - } - }, - "react-dom": { - "version": "16.12.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.12.0.tgz", - "integrity": "sha512-LMxFfAGrcS3kETtQaCkTKjMiifahaMySFDn71fZUNpPHZQEzmk/GiAeIT8JSOrHB23fnuCOMruL2a8NYlw+8Gw==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2", - "scheduler": "^0.18.0" - } - }, - "react-router": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.1.2.tgz", - "integrity": "sha512-yjEuMFy1ONK246B+rsa0cUam5OeAQ8pyclRDgpxuSCrAlJ1qN9uZ5IgyKC7gQg0w8OM50NXHEegPh/ks9YuR2A==", - "requires": { - "@babel/runtime": "^7.1.2", - "history": "^4.9.0", - "hoist-non-react-statics": "^3.1.0", - "loose-envify": "^1.3.1", - "mini-create-react-context": "^0.3.0", - "path-to-regexp": "^1.7.0", - "prop-types": "^15.6.2", - "react-is": "^16.6.0", - "tiny-invariant": "^1.0.2", - "tiny-warning": "^1.0.0" - } - }, - "react-router-dom": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.1.2.tgz", - "integrity": "sha512-7BPHAaIwWpZS074UKaw1FjVdZBSVWEk8IuDXdB+OkLb8vd/WRQIpA4ag9WQk61aEfQs47wHyjWUoUGGZxpQXew==", - "requires": { - "@babel/runtime": "^7.1.2", - "history": "^4.9.0", - "loose-envify": "^1.3.1", - "prop-types": "^15.6.2", - "react-router": "5.1.2", - "tiny-invariant": "^1.0.2", - "tiny-warning": "^1.0.0" - } - }, - "resolve-pathname": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz", - "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==" - }, - "value-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz", - "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==" } } }, "bitsharesjs": { - "version": "git+https://github.com/bitshares/bitsharesjs.git#c11e86ade64e1d3bc3b61e86ff10796492c10172", - "from": "git+https://github.com/bitshares/bitsharesjs.git#c11e86ade64e1d3bc3b61e86ff10796492c10172", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/bitsharesjs/-/bitsharesjs-4.0.0.tgz", + "integrity": "sha512-mB5iAvOgPoURRBq2tZRr10U/V1xz7hJExZsZcbhNhS+mJqpALVMEZPi26B2zQ5/02K37ukIwkLGJVIzafOBuCw==", "requires": { "bigi": "1.4.2", - "bitsharesjs-ws": "^3.1.1", + "bitsharesjs-ws": "^4.0.0", "bs58": "4.0.1", "bytebuffer": "5.0.1", "create-hash": "1.2.0", @@ -5401,18 +5305,18 @@ } }, "bitsharesjs-ws": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/bitsharesjs-ws/-/bitsharesjs-ws-3.1.1.tgz", - "integrity": "sha512-p9WQQF9GtttCD3T4yk526TQwqxkOy1Ut0G5m3G/w49RVQeXZtg0k8xJFTViqefmqno/b81mKmFRUIutExyHjag==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/bitsharesjs-ws/-/bitsharesjs-ws-4.0.0.tgz", + "integrity": "sha512-2+9D8xMjCBgaB+7Pokb9j1NmraWNyVAFtY0+9WlDzWtGiVmrsjpg/fpE6qeXN99/b300ub83WJunbOpDAIlzUQ==", "requires": { "isomorphic-ws": "^4.0.1", "ws": "^4.1.0" } }, "bl": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", - "integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz", + "integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==", "dev": true, "requires": { "readable-stream": "^2.3.5", @@ -6730,11 +6634,11 @@ "dev": true }, "copy-to-clipboard": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz", - "integrity": "sha512-c3GdeY8qxCHGezVb1EFQfHYK/8NZRemgcTIzPq7PuxjHAf/raKibn2QdhHPb/y6q74PMgH6yizaDZlRmw6QyKw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz", + "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==", "requires": { - "toggle-selection": "^1.0.3" + "toggle-selection": "^1.0.6" } }, "copy-webpack-plugin": { @@ -7073,8 +6977,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true }, "normalize-path": { @@ -7170,9 +7073,9 @@ } }, "csstype": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.7.tgz", - "integrity": "sha512-9Mcn9sFbGBAdmimWb2gLVDtFJzeKtDGIr76TUqmjZrw9LFXBMSU70lcs+C0/7fyCd6iBDqmksUcCOUIkisPHsQ==" + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.3.tgz", + "integrity": "sha512-jPl+wbWPOWJ7SXsWyqGRk3lGecbar0Cb0OvZF/r/ZU011R4YqiRehgkQ9p4eQfo9DSDLqLL3wHwfxeJiuIsNag==" }, "csv": { "version": "5.3.0", @@ -7628,9 +7531,9 @@ } }, "dom-walk": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz", - "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=", + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz", + "integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==", "dev": true }, "domain-browser": { @@ -7674,9 +7577,9 @@ } }, "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz", + "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==", "dev": true, "requires": { "is-obj": "^1.0.0" @@ -7720,7 +7623,7 @@ }, "immutable": { "version": "3.7.6", - "resolved": "http://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks=" } } @@ -7981,9 +7884,9 @@ "dev": true }, "elliptic": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", - "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz", + "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==", "dev": true, "requires": { "bn.js": "^4.4.0", @@ -8855,8 +8758,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true } } @@ -9952,13 +9854,13 @@ } }, "global": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz", - "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz", + "integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==", "dev": true, "requires": { "min-document": "^2.19.0", - "process": "~0.5.1" + "process": "^0.11.10" } }, "global-dirs": { @@ -10290,9 +10192,9 @@ "dev": true }, "highcharts": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/highcharts/-/highcharts-6.1.1.tgz", - "integrity": "sha512-etFYUPb+CwG9mrTb08IS4k3XGXs94xSA9vNF1yTJLxL/rw6t9U0InrcMRKG7IVNc5MolMXOPAPCdkuzKXV3Gng==" + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/highcharts/-/highcharts-6.2.0.tgz", + "integrity": "sha512-A4E89MA+kto8giic7zyLU6ZxfXnVeCUlKOyzFsah3+n4BROx4bgonl92KIBtwLud/mIWir8ahqhuhe2by9LakQ==" }, "hirestime": { "version": "3.2.1", @@ -10300,25 +10202,16 @@ "integrity": "sha512-VoXZ1Wz2lII6KZid7ByyeoW1TheD/Hiu6r9TjWWFUM2O3tddeRlj2/yGP63bZiIizHXW336eW0KNUiD6wngzSw==" }, "history": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/history/-/history-4.7.2.tgz", - "integrity": "sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==", + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz", + "integrity": "sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew==", "requires": { - "invariant": "^2.2.1", + "@babel/runtime": "^7.1.2", "loose-envify": "^1.2.0", - "resolve-pathname": "^2.2.0", - "value-equal": "^0.4.0", - "warning": "^3.0.0" - }, - "dependencies": { - "warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", - "requires": { - "loose-envify": "^1.0.0" - } - } + "resolve-pathname": "^3.0.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0", + "value-equal": "^1.0.1" } }, "hmac-drbg": { @@ -10333,9 +10226,12 @@ } }, "hoist-non-react-statics": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", - "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "requires": { + "react-is": "^16.7.0" + } }, "home-or-tmp": { "version": "2.0.0", @@ -10857,9 +10753,9 @@ "integrity": "sha1-giRKIZDE5Bn4Nx9ao02qNCDiq94=" }, "intl-format-cache": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-2.1.0.tgz", - "integrity": "sha1-BKNp/sv61tpgBbrh8UMzMy3PkxY=" + "version": "2.2.9", + "resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-2.2.9.tgz", + "integrity": "sha512-Zv/u8wRpekckv0cLkwpVdABYST4hZNTDaX7reFetrYTJwxExR2VyTqQm+l0WmL0Qo8Mjb9Tf33qnfj0T7pjxdQ==" }, "intl-messageformat": { "version": "2.2.0", @@ -10875,9 +10771,9 @@ "integrity": "sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU=" }, "intl-relativeformat": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-2.1.0.tgz", - "integrity": "sha1-AQ8RBYAiUfQKxH0OPhogE0iiVd8=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz", + "integrity": "sha512-4bV/7kSKaPEmu6ArxXf9xjv1ny74Zkwuey8Pm01NH4zggPP7JHwg2STk8Y3JdspCKRDriwIyLRfEXnj2ZLr4Bw==", "requires": { "intl-messageformat": "^2.0.0" } @@ -11060,6 +10956,11 @@ "is-path-inside": "^1.0.0" } }, + "is-mobile": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/is-mobile/-/is-mobile-2.2.2.tgz", + "integrity": "sha512-wW/SXnYJkTjs++tVK5b6kVITZpAZPtUrt9SF80vvxGiF/Oywal+COk1jlRkiVq15RFNEQKQY31TkV24/1T5cVg==" + }, "is-npm": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", @@ -11392,9 +11293,9 @@ "dev": true }, "lodash": { - "version": "4.17.14", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", - "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, "ms": { @@ -15079,9 +14980,9 @@ } }, "jsqr": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/jsqr/-/jsqr-1.1.1.tgz", - "integrity": "sha512-FVoMU2ncTyjaOqN/vwvDnZ7jaAVvFzM3LK3vG3jvQZFWJQlAwJ1XTCOgAEKo+4Rkd6ydMXTTvqGV/4w5VunmTw==" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsqr/-/jsqr-1.3.1.tgz", + "integrity": "sha512-zCTP6Qd/WwjrpuHFkJuXc5opRdKprUr7eI7+JCCtcetThJt45qptu82MWQ+eET+FtDrMo7+BYjo3iD0XIq1L9Q==" }, "jsx-ast-utils": { "version": "1.4.1", @@ -15219,9 +15120,9 @@ } }, "lodash": { - "version": "4.17.14", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", - "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==" + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" }, "lodash-es": { "version": "4.17.10", @@ -15332,9 +15233,22 @@ } }, "lodash.throttle": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", - "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=" + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-3.0.4.tgz", + "integrity": "sha1-vE9HH7Mo5Nb9xt8rPTyvET8Pick=", + "requires": { + "lodash.debounce": "^3.0.0" + }, + "dependencies": { + "lodash.debounce": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.1.1.tgz", + "integrity": "sha1-gSIRw3ipTMKdWqTjNGzwv846ffU=", + "requires": { + "lodash._getnative": "^3.0.0" + } + } + } }, "lodash.toarray": { "version": "4.4.0", @@ -15538,8 +15452,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true } } @@ -15732,13 +15645,12 @@ } }, "mini-create-react-context": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.3.2.tgz", - "integrity": "sha512-2v+OeetEyliMt5VHMXsBhABoJ0/M4RCe7fatd/fBy6SMiKazUSEt3gxxypfnk2SHMkdBYvorHRoQxuGoiwbzAw==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/mini-create-react-context/-/mini-create-react-context-0.4.0.tgz", + "integrity": "sha512-b0TytUgFSbgFJGzJqXPKCFCBWigAjpjo+Fl7Vf7ZbKRDptszpppKxXH6DRXEABZ/gcEQczeb0iZ7JvL8e8jjCA==", "requires": { - "@babel/runtime": "^7.4.0", - "gud": "^1.0.0", - "tiny-warning": "^1.0.2" + "@babel/runtime": "^7.5.5", + "tiny-warning": "^1.0.3" } }, "mini-css-extract-plugin": { @@ -15761,6 +15673,13 @@ "prop-types": "^15.6.0", "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.0.2" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", + "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" + } } }, "minimalistic-assert": { @@ -15957,9 +15876,9 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "mutationobserver-shim": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz", - "integrity": "sha512-gciOLNN8Vsf7YzcqRjKzlAJ6y7e+B86u7i3KXes0xfxx/nfLmozlW1Vn+Sc9x3tPIePFgc1AeIFhtRgkqTjzDQ==" + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz", + "integrity": "sha512-oRIDTyZQU96nAiz2AQyngwx1e89iApl2hN5AOYwyxLUB47UYsU3Wv9lJWqH5y/QdiYkc5HQLi23ZNB3fELdHcQ==" }, "mute-stream": { "version": "0.0.7", @@ -16244,9 +16163,9 @@ "dev": true }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true }, "oauth-sign": { @@ -16938,9 +16857,9 @@ "dev": true }, "path-to-regexp": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", - "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", "requires": { "isarray": "0.0.1" } @@ -17405,9 +17324,9 @@ "dev": true }, "process": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz", - "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=", + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", "dev": true }, "process-nextick-args": { @@ -17913,9 +17832,9 @@ } }, "rc-calendar": { - "version": "9.15.8", - "resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-9.15.8.tgz", - "integrity": "sha512-x3zVaZSRX7FkRNKw7nz3tutwrlIrU1aqMn5GtRUmlf84GnXLtd9fuuydxeNkFWfcHry3BPSto7+r9TK2al0h+g==", + "version": "9.15.11", + "resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-9.15.11.tgz", + "integrity": "sha512-qv0VXfAAnysMWJigxaP6se4bJHvr17D9qsLbi8BOpdgEocsS0RkgY1IUiFaOVYKJDy/EyLC447O02sV/y5YYBg==", "requires": { "babel-runtime": "6.x", "classnames": "2.x", @@ -17952,9 +17871,9 @@ } }, "rc-collapse": { - "version": "1.11.7", - "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-1.11.7.tgz", - "integrity": "sha512-ge3EEzIFtrDGuPX4bxXdQqwb91JnPIdj3B+FU88yNOUeOroNuA2q9kVK+UatpQ1Eft5hNo/ICTDrVFi8+685ng==", + "version": "1.11.8", + "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-1.11.8.tgz", + "integrity": "sha512-8EhfPyScTYljkbRuIoHniSwZagD5UPpZ3CToYgoNYWC85L2qCbPYF7+OaC713FOrIkp6NbfNqXsITNxmDAmxog==", "requires": { "classnames": "2.x", "css-animation": "1.x", @@ -17966,13 +17885,13 @@ } }, "rc-dialog": { - "version": "7.5.13", - "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-7.5.13.tgz", - "integrity": "sha512-tmubIipW/qoCmRlHHV8tpepDaFhuhk+SeSFSyRhNKW4mYgflsEYQmYWilyCJHy6UzKl84bSyFvJskhc1z1Hniw==", + "version": "7.6.1", + "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-7.6.1.tgz", + "integrity": "sha512-KUKf+2eZ4YL+lnXMG3hR4ZtIhC9glfH27NtTVz3gcoDIPAf3uUvaXVRNoDCiSi+OGKLyIb/b6EoidFh6nQC5Wg==", "requires": { "babel-runtime": "6.x", "rc-animate": "2.x", - "rc-util": "^4.8.1" + "rc-util": "^4.16.1" }, "dependencies": { "add-dom-event-listener": { @@ -17984,27 +17903,31 @@ } }, "rc-util": { - "version": "4.15.7", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.15.7.tgz", - "integrity": "sha512-9pn2NU7IafaP0Hbtll7Ufu9eF9odDOMGMI/WD9lgD4yrm3xR4yCAWZ0cqQGIhKMqdkg3I7et7/dTekrftMeqJQ==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz", + "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==", "requires": { "add-dom-event-listener": "^1.1.0", - "babel-runtime": "6.x", "prop-types": "^15.5.10", + "react-is": "^16.12.0", "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.1.0" } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" } } }, "rc-drawer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-3.0.2.tgz", - "integrity": "sha512-oPScGXB/8/ov9gEFLxPH8RBv/9jLTZboZtyF/GgrrnCAvbFwUxXdELH6n6XIowmuDKKvTGIMgZdnao0T46Yv3A==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-3.1.3.tgz", + "integrity": "sha512-2z+RdxmzXyZde/1OhVMfDR1e/GBswFeWSZ7FS3Fdd0qhgVdpV1wSzILzzxRaT481ItB5hOV+e8pZT07vdJE8kg==", "requires": { - "babel-runtime": "^6.26.0", "classnames": "^2.2.6", - "rc-util": "^4.11.2", + "rc-util": "^4.16.1", "react-lifecycles-compat": "^3.0.4" }, "dependencies": { @@ -18017,16 +17940,21 @@ } }, "rc-util": { - "version": "4.15.7", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.15.7.tgz", - "integrity": "sha512-9pn2NU7IafaP0Hbtll7Ufu9eF9odDOMGMI/WD9lgD4yrm3xR4yCAWZ0cqQGIhKMqdkg3I7et7/dTekrftMeqJQ==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz", + "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==", "requires": { "add-dom-event-listener": "^1.1.0", - "babel-runtime": "6.x", "prop-types": "^15.5.10", + "react-is": "^16.12.0", "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.1.0" } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" } } }, @@ -18101,40 +18029,29 @@ "object-assign": "4.x" } }, - "hoist-non-react-statics": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", - "integrity": "sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==", - "requires": { - "react-is": "^16.7.0" - } - }, "rc-util": { - "version": "4.15.7", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.15.7.tgz", - "integrity": "sha512-9pn2NU7IafaP0Hbtll7Ufu9eF9odDOMGMI/WD9lgD4yrm3xR4yCAWZ0cqQGIhKMqdkg3I7et7/dTekrftMeqJQ==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz", + "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==", "requires": { "add-dom-event-listener": "^1.1.0", - "babel-runtime": "6.x", "prop-types": "^15.5.10", + "react-is": "^16.12.0", "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.1.0" } }, - "warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "requires": { - "loose-envify": "^1.0.0" - } + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" } } }, "rc-hammerjs": { - "version": "0.6.9", - "resolved": "https://registry.npmjs.org/rc-hammerjs/-/rc-hammerjs-0.6.9.tgz", - "integrity": "sha512-4llgWO3RgLyVbEqUdGsDfzUDqklRlQW5VEhE3x35IvhV+w//VPRG34SBavK3D2mD/UaLKaohgU41V4agiftC8g==", + "version": "0.6.10", + "resolved": "https://registry.npmjs.org/rc-hammerjs/-/rc-hammerjs-0.6.10.tgz", + "integrity": "sha512-Vgh9qIudyN5CHRop4M+v+xUniQBFWXKrsJxQRVtJOi2xgRrCeI52/bkpaL5HWwUhqTK9Ayq0n7lYTItT6ld5rg==", "requires": { "babel-runtime": "6.x", "hammerjs": "^2.0.8", @@ -18142,9 +18059,9 @@ } }, "rc-input-number": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-4.5.1.tgz", - "integrity": "sha512-grO7/Lau7iv3NyHVyCajE1LuGLqGkG1tEAAZSwm9M0esYfrwXVSip4qhb5sF+8g6ACsiI20sOVLIihXuhSoifA==", + "version": "4.5.7", + "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-4.5.7.tgz", + "integrity": "sha512-99PrQ90sTOKyyj7eu0VzwxY17xQ+bwG1XTQd+bTwFQ+IOUkIw7L4qSAYxt58sVYL+Cw+bu/RAtT2IpT9yC2pCQ==", "requires": { "babel-runtime": "6.x", "classnames": "^2.2.0", @@ -18154,9 +18071,9 @@ } }, "rc-mentions": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-0.4.1.tgz", - "integrity": "sha512-XSJp6kcEPydUaM0I/gnxpXggiKgA5FjgFPKZCMQBDQJYUjXpQNyg5ogNkOJt1/4B2P7pwbYPZXgxP/30yZVahA==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-0.4.2.tgz", + "integrity": "sha512-DTZurQzacLXOfVuiHydGzqkq7cFMHXF18l2jZ9PhWUn2cqvOSY3W4osN0Pq29AOMOBpcxdZCzgc7Lb0r/bgkDw==", "requires": { "@ant-design/create-react-context": "^0.2.4", "classnames": "^2.2.6", @@ -18175,23 +18092,28 @@ } }, "rc-util": { - "version": "4.15.7", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.15.7.tgz", - "integrity": "sha512-9pn2NU7IafaP0Hbtll7Ufu9eF9odDOMGMI/WD9lgD4yrm3xR4yCAWZ0cqQGIhKMqdkg3I7et7/dTekrftMeqJQ==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz", + "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==", "requires": { "add-dom-event-listener": "^1.1.0", - "babel-runtime": "6.x", "prop-types": "^15.5.10", + "react-is": "^16.12.0", "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.1.0" } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" } } }, "rc-menu": { - "version": "7.5.3", - "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-7.5.3.tgz", - "integrity": "sha512-H/jUyGbJxZI/iuVdC6Iu9KHfz7tucoqK0Vn8ahDnv+ppc1PnKb4SkBbXn5LrmUyaj7thCBiaktBxVnUXSmNE2g==", + "version": "7.5.5", + "resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-7.5.5.tgz", + "integrity": "sha512-4YJXJgrpUGEA1rMftXN7bDhrV5rPB8oBJoHqT+GVXtIWCanfQxEnM3fmhHQhatL59JoAFMZhJaNzhJIk4FUWCQ==", "requires": { "classnames": "2.x", "dom-scroll-into-view": "1.x", @@ -18213,9 +18135,9 @@ } }, "rc-animate": { - "version": "2.10.2", - "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.10.2.tgz", - "integrity": "sha512-cE/A7piAzoWFSgUD69NmmMraqCeqVBa51UErod8NS3LUEqWfppSVagHfa0qHAlwPVPiIBg3emRONyny3eiH0Dg==", + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.11.1.tgz", + "integrity": "sha512-1NyuCGFJG/0Y+9RKh5y/i/AalUCA51opyyS/jO2seELpgymZm2u9QV3xwODwEuzkmeQ1BDPxMLmYLcTJedPlkQ==", "requires": { "babel-runtime": "6.x", "classnames": "^2.2.6", @@ -18227,16 +18149,21 @@ } }, "rc-util": { - "version": "4.15.7", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.15.7.tgz", - "integrity": "sha512-9pn2NU7IafaP0Hbtll7Ufu9eF9odDOMGMI/WD9lgD4yrm3xR4yCAWZ0cqQGIhKMqdkg3I7et7/dTekrftMeqJQ==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz", + "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==", "requires": { "add-dom-event-listener": "^1.1.0", - "babel-runtime": "6.x", "prop-types": "^15.5.10", + "react-is": "^16.12.0", "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.1.0" } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" } } }, @@ -18253,9 +18180,9 @@ } }, "rc-pagination": { - "version": "1.20.11", - "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-1.20.11.tgz", - "integrity": "sha512-2wKO5kO+ELx1/zlqTY8TwGBruzofi+1BcZ7Z4xalMlLbDMTuUU4FDljbBBP/n9D2llK+NtgWA619PMBhInozZw==", + "version": "1.20.15", + "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-1.20.15.tgz", + "integrity": "sha512-/Xr4/3GOa1DtL8iCYl7qRUroEMrRDhZiiuHwcVFfSiwa9LYloMlUWcOJsnr8LN6A7rLPdm3/CHStUNeYd+2pKw==", "requires": { "babel-runtime": "6.x", "classnames": "^2.2.6", @@ -18264,18 +18191,18 @@ } }, "rc-progress": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-2.5.2.tgz", - "integrity": "sha512-ajI+MJkbBz9zYDuE9GQsY5gsyqPF7HFioZEDZ9Fmc+ebNZoiSeSJsTJImPFCg0dW/5WiRGUy2F69SX1aPtSJgA==", + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-2.5.3.tgz", + "integrity": "sha512-K2fa4CnqGehLZoMrdmBeZ86ONSTVcdk5FlqetbwJ3R/+42XfqhwQVOjWp2MH4P7XSQOMAGcNOy1SFfCP3415sg==", "requires": { "babel-runtime": "6.x", "prop-types": "^15.5.8" } }, "rc-rate": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.5.0.tgz", - "integrity": "sha512-aXX5klRqbVZxvLghcKnLqqo7LvLVCHswEDteWsm5Gb7NBIPa1YKTcAbvb5SZ4Z4i4EeRoZaPwygRAWsQgGtbKw==", + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.5.1.tgz", + "integrity": "sha512-3iJkNJT8xlHklPCdeZtUZmJmRVUbr6AHRlfSsztfYTXVlHrv2TcPn3XkHsH+12j812WVB7gvilS2j3+ffjUHXg==", "requires": { "classnames": "^2.2.5", "prop-types": "^15.5.8", @@ -18302,23 +18229,28 @@ } }, "rc-util": { - "version": "4.15.7", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.15.7.tgz", - "integrity": "sha512-9pn2NU7IafaP0Hbtll7Ufu9eF9odDOMGMI/WD9lgD4yrm3xR4yCAWZ0cqQGIhKMqdkg3I7et7/dTekrftMeqJQ==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz", + "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==", "requires": { "add-dom-event-listener": "^1.1.0", - "babel-runtime": "6.x", "prop-types": "^15.5.10", + "react-is": "^16.12.0", "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.1.0" } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" } } }, "rc-select": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-9.2.1.tgz", - "integrity": "sha512-nW/Zr2OCgxN26OX8ff3xcO1wK0e1l5ixnEfyN15Rbdk7TNI/rIPJIjPCQAoihRpk9A2C/GH8pahjlvKV1Vj++g==", + "version": "9.2.3", + "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-9.2.3.tgz", + "integrity": "sha512-WhswxOMWiNnkXRbxyrj0kiIvyCfo/BaRPaYbsDetSIAU2yEDwKHF798blCP5u86KLOBKBvtxWLFCkSsQw1so5w==", "requires": { "babel-runtime": "^6.23.0", "classnames": "2.x", @@ -18332,16 +18264,6 @@ "rc-util": "^4.0.4", "react-lifecycles-compat": "^3.0.2", "warning": "^4.0.2" - }, - "dependencies": { - "warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "requires": { - "loose-envify": "^1.0.0" - } - } } }, "rc-slider": { @@ -18357,16 +18279,6 @@ "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.1.0", "warning": "^4.0.3" - }, - "dependencies": { - "warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "requires": { - "loose-envify": "^1.0.0" - } - } } }, "rc-steps": { @@ -18391,9 +18303,9 @@ } }, "rc-table": { - "version": "6.9.5", - "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-6.9.5.tgz", - "integrity": "sha512-STL6387A/izVh6r9F1WDiIIZ0QeubCdTgIlzMeGTSl/bXhB0VqjAZEikvoijPoauTjJIkIzVuQEIDjOhAWbpkQ==", + "version": "6.10.15", + "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-6.10.15.tgz", + "integrity": "sha512-LAr0M/gqt+irOjvPNBLApmQ0CUHNOfKsEBhu1uIuB3OlN1ynA9z+sdoTQyNd9+8NSl0MYnQOOfhtLChAY7nU0A==", "requires": { "classnames": "^2.2.5", "component-classes": "^1.2.6", @@ -18414,16 +18326,21 @@ } }, "rc-util": { - "version": "4.15.7", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.15.7.tgz", - "integrity": "sha512-9pn2NU7IafaP0Hbtll7Ufu9eF9odDOMGMI/WD9lgD4yrm3xR4yCAWZ0cqQGIhKMqdkg3I7et7/dTekrftMeqJQ==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz", + "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==", "requires": { "add-dom-event-listener": "^1.1.0", - "babel-runtime": "6.x", "prop-types": "^15.5.10", + "react-is": "^16.12.0", "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.1.0" } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" } } }, @@ -18443,22 +18360,12 @@ "react-lifecycles-compat": "^3.0.4", "resize-observer-polyfill": "^1.5.1", "warning": "^4.0.3" - }, - "dependencies": { - "warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "requires": { - "loose-envify": "^1.0.0" - } - } } }, "rc-time-picker": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/rc-time-picker/-/rc-time-picker-3.7.2.tgz", - "integrity": "sha512-UVWO9HXGyZoM4I2THlJsEAFcZQz+tYwdcpoHXCEFZsRLz9L2+7vV4EMp9Wa3UrtzMFEt83qSAX/90dCJeKl9sg==", + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/rc-time-picker/-/rc-time-picker-3.7.3.tgz", + "integrity": "sha512-Lv1Mvzp9fRXhXEnRLO4nW6GLNxUkfAZ3RsiIBsWjGjXXvMNjdr4BX/ayElHAFK0DoJqOhm7c5tjmIYpEOwcUXg==", "requires": { "classnames": "2.x", "moment": "2.x", @@ -18479,9 +18386,9 @@ } }, "rc-tree": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-2.1.3.tgz", - "integrity": "sha512-COvV65spQ6omrHBUhHRKqKNL5+ddXjlS+qWZchaL9FFuQNvjM5pjp9RnmMWK4fJJ5kBhhpLneh6wh9Vh3kSMXQ==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-2.1.4.tgz", + "integrity": "sha512-Xey794Iavgs8YldFlXcZLOhfcIhlX5Oz/yfKufknBXf2AlZCOkc7aHqSM9uTF7fBPtTGPhPxNEfOqHfY7b7xng==", "requires": { "@ant-design/create-react-context": "^0.2.4", "classnames": "2.x", @@ -18501,9 +18408,9 @@ } }, "rc-animate": { - "version": "2.10.2", - "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.10.2.tgz", - "integrity": "sha512-cE/A7piAzoWFSgUD69NmmMraqCeqVBa51UErod8NS3LUEqWfppSVagHfa0qHAlwPVPiIBg3emRONyny3eiH0Dg==", + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.11.1.tgz", + "integrity": "sha512-1NyuCGFJG/0Y+9RKh5y/i/AalUCA51opyyS/jO2seELpgymZm2u9QV3xwODwEuzkmeQ1BDPxMLmYLcTJedPlkQ==", "requires": { "babel-runtime": "6.x", "classnames": "^2.2.6", @@ -18515,41 +18422,38 @@ }, "dependencies": { "rc-util": { - "version": "4.15.7", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.15.7.tgz", - "integrity": "sha512-9pn2NU7IafaP0Hbtll7Ufu9eF9odDOMGMI/WD9lgD4yrm3xR4yCAWZ0cqQGIhKMqdkg3I7et7/dTekrftMeqJQ==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz", + "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==", "requires": { "add-dom-event-listener": "^1.1.0", - "babel-runtime": "6.x", "prop-types": "^15.5.10", + "react-is": "^16.12.0", "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.1.0" } } } }, - "warning": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", - "requires": { - "loose-envify": "^1.0.0" - } + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" } } }, "rc-tree-select": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-2.9.1.tgz", - "integrity": "sha512-AfJQC1ZzaeH+Onmx84TtVLUL2guBZe7exA8XSfj1RRB1doDbYGTtybzpP3CEw/tuSftSRnz+iPt+iaxRTrgXRw==", + "version": "2.9.4", + "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-2.9.4.tgz", + "integrity": "sha512-0HQkXAN4XbfBW20CZYh3G+V+VMrjX42XRtDCpyv6PDUm5vikC0Ob682ZBCVS97Ww2a5Hf6Ajmu0ahWEdIEpwhg==", "requires": { "classnames": "^2.2.1", "dom-scroll-into-view": "^1.2.1", "prop-types": "^15.5.8", "raf": "^3.4.0", "rc-animate": "^2.8.2", - "rc-tree": "~2.0.0", - "rc-trigger": "^3.0.0-rc.2", + "rc-tree": "~2.1.0", + "rc-trigger": "^3.0.0", "rc-util": "^4.5.0", "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.0.2", @@ -18564,24 +18468,10 @@ "object-assign": "4.x" } }, - "fbjs": { - "version": "0.8.17", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", - "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", - "requires": { - "core-js": "^1.0.0", - "isomorphic-fetch": "^2.1.1", - "loose-envify": "^1.0.0", - "object-assign": "^4.1.0", - "promise": "^7.1.1", - "setimmediate": "^1.0.5", - "ua-parser-js": "^0.7.18" - } - }, "rc-animate": { - "version": "2.10.2", - "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.10.2.tgz", - "integrity": "sha512-cE/A7piAzoWFSgUD69NmmMraqCeqVBa51UErod8NS3LUEqWfppSVagHfa0qHAlwPVPiIBg3emRONyny3eiH0Dg==", + "version": "2.11.1", + "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.11.1.tgz", + "integrity": "sha512-1NyuCGFJG/0Y+9RKh5y/i/AalUCA51opyyS/jO2seELpgymZm2u9QV3xwODwEuzkmeQ1BDPxMLmYLcTJedPlkQ==", "requires": { "babel-runtime": "6.x", "classnames": "^2.2.6", @@ -18593,47 +18483,23 @@ }, "dependencies": { "rc-util": { - "version": "4.15.7", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.15.7.tgz", - "integrity": "sha512-9pn2NU7IafaP0Hbtll7Ufu9eF9odDOMGMI/WD9lgD4yrm3xR4yCAWZ0cqQGIhKMqdkg3I7et7/dTekrftMeqJQ==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz", + "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==", "requires": { "add-dom-event-listener": "^1.1.0", - "babel-runtime": "6.x", "prop-types": "^15.5.10", + "react-is": "^16.12.0", "react-lifecycles-compat": "^3.0.4", "shallowequal": "^1.1.0" } } } }, - "rc-tree": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-2.0.0.tgz", - "integrity": "sha512-DAT/jsbnFbHqG9Df9OaVG93CAVtTsJVnJiwKX+wqsG8TChpty3s6QX3zJZ+gBgjkq4ikLbu1kuFJtX63EKhSAA==", - "requires": { - "babel-runtime": "^6.23.0", - "classnames": "2.x", - "prop-types": "^15.5.8", - "rc-animate": "^2.6.0", - "rc-util": "^4.5.1", - "react-lifecycles-compat": "^3.0.4", - "warning": "^3.0.0" - }, - "dependencies": { - "warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", - "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", - "requires": { - "loose-envify": "^1.0.0" - } - } - } - }, "rc-trigger": { - "version": "3.0.0-rc.3", - "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-3.0.0-rc.3.tgz", - "integrity": "sha512-4vB6cpxcUdm2qO5VtB9q1TZz0MoWm9BzFLvGknulphGrl1qI6uxUsPDCvqnmujdpDdAKGGfjxntFpA7RtAwkFQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-3.0.0.tgz", + "integrity": "sha512-hQxbbJpo23E2QnYczfq3Ec5J5tVl2mUDhkqxrEsQAqk16HfADQg+iKNWzEYXyERSncdxfnzYuaBgy764mNRzTA==", "requires": { "babel-runtime": "6.x", "classnames": "^2.2.6", @@ -18641,25 +18507,38 @@ "raf": "^3.4.0", "rc-align": "^2.4.1", "rc-animate": "^3.0.0-rc.1", - "rc-util": "^4.4.0" + "rc-util": "^4.15.7" }, "dependencies": { "rc-animate": { - "version": "3.0.0-rc.6", - "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.0.0-rc.6.tgz", - "integrity": "sha512-oBLPpiT6Q4t6YvD/pkLcmofBP1p01TX0Otse8Q4+Mxt8J+VSDflLZGIgf62EwkvRwsQUkLPjZVFBsldnPKLzjg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.1.1.tgz", + "integrity": "sha512-8wg2Zg3EETy0k/9kYuis30NJNQg1D6/WSQwnCiz6SvyxQXNet/rVraRz3bPngwY6rcU2nlRvoShiYOorXyF7Sg==", "requires": { - "babel-runtime": "6.x", - "classnames": "^2.2.5", - "component-classes": "^1.2.6", - "fbjs": "^0.8.16", - "prop-types": "15.x", + "@ant-design/css-animation": "^1.7.2", + "classnames": "^2.2.6", "raf": "^3.4.0", - "rc-util": "^4.5.0", - "react-lifecycles-compat": "^3.0.4" + "rc-util": "^4.15.3" + } + }, + "rc-util": { + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz", + "integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==", + "requires": { + "add-dom-event-listener": "^1.1.0", + "prop-types": "^15.5.10", + "react-is": "^16.12.0", + "react-lifecycles-compat": "^3.0.4", + "shallowequal": "^1.1.0" } } } + }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" } } }, @@ -18678,9 +18557,9 @@ } }, "rc-upload": { - "version": "2.9.3", - "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-2.9.3.tgz", - "integrity": "sha512-d4pThCff5vriqb2nPnEIoW2HnYgZ5aLtlNmSLGRnpQHWeXeIN/c3SzpEbA4uSj+PjX2T9ye9Utd0iLnWFhIDuQ==", + "version": "2.9.4", + "resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-2.9.4.tgz", + "integrity": "sha512-WXt0HGxXyzLrPV6iec/96Rbl/6dyrAW8pKuY6wwD7yFYwfU5bjgKjv7vC8KNMJ6wzitFrZjnoiogNL3dF9dj3Q==", "requires": { "babel-runtime": "6.x", "classnames": "^2.2.5", @@ -18710,30 +18589,13 @@ } }, "react": { - "version": "16.4.2", - "resolved": "https://registry.npmjs.org/react/-/react-16.4.2.tgz", - "integrity": "sha512-dMv7YrbxO4y2aqnvA7f/ik9ibeLSHQJTI6TrYAenPSaQ6OXfb+Oti+oJiy8WBxgRzlKatYqtCjphTgDSCEiWFg==", + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz", + "integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==", "requires": { - "fbjs": "^0.8.16", "loose-envify": "^1.1.0", "object-assign": "^4.1.1", - "prop-types": "^15.6.0" - }, - "dependencies": { - "fbjs": { - "version": "0.8.17", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", - "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", - "requires": { - "core-js": "^1.0.0", - "isomorphic-fetch": "^2.1.1", - "loose-envify": "^1.0.0", - "object-assign": "^4.1.0", - "promise": "^7.1.1", - "setimmediate": "^1.0.5", - "ua-parser-js": "^0.7.18" - } - } + "prop-types": "^15.6.2" } }, "react-autocomplete": { @@ -18762,9 +18624,9 @@ } }, "react-copy-to-clipboard": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.1.tgz", - "integrity": "sha512-ELKq31/E3zjFs5rDWNCfFL4NvNFQvGRoJdAKReD/rUPA+xxiLPQmZBZBvy2vgH7V0GE9isIQpT9WXbwIVErYdA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.2.tgz", + "integrity": "sha512-/2t5mLMMPuN5GmdXo6TebFa8IoFxZ+KTDDqYhcDm0PhkgEzSxVvIX26G20s1EB02A4h2UZgwtfymZ3lGJm0OLg==", "requires": { "copy-to-clipboard": "^3", "prop-types": "^15.5.8" @@ -18807,30 +18669,14 @@ } }, "react-dom": { - "version": "16.4.2", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.4.2.tgz", - "integrity": "sha512-Usl73nQqzvmJN+89r97zmeUpQDKDlh58eX6Hbs/ERdDHzeBzWy+ENk7fsGQ+5KxArV1iOFPT46/VneklK9zoWw==", + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz", + "integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==", "requires": { - "fbjs": "^0.8.16", "loose-envify": "^1.1.0", "object-assign": "^4.1.1", - "prop-types": "^15.6.0" - }, - "dependencies": { - "fbjs": { - "version": "0.8.17", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", - "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", - "requires": { - "core-js": "^1.0.0", - "isomorphic-fetch": "^2.1.1", - "loose-envify": "^1.0.0", - "object-assign": "^4.1.0", - "promise": "^7.1.1", - "setimmediate": "^1.0.5", - "ua-parser-js": "^0.7.18" - } - } + "prop-types": "^15.6.2", + "scheduler": "^0.19.1" } }, "react-foundation-apps": { @@ -18858,25 +18704,44 @@ } }, "react-highcharts": { - "version": "16.0.2", - "resolved": "https://registry.npmjs.org/react-highcharts/-/react-highcharts-16.0.2.tgz", - "integrity": "sha512-RH56Yv1NvBfo6YTVBF7zyT/i4yCXSyDSK6VyaAcAi3SqOkixB9Ac+81EJK4VMbXi2BEXaYkVTYcV7KVAiQSE7w==", + "version": "16.1.0", + "resolved": "https://registry.npmjs.org/react-highcharts/-/react-highcharts-16.1.0.tgz", + "integrity": "sha512-CHpCSMN96lXKeTIpx8UJPsUgeNeJqh81NN6cbzraiHQBiQz2mzXa5aaIWYbMEQ2NHhAEWU5uj5DPhZY1f1Rq+A==", "requires": { "highcharts": "^6.0.4" } }, "react-hot-loader": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.3.4.tgz", - "integrity": "sha512-LlKjtHq+RhDq9xm6crXojbkzrEvli5F4/RaeJ//XtDWrwwsAHDjEqKfZZiPCxv7gWV2cxE3YE8TXeE9BDzLqOA==", + "version": "4.12.21", + "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.21.tgz", + "integrity": "sha512-Ynxa6ROfWUeKWsTHxsrL2KMzujxJVPjs385lmB2t5cHUxdoRPGind9F00tOkdc1l5WBleOF4XEAMILY1KPIIDA==", "dev": true, "requires": { "fast-levenshtein": "^2.0.6", "global": "^4.3.0", - "hoist-non-react-statics": "^2.5.0", + "hoist-non-react-statics": "^3.3.0", + "loader-utils": "^1.1.0", "prop-types": "^15.6.1", "react-lifecycles-compat": "^3.0.4", - "shallowequal": "^1.0.2" + "shallowequal": "^1.1.0", + "source-map": "^0.7.3" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "dev": true, + "requires": { + "react-is": "^16.7.0" + } + }, + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + } } }, "react-interpolate-component": { @@ -18891,14 +18756,25 @@ } }, "react-intl": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.4.0.tgz", - "integrity": "sha1-ZsFNyd+ac7L7v71gIXJugKYT6xU=", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.9.0.tgz", + "integrity": "sha512-27jnDlb/d2A7mSJwrbOBnUgD+rPep+abmoJE511Tf8BnoONIAUehy/U1zZCHGO17mnOwMWxqN4qC0nW11cD6rA==", "requires": { + "hoist-non-react-statics": "^3.3.0", "intl-format-cache": "^2.0.5", "intl-messageformat": "^2.1.0", - "intl-relativeformat": "^2.0.0", + "intl-relativeformat": "^2.1.0", "invariant": "^2.1.1" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "requires": { + "react-is": "^16.7.0" + } + } } }, "react-is": { @@ -18926,14 +18802,21 @@ } }, "react-lazy-load": { - "version": "3.0.13", - "resolved": "https://registry.npmjs.org/react-lazy-load/-/react-lazy-load-3.0.13.tgz", - "integrity": "sha1-OwqS0zbUPT8Nc8vm81sXBQsIuCQ=", + "version": "3.1.13", + "resolved": "https://registry.npmjs.org/react-lazy-load/-/react-lazy-load-3.1.13.tgz", + "integrity": "sha512-eAVNUn3vhNj79Iv04NOCwy/sCLyqDEhL3j9aJKV7VJuRBDg6rCiB+BIWHuG7VXJGCgb//6nX/soR8PTyWRhFvQ==", "requires": { "eventlistener": "0.0.1", "lodash.debounce": "^4.0.0", "lodash.throttle": "^4.0.0", "prop-types": "^15.5.8" + }, + "dependencies": { + "lodash.throttle": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", + "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=" + } } }, "react-lifecycles-compat": { @@ -18942,19 +18825,18 @@ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "react-loadable": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/react-loadable/-/react-loadable-5.4.0.tgz", - "integrity": "sha512-HAFWL3aLB9dQA6OfGr7ACDNn/mv8jPUmBvXqrhJZfZgRhZysyNW8RupvGUbeGkTO+9frH1LTdJmKWphZENhlJg==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/react-loadable/-/react-loadable-5.5.0.tgz", + "integrity": "sha512-C8Aui0ZpMd4KokxRdVAm2bQtI03k2RMRNzOB+IipV3yxFTSVICv7WoUr5L9ALB5BmKO1iHgZtWM8EvYG83otdg==", "requires": { "prop-types": "^15.5.0" } }, "react-notification-system": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/react-notification-system/-/react-notification-system-0.2.17.tgz", - "integrity": "sha1-pg7du2IiWtj5/F14N1Rr9s2zaBg=", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/react-notification-system/-/react-notification-system-0.4.0.tgz", + "integrity": "sha512-5WhXnjkYC07zqXruCiUXDU9iHjVxZlL1zgHpNgXk91A5ghV1AHrWVrJYo1XM4SnwlKy5NLdftkaTl+pTuVFAqw==", "requires": { - "create-react-class": "^15.5.1", "object-assign": "^4.0.1", "prop-types": "^15.5.6" } @@ -18968,50 +18850,44 @@ } }, "react-perf-devtool": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/react-perf-devtool/-/react-perf-devtool-3.0.8.tgz", - "integrity": "sha512-4SiLWgXkFw7NT4ufSi1j4UJ9K8VrcVHUEaaYL1l4QjeFWwlNoyZgiPLb38GYIsq29BrN2H6Jr1Z4zV59+H1G3Q==", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/react-perf-devtool/-/react-perf-devtool-3.1.8.tgz", + "integrity": "sha512-jBnIr+jPcXTLyWLkGjxoAyB7/n7ojYLG3Az2y6FHEWu6eol9J3Ujx/aVMfY5qqrm2W3cVC/pmEC376Pjdi3f4g==", "dev": true }, "react-popover": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/react-popover/-/react-popover-0.5.7.tgz", - "integrity": "sha512-3eOHnTe8c7UOonSCMWa32nZefn/cn+iLkxNeHQXhxjpX+aPqkKrWssAmAemyVxKZuUkXb5CvHvj99TfLvcq9Zw==", + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/react-popover/-/react-popover-0.5.10.tgz", + "integrity": "sha512-5SYDTfncywSH00I70oHd4gFRUR8V0rJ4sRADSI/P6G0RVXp9jUgaWloJ0Bk+SFnjpLPuipTKuzQNNd2CTs5Hrw==", "requires": { "css-vendor": "^0.3.1", "debug": "^2.6.8", "lodash.throttle": "^3.0.3", "prop-types": "^15.5.10" + } + }, + "react-qr-reader": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-2.2.1.tgz", + "integrity": "sha512-EL5JEj53u2yAOgtpAKAVBzD/SiKWn0Bl7AZy6ZrSf1lub7xHwtaXe6XSx36Wbhl1VMGmvmrwYMRwO1aSCT2fwA==", + "requires": { + "jsqr": "^1.2.0", + "prop-types": "^15.7.2", + "webrtc-adapter": "^7.2.1" }, "dependencies": { - "lodash.debounce": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.1.1.tgz", - "integrity": "sha1-gSIRw3ipTMKdWqTjNGzwv846ffU=", - "requires": { - "lodash._getnative": "^3.0.0" - } - }, - "lodash.throttle": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-3.0.4.tgz", - "integrity": "sha1-vE9HH7Mo5Nb9xt8rPTyvET8Pick=", + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", "requires": { - "lodash.debounce": "^3.0.0" + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" } } } }, - "react-qr-reader": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-2.1.0.tgz", - "integrity": "sha512-B/1xHv1IAnZqUSR0l0JEJnam4zll1aNgPRVau+Gw8pAFcTAsYXu44JzN/hW1gUdI7BHAP9klYj7tEy4mwOvqtQ==", - "requires": { - "jsqr": "^1.0.1", - "prop-types": "^15.5.8", - "webrtc-adapter": "^6.1.1" - } - }, "react-responsive-mixin": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/react-responsive-mixin/-/react-responsive-mixin-0.4.0.tgz", @@ -19023,39 +18899,60 @@ } }, "react-router": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz", - "integrity": "sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz", + "integrity": "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw==", "requires": { - "history": "^4.7.2", - "hoist-non-react-statics": "^2.5.0", - "invariant": "^2.2.4", + "@babel/runtime": "^7.1.2", + "history": "^4.9.0", + "hoist-non-react-statics": "^3.1.0", "loose-envify": "^1.3.1", + "mini-create-react-context": "^0.4.0", "path-to-regexp": "^1.7.0", - "prop-types": "^15.6.1", - "warning": "^4.0.1" + "prop-types": "^15.6.2", + "react-is": "^16.6.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0" } }, "react-router-dom": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.3.1.tgz", - "integrity": "sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz", + "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==", "requires": { - "history": "^4.7.2", - "invariant": "^2.2.4", + "@babel/runtime": "^7.1.2", + "history": "^4.9.0", "loose-envify": "^1.3.1", - "prop-types": "^15.6.1", - "react-router": "^4.3.1", - "warning": "^4.0.1" + "prop-types": "^15.6.2", + "react-router": "5.2.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0" } }, "react-scroll": { - "version": "1.7.10", - "resolved": "https://registry.npmjs.org/react-scroll/-/react-scroll-1.7.10.tgz", - "integrity": "sha512-7K1caXF19PQ/jck+QRCdRMytqWei1ktv7jtcsgMap2s55pGOUc/a5phr4loajZRFRx3qKj9Tz12KDtELp91xMg==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/react-scroll/-/react-scroll-1.8.1.tgz", + "integrity": "sha512-UAKmawFHn+c7x/DoXuHqOsQ5xwNk2Dxv7vP8Ft41K2hglPWkshcSos0tMTr8704UkFqImoUGzMTdN4vuZXoqbw==", "requires": { "lodash.throttle": "^4.1.1", - "prop-types": "^15.5.8" + "prop-types": "^15.7.2" + }, + "dependencies": { + "lodash.throttle": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", + "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=" + }, + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + } } }, "react-slick": { @@ -19089,11 +18986,10 @@ } }, "react-tooltip": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-3.6.1.tgz", - "integrity": "sha512-4NVjHNIx1ZazFYBNP044DHW0cr95Qaq0DSwWbrEQ7VyE8AxemHDjp0DoYvV8wilK9vR9jMlSwDW6ebRgbk3aHw==", + "version": "3.11.6", + "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-3.11.6.tgz", + "integrity": "sha512-nTc1yHHaPCHHURvMpf/VNF17pIZiU4zwUGFJBUVr1fZkezFC7E0VPMMVrCfDjt+IpwTHICyzlyx+1FiQ7lw5LQ==", "requires": { - "classnames": "^2.2.5", "prop-types": "^15.6.0" } }, @@ -19579,9 +19475,9 @@ }, "dependencies": { "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", "dev": true } } @@ -19691,9 +19587,9 @@ "dev": true }, "resolve-pathname": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-2.2.0.tgz", - "integrity": "sha512-bAFz9ld18RzJfddgrO2e/0S2O81710++chRMUxHjXOYKF6jTAMrUNZrEZ1PvV0zlhfjidm08iRPdTLPno1FuRg==" + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz", + "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==" }, "resolve-url": { "version": "0.2.1", @@ -19755,9 +19651,9 @@ "dev": true }, "rtcpeerconnection-shim": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.13.tgz", - "integrity": "sha512-Xz4zQLZNs9lFBvqbaHGIjLWtyZ1V82ec5r+WNEo7NlIx3zF5M3ytn9mkkfYeZmpE032cNg3Vvf0rP8kNXUNd9w==", + "version": "1.2.15", + "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.15.tgz", + "integrity": "sha512-C6DxhXt7bssQ1nHb154lqeL0SXz5Dx4RczXZu2Aa/L1NJFnEVDxFwCBo3fqtuljhHIGceg5JKBV4XJ0gW5JKyw==", "requires": { "sdp": "^2.6.0" } @@ -20064,9 +19960,9 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "scheduler": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.18.0.tgz", - "integrity": "sha512-agTSHR1Nbfi6ulI0kYNK0203joW2Y5W4po4l+v03tOoiJKpTBbxpNhWDvqc/4IcOw+KLmSiQLTasZ4cab2/UWQ==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1" @@ -20139,9 +20035,9 @@ } }, "sdp": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/sdp/-/sdp-2.8.0.tgz", - "integrity": "sha512-wRSES07rAwKWAR7aev9UuClT7kdf9ZTdeUK5gTgHue9vlhs19Fbm3ccNEGJO4y2IitH4/JzS4sdzyPl6H2KQLw==" + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/sdp/-/sdp-2.12.0.tgz", + "integrity": "sha512-jhXqQAQVM+8Xj5EjJGVweuEzgtGWb3tmEEpl3CLP3cStInSbVHSg0QWOGQzNq8pSID4JkpeV2mPqlMDLrm0/Vw==" }, "secure-random": { "version": "1.1.1", @@ -20282,9 +20178,9 @@ } }, "shallow-equal": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.0.tgz", - "integrity": "sha512-Z21pVxR4cXsfwpMKMhCEIO1PCi5sp7KEp+CmOpBQ+E8GpHwKOw2sEzk7sgblM3d/j4z4gakoWEoPcjK0VJQogA==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz", + "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA==" }, "shallowequal": { "version": "1.1.0", @@ -20458,8 +20354,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true } } @@ -21222,16 +21117,16 @@ } }, "terser-webpack-plugin": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz", - "integrity": "sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==", + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz", + "integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==", "dev": true, "requires": { "cacache": "^12.0.2", "find-cache-dir": "^2.1.0", "is-wsl": "^1.1.0", "schema-utils": "^1.0.0", - "serialize-javascript": "^2.1.2", + "serialize-javascript": "^4.0.0", "source-map": "^0.6.1", "terser": "^4.1.2", "webpack-sources": "^1.4.0", @@ -21239,9 +21134,9 @@ }, "dependencies": { "ajv": { - "version": "6.12.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", - "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "version": "6.12.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", + "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -21286,9 +21181,9 @@ "dev": true }, "fast-deep-equal": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", - "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, "find-cache-dir": { @@ -21433,6 +21328,15 @@ "once": "^1.3.1" } }, + "randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "requires": { + "safe-buffer": "^5.1.0" + } + }, "rimraf": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", @@ -21460,10 +21364,13 @@ "dev": true }, "serialize-javascript": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz", - "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==", - "dev": true + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } }, "source-map": { "version": "0.6.1", @@ -21499,15 +21406,6 @@ "source-map": "~0.6.1" } }, - "worker-farm": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz", - "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==", - "dev": true, - "requires": { - "errno": "~0.1.7" - } - }, "yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", @@ -21689,9 +21587,9 @@ "integrity": "sha512-2NM0auVBGft5tee/OxP4PI3d8WItkDM+fPnaRAVo6xTDI2knbz9eC5ArWGqtGlYqiH3RU5yMpdyTTO7MguC4ow==" }, "tiny-invariant": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.6.tgz", - "integrity": "sha512-FOyLWWVjG+aC0UqG76V53yAWdXfH8bO6FNmyZOuUrzDzK8DI3/JRY25UD7+g49JWM1LXwymsKERB+DzI0dTEQA==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.1.0.tgz", + "integrity": "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw==" }, "tiny-warning": { "version": "1.0.3", @@ -21699,9 +21597,9 @@ "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==" }, "tinycolor2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz", - "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=" + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz", + "integrity": "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA==" }, "tmp": { "version": "0.0.33", @@ -22548,9 +22446,9 @@ } }, "value-equal": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-0.4.0.tgz", - "integrity": "sha512-x+cYdNnaA3CxvMaTX0INdTCN8m8aF2uY9BvEqmxuYp8bL09cs/kWVQPVGcA35fMktdOsP69IgU7wFj/61dJHEw==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz", + "integrity": "sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==" }, "vary": { "version": "1.1.2", @@ -22596,9 +22494,9 @@ } }, "warning": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.1.tgz", - "integrity": "sha512-rAVtTNZw+cQPjvGp1ox0XC5Q2IBFyqoqh+QII4J/oguyu83Bax1apbo2eqB8bHRS+fqYUBagys6lqUoVwKSmXQ==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", "requires": { "loose-envify": "^1.0.0" } @@ -23303,12 +23201,12 @@ } }, "webrtc-adapter": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-6.3.2.tgz", - "integrity": "sha512-7pFMXpZCka7ScIQyk8Wo+fOr3OlKLtGd6YHqkHVT74zerpY2Siyds8sxsmkE0bNqsi/J1b0vDzN7WpB34dQzAA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-7.7.0.tgz", + "integrity": "sha512-7Bp9OBnx642oJRkom1tNAbeJjUadAq2rh5xLL9YXPw5hVyt2h4hHr5bcoPYDs1stp/mZHSPSQA34YISdnr0DBQ==", "requires": { - "rtcpeerconnection-shim": "^1.2.10", - "sdp": "^2.7.0" + "rtcpeerconnection-shim": "^1.2.15", + "sdp": "^2.12.0" } }, "whatwg-encoding": { diff --git a/package.json b/package.json index f9f1d228bc..2e607480d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "BitShares2-light", - "version": "3.3.191120-rc1", + "version": "4.0.0", "description": "Reference UI to showcase all features of the BitShares blockchain.", "homepage": "https://github.com/bitshares/bitshares-ui", "author": "BitShares UI Worker ", @@ -144,8 +144,8 @@ "alt-react": "git+https://github.com/bitshares/alt-react.git#d91addef51f58e41e9857ebb0dd9177cfbd3b583", "bignumber.js": "^4.0.0", "bitshares-report": "git+https://github.com/bitshares/bitshares-report.git#bba397fc7b4eb903d1ca109ac33301e9d2e2d753", - "bitshares-ui-style-guide": "git+https://github.com/bitshares/bitshares-ui-style-guide.git#23ca108d47442dc70634797fb113d1e751e9b1cb", - "bitsharesjs": "git+https://github.com/bitshares/bitsharesjs.git#c11e86ade64e1d3bc3b61e86ff10796492c10172", + "bitshares-ui-style-guide": "git+https://github.com/bitshares/bitshares-ui-style-guide.git#a17a9f6a89932f288a543b1922af0107aea06218", + "bitsharesjs": "^4.0.0", "browser-locale": "^1.0.3", "classnames": "^2.2.1", "cookies-js": "^1.2.1", @@ -181,26 +181,26 @@ "qrcode": "^1.4.4", "qrcode.react": "^0.7.1", "query-string": "^6.1.0", - "react": "^16.4.1", + "react": "^16.11.0", "react-autocomplete": "^1.7.2", "react-clipboard.js": "^1.0.1", - "react-copy-to-clipboard": "^5.0.1", + "react-copy-to-clipboard": "^5.0.2", "react-datepicker2": "git+https://github.com/bitshares/react-datepicker2.git#9d4c2c28a23c970badcf765c35c5493d5a49afde", "react-debounce-render": "^4.0.2", - "react-dom": "^16.4.1", + "react-dom": "^16.11.0", "react-foundation-apps": "git+https://github.com/bitshares/react-foundation-apps.git", - "react-highcharts": "^16.0", + "react-highcharts": "^16.1.0", "react-interpolate-component": "^0.12.0", - "react-intl": "^2.4.0", + "react-intl": "^2.9.0", "react-json-inspector": "^7.1.1", - "react-loadable": "^5.4.0", - "react-notification-system": "^0.2.16", - "react-popover": "^0.5.7", - "react-qr-reader": "^2.1.0", + "react-loadable": "^5.5.0", + "react-notification-system": "^0.4.0", + "react-popover": "^0.5.10", + "react-qr-reader": "^2.2.1", "react-responsive-mixin": "^0.4.0", - "react-router-dom": "^4.3.1", - "react-scroll": "^1.7.9", - "react-tooltip": "^3.6.1", + "react-router-dom": "^5.1.2", + "react-scroll": "^1.8.1", + "react-tooltip": "^3.11.6", "react-transition-group": "^1.2.0", "react-translate-component": "^0.15.1", "steem-js-api": "^0.7.1", @@ -232,8 +232,8 @@ "copyfiles": "^1.2.0", "cross-env": "^5.0.5", "css-loader": "^2.1.1", - "electron": "^2.0.13", - "electron-builder": "^20.40.2", + "electron": "2.0.13", + "electron-builder": "20.40.2", "es6-promise": "^3.0.2", "eslint": "^4.19.0", "eslint-plugin-json": "^1.2.0", @@ -262,8 +262,8 @@ "postcss-loader": "^3.0.0", "prettier": "^1.10.2", "pretty-quick": "^1.4.1", - "react-hot-loader": "^4.3.3", - "react-perf-devtool": "^3.0.7", + "react-hot-loader": "^4.12.21", + "react-perf-devtool": "^3.1.8", "react-sticky-table": "1.2.0", "sass-loader": "^7.0.1", "script-loader": "^0.6.1", From 3b470c3b8cffc1e26838729d176d10f9d1732ce7 Mon Sep 17 00:00:00 2001 From: Abit Date: Wed, 7 Oct 2020 17:45:04 +0200 Subject: [PATCH 075/141] Comment out API node citadel.li The node has been out of sync for months. --- app/api/apiConfig.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 3ec5410af9..fc55317d18 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -281,14 +281,15 @@ export const settingsAPIs = { operator: "bitshares.org", contact: "" }, - { - url: "wss://citadel.li/node", - region: "Western Europe", - country: "Iceland", - location: "Reykjavik", - operator: "CITADEL", - contact: "email:citadel.li;support" - }, + // TODO node is out of sync, recheck later + //{ + // url: "wss://citadel.li/node", + // region: "Western Europe", + // country: "Iceland", + // location: "Reykjavik", + // operator: "CITADEL", + // contact: "email:citadel.li;support" + //}, { url: "wss://api-bts.liondani.com/ws", region: "Western Europe", From a9dafc656a61b0b7e84ed86226ba7102854b1fad Mon Sep 17 00:00:00 2001 From: Abit Date: Wed, 7 Oct 2020 18:17:06 +0200 Subject: [PATCH 076/141] Comment out API node api.bts.ai --- app/api/apiConfig.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index fc55317d18..dc5fb3636b 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -217,14 +217,15 @@ export const settingsAPIs = { operator: "Witness: delegate.freedom", contact: "telegram:eggplant" }, - { - url: "wss://api.bts.ai", - region: "Eastern Asia", - country: "China", - location: "Beijing", - operator: "Witness: witness.hiblockchain", - contact: "telegram:vianull;wechat:strugglingl" - }, + // TODO the owner said it's temporarily closed. Recheck later. + //{ + // url: "wss://api.bts.ai", + // region: "Eastern Asia", + // country: "China", + // location: "Beijing", + // operator: "Witness: witness.hiblockchain", + // contact: "telegram:vianull;wechat:strugglingl" + //}, { url: "wss://bts-seoul.clockwork.gr", region: "Southeastern Asia", From 45f326cb72773fe6783954065b38e0d172f92b8d Mon Sep 17 00:00:00 2001 From: Abit Date: Wed, 7 Oct 2020 21:24:55 +0200 Subject: [PATCH 077/141] Remove a duplicate account from scam list --- app/lib/common/scamAccounts.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 9e19895683..bf5f4a1813 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1229,8 +1229,6 @@ export const scamAccountsOther = [ "1.2.1589838", "committee-security-update", "1.2.1592605", - "committee-accounr", - "1.2.500266", "committee-delegate", "1.2.1621188", "binance-witness", From dc1fac74ddc9e92affb560e76024a8f4de4dbb7d Mon Sep 17 00:00:00 2001 From: Abit Date: Sun, 18 Oct 2020 19:33:47 +0200 Subject: [PATCH 078/141] Add a new account to scam list --- app/lib/common/scamAccounts.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index bf5f4a1813..c81b363946 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -41,6 +41,8 @@ export const scamAccountsBittrex = [ export const scamAccountsOther = [ // "blockchainprojectsbv-test-2", for testing // "1.2.894879", + "aaex-bitcny-deposit-wallet", + "1.2.492535", "aacoin", "1.2.1005892", "abucoins", From aeb6246059b08890fd63068407c8fba903e1eedd Mon Sep 17 00:00:00 2001 From: Ross Walker Date: Thu, 22 Oct 2020 21:59:13 +0100 Subject: [PATCH 079/141] Update apiConfig.js add API node nexus01.co.uk this time with correct regional setting (Northern Europe). --- app/api/apiConfig.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index dc5fb3636b..39a44b6e4d 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -123,6 +123,14 @@ export const settingsAPIs = { url: "ws://127.0.0.1:8090", location: "Locally hosted" }, + { + url: "wss://nexus01.co.uk/ws", + region: "Northern Europe", + country: "England", + location: "Gloucester", + operator: "Witness: nexus01", + contact: "telegram:rosswlkr" + }, { url: "wss://dex.iobanker.com/ws", region: "Western Europe", From 8a7a38e31b3d3ebf382a2f80b18fab42752ec44e Mon Sep 17 00:00:00 2001 From: xiao93 <42384581+xiao93@users.noreply.github.com> Date: Tue, 27 Oct 2020 15:46:01 +0800 Subject: [PATCH 080/141] Update apiConfig.js --- app/api/apiConfig.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 39a44b6e4d..aa2fffdd87 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -355,14 +355,6 @@ export const settingsAPIs = { operator: "ptschina", contact: "wechat:planetlife" }, - { - url: "wss://tokyo.bitshares.im/ws", - region: "Eastern Asia", - country: "Japan", - location: "Tokyo", - operator: "Witness: clone", - contact: "telegram: yexiao" - }, { url: "wss://singapore.bitshares.im/ws", region: "Southeast Asia", @@ -371,14 +363,6 @@ export const settingsAPIs = { operator: "Witness: clone", contact: "telegram: yexiao" }, - { - url: "wss://bangalore.bitshares.im/ws", - region: "South Asia", - country: "India", - location: "Bangalore", - operator: "Witness: clone", - contact: "telegram: yexiao" - }, { url: "wss://newyork.bitshares.im/ws", region: "Northern America", From b60a5948d52aa313ae45d89179167c682a467bf1 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 15 Nov 2020 22:08:47 +0100 Subject: [PATCH 081/141] fix nasty infinite loop bug --- app/components/Account/AccountVoting.jsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/components/Account/AccountVoting.jsx b/app/components/Account/AccountVoting.jsx index 407b73e326..23e14d4425 100644 --- a/app/components/Account/AccountVoting.jsx +++ b/app/components/Account/AccountVoting.jsx @@ -510,10 +510,13 @@ class AccountVoting extends React.Component { let [lbo] = res; if (lbo === null) { // The object does not exist, the id was too high - this.setState( - {lastBudgetObject: `2.13.${newIDInt - 1}`}, - this.getBudgetObject - ); + let lastId = `2.13.${newIDInt - 1}`; + if (lastId != lastBudgetObject) { + this.setState( + {lastBudgetObject: `2.13.${newIDInt - 1}`}, + this.getBudgetObject + ); + } } else { SettingsStore.setLastBudgetObject(newID); From dabbccfb9487d476513c3638a90adbb510292af4 Mon Sep 17 00:00:00 2001 From: bangzi1001 <36911788+bangzi1001@users.noreply.github.com> Date: Wed, 18 Nov 2020 12:52:01 +0800 Subject: [PATCH 082/141] Remove API Node --- app/api/apiConfig.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index aa2fffdd87..c5d3fdfdf6 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -250,14 +250,6 @@ export const settingsAPIs = { operator: "Witness: liuye", contact: "email:work@domyself.me" }, - { - url: "wss://btsfullnode.bangzi.info/ws", - region: "Western Europe", - country: "Germany", - location: "Munich", - operator: "Witness: Bangzi", - contact: "telegram:Bangzi" - }, { url: "wss://api.dex.trading/", region: "Western Europe", From 75f4f5240716f051185d523da2f95b71064ad5fa Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 23 Nov 2020 09:35:25 +0100 Subject: [PATCH 083/141] fix error message bug --- app/actions/TransactionConfirmActions.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/actions/TransactionConfirmActions.js b/app/actions/TransactionConfirmActions.js index 108783b7b0..1f6c6c547e 100644 --- a/app/actions/TransactionConfirmActions.js +++ b/app/actions/TransactionConfirmActions.js @@ -50,7 +50,9 @@ class TransactionConfirmActions { // try to break down the error in human readable pieces let splitError = error.message.split("\n"); let data, code; - if (splitError.length > 1) { + if (splitError.length == 1) { + message = splitError[0]; + } else if (splitError.length > 1) { try { jsonError = JSON.parse(splitError[1]); data = jsonError.data; From 9440bff95269e4c8a4b1f44020bf411978fa2b23 Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 23 Nov 2020 09:36:04 +0100 Subject: [PATCH 084/141] forward policy when creating vesting balance --- app/api/ApplicationApi.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/app/api/ApplicationApi.js b/app/api/ApplicationApi.js index a053e3233d..0203e943f7 100644 --- a/app/api/ApplicationApi.js +++ b/app/api/ApplicationApi.js @@ -803,15 +803,7 @@ const ApplicationApi = { amount: amount, asset_id: objects.asset.get("id") }, - // fixme should be given - policy: [ - 0, - { - begin_timestamp: parseInt(new Date().getTime() / 1000), - vesting_cliff_seconds: 100, - vesting_duration_seconds: 100 - } - ] + policy: policy } ); From 52b192d01eb1603f76828a6dc769862cb10f5f20 Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 23 Nov 2020 09:36:16 +0100 Subject: [PATCH 085/141] dont subscribe on lookup accounts --- app/api/accountApi.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/accountApi.js b/app/api/accountApi.js index 6caa6f7e9d..b1ce6c568e 100644 --- a/app/api/accountApi.js +++ b/app/api/accountApi.js @@ -5,7 +5,7 @@ class Api { // direct query, circumventing subscription system of ChainStore return Apis.instance() .db_api() - .exec("lookup_accounts", [startChar, limit]); + .exec("lookup_accounts", [startChar, limit], false); } lookupAccountByPublicKey(pubKey) { // direct query, circumventing subscription system of ChainStore From 2f359ae9060406e25cc8c92cc084e5aff00bc39e Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 23 Nov 2020 09:36:42 +0100 Subject: [PATCH 086/141] introduce create lock button in voting to lock away core token --- app/assets/locales/locale-en.json | 24 ++- app/components/Account/AccountVoting.jsx | 59 ++++-- app/components/Modal/CreateLockModal.jsx | 231 +++++++++++++++++++++++ 3 files changed, 289 insertions(+), 25 deletions(-) create mode 100644 app/components/Modal/CreateLockModal.jsx diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json index 664669f1d9..63062af8d7 100644 --- a/app/assets/locales/locale-en.json +++ b/app/assets/locales/locale-en.json @@ -1580,6 +1580,15 @@ "amount": "Amount to Convert", "submit": "Ok" }, + "create_lock": { + "amount": "Amount to lock", + "from": "Account to lock from", + "targetType": "Lock Type", + "type_warning": "Please choose a lock type.", + "submit": "Lock", + "title": "Create Lock", + "warning_message": "Note that locked assets must be requested to unlock, and can only be claimed back after the unlock period has passed. Current unlock period would be %(lock_days)s days" + }, "deposit": { "address_generation_error": "Unable to generate address", "amount": "Amount to Deposit", @@ -1788,14 +1797,14 @@ "ticket_create": "{account} locked away {amount} in a ticket", "ticket_types": { "0": "Liquid", - "1": "Locked for 180 days", - "2": "Locked for 360 days", - "3": "Locked for 720 days", + "1": "Claimable 180 days after unlock request", + "2": "Claimable 360 days after unlock request", + "3": "Claimable 720 days after unlock request", "4": "Locked forever", "liquid": "Liquid", - "lock_180_days": "Locked for 180 days", - "lock_360_days": "Locked for 360 days", - "lock_720_days": "Locked for 720 days", + "lock_180_days": "Claimable 180 days after unlock request", + "lock_360_days": "Claimable 360 days after unlock request", + "lock_720_days": "Claimable 720 days after unlock request", "lock_forever": "Locked forever" } }, @@ -2712,7 +2721,8 @@ "voting": { "description": "The BitShares blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).", "title": "Voting", - "ticket_explanation": "TBD", + "ticket_explanation": "Obtain voting power by locking away the core token BTS.", + "increase_voting_power": "Create Lock", "create_ticket": "Lock 1 {asset}" }, "walkthrough": { diff --git a/app/components/Account/AccountVoting.jsx b/app/components/Account/AccountVoting.jsx index 23e14d4425..7d35e2b384 100644 --- a/app/components/Account/AccountVoting.jsx +++ b/app/components/Account/AccountVoting.jsx @@ -17,7 +17,7 @@ import AccountStore from "stores/AccountStore"; import Witnesses from "./Voting/Witnesses"; import Committee from "./Voting/Committee"; import Workers from "./Voting/Workers"; -import TranslateWithLinks from "../Utility/TranslateWithLinks"; +import CreateLockModal from "../Modal/CreateLockModal"; const WITNESSES_KEY = "witnesses"; const COMMITTEE_KEY = "committee"; @@ -54,6 +54,8 @@ class AccountVoting extends React.Component { all_committee: Immutable.List(), hideLegacyProposals: true, filterSearch: "", + isCreateLockModalVisible: false, + isCreateLockModalVisibleBefore: false, tabs: [ { name: "witnesses", @@ -80,6 +82,9 @@ class AccountVoting extends React.Component { this.onPublish = this.onPublish.bind(this); this.onReset = this.onReset.bind(this); this._getVoteObjects = this._getVoteObjects.bind(this); + + this.showCreateLockModal = this.showCreateLockModal.bind(this); + this.hideCreateLockModal = this.hideCreateLockModal.bind(this); } componentWillMount() { @@ -96,6 +101,8 @@ class AccountVoting extends React.Component { shouldComponentUpdate(np, ns) { return ( + ns.isCreateLockModalVisible != + this.state.isCreateLockModalVisible || np.location.pathname !== this.props.location.pathname || ns.prev_proxy_account_id !== this.state.prev_proxy_account_id || ns.hideLegacyProposals !== this.state.hideLegacyProposals || @@ -614,27 +621,16 @@ class AccountVoting extends React.Component { float: "right" }} > -
); - + console.log( + this.state.isCreateLockModalVisible, + this.state.isCreateLockModalVisibleBefore + ); return (
@@ -721,10 +717,37 @@ class AccountVoting extends React.Component { })}
+ {/* CreateLock Modal */} + {(this.state.isCreateLockModalVisible || + this.state.isCreateLockModalVisibleBefore) && ( + + )} + {(this.state.isCreateLockModalVisible || + this.state.isCreateLockModalVisibleBefore) && ( +
fff fff fff
+ )}
); } + showCreateLockModal() { + this.setState({ + isCreateLockModalVisible: true, + isCreateLockModalVisibleBefore: true + }); + } + + hideCreateLockModal() { + this.setState({ + isCreateLockModalVisible: false + }); + } + _getBudgets(globalObject) { let budgetObject; if (this.state.lastBudgetObject) { diff --git a/app/components/Modal/CreateLockModal.jsx b/app/components/Modal/CreateLockModal.jsx new file mode 100644 index 0000000000..9786975249 --- /dev/null +++ b/app/components/Modal/CreateLockModal.jsx @@ -0,0 +1,231 @@ +import React from "react"; +import BalanceComponent from "../Utility/BalanceComponent"; +import counterpart from "counterpart"; +import AmountSelector from "../Utility/AmountSelectorStyleGuide"; +import {ChainStore, ChainTypes} from "bitsharesjs"; +import {Asset} from "common/MarketClasses"; +import AssetWrapper from "../Utility/AssetWrapper"; +import { + Modal, + Button, + Form, + Alert, + Tooltip, + Input, + Select +} from "bitshares-ui-style-guide"; +import ApplicationApi from "../../api/ApplicationApi"; + +class CreateLockModal extends React.Component { + constructor(props) { + super(props); + this.state = this.getInitialState(props); + + this.onSubmit = this.onSubmit.bind(this); + } + + componentWillReceiveProps(np) { + if ( + np.asset && + this.props.asset && + np.asset.get("id") !== this.props.asset.get("id") + ) { + this.setState(this.getInitialState(np)); + } + } + + getInitialState(props) { + return { + targetType: null, + amount: 0, + amountAsset: new Asset({ + amount: 0, + asset_id: props.asset.get("id"), + precision: props.asset.get("precision") + }) + }; + } + + onAmountChanged({amount, asset}) { + this.state.amountAsset.setAmount({real: amount}); + this.setState({amount, asset}); + } + + onTargetTypeChanged(e) { + this.setState({targetType: e}); + } + + canSubmit() { + return this.state.targetType && this.state.amountAsset.hasAmount(); + } + + onSubmit() { + ApplicationApi.createTicket( + this.props.account, + this.state.amountAsset.asset_id, + this.state.amountAsset.getAmount(), + this.state.targetType + ).then(() => { + this.state.amountAsset.setAmount({sats: 0}); + this.setState({ + amount: 0, + numberOfPeriods: 1 + }); + }); + this.props.hideModal(); + } + + _getUnlockPeriod() { + if (!this.state.targetType) return 0; + const unlockPeriods = { + 0: 0, + 1: 180, + 2: 360, + 3: 720, + 4: Infinity + }; + return unlockPeriods[this.state.targetType]; + } + + render() { + console.log(this.props.asset); + let assetId = this.props.asset.get("id"); + + let currentBalance = + this.props.account && + this.props.account.get("balances", []).size && + !!this.props.account.getIn(["balances", assetId]) + ? ChainStore.getObject( + this.props.account.getIn(["balances", assetId]) + ) + : null; + if (!currentBalance) { + currentBalance = 0; + } else { + currentBalance = currentBalance.get("balance"); + } + + return ( +
+ {" "} + asd asd + + {counterpart.translate("modal.create_lock.submit")} + , + + ]} + > + +
+ { + this.state.amountAsset.setAmount({ + sats: currentBalance + }); + this.setState({ + amount: this.state.amountAsset.getAmount( + {real: true} + ) + }); + }} + > + +
+ } + tabIndex={1} + /> + + + + + + + +
+ ); + } +} + +CreateLockModal = AssetWrapper(CreateLockModal, { + propNames: ["asset"] +}); + +export default CreateLockModal; From b609693a6d89ecdc1ff0cfb720cfd512482b3a91 Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 25 Nov 2020 08:50:46 +0100 Subject: [PATCH 087/141] add develop CI flow --- .../npm-build-and-deploy-develop.yml | 30 +++ app/components/Account/AccountVoting.jsx | 8 - app/components/Modal/CreateLockModal.jsx | 207 ++++++++---------- 3 files changed, 127 insertions(+), 118 deletions(-) create mode 100644 .github/workflows/npm-build-and-deploy-develop.yml diff --git a/.github/workflows/npm-build-and-deploy-develop.yml b/.github/workflows/npm-build-and-deploy-develop.yml new file mode 100644 index 0000000000..ba728578f2 --- /dev/null +++ b/.github/workflows/npm-build-and-deploy-develop.yml @@ -0,0 +1,30 @@ +# This workflow will do a clean install of node dependencies, build the source code and push the binaries to the deployment repository. +name: Continuous Delivery and Deployment + +on: + push: + branches: [develop] + +jobs: + build: + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [10.x] + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm ci + - run: npm run build + - name: Deploy + uses: s0/git-publish-subdir-action@master + env: + REPO: git@github.com:bitshares/develop.bitshares.org.git + BRANCH: master + FOLDER: build/dist + GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }} diff --git a/app/components/Account/AccountVoting.jsx b/app/components/Account/AccountVoting.jsx index 7d35e2b384..d677395253 100644 --- a/app/components/Account/AccountVoting.jsx +++ b/app/components/Account/AccountVoting.jsx @@ -627,10 +627,6 @@ class AccountVoting extends React.Component { ); - console.log( - this.state.isCreateLockModalVisible, - this.state.isCreateLockModalVisibleBefore - ); return (
@@ -727,10 +723,6 @@ class AccountVoting extends React.Component { account={this.props.account} /> )} - {(this.state.isCreateLockModalVisible || - this.state.isCreateLockModalVisibleBefore) && ( -
fff fff fff
- )}
); } diff --git a/app/components/Modal/CreateLockModal.jsx b/app/components/Modal/CreateLockModal.jsx index 9786975249..52a3c16728 100644 --- a/app/components/Modal/CreateLockModal.jsx +++ b/app/components/Modal/CreateLockModal.jsx @@ -88,7 +88,6 @@ class CreateLockModal extends React.Component { } render() { - console.log(this.props.asset); let assetId = this.props.asset.get("id"); let currentBalance = @@ -106,120 +105,108 @@ class CreateLockModal extends React.Component { } return ( -
- {" "} - asd asd - - {counterpart.translate("modal.create_lock.submit")} - , - - ]} - > - + {counterpart.translate("modal.create_lock.submit")} + , + + ]} + > + +
+ { + this.state.amountAsset.setAmount({ + sats: currentBalance + }); + this.setState({ + amount: this.state.amountAsset.getAmount( + {real: true} + ) + }); + }} + > + +
+ } + tabIndex={1} /> - - { - this.state.amountAsset.setAmount({ - sats: currentBalance - }); - this.setState({ - amount: this.state.amountAsset.getAmount( - {real: true} - ) - }); - }} - > - -
- } - tabIndex={1} - /> - + - - - - - - - + )} + + ) : null + )} + + + + + ); } } From 1fca8f67acacf3bff3528354bf3931619de85fe4 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 1 Dec 2020 11:15:03 +0100 Subject: [PATCH 088/141] in exchange transaction confirm modal showed wrong market direction --- app/components/Exchange/Exchange.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/Exchange/Exchange.jsx b/app/components/Exchange/Exchange.jsx index a374f1e83d..9e63e466f5 100644 --- a/app/components/Exchange/Exchange.jsx +++ b/app/components/Exchange/Exchange.jsx @@ -1047,7 +1047,7 @@ class Exchange extends React.Component { const inverted = this.props.marketDirections.get(marketName); const shouldFlip = (inverted && first.get("id") !== this.props.baseAsset.get("id")) || - (!inverted && first.get("id") !== this.props.baseAsset.get("id")); + (!inverted && first.get("id") === this.props.baseAsset.get("id")); if (shouldFlip) { let setting = {}; setting[marketName] = !inverted; From 1ecad378089aac9f61e290b8b5d3d4fa023b9eab Mon Sep 17 00:00:00 2001 From: Abit Date: Wed, 2 Dec 2020 10:25:11 +0100 Subject: [PATCH 089/141] Remove the New Jersey node provided by Zhaomu The node is being shut down. --- app/api/apiConfig.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index aa2fffdd87..0de37eebc5 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -155,14 +155,6 @@ export const settingsAPIs = { operator: "Witness: btspp-witness", contact: "telegram:btsplusplus" }, - { - url: "wss://blockzms.xyz/ws", - region: "Northern America", - country: "U.S.A.", - location: "New Jersey", - operator: "Witness: delegate-zhaomu", - contact: "telegram:lzmlam;wechat:lzmlam" - }, { url: "wss://api.bts.mobi/ws", region: "Northern America", From 5a3a9295ef704b2b02a00e303f74fa8c776111a2 Mon Sep 17 00:00:00 2001 From: Abit Date: Wed, 2 Dec 2020 10:46:27 +0100 Subject: [PATCH 090/141] Remove another New Jersey node provided by Yao The node has been down for a long time. --- app/api/apiConfig.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 0de37eebc5..1657f8a09b 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -178,14 +178,6 @@ export const settingsAPIs = { operator: "Witness: bhuz", contact: "telegram:bhuzor" }, - { - url: "wss://kimziv.com/ws", - region: "Northern America", - country: "U.S.A.", - location: "New Jersey", - operator: "Witness: witness.yao", - contact: "telegram:imyao" - }, { url: "wss://api.btsgo.net/ws", region: "Southeastern Asia", From 5c90594d595fc4fdc49b28ba8e2718ebb976b924 Mon Sep 17 00:00:00 2001 From: Abit Date: Wed, 2 Dec 2020 11:47:05 +0100 Subject: [PATCH 091/141] Add new accounts to scam list Fixes https://github.com/bitshares/bitshares-ui/issues/3308 --- app/lib/common/scamAccounts.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index c81b363946..84a0cc02ea 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1234,5 +1234,15 @@ export const scamAccountsOther = [ "committee-delegate", "1.2.1621188", "binance-witness", - "1.2.1700190" + "1.2.1700190", + "binanace-bts-1", + "1.2.1593437", + "zbbs001", + "1.2.886790", + "zbbt001", + "1.2.886122", + "huibi-pro", + "1.2.852941", + "hubi-pro", + "1.2.852641" ]; From 67acf18aa5f6a9361b390ed66b4051a142acc544 Mon Sep 17 00:00:00 2001 From: Abit Date: Thu, 3 Dec 2020 00:53:31 +0100 Subject: [PATCH 092/141] Remove a dead API node --- app/api/apiConfig.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index dfc0e9f6e9..8e1b3faae8 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -323,14 +323,6 @@ export const settingsAPIs = { operator: "Witness: ioex", contact: "wechat:xiaoyuan_409" }, - { - url: "wss://fujian.cnvote.vip:81/", - region: "Eastern Asia", - country: "China", - location: "Fujian", - operator: "ptschina", - contact: "wechat:planetlife" - }, { url: "wss://singapore.bitshares.im/ws", region: "Southeast Asia", From 8e5a33aac5814928997757c3495446fdad0da2d2 Mon Sep 17 00:00:00 2001 From: Abit Date: Thu, 10 Dec 2020 00:27:06 +0100 Subject: [PATCH 093/141] Add a new account to the scam account list --- app/lib/common/scamAccounts.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 84a0cc02ea..938a2bc97b 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1244,5 +1244,7 @@ export const scamAccountsOther = [ "huibi-pro", "1.2.852941", "hubi-pro", - "1.2.852641" + "1.2.852641", + "bts-binance-1", + "1.2.1037039" ]; From 46c8b4b44e54ca80e183f7d3ed8ddd1fcaa64486 Mon Sep 17 00:00:00 2001 From: Abit Date: Sat, 12 Dec 2020 15:45:32 +0100 Subject: [PATCH 094/141] Remove link to hackthedex.io --- app/help/en/index.md | 1 - 1 file changed, 1 deletion(-) diff --git a/app/help/en/index.md b/app/help/en/index.md index 3676ecf429..fe9cd80fa2 100644 --- a/app/help/en/index.md +++ b/app/help/en/index.md @@ -34,7 +34,6 @@ of this application. ## Development * [Bitshares UI Github](https://github.com/bitshares/bitshares-ui) - * [HackTheDEX](introduction/hackthedex.md) ---------- [Glossary](glossary.md) From 7b60dd25db7793da56f704ed4492ce0c80f1ff8a Mon Sep 17 00:00:00 2001 From: Abit Date: Sat, 12 Dec 2020 15:46:36 +0100 Subject: [PATCH 095/141] Delete hackthedex.md --- app/help/en/introduction/hackthedex.md | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 app/help/en/introduction/hackthedex.md diff --git a/app/help/en/introduction/hackthedex.md b/app/help/en/introduction/hackthedex.md deleted file mode 100644 index 80a578db80..0000000000 --- a/app/help/en/introduction/hackthedex.md +++ /dev/null @@ -1,23 +0,0 @@ -# Hack the DEX - -## How It Works -If someone discovers a critical bug in the DEX, they might be tempted to exploit the bug, in an attempt to steal funds from unsuspecting users. Without a public bug bounty system, hackers do not have an obvious path of disclosure for reporting their findings. They also do not have any incentive to share their exploits and techniques, rather than using them for personal gain. - -With this worker proposal, we've started a BitShares bug bounty program for security researchers and penetration testers (...aka hackers!) to disclose important security vulnerabilities they find within the BitShares core protocol, reference wallet, and related code repositories. - -The proposal will use funds from the reserve pool to reward those that step forward with exploits, relative to the overall risk assessment of the exploit. The higher the payout for critical bugs, the more incentive there will be to attract higher quality researchers, and ultimately providing better security coverage for the DEX. - -Worker proposal funds will be held in an escrow account by the BitShares Blockchain Foundation and unused funds will be refunded back to the network at the end of the proposal period. - -## General Rules -* Public disclosure of a vulnerability makes it ineligible for a bounty -* Your testing must not violate any law or compromise any data that is not yours -* Issues that have already been submitted by another user or are already known to repository maintainers are not eligible for bounty rewards -* Bounties will only be awarded for code repositories that are in scope -* BitShares marketing websites and 3rd party websites/gateways are not eligible for bounties -* Anyone involved in an audit panel or in the bug bounty program are not eligible to win bounty rewards -* A number of variables contribute to determining if a disclosed vulnerability is eligible for a reward. How the vulnerability is scored, and the methods used to determine the score, are at the sole discretion of the panel chosen to audit the report -* You should expect to provide your full name to claim bounty rewards -* Once the bounty is awarded, feel free to share/blog/tweet/tell your mom about the exploit - -Learn more on [hackthedex.io](https://hackthedex.io) or submit a report directly to submit@hackthedex.io \ No newline at end of file From 4cefa6b75d3f18d1d3467e9f901ac7d5c0864810 Mon Sep 17 00:00:00 2001 From: Abit Date: Sat, 12 Dec 2020 15:53:02 +0100 Subject: [PATCH 096/141] Remove link to hackthedex.io from ReportModal --- app/components/Modal/ReportModal.jsx | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/components/Modal/ReportModal.jsx b/app/components/Modal/ReportModal.jsx index 9e7f4a53c7..6d59ae0164 100644 --- a/app/components/Modal/ReportModal.jsx +++ b/app/components/Modal/ReportModal.jsx @@ -115,17 +115,6 @@ class ReportModal extends React.Component {

-
-    - - https://hackthedex.io -

); } From 643cace9c730468e50dcdf3117b5598af45bd7ac Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 22 Dec 2020 13:21:53 +0100 Subject: [PATCH 097/141] fix flow warnings --- app/components/Dashboard/MarketsTable.jsx | 8 +++++--- app/components/Exchange/MarketRow.jsx | 12 +++++++----- package-lock.json | 23 ++++++++++++++--------- package.json | 2 +- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/app/components/Dashboard/MarketsTable.jsx b/app/components/Dashboard/MarketsTable.jsx index 8493a4744c..53923c5e20 100644 --- a/app/components/Dashboard/MarketsTable.jsx +++ b/app/components/Dashboard/MarketsTable.jsx @@ -307,7 +307,6 @@ class MarketsTable extends React.Component { _onError(imgName) { if (!this.state.imgError) { - this.refs[imgName.toLowerCase()].src = "asset-symbols/bts.png"; this.setState({ imgError: true }); @@ -340,6 +339,10 @@ class MarketsTable extends React.Component { ? "gold-star" : "grey-star"; + const imageSrc = this.state.imgError + ? `${__BASE_URL__}asset-symbols/${imgName.toLowerCase()}.png` + : `${__BASE_URL__}asset-symbols/bts.png`; + return { key: marketID, star: ( @@ -357,11 +360,10 @@ class MarketsTable extends React.Component { asset: (   diff --git a/app/components/Exchange/MarketRow.jsx b/app/components/Exchange/MarketRow.jsx index 2de6ec1bdf..39fed09159 100644 --- a/app/components/Exchange/MarketRow.jsx +++ b/app/components/Exchange/MarketRow.jsx @@ -30,11 +30,13 @@ class MarketRow extends React.Component { componentDidMount() { this.statsChecked = new Date(); - this.statsInterval = MarketsActions.getMarketStatsInterval( - 35 * 1000, - this.props.base, - this.props.quote - ); + if ("id" in this.props.base && "id" in this.props.quote) { + this.statsInterval = MarketsActions.getMarketStatsInterval( + 35 * 1000, + this.props.base, + this.props.quote + ); + } } componentWillUnmount() { diff --git a/package-lock.json b/package-lock.json index 167f0602c4..5cd640cceb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5163,7 +5163,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } @@ -6977,7 +6978,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true }, "normalize-path": { @@ -8758,7 +8760,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } @@ -15452,7 +15455,8 @@ }, "minimist": { "version": "1.2.0", - "resolved": "", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true } } @@ -18660,11 +18664,11 @@ } }, "react-debounce-render": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/react-debounce-render/-/react-debounce-render-4.0.3.tgz", - "integrity": "sha512-bjbpWHE0gRhkZoH0F+G3Azc7Zceb/Et1fwMJuKYagRnd0LqwcaC/JuECyPlFKK36HiRhzMO9kQplGLF/nlt7Lg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/react-debounce-render/-/react-debounce-render-7.0.0.tgz", + "integrity": "sha512-OaI1RhLxchlV2nKukQgbq2CZG5DQoNkHG1O9vMw8fnY4bLCIdKPDy2EL4aQY9cdeXW/NkYkso7O/5ARbs/XI6w==", "requires": { - "lodash": "^4.17.10", + "hoist-non-react-statics": "^3.3.2", "lodash.debounce": "^4.0.8" } }, @@ -20354,7 +20358,8 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", + "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", "dev": true } } diff --git a/package.json b/package.json index 2e607480d3..43fc0fb23a 100644 --- a/package.json +++ b/package.json @@ -186,7 +186,7 @@ "react-clipboard.js": "^1.0.1", "react-copy-to-clipboard": "^5.0.2", "react-datepicker2": "git+https://github.com/bitshares/react-datepicker2.git#9d4c2c28a23c970badcf765c35c5493d5a49afde", - "react-debounce-render": "^4.0.2", + "react-debounce-render": "^7.0.0", "react-dom": "^16.11.0", "react-foundation-apps": "git+https://github.com/bitshares/react-foundation-apps.git", "react-highcharts": "^16.1.0", From 8890dedf54ebb7d82a82ade85eaa97f66b86f3ec Mon Sep 17 00:00:00 2001 From: froooze <40874087+froooze@users.noreply.github.com> Date: Sat, 26 Dec 2020 22:06:31 +0100 Subject: [PATCH 098/141] Add Binance Scam Account --- app/lib/common/scamAccounts.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 938a2bc97b..11adff3684 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1246,5 +1246,7 @@ export const scamAccountsOther = [ "hubi-pro", "1.2.852641", "bts-binance-1", - "1.2.1037039" + "1.2.1037039", + "binance-bts1", + "1.2.467722" ]; From a321a19d2073c1f53df819eca233bd5b772d8e78 Mon Sep 17 00:00:00 2001 From: Abit Date: Mon, 11 Jan 2021 19:37:00 +0100 Subject: [PATCH 099/141] Add a testnet API node provided by witness liuye --- app/api/apiConfig.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 8e1b3faae8..45d01b4e1f 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -371,8 +371,15 @@ export const settingsAPIs = { location: "Tokyo", operator: "Witness: clone", contact: "telegram: yexiao" + }, + { + url: "wss://api-test-pub.61bts.com/ws", + region: "Eastern Asia", + country: "China", + location: "Shandong", + operator: "Witness: liuye", + contact: "email:work@domyself.me" } - ], ES_WRAPPER_LIST: [ ], From 6f328bec76c8b38b0219936db13ac3a36db75f99 Mon Sep 17 00:00:00 2001 From: Abit Date: Wed, 13 Jan 2021 23:55:07 +0100 Subject: [PATCH 100/141] Update Telegram group link --- app/help/en/introduction/bitshares.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/help/en/introduction/bitshares.md b/app/help/en/introduction/bitshares.md index 1ab32c3cdd..420e6d407a 100644 --- a/app/help/en/introduction/bitshares.md +++ b/app/help/en/introduction/bitshares.md @@ -7,7 +7,7 @@ ### Bitshares Chat You can chat with other member of the Bitshares community in real time at: -- [Telegram](https://t.me/BitSharesDEX) +- [Telegram](https://t.me/BitSharesDAC) - [Discord](https://discord.gg/GsjQfAJ) ### Developers From ae5b5cf47c8f27b3975727fa2bffdfbbeee189c8 Mon Sep 17 00:00:00 2001 From: Abit Date: Sun, 17 Jan 2021 06:00:17 +0100 Subject: [PATCH 101/141] Update testnet.61bts API node --- app/api/apiConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 45d01b4e1f..0b9dcf666a 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -373,7 +373,7 @@ export const settingsAPIs = { contact: "telegram: yexiao" }, { - url: "wss://api-test-pub.61bts.com/ws", + url: "wss://api-testnet.61bts.com/ws", region: "Eastern Asia", country: "China", location: "Shandong", From ff6fadd801ecfc2e8e0cb58961e0366b657ef773 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 17 Jan 2021 16:47:00 +0100 Subject: [PATCH 102/141] add es wrapper from blocksights --- app/api/apiConfig.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 8e1b3faae8..3a1061e423 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -338,7 +338,7 @@ export const settingsAPIs = { location: "New York", operator: "Witness: clone", contact: "telegram: yexiao" - }, + }, // Testnet { url: "wss://node.testnet.bitshares.eu", @@ -372,9 +372,15 @@ export const settingsAPIs = { operator: "Witness: clone", contact: "telegram: yexiao" } - ], ES_WRAPPER_LIST: [ + { + url: "https://api.bitshares.ws/openexplorer", + region: "Western Europe", + country: "Germany", + operator: "blocksights.info", + contact: "bitshares:blocksights" + } ], DEFAULT_FAUCET: getFaucet().url, TESTNET_FAUCET: getTestFaucet().url From adc76230f804b8791534c2f9e7c016e97af58f61 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 21 Jan 2021 16:45:12 +0100 Subject: [PATCH 103/141] switch to https url to use token --- .github/workflows/npm-build-and-deploy-develop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/npm-build-and-deploy-develop.yml b/.github/workflows/npm-build-and-deploy-develop.yml index ba728578f2..9bed7a57b7 100644 --- a/.github/workflows/npm-build-and-deploy-develop.yml +++ b/.github/workflows/npm-build-and-deploy-develop.yml @@ -24,7 +24,7 @@ jobs: - name: Deploy uses: s0/git-publish-subdir-action@master env: - REPO: git@github.com:bitshares/develop.bitshares.org.git + REPO: https://github.com/bitshares/develop.bitshares.org.git BRANCH: master FOLDER: build/dist GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }} From a590636dbddd255aa2b75f0f0e0019933e861409 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 21 Jan 2021 17:14:22 +0100 Subject: [PATCH 104/141] Update npm-build-and-deploy-develop.yml --- .github/workflows/npm-build-and-deploy-develop.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/npm-build-and-deploy-develop.yml b/.github/workflows/npm-build-and-deploy-develop.yml index 9bed7a57b7..0d13631f21 100644 --- a/.github/workflows/npm-build-and-deploy-develop.yml +++ b/.github/workflows/npm-build-and-deploy-develop.yml @@ -24,7 +24,7 @@ jobs: - name: Deploy uses: s0/git-publish-subdir-action@master env: - REPO: https://github.com/bitshares/develop.bitshares.org.git + REPO: git@github.com:bitshares/develop.bitshares.org.git BRANCH: master FOLDER: build/dist - GITHUB_TOKEN: ${{ secrets.AUTOMATION_GITHUB_TOKEN }} + SSH_PRIVATE_KEY: ${{ secrets.AUTOMATION_UI_DEPLOYMENT_KEY }} From ac8aaf21263d73fe4b40624e1c7768e979b8d074 Mon Sep 17 00:00:00 2001 From: Abit Date: Sat, 23 Jan 2021 01:42:35 +0100 Subject: [PATCH 105/141] Create CNAME file when auto-deploying to develop.bitshares.org --- .github/workflows/npm-build-and-deploy-develop.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/npm-build-and-deploy-develop.yml b/.github/workflows/npm-build-and-deploy-develop.yml index 0d13631f21..4f79372ed5 100644 --- a/.github/workflows/npm-build-and-deploy-develop.yml +++ b/.github/workflows/npm-build-and-deploy-develop.yml @@ -21,6 +21,11 @@ jobs: node-version: ${{ matrix.node-version }} - run: npm ci - run: npm run build + - name: Create CNAME file + uses: "finnp/create-file-action@master" + env: + FILE_NAME: "build/dist/CNAME" + FILE_DATA: "develop.bitshares.org" - name: Deploy uses: s0/git-publish-subdir-action@master env: From 26872f2e9552a9e45f126ff8fa9f73947ea618ec Mon Sep 17 00:00:00 2001 From: iamredbar Date: Sat, 23 Jan 2021 15:44:57 -0600 Subject: [PATCH 106/141] Add Api Node - add node wss://api.iamredbar.com/ws --- app/api/apiConfig.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js index 3a1061e423..e59f0a6a12 100644 --- a/app/api/apiConfig.js +++ b/app/api/apiConfig.js @@ -339,6 +339,14 @@ export const settingsAPIs = { operator: "Witness: clone", contact: "telegram: yexiao" }, + { + url: "wss://api.iamredbar.com/ws", + region: "Northern America", + country: "U.S.A.", + location: "Minnesota", + operator: "Witness: iamredbar", + contact: "telegram: iamredbar" + }, // Testnet { url: "wss://node.testnet.bitshares.eu", From e3949af64883f50809cfd4fb1793696047d47b6d Mon Sep 17 00:00:00 2001 From: Abit Date: Sat, 16 Jan 2021 23:48:04 +0100 Subject: [PATCH 107/141] Add scam accounts --- app/lib/common/scamAccounts.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 11adff3684..34b7a0f7de 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1248,5 +1248,27 @@ export const scamAccountsOther = [ "bts-binance-1", "1.2.1037039", "binance-bts1", - "1.2.467722" + "1.2.467722", + "collateral-update", + "1.2.1623407", + "bue", + "1.2.18513", + "openledger-safety", + "1.2.1682058", + "gdex-wallet-security", + "1.2.1691946", + "bridge-security", + "1.2.1691907", + "criptobridge-security", + "1.2.1691905", + "rudex-upgrade", + "1.2.1682487", + "openledger-guarantee", + "1.2.1602048", + "bitshares-guarantee", + "1.2.1655608", + "huilao000", + "1.2.1640223", + "china-cash", + "1.2.673914" ]; From 3d617314e15b449864c453ec362096a5e4a95c18 Mon Sep 17 00:00:00 2001 From: Abit Date: Sun, 17 Jan 2021 05:42:36 +0100 Subject: [PATCH 108/141] Add more scam accounts and more to add. --- app/lib/common/scamAccounts.js | 168 ++++++++++++++++++++++++++++++++- 1 file changed, 167 insertions(+), 1 deletion(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 34b7a0f7de..eddd4be800 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1270,5 +1270,171 @@ export const scamAccountsOther = [ "huilao000", "1.2.1640223", "china-cash", - "1.2.673914" + "1.2.673914", + "cryptobridge-security", + "1.2.1574325", + "nextt0", + "1.2.1588395", + "putler666", + "1.2.1589085", + "bankofamerica1488", + "1.2.649072", + "ooops0", + "1.2.1602141", + "ikarus2", + "1.2.671426", + "toolate6238", + "1.2.486167", + "huibao000", + "1.2.1615149", + "tkyjpn0109", + "1.2.1606009", + "rz120", + "1.2.1045915", + "demon2443", + "1.2.1653463", + "bit-token", + "1.2.777552", + "jk700", + "1.2.284217", + "mnstr", + "1.2.875801", + "hltbb", + "1.2.867020", + "mitu-kine", + "1.2.622294", + "tanhayir666", + "1.2.1588321", + "porro777", + "1.2.1601740", + "poroh777", + "1.2.1597967", + "clgc1972", + "1.2.897040", + "memet92", + "1.2.732890", + "rich4231", + "1.2.1574048", + "kbak19", + "1.2.183440", + "prvtrl", + "1.2.1059156", + "cement-wallet", + "1.2.739132", + "hui-lusha", + "1.2.690318", + "bot-ho-bot", + "1.2.809180", + "drugtvoejmami888", + "1.2.661618", + "china-na", + "1.2.641953", + "update-wallet", + "1.2.1621516", + "acrll-confirm", + "1.2.1677131", + "postup5", + "1.2.567061", + "wallet-upgrade", + "1.2.1638214", + "bit-daozhi", + "1.2.1605117", + "openledger-dex.com", + "1.2.1670833", + "openledger-secure", + "1.2.1640825", + "chen-woo", + "1.2.1641140", + "cryptobridge-confirm", + "1.2.1634946", + "get-free-btc", + "1.2.1593095", + "chey-woochey", + "1.2.1638351", + "p0202p", + "1.2.1638431", + "jd84053589", + "1.2.432753", + "yanlee-che", + "1.2.1593044", + "tele-gram", + "1.2.659614", + "cryptobridge-withdraw", + "1.2.1571944", + "khalil84", + "1.2.1080837", + "n8wmajor", + "1.2.1081311", + "aj357911", + "1.2.788421", + "supercoiner-666", + "1.2.1298993", + "stepcoin-wallet", + "1.2.688768", + "cryptobridge-update", + "1.2.1589426", + "china-capuchina", + "1.2.630495", + "zbbttss001", + "1.2.1588916", + "security-upgrade", + "1.2.1640943", + "mind-alkemist", + "1.2.381456", + "norbitz1510", + "1.2.104355", + "mrk86", + "1.2.1211789", + "hbscc", + "1.2.270441", + "pnc1", + "1.2.93052", + "arnaud2", + "1.2.529684", + "hack-tiras", + "1.2.985746", + "derek-molden", + "1.2.983604", + "alvinauh86", + "1.2.635321", + "argo9north9", + "1.2.706723", + "gjf-1", + "1.2.857833", + "ydnah2", + "1.2.1096704", + "driss19999", // recoverable + "1.2.913826", + "oyxm", + "1.2.20177", + "thunder-thor", + "1.2.1575892", + "btc-profit", + "1.2.962295", + "neffos14", + "1.2.1602008", + "neffos1488", + "1.2.1601731", + "ardis-29", + "1.2.1591593", + "tigriri909", + "1.2.96396", + "eror404", + "1.2.155124", + "toolate111", + "1.2.977735", + "mcavoy5", + "1.2.452330", + "laniakea-corp", + "1.2.491952", + "openledger.com-wallet", + "1.2.1680581", + "clockwork-delegate", + "1.2.1653886", + "gdex-delegate", + "1.2.1697884", + "cni-hotwallet.update", + "1.2.1674304", + "abit.committee-delegate", + "1.2.1676892" ]; From a9dc3abdc6c2b6211dd97abf9aafbaee713a9198 Mon Sep 17 00:00:00 2001 From: abitmore Date: Sat, 30 Jan 2021 08:39:31 -0500 Subject: [PATCH 109/141] Add a scam account --- app/lib/common/scamAccounts.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index eddd4be800..eda238a677 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -51,6 +51,8 @@ export const scamAccountsOther = [ "1.2.878058", "aex-bitcny-deposit", "1.2.455052", + "aex-bitcny-dopesit-wallet", + "1.2.1795613", "aex-bts-deposit-walle", "1.2.454205", "aex-cnc-cza", From 8356f59be6f4ef4fd9ffcedcd7a907838c04bff9 Mon Sep 17 00:00:00 2001 From: abitmore Date: Sat, 30 Jan 2021 17:59:08 -0500 Subject: [PATCH 110/141] Add a new scam account --- app/lib/common/scamAccounts.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index eda238a677..effa97ee84 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1438,5 +1438,7 @@ export const scamAccountsOther = [ "cni-hotwallet.update", "1.2.1674304", "abit.committee-delegate", - "1.2.1676892" + "1.2.1676892", + "p3732551", + "1.2.397891" ]; From d6c15ef60901452002f6dce6740a700f06685ccc Mon Sep 17 00:00:00 2001 From: Abit Date: Thu, 4 Feb 2021 13:37:05 +0100 Subject: [PATCH 111/141] Update default tokens and markets --- app/branding.js | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/app/branding.js b/app/branding.js index 59b9c68132..6ecab5a394 100644 --- a/app/branding.js +++ b/app/branding.js @@ -100,7 +100,7 @@ export function getDefaultMarket() { if (_isTestnet()) { return "USD_TEST"; } - return "USD_BTS"; + return "BTS_CNY"; } /** @@ -112,7 +112,7 @@ export function getMyMarketsBases() { if (_isTestnet()) { return ["TEST"]; } - return ["BTS", "BTC", "ETH", "USD", "CNY"]; + return ["BTS", "BTC", "CNY", "USD", "USDT", "ETH"]; } /** @@ -127,14 +127,20 @@ export function getMyMarketsQuotes() { let tokens = { nativeTokens: [ "BTC", + "BTC1.0", "BTS", "CNY", + "CNY1.0", "EUR", + "EUR1.0", "GOLD", - "KRW", + "GOLD1.0", "RUBLE", + "RUB1.0", "SILVER", - "USD" + "SILVER1.0", + "USD", + "USD1.0" ], gdexTokens: [ "GDEX.BTC", @@ -186,7 +192,14 @@ export function getMyMarketsQuotes() { "XBTSX.COF", "XBTSX.MDL", "XBTSX.ETH", - "XBTSX.EXR" + "XBTSX.EXR", + "XBTSX.USDT", + "XBTSX.TUSD", + "XBTSX.USDC", + "XBTSX.USDN", + "XBTSX.USD", + "XBTSX.RUB", + "XBTSX.EUR" ], otherTokens: ["CVCOIN", "HERO", "OCT", "HERTZ", "YOYOW"] }; @@ -281,8 +294,17 @@ export function getFeaturedMarkets(quotes = []) { ["BTS", "RUDEX.WLS"], ["BTS", "RUDEX.SMOKE"], ["BTS", "RUDEX.PZM"], + ["BTS", "XBTSX.BTC"], + ["BTS", "XBTSX.ETH"], + ["BTS", "XBTSX.EUR"], + ["BTS", "XBTSX.RUB"], ["BTS", "XBTSX.STH"], + ["BTS", "XBTSX.TUSD"], ["BTS", "XBTSX.WAVES"], + ["BTS", "XBTSX.USD"], + ["BTS", "XBTSX.USDC"], + ["BTS", "XBTSX.USDN"], + ["BTS", "XBTSX.USDT"], ["BTS", "HERTZ"] ].filter(a => { if (!quotes.length) return true; From 3010a8ef0f3449c60ce968ac20648e106490b0e8 Mon Sep 17 00:00:00 2001 From: TechnoL0g <9394904+technologiespro@users.noreply.github.com> Date: Thu, 4 Feb 2021 16:58:47 +0300 Subject: [PATCH 112/141] branding:XBTS Assets:update --- app/assets/asset-symbols/atri.png | Bin 0 -> 4255 bytes app/assets/asset-symbols/bat.png | Bin 0 -> 2061 bytes app/assets/asset-symbols/fil.png | Bin 0 -> 893 bytes app/assets/asset-symbols/symbols.js | 6 +++++- app/assets/asset-symbols/usdc.png | Bin 0 -> 3300 bytes app/assets/asset-symbols/usdn.png | Bin 0 -> 842 bytes app/branding.js | 13 ++++++++++++- 7 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 app/assets/asset-symbols/atri.png create mode 100644 app/assets/asset-symbols/bat.png create mode 100644 app/assets/asset-symbols/fil.png create mode 100644 app/assets/asset-symbols/usdc.png create mode 100644 app/assets/asset-symbols/usdn.png diff --git a/app/assets/asset-symbols/atri.png b/app/assets/asset-symbols/atri.png new file mode 100644 index 0000000000000000000000000000000000000000..e48579acad2e3a1ed4d1cba475087c54778954d1 GIT binary patch literal 4255 zcmV;Q5Mb|#P)Px&08mU+MNDaN|NsB4pL5K>l>h($Ix{T)|NpX}j$~dx z00061|N3-lO#J-rrlN}a^vmMerE_Xd|M}U!uz+7!Ngo^=fpky9vwn?!R8C7l8WQE@5C(`}V;nCLx%MWPW*HLOeD}N`--fq!ycSWsbKP@$WOe}8UPRZNI~Ut?K4kBW9vQAd`Jb%1b7R!~VeH!@#TIXX2k zmWW-WkYhYLHiUp@QBFc)T~RVJEUKGuNkcY$d2Ijy000010RaI50s{sF1_=lW4h#rj zRX;yDCu(3tZ(>L^Fe-3kL~UV3a&2I9Wk_OJJ`oQMK{+aLYg}AXJSQR=92pj6T0l`q zHE3N!aAZq$a$!I^F*z|NK0G&LSVB%rM0sjT8W$0IZci*KC?OpcH#IOI9UO0KUut1V z6%!FcJS=^AYHVp*LqIloX+$n3Az4m5Ff1fGG$=+tE_G^4Mm;QERz6==LuX`KZE9U! zQa3?7GhkRi5)l$THz;jjM`vC~a&Kd1T10ANPG)6SqK;N`Ze3MNHAqH2VO2T}3l2;~ zGcz(SJ~%8dEh{oBBUw&17Zw*?T25_eRBBvAa%@?KbVp7`HdIYGV_QXMV^wQsUL+zQ zSXE0rG$dqUQam>=G%qE9dSX;gKX`RwbY)9hQb1~2Kx|(>b7n+mS~_=eTXb?|Nklb` zdrL||E=58yeRf_BDu9#CsO zBp(^Qq+Cl#L2Y6|fpkw$Og)K$X@`7Rp_FNTbW($VY-U|Pjeb;@gipVyV|;jGabrDy zZ%ehJXhcIjC?z9dT~e}~S4TiHesV^Vh-R*wU6O!Ij)Y&Rmt$pIN`rPydUIWYZ%CDe zTdtyVnU8FvjY+7TYABAgng9R*M|4t7QveH~QU3k~0R#L9))I9vIqxHQ{QTT!$L9Nv zxndpqmXQ6rt`WA>W_R8r!1|ha%r;Pn>iNaguN?EBih>Dcw~vCQpw!vc7-000c? zNklUHh{?X}7|7d$==FB;dG+BAcZkO934ZU`4HXTu?i9=KX@5cG_`fZgPI- zotJk%?|$#Sxe0>&%1D9mv32`Czx~^~B@Tx~wr&3#`?ha|n}H08_&YvL5zpl7bovhMy?gf(T1M~R59W>*7l%F=%WlN+h^L=KHvMtO zOELk)?OxTNw$Hf28~d+1>*r}nc88*rE}JveSTYhod^>0%4Z3Nx9%Ff z{VNk`G-Dl&wv@^@csoSK0&Z$%TwKr8RPXY`buKfa`Euv`ul$k#{r@shCKu~R=T^8z z1&wRun$7Lbg6wB8Goi+$(zx#K-rnJ_+Bx;jswi}+3caJq*7xo zEmcUXrJ2;Nwact@Q(r*qdYr6#q^DY8F=v4ix_3=hX~EcBeU|YWYyVgPy5S zK>swMqH2aUla|nME7a;`TCE}7$=!v$O>V(t&W)Q6YW~dGSAP;gLUuf_eWl|`ou9BuoIK&>yDT`Fbl-|`Vc4M4Rfpvy0oZHVpObAp*MvB2130PW&*J2 z5<+i)QYhFJ_sL6NpRuvolar4hMogdnEioxK+sQa6Xvm;LKv5>mnuwwRo~2kk-Yy8> z>#Oq}I0^wM1*KM0eEauH0$Z4ked#JKmwb0K1o(-_Xvb)HavY;5Ln={}ns6#gOu`hG zSL6efOwcqN!;u1FY-el&x0@XnCitEY$kY#@g1tByExy;#z+k{2tP-xmV~Ek|bX|;!rSxhB0>WU0t0uRKRPKmCSZr1RQK?3@cT{3j^FuXn(+(t5k^Qxh_onEVN9}A zM;TPADNUU?lZe2iPYK=t01QjN_BZ#j*yAU{j<(%w@%PW$j_lKtfoSL%hrtP9WE3qa zthFujj*C?wHx6&$6%hcPRwdj3P=GTz()PJP!2avm>7x&Bp=9yfz7#}r4N4Y_AVb0} zQqY*qJk|s@Sc0)|I#C5t2`0r*IOSn(%aoO|XV~l$Y&kgbj}@FueG}QQA)^TwrBNJN z4I?B|O3&moqm7Tt!Q~j<5=H>{8YxJENq_(hcpg|z#(pk<0Yu~!Ix#XhjO?ZQ;}82~ zHLUs~M#eln)sR@Fn>ALR$^sL1Kmby(Qc4%>MV|yyvMTaR_W9VpoOZb`QCBs17*PVi z8^0*wusDp6q7buTU@*T*ed@@t9(XJuBnVgxU_BaDq@#oc;JH5V&E&~r(>d|-!2l*R zp!!2(9#E)HZq+9w)F_h~wb}qz6*Esg*f)h^95D(3!7ZR#3#xn}5P%7_t)jEf6t9+> zI?dIlb4Vj>TyOAvR8-BBGQ*`!aWPZ4LjAcipc=t^Ni={m8Hx(?A%Oy#7eskkU$n>T z2L=Z8jE1zzHV6Qk>P*I$tYqLzEPdJDy!6VTJbA)=a zuCcMPIllMCx@jk}4fm&{r3s@r^^Dv>(_&xz^mQSMgYr=v`!NCx)m^7zU^cm&Xy%Cc zfRUR+Lt~N_#=Nj^8?v8A2H_1{P7OmDoh#SHPc2vg4n)h*=uZIHK*=xxL8)93nz+2O zn)Tp^ANm!o25sNs`^Z5R8KlicaX5?-Z-6}2(L#m(1EXSi@4o=>J`mRca{`#*<(aoA*FAM< z_YWU;mO=wy#lps2m|WC!t1JT;lQre;-d^r--~}#>J)i~vz2ZBqwblK0se9{|E#D5! z7mgc&qmtOqVu(;&t)tRwNcIkne zIqd8_0(%!sFFLm^$jcb^ru`$0fbW85lYrB1dL{{jbb{l{u z#Bc^x`OLeuZ39sM&f+yc`yMB!o|^SwYU;}6ouQ5Sol%V?Nmm+nUM`(Jlf@^`3a#4# z3`q0ok`rsEZMd~9_r*7@D-^-K@XYzU-M+sW{UL zqtn68z@-owA75Ko`{DBCRWFVnUA1OSarge6|GQV0lw1i-$}irsIBCzq^ZVYUR;Dj9 z!qRC03P?>Z@2c>bIpgHD%P0C?6hFSd`SH$G_a8srlC-9?Gkwvg*Pj)0v)`?rbx#j# zrw7<&Vz%Bc5|on{`!e|S>&u_^yxY>brL(hh%aIF7n?J37aBfriggwHndnGJ!b-Oqi zWK}C>#6-_;b-(oM(6!T#{yhAYy!q?Hqo-b9d*4xbGd*?Mtg1p~9-Q4akOVXL*7%jc zW}AD&@z^Kx4jnpm`Fw9iQ2#PuGmAy>Lh5ZZLk8UX!QNox)yxKWTS4`L&m{MVR#2mj z#S7SZjVM%;VI$Q0We4?~wGYPvvo9wS0G1Gwmq7`Y zN+Q)r#gO$Tn$eUc!p!^s#rb#cIq&y=&-;AO`@H8n=R02#)yAA4vQ7j+5CYl4gof@0 zzt##Iny=SJaS;Sdp;GKk&HX8G00Alj5sMkc`UoHh99%3>uyl&%rLg%w1B(DHX$br# zQ6Jky1_daI;-x?}X!{bjTLh>8jU`W%UnIk)clY*jDG?e4p0*l1ng1$JeVPHL<+uh08lX& z`21h~WCRxG!4#c^g=fV;#egjiED?BG3^rIWM?HmriUlhSSYzP;9w-R-ZvzVic%$Gb z2Km8Yy9^Gmg2{29V8IxHhXrs*5*Fs*kQh{^fg=K~l@MzMKAYgEEWCLDSO0)yd+?Np z^G3i-huJB}a)%$25VQ;WS6I`J0gKz_AxB*93L*NeZQ->5s&_f{C2eLfi4^_}Xfc=6b8FU7HUgkkG z8#`p-FYG*D2!j(~=lC;%x+7nTFyqo|RMXQu{65dQFO*JA`wBRMkkEHs?>qEoXABeK zx3FHTZPU2@^f~`wlWZJM?kyfarjnI*5kc^3WD`SsrzeGuGp0;;=CMau=I3QR(CO=h4)UIXx>_R_a0}I2uBo-ej%Qdp^V@NHI}z>fX(6 zr!+ack~)JC^OBl6dhH1TPM3G8KD zc#?qZEM@At)G}n-Wn?8~s#?ljkK-Kpqah0461~}lqHK*Yv9BGrSeeLbFG2Q8X<0#K zbzbBE#>i<%l2CTgU1Go4R6tz=;m{-#?4a1V0=<)ru=p-kCpm;P$FOt|E#s}TGfhY#xm52hGxzFIpxZ9##T!S z2^nc`FG;-IDIK+ne|E684Fz<$Iw|uu;nxKTYiMe;xg`Dg!u@1J!9*7{of#75USK4} z;p4r^GGg-D(zKCR?I(%YzENq<_SiVm*Xi0!HT%IQ{slFeIY3)jS9AQ$>$9FB@vZD( zi&(!?1?PNWmV-?ouIOzKNk}~G6L8vCY26F*2J46yPuHv^QbG)ro>QZD=jXO;=nNTK zMx$cdT*O0@R$jTA=k>sXjpIGSn?~hv2Y$4S$v5dG_FUg^*}_1?#h!a{b=j(5=Dk2e zEj2>eoQfVH{+~!ArxhMV9nyg~3t`)pT;*k%Je)G|D1GqS%UCZxMcazm@x09i*&B9F zwOWg*wFF$R;_JI@G2H#9FQsH7u?R;OA~ZxTPYULVn<%Kr_kZDRx|6fKk}T4AQL}DG zr#ik)Dk5B3MJR)?LWCjzGcm&_u(r955x-GaPUUYQ0u!@xuB_F!Ip=hRe57qPJX=(5wLaR+L`~rA@r;)x-GI{LXamcq1hAyH~oM7wy88IF)yaRXanucm_D|opi zX1|jOk7*-8rnq;?-rMgb6}*DC$Hl9>ZWY;{T(vQ#PkFPMynC(OOmo7`e5U7_;tu+o znPL~SCSn>8lb2_%nV-C|XRmWkZs*(Bj{A70t2EU-BVE~M>B#$MEzN49?M~}EdHB<)XcxHn z9bxr5Ztv)vFmZKO=UA#%Z@Sk6G)kF`pQmeQj?FdOO#D~9n22m4Rwa~_@If0z0+^5vL9CviUO@#LF9k+i;n7mho% z9prSgSs!fArRdI`D&1Gd9=*Dzv2?n5WNPq1(cg?#&)Mc}{wWpsRMA7)GMO@FhVx9F)1^0i~b)>=pwHG literal 0 HcmV?d00001 diff --git a/app/assets/asset-symbols/fil.png b/app/assets/asset-symbols/fil.png new file mode 100644 index 0000000000000000000000000000000000000000..19cf73df96a1a640d80401181271f1eaeff04052 GIT binary patch literal 893 zcmV-@1A_dCP)wNH_sG0ou@{vnim0=e!3M6p)Szr=lXyDd2?eT_zvceGkr-d&GIRyfK=8BqhTN5^!4&F>!>od%NY=DisZM?2!+ zwM`O76LFxiO@fTh#evy7!^4V?#Z+&r8Jdfmw#W1m4_6od0Q}I@bTr1p)*+4Sy_xDW zA)`z2A?Z8CG`cbHnV-BT!PC#OUeMk%fp=iosgaMSn6?Dl1ns;gWaLC=Mph+>U_7X! zLrkw8?8Hc)-KmT}JXyzclJTv!0vj9oAZwo7<&7+>wGocqh=xY`U`$0vN0_bz8ySg< z9>&$I#L=#3V5HCLuZ*i%305}LC$#t}nq%5)WMvaiFE$4Nt^P^|W`V3^ zrqAO~G9JYZ`0D{H7->HJOE-3h7&H{YctpL+Kn8mo;{2-kbyrmn`-!Uc0MxO#lKn*W z4!#yJpy1x^V)pGfrr3_zPonW#*|(aG_WA5zi$FyC4h;6!(`A(D-&CY5pL~$t4kg$} zPxHYBVDBTQChM3e3XDXIc7Re*pder4e1@^y7jX+&$3#(}U=`V-SlJQm!%R`2U>A6k zbZ}PO7Q_CcDhib46@7kDT;pBgOX^9@CDmC`U|?6U9~DOfJoZAy?_?d8%X!V<*^}oo zuHcHd!ux?hH2quOC0NHyS3Ww!Ktx}hVfwO;ng78+M3LnmS;x#21|aes;3~ZvB9VR) zheR-LD7-%)D@4&Jjp=VV0A`QBnivEtDeE)XuRnGxSW#IY-Xde%%u2AblDGlFxS9L_ zxDsrj%WqGMT{nI}CKG?WIAB;7Lo7kEb zyThsk`DLb(Z9jXX>&Rhx&ES^|v9o}@pRZ#6OSUodRo}ncv{)4RyM1|6$ai^nPGlWp z=a^169L)lqr|u6-qaQ71LIQrp!`GqVnlPxnulYJso(Y{-`!3*z5A7ff_+GJRr0cyc ze2+~YTrBeu|8*}(Vh_ZAB#$fQ-HeB3dQT+dCb(fG#a-A&Kc}>r;c`W_`WmC$s T;lb#200000NkvXXu0mjffQhq( literal 0 HcmV?d00001 diff --git a/app/assets/asset-symbols/symbols.js b/app/assets/asset-symbols/symbols.js index 41b7c04d80..49987fb2a9 100644 --- a/app/assets/asset-symbols/symbols.js +++ b/app/assets/asset-symbols/symbols.js @@ -82,7 +82,11 @@ require("file-loader?name=asset-symbols/[name].png!./cof.png"); require("file-loader?name=asset-symbols/[name].png!./exr.png"); require("file-loader?name=asset-symbols/[name].png!./lcrt.png"); require("file-loader?name=asset-symbols/[name].png!./nvc.png"); -require("file-loader?name=asset-symbols/[name].png!./nmc.png"); +require("file-loader?name=asset-symbols/[name].png!./atri.png"); +require("file-loader?name=asset-symbols/[name].png!./bat.png"); +require("file-loader?name=asset-symbols/[name].png!./fil.png"); +require("file-loader?name=asset-symbols/[name].png!./usdc.png"); +require("file-loader?name=asset-symbols/[name].png!./usdn.png"); // 3rd party assets (RuDEX) require("file-loader?name=asset-symbols/[name].png!./ppy.png"); diff --git a/app/assets/asset-symbols/usdc.png b/app/assets/asset-symbols/usdc.png new file mode 100644 index 0000000000000000000000000000000000000000..09c2e4c8d425445929beeb0dc3e000c444ca5e2c GIT binary patch literal 3300 zcmXX}X*d*W8y;I(vP9XU9LpGU?Ax&(X)`l!mQuc_fN4AJ; zvyz=@u`>)~-_7!k@B6On-R|ePpXa`>_j>=liMMWA@bgOY0ssL1>y~Ertli{fa&xfO zca2f2000NzmbJq*3x8_>q#N*zX&lzBh`<67IK@CLfXQT?0RSfOWCZ~HpWV)50t0a@ zsK_FmaBzx21O*lh?gs`D{+~kj0R!_B_$LtAuK@1^!h25m za11bz#U!4z3dDg}C4sn;h9?kz`*yiJg77~%R-C29ss$nYS>6y>?qz2Mu+YI{s) zfKUTUNIc8DgikNas#3@xIAY?M#*l+!)j|k!)B~lEp+5q!dXatNK0V^zJ%1wctZP}{ zIc6zBb0;?Tj&&l4`ceJh2ogAaOeu5(6#QKUMbHW-E^QuyLI#yWhv6T7$vws1%^XFR z{oXyKQMZrPLkXsF15U3-L&_&twvLWy48!RDv4!2Ahis$3=W@Y z9a$Ti+aXMDsi5$|A19YK4rf;nmNyUg4(XMI711X>Ht1ocuu+|ezM`I`7Y(z6v)lKx z#y0n8?c?hY-%g}9&EbA+eZ(#=t{)yAGq(3>PfLEq)J%s~Oy+hhlE{1IILaqHMLC%8 z=Ii40%Kqs5&iilVmf^L3`&UbPmrF6reN$WaUXA@7Kd`k&o1*MzwJv0|%tu#G8^wIT z@nYz~>v6M$LDdj~fAP=fwKLuYKRn+52>&#t0LPW|EP;ZE_1{-bo`0uqA1$mM49skQ zn^-UCA}7_){#xF%Od9kn`f2xa#360eHg)()?DyKf6&juC@@5Tt2~UKFuuwdbZ&l7`H@3uqNN|*+1?Gq(4WVxGbmEQl%ZiR zu1a6n%F6c^wPyE80D#Bzy4h6+$1e0;B;*`YH1B-YV>S+M*(6DuamPZl;ZW6uBbvL1 zhsT?Du$pUl_MtSokkIpg&c@i^feHd(!@ zTDH`8N!jo?bZTm4{aA0UMG<(0c|G^Fy4Qs5tQ|2+}+0)ELQ8Kyh zAdEM1$|3A!iWQ2I-SEjDHct<0Co?RmT22ifdDgRt7~i1qokvJg$mcW~f1V|*np&0D zu1$&u`(tHA`Tdfz$91yJ>_WB8epiaeUBuAh z&J&rW+SL%;{Kol+n&vtCG$xGcq8jKkIkW_SU7RocFD7=`t!mKNeA|Qp+leGCs5mvP z%2JM39UBH@zYx#NHqcIM(<=wO5s$WtCU!-Uj}@`pr(!_U7TV&R2a`_A4MaC?yTgAF zIbXRSLbiND+OLD}x3U+UkrfHyq=olnKTc0vRu4V*m#%#E%-Y9?TdkjGK$=O8z2d?c z&%(29ZTA*9xOMhp)9t%T1f*}$Jc6=(OtAnAdYP`R?y4Q!j@y<9G&|TRNR%SrJkg7r z`n3)Z^kZx4*b}PtMb9y9v_O$A7jDJR7IW9aFG?3Dy7T_>N-jJK6)3P40&KpI>n(SW zz5Q2V;AmjQK7cdqO`?G^k++h1(-)i=dBv++B;eq7!;yY&NBINKrv@YD#%w|Zl9Myj z%w@$7eP$L8i4q#J*GuKjBdTqZr-)#0w=Jvtl}SYui?GtOQ>{N&{mT^%c}#&%z+XDu zP-;~X(%IV4!2>=_|1`Uft##D7&{4+STQcbqWlKH{rTMOE=0e?7J)*O52{X2({!O|T z_FRyZ$^!tlLe+0U;E5L4w41+-97OgLtiU zJWoFFfZ|*6bVyMDvB^78$%H1 zg)!i#=txm}x%vhuHrnO92p_(I17Se1%Pe0!lP1oXTjsrj-mi~Hc?U?x?CHbzI!f8v z*5!1~`riummQ23qGg4M5_2-weviM!ME5nnWuve{?Cf#aL<-$B0P{!8w=+&2*7m-2d z3<6SH@$*lnY{12@oJUtmr58(llA4c1scb}2> zt+{jQvBHkW7rK-{z9)AB*Uppyilf%AB%V_%K}Z-^e_^zN@hQ-~l875_ahkDHDqeF|P)7VS>R0hH zUb!Pj7$iC0E$1&$q4VHb{U12q@)Wmej^i-0Cx4{%I0+m-4nrR7Ntfnt5K1ZKkHkA% z?%8H&M9akxi`Ds`a7emx?og5lmmHekh5hu+yf~1*0XWsvp*@XyVv0RI=4V%vaDM~S zLLE)Aw;7h;nW`uuo|ez3;pt8kdTyo18^=Fs|Exw(hT{$QpM9+;!7)Bn)mOH=X!amk z{-WZ#%NtqBJt)A%iM^SKOfU6SpEpjFw6C3jWeF>*Ru4-JsSjM}F1uk=}$%`vP${;wmLaB_A}$ppiZ3EKJ9cU?!;)iv1P)+ zV!BZya9xBvn;0Z!w65lwcDi0+VfDgTwWHfr;fXdrc4?)zEv^Pc4D?5)P1blVZ*=>; zTHTj3vD7OI6~2FTb$Xhuw(6JabIJD;FASD_nKZJwY-6(bzJGKTgH_by+!VP&ooCRhiqwijJbZg2ijn7C* z53}*%REFJt=evDXQ#`$s|y~yv5e@iE{yDLz?#DYWt>N>lGXCs@cA+E#C zsJvB>r>FZcDkF7JrxJbU?#3S1&()7hwCs za!905=R9{@mT;?7NsQ(>y;gUdmjzPyFF--no4j(Nb|&iDFJ{k#WZFxaa6gs*+c+gt zRWk+3gT?ftAYC8<{}MCvx?rtpU4%xKsBDON?(5}_AxVe#IAg6a&nGT9qWP!}k?>?e zjR(OhwwLQC6uBIc#yJ=^52>C6pt^Lj9M%DC;(&hfvB3|{`35Z1Hy`26aqG7dTR9(u zbgypS@>vxG0WC1ec8rW@3GH@B9Kcu1NgtQtKz-gJ-ZIs@)F7m>!3{LKD49BZ)l2u5_}TD?Kk$UE?gqNO|#Sn91QB(%+Fk TlbLk#8@Yb%rdgG#YxI8rB=oSZ literal 0 HcmV?d00001 diff --git a/app/assets/asset-symbols/usdn.png b/app/assets/asset-symbols/usdn.png new file mode 100644 index 0000000000000000000000000000000000000000..294e3da68cec2a7a5948ccf179aefc4275830436 GIT binary patch literal 842 zcmV-Q1GW5#P)k~dc4XNc1oLmUS>J_IgQh0cb+MMCIY2wWfroe6=1$0Yd>IB*>#8v+M)5#miQ z1P&-6)SpZU985}#9<7JKfqaP7r?n6`h?_ZE81-*4HF)hb9s&ojv!-1n-yj+bffw7@ z%`a&87JJ&LJp^88W4pMdJ=gteqt)-SPrOX5wNYCLyvT(~tTAzWJ*6!R^Gd6;5j_N6 z;6lB>6l-kUEgsRX)wqZj0vk)9crJnBxrE>l*iZ_^a|!$wZI_R=8VQv{U?U$Wp3B$_ z?pCv$ssSjxLtq16D4w^0I0PCW82)&-8?RnE8GU=L2cTr=**MM+VBm5dY}h*cQ#4`! zRwxbOq2T=YM=nzdw$G)0;y6^(Xdz?|hdUfmSdbc;g=a{lYXehyyKYzW7!Ig2L4 zB0ikmemc67?Q^vlLJns-NS&Sixz?65arl%?u&<^RLNL81+4GH7=Lvh3DuoaR^QRY_ zi#0y5ms3fE0P$Q3`-oK~1oq&$4>5YNhqrt~pnn|j?izY&H8$w4ET0gDpP$X>XN{DQ zKJ*65Cj@%4XWv=l!q8*Qnlk8(CTR%tDP`U()|El85^Kt!FS+9~~I8m(T4e>&-HTs|R`4bC$u z#U8DyN(eIi{%B(Inuuy|~@u;IpRnA6=nF UiCT7^I{*Lx07*qoM6N<$f^MvNy#N3J literal 0 HcmV?d00001 diff --git a/app/branding.js b/app/branding.js index 59b9c68132..62d54983bf 100644 --- a/app/branding.js +++ b/app/branding.js @@ -186,7 +186,18 @@ export function getMyMarketsQuotes() { "XBTSX.COF", "XBTSX.MDL", "XBTSX.ETH", - "XBTSX.EXR" + "XBTSX.EXR", + "XBTSX.USDT", + "XBTSX.TUSD", + "XBTSX.USDC", + "XBTSX.USDN", + "XBTSX.USD", + "XBTSX.RUB", + "XBTSX.EUR", + "XBTSX.ATRI", + "XBTSX.FIL", + "XBTSX.EOS", + "XBTSX.BAT", ], otherTokens: ["CVCOIN", "HERO", "OCT", "HERTZ", "YOYOW"] }; From 1b6deb28eb5bf24f57a219268848a57eb458f53c Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 12 Feb 2021 22:40:54 +0100 Subject: [PATCH 113/141] fix bug in merket rows for #3333 --- app/components/Exchange/MarketRow.jsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/components/Exchange/MarketRow.jsx b/app/components/Exchange/MarketRow.jsx index 39fed09159..65672ecb7d 100644 --- a/app/components/Exchange/MarketRow.jsx +++ b/app/components/Exchange/MarketRow.jsx @@ -30,7 +30,12 @@ class MarketRow extends React.Component { componentDidMount() { this.statsChecked = new Date(); - if ("id" in this.props.base && "id" in this.props.quote) { + if ( + this.props.base.get && + this.props.base.get("id") && + this.props.quote.get && + this.props.quote.get("id") + ) { this.statsInterval = MarketsActions.getMarketStatsInterval( 35 * 1000, this.props.base, From 158e15d7f1605d11e641a5e7479b6c7510f3a665 Mon Sep 17 00:00:00 2001 From: Stefan Date: Mon, 15 Feb 2021 00:11:10 +0100 Subject: [PATCH 114/141] update charting lib to latest version --- .gitignore | 7 +- app/components/Exchange/Exchange.jsx | 4 +- .../Exchange/TradingViewPriceChart.jsx | 94 ++- app/components/Exchange/tradingViewClasses.js | 30 +- app/stores/MarketsStore.js | 2 +- .../charting_library.17.025.02b61a1c.zip.md5 | 1 + charting_library/charting_library.zip.md5 | 1 - charting_library/install-charting-library.js | 9 +- charting_library/package-charting-library.js | 4 +- charting_library/scss/base.scss | 674 ++++++++++++++++++ charting_library/scss/darkTheme.scss | 32 + charting_library/scss/lightTheme.scss | 30 + charting_library/scss/midnightTheme.scss | 32 + package-lock.json | 52 +- package.json | 4 +- 15 files changed, 877 insertions(+), 99 deletions(-) create mode 100644 charting_library/charting_library.17.025.02b61a1c.zip.md5 delete mode 100644 charting_library/charting_library.zip.md5 create mode 100644 charting_library/scss/base.scss create mode 100644 charting_library/scss/darkTheme.scss create mode 100644 charting_library/scss/lightTheme.scss create mode 100644 charting_library/scss/midnightTheme.scss diff --git a/.gitignore b/.gitignore index 038d9c14df..4641489b8d 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,9 @@ app/stats-dev.json app/stats-prod.json app/test/MarketClasses.js yarn.lock -charting_library/charting_library.zip + +charting_library/* +!charting_library/scss +!charting_library/charting_library.17.025.02b61a1c.zip.md5 +!charting_library/package-charting-library.js +!charting_library/install-charting-library.js \ No newline at end of file diff --git a/app/components/Exchange/Exchange.jsx b/app/components/Exchange/Exchange.jsx index 9e63e466f5..9c1c5b8b80 100644 --- a/app/components/Exchange/Exchange.jsx +++ b/app/components/Exchange/Exchange.jsx @@ -349,7 +349,7 @@ class Exchange extends React.Component { chartType: ws.get("chartType", "price_chart"), chartHeight: chart_height, chartZoom: ws.get("chartZoom", true), - chartTools: ws.get("chartTools", true), + chartTools: ws.get("chartTools", false), hideFunctionButtons: ws.get("hideFunctionButtons", true), currentPeriod: ws.get("currentPeriod", 3600 * 24 * 30 * 3), // 3 months showMarketPicker: false, @@ -2754,7 +2754,7 @@ class Exchange extends React.Component { className={"exchange--chart-control"} style={{ height: 33, - right: chartType == "price_chart" ? "5rem" : "15rem", + right: chartType == "price_chart" ? "6rem" : "15rem", top: "1px", position: "absolute", zIndex: 1, diff --git a/app/components/Exchange/TradingViewPriceChart.jsx b/app/components/Exchange/TradingViewPriceChart.jsx index bd89756176..806c94ea1b 100644 --- a/app/components/Exchange/TradingViewPriceChart.jsx +++ b/app/components/Exchange/TradingViewPriceChart.jsx @@ -1,5 +1,5 @@ import React from "react"; -const TradingView = require("../../../charting_library/charting_library.min.js"); +const TradingView = require("../../../charting_library/charting_library.esm"); import colors from "assets/colors"; import {getResolutionsFromBuckets, getTVTimezone} from "./tradingViewClasses"; import {Modal, Input, Table, Button, Icon} from "bitshares-ui-style-guide"; @@ -54,7 +54,8 @@ class TradingViewPriceChart extends React.Component { "border_around_the_chart", "header_symbol_search", "header_compare", - "header_saveload" + "header_saveload", + "header_settings" ]; let enabled_features = []; @@ -70,6 +71,7 @@ class TradingViewPriceChart extends React.Component { disabled_features.push("chart_events"); disabled_features.push("footer_share_buttons"); disabled_features.push("footer_screenshot"); + disabled_features.push("timeframes_toolbar"); disabled_features.push("footer_publish_idea_button"); disabled_features.push("caption_buttons_text_if_possible"); disabled_features.push("line_tool_templates"); @@ -93,10 +95,24 @@ class TradingViewPriceChart extends React.Component { if (__DEV__) console.log("*** Load Chart ***"); if (__DEV__) console.time("*** Chart load time: "); + // resolution / interval: length of one bar + // frame: total timeframe shown on the chart + // (in below list, text is frame) + const allTimes = props.buckets.map(bucket => { + return { + text: getResolutionsFromBuckets([bucket * 250], true)[0], + resolution: getResolutionsFromBuckets([bucket])[0] + }; + }); this.tvWidget = new TradingView.widget({ fullscreen: false, symbol: props.quoteSymbol + "_" + props.baseSymbol, interval: getResolutionsFromBuckets([props.bucketSize])[0], + timeframe: getResolutionsFromBuckets( + [props.bucketSize * 250], + true + )[0], + time_frames: allTimes, library_path: `${ __ELECTRON__ ? __BASE_URL__ : "" }/charting_library/`, @@ -109,15 +125,23 @@ class TradingViewPriceChart extends React.Component { autosize: true, locale: props.locale, timezone: getTVTimezone(), - toolbar_bg: themeColors.bgColor, + // toolbar_bg: themeColors.bgColor, + // theme: (props.theme == "darkTheme") ? "dark" : "light", overrides: { "paneProperties.background": themeColors.bgColor, "paneProperties.horzGridProperties.color": themeColors.axisLineColor, "paneProperties.vertGridProperties.color": - themeColors.axisLineColor, - "scalesProperties.lineColor": themeColors.axisLineColor, - "scalesProperties.textColor": themeColors.textColor + themeColors.axisLineColor + // "scalesProperties.lineColor": themeColors.axisLineColor, + // "scalesProperties.textColor": themeColors.textColor, + // "scalesProperties.backgroundColor": themeColors.bgColor, + // "mainSeriesProperties.candleStyle.upColor": "#", + // "mainSeriesProperties.candleStyle.downColor": "#", + // "mainSeriesProperties.hollowCandleStyle.upColor": "#", + // "mainSeriesProperties.hollowCandleStyle.downColor": "#", + // "mainSeriesProperties.haStyle.upColor": "#", + // "mainSeriesProperties.haStyle.downColor": "#" }, custom_css_url: props.theme + ".css", enabled_features: enabled_features, @@ -125,41 +149,39 @@ class TradingViewPriceChart extends React.Component { debug: false, preset: this.props.mobile ? "mobile" : "" }); - this.tvWidget.onChartReady(() => { + let widget = this.tvWidget; if (__DEV__) console.log("*** Chart Ready ***"); if (__DEV__) console.timeEnd("*** Chart load time: "); - this.tvWidget - .createButton() - .attr( - "title", - counterpart.translate("exchange.load_custom_charts") - ) - .addClass("apply-common-tooltip") - .on("click", () => { - that.setState({showLoadModal: true}); - }) - .append( - `${counterpart.translate( + if (!this.props.mobile && this.props.chartTools) { + widget.headerReady().then(() => { + if (__DEV__) console.log("*** Header Ready ***"); + const loadButton = this.tvWidget.createButton(); + loadButton.setAttribute( + "title", + counterpart.translate("exchange.load_custom_charts") + ); + loadButton.classList.add("apply-common-tooltip"); + loadButton.addEventListener("click", () => { + that.setState({showLoadModal: true}); + }); + loadButton.innerHTML = `${counterpart.translate( "exchange.chart_load" - )}` - ); - this.tvWidget - .createButton() - .attr( - "title", - counterpart.translate("exchange.save_custom_charts") - ) - .addClass("apply-common-tooltip") - .on("click", () => { - that.setState({showSaveModal: true}); - }) - .append( - `${counterpart.translate( + )}`; + const saveButton = this.tvWidget.createButton(); + saveButton.setAttribute( + "title", + counterpart.translate("exchange.save_custom_charts") + ); + saveButton.classList.add("apply-common-tooltip"); + saveButton.addEventListener("click", () => { + that.setState({showSaveModal: true}); + }); + saveButton.innerHTML = `${counterpart.translate( "exchange.chart_save" - )}` - ); - + )}`; + }); + } dataFeed.update({ onMarketChange: this._setSymbol.bind(this) }); diff --git a/app/components/Exchange/tradingViewClasses.js b/app/components/Exchange/tradingViewClasses.js index d30b697103..eb00bbd3fd 100644 --- a/app/components/Exchange/tradingViewClasses.js +++ b/app/components/Exchange/tradingViewClasses.js @@ -70,36 +70,30 @@ class SymbolInfo { } } -function getResolutionsFromBuckets(buckets) { +function getResolutionsFromBuckets(buckets, convertToFrame = false) { let resolutions = buckets .map(r => { let minute = r / 60; let day = minute / 60 / 24; let week = day / 7; - if (minute < 1) { + if (minute < 1 && !convertToFrame) { // below 1 minute we return Seconds return r + "S"; - } else if (day < 1 && parseInt(minute, 10) === minute) { + } else if ( + day < 1 && + parseInt(minute, 10) === minute && + !convertToFrame + ) { // below 1 day we return Minutes return minute.toString(); - } else if (week < 1) { - // below 1 week we return Days - if (day >= 1) { - if (parseInt(day, 10) === day) { - if (day === 1) return "D"; - return day + "D"; - } - } } else { - // we return weeks - if (week >= 1) { - if (parseInt(week, 10) === week) { - return week + "D"; - } - } + // below 1 week we return Days + day = parseInt(day, 10); + if (day === 1 && !convertToFrame) return "D"; + if (day === 0) return "1D"; + return day + "D"; } - return null; }) .filter(a => !!a); diff --git a/app/stores/MarketsStore.js b/app/stores/MarketsStore.js index 9d187c3413..b908a51562 100644 --- a/app/stores/MarketsStore.js +++ b/app/stores/MarketsStore.js @@ -170,7 +170,7 @@ class MarketsStore { } _getBucketSize() { - return parseInt(marketStorage.get("bucketSize", 4 * 3600)); + return parseInt(marketStorage.get("bucketSize", 3600)); } _setBucketSize(size) { diff --git a/charting_library/charting_library.17.025.02b61a1c.zip.md5 b/charting_library/charting_library.17.025.02b61a1c.zip.md5 new file mode 100644 index 0000000000..ad7955d2a4 --- /dev/null +++ b/charting_library/charting_library.17.025.02b61a1c.zip.md5 @@ -0,0 +1 @@ +7C1A43A054922FBAFBB49B40CC115B25 diff --git a/charting_library/charting_library.zip.md5 b/charting_library/charting_library.zip.md5 deleted file mode 100644 index 78577c8f2b..0000000000 --- a/charting_library/charting_library.zip.md5 +++ /dev/null @@ -1 +0,0 @@ -0F4B4F04A2BD6511722F666CA89248D1 \ No newline at end of file diff --git a/charting_library/install-charting-library.js b/charting_library/install-charting-library.js index 91d46732a7..9477bec18b 100644 --- a/charting_library/install-charting-library.js +++ b/charting_library/install-charting-library.js @@ -9,11 +9,12 @@ function getMD5Digest(file) { return hash.toUpperCase(); } -var outputFilePath = path.join(__dirname, "charting_library.zip"); +var outputFileName = "charting_library.17.025.02b61a1c.zip"; +var outputFilePath = path.join(__dirname, outputFileName); const outputFile = fs.createWriteStream(outputFilePath); -http.get("https://bitshares.org/assets/charting_library.zip", (response) => { - response.pipe(outputFile); +http.get("https://bitshares.org/assets/" + outputFileName, (response) => { + response.pipe(outputFile); }).on("error", (err) => { console.error("Failed to download charting_library archive"); console.error(err); @@ -21,7 +22,7 @@ http.get("https://bitshares.org/assets/charting_library.zip", (response) => { outputFile.on("finish", () => { const actualDigest = getMD5Digest(outputFilePath); - const expectedDigest = fs.readFileSync(outputFilePath + ".md5").toString(); + const expectedDigest = fs.readFileSync(outputFilePath + ".md5").toString().trim(); if (actualDigest !== expectedDigest) { fs.unlinkSync(outputFilePath); throw new Error("MD5 of downloaded file (" + actualDigest + ") not matches expected (" + expectedDigest + ")"); diff --git a/charting_library/package-charting-library.js b/charting_library/package-charting-library.js index afdefdddd2..b2c5c0ce86 100644 --- a/charting_library/package-charting-library.js +++ b/charting_library/package-charting-library.js @@ -4,9 +4,9 @@ var archiver = require("archiver"); const md5File = require("md5-file"); -var outputFile = path.join(__dirname, "charting_library.zip"); +var outputFile = path.join(__dirname, "charting_library.17.025.02b61a1c.zip"); const outFilename = path.basename(outputFile); -var ignoreFiles = [path.basename(__filename), outFilename, outFilename + ".md5", "install-charting-library.js"]; +var ignoreFiles = [path.basename(__filename), outFilename, outFilename + ".md5", "install-charting-library.js", "scss", "scss/**", "base.css", "darkTheme.css", "midnightTheme.css", "lightTheme.css"]; /** * @param {String} source diff --git a/charting_library/scss/base.scss b/charting_library/scss/base.scss new file mode 100644 index 0000000000..16884c8d80 --- /dev/null +++ b/charting_library/scss/base.scss @@ -0,0 +1,674 @@ +// main colors + +$primary-background: #383838 !default; +$primary-border-color: #535353 !default; +$primary-background-active: $primary-border-color !default; + +$primary-text-color: #bababa !default; +$primary-text-color-active: #059cce !default; + +$layout-top-button-border-color: $primary-border-color !default; + +$button-success-color: #fff !default; +$button-success-border: $primary-text-color-active !default; +$button-success-background: $primary-text-color-active !default; + +$button-default-color: $primary-text-color !default; +$button-default-border: $primary-background-active !default; +$button-default-background: $primary-background-active !default; + +$button-cancel-color: $primary-text-color !default; +$button-cancel-border: $primary-background-active !default; +$button-cancel-background: $primary-background-active !default; + +$primary-btn-color: $primary-text-color !default; +$primary-btn-background: #262626 !default; +$primary-btn-background-active: #2d2d2d !default; +$primary-btn-border-active: $primary-background-active !default; + +$icon-light-color: $primary-text-color !default; +$icon-light-color-active: $primary-text-color-active !default; + +.chart-page { + --tv-color-platform-background: #{$primary-background}; + --tv-color-pane-background: #{$primary-background}; + --tv-color-pane-background-secondary: #{$primary-background-active}; + --tv-color-toolbar-button-background-hover: #{$primary-btn-background-active}; + --tv-color-toolbar-button-background-secondary-hover: #{$primary-btn-background-active}; + --tv-color-toolbar-button-background-expanded: #{$primary-btn-background}; + --tv-color-toolbar-button-text: #{$primary-btn-color}; + --tv-color-toolbar-button-text-hover: #{$primary-btn-color}; + --tv-color-toolbar-button-text-active: #{$primary-btn-color}; + --tv-color-toolbar-button-text-active-hover: #{$primary-btn-color}; + --tv-color-item-active-text: #{$primary-btn-color}; + --tv-color-toolbar-toggle-button-background-active: #{$primary-btn-background-active}; + --tv-color-toolbar-toggle-button-background-active-hover: #{$primary-btn-background-active}; +} + +.layout__area--top { + // header buttons + .apply-common-tooltip { + cursor: pointer; + + background-color: $primary-btn-background; + color: $primary-btn-color !important; + + &:hover { + background-color: $primary-btn-background-active; + } + } +} + +// +//body.chart-page, .loading-indicator { +// --background: $primary-background; +//} +// +//.chart-page .chart-container { +// border: none; +// background: $primary-background; +//} +// +//.header-chart-panel .group { +// margin: 1px 0; +//} +// +///*Header buttons background color */ +//.header-chart-panel .button, +//.symbol-search-dialog .symbol-block input, +//input.symbol-edit, +//.favored-list-container span { +// background: #9e9e9e21; +// border: none; +//} +// +//.header-chart-panel .button.disabled { +// background: #9e9e9e21; +// border: none; +// opacity: 50%; +//} +// +///* Disabled features background color */ +//.feature-no-touch .header-chart-panel .button.disabled:active, +//.feature-touch .header-chart-panel .button.disabled:active, +//.header-chart-panel .button.disabled, +//.header-chart-panel .button.disabled.active { +// /*background: red;*/ +//} +// +///* Small close button */ +//.tv-close-panel { +// display: none; +// z-index: 999; +//} +// +//.tv-close-panel.top { +// bottom: -15px; +// background: $primary-background; +// border-color: $primary-background; +// margin-left: -5px; +// height: 8px; +//} +// +//.tv-close-panel.top:after { +// display: block; +// content: ""; +// position: absolute; +// width: 0; +// height: 0; +// border-style: solid; +// border-width: 0 5px 4px 5px; +// border-color: transparent transparent $icon-light-color transparent; +// top: 2px; +// left: 50%; +// margin-left: -5px; +//} +// +//.favored-list-container span { +// color: $icon-light-color; +//} +// +////.header-chart-panel-content .group svg { +//// fill: #bababa; +////} +// +////.header-chart-panel .button, .apply-common-tooltip { +//// background-color: #262626 !important; +////} +// +////.header-chart-panel .intervals-container .interval-dialog-button { +//// border-right-color: #383838; +////} +// +////.header-chart-panel .header-group-indicators .study-template-widget .submenu{ +//// border-left-color: #383838; +////} +// +//.on-widget .getimage .icon { +// fill: $icon-light-color !important; +//} +// +//.pane-legend { +// margin-top: 12px; +// margin-left: 12px; +//} +// +//.layout__area--top { +// .header-chart-panel-sizer { +// height: 42px !important; +// .header-chart-panel-content { +// padding: 5px !important; +// background: $primary-background; +// +// .button, .apply-common-tooltip { +// border: 1px solid $layout-top-button-border-color !important; +// background-color: $primary-btn-background; +// } +// +// // template button border +// .favored-list-container .submenu { +// border-color: $primary-background; +// } +// +// } +// } +// +// // header buttons +// .apply-common-tooltip { +// cursor: pointer; +// +// color: $primary-btn-color !important; +// +// svg { +// fill: $primary-btn-color !important; +// } +// +// i { +// background-color: $primary-btn-color !important; +// } +// +// &:hover { +// background-color: $primary-btn-background-active; +// &:before { +// border-color: transparent !important; +// } +// +// color: $icon-light-color-active !important; +// +// svg { +// fill: $icon-light-color-active !important; +// } +// +// i { +// background-color: $icon-light-color-active !important; +// } +// } +// } +// +// // study-template header button +// +// .study-template-widget { +// .apply-common-tooltip { +// border: 0 !important; +// margin-left: 1px; +// .tv-caret { +// margin-left: 7px; +// } +// } +// } +// +// // chart-style-widget header button +// +// .chart-style-widget { +// .apply-common-tooltip { +// margin-left: 1px; +// .tv-caret { +// margin-left: 7px; +// } +// } +// } +// +// // header group intervals +// .header-group-intervals { +// margin-right: 2px; +// .interval-dialog-button { +// margin: 0 1px; +// border-right: none !important; +// } +// .tv-caret { +// margin-left: 7px; +// } +// } +//} +// +//// dropdown list styling when user click on some dropdown btn +// +//.charts-popup-list { +// border: none; +// background-color: $primary-background; +// +// .special { +// color: $primary-text-color-active !important; +// background-color: $primary-background-active !important; +// } +// +// .item, span { +// color: $primary-text-color !important; +// +// //hover state +// &:hover { +// color: $primary-text-color-active !important; +// +// background: $primary-background-active !important; +// +// span { +// color: $primary-text-color-active !important; +// } +// } +// +// //active state +// &.active { +// color: $icon-light-color-active !important; +// +// background-color: $primary-background-active; +// } +// +// } +// +// .separator { +// border-color: $primary-border-color; +// } +// +//} +// +///* buttons */ +// +//.tv-button--default { +// color: $button-default-color; +// border-color: $button-default-border; +// background-color: $button-default-background; +// &:hover { +// color: $button-default-color; +// border-color: lighten($button-default-border, 20%) !important; +// background-color: lighten($button-default-background, 20%) !important; +// } +//} +// +//.tv-button--success { +// color: $button-success-color; +// border-color: $button-success-border; +// background-color: $button-success-background; +// &:hover { +// color: $button-success-color; +// border-color: lighten($button-success-border, 20%) !important; +// background-color: lighten($button-success-background, 20%) !important; +// } +//} +// +///* dialogs */ +// +//.tv-dialog { +// +// background-color: $primary-background; +// +// color: $primary-text-color; +// +// .js-reset-button, .js-dialog__close { +// svg { +// fill: $primary-text-color; +// } +// } +// +// .tv-dialog__title { +// color: $primary-text-color +// } +// +// .tv-dialog__section--title { +// border-color: $primary-border-color; +// } +// +// .tv-search-row { +// border-color: $primary-border-color; +// input { +// background-color: $primary-background; +// color: $primary-text-color; +// } +// } +// +// .tv-insert-study-item { +// &:hover { +// color: $primary-text-color-active; +// background-color: $primary-background-active; +// } +// } +// +// .tv-text { +// color: $primary-text-color; +// p { +// color: $primary-text-color; +// } +// } +// +// // when user clicks on save template as +// .tv-control-input { +// color: $primary-text-color; +// background-color: $primary-background; +// } +// +// .tv-dropdown__body { +// background-color: $primary-background !important; +// } +// +// .tv-autocomplete__dropdown-item { +// color: $primary-text-color; +// background-color: $primary-background !important; +// &:hover { +// color: $primary-text-color-active; +// } +// } +//} +// +//._tv-dialog { +// border-color: $primary-background-active; +// background-color: $primary-background; +// +// * { +// color: $primary-text-color; +// } +// +// .tv-tabs { +// &:before { +// background-color: $primary-border-color; +// } +// } +// +// input { +// border-color: $primary-border-color !important; +// background-color: $primary-background; +// +// color: $primary-text-color !important; +// } +// +// a { +// color: $primary-text-color !important; +// &:hover { +// color: $primary-text-color-active !important; +// } +// } +// +// label { +// color: $primary-text-color; +// } +// +// /* buttons */ +// +// .dialog-buttons { +// ._tv-button.tv-left { +// color: $button-default-color !important; +// border-color: $button-default-border !important; +// background-color: $button-default-background !important; +// &:hover { +// color: $button-default-color !important; +// border-color: lighten($button-default-border, 20%) !important; +// background-color: lighten($button-default-background, 20%) !important; +// } +// } +// ._tv-button.ok { +// color: $button-success-color !important; +// border-color: $button-success-border !important; +// background-color: $button-success-background !important; +// &:hover { +// color: $button-success-color !important; +// border-color: lighten($button-success-border, 20%) !important; +// background-color: lighten($button-success-background, 20%) !important; +// } +// } +// ._tv-button.cancel { +// color: $button-cancel-color !important; +// border-color: $button-cancel-border !important; +// background-color: $button-cancel-background !important; +// &:hover { +// color: $button-cancel-color !important; +// border-color: lighten($button-cancel-border, 20%) !important; +// background-color: lighten($button-cancel-background, 20%) !important; +// } +// } +// } +// +// /* select */ +// .tv-select-container.dialog { +// cursor: pointer; +// background-color: $primary-background !important; +// color: $primary-text-color !important; +// border-color: $primary-border-color !important; +// +// .sbOptions { +// li, a { +// background-color: $primary-background; +// color: $primary-text-color; +// &:hover { +// background-color: $primary-background-active; +// color: $primary-text-color-active; +// } +// } +// } +// +// .sbToggle, .sbSelector { +// cursor: pointer; +// } +// } +// +// /* input number */ +// .ticker.tv-text-input.inset.dialog { +// background-color: $primary-background; +// color: $primary-text-color; +// border-color: $primary-border-color; +// } +// .tv-ticker { +// background-color: $primary-background; +// color: $primary-text-color; +// .tv-ticker__btn { +// svg { +// fill: $primary-text-color; +// } +// background-color: $primary-background; +// border-color: $primary-border-color; +// } +// } +// /* end input number */ +// +// /* color picker */ +// .colorpicker-widget.tvcolorpicker-widget { +// border-color: $primary-border-color !important; +// } +// +// /* custom-select (line selector) */ +// .custom-select { +// .switcher { +// cursor: pointer; +// background-color: $primary-background !important; +// border-color: $primary-border-color !important; +// &:hover { +// border-color: $primary-border-color !important; +// &:before { +// border-color: $primary-border-color !important; +// } +// } +// } +// .items { +// background-color: $primary-background !important; +// border-color: $primary-border-color !important; +// .item { +// background-color: $primary-background !important; +// &.selected { +// background-color: $primary-background-active !important; +// } +// &:hover { +// background-color: $primary-background-active !important; +// } +// } +// } +// } +// +// /* font-size selector */ +// .tv-select-container-fontsize { +// border-color: $primary-border-color !important; +// ul { +// border-color: $primary-border-color !important; +// } +// } +// +//} +// +///* end dialogs*/ +// +///* bottom control bar */ +//.chart-controls-bar { +// .apply-common-tooltip { +// color: $primary-text-color !important; +// &:hover { +// background-color: transparent !important; +// color: $primary-text-color-active !important; +// } +// } +//} +// +///* go to dialog */ +// +//[class|=dialog] { +// background-color: $primary-background; +// [class|=header] { +// color: $primary-text-color; +// border-color: $primary-border-color; +// [class|=close] { +// svg { +// fill: $primary-text-color +// } +// &:hover { +// svg { +// fill: $primary-text-color-active; +// } +// } +// } +// } +// [class|=body] { +// input { +// color: $primary-text-color !important; +// background-color: $primary-background !important; +// border-color: $primary-border-color !important; +// } +// } +//} +// +// +//.layout__area--left { +// [class|=separator] { +// background-color: $primary-border-color; +// } +// [class|=inner] { +// background: $primary-background; +// [class|=buttonIcon] { +// color: $primary-text-color; +// } +// [class|=button] { +// &:hover { +// svg { +// fill: $primary-text-color-active !important; +// } +// } +// } +// span { +// svg { +// fill: $icon-light-color; +// } +// } +// [class|=isActive] { +// span { +// svg { +// fill: $icon-light-color-active; +// } +// } +// } +// } +//} +// +//.tv-floating-toolbar { +// border-color: $primary-border-color; +// background-color: $primary-background; +// +// .tv-grouped-floating-toolbar__sub-widget { +// transition: none; +// border-color: $primary-border-color; +// background-color: $primary-background; +// &:hover { +// border-color: $primary-border-color !important; +// background-color: $primary-background !important; +// } +// } +// +// .tv-floating-toolbar__content { +// background-color: $primary-background !important; +// +// .tv-floating-toolbar__widget { +// background-color: $primary-background !important; +// border-color: $primary-border-color; +// +// .apply-common-tooltip { +// background-color: $primary-background !important; +// } +// } +// +// } +// +// &.tv-linetool-properties-toolbar { +// .tv-linetool-properties-toolbar__color-picker { +// svg { +// fill: $primary-background; +// .bg { +// fill: $primary-background; +// } +// .icon { +// fill: $primary-text-color; +// } +// &:hover { +// .bg { +// fill: $primary-background; +// } +// } +// } +// } +// +// .tv-linetool-properties-toolbar__icon { +// svg { +// path { +// fill: $primary-text-color !important; +// } +// } +// } +// } +//} +// +///* dropdown menu when click on some items +// on left side menu +//*/ +// +//[class|=menuWrap] { +// [class|=menu] { +// background-color: $primary-background !important; +// [class|=item] { +// cursor: pointer; +// color: $primary-text-color; +// background-color: $primary-background !important; +// [class|=labelRow] { +// color: $primary-text-color !important; +// } +// &:hover { +// color: $primary-text-color-active; +// background-color: $primary-background-active !important; +// [class|=labelRow] { +// color: $primary-text-color-active !important; +// } +// } +// } +// } +//} diff --git a/charting_library/scss/darkTheme.scss b/charting_library/scss/darkTheme.scss new file mode 100644 index 0000000000..ed21364b3c --- /dev/null +++ b/charting_library/scss/darkTheme.scss @@ -0,0 +1,32 @@ +// main colors + +$primary-background: #383838; +$primary-border-color: #535353; +$primary-background-active: $primary-border-color; + +$layout-top-button-border-color: $primary-background; + +$primary-text-color: #bababa; +$primary-text-color-active: #059cce; + +$button-success-color: #fff; +$button-success-border: $primary-text-color-active; +$button-success-background: $primary-text-color-active; + +$button-default-color: $primary-text-color; +$button-default-border: $primary-background-active; +$button-default-background: $primary-background-active; + +$button-cancel-color: $primary-text-color; +$button-cancel-border: $primary-background-active; +$button-cancel-background: $primary-background-active; + +$primary-btn-color: $primary-text-color; +$primary-btn-background: #262626; +$primary-btn-background-active: #2d2d2d; +$primary-btn-border-active: $primary-background-active; + +$icon-light-color: $primary-text-color; +$icon-light-color-active: $primary-text-color-active; + +@import "./base"; diff --git a/charting_library/scss/lightTheme.scss b/charting_library/scss/lightTheme.scss new file mode 100644 index 0000000000..223d089b67 --- /dev/null +++ b/charting_library/scss/lightTheme.scss @@ -0,0 +1,30 @@ +// main colors + +$primary-background: #eee; +$primary-border-color: #e0e0e0; +$primary-background-active: #dadada; + +$primary-text-color: #656565; +$primary-text-color-active: #059cce; + +$button-success-color: #fff; +$button-success-border: $primary-text-color-active; +$button-success-background: $primary-text-color-active; + +$button-default-color: $primary-text-color; +$button-default-border: $primary-background-active; +$button-default-background: $primary-background-active; + +$button-cancel-color: $primary-text-color; +$button-cancel-border: $primary-background-active; +$button-cancel-background: $primary-background-active; + +$primary-btn-color: $primary-text-color; +$primary-btn-background: $primary-background; +$primary-btn-background-active: $primary-background-active; +$primary-btn-border-active: $primary-background-active; + +$icon-light-color: $primary-text-color; +$icon-light-color-active: $primary-text-color-active; + +@import "./base"; diff --git a/charting_library/scss/midnightTheme.scss b/charting_library/scss/midnightTheme.scss new file mode 100644 index 0000000000..aec3f47385 --- /dev/null +++ b/charting_library/scss/midnightTheme.scss @@ -0,0 +1,32 @@ +// main colors + +$primary-background: #2b2e37; +$primary-border-color: #373e47; +$primary-background-active: $primary-border-color; + +$layout-top-button-border-color: $primary-background; + +$primary-text-color: #b6bab7; +$primary-text-color-active: #059cce; + +$button-success-color: #fff; +$button-success-border: $primary-text-color-active; +$button-success-background: $primary-text-color-active; + +$button-default-color: $primary-text-color; +$button-default-border: $primary-background-active; +$button-default-background: $primary-background-active; + +$button-cancel-color: $primary-text-color; +$button-cancel-border: $primary-background-active; +$button-cancel-background: $primary-background-active; + +$primary-btn-color: $primary-text-color; +$primary-btn-background: #1d212d; +$primary-btn-background-active: #272b3c; +$primary-btn-border-active: $primary-background-active; + +$icon-light-color: $primary-text-color; +$icon-light-color-active: $primary-text-color-active; + +@import "./base"; diff --git a/package-lock.json b/package-lock.json index 5cd640cceb..7298ec1704 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9936,13 +9936,13 @@ } }, "globule": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz", - "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.2.tgz", + "integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==", "dev": true, "requires": { "glob": "~7.1.1", - "lodash": "~4.17.12", + "lodash": "~4.17.10", "minimatch": "~3.0.2" } }, @@ -14794,9 +14794,9 @@ } }, "js-base64": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz", - "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", + "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==", "dev": true }, "js-sha256": { @@ -15891,9 +15891,9 @@ "dev": true }, "nan": { - "version": "2.14.1", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz", - "integrity": "sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw==", + "version": "2.14.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", + "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==", "dev": true }, "nanomatch": { @@ -16123,9 +16123,9 @@ }, "dependencies": { "ajv": { - "version": "6.12.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz", - "integrity": "sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -16145,18 +16145,18 @@ } }, "fast-deep-equal": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", - "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", "dev": true, "requires": { - "ajv": "^6.5.5", + "ajv": "^6.12.3", "har-schema": "^2.0.0" } }, @@ -16166,12 +16166,6 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, - "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", - "dev": true - }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", @@ -19841,12 +19835,6 @@ "locate-path": "^3.0.0" } }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", diff --git a/package.json b/package.json index 43fc0fb23a..dd657c24f0 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,8 @@ "main": "build/electron/index.js", "scripts": { "postinstall": "npm run install-charting-library", - "compile-tv-css": "node-sass ./charting_library/static/scss/ --output ./charting_library/static/ --output-style compressed", - "install-charting-library": "node ./charting_library/install-charting-library.js", + "compile-tv-css": "node-sass ./charting_library/scss/ --output ./charting_library/ --output-style compressed", + "install-charting-library": "node ./charting_library/install-charting-library.js && npm run compile-tv-css", "test:market": "cross-env NODE_ENV=test mocha --require babel-core/register --watch --watch-extensions js ./app/test/marketTests", "bench:market": "cross-env NODE_ENV=test babel ./lib/common/MarketClasses.js -o ./app/test/MarketClasses.js && cross-env NODE_ENV=test node --harmony ./test/marketBenchmark", "profile-dev": "webpack --env.dev --env.profile --profile --json > stats-dev.json", From 5cd9e12dfca7a2ea154c788acbf3e78b9c99957c Mon Sep 17 00:00:00 2001 From: abitmore Date: Mon, 15 Feb 2021 20:03:07 -0500 Subject: [PATCH 115/141] Add phishing accounts --- app/lib/common/scamAccounts.js | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index effa97ee84..00a1eb46e3 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1440,5 +1440,33 @@ export const scamAccountsOther = [ "abit.committee-delegate", "1.2.1676892", "p3732551", - "1.2.397891" + "1.2.397891", + "witness-blockchain", + "1.2.1702664", + "huobui-pro", + "1.2.1795490", + "binanece-bts-1", + "1.2.1795443", + "zbbit001", + "1.2.1795542", + "houbui-pro", + "1.2.1795489", + "zbbls001", + "1.2.1795565", + "binaence-bts-1", + "1.2.1795582", + "hobui-pro", + "1.2.1795665", + "esrcow-67zgh", + "1.2.1795658", + "esrcow-panff", + "1.2.1795683", + "yykuxxu830905", + "1.2.1797839", + "aex-bts-dopesit-wallet", + "1.2.1795663", + "escrow-fgj7a", + "1.2.1795566", + "aex-bts-deposite-walet", + "1.2.1795541" ]; From 26bf22f99e0983f4e8c7373a2ac53103bb5d13b7 Mon Sep 17 00:00:00 2001 From: abitmore Date: Tue, 16 Feb 2021 02:37:11 -0500 Subject: [PATCH 116/141] Add phishing accounts --- app/lib/common/scamAccounts.js | 372 ++++++++++++++++++++++++++++++++- 1 file changed, 371 insertions(+), 1 deletion(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 00a1eb46e3..2b5b45355e 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1468,5 +1468,375 @@ export const scamAccountsOther = [ "escrow-fgj7a", "1.2.1795566", "aex-bts-deposite-walet", - "1.2.1795541" + "1.2.1795541", + "aex-bts-withdrawal-wallet-security", + "1.2.1694852", + "citadel-one", + "1.2.1701664", + "account-free", + "1.2.1700256", + "huobi-pro-security", + "1.2.1685151", + "huobi-bts-withdrawal-security", + "1.2.1694660", + "binance-bts-security", + "1.2.1695170", + "bitshares-dex.com", + "1.2.1784547", + "bitsharesdex.com-update1904454", + "1.2.1702044", + "bitsharesdex.com-security", + "1.2.1654426", + "bitshares-blockchain", + "1.2.1704232", + "bitshares-committee", + "1.2.1617075", + "bridge-assets", + "1.2.1680505", + "bridge-delegate", + "1.2.1699981", + "attention.hacker-attac.update-account", + "1.2.1679799", + "cn-vote.update", + "1.2.1791755", + "account-whitelist", + "1.2.1703478", + "committee-members", + "1.2.1672586", + "committee-capital", + "1.2.1672714", + "committee-member", + "1.2.1779077", + "committee-accaunt", + "1.2.1668194", + "committee-cryptobridge", + "1.2.1613328", + "committee-proposals-cryptobridge", + "1.2.1616990", + "committee-update.wallet", + "1.2.1680811", + "coommittee-proposals", + "1.2.1569126", + "committee-beos-update", + "1.2.1612406", + "committee-operator", + "1.2.1668188", + "committee-cnyoperator", + "1.2.1668177", + "committee-safe", + "1.2.1652200", + "committee-account.wallet", + "1.2.1680392", + "committee.data-lock", + "1.2.1672227", + "security-update", + "1.2.1621255", + "assets.committee-account", + "1.2.1680394", + "jademont-committee", + "1.2.1653895", + "cryptobridge-assist", + "1.2.1700317", + "cryptobridge-notification", + "1.2.1686969", + "cryptobridge.wallet-security", + "1.2.1662834", + "bitcrab-committee", + "1.2.1661890", + "bitcrab-security", + "1.2.1669292", + "bitcrab-delegate", + "1.2.1653889", + "dexbot-cryptobridge", + "1.2.1679899", + "deex-security", + "1.2.1697838", + "deliondex-witness", + "1.2.1701987", + "delegate-security", + "1.2.1649328", + "evraz-team", + "1.2.1701498", + "evraz-delegate", + "1.2.1703881", + "gdex-gateway", + "1.2.1783425", + "gdex-account", + "1.2.1700585", + "gdex-maintenance", + "1.2.1742757", + "gdex-proposals", + "1.2.1669295", + "gdex-update", + "1.2.1636052", + "gdex-whitelist", + "1.2.1761562", + "gdex-wallet-proposes", + "1.2.1669298", + "gdex.usdt-witness", + "1.2.1698882", + "obits-team", + "1.2.1701497", + "openledger.com-account", + "1.2.1653960", + "openledger-dc.witness", + "1.2.1678121", + "openledger-delegate", + "1.2.1623104", + "openledger-wallet.last-update", + "1.2.1702509", + "openledger-asset", + "1.2.1680387", + "openledger-team", + "1.2.1652169", + "openledger-news", + "1.2.1634974", + "openledger-notification", + "1.2.1686966", + "openledger-operator", + "1.2.1668859", + "openledger-proposal", + "1.2.1685599", + "openledger-wallet-security", + "1.2.1657279", + "openledger-dex.wallet", + "1.2.1680259", + "openledger-dex.account", + "1.2.1671740", + "openledgerdex-security", + "1.2.1656375", + "openledger-update-security", + "1.2.1621760", + "openledger-update.wallet", + "1.2.1684393", + "openledger-witness", + "1.2.1672208", + "openledger.bts-witness", + "1.2.1757518", + "openlegder-wallet", + "1.2.1574699", + "openledger-settings", + "1.2.1640823", + "openledger.io-update", + "1.2.1659323", + "openledger-new-option", + "1.2.1640335", + "openledgerdex-account", + "1.2.1668861", + "openledger-dex-wallet", + "1.2.1658954", + "openledger-deposition", + "1.2.1617054", + "openledgerdex-wallet", + "1.2.1657273", + "openservice1000", + "1.2.1640832", + "open-explorer.com", + "1.2.1672571", + "wallet-openledger", + "1.2.1680271", + "beos.gateway-wallet", + "1.2.1654890", + "beos-update", + "1.2.1613314", + "beos-market", + "1.2.1674026", + "beos-account", + "1.2.1665247", + "delegate-witness", + "1.2.1703158", + "transactions-blocked.recommendation-update", + "1.2.1679759", + "compumatrix-assets", + "1.2.1680396", + "compumatrix-witness", + "1.2.1698652", + "compumatrix-security", + "1.2.1675939", + "compumatrix-1", + "1.2.1678154", + "compamatrix1", + "1.2.1680878", + "bittrex-security-update", + "1.2.1695149", + "rudex-account", + "1.2.1700275", + "rudex-delegate", + "1.2.1699874", + "rudex-update", + "1.2.1612897", + "rudex-witness", + "1.2.1699897", + "rudex-farme", + "1.2.1664661", + "rudex-karma.contract", + "1.2.1699055", + "security-suport", + "1.2.1641465", + "sparkdex-wallet", + "1.2.1703512", + "wallet.bitshares.org-update", + "1.2.1782212", + "wallet.bitshares.org-security", + "1.2.1677407", + "wallet.bitshares.org-compumatrix", + "1.2.1675264", + "wallet-update", + "1.2.1684797", + "wallet-security", + "1.2.1656385", + "wallet.maintenance-security", + "1.2.1655293", + "libra-proposals", + "1.2.1663826", + "update-security", + "1.2.1621419", + "bitshares.org-wallet", + "1.2.1671745", + "bitshares.org-update", + "1.2.1653973", + "magicwallet-witness", + "1.2.1668200", + "delegate.freedom-witness", + "1.2.1666141", + "account-wallet", + "1.2.1685496", + "security-delegate", + "1.2.1669437", + "support-update", + "1.2.1652121", + "bitspark-committee", + "1.2.1653944", + "xbtsx-account", + "1.2.1700443", + "blockchain.com-wallet", + "1.2.1677087", + "sparkdex-delegate", + "1.2.1697883", + "account-update", + "1.2.1685113", + "witness-update", + "1.2.1785414", + "proposals-update", + "1.2.1620632", + "update-account", + "1.2.1679807", + "bitcoin.com-work", + "1.2.1682875", + "condor1", + "1.2.1692389", + "condor2", + "1.2.1692603", + "ugv-1", + "1.2.1672113", + "selo-67", + "1.2.1617731", + "kg-033", + "1.2.1601638", + "u-67", + "1.2.1785627", + "dusja-1", + "1.2.1791654", + "galogenco2", + "1.2.1702987", + "dizel1", + "1.2.1701576", + "lusi1", + "1.2.1684459", + "lusi51", + "1.2.1684396", + "bts552", + "1.2.1683740", + "ag475", + "1.2.1679233", + "game-ss", + "1.2.1702766", + "bitforint-market", + "1.2.1689684", + "tank-34", + "1.2.1601663", + "dubl-1", + "1.2.1640338", + "dubl-2", + "1.2.1641069", + "dubl-3", + "1.2.1641083", + "cuda-1", + "1.2.1651011", + "gru1", + "1.2.1689985", + "f0123f", + "1.2.1640161", + "shaie-uh", + "1.2.1649099", + "nu35ko", + "1.2.1658517", + "loijuufao3", + "1.2.1668748", + "sfbf1uhf1i381191kal", + "1.2.1653720", + "fsjkfu1hf818181", + "1.2.1673663", + "gliofdr229", + "1.2.1671362", + "bitcoin-wizards", + "1.2.457302", + "leon38marokko", + "1.2.1782246", + "orthodox-friar", + "1.2.645010", + "galvanzio845", + "1.2.880009", + "lus", // likely false positive + "1.2.142945", + "wit", // likely false positive + "1.2.5509", + "duolba26", + "1.2.446891", + "mstrader77", + "1.2.645984", + "dylan-1978", + "1.2.1600004", + "st4585k", + "1.2.780140", + "ippua1", + "1.2.392599", + "nicaracuaga-1", + "1.2.1653236", + "e-lena", + "1.2.1063803", + "dujuan0204", + "1.2.408553", + "liaofuxing-liaowenxin", + "1.2.1146367", + "blacknightdream410", + "1.2.1589532", + "pavelzcz-1", + "1.2.792058", + "grand-cryptos", // temporarily recoverable + "1.2.787832", + "vve732", + "1.2.803373", + "loto1", + "1.2.480686", + "phienho226loj", + "1.2.1088744", + "mrbrown1", + "1.2.109836", + "doyle", + "1.2.20952", + "ifeomadee1", + "1.2.1654233", + "barmaley6", + "1.2.1639497", + "danfreeus-702", + "1.2.494368", + "inlusoble88", + "1.2.1582517", + "tne6mujflmcoc", + "1.2.811935", + "mister-hankeh", + "1.2.593183", + "ed-tred", + "1.2.36103" ]; From 33706998d7c6aeff5be6295b7c8d1a8e2e034d9c Mon Sep 17 00:00:00 2001 From: abitmore Date: Tue, 16 Feb 2021 02:55:11 -0500 Subject: [PATCH 117/141] Add scam accounts --- app/lib/common/scamAccounts.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 2b5b45355e..fd22bf4e62 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1838,5 +1838,13 @@ export const scamAccountsOther = [ "mister-hankeh", "1.2.593183", "ed-tred", - "1.2.36103" + "1.2.36103", + "citizen1983", + "1.2.1096445", + "ghost-llk", + "1.2.1597865", + "vezunchik-account", + "1.2.462216", + "razdacha-bts", + "1.2.1646336" ]; From 47ac8c4d90aed354e4d4f7a608649718688d3b8c Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 16 Feb 2021 14:45:48 +0100 Subject: [PATCH 118/141] last styling for #3337 --- charting_library/scss/base.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charting_library/scss/base.scss b/charting_library/scss/base.scss index 16884c8d80..eb967d591f 100644 --- a/charting_library/scss/base.scss +++ b/charting_library/scss/base.scss @@ -35,14 +35,14 @@ $icon-light-color-active: $primary-text-color-active !default; --tv-color-pane-background-secondary: #{$primary-background-active}; --tv-color-toolbar-button-background-hover: #{$primary-btn-background-active}; --tv-color-toolbar-button-background-secondary-hover: #{$primary-btn-background-active}; - --tv-color-toolbar-button-background-expanded: #{$primary-btn-background}; + --tv-color-toolbar-button-background-expanded: #{$primary-background}; --tv-color-toolbar-button-text: #{$primary-btn-color}; --tv-color-toolbar-button-text-hover: #{$primary-btn-color}; --tv-color-toolbar-button-text-active: #{$primary-btn-color}; --tv-color-toolbar-button-text-active-hover: #{$primary-btn-color}; --tv-color-item-active-text: #{$primary-btn-color}; - --tv-color-toolbar-toggle-button-background-active: #{$primary-btn-background-active}; - --tv-color-toolbar-toggle-button-background-active-hover: #{$primary-btn-background-active}; + --tv-color-toolbar-toggle-button-background-active: #{$primary-background}; + --tv-color-toolbar-toggle-button-background-active-hover: #{$primary-background-active}; } .layout__area--top { @@ -50,7 +50,7 @@ $icon-light-color-active: $primary-text-color-active !default; .apply-common-tooltip { cursor: pointer; - background-color: $primary-btn-background; + background-color: $primary-background; color: $primary-btn-color !important; &:hover { From 2a8cc2f46716d54119f33b2a60fcdfa8f378a31a Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 16 Feb 2021 14:46:43 +0100 Subject: [PATCH 119/141] sync languages --- app/assets/locales/locale-de.json | 26 +++++++++++++++++++++ app/assets/locales/locale-en.json | 38 +++++++++++++++---------------- app/assets/locales/locale-es.json | 26 +++++++++++++++++++++ app/assets/locales/locale-fr.json | 26 +++++++++++++++++++++ app/assets/locales/locale-it.json | 26 +++++++++++++++++++++ app/assets/locales/locale-ja.json | 26 +++++++++++++++++++++ app/assets/locales/locale-ko.json | 26 +++++++++++++++++++++ app/assets/locales/locale-ru.json | 26 +++++++++++++++++++++ app/assets/locales/locale-tr.json | 26 +++++++++++++++++++++ app/assets/locales/locale-zh.json | 26 +++++++++++++++++++++ 10 files changed, 253 insertions(+), 19 deletions(-) diff --git a/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json index 8bc684194f..7142032556 100644 --- a/app/assets/locales/locale-de.json +++ b/app/assets/locales/locale-de.json @@ -1580,6 +1580,15 @@ "amount": "Betrag zum Tauschen", "submit": "Ok" }, + "create_lock": { + "amount": "Amount to lock", + "from": "Account to lock from", + "submit": "Lock", + "targetType": "Lock Type", + "title": "Create Lock", + "type_warning": "Please choose a lock type.", + "warning_message": "Note that locked assets must be requested to unlock, and can only be claimed back after the unlock period has passed. Current unlock period would be %(lock_days)s days" + }, "deposit": { "address_generation_error": "Adresse konnte nicht genieriert werden.", "amount": "Einzahlungsbetrag", @@ -1774,6 +1783,19 @@ "publish_feed": "{account} hat eine Preisangabe von {price} veröffentlicht.", "reg_account": "{registrar} hat das Konto {newaccount} registriert.", "set_proxy": "{account} hat {proxy} als seinen Vertreter eingestellt.", + "ticket_create": "{account} locked away {amount} in a ticket", + "ticket_types": { + "0": "Liquid", + "1": "Claimable 180 days after unlock request", + "2": "Claimable 360 days after unlock request", + "3": "Claimable 720 days after unlock request", + "4": "Locked forever", + "liquid": "Liquid", + "lock_180_days": "Claimable 180 days after unlock request", + "lock_360_days": "Claimable 360 days after unlock request", + "lock_720_days": "Claimable 720 days after unlock request", + "lock_forever": "Locked forever" + }, "transfer": "{from} hat {amount} an {to} überwiesen.", "transfer_account": "Konto {account} wurde an {to} übertragen.", "unlisted_by": "{lister} hat {listee} von der Liste gestrichen.", @@ -2559,6 +2581,7 @@ "proposal_create": "Vorschlag erstellen", "proposal_delete": "Vorschlag löschen", "proposal_update": "Vorschlag aktualisieren", + "ticket_create": "Create ticket", "transfer": "Überweisung", "transfer_from_blind": "Überweisung von blindem Konto", "transfer_to_blind": "Überweisung zu blinden Konten", @@ -2696,7 +2719,10 @@ } }, "voting": { + "create_ticket": "Lock 1 {asset}", "description": "The BitShares blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).", + "increase_voting_power": "Create Lock", + "ticket_explanation": "Obtain voting power by locking away the core token BTS.", "title": "Voting" }, "walkthrough": { diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json index 63062af8d7..013bcb3516 100644 --- a/app/assets/locales/locale-en.json +++ b/app/assets/locales/locale-en.json @@ -1583,10 +1583,10 @@ "create_lock": { "amount": "Amount to lock", "from": "Account to lock from", - "targetType": "Lock Type", - "type_warning": "Please choose a lock type.", "submit": "Lock", + "targetType": "Lock Type", "title": "Create Lock", + "type_warning": "Please choose a lock type.", "warning_message": "Note that locked assets must be requested to unlock, and can only be claimed back after the unlock period has passed. Current unlock period would be %(lock_days)s days" }, "deposit": { @@ -1783,17 +1783,6 @@ "publish_feed": "{account} published feed price of {price}", "reg_account": "{registrar} registered the account {new_account}", "set_proxy": "{account} set {proxy} as their voting proxy", - "transfer": "{from} sent {amount} to {to}", - "transfer_account": "{account} ownership transferred to {to}", - "unlisted_by": "{lister} unlisted the account {listee}", - "update_account": "{account} updated their account data {change}", - "vesting_balance_withdraw": "{account} withdrew vesting balance of {amount}", - "whitelisted_by": "{lister} whitelisted the account {listee}", - "witness_create": "{account} was upgraded to become a witness", - "witness_pay": "Withdrew witness pay to account", - "witness_receive": "Received witness from witness", - "witness_update": "{account} update its witness info", - "worker_create": "{account} created a worker proposal with daily pay of {pay}", "ticket_create": "{account} locked away {amount} in a ticket", "ticket_types": { "0": "Liquid", @@ -1806,7 +1795,18 @@ "lock_360_days": "Claimable 360 days after unlock request", "lock_720_days": "Claimable 720 days after unlock request", "lock_forever": "Locked forever" - } + }, + "transfer": "{from} sent {amount} to {to}", + "transfer_account": "{account} ownership transferred to {to}", + "unlisted_by": "{lister} unlisted the account {listee}", + "update_account": "{account} updated their account data {change}", + "vesting_balance_withdraw": "{account} withdrew vesting balance of {amount}", + "whitelisted_by": "{lister} whitelisted the account {listee}", + "witness_create": "{account} was upgraded to become a witness", + "witness_pay": "Withdrew witness pay to account", + "witness_receive": "Received witness from witness", + "witness_update": "{account} update its witness info", + "worker_create": "{account} created a worker proposal with daily pay of {pay}" }, "page404": { "asset_not_found_subtitle": "That asset does not exist", @@ -2581,6 +2581,7 @@ "proposal_create": "Create proposal", "proposal_delete": "Delete proposal", "proposal_update": "Update proposal", + "ticket_create": "Create ticket", "transfer": "Transfer", "transfer_from_blind": "Transfer from blinded account", "transfer_to_blind": "Transfer to blinded account", @@ -2593,8 +2594,7 @@ "witness_create": "Create witness", "witness_update": "Update witness", "witness_withdraw_pay": "Witness pay withdrawal", - "worker_create": "Create worker", - "ticket_create": "Create ticket" + "worker_create": "Create worker" }, "vesting_balance_create": "created vesting balance of", "view_json": "Show raw json", @@ -2719,11 +2719,11 @@ } }, "voting": { + "create_ticket": "Lock 1 {asset}", "description": "The BitShares blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).", - "title": "Voting", - "ticket_explanation": "Obtain voting power by locking away the core token BTS.", "increase_voting_power": "Create Lock", - "create_ticket": "Lock 1 {asset}" + "ticket_explanation": "Obtain voting power by locking away the core token BTS.", + "title": "Voting" }, "walkthrough": { "buy_form": "Place buy orders using this form.", diff --git a/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json index aa4175a3a0..dc6d7390d1 100644 --- a/app/assets/locales/locale-es.json +++ b/app/assets/locales/locale-es.json @@ -1580,6 +1580,15 @@ "amount": "Cantidad a convertir", "submit": "Ok" }, + "create_lock": { + "amount": "Amount to lock", + "from": "Account to lock from", + "submit": "Lock", + "targetType": "Lock Type", + "title": "Create Lock", + "type_warning": "Please choose a lock type.", + "warning_message": "Note that locked assets must be requested to unlock, and can only be claimed back after the unlock period has passed. Current unlock period would be %(lock_days)s days" + }, "deposit": { "address_generation_error": "No se puede generar la dirección", "amount": "Cantidad a depositar", @@ -1774,6 +1783,19 @@ "publish_feed": "{account} publicò precio de suministro de {price}", "reg_account": "{registrar} Cuenta registrada {new_account}", "set_proxy": "{account} set {proxy} como su proxy de voto", + "ticket_create": "{account} locked away {amount} in a ticket", + "ticket_types": { + "0": "Liquid", + "1": "Claimable 180 days after unlock request", + "2": "Claimable 360 days after unlock request", + "3": "Claimable 720 days after unlock request", + "4": "Locked forever", + "liquid": "Liquid", + "lock_180_days": "Claimable 180 days after unlock request", + "lock_360_days": "Claimable 360 days after unlock request", + "lock_720_days": "Claimable 720 days after unlock request", + "lock_forever": "Locked forever" + }, "transfer": "{from} enviado {amount} a {to}", "transfer_account": "{account} propiedad transferida a {to}", "unlisted_by": "{lister} delistada la cuenta {listee}", @@ -2559,6 +2581,7 @@ "proposal_create": "Crear propuesta", "proposal_delete": "Eliminar propuesta", "proposal_update": "Actualizar propuesta", + "ticket_create": "Create ticket", "transfer": "Transferencia", "transfer_from_blind": "Transferencia desde cuenta cegada", "transfer_to_blind": "Transferencia a la cuenta cegada", @@ -2696,7 +2719,10 @@ } }, "voting": { + "create_ticket": "Lock 1 {asset}", "description": "The BitShares blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).", + "increase_voting_power": "Create Lock", + "ticket_explanation": "Obtain voting power by locking away the core token BTS.", "title": "Voting" }, "walkthrough": { diff --git a/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json index f871c9280e..ef41fd0164 100644 --- a/app/assets/locales/locale-fr.json +++ b/app/assets/locales/locale-fr.json @@ -1574,6 +1574,15 @@ "amount": "Amount to Convert", "submit": "Ok" }, + "create_lock": { + "amount": "Amount to lock", + "from": "Account to lock from", + "submit": "Lock", + "targetType": "Lock Type", + "title": "Create Lock", + "type_warning": "Please choose a lock type.", + "warning_message": "Note that locked assets must be requested to unlock, and can only be claimed back after the unlock period has passed. Current unlock period would be %(lock_days)s days" + }, "deposit": { "address_generation_error": "Unable to generate address", "amount": "Amount to Deposit", @@ -1768,6 +1777,19 @@ "publish_feed": "{account} a publié un nouveau flux de {price}", "reg_account": "{registrar} a créé le compte {new_account}", "set_proxy": "{account} a choisi {proxy} pour son nouveau proxy", + "ticket_create": "{account} locked away {amount} in a ticket", + "ticket_types": { + "0": "Liquid", + "1": "Claimable 180 days after unlock request", + "2": "Claimable 360 days after unlock request", + "3": "Claimable 720 days after unlock request", + "4": "Locked forever", + "liquid": "Liquid", + "lock_180_days": "Claimable 180 days after unlock request", + "lock_360_days": "Claimable 360 days after unlock request", + "lock_720_days": "Claimable 720 days after unlock request", + "lock_forever": "Locked forever" + }, "transfer": "{from} a envoyé {amount} à {to}", "transfer_account": "{account} ownership transferred to {to}", "unlisted_by": "{lister} a délisté le compte {listee}", @@ -2553,6 +2575,7 @@ "proposal_create": "Création d'une proposition", "proposal_delete": "Suppresion d'une proposition", "proposal_update": "Mise à jour d'une proposition", + "ticket_create": "Create ticket", "transfer": "Transfert", "transfer_from_blind": "Transfer from blinded account", "transfer_to_blind": "Transfer to blinded account", @@ -2690,7 +2713,10 @@ } }, "voting": { + "create_ticket": "Lock 1 {asset}", "description": "The BitShares blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).", + "increase_voting_power": "Create Lock", + "ticket_explanation": "Obtain voting power by locking away the core token BTS.", "title": "Voting" }, "walkthrough": { diff --git a/app/assets/locales/locale-it.json b/app/assets/locales/locale-it.json index bfd616b3b7..2a70fc0a37 100644 --- a/app/assets/locales/locale-it.json +++ b/app/assets/locales/locale-it.json @@ -1574,6 +1574,15 @@ "amount": "Quantità da convertire", "submit": "Ok" }, + "create_lock": { + "amount": "Amount to lock", + "from": "Account to lock from", + "submit": "Lock", + "targetType": "Lock Type", + "title": "Create Lock", + "type_warning": "Please choose a lock type.", + "warning_message": "Note that locked assets must be requested to unlock, and can only be claimed back after the unlock period has passed. Current unlock period would be %(lock_days)s days" + }, "deposit": { "address_generation_error": "Unable to generate address", "amount": "Quantità da depositare", @@ -1768,6 +1777,19 @@ "publish_feed": "{account} ha pubblicato un feed price di {price}", "reg_account": "{registrar} ha registrato l'account {new_account}", "set_proxy": "{account} ha scelto {proxy} come suo proxy di voto", + "ticket_create": "{account} locked away {amount} in a ticket", + "ticket_types": { + "0": "Liquid", + "1": "Claimable 180 days after unlock request", + "2": "Claimable 360 days after unlock request", + "3": "Claimable 720 days after unlock request", + "4": "Locked forever", + "liquid": "Liquid", + "lock_180_days": "Claimable 180 days after unlock request", + "lock_360_days": "Claimable 360 days after unlock request", + "lock_720_days": "Claimable 720 days after unlock request", + "lock_forever": "Locked forever" + }, "transfer": "{from} ha inviato {amount} a {to}", "transfer_account": "L'ownership di {account} è stata transferita a {to}", "unlisted_by": "{lister} ha delistato l'account {listee}", @@ -2553,6 +2575,7 @@ "proposal_create": "Crea proposta", "proposal_delete": "Cancella proposta", "proposal_update": "Aggiorna proposta", + "ticket_create": "Create ticket", "transfer": "Trasferimento", "transfer_from_blind": "Trasferisci da blinded account", "transfer_to_blind": "Trasferisci a blinded account", @@ -2690,7 +2713,10 @@ } }, "voting": { + "create_ticket": "Lock 1 {asset}", "description": "The BitShares blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).", + "increase_voting_power": "Create Lock", + "ticket_explanation": "Obtain voting power by locking away the core token BTS.", "title": "Voting" }, "walkthrough": { diff --git a/app/assets/locales/locale-ja.json b/app/assets/locales/locale-ja.json index d20e6a1a6c..6093ddd91f 100644 --- a/app/assets/locales/locale-ja.json +++ b/app/assets/locales/locale-ja.json @@ -1574,6 +1574,15 @@ "amount": "変換数量", "submit": "OK" }, + "create_lock": { + "amount": "Amount to lock", + "from": "Account to lock from", + "submit": "Lock", + "targetType": "Lock Type", + "title": "Create Lock", + "type_warning": "Please choose a lock type.", + "warning_message": "Note that locked assets must be requested to unlock, and can only be claimed back after the unlock period has passed. Current unlock period would be %(lock_days)s days" + }, "deposit": { "address_generation_error": "アドレスを生成できません", "amount": "入金する数量", @@ -1768,6 +1777,19 @@ "publish_feed": "{account}はフィード価格 {price}を公開しました", "reg_account": "{registrar}は{new_account}のアカウントを登録しました", "set_proxy": "{account}は投票代理人に{proxy}を設定しました", + "ticket_create": "{account} locked away {amount} in a ticket", + "ticket_types": { + "0": "Liquid", + "1": "Claimable 180 days after unlock request", + "2": "Claimable 360 days after unlock request", + "3": "Claimable 720 days after unlock request", + "4": "Locked forever", + "liquid": "Liquid", + "lock_180_days": "Claimable 180 days after unlock request", + "lock_360_days": "Claimable 360 days after unlock request", + "lock_720_days": "Claimable 720 days after unlock request", + "lock_forever": "Locked forever" + }, "transfer": "{from}は{amount}を{to}に送りました", "transfer_account": "{account}の所有権を{to}に移転しました", "unlisted_by": "{lister}は{listee}をリストから外しました", @@ -2553,6 +2575,7 @@ "proposal_create": "提案を作成", "proposal_delete": "提案を削除", "proposal_update": "提案を更新", + "ticket_create": "Create ticket", "transfer": "転送", "transfer_from_blind": "匿名アカウントからの転送", "transfer_to_blind": "匿名アカウントに転送", @@ -2690,7 +2713,10 @@ } }, "voting": { + "create_ticket": "Lock 1 {asset}", "description": "The BitShares blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).", + "increase_voting_power": "Create Lock", + "ticket_explanation": "Obtain voting power by locking away the core token BTS.", "title": "Voting" }, "walkthrough": { diff --git a/app/assets/locales/locale-ko.json b/app/assets/locales/locale-ko.json index 998c62b9db..99134751f8 100644 --- a/app/assets/locales/locale-ko.json +++ b/app/assets/locales/locale-ko.json @@ -1574,6 +1574,15 @@ "amount": "Amount to Convert", "submit": "Ok" }, + "create_lock": { + "amount": "Amount to lock", + "from": "Account to lock from", + "submit": "Lock", + "targetType": "Lock Type", + "title": "Create Lock", + "type_warning": "Please choose a lock type.", + "warning_message": "Note that locked assets must be requested to unlock, and can only be claimed back after the unlock period has passed. Current unlock period would be %(lock_days)s days" + }, "deposit": { "address_generation_error": "Unable to generate address", "amount": "Amount to Deposit", @@ -1768,6 +1777,19 @@ "publish_feed": "{account} published feed price of {price}", "reg_account": "{registrar} registered the account {new_account}", "set_proxy": "{account} set {proxy} as their voting proxy", + "ticket_create": "{account} locked away {amount} in a ticket", + "ticket_types": { + "0": "Liquid", + "1": "Claimable 180 days after unlock request", + "2": "Claimable 360 days after unlock request", + "3": "Claimable 720 days after unlock request", + "4": "Locked forever", + "liquid": "Liquid", + "lock_180_days": "Claimable 180 days after unlock request", + "lock_360_days": "Claimable 360 days after unlock request", + "lock_720_days": "Claimable 720 days after unlock request", + "lock_forever": "Locked forever" + }, "transfer": "{from} sent {amount} to {to}", "transfer_account": "{account} ownership transferred to {to}", "unlisted_by": "{lister} unlisted the account {listee}", @@ -2553,6 +2575,7 @@ "proposal_create": "제안서 생성", "proposal_delete": "제안서 삭제", "proposal_update": "제안서 업데이트", + "ticket_create": "Create ticket", "transfer": "전송", "transfer_from_blind": "Transfer from blinded account", "transfer_to_blind": "Transfer to blinded account", @@ -2690,7 +2713,10 @@ } }, "voting": { + "create_ticket": "Lock 1 {asset}", "description": "The BitShares blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).", + "increase_voting_power": "Create Lock", + "ticket_explanation": "Obtain voting power by locking away the core token BTS.", "title": "Voting" }, "walkthrough": { diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json index 40f8ef3a1c..c183bca142 100644 --- a/app/assets/locales/locale-ru.json +++ b/app/assets/locales/locale-ru.json @@ -1580,6 +1580,15 @@ "amount": "Сумма к конвертации", "submit": "ОК" }, + "create_lock": { + "amount": "Amount to lock", + "from": "Account to lock from", + "submit": "Lock", + "targetType": "Lock Type", + "title": "Create Lock", + "type_warning": "Please choose a lock type.", + "warning_message": "Note that locked assets must be requested to unlock, and can only be claimed back after the unlock period has passed. Current unlock period would be %(lock_days)s days" + }, "deposit": { "address_generation_error": "Не удается сгенерировать адрес", "amount": "Сумма депозита", @@ -1774,6 +1783,19 @@ "publish_feed": "{account} опубликовал котировки {price}", "reg_account": "{registrar} зарегистрировал аккаунт {new_account}", "set_proxy": "{account} установил {proxy} в качестве своего прокси для голосования", + "ticket_create": "{account} locked away {amount} in a ticket", + "ticket_types": { + "0": "Liquid", + "1": "Claimable 180 days after unlock request", + "2": "Claimable 360 days after unlock request", + "3": "Claimable 720 days after unlock request", + "4": "Locked forever", + "liquid": "Liquid", + "lock_180_days": "Claimable 180 days after unlock request", + "lock_360_days": "Claimable 360 days after unlock request", + "lock_720_days": "Claimable 720 days after unlock request", + "lock_forever": "Locked forever" + }, "transfer": "{from} отправил {amount} на {to}", "transfer_account": "Владение {account} передано {to}", "unlisted_by": "{lister} удалил аккаунт {listee} из списка", @@ -2559,6 +2581,7 @@ "proposal_create": "Создание предложения", "proposal_delete": "Удаление предложения", "proposal_update": "Обновление предложения", + "ticket_create": "Create ticket", "transfer": "Перевод", "transfer_from_blind": "Перевод со слепого аккаунта", "transfer_to_blind": "Перевод на слепой аккаунт", @@ -2696,7 +2719,10 @@ } }, "voting": { + "create_ticket": "Lock 1 {asset}", "description": "Блокчейн BitShares позволяет держателям его базового токена BTS голосовать за производителей блоков (заверителей), членов комитета (управления блокчейном), рабочие предложения (оплата блокчейном задач и стратегических решений через Предложения/Опросы).", + "increase_voting_power": "Create Lock", + "ticket_explanation": "Obtain voting power by locking away the core token BTS.", "title": "Голосование" }, "walkthrough": { diff --git a/app/assets/locales/locale-tr.json b/app/assets/locales/locale-tr.json index 9fa55f00ca..55d69e4e10 100644 --- a/app/assets/locales/locale-tr.json +++ b/app/assets/locales/locale-tr.json @@ -1574,6 +1574,15 @@ "amount": "Amount to Convert", "submit": "Ok" }, + "create_lock": { + "amount": "Amount to lock", + "from": "Account to lock from", + "submit": "Lock", + "targetType": "Lock Type", + "title": "Create Lock", + "type_warning": "Please choose a lock type.", + "warning_message": "Note that locked assets must be requested to unlock, and can only be claimed back after the unlock period has passed. Current unlock period would be %(lock_days)s days" + }, "deposit": { "address_generation_error": "Unable to generate address", "amount": "Yatıralacak Miktar", @@ -1768,6 +1777,19 @@ "publish_feed": "{account} fiyat duyurdu: {price}", "reg_account": "{registrar} kayıt yaptırdı - Hesap adı: {new_account}", "set_proxy": "{account} oy kullanması için {proxy} adlı hesabı vekil tayin etti", + "ticket_create": "{account} locked away {amount} in a ticket", + "ticket_types": { + "0": "Liquid", + "1": "Claimable 180 days after unlock request", + "2": "Claimable 360 days after unlock request", + "3": "Claimable 720 days after unlock request", + "4": "Locked forever", + "liquid": "Liquid", + "lock_180_days": "Claimable 180 days after unlock request", + "lock_360_days": "Claimable 360 days after unlock request", + "lock_720_days": "Claimable 720 days after unlock request", + "lock_forever": "Locked forever" + }, "transfer": "{from} {amount} gönderdi - Alıcı: {to}", "transfer_account": "{account} adlı hesabın mülkiyeti {to} adlı hesaba devredildi.", "unlisted_by": "{lister} izin listesinden {listee} adlı hesabı çıkardı.", @@ -2553,6 +2575,7 @@ "proposal_create": "Teklif oluşturma", "proposal_delete": "Teklif silme", "proposal_update": "Teklif güncelleme", + "ticket_create": "Create ticket", "transfer": "Gönder", "transfer_from_blind": "Kör hesaptan transfer et", "transfer_to_blind": "Kör hesaba transfer", @@ -2690,7 +2713,10 @@ } }, "voting": { + "create_ticket": "Lock 1 {asset}", "description": "The BitShares blockchain allows the holders of its core token BTS to vote on block producers (witnesses), committee members (blockchain governance), worker proposals (reimbursement for tasks and strategic decisions through BSIPs/Polls).", + "increase_voting_power": "Create Lock", + "ticket_explanation": "Obtain voting power by locking away the core token BTS.", "title": "Voting" }, "walkthrough": { diff --git a/app/assets/locales/locale-zh.json b/app/assets/locales/locale-zh.json index dc73e71611..ae2128c98e 100644 --- a/app/assets/locales/locale-zh.json +++ b/app/assets/locales/locale-zh.json @@ -1580,6 +1580,15 @@ "amount": "兑换数量", "submit": "确定" }, + "create_lock": { + "amount": "Amount to lock", + "from": "Account to lock from", + "submit": "Lock", + "targetType": "Lock Type", + "title": "Create Lock", + "type_warning": "Please choose a lock type.", + "warning_message": "Note that locked assets must be requested to unlock, and can only be claimed back after the unlock period has passed. Current unlock period would be %(lock_days)s days" + }, "deposit": { "address_generation_error": "不能生成地址", "amount": "充值数量", @@ -1774,6 +1783,19 @@ "publish_feed": "{account} 发布了喂价 {price}", "reg_account": "{registrar} 登记了账户 {new_account}", "set_proxy": "{account} 将 {proxy} 设置为投票代理", + "ticket_create": "{account} locked away {amount} in a ticket", + "ticket_types": { + "0": "Liquid", + "1": "Claimable 180 days after unlock request", + "2": "Claimable 360 days after unlock request", + "3": "Claimable 720 days after unlock request", + "4": "Locked forever", + "liquid": "Liquid", + "lock_180_days": "Claimable 180 days after unlock request", + "lock_360_days": "Claimable 360 days after unlock request", + "lock_720_days": "Claimable 720 days after unlock request", + "lock_forever": "Locked forever" + }, "transfer": "{from} 将 {amount} 转账给 {to}", "transfer_account": "{account} 的账户权限转移给了 {to}", "unlisted_by": "{lister} 将 {listee} 移出清单", @@ -2559,6 +2581,7 @@ "proposal_create": "创建提案", "proposal_delete": "删除提案", "proposal_update": "更新提案", + "ticket_create": "Create ticket", "transfer": "转账", "transfer_from_blind": "从隐私账户转出", "transfer_to_blind": "向隐私账户转账", @@ -2696,7 +2719,10 @@ } }, "voting": { + "create_ticket": "Lock 1 {asset}", "description": "比特股区块链允许BTS token持有者投票决定区块生产者(见证人), 理事会成员(区块链管理者), 工作提案(任务赏金及BSIPs/Polls战略决策)。", + "increase_voting_power": "Create Lock", + "ticket_explanation": "Obtain voting power by locking away the core token BTS.", "title": "投票" }, "walkthrough": { From f7d4e163ab5f1831847f10c13dd1a2773bf6c3d7 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 16 Feb 2021 14:49:48 +0100 Subject: [PATCH 120/141] bump version --- package-lock.json | 53 ++++++++++++++--------------------------------- package.json | 2 +- 2 files changed, 17 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7298ec1704..152f5d833b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "BitShares2-light", - "version": "4.0.0", + "version": "5.0.20210216", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5163,8 +5163,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true } } @@ -6793,29 +6792,12 @@ } }, "create-react-class": { - "version": "15.6.3", - "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz", - "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==", + "version": "15.7.0", + "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.7.0.tgz", + "integrity": "sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==", "requires": { - "fbjs": "^0.8.9", "loose-envify": "^1.3.1", "object-assign": "^4.1.1" - }, - "dependencies": { - "fbjs": { - "version": "0.8.17", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", - "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", - "requires": { - "core-js": "^1.0.0", - "isomorphic-fetch": "^2.1.1", - "loose-envify": "^1.0.0", - "object-assign": "^4.1.0", - "promise": "^7.1.1", - "setimmediate": "^1.0.5", - "ua-parser-js": "^0.7.18" - } - } } }, "cross-env": { @@ -6978,8 +6960,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true }, "normalize-path": { @@ -8760,8 +8741,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true } } @@ -10655,9 +10635,9 @@ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", - "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true }, "inquirer": { @@ -15455,8 +15435,7 @@ }, "minimist": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "resolved": "", "dev": true } } @@ -18005,9 +17984,9 @@ } }, "rc-form": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/rc-form/-/rc-form-2.4.11.tgz", - "integrity": "sha512-8BL+FNlFLTOY/A5X6tU35GQJLSIpsmqpwn/tFAYQTczXc4dMJ33ggtH248Cum8+LS0jLTsJKG2L4Qp+1CkY+sA==", + "version": "2.4.12", + "resolved": "https://registry.npmjs.org/rc-form/-/rc-form-2.4.12.tgz", + "integrity": "sha512-sHfyWRrnjCHkeCYfYAGop2GQBUC6CKMPcJF9h/gL/vTmZB/RN6fNOGKjXrXjFbwFwKXUWBoPtIDDDmXQW9xNdw==", "requires": { "async-validator": "~1.11.3", "babel-runtime": "6.x", @@ -18016,6 +17995,7 @@ "hoist-non-react-statics": "^3.3.0", "lodash": "^4.17.4", "rc-util": "^4.15.3", + "react-is": "^16.13.1", "warning": "^4.0.3" }, "dependencies": { @@ -20346,8 +20326,7 @@ }, "kind-of": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "resolved": "", "dev": true } } diff --git a/package.json b/package.json index dd657c24f0..af1060e8c4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "BitShares2-light", - "version": "4.0.0", + "version": "5.0.20210216", "description": "Reference UI to showcase all features of the BitShares blockchain.", "homepage": "https://github.com/bitshares/bitshares-ui", "author": "BitShares UI Worker ", From fef5ff92e1f31922a31e378466997a99d2bb6834 Mon Sep 17 00:00:00 2001 From: Stefan Date: Tue, 16 Feb 2021 15:07:58 +0100 Subject: [PATCH 121/141] disable CITADEL and mark SPARK --- app/branding.js | 3 ++- app/components/Gateways/GatewaySelectorModal.jsx | 6 +++++- app/lib/common/gateways.js | 10 +++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/branding.js b/app/branding.js index 3206fc429f..5cdc128a5c 100644 --- a/app/branding.js +++ b/app/branding.js @@ -350,7 +350,8 @@ export function allowedGateway(gateway) { "GDEX", "XBTSX", "CITADEL", - "BRIDGE" // keep to display the warning icon, permanently disabled in gateways.js + "BRIDGE", // keep to display the warning icon, permanently disabled in gateways.js + "SPARKDEX" // keep to display the warning icon, permanently disabled in gateways.js ]; if (!gateway) { // answers the question: are any allowed? diff --git a/app/components/Gateways/GatewaySelectorModal.jsx b/app/components/Gateways/GatewaySelectorModal.jsx index 089ba0ce0d..c36f6b0997 100644 --- a/app/components/Gateways/GatewaySelectorModal.jsx +++ b/app/components/Gateways/GatewaySelectorModal.jsx @@ -194,8 +194,12 @@ class GatewaySelectorModal extends React.Component { const all = this._getRows(); let onChainConfig = {}; for (let i = 0; i < all.length; i++) { - if (!(await all[i].isEnabled({onlyOnChainConfig: true}))) + if (!(await all[i].isEnabled({onlyOnChainConfig: true}))) { onChainConfig[all[i].key] = await getGatewayConfig(all[i].key); + if (!onChainConfig[all[i].key]) { + onChainConfig[all[i].key] = {enabled: false}; + } + } } this.setState({onChainConfig}); } diff --git a/app/lib/common/gateways.js b/app/lib/common/gateways.js index effbe4c6a8..d361e6d4d4 100644 --- a/app/lib/common/gateways.js +++ b/app/lib/common/gateways.js @@ -125,14 +125,14 @@ export const availableGateways = { id: "SPARKDEX", name: "BitSpark", baseAPI: bitsparkAPIs, - isEnabled: _isEnabled("SPARKDEX"), + isEnabled: () => false, selected: false, options: { enabled: false, selected: false }, - landing: "https://www.bitspark.io/for-traders", - wallet: "https://dex.bitspark.io/" + landing: "https://www.bitspark.io/", + wallet: "Shutdown" }, BRIDGE: { id: "BRIDGE", @@ -181,7 +181,7 @@ export const availableGateways = { id: "CITADEL", name: "Citadel", baseAPI: citadelAPIs, - isEnabled: _isEnabled("CITADEL"), + isEnabled: () => false, selected: false, assetWithdrawlAlias: {monero: "xmr"}, // if asset name doesn't equal to memo options: { @@ -189,7 +189,7 @@ export const availableGateways = { selected: false }, landing: "https://citadel.li/", - wallet: "https://citadel.li/wallet/" + wallet: "Disabled" } }; From c9d9912a3550af1927192a8e4ae8f714a71ee6bd Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 17 Feb 2021 08:42:39 +0100 Subject: [PATCH 122/141] wrong versioning 210216 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5dc875ab6b..6185290d97 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "BitShares2-light", - "version": "5.0.20210216-rc1", + "version": "5.0.210216-rc1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b91537886b..5940f4b3fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "BitShares2-light", - "version": "5.0.20210216-rc1", + "version": "5.0.210216-rc1", "description": "Reference UI to showcase all features of the BitShares blockchain.", "homepage": "https://github.com/bitshares/bitshares-ui", "author": "BitShares UI Worker ", From 21efe7e427f76bf0bd5d7052d42fa7a9d760e991 Mon Sep 17 00:00:00 2001 From: abitmore Date: Fri, 19 Feb 2021 19:16:38 -0500 Subject: [PATCH 123/141] Add phishing accounts --- app/lib/common/scamAccounts.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index fd22bf4e62..949e33acdb 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -35,7 +35,9 @@ export const scamAccountsBittrex = [ "bittrex", "1.2.2343", "bittrex-deposits", - "1.2.161093" + "1.2.161093", + "bittrexacct1", + "1.2.1649570" ]; export const scamAccountsOther = [ @@ -1846,5 +1848,7 @@ export const scamAccountsOther = [ "vezunchik-account", "1.2.462216", "razdacha-bts", - "1.2.1646336" + "1.2.1646336", + "coinbasebase", + "1.2.1603952" ]; From cc43e1b6760d48f67499f3005251a92fd22a7951 Mon Sep 17 00:00:00 2001 From: abitmore Date: Sat, 20 Feb 2021 10:22:25 -0500 Subject: [PATCH 124/141] Add EOS deposit accounts used by exchanges and etc --- app/lib/common/scamAccounts.js | 176 ++++++++++++++++++++++++++++++++- 1 file changed, 174 insertions(+), 2 deletions(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 949e33acdb..1dec773594 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -20,7 +20,9 @@ export const scamAccountsPolo = [ "poloniex", "1.2.2340", "poloneix", - "1.2.24900" + "1.2.24900", + "poloniexeos1", + "1.2.1049362" ]; export const scamAccountsBittrex = [ @@ -1850,5 +1852,175 @@ export const scamAccountsOther = [ "razdacha-bts", "1.2.1646336", "coinbasebase", - "1.2.1603952" + "1.2.1603952", + "accountcreat", + "1.2.1799179", + "atomintlexch", + "1.2.1799180", + "bcgame222333", + "1.2.1799181", + "bcgameeoswin", + "1.2.1799182", + "beexpayioeos", + "1.2.1799183", + "bikicoineos5", + "1.2.1593635", + "bilaxyeos111", + "1.2.1799184", + "bitforexcoin", + "1.2.1596635", + "bithumbeos15", + "1.2.1677135", + "bithumbrecv1", + "1.2.1635360", + "bitmaxaddrz1", + "1.2.1109244", + "bitoctoeosio", + "1.2.1799185", + "bitruebitrue", + "1.2.1799186", + "bitvavodepos", + "1.2.1799187", + "bkexeosusers", + "1.2.1234827", + "btcturkeosio", + "1.2.1761232", + "btflwnetex24", + "1.2.1799188", + "bweosdeposit", + "1.2.1282180", + "bybitdeposit", + "1.2.1761243", + "catexioeosio", + "1.2.1799189", + "changenoweos", + "1.2.1799119", + "coinboxstore", + "1.2.1799190", + "coincolasave", + "1.2.1653599", + "coinealeoswa", + "1.2.1799191", + "coinexviabtc", + "1.2.1087752", + "coinonekorea", + "1.2.1150124", + "coinspoteos1", + "1.2.1603157", + "crexpayments", + "1.2.1799192", + "cryptocomeos", + "1.2.1761230", + "cryptomkteos", + "1.2.1799193", + "ctforeos2222", + "1.2.1147939", + "dcoindeposit", + "1.2.1212186", + "dfttothemoon", + "1.2.1158646", + "e1k2m1ynpoof", + "1.2.1703024", + "eoshoowallet", + "1.2.1080697", + "eosprimedice", + "1.2.1799194", + "eosupbitsusr", + "1.2.1703357", + "eoswithmixin", + "1.2.1212806", + "exmodeposits", + "1.2.1799195", + "exodussignup", + "1.2.1689962", + "freewalletin", + "1.2.1797385", + "gopaxdeposit", + "1.2.1150123", + "gxgxcomtotal", + "1.2.1799196", + "gyztsojzgage", + "1.2.1799197", + "hitbtcpayins", + "1.2.1080701", + "hotbitioeoss", + "1.2.1606463", + "hotbitkorean", + "1.2.1799198", + "ilovebityard", + "1.2.1799199", + "indodaxaccnt", + "1.2.1594372", + "koineksadres", + "1.2.1594877", + "korbiteosdep", + "1.2.1797390", + "kunaexchange", + "1.2.1211841", + "latokeneos11", + "1.2.1799200", + "lbkexdeposit", + "1.2.1637485", + "luckyfish321", + "1.2.1799201", + "makeaccounts", + "1.2.1799202", + "mathmathmath", + "1.2.1794559", + "mercatoxeos1", + "1.2.1604773", + "metalcccceos", + "1.2.1799203", + "mxcexdeposit", + "1.2.1261064", + "myeostokenin", + "1.2.1799204", + "nobitexeosw1", + "1.2.1799205", + "okcoincomeos", + "1.2.1761246", + "orinocotrade", + "1.2.1799206", + "paribuwallet", + "1.2.1273867", + "paribuwallet", + "1.2.1273867", + "probitwallet", + "1.2.1799207", + "radardeposit", + "1.2.1653604", + "stakecasino1", + "1.2.1799208", + "th3f4tw4113t", + "1.2.1681437", + "tokenbankpro", + "1.2.1211831", + "trustbitopro", + "1.2.1799209", + "unocoinindia", + "1.2.1799210", + "useosbinance", + "1.2.1761231", + "utexiopayin1", + "1.2.1799211", + "uytt1epvvwtn", + "1.2.1799212", + "wablockchain", + "1.2.1799213", + "walleteos125", + "1.2.1700871", + "whaleextrust", + "1.2.1147873", + "x1bitpaygate", + "1.2.1799214", + "xq3bcloi5tox", + "1.2.1799215", + "youhodlereos", + "1.2.1799216", + "yuo4dirjxmz4", + "1.2.1799217", + "z1wdmuuosmes", + "1.2.1770761", + "zebpaypayins", + "1.2.1799218" ]; From 9db734bb139f6dac84ddbd38f77fa8a250373998 Mon Sep 17 00:00:00 2001 From: abitmore Date: Sat, 20 Feb 2021 12:40:41 -0500 Subject: [PATCH 125/141] Add phishing accounts that send proposals --- app/lib/common/scamAccounts.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 1dec773594..33022bddf5 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1783,6 +1783,10 @@ export const scamAccountsOther = [ "1.2.1673663", "gliofdr229", "1.2.1671362", + "pocits-team", + "1.2.1702279", + "committee.blacklist-manager", + "1.2.1799121", "bitcoin-wizards", "1.2.457302", "leon38marokko", From f381993d588eee342f128593c2c4efe50c995fdb Mon Sep 17 00:00:00 2001 From: abitmore Date: Mon, 22 Feb 2021 10:50:03 -0500 Subject: [PATCH 126/141] Add phishing accounts --- app/lib/common/scamAccounts.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 33022bddf5..3236ee850a 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1473,6 +1473,12 @@ export const scamAccountsOther = [ "1.2.1795566", "aex-bts-deposite-walet", "1.2.1795541", + "aex-bts-deposit-wellat", + "1.2.1799240", + "bineance-bts-1", + "1.2.1799262", + "juhiy011-01", + "1.2.1798466", "aex-bts-withdrawal-wallet-security", "1.2.1694852", "citadel-one", From 608858f73ec6c58179f6254dd787b9fbfa61e1b5 Mon Sep 17 00:00:00 2001 From: Abit Date: Mon, 22 Feb 2021 18:41:04 +0100 Subject: [PATCH 127/141] Rethrow error when failed to download charting lib --- charting_library/install-charting-library.js | 1 + 1 file changed, 1 insertion(+) diff --git a/charting_library/install-charting-library.js b/charting_library/install-charting-library.js index 9477bec18b..e0336270df 100644 --- a/charting_library/install-charting-library.js +++ b/charting_library/install-charting-library.js @@ -18,6 +18,7 @@ http.get("https://bitshares.org/assets/" + outputFileName, (response) => { }).on("error", (err) => { console.error("Failed to download charting_library archive"); console.error(err); + throw (err); }); outputFile.on("finish", () => { From d26abd685b4adeff685d1aaf87b75cd6bfb326dc Mon Sep 17 00:00:00 2001 From: Abit Date: Wed, 24 Feb 2021 16:34:47 +0100 Subject: [PATCH 128/141] Check scam for linked_status with higher priority --- app/components/Account/AccountSelector.jsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/components/Account/AccountSelector.jsx b/app/components/Account/AccountSelector.jsx index 6b90231650..a5b1365557 100644 --- a/app/components/Account/AccountSelector.jsx +++ b/app/components/Account/AccountSelector.jsx @@ -458,25 +458,25 @@ class AccountSelector extends React.Component { error || disableActionButton; - if (selectedAccount && selectedAccount.isOwnAccount) { + if (selectedAccount && selectedAccount.isKnownScammer) { linked_status = ( - - + + ); - } else if (selectedAccount && selectedAccount.isKnownScammer) { + } else if (selectedAccount && selectedAccount.isOwnAccount) { linked_status = ( - - + + ); From 69dee1484ad75a084500afe1c520f8891ad9675b Mon Sep 17 00:00:00 2001 From: Abit Date: Wed, 24 Feb 2021 16:50:14 +0100 Subject: [PATCH 129/141] Add option to exclude my accounts from selector --- app/components/Account/AccountSelector.jsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/components/Account/AccountSelector.jsx b/app/components/Account/AccountSelector.jsx index a5b1365557..b375cb515f 100644 --- a/app/components/Account/AccountSelector.jsx +++ b/app/components/Account/AccountSelector.jsx @@ -52,6 +52,7 @@ class AccountSelector extends React.Component { allowUppercase: PropTypes.bool, // use it if you need to allow uppercase letters typeahead: PropTypes.bool, excludeAccounts: PropTypes.array, // array of accounts to exclude from the typeahead + includeMyActiveAccounts: PropTypes.bool, // whether to include my active accounts in the list focus: PropTypes.bool, disabled: PropTypes.bool, editable: PropTypes.bool, @@ -63,6 +64,7 @@ class AccountSelector extends React.Component { static defaultProps = { autosubscribe: false, excludeAccounts: [], + includeMyActiveAccounts: true, disabled: null, editable: null, locked: false, @@ -86,9 +88,11 @@ class AccountSelector extends React.Component { if (accountName) { this._addThisToIndex(accountName); } - this.props.myActiveAccounts.map(a => { - this._addThisToIndex(a); - }); + if (this.props.includeMyActiveAccounts) { + this.props.myActiveAccounts.map(a => { + this._addThisToIndex(a); + }); + } this.props.contacts.map(a => { this._addThisToIndex(a); }); From 6344d11de459867aae099cbd1a9e83a0d5fef789 Mon Sep 17 00:00:00 2001 From: Abit Date: Wed, 24 Feb 2021 16:53:11 +0100 Subject: [PATCH 130/141] Do not include my accounts in transfer.to field --- app/components/Modal/SendModal.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/app/components/Modal/SendModal.jsx b/app/components/Modal/SendModal.jsx index 2e9a3f1d42..fa9d332f36 100644 --- a/app/components/Modal/SendModal.jsx +++ b/app/components/Modal/SendModal.jsx @@ -616,6 +616,7 @@ class SendModal extends React.Component { this )} typeahead={true} + includeMyActiveAccounts={false} tabIndex={tabIndex++} /> From 7c1456d7c4d84c7574ab75856ed51ecb20df6b02 Mon Sep 17 00:00:00 2001 From: abitmore Date: Wed, 24 Feb 2021 11:35:03 -0500 Subject: [PATCH 131/141] Update account filter on typehead --- app/components/Account/AccountSelector.jsx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/app/components/Account/AccountSelector.jsx b/app/components/Account/AccountSelector.jsx index b375cb515f..b5222874e9 100644 --- a/app/components/Account/AccountSelector.jsx +++ b/app/components/Account/AccountSelector.jsx @@ -527,7 +527,7 @@ class AccountSelector extends React.Component { return null; } if ( - account.data.isOwnAccount || + (this.props.includeMyActiveAccount && account.data.isOwnAccount) || (!this.props.locked && account.data.isContact) || (accountName && account.data.name === accountName) ) { @@ -552,15 +552,13 @@ class AccountSelector extends React.Component { value={account.data.name} disabled={account.data.disabled ? true : undefined} > - {account.data.isOwnAccount ? ( - - ) : null} - {account.data.isContact ? ( - - ) : null} {account.data.isKnownScammer ? ( - ) : null} + ) : {account.data.isOwnAccount ? ( + + ) : {account.data.isContact ? ( + + ) : null} } }   {account.data.name} From 21889451d6b1869f68e6f4a1039a45bde803ef6f Mon Sep 17 00:00:00 2001 From: abitmore Date: Wed, 24 Feb 2021 11:40:12 -0500 Subject: [PATCH 132/141] Update right label --- app/components/Account/AccountSelector.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/components/Account/AccountSelector.jsx b/app/components/Account/AccountSelector.jsx index b5222874e9..2281e74a03 100644 --- a/app/components/Account/AccountSelector.jsx +++ b/app/components/Account/AccountSelector.jsx @@ -669,11 +669,11 @@ class AccountSelector extends React.Component { ); - } else if (selectedAccount && selectedAccount.isOwnAccount) { + } else if (selectedAccount && selectedAccount.isContact) { linked_status = ( - + ); - } else if (selectedAccount && selectedAccount.isContact) { + } else if (selectedAccount && selectedAccount.isOwnAccount) { linked_status = ( - + ); @@ -554,10 +554,10 @@ class AccountSelector extends React.Component { > {account.data.isKnownScammer ? ( - ) : {account.data.isOwnAccount ? ( - ) : {account.data.isContact ? ( + ) : {account.data.isOwnAccount ? ( + ) : null} } }   {account.data.name} From 99bfe1cd1a9f701f090a1917a7a9e92be1e08e1c Mon Sep 17 00:00:00 2001 From: abitmore Date: Wed, 24 Feb 2021 11:54:58 -0500 Subject: [PATCH 134/141] Fix syntax --- app/components/Account/AccountSelector.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/Account/AccountSelector.jsx b/app/components/Account/AccountSelector.jsx index 2dbe566de2..e69fb5408d 100644 --- a/app/components/Account/AccountSelector.jsx +++ b/app/components/Account/AccountSelector.jsx @@ -554,11 +554,11 @@ class AccountSelector extends React.Component { > {account.data.isKnownScammer ? ( - ) : {account.data.isContact ? ( + ) : (account.data.isContact ? ( - ) : {account.data.isOwnAccount ? ( + ) : (account.data.isOwnAccount ? ( - ) : null} } } + ) : null) ) }   {account.data.name} From b7729ca81e187722dc0f06f9e1468577e62e862e Mon Sep 17 00:00:00 2001 From: abitmore Date: Thu, 25 Feb 2021 04:41:56 -0500 Subject: [PATCH 135/141] Add STEEM deposit accounts used by exchanges --- app/lib/common/scamAccounts.js | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 3236ee850a..45b864edd2 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1861,6 +1861,7 @@ export const scamAccountsOther = [ "1.2.462216", "razdacha-bts", "1.2.1646336", + // EOS "coinbasebase", "1.2.1603952", "accountcreat", @@ -2032,5 +2033,30 @@ export const scamAccountsOther = [ "z1wdmuuosmes", "1.2.1770761", "zebpaypayins", - "1.2.1799218" + "1.2.1799218", + // STEEM + "bitsonicpro", + "1.2.1799436", + "bitvavo", + "1.2.1785173", + "deepcrypto8", + "1.2.1211130", + "deposit-kr", + "1.2.1787961", + "gateiodeposit", + "1.2.1783716", + "ionomy", + "1.2.1799435", + "mxcsteem", + "1.2.1785904", + "orinoco", + "1.2.1794558", + "probitsteem", + "1.2.1791239", + "receiver-kr", + "1.2.1787962", + "receiver-pro", + "1.2.1787963", + "user.dunamu", + "1.2.1761235" ]; From c7c8961662359b772133692398fd329d3af7f5e6 Mon Sep 17 00:00:00 2001 From: abitmore Date: Thu, 25 Feb 2021 04:43:54 -0500 Subject: [PATCH 136/141] Remove a duplicate account --- app/lib/common/scamAccounts.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 45b864edd2..dd01ad2e9a 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1994,8 +1994,6 @@ export const scamAccountsOther = [ "1.2.1799206", "paribuwallet", "1.2.1273867", - "paribuwallet", - "1.2.1273867", "probitwallet", "1.2.1799207", "radardeposit", From 94836137758a89f14c5b4923566c9c2b18058d17 Mon Sep 17 00:00:00 2001 From: Abit Date: Sun, 28 Feb 2021 16:54:15 +0100 Subject: [PATCH 137/141] Add a phishing account --- app/lib/common/scamAccounts.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index dd01ad2e9a..86eceb1053 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1479,6 +1479,8 @@ export const scamAccountsOther = [ "1.2.1799262", "juhiy011-01", "1.2.1798466", + "huoboi-pro", + "1.2.1799492", "aex-bts-withdrawal-wallet-security", "1.2.1694852", "citadel-one", From f1a33be63772a9cee340cdf673689cb64f737831 Mon Sep 17 00:00:00 2001 From: Abit Date: Sun, 28 Feb 2021 18:31:29 +0100 Subject: [PATCH 138/141] Add an account related to phishing accounts --- app/lib/common/scamAccounts.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 86eceb1053..da7ba0af9c 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1481,6 +1481,8 @@ export const scamAccountsOther = [ "1.2.1798466", "huoboi-pro", "1.2.1799492", + "sarkie1337", + "1.2.1799478", "aex-bts-withdrawal-wallet-security", "1.2.1694852", "citadel-one", From 41dc80cdc72fc89cea4e62a8fd7dc52bec5232f5 Mon Sep 17 00:00:00 2001 From: abitmore Date: Sun, 28 Feb 2021 13:45:06 -0500 Subject: [PATCH 139/141] Add accounts related to phishing accounts --- app/lib/common/scamAccounts.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index da7ba0af9c..e20c941330 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1483,6 +1483,10 @@ export const scamAccountsOther = [ "1.2.1799492", "sarkie1337", "1.2.1799478", + "niegoe9ia", + "1.2.1799397", + "botgate11", + "1.2.1799462", "aex-bts-withdrawal-wallet-security", "1.2.1694852", "citadel-one", From 2f20213030ae691b22034bdc46480565d2d4a42a Mon Sep 17 00:00:00 2001 From: abitmore Date: Sun, 28 Feb 2021 17:38:11 -0500 Subject: [PATCH 140/141] Add new phishing accounts --- app/lib/common/scamAccounts.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index e20c941330..8ca86db4d7 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1487,6 +1487,14 @@ export const scamAccountsOther = [ "1.2.1799397", "botgate11", "1.2.1799462", + "zblbts001", + "1.2.1799353", + "gate-bts-io66", + "1.2.1798716", + "houdi-pro", + "1.2.1795562", + "binaince-bts-1", + "1.2.1798345", "aex-bts-withdrawal-wallet-security", "1.2.1694852", "citadel-one", From efe94c3b8dc654c39872434eed179fcd6fd040e4 Mon Sep 17 00:00:00 2001 From: abitmore Date: Sun, 28 Feb 2021 20:21:36 -0500 Subject: [PATCH 141/141] Add accounts related to phishing accounts --- app/lib/common/scamAccounts.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js index 8ca86db4d7..f3f2ec9ffa 100644 --- a/app/lib/common/scamAccounts.js +++ b/app/lib/common/scamAccounts.js @@ -1495,6 +1495,12 @@ export const scamAccountsOther = [ "1.2.1795562", "binaince-bts-1", "1.2.1798345", + "hujoyy-131hk", + "1.2.1799561", + "hitxxxrav25", + "1.2.1799380", + "subzyng11", + "1.2.1799563", "aex-bts-withdrawal-wallet-security", "1.2.1694852", "citadel-one",