Merge branch 'master' into smart_scroll

Author: STetsing

.circleci/config.yml

@@ -388,7 +388,7 @@ workflows:
             - build
           matrix:
             parameters:
-              browser: ["chrome", "firefox"]
+              browser: ["chrome"]
               script: ["singletest.sh"]
               job: ["nogroup"]
               jobsize: ["1"]
@@ -439,14 +439,29 @@ workflows:
           requires:
             - build
           matrix:
-            alias: browser-tests
+            alias: chrome-tests
+            parameters:
+              browser: ["chrome"]
+              script: ["browser_test.sh"]
+              job: ["0","1","2","3","4","5","6","7","8","9"]
+              jobsize: ["10"]
+              parallelism: [15]
+              scriptparameter: [""]
+      - remix-ide-browser:
+          requires:
+            - build
+          matrix:
+            alias: firefox-tests
             parameters:
-              browser: ["chrome", "firefox"]
+              browser: ["firefox"]
               script: ["browser_test.sh"]
               job: ["0","1","2","3","4","5","6","7","8","9"]
               jobsize: ["10"]
               parallelism: [15]
               scriptparameter: [""]
+          filters:
+            branches:
+              only: ['master', 'remix_live', 'remix_beta', 'remix_alpha']
       - remix-ide-browser:
           requires:
             - build
@@ -466,7 +481,8 @@ workflows:
           requires:
             - lint
             - remix-libs
-            - browser-tests
+            - chrome-tests
+            - firefox-tests
             - metamask
             - plugins
 
@@ -480,7 +496,8 @@ workflows:
           requires:
             - lint
             - remix-libs
-            - browser-tests
+            - chrome-tests
+            - firefox-tests
             - metamask
             - plugins
             - predeploy
@@ -493,7 +510,8 @@ workflows:
           requires:
             - lint
             - remix-libs
-            - browser-tests
+            - chrome-tests
+            - firefox-tests
             - metamask
             - plugins
             - predeploy
@@ -506,7 +524,8 @@ workflows:
           requires:
             - lint
             - remix-libs
-            - browser-tests
+            - chrome-tests
+            - firefox-tests
             - metamask
             - plugins
             - predeploy

apps/remix-ide-e2e/src/tests/transactionExecution.test.ts

@@ -343,7 +343,7 @@ module.exports = {
       .perform(async (done) => {
         try {
           console.log('getting the provider up..')
-          const provider = new JsonRpcProvider('https://go.getblock.io/1552e4e35bcf4efe8a78897cba5557f9')
+          const provider = new JsonRpcProvider('https://go.getblock.us/1552e4e35bcf4efe8a78897cba5557f9')
           currentBlockNumber = (await provider.getBlockNumber()) as number
           console.log('getBlockNumber', currentBlockNumber)
           done()

apps/remix-ide/src/app/providers/mainnet-vm-fork-provider.tsx

@@ -18,7 +18,7 @@ export class MainnetForkVMProvider extends BasicVMProvider {
     )
     this.blockchain = blockchain
     this.fork = 'prague'
-    this.nodeUrl = 'https://go.getblock.io/1552e4e35bcf4efe8a78897cba5557f9'
+    this.nodeUrl = 'https://go.getblock.us/1552e4e35bcf4efe8a78897cba5557f9'
     this.blockNumber = 'latest'
   }
 

libs/remix-debug/src/init.ts

@@ -22,7 +22,7 @@ export function setProvider (web3, url) {
 
 export function web3DebugNode (network) {
   const web3DebugNodes = {
-    Main: 'https://go.getblock.io/1552e4e35bcf4efe8a78897cba5557f9',
+    Main: 'https://go.getblock.us/1552e4e35bcf4efe8a78897cba5557f9',
     Sepolia: 'https://go.getblock.io/7fbe62b139884d2c9c1616ca0de8b5b2'
   }
   if (web3DebugNodes[network]) {