Merge branch 'develop' into staging

bitshares · Sep 17, 2023 · da77971 · da77971
2 parents cbc3356 + 358e0b9
commit da77971
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/app/lib/common/scamAccounts.js b/app/lib/common/scamAccounts.js
@@ -2371,6 +2371,10 @@ export const scamAccountsOther = [
     "1.2.1810603",
     "blockchain-prize",
     "1.2.1827123",
+    "bin-node-rst1",
+    "1.2.1825454",
+    "tat-trade999",
+    "1.2.1827646",
 
     // BATCH START 2023-06-21
     "1.2.1822947",

diff --git a/package.json b/package.json
@@ -144,7 +144,7 @@
         "bignumber.js": "^4.0.0",
         "bitshares-report": "https://github.com/bitshares/bitshares-report.git",
         "bitshares-ui-style-guide": "https://github.com/bitshares/bitshares-ui-style-guide.git",
-        "bitsharesjs": "^6.0.0",
+        "bitsharesjs": "^6.0.2",
         "browser-locale": "^1.0.3",
         "classnames": "^2.2.1",
         "constants-browserify": "^1.0.0",

diff --git a/yarn.lock b/yarn.lock
@@ -2799,21 +2799,21 @@ bindings@^1.5.0:
     react-dom "16.14.0"
     react-router-dom "^5.1.2"
 
-bitsharesjs-ws@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/bitsharesjs-ws/-/bitsharesjs-ws-6.0.0.tgz#88f5f2014b355ea20ddfdcee6494a8db0596ad15"
-  integrity sha512-hIsFcGggV6jkgCKrVE7Pmm8AgJMbBc2pthOx1/9he436gfehtbMvjn7J5G3rWhPu0VONROI//LAX/qhhhIieaA==
+bitsharesjs-ws@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/bitsharesjs-ws/-/bitsharesjs-ws-6.0.2.tgz#3b068af0a9b4b97429c7b8897882f228f7b6e385"
+  integrity sha512-NkmCx9wnBAnu2DU2miSdIl6AxN0PnfSessUwZwkUN7v5KZWaBtfjUGtxr0zUPi2wUGkOCuJOVBH9OUG3TiMwZg==
   dependencies:
     isomorphic-ws "^4.0.1"
     ws "^8.4.0"
 
-bitsharesjs@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/bitsharesjs/-/bitsharesjs-6.0.0.tgz#1de869e6e9c9f5ba17b7a3c4baf67e9f78b9bb82"
-  integrity sha512-KSYvLvbRLNZ+cdzAiQ6YuryZx1b7yXnz7pOBzbRt5yz+7KIh7OUFUJBQ45G6wwBIc3kqnxcZVOsISwl7hLoGFQ==
+bitsharesjs@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/bitsharesjs/-/bitsharesjs-6.0.2.tgz#0fcae6b9f6113a91d06fc000523255f3e1dade00"
+  integrity sha512-BrzlQic/lRyy2JQmz8sPcIlBMTFDhKlpGR+3vln12jOGlm4nDMFne7iFWzgN39NKu49yFD6ufZFe7uNdDgje6A==
   dependencies:
     bigi "^1.4.2"
-    bitsharesjs-ws "^6.0.0"
+    bitsharesjs-ws "^6.0.2"
     bs58 "^4.0.1"
     bytebuffer "^5.0.1"
     create-hash "^1.2.0"