Merge branch 'release/2.0' into kayan_2.0_to_main_instantIF

Author: taokayan

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "external/silkworm"]
 	path = external/silkworm
-	url = https://github.com/eosnetworkfoundation/silkworm
+	url = https://github.com/VaultaFoundation/silkworm
 [submodule "external/appbase"]
 	path = external/appbase
 	url = https://github.com/AntelopeIO/appbase

external/silkworm

@@ -118,7 +118,7 @@
 
     Print("Stand up cluster")
     if cluster.launch(topo="bridge", pnodes=totalProducerNodes,
-                      totalNodes=totalNodes, totalProducers=totalProducers,
+                      totalNodes=totalNodes, totalProducers=totalProducers,activateIF=True,
                       extraNodeosArgs=extraNodeosArgs, specificExtraNodeosArgs=specificExtraNodeosArgs) is False:
         Utils.cmdError("launcher")
         Utils.errorExit("Failed to stand up eos cluster.")

tests/nodeos_evm_server.py

@@ -228,7 +228,7 @@ def makeReservedEvmAddress(account):
     extraNodeosArgs="--contracts-console"
 
     Print("Stand up cluster")
-    if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, extraNodeosArgs=extraNodeosArgs, specificExtraNodeosArgs=specificExtraNodeosArgs, delay=5) is False:
+    if cluster.launch(pnodes=pnodes, totalNodes=total_nodes, extraNodeosArgs=extraNodeosArgs, specificExtraNodeosArgs=specificExtraNodeosArgs, activateIF=True, delay=5) is False:
         errorExit("Failed to stand up eos cluster.")
 
     Print ("Wait for Cluster stabilization")

tests/nodeos_evm_ws_test_basic.py

@@ -320,10 +320,10 @@ def makeReservedEvmAddress(account):
 
     specificExtraNodeosArgs[2]="--plugin eosio::test_control_api_plugin"
 
-    extraNodeosArgs="--contracts-console"
+    extraNodeosArgs="--contracts-console --production-pause-vote-timeout-ms 0"
 
     Print("Stand up cluster")
-    if cluster.launch(prodCount=2, pnodes=2, topo="bridge", totalNodes=3, extraNodeosArgs=extraNodeosArgs, totalProducers=3, specificExtraNodeosArgs=specificExtraNodeosArgs,delay=5) is False:
+    if cluster.launch(prodCount=2, pnodes=2, topo="bridge", totalNodes=3, extraNodeosArgs=extraNodeosArgs, totalProducers=3, specificExtraNodeosArgs=specificExtraNodeosArgs,activateIF=True,delay=5) is False:
         errorExit("Failed to stand up eos cluster.")
 
     Print ("Wait for Cluster stabilization")