Merge branch 'master' into remixd_terminal

apps/remix-ide/src/app/files/dgitProvider.js

@@ -298,7 +298,7 @@ class DGitProvider extends Plugin {
     const ipfs = IpfsHttpClient(config)
     let result = false
     try {
-      const data = ipfs.get(cid, { timeout: 10000 })
+      const data = ipfs.get(cid, { timeout: 60000 })
       for await (const file of data) {
         if (file.path) result = true
         file.path = file.path.replace(cid, '')

apps/remix-ide/src/remixEngine.js

@@ -10,6 +10,7 @@ export class RemixEngine extends Engine {
   setPluginOption ({ name, kind }) {
     if (kind === 'provider') return { queueTimeout: 60000 * 2 }
     if (name === 'LearnEth') return { queueTimeout: 60000 }
+    if (name === 'dGitProvider') return { queueTimeout: 60000 * 4 }
     if (name === 'slither') return { queueTimeout: 60000 * 4 } // Requires when a solc version is installed
     return { queueTimeout: 10000 }
   }