updated switch.py to check witness shuffle, and if witness is within …

…last 5 witness slots to not switch signing keys when a block is missed
xeroc · Nov 5, 2015 · ff83441 · ff83441
1 parent 4a88252
commit ff83441
Show file tree

Hide file tree

Showing 39 changed files with 25 additions and 774 deletions.
diff --git a/scripts/pricefeeds/pricefeeds.py b/scripts/pricefeeds/pricefeeds.py
diff --git a/scripts/switch-keys/config-example.py b/scripts/switch-keys/config-example.py
@@ -7,6 +7,8 @@
 # the name of your witness as string
 witnessname = "test.dele-puppy"
 
+# witness number
+witness_object = "1.6.13"
 # the password of your wallet as string
 wallet_password = "puppiesRkewl" # not really my password.  Just left in so people can see how it should look.
 

diff --git a/scripts/switch-keys/example-config.ini b/scripts/switch-keys/example-config.ini
diff --git a/scripts/switch-keys/object_database/1/10 b/scripts/switch-keys/object_database/1/10
diff --git a/scripts/switch-keys/object_database/1/11 b/scripts/switch-keys/object_database/1/11
diff --git a/scripts/switch-keys/object_database/1/12 b/scripts/switch-keys/object_database/1/12
diff --git a/scripts/switch-keys/object_database/1/13 b/scripts/switch-keys/object_database/1/13
diff --git a/scripts/switch-keys/object_database/1/14 b/scripts/switch-keys/object_database/1/14
diff --git a/scripts/switch-keys/object_database/1/15 b/scripts/switch-keys/object_database/1/15
diff --git a/scripts/switch-keys/object_database/1/2 b/scripts/switch-keys/object_database/1/2
diff --git a/scripts/switch-keys/object_database/1/3 b/scripts/switch-keys/object_database/1/3
diff --git a/scripts/switch-keys/object_database/1/4 b/scripts/switch-keys/object_database/1/4
diff --git a/scripts/switch-keys/object_database/1/5 b/scripts/switch-keys/object_database/1/5
diff --git a/scripts/switch-keys/object_database/1/6 b/scripts/switch-keys/object_database/1/6
diff --git a/scripts/switch-keys/object_database/1/7 b/scripts/switch-keys/object_database/1/7
diff --git a/scripts/switch-keys/object_database/1/8 b/scripts/switch-keys/object_database/1/8
diff --git a/scripts/switch-keys/object_database/2/0 b/scripts/switch-keys/object_database/2/0
diff --git a/scripts/switch-keys/object_database/2/1 b/scripts/switch-keys/object_database/2/1
diff --git a/scripts/switch-keys/object_database/2/10 b/scripts/switch-keys/object_database/2/10
diff --git a/scripts/switch-keys/object_database/2/11 b/scripts/switch-keys/object_database/2/11
diff --git a/scripts/switch-keys/object_database/2/12 b/scripts/switch-keys/object_database/2/12
diff --git a/scripts/switch-keys/object_database/2/13 b/scripts/switch-keys/object_database/2/13
diff --git a/scripts/switch-keys/object_database/2/3 b/scripts/switch-keys/object_database/2/3
diff --git a/scripts/switch-keys/object_database/2/4 b/scripts/switch-keys/object_database/2/4
diff --git a/scripts/switch-keys/object_database/2/5 b/scripts/switch-keys/object_database/2/5
diff --git a/scripts/switch-keys/object_database/2/6 b/scripts/switch-keys/object_database/2/6
diff --git a/scripts/switch-keys/object_database/2/7 b/scripts/switch-keys/object_database/2/7
diff --git a/scripts/switch-keys/object_database/2/8 b/scripts/switch-keys/object_database/2/8
diff --git a/scripts/switch-keys/object_database/2/9 b/scripts/switch-keys/object_database/2/9
diff --git a/scripts/switch-keys/object_database/5/1 b/scripts/switch-keys/object_database/5/1
diff --git a/scripts/switch-keys/producer1/__init__.py b/scripts/switch-keys/producer1/__init__.py
diff --git a/scripts/switch-keys/producer1/config-example.py b/scripts/switch-keys/producer1/config-example.py
diff --git a/scripts/switch-keys/producer1/producer1.py b/scripts/switch-keys/producer1/producer1.py
@@ -31,8 +31,8 @@ def tryProducer():
     while attempt < 5:
         attempt +=1
         print("attempt #" + attempt + " to reconnect to " + wallet_name)
-#        subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"--chain-id","16362d305df19018476052eed629bb4052903c7655a586a0e0cfbdb0eaf1bfd8"]) ### uncomment this line if running on testnet
-        subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"]) ### comment this line out if running on testnet
+        subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"--chain-id","16362d305df19018476052eed629bb4052903c7655a586a0e0cfbdb0eaf1bfd8"]) ### uncomment this line if running on testnet
+#        subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"]) ### comment this line out if running on testnet
         time.sleep(1)
 
 
@@ -47,8 +47,8 @@ def openProducer():
 
             try:
                 print("waiting ...")
-#                subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"--chain-id","16362d305df19018476052eed629bb4052903c7655a586a0e0cfbdb0eaf1bfd8"]) ### uncomment this line if running on testnet
-                subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"]) ### comment this line out if running on testnet
+                subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"--chain-id","16362d305df19018476052eed629bb4052903c7655a586a0e0cfbdb0eaf1bfd8"]) ### uncomment this line if running on testnet
+#                subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"]) ### comment this line out if running on testnet
                 time.sleep(1)
                 checkIfNew()
                 unlockWallet()

diff --git a/scripts/switch-keys/producer2/__init__.py b/scripts/switch-keys/producer2/__init__.py
diff --git a/scripts/switch-keys/producer2/config-example.py b/scripts/switch-keys/producer2/config-example.py
diff --git a/scripts/switch-keys/producer2/config2.py b/scripts/switch-keys/producer2/config2.py
diff --git a/scripts/switch-keys/producer2/producer2.py b/scripts/switch-keys/producer2/producer2.py
@@ -34,8 +34,8 @@ def tryProducer():
     while attempt < 5:
         attempt +=1
         print("attempt #" + attempt + " to reconnect to " + wallet_name)
-#        subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"--chain-id","16362d305df19018476052eed629bb4052903c7655a586a0e0cfbdb0eaf1bfd8"]) ### uncomment this line if running on testnet
-        subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"]) ### comment this line out if running on testnet
+        subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"--chain-id","16362d305df19018476052eed629bb4052903c7655a586a0e0cfbdb0eaf1bfd8"]) ### uncomment this line if running on testnet
+#        subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"]) ### comment this line out if running on testnet
         time.sleep(1)
 
 
@@ -48,8 +48,8 @@ def openProducer():
 
             try:
                 print("waiting ...")
-#                subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"--chain-id","16362d305df19018476052eed629bb4052903c7655a586a0e0cfbdb0eaf1bfd8"]) ### uncomment this line if running on testnet
-                subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"]) ### comment this line out if running on testnet
+                subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"--chain-id","16362d305df19018476052eed629bb4052903c7655a586a0e0cfbdb0eaf1bfd8"]) ### uncomment this line if running on testnet
+#                subprocess.call(["screen","-dmS",wallet_name,path_to_cli_wallet,"-H",local_port,"-s",remote_ws,"]) ### comment this line out if running on testnet
                 time.sleep(1)
                 checkIfNew()
                 unlockWallet()

diff --git a/scripts/switch-keys/switch.py b/scripts/switch-keys/switch.py
@@ -14,8 +14,9 @@
 from producer2 import producer2
 
 
-
-
+#  (note to self I would like to add a check if the current block age is greater than or less than a minute to participation check.  If head_block_age is greater than 1 min, it is possible it is syncing the blockchain, and we should wait 15 or so seconds, do a second check and then resplay if needed.)
+#
+#
 rpc = GrapheneWebsocket("localhost", 8092, "", "")
 
 def unlockWallet():
@@ -58,7 +59,7 @@ def info():
     return part
 
 def waitAndNotify():
-    time.sleep(3)
+    time.sleep(1)
     info = rpc.info()
     block = info["head_block_num"]
     age = info["head_block_age"]
@@ -160,7 +161,16 @@ def getMissed(witnessname):
 
 # add check for age of head block, and last block vs head block
 def switch(witnessname, publickeys, missed):
-    if config.switching_active == True:
+    shuffle = rpc.get_object("2.12.0")
+    shuffle = shuffle["current_shuffled_witnesses"]
+    witness1 = shuffle[len(shuffle) -1]
+    witness2 = shuffle[len(shuffle) -2]
+    witness3 = shuffle[len(shuffle) -3]
+    witness4 = shuffle[len(shuffle) -4]
+    witness5 = shuffle[len(shuffle) -5]
+    if config.witness_object == witness1 or config.witness_object == witness2 or config.witness_object == witness3 or config.witness_object == witness4 or config.witness_object == witness5:
+        return
+    elif config.switching_active == True:
         blockAge = rpc.info()
         blockAge = blockAge["head_block_age"]
         blockAgeInt = int(blockAge.split()[0])
@@ -171,6 +181,7 @@ def switch(witnessname, publickeys, missed):
                 key = publickeys[keynumber]
                 rpc.update_witness(witnessname, "", key, "true")
                 print("updated signing key to " + key)
+                time.sleep(3)
 
 feed = True
 replay = 0

diff --git a/scripts/switch-keys/wallet.json b/scripts/switch-keys/wallet.json