set Frame-size when using WS provider

Giveth · Dec 27, 2018 · ba356f9 · ba356f9
1 parent 53ec1cf
commit ba356f9
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -79,10 +79,10 @@
     "serve-favicon": "^2.4.3",
     "shortid": "^2.2.8",
     "triple-beam": "^1.3.0",
-    "web3": "1.0.0-beta.35",
-    "web3-core-promievent": "1.0.0-beta.34",
-    "web3-eth-accounts": "1.0.0-beta.34",
-    "web3-eth-contract": "1.0.0-beta.34",
+    "web3": "1.0.0-beta.37",
+    "web3-core-promievent": "1.0.0-beta.37",
+    "web3-eth-accounts": "^1.0.0-beta.37",
+    "web3-eth-contract": "^1.0.0-beta.37",
     "web3-utils": "^1.0.0-beta.26",
     "winston": "^3.0.0",
     "winston-daily-rotate-file": "^3.3.2"

diff --git a/src/blockchain/lib/web3Helpers.js b/src/blockchain/lib/web3Helpers.js
@@ -133,7 +133,16 @@ const reconnectOnEnd = (web3, nodeUrl) => {
 };
 
 function instantiateWeb3(nodeUrl) {
-  const w3 = Object.assign(new Web3(nodeUrl), EventEmitter.prototype);
+  const provider =
+    nodeUrl && nodeUrl.startsWith('ws')
+      ? new Web3.providers.WebsocketProvider(nodeUrl, {
+          clientConfig: {
+            maxReceivedFrameSize: 100000000,
+            maxReceivedMessageSize: 100000000,
+          },
+        })
+      : nodeUrl;
+  const w3 = Object.assign(new Web3(provider), EventEmitter.prototype);
 
   if (w3.currentProvider.on) {
     w3.currentProvider.on('connect', () => {

diff --git a/src/blockchain/pledges.js b/src/blockchain/pledges.js
@@ -28,24 +28,26 @@ function logTransferInfo(transferInfo) {
 }
 
 function _retreiveTokenFromPledge(app, pledge) {
-    const tokenWhitelist = app.get('tokenWhitelist');
-    let token;
-    
-    if (Array.isArray(tokenWhitelist))
-      token = tokenWhitelist.find(
-        t =>
-          typeof t.foreignAddress === 'string' &&
-          typeof pledge.token === 'string' &&
-          t.foreignAddress.toLowerCase() === pledge.token.toLowerCase(),
-      );
-    else {
-      throw new Error('Could not get tokenWhitelist or it is not defined');
-    }
+  const tokenWhitelist = app.get('tokenWhitelist');
+  let token;
+
+  if (Array.isArray(tokenWhitelist))
+    token = tokenWhitelist.find(
+      t =>
+        typeof t.foreignAddress === 'string' &&
+        typeof pledge.token === 'string' &&
+        t.foreignAddress.toLowerCase() === pledge.token.toLowerCase(),
+    );
+  else {
+    throw new Error('Could not get tokenWhitelist or it is not defined');
+  }
 
-    if (!token)
-      throw new Error(`Token address ${pledge.token} was not found in whitelist for pledge ${pledgeId}`);
+  if (!token)
+    throw new Error(
+      `Token address ${pledge.token} was not found in whitelist for pledge ${pledge}`,
+    );
 
-    return token
+  return token;
 }
 
 // sort donations by pendingAmountRemaining (asc with undefined coming last)