Merge develop branch into staging branch

.gitignore

@@ -22,6 +22,6 @@ app/test/MarketClasses.js
 
 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.cjs
+!charting_library/charting_library.29.4.0.zip.md5
+!charting_library/package-charting-library.cjs
+!charting_library/install-charting-library.cjs

app/api/apiConfig.js

@@ -145,15 +145,7 @@ export const settingsAPIs = {
             contact: "email:admin@iobanker.com"
         },
         {
-            url: "wss://mainnet-node.btspp.io",
-            region: "Eastern Asia",
-            country: "China",
-            location: "Hangzhou",
-            operator: "Witness: btspp-witness",
-            contact: "telegram:btsplusplus"
-        },
-        {
-            url: "wss://api.bts.mobi/ws",
+            url: "wss://api.bitshares.dev/ws",
             region: "Northern America",
             country: "U.S.A.",
             location: "Virginia",
@@ -168,22 +160,6 @@ export const settingsAPIs = {
             operator: "Witness: roelandp",
             contact: "telegram:roelandp"
         },
-        {
-            url: "wss://api.61bts.com",
-            region: "Eastern Asia",
-            country: "China",
-            location: "Shandong",
-            operator: "Witness: liuye",
-            contact: "email:work@akawa.ink"
-        },
-        {
-            url: "wss://api-us.61bts.com",
-            region: "Northern America",
-            country: "USA",
-            location: "St. Louis",
-            operator: "Witness: liuye",
-            contact: "email:work@akawa.ink"
-        },
         {
             url: "wss://api.dex.trading/",
             region: "Western Europe",
@@ -192,14 +168,14 @@ export const settingsAPIs = {
             operator: "Witness: zapata42-witness",
             contact: "telegram:Zapata_42"
         },
-        {
-            url: "wss://eu.nodes.bitshares.ws",
-            region: "Western Europe",
-            country: "Germany",
-            location: "Nuremberg",
-            operator: "Witness: blocksights",
-            contact: "telegram:blocksights"
-        },
+        //{
+        //    url: "wss://eu.nodes.bitshares.ws",
+        //    region: "Western Europe",
+        //    country: "Germany",
+        //    location: "Nuremberg",
+        //    operator: "Witness: blocksights",
+        //    contact: "telegram:blocksights"
+        //},
         {
             url: "wss://public.xbts.io/ws",
             region: "Western Europe",
@@ -224,14 +200,6 @@ export const settingsAPIs = {
             operator: "Witness: xbtsio-wallet",
             contact: "telegram: xbtsio"
         },
-        {
-            url: "wss://bts.mypi.win",
-            region: "Northern America",
-            country: "U.S.A.",
-            location: "Seattle, CA",
-            operator: "Witness: gbac-ety001",
-            contact: "email:work@akawa.ink"
-        },
         {
             url: "wss://api.btslebin.com/ws",
             region: "Eastern Asia",
@@ -249,14 +217,14 @@ export const settingsAPIs = {
             contact: "telegram:brekyrself"
         },
         // Testnet
-        {
-            url: "wss://eu.nodes.testnet.bitshares.ws",
-            region: "TESTNET - Western Europe",
-            country: "Germany",
-            location: "Nuremberg",
-            operator: "Witness: blocksights",
-            contact: "telegram:blocksights"
-        },
+        //{
+        //    url: "wss://eu.nodes.testnet.bitshares.ws",
+        //    region: "TESTNET - Western Europe",
+        //    country: "Germany",
+        //    location: "Nuremberg",
+        //    operator: "Witness: blocksights",
+        //    contact: "telegram:blocksights"
+        //},
         {
             url: "wss://testnet.dex.trading/",
             region: "TESTNET - Western Europe",
@@ -273,30 +241,6 @@ export const settingsAPIs = {
             operator: "Witness: xbtsio-wallet",
             contact: "telegram: xbtsio"
         },
-        {
-            url: "wss://api-testnet.61bts.com/ws",
-            region: "Eastern Asia",
-            country: "China",
-            location: "Shandong",
-            operator: "Witness: liuye",
-            contact: "email:work@akawa.ink"
-        },
-        {
-            url: "wss://api-us-testnet.61bts.com/ws",
-            region: "Northern America",
-            country: "USA",
-            location: "St. Louis",
-            operator: "Witness: liuye",
-            contact: "email:work@akawa.ink"
-        },
-        {
-            url: "wss://btstestnet.cybertron.ninja/ws",
-            region: "Northern America",
-            country: "USA",
-            location: "Utah",
-            operator: "Witness: cn-faucet-test",
-            contact: "email:codinheim@protonmail.com"
-        },
         {
             url: "wss://bitsharestestnet.loclx.io",
             region: "Northern America",
@@ -307,13 +251,13 @@ export const settingsAPIs = {
         }
     ],
     ES_WRAPPER_LIST: [
-        {
-            url: "https://api.bitshares.ws/openexplorer",
-            region: "Western Europe",
-            country: "Germany",
-            operator: "blocksights.info",
-            contact: "telegram:blocksights"
-        }
+        //{
+        //    url: "https://api.bitshares.ws/openexplorer",
+        //    region: "Western Europe",
+        //    country: "Germany",
+        //    operator: "blocksights.info",
+        //    contact: "telegram:blocksights"
+        //}
     ],
     DEFAULT_FAUCET: getFaucet().url,
     TESTNET_FAUCET: getTestFaucet().url

app/lib/common/scamAccounts.js

@@ -2479,6 +2479,10 @@ export const scamAccountsOther = [
     "1.2.1836660",
     "a-lll",
     "1.2.1836366",
+    "cosmos14pp464pc7ldxjuejn5ffu2fnsfrj7kzv3kyfyx",
+    "1.2.1837716",
+    "inj15s72jmpjlgljeycp9dtycwdeu4jnxwrdcjtklc",
+    "1.2.1854034",
 
     // BATCH START 2023-06-21
     "1.2.1822947",

charting_library/install-charting-library.cjs

@@ -15,7 +15,7 @@ var outputFilePath = path.join(__dirname, outputFileName);
 // download only if it doesnt exist
 if (!fs.existsSync(outputFilePath)) {
     const outputFile = fs.createWriteStream(outputFilePath);
-    http.get("https://explorer.bitshares.ws/" + outputFileName, (response) => {
+    http.get("https://blocksights.info/" + outputFileName, (response) => {
         response.pipe(outputFile);
     }).on("error", (err) => {
         console.error("Failed to download charting_library archive");

package.json

@@ -154,21 +154,21 @@
         "file-saver": "^1.3.8",
         "foundation-apps": "git+https://github.com/zurb/foundation-apps.git",
         "fractional": "^1.0.0",
-        "handlebars": "^4.7.7",
+        "handlebars": "^4.7.9",
         "hirestime": "^3.2.1",
         "html2canvas": "^1.3.3",
         "humanize-duration": "^3.27.1",
         "ifvisible": "^1.1.0",
-        "immutable": "3.8.2",
+        "immutable": "4.3.8",
         "indexeddbshim": "^2.2.1",
         "intl": "^1.2.5",
         "intro.js": "^2.8.0-alpha.1",
         "jdenticon": "git+https://github.com/cryptonomex/jdenticon.git",
         "js-sha256": "^0.2.3",
         "jsonschema": "^1.2.4",
-        "jspdf": "^3.0.1",
+        "jspdf": "^4.2.1",
         "jspdf-autotable": "^3.1.1",
-        "lodash-es": "^4.17.10",
+        "lodash-es": "^4.18.1",
         "lzma": "2.1.6",
         "moment": "^2.29.4",
         "moment-timezone": "^0.5.35",
@@ -272,10 +272,10 @@
         "style-loader": "^3.3.1",
         "svg-inline-loader": "^0.8.2",
         "svg-loader": "^0.0.2",
-        "svgo": "^2.8.0",
+        "svgo": "^2.8.2",
         "svgo-loader": "^3.0.0",
         "url-loader": "^4.1.1",
-        "webpack": "^5.94.0",
+        "webpack": "^5.104.1",
         "webpack-cli": "^4.9.1",
         "webpack-dev-server": "^4.6.0",
         "webpack-hot-middleware": "^2.25.1",