merge v0.10.10 to devnet (#146)

- fix: dumpgenesis for wemix (#140) 
- feat: implement montblanc hard fork (#137) 
- fix: modify pn (#144) 
- fix: dumpgenesis failure (#143) 
- test scripts with fixed nodekey (#142) 
- fix: version up to 0.10.10 (#145)

Author: egonspace

cmd/geth/chaincmd.go

@@ -208,6 +208,7 @@ func initGenesis(ctx *cli.Context) error {
 
 func dumpGenesis(ctx *cli.Context) error {
 	// TODO(rjl493456442) support loading from the custom datadir
+	utils.SetWemixConfig(ctx)
 	genesis := utils.MakeGenesis(ctx)
 	if genesis == nil {
 		genesis = core.DefaultGenesisBlock()

cmd/geth/config.go

@@ -144,7 +144,7 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) {
 		utils.Fatalf("Failed to set account manager backends: %v", err)
 	}
 
-	utils.SetWemixConfig(ctx, stack, &cfg.Eth)
+	utils.SetWemixConfig(ctx)
 	utils.SetEthConfig(ctx, stack, &cfg.Eth)
 	if ctx.GlobalIsSet(utils.EthStatsURLFlag.Name) {
 		cfg.Ethstats.URL = ctx.GlobalString(utils.EthStatsURLFlag.Name)

cmd/utils/flags.go

@@ -1981,7 +1981,7 @@ func SetDNSDiscoveryDefaults(cfg *ethconfig.Config, genesis common.Hash) {
 }
 
 // SetWemixConfig applies wemix related command line flags to the config.
-func SetWemixConfig(ctx *cli.Context, stack *node.Node, cfg *eth.Config) {
+func SetWemixConfig(ctx *cli.Context) {
 	if ctx.GlobalIsSet(ConsensusMethodFlag.Name) {
 		params.ConsensusMethod = ctx.GlobalInt(ConsensusMethodFlag.Name)
 	} else {

consensus/ethash/consensus.go

@@ -319,6 +319,10 @@ func (ethash *Ethash) verifyHeader(chain consensus.ChainHeaderReader, header, pa
 	if err := misc.VerifyForkHashes(chain.Config(), header, uncle); err != nil {
 		return err
 	}
+	// Wemix: Verify SPoA block
+	if chain.Config().IsMontBlanc(header.Number) {
+		return fmt.Errorf("go-wemix does not support blocks after MontBlanc hard fork")
+	}
 	// Wemix: Check if it's generated and signed by a registered node
 	if !wemixminer.IsPoW() && !wemixminer.VerifyBlockSig(header.Number, header.Coinbase, header.MinerNodeId, header.Root, header.MinerNodeSig, chain.Config().IsPangyo(header.Number)) {
 		return consensus.ErrUnauthorized

local-docker-env/Dockerfile.boot

@@ -2,7 +2,7 @@
 ARG UBUNTU_VERSION
 
 # Stage 1: Build stage
-FROM golang:1.19 as builder
+FROM golang:1.19 AS builder
 
 # Set environment variables
 ENV PATH=/usr/local/go/bin:$PATH
@@ -42,7 +42,7 @@ RUN apt-get remove -y \
     apt-get clean
 
 # Stage 2: Runtime stage
-FROM ubuntu:${UBUNTU_VERSION}
+FROM ubuntu:${UBUNTU_VERSION:-latest}
 
 # Update and upgrade the package list
 RUN apt-get update && \

local-docker-env/Dockerfile.boot.git

@@ -2,7 +2,7 @@
 ARG UBUNTU_VERSION
 
 # Stage 1: Build stage
-FROM golang:1.19 as builder
+FROM golang:1.19 AS builder
 
 # Set environment variables
 ENV PATH=/usr/local/go/bin:$PATH
@@ -52,7 +52,7 @@ RUN apt-get remove -y \
     apt-get clean
 
 # Stage 2: Runtime stage
-FROM ubuntu:${UBUNTU_VERSION}
+FROM ubuntu:${UBUNTU_VERSION:-latest}
 
 # Set environment variables
 ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt

local-docker-env/Dockerfile.node

@@ -2,7 +2,7 @@
 ARG UBUNTU_VERSION
 
 # Stage 1: Build stage
-FROM golang:1.19 as builder
+FROM golang:1.19 AS builder
 
 # Set environment variables
 ENV PATH=/usr/local/go/bin:$PATH
@@ -42,7 +42,7 @@ RUN apt-get remove -y \
     apt-get clean
 
 # Stage 2: Runtime stage
-FROM ubuntu:${UBUNTU_VERSION}
+FROM ubuntu:${UBUNTU_VERSION:-latest}
 
 # Update and upgrade the package list
 RUN apt-get update && \

local-docker-env/Dockerfile.node.git

@@ -2,7 +2,7 @@
 ARG UBUNTU_VERSION
 
 # Stage 1: Build stage
-FROM golang:1.19 as builder
+FROM golang:1.19 AS builder
 
 # Set environment variables
 ENV PATH=/usr/local/go/bin:$PATH
@@ -52,7 +52,7 @@ RUN apt-get remove -y \
     apt-get clean
 
 # Stage 2: Runtime stage
-FROM ubuntu:${UBUNTU_VERSION}
+FROM ubuntu:${UBUNTU_VERSION:-latest}
 
 # Set environment variables
 ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt

local-docker-env/README.md

@@ -11,32 +11,22 @@ This document explains how to set up a local testing environment based on the `g
 ### local-docker.sh
 
 - **Purpose**: Integrated running script for local testing based on the local repository.
-- **Usage**: `./local-docker-env/local-docker.sh -a <account_num> -v <ubuntu_version>(optional)`
+- **Usage**: `./local-docker-env/local-docker.sh -a <account_num> -v <ubuntu_version>(optional) --keep-nodekey(optional)`
 
 ### local-docker-git.sh
 
 - **Purpose**: Integrated running script for local testing based on the Git repository.
-- **Usage**: `./local-docker-env/local-docker-git.sh -a <account_num> -b <branch> -r <repo> -v <ubuntu_version>(optional)`
+- **Usage**: `./local-docker-env/local-docker-git.sh -a <account_num> -b <branch> -r <repo> -v <ubuntu_version>(optional --keep-nodekey(optional)`
 
-### key-gen.sh
+### gen-nodekey.sh
 
-- **Purpose**: Generates an account in the `keystore` folder and creates a nodekey in the `nodekey` folder.
-- **Usage**: `./key-gen.sh -a <account_num>`
+- **Purpose**: Script for generating a nodekey for the node.
+- **Usage**: `./local-docker-env/gen-nodekey.sh -a <nodekey_num>`
 
-### config-gen.sh
+### gen-account.sh
 
-- **Purpose**: Generates the `config.json` file.
-- **Usage**: `./config-gen.sh -a <account_num> -f <output_config_file>`
-
-### docker-compose-gen.sh
-
-- **Purpose**: Generates the `docker-compose.yml` file based on the local repository.
-- **Usage**: `./docker-compose-gen.sh -a <account_num> -f <output_file_path> -v <ubuntu_version>(optional)`
-
-### docker-compose-gen-git.sh
-
-- **Purpose**: Generates the `docker-compose.yml` file based on the Git repository.
-- **Usage**: `./docker-compose-gen-git.sh -a <account_num> -f <output_file_path> -r <repo_url> -b <branch_name> -v <ubuntu_version>(optional)`
+- **Purpose**: Script for generating a nodekey for the node.
+- **Usage**: `./local-docker-env/gen-account.sh -a <account_num>`
 
 ### init-boot.sh
 
@@ -66,11 +56,11 @@ This document explains how to set up a local testing environment based on the `g
 ### Execution based on the local repository code
 
 ```bash
-./local-docker-env/local-docker.sh -a <account_num> -v <ubuntu_version>(optional)
+./local-docker-env/local-docker.sh -a <account_num> -v <ubuntu_version> (optional) --keep-nodekey (optional)
 ```
 
 ### Execution based on the Git repository code
 
 ```bash
-./local-docker-env/local-docker-git.sh -a <account_num> -b <branch> -r <repo> -v <ubuntu_version>(optional)
+./local-docker-env/local-docker-git.sh -a <account_num> -b <branch> -r <repo> -v <ubuntu_version> (optional) --keep-nodekey (optional)
 ```

local-docker-env/key-gen.sh local-docker-env/gen-account.sh

@@ -1,33 +1,32 @@
 #!/bin/bash
 
-# 필수 인수 확인
+# Check required arguments
 if [ "$#" -ne 2 ]; then
   echo "Usage: $0 -a <account_num>"
   exit 1
 fi
 
-# 옵션 파싱
+# Option parsing
 while getopts "a:" opt; do
   case ${opt} in
   a)
     ACCOUNT_NUM=$OPTARG
     ;;
   \?)
-    echo "Usage: $0 -a <account_num> -f <output_config_file>"
+    echo "Usage: $0 -a <account_num>"
     exit 1
     ;;
   esac
 done
 
-# 필수 인수 확인
+# Check required arguments
 if [ -z "$ACCOUNT_NUM" ]; then
   exit 1
 fi
 
 mkdir local-docker-env/keystore
-mkdir local-docker-env/nodekey
 
-# 계정 및 노드 키 생성
+# Create accounts
 for ((i = 1; i <= ACCOUNT_NUM; i++)); do
   if [ -f "local-docker-env/keystore/account$i" ]; then
     rm local-docker-env/keystore/account$i
@@ -39,14 +38,4 @@ for ((i = 1; i <= ACCOUNT_NUM; i++)); do
     echo "Failed to create account $i"
     exit 1
   fi
-  
-  if [ -f "local-docker-env/nodekey/nodekey$i" ]; then
-    rm local-docker-env/nodekey/nodekey$i
-  fi
-  if gwemix wemix new-nodekey --out local-docker-env/nodekey/nodekey$i; then
-    echo "Nodekey $i created successfully"
-  else
-    echo "Failed to create nodekey $i"
-    exit 1
-  fi
 done

local-docker-env/config-gen.sh local-docker-env/gen-config.sh

@@ -1,39 +1,39 @@
 #!/bin/bash
 
-# 필수 인수 확인
+# Check required arguments
 if [ "$#" -ne 4 ]; then
-  echo "Usage: $0 -a <account_num> -f <output_config_file>"
+  echo "Usage: $0 -a <node_num> -f <output_config_file>"
   exit 1
 fi
 
-# 옵션 파싱
+# Option parsing
 while getopts "a:f:" opt; do
   case ${opt} in
   a)
-    ACCOUNT_NUM=$OPTARG
+    NODE_NUM=$OPTARG
     ;;
   f)
     OUTPUT_CONFIG_FILE=$OPTARG
     ;;
   \?)
-    echo "Usage: $0 -a <account_num> -f <output_config_file>"
+    echo "Usage: $0 -a <node_num> -f <output_config_file>"
     exit 1
     ;;
   esac
 done
 
-# 필수 인수 확인
-if [ -z "$ACCOUNT_NUM" ] || [ -z "$OUTPUT_CONFIG_FILE" ]; then
+# Check required arguments
+if [ -z "$NODE_NUM" ] || [ -z "$OUTPUT_CONFIG_FILE" ]; then
   exit 1
 fi
 
-# 초기화
+# Initialize
 echo '{"members":[], "accounts":[]}' >"$OUTPUT_CONFIG_FILE"
 
-# 파일을 JSON 형식으로 로드
+# Load file as JSON
 json_content=$(cat "$OUTPUT_CONFIG_FILE")
 
-# 고정된 env 값을 포함한 JSON 객체
+# JSON object with fixed env values
 ENV_JSON='{
   "ballotDurationMin": 86400,
   "ballotDurationMax": 604800,
@@ -53,8 +53,8 @@ ENV_JSON='{
 json_content=$(echo "$json_content" | jq --argjson env "$ENV_JSON" \
   '.env = $env| .extraData = "chain for local test"')
 
-# JSON 구성 파일 생성
-for ((i = 1; i <= ACCOUNT_NUM; i++)); do
+# Generate JSON config file
+for ((i = 1; i <= NODE_NUM; i++)); do
   ids=$(gwemix wemix nodeid local-docker-env/nodekey/nodekey$i) || { echo "Failed to get node ID"; exit 1; }
   idv5=$(echo "$ids" | awk '/idv5:/ {print $2}')
   idv5="0x$idv5"
@@ -74,6 +74,6 @@ for ((i = 1; i <= ACCOUNT_NUM; i++)); do
   fi
 done
 
-# 수정된 내용을 파일에 저장
+# Save modified content to file
 echo "$json_content" >"$OUTPUT_CONFIG_FILE"
 echo "Updated config saved to $OUTPUT_CONFIG_FILE"

local-docker-env/docker-compose-gen-git.sh local-docker-env/gen-docker-compose-git.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Usage: ./gen-docker-compose.sh -a <account_num> -f <output_config_file> -r <repo_url> -b <branch_name>
-# -a: 계정 수
-# -f: 출력 파일
-# -r: 레포지토리 URL
-# -b: 브랜치 이름
-# -a 옵션은 필수이며, -f 옵션은 선택적
-# -f 옵션을 지정하지 않으면, 현재 디렉토리에 docker-compose.yml 파일을 생성
-# -f 옵션을 지정하면, 해당 경로에 docker-compose.yml 파일을 생성
+# -a: number of accounts
+# -f: output file
+# -r: repository URL
+# -b: branch name
+# -a option is mandatory, -f option is optional
+# If -f option is not specified, a docker-compose.yml file will be created in the current directory
+# If -f option is specified, a docker-compose.yml file will be created at the specified path
 
 # Parse command line arguments
 while getopts "a:f:r:b:v:" opt; do
@@ -63,7 +63,7 @@ fi
 
 # Set default version if not provided
 if [ -z "$version" ]; then
-    version="latest"
+    version="22.04"
 fi
 
 # Generate docker-compose.yml content

local-docker-env/docker-compose-gen.sh local-docker-env/gen-docker-compose.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
 # Usage: ./gen-docker-compose.sh -a <account_num> -f <output_config_file>
-# -a: 계정 수
-# -f: 출력 파일
-# -a 옵션은 필수이며, -f, -v 옵션은 선택적
-# -f 옵션을 지정하지 않으면, 현재 디렉토리에 docker-compose.yml 파일을 생성
-# -f 옵션을 지정하면, 해당 경로에 docker-compose.yml 파일을 생성
-# -v 옵션을 지정하지 않으면, latest 버전으로 설정
-# -v 옵션을 지정하면, 해당 버전으로 설정
+# -a: number of accounts
+# -f: output file
+# -a option is required, -f and -v options are optional
+# If -f option is not specified, a docker-compose.yml file will be created in the current directory
+# If -f option is specified, a docker-compose.yml file will be created at the specified path
+# If -v option is not specified, the version will be set to latest
+# If -v option is specified, the version will be set to the specified version
 
 # Parse command line arguments
 while getopts "a:f:v:" opt; do
@@ -45,7 +45,7 @@ fi
 
 # Set default version if not provided
 if [ -z "$version" ]; then
-    version="latest"
+    version="22.04"
 fi
 
 # Generate docker-compose.yml content

local-docker-env/gen-nodekey.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# Check required arguments
+if [ "$#" -ne 2 ]; then
+  echo "Usage: $0 -a <nodekey_num>"
+  exit 1
+fi
+
+# Option parsing
+while getopts "a:" opt; do
+  case ${opt} in
+  a)
+    NODEKEY_NUM=$OPTARG
+    ;;
+  \?)
+    echo "Usage: $0 -a <nodekey_num>"
+    exit 1
+    ;;
+  esac
+done
+
+# Check required arguments
+if [ -z "$NODEKEY_NUM" ]; then
+  exit 1
+fi
+
+mkdir local-docker-env/nodekey
+
+# Create nodekeys
+for ((i = 1; i <= NODEKEY_NUM; i++)); do
+  if [ -f "local-docker-env/nodekey/nodekey$i" ]; then
+    rm local-docker-env/nodekey/nodekey$i
+  fi
+  if gwemix wemix new-nodekey --out local-docker-env/nodekey/nodekey$i; then
+    echo "Nodekey $i created successfully"
+  else
+    echo "Failed to create nodekey $i"
+    exit 1
+  fi
+done