Fixes for local network and docker tests

UnitsNetwork · Nov 21, 2024 · 8abbb9b · 8abbb9b
1 parent 473930a
commit 8abbb9b
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 1 deletion.
diff --git a/consensus-client-it/src/test/scala/units/Accounts.scala b/consensus-client-it/src/test/scala/units/Accounts.scala
@@ -9,6 +9,7 @@ import units.eth.EthAddress
 import java.nio.charset.StandardCharsets
 
 trait Accounts {
+  val chainRegistryAccount: KeyPair = mkKeyPair("devnet registry", 0)
   val chainContractAccount: KeyPair = mkKeyPair("devnet cc", 0)
 
   val miner11Account       = mkKeyPair("devnet-1", 0)

diff --git a/consensus-client-it/src/test/scala/units/BaseDockerTestSuite.scala b/consensus-client-it/src/test/scala/units/BaseDockerTestSuite.scala
@@ -78,6 +78,9 @@ trait BaseDockerTestSuite
   }
 
   protected def setupChain(): Unit = {
+    log.info("Approve chain on registry")
+    waves1.api.broadcast(ChainRegistry.approve())
+
     log.info("Set script")
     waves1.api.broadcastAndWait(ChainContract.setScript())
 

diff --git a/local-network/configs/wavesnode/genesis-template.conf b/local-network/configs/wavesnode/genesis-template.conf
@@ -62,6 +62,15 @@ genesis-generator {
     # Address:     3FVp6fUSmVehs7Q3uJBXe5kWtpz57f7azzA
     { seed-text = "devnet dao", nonce = 0, amount = 100000000 }
 
+    # Chain registry
+    # Seed text:   devnet registry
+    # Nonce:       0
+    # Seed:        3oujRTe9jVvnMHcKe9vGG
+    # Private key: 3kqzGQiNy5qTKEGDzCxh6Kk8LLXW5Lh22pLmZvFNqDm1
+    # Public key:  HRHrDistEQkJJ7dBxBBzxfSsbN8oEF8xt3FeUHLNBYfX
+    # Address:     3FibjK5ZAXFfJf9J3gDsheia88Vz2itLPu1
+    { seed-text = "devnet registry", nonce = 0, amount = 100000000 }
+
     # Chain contract
     # Seed text:   devnet cc
     # Nonce:       0

diff --git a/local-network/configs/wavesnode/waves.conf b/local-network/configs/wavesnode/waves.conf
@@ -41,14 +41,17 @@ waves {
         dao-address = "3FVGizGxjdi8m4e8WKjbwtzg4rdiiUGkLCu"
         xtn-buyback-address = "3FZQMZsyypqDUk2r5katP1AUChe7Uzc9dC4"
         xtn-buyback-reward-period = 20
+        units-registry-address = "3FibjK5ZAXFfJf9J3gDsheia88Vz2itLPu1"
       }
+
       rewards {
         term = 100000
         term-after-capped-reward-feature = 5
         initial = 600000000
         min-increment = 50000000
         voting-interval = 1
       }
+
       include "genesis.conf"
       include "/etc/it/genesis.conf"
     }

diff --git a/local-network/deploy/deploy.py b/local-network/deploy/deploy.py
@@ -23,8 +23,14 @@
     log.info(f"Wait for {min_peers} peers, now: {r}")
     sleep(2)
 
+log.info(f"Registry address: {network.cl_registry.oracleAddress}")
 log.info(f"Chain contract address: {network.cl_chain_contract.oracleAddress}")
 
+log.info("Approve chain contract on registry")
+network.cl_registry.storeData(
+    f"unit_{network.cl_chain_contract.oracleAddress}_approved", "boolean", True
+)
+
 script_info = network.cl_chain_contract.oracleAcc.scriptInfo()
 if script_info["script"] is None:
     log.info("Set chain contract script")

diff --git a/local-network/deploy/local/network.py b/local-network/deploy/local/network.py
@@ -28,9 +28,13 @@ class Miner:
 
 class ExtendedNetwork(Network):
     @cached_property
-    def cl_dao(self) -> ChainContract:
+    def cl_dao(self) -> pw.Address:
         return pw.Address(seed="devnet dao", nonce=0)
 
+    @cached_property
+    def cl_registry(self) -> pw.Oracle:
+        return pw.Oracle(seed="devnet registry")
+
     @cached_property
     def cl_chain_contract(self) -> ChainContract:
         return ChainContract(seed="devnet cc", nonce=0)