From 875aeaa53fca3bf1b1f3c3e53669d7eea627d01a Mon Sep 17 00:00:00 2001
From: Justin Starry <justin@solana.com>
Date: Wed, 18 Mar 2020 22:28:10 +0800
Subject: [PATCH] Update web3 and fix hasha warning (#6)

---
 explorer/.travis.yml       |  3 +--
 explorer/package-lock.json | 39 ++++++++++++++------------------------
 explorer/package.json      |  2 +-
 3 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/explorer/.travis.yml b/explorer/.travis.yml
index 9b4a588cde1fb6..2b6694947665d7 100644
--- a/explorer/.travis.yml
+++ b/explorer/.travis.yml
@@ -5,6 +5,5 @@ branches:
   only:
     - master
 script:
-  # temporary until hasha dependency warning is fixed
-  - CI=false npm run build
+  - npm run build
   - npm run format
diff --git a/explorer/package-lock.json b/explorer/package-lock.json
index f454f7a37b529d..1223a9eb1b30f7 100644
--- a/explorer/package-lock.json
+++ b/explorer/package-lock.json
@@ -1269,17 +1269,17 @@
       "integrity": "sha512-DetpxZw1fzPD5xUBrIAoplLChO2VB8DlL5Gg+I1IR9b2wPqYIca2WSUxL5g1vLeR4MsQq1NeWriXAVffV+U1Fw=="
     },
     "@solana/web3.js": {
-      "version": "0.34.2",
-      "resolved": "https://registry.npmjs.org/@solana/web3.js/-/web3.js-0.34.2.tgz",
-      "integrity": "sha512-cqELrDZEDamIpUA0LfQacA/grrM3OH+ksEu29cwxpIUVUNaH/LEQOpgwWnvv2PswDOAE1igR2rB2aPwZXEnRFA==",
+      "version": "0.35.0",
+      "resolved": "https://registry.npmjs.org/@solana/web3.js/-/web3.js-0.35.0.tgz",
+      "integrity": "sha512-YRdXWVfE8h0Yz2EirfFeKRgLXErsaBn9/2VYyCpFG0KCPmOZ9NLq/zjdfLPu8VaJzMD7ryVOM5PCPOx7TQfxPA==",
       "requires": {
         "@babel/runtime": "^7.3.1",
         "bn.js": "^5.0.0",
         "bs58": "^4.0.1",
         "buffer": "^5.4.3",
         "buffer-layout": "^1.2.0",
+        "crypto-hash": "^1.2.2",
         "esdoc-inject-style-plugin": "^1.0.0",
-        "hasha": "^5.1.0",
         "jayson": "^3.0.1",
         "mz": "^2.7.0",
         "node-fetch": "^2.2.0",
@@ -3957,6 +3957,11 @@
         "randomfill": "^1.0.3"
       }
     },
+    "crypto-hash": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/crypto-hash/-/crypto-hash-1.2.2.tgz",
+      "integrity": "sha512-rXXMXepuKg9gIfqE7I1jtVa6saLhzIkDQ2u3kTGUWYiUGsHcUa3LTsfrjPEdOY8kxKlryQtsOmJOU0F23yRJTg=="
+    },
     "css": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
@@ -6324,22 +6329,6 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
-    "hasha": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz",
-      "integrity": "sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==",
-      "requires": {
-        "is-stream": "^2.0.0",
-        "type-fest": "^0.8.0"
-      },
-      "dependencies": {
-        "is-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="
-        }
-      }
-    },
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -12225,16 +12214,16 @@
       }
     },
     "rpc-websockets": {
-      "version": "5.0.14",
-      "resolved": "https://registry.npmjs.org/rpc-websockets/-/rpc-websockets-5.0.14.tgz",
-      "integrity": "sha512-6zWfeAIoQJHnqq97sPZOVu+BIyh5uoa9wgc30KTQdKbrn2er5z/NVfiI3EjZ5+aIiKkOS3lvxHGshRlY7C9zUw==",
+      "version": "5.0.16",
+      "resolved": "https://registry.npmjs.org/rpc-websockets/-/rpc-websockets-5.0.16.tgz",
+      "integrity": "sha512-6xCVjhKge1/MMAWkpa7C8KO7vcZPMAboqAF8vkSNdy+UreoOdaYvd94vwtUGtJuSb22xWFibAsrp5JTxTsAubQ==",
       "requires": {
-        "@babel/runtime": "^7.4.5",
+        "@babel/runtime": "^7.8.7",
         "assert-args": "^1.2.1",
         "babel-runtime": "^6.26.0",
         "circular-json": "^0.5.9",
         "eventemitter3": "^3.1.2",
-        "uuid": "^3.3.2",
+        "uuid": "^3.4.0",
         "ws": "^5.2.2"
       },
       "dependencies": {
diff --git a/explorer/package.json b/explorer/package.json
index b31d6a312a4b48..53abcc90e39f1a 100644
--- a/explorer/package.json
+++ b/explorer/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@solana/web3.js": "^0.34.2",
+    "@solana/web3.js": "^0.35.0",
     "@testing-library/jest-dom": "^4.2.4",
     "@testing-library/react": "^9.3.2",
     "@testing-library/user-event": "^7.1.2",