Change of cycle length in Quebec protocol (#715)

Author: nicolasochem

src/Constants.py

@@ -39,6 +39,8 @@
 
 FIRST_PARIS_LEVEL = 5726209
 
+FIRST_QUEBEC_LEVEL = 7692289
+
 TEZOS_RPC_PORT = 8732
 
 SIGNER_PORT = 6732
@@ -81,14 +83,14 @@
     "MAINNET": {
         # General
         "NAME": "MAINNET",
-        "MINIMAL_BLOCK_DELAY": 10,
-        "BLOCKS_PER_CYCLE": 24576,
+        "MINIMAL_BLOCK_DELAY": 8,
+        "BLOCKS_PER_CYCLE": 30720,
     },
     CURRENT_TESTNET: {
         # General
         "NAME": CURRENT_TESTNET,
-        "MINIMAL_BLOCK_DELAY": 5,
-        "BLOCKS_PER_CYCLE": 12288,
+        "MINIMAL_BLOCK_DELAY": 4,
+        "BLOCKS_PER_CYCLE": 15360,
     },
 }
 

src/api/block_api.py

@@ -1,5 +1,10 @@
 from abc import ABC, abstractmethod
-from Constants import FIRST_GRANADA_LEVEL, FIRST_MUMBAI_LEVEL, FIRST_PARIS_LEVEL
+from Constants import (
+    FIRST_GRANADA_LEVEL,
+    FIRST_MUMBAI_LEVEL,
+    FIRST_PARIS_LEVEL,
+    FIRST_QUEBEC_LEVEL,
+)
 
 # TODO: we should check if we are on mainnet, or a testnet
 # we could add a get_current_protocol() method and check against it
@@ -15,10 +20,13 @@ def get_current_cycle_and_level(self):
         pass
 
     def level_in_cycle(self, level):
-        if level >= FIRST_PARIS_LEVEL:
+        if level >= FIRST_QUEBEC_LEVEL:
+            # Since protocol Quebec
+            return (level - FIRST_QUEBEC_LEVEL) % self.nw["BLOCKS_PER_CYCLE"]
+        elif level >= FIRST_PARIS_LEVEL:
             # Since protocol Paris
             return (level - FIRST_PARIS_LEVEL) % self.nw["BLOCKS_PER_CYCLE"]
-        if level >= FIRST_MUMBAI_LEVEL:
+        elif level >= FIRST_MUMBAI_LEVEL:
             # Since protocol Mumbai
             return (level - FIRST_MUMBAI_LEVEL) % self.nw["BLOCKS_PER_CYCLE"]
         elif level >= FIRST_GRANADA_LEVEL: