Merge branch 'main' into execution-payload

Signed-off-by: Ivan Mashonskii <[email protected]>

Author: ivan-mashonskiy

build.sbt

@@ -13,8 +13,8 @@ name             := "consensus-client"
 maintainer       := "Units Network Team"
 resolvers ++= Resolver.sonatypeOssRepos("releases") ++ Resolver.sonatypeOssRepos("snapshots") ++ Seq(Resolver.mavenLocal)
 libraryDependencies ++= Seq(
-  "com.wavesplatform"              % "node-testkit"  % "1.5.7-3964-SNAPSHOT" % "test",
-  "com.wavesplatform"              % "node"          % "1.5.7-3964-SNAPSHOT" % "provided",
+  "com.wavesplatform"              % "node-testkit"  % "1.5.8-SNAPSHOT" % "test",
+  "com.wavesplatform"              % "node"          % "1.5.8-SNAPSHOT" % "provided",
   "com.softwaremill.sttp.client3"  % "core_2.13"     % "3.9.8",
   "com.softwaremill.sttp.client3" %% "play-json"     % "3.9.8",
   "com.github.jwt-scala"          %% "jwt-play-json" % "10.0.1"

docker/README.md

@@ -3,9 +3,13 @@ Units Network node consists of Waves blockchain node, Consensus Client extension
 
 ## Prerequisites
 * Install [Docker Compose](https://docs.docker.com/compose/install/).
-* Generate JWT secret and execution client keys by running `./gen-keys.sh`. This script requires `openssl` and `xxd`.
+* Generate JWT secret and execution client keys by running `./gen-keys.sh`. This script requires `openssl`.
 * Optional: get waves node [state](https://docs.waves.tech/en/waves-node/options-for-getting-actual-blockchain/state-downloading-and-applying) and place it inside the `./data/waves` directory.
 * Optional: get execution client state.
+* To run besu on Linux, you need to manually create data & log directories and set appropriate permissions:
+```
+install -d -o 1000 -g 1000 data/besu logs/besu
+```
 
 ## Configuring Waves Node
 * Create `./secrets.env` file with the base58-encoded [seed and password](https://docs.waves.tech/en/waves-node/how-to-work-with-node-wallet):
@@ -17,19 +21,17 @@ Units Network node consists of Waves blockchain node, Consensus Client extension
 * Specify the proper declared addresses in the environment file (`testnet.env` for testnet, etc.). Make sure these declared addresses have distinct ports, otherwise your node will be banned from the network!
 
 ## Launching
-To run besu on Linux, you need to manually create data & log directories and set appropriate permissions:
-```
-install -d -o 1000 -g 1000 data/besu logs/besu
-```
+There are two profiles in the compose file: `besu` and `geth`, each starting a respective execution client. You can choose which one to run by specifying either `--profile besu` or `--profile geth` on the command line.
+
 Running, stopping and updating with besu in testnet:
 ```
-docker compose --env-file=testnet.env up -d
-docker compose --env-file=testnet.env down
-docker compose --env-file=testnet.env pull
+docker compose --profile besu --env-file=testnet.env up -d
+docker compose --profile besu --env-file=testnet.env down
+docker compose --profile besu --env-file=testnet.env pull
 ```
 Running, stopping and updating with geth in testnet:
 ```
-docker compose -f docker-compose-geth.yml --env-file=testnet.env up -d
-docker compose -f docker-compose-geth.yml --env-file=testnet.env down
-docker compose -f docker-compose-geth.yml --env-file=testnet.env pull
+docker compose --profile geth --env-file=testnet.env up -d
+docker compose --profile geth --env-file=testnet.env down
+docker compose --profile geth --env-file=testnet.env pull
 ```

docker/docker-compose-geth.yml

@@ -1,11 +1,28 @@
 services:
   besu:
+    profiles: [besu]
+    hostname: execution-client
     extends:
       file: ./services/besu.yml
       service: besu
+
+  geth-init:
+    profiles: [geth]
+    extends:
+      file: ./services/geth.yml
+      service: geth-init
+
+  geth:
+    profiles: [geth]
+    hostname: execution-client
+    extends:
+      file: ./services/geth.yml
+      service: geth
+    depends_on:
+      geth-init:
+        condition: service_completed_successfully
+
   waves-node:
     extends:
       file: ./services/waves-node.yml
       service: waves-node
-    environment:
-      EXECUTION_CLIENT: besu

docker/docker-compose.yml

@@ -1,4 +1,4 @@
 #!/bin/sh
 mkdir -p data/secrets
-openssl rand 32 | xxd -p -c 32 > data/secrets/p2p-key
-openssl rand 32 | xxd -p -c 32 > data/secrets/jwtsecret
+openssl rand -hex 32 | tr -d "\n" > data/secrets/p2p-key
+openssl rand -hex 32 | tr -d "\n" > data/secrets/jwtsecret

docker/gen-keys.sh

@@ -11,7 +11,6 @@ services:
       - --rpc-http-api=ETH,NET,WEB3,TXPOOL,TRACE
       - --rpc-http-cors-origins=all
       - --rpc-ws-enabled
-      - --discovery-dns-url=enrtree://AIRIZFFZSCSIVHXTKA44WYZQJMR75FLTGWJ5TUNEW5IP7QKZDLBRK@${NETWORK}-nodes.unit0.dev
       - --discovery-enabled=true
       - --engine-rpc-enabled
       - --engine-jwt-secret=/etc/secrets/jwtsecret
@@ -31,6 +30,5 @@ services:
     ports:
       - '30303:30303/tcp'
       - '30303:30303/udp'
-      - '8545:8545'
     environment:
       - LOG4J_CONFIGURATION_FILE=/etc/besu/log4j2.xml

docker/services/besu.yml

@@ -1,4 +1,12 @@
 services:
+  geth-init:
+    container_name: geth-init
+    image: ethereum/client-go:stable
+    entrypoint: /tmp/init-geth.sh
+    volumes:
+      - ../genesis-${NETWORK}.json:/tmp/genesis.json
+      - ../data/geth:/root/.ethereum
+      - ../init-geth.sh:/tmp/init-geth.sh
   geth:
     container_name: geth
     image: ethereum/client-go:stable

docker/services/geth.yml

@@ -1,5 +1,5 @@
 NETWORK=testnet
 NETWORK_ID=88817
-WAVES_NODE_TAG=L2-test
-WAVES_DECLARED_ADDRESS=1.2.3.4:6868
-UNITS_DECLARED_ADDRESS=1.2.3.4:6865
+WAVES_NODE_TAG=testnet
+#WAVES_DECLARED_ADDRESS=1.2.3.4:6868
+#UNITS_DECLARED_ADDRESS=1.2.3.4:6865

docker/testnet.env

@@ -22,14 +22,15 @@ waves {
   }
 
   l2 {
-    chain-contract = 3MsqKJ6o1ABE37676cHHBxJRs6huYTt72ch
-    execution-client-address = "http://${EXECUTION_CLIENT}:8551"
+    chain-contract = 3Msx4Aq69zWUKy4d1wyKnQ4ofzEDAfv5Ngf
+    execution-client-address = "http://execution-client:8551"
     jwt-secret-file = /etc/secrets/jwtsecret
 
     network {
      port = 6865
      declared-address = ${?UNITS_DECLARED_ADDRESS}
      known-peers = [
+       "testnet-l2-htz-hel1-1.wavesnodes.com:6865"
        "testnet-l2-htz-hel1-2.wavesnodes.com:6865"
        "testnet-htz-nbg1-1.wavesnodes.com:6865"
       ]

docker/waves-testnet.conf

@@ -54,9 +54,8 @@ export const ccMinerJoin1 = wt.invokeScript(
       args: [
         {
           // Reward address
-          type: "binary",
-          // 0x7dbcf9c6c3583b76669100f9be3caf6d722bc9f9
-          value: "base64:fbz5xsNYO3ZmkQD5vjyvbXIryfk="
+          type: "string",
+          value: "0x7dbcf9c6c3583b76669100f9be3caf6d722bc9f9"
         }
       ]
     }
@@ -74,9 +73,8 @@ export const ccMinerJoin2 = wt.invokeScript(
       args: [
         {
           // Reward address
-          type: "binary",
-          // 0xcf0b9e13fdd593f4ca26d36afcaa44dd3fdccbed
-          value: "base64:zwueE/3Vk/TKJtNq/KpE3T/cy+0="
+          type: "string",
+          value: "0xcf0b9e13fdd593f4ca26d36afcaa44dd3fdccbed"
         }
       ]
     }
@@ -131,4 +129,3 @@ export function mkE2CTransfer(senderPrivateKey: string, blockHash: string, merkl
     { privateKey: senderPrivateKey }
   )
 }
-