GH-1510 Use boot contract to activate protocol features instead of ol…

…d bios contract. Use current bios contract for setting producers.
AntelopeIO · Dec 18, 2023 · c494c5c · c494c5c
1 parent 021b0c3
commit c494c5c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 27 deletions.
diff --git a/tests/TestHarness/Cluster.py b/tests/TestHarness/Cluster.py
@@ -993,20 +993,6 @@ def parseClusterKeys(totalNodes):
         return producerKeys
 
     def activateInstantFinality(self, launcher):
-        # publish bios contract with setfinalizer
-        contract = "eosio.bios"
-        contractDir = str(self.libTestingContractsPath / contract)
-        wasmFile = "%s.wasm" % (contract)
-        abiFile = "%s.abi" % (contract)
-        Utils.Print("Publish %s contract" % (contract))
-        # assumes eosio already in wallet
-        eosioAccount=Account("eosio")
-        trans = self.biosNode.publishContract(eosioAccount, contractDir, wasmFile, abiFile, waitForTransBlock=True)
-        if trans is None:
-            Utils.Print("ERROR: Failed to publish contract %s." % (contract))
-            return None
-        Node.validateTransaction(trans)
-
         # call setfinalizer
         numFins = len(launcher.network.nodes.values())
         setFinStr =  f'{{"finalizer_policy": {{'
@@ -1077,15 +1063,8 @@ def bootstrap(self, launcher,  biosNode, totalNodes, prodCount, totalProducers,
             Utils.Print("ERROR: Failed to import %s account keys into ignition wallet." % (eosioName))
             return None
 
-        if activateIF:
-            self.activateInstantFinality(launcher)
-
-        contract="eosio.bios"
-        contractDir= str(self.libTestingContractsPath / contract)
-        if PFSetupPolicy.hasPreactivateFeature(pfSetupPolicy):
-            contractDir=str(self.libTestingContractsPath / "old_versions" / "v1.7.0-develop-preactivate_feature" / contract)
-        else:
-            contractDir=str(self.libTestingContractsPath / "old_versions" / "v1.6.0-rc3" / contract)
+        contract="eosio.boot"
+        contractDir= str(self.unittestsContractsPath / contract)
         wasmFile="%s.wasm" % (contract)
         abiFile="%s.abi" % (contract)
         Utils.Print("Publish %s contract" % (contract))
@@ -1096,9 +1075,21 @@ def bootstrap(self, launcher,  biosNode, totalNodes, prodCount, totalProducers,
 
         if pfSetupPolicy == PFSetupPolicy.FULL:
             biosNode.preactivateAllBuiltinProtocolFeature()
-
         Node.validateTransaction(trans)
 
+        contract="eosio.bios"
+        contractDir= str(self.libTestingContractsPath / contract)
+        wasmFile="%s.wasm" % (contract)
+        abiFile="%s.abi" % (contract)
+        Utils.Print("Publish %s contract" % (contract))
+        trans=biosNode.publishContract(eosioAccount, contractDir, wasmFile, abiFile, waitForTransBlock=True)
+        if trans is None:
+            Utils.Print("ERROR: Failed to publish contract %s." % (contract))
+            return None
+
+        if activateIF:
+            self.activateInstantFinality(launcher)
+
         Utils.Print("Creating accounts: %s " % ", ".join(producerKeys.keys()))
         producerKeys.pop(eosioName)
         accounts=[]
@@ -1145,7 +1136,7 @@ def bootstrap(self, launcher,  biosNode, totalNodes, prodCount, totalProducers,
                     if counts[keys["node"]] >= prodCount:
                         Utils.Print(f'Count for this node exceeded: {counts[keys["node"]]}')
                         continue
-                    prodStanzas.append({ 'producer_name': keys['name'], 'block_signing_key': keys['public'] })
+                    prodStanzas.append({ 'producer_name': keys['name'], 'authority': ["block_signing_authority_v0", { 'threshold': 1, 'keys': [{ 'key': keys['public'], 'weight': 1 }]}]})
                     prodNames.append(keys["name"])
                     counts[keys["node"]] += 1
                 setProdsStr += json.dumps(prodStanzas)

diff --git a/tests/nodeos_chainbase_allocation_test.py b/tests/nodeos_chainbase_allocation_test.py
@@ -61,7 +61,7 @@
     nonProdNode.createAccount(newProducerAcc, cluster.eosioAccount, waitForTransBlock=True)
 
     setProdsStr = '{"schedule": ['
-    setProdsStr += '{"producer_name":' + newProducerAcc.name + ',"block_signing_key":' + newProducerAcc.activePublicKey + '}'
+    setProdsStr += '{"producer_name":' + newProducerAcc.name + ',"authority": ["block_signing_authority_v0", {"threshold":1, "keys":[{"key":' + newProducerAcc.activePublicKey + ', "weight":1}]}]}'
     setProdsStr += ']}'
     cmd="push action -j eosio setprods '{}' -p eosio".format(setProdsStr)
     trans = producerNode.processCleosCmd(cmd, cmd, silentErrors=False)

diff --git a/tests/nodeos_producer_watermark_test.py b/tests/nodeos_producer_watermark_test.py
@@ -40,7 +40,7 @@ def setProds(sharedProdKey):
         key = cluster.defProducerAccounts[name].activePublicKey
         if name == "shrproducera":
             key = sharedProdKey
-        setProdsStr += ' { "producer_name": "%s", "block_signing_key": "%s" }' % (name, key)
+        setProdsStr += '{"producer_name":' + name + ',"authority": ["block_signing_authority_v0", {"threshold":1, "keys":[{"key":' + key + ', "weight":1}]}]}'
 
     setProdsStr += ' ] }'
     Utils.Print("setprods: %s" % (setProdsStr))