chore: resolve merge conflicts and fix review comments

.github/workflows/build-test.yml

@@ -7,7 +7,9 @@ on:
       - develop
 
   pull_request:
-
+    branches:
+      - master
+      - develop
 
 jobs:
   unit-test:
@@ -45,5 +47,3 @@ jobs:
       run: |
         go mod download
         make geth
-
-

.github/workflows/commit-lint.yml

@@ -7,7 +7,9 @@ on:
       - develop
 
   pull_request:
-
+    branches:
+      - master
+      - develop
 
 jobs:
   commitlint:

.github/workflows/integration-test.yml

@@ -7,6 +7,9 @@ on:
       - develop
 
   pull_request:
+    branches:
+      - master
+      - develop
 
 jobs:
   truffle-test:

.github/workflows/lint.yml

@@ -7,7 +7,9 @@ on:
       - develop
 
   pull_request:
-
+    branches:
+      - master
+      - develop
 
 jobs:
   golang-lint:

.github/workflows/unit-test.yml

@@ -7,7 +7,9 @@ on:
       - develop
 
   pull_request:
-
+    branches:
+      - master
+      - develop
 
 jobs:
   unit-test:
@@ -48,6 +50,5 @@ jobs:
         ANDROID_HOME: "" # Skip android test
       run: |
         git submodule update --init --depth 1 --recursive
-        go mod tidy
+        go mod download
         make test
-

cmd/geth/blsaccountcmd.go

@@ -673,7 +673,7 @@ func blsAccountGenerateProof(ctx *cli.Context) error {
 		utils.Fatalf("BLS wallet not exists.")
 	}
 
-	walletPassword := utils.GetPassPhraseWithList("Enter the password for your BLS wallet.", false, 0, GetBLSPassword(ctx))
+	walletPassword := utils.GetPassPhraseWithList("Enter the password for your BLS wallet.", false, 0, utils.MakePasswordListFromPath(ctx.String(utils.BLSPasswordFileFlag.Name)))
 	w, err := wallet.OpenWallet(context.Background(), &wallet.Config{
 		WalletDir:      walletDir,
 		WalletPassword: walletPassword,

consensus/parlia/abi.go

@@ -4481,6 +4481,54 @@ const stakeABI = `
     ],
     "stateMutability": "view"
   },
+  {
+    "type": "function",
+    "name": "getValidatorRewardRecord",
+    "inputs": [
+      {
+        "name": "operatorAddress",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "dayIndex",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "stateMutability": "view"
+  },
+  {
+    "type": "function",
+    "name": "getValidatorTotalPooledBNBRecord",
+    "inputs": [
+      {
+        "name": "operatorAddress",
+        "type": "address",
+        "internalType": "address"
+      },
+      {
+        "name": "dayIndex",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256",
+        "internalType": "uint256"
+      }
+    ],
+    "stateMutability": "view"
+  },
   {
     "type": "function",
     "name": "initialize",

consensus/parlia/feynmanfork.go

@@ -204,14 +204,14 @@ func getTopValidatorsByVotingPower(validatorItems []ValidatorItem, maxElectedVal
 	hp := &validatorHeap
 	heap.Init(hp)
 
-	length := int(maxElectedValidators.Int64())
-	if length > len(validatorHeap) {
-		length = len(validatorHeap)
-	}
-	eValidators := make([]common.Address, length)
-	eVotingPowers := make([]uint64, length)
-	eVoteAddrs := make([][]byte, length)
-	for i := 0; i < length; i++ {
+	topN := int(maxElectedValidators.Int64())
+	if topN > len(validatorHeap) {
+		topN = len(validatorHeap)
+	}
+	eValidators := make([]common.Address, topN)
+	eVotingPowers := make([]uint64, topN)
+	eVoteAddrs := make([][]byte, topN)
+	for i := 0; i < topN; i++ {
 		item := heap.Pop(hp).(ValidatorItem)
 		eValidators[i] = item.address
 		// as the decimal in BNB Beacon Chain is 1e8 and in BNB Smart Chain is 1e18, we need to divide it by 1e10

core/vm/contracts.go

@@ -1453,6 +1453,9 @@ func (c *verifyDoubleSignEvidence) Run(input []byte) ([]byte, error) {
 	// check sig
 	msgHash1 := types.SealHash(header1, evidence.ChainId)
 	msgHash2 := types.SealHash(header2, evidence.ChainId)
+	if bytes.Equal(msgHash1.Bytes(), msgHash2.Bytes()) {
+		return nil, ErrExecutionReverted
+	}
 	pubkey1, err := secp256k1.RecoverPubkey(msgHash1.Bytes(), sig1)
 	if err != nil {
 		return nil, ErrExecutionReverted