feat(sdk): fix using infuraurl for fetching

AztecProtocol · Jul 8, 2020 · 76791ce · 76791ce
1 parent 72f6fbc
commit 76791ce
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/packages/extension/src/background/services/EventService/helpers/AssetsSyncManager/index.js b/packages/extension/src/background/services/EventService/helpers/AssetsSyncManager/index.js
@@ -14,6 +14,9 @@ class SyncManager {
     constructor() {
         this.config = {
             syncInterval: 5000, // ms
+            blocksPerRequest: 50, // ~ per 3 months (~6000 per day)
+            precisionDelta: 10, //
+            maxNumberOfAttempts: 5,
         };
         this.syncConfig = undefined;
         this.networks = new Map();

diff --git a/packages/extension/src/background/services/EventService/helpers/NotesSyncManager/index.js b/packages/extension/src/background/services/EventService/helpers/NotesSyncManager/index.js
@@ -17,7 +17,12 @@ const infuraLimitError = {
     message: 'query returned more than 10000 results',
 };
 
-const isInfuraLimitError = error => error && error.code === infuraLimitError.code;
+
+const uriTooLong = {
+    code: -32603,
+};
+
+const isInfuraLimitError = error => error && error.code === infuraLimitError.code || error.code === uriTooLong.code;
 
 const SYNCING_STATUS = {
     ACTIVE: 'ACTIVE',
@@ -30,7 +35,7 @@ const SYNCING_STATUS = {
 class SyncManager {
     constructor() {
         this.config = {
-            blocksPerRequest: 540000, // ~ per 3 months (~6000 per day)
+            blocksPerRequest: 6000 * 30, // ~ per 3 months (~6000 per day)
             precisionDelta: 10, //
             maxNumberOfAttempts: 5,
             networkId: null,
@@ -134,7 +139,7 @@ class SyncManager {
             lastSyncedBlock,
             assets,
             progressCallbacks,
-            retriedNumber = 0,
+            retriedNumber = 5,
         } = options;
 
         const syncAddress = this.addresses.get(address);

diff --git a/packages/extension/src/background/services/EventService/helpers/NotesWatcher/index.js b/packages/extension/src/background/services/EventService/helpers/NotesWatcher/index.js
@@ -242,6 +242,13 @@ class Watcher {
 
         return subscription;
     }
+
+    handleFetchError = (error) => {
+        errorLog('Failed to sync CreateNote / UpdateMetadata / DestroyNote with web3.', error);
+        if (process.env.NODE_ENV === 'development') {
+            this.paused = true;
+        }
+    };
 }
 
 export default Watcher;
diff --git a/packages/extension/src/background/services/EventService/utils/note/fetchNotes.js b/packages/extension/src/background/services/EventService/utils/note/fetchNotes.js
@@ -1,8 +1,10 @@
+import Web3 from 'web3';
 import Web3Service from '~/helpers/Web3Service';
 import {
     ZkAsset,
 } from '~/config/contracts';
 import decodeNoteLogs from './helpers/decodeNoteLogs';
+import { getProviderUrl } from '~/utils/network';
 
 export default async function fetchNotes({
     owner,
@@ -16,7 +18,9 @@ export default async function fetchNotes({
         ZkAsset.events.updateNoteMetaData,
     ],
 } = {}) {
-    const { abi, getPastLogs } = Web3Service.eth;
+    // TODO require network selection
+    const provider = new Web3.providers.HttpProvider(getProviderUrl(Web3Service.networkId));
+    const { abi, getPastLogs } = new Web3(provider).eth;
 
     const eventsTopics = events
         .map(e => ZkAsset.config.abi.find(({ name, type }) => name === e && type === 'event'))

diff --git a/packages/extension/src/config/provider.js b/packages/extension/src/config/provider.js
@@ -1,5 +1,5 @@
 export const infuraProjectId = '09c4eed231c840d5ace14ba5389a1a7c';
 
-export const infuraProviderUrlPattern = 'wss://{networkName}.infura.io/ws/v3/{projectId}';
+export const infuraProviderUrlPattern = 'https://{networkName}.infura.io/v3/{projectId}';
 
 export const defaultProviderUrl = 'ws://localhost:8545';