v3.11.3: deprioritize bot txs

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v3.11.3
+Sun Dec 17 21:32:41 CST 2023
+
+- deprioritize bot txs
+
 ## v3.11.0
 Fri Dec 15 12:59:23 CST 2023
 

Makefile

@@ -5,7 +5,7 @@ GO_INSTALL := $(GO) install
 
 PROJECT_NAME := $(shell basename "$(PWD)")
 BUILDER_VERSION = 3.11.0
-VERSION = 3.11.2
+VERSION = 3.11.3
 COMMIT = $(shell git rev-parse --short HEAD)
 PROJECT = github.com/iost-official/go-iost
 DOCKER_IMAGE = iostio/iost-node:$(VERSION)-$(COMMIT)

verifier/executor.go

@@ -110,6 +110,7 @@ func baseGen(blk *block.Block, db database.IMultiValue, provider Provider, isola
 	to := time.Now().Add(c.Timeout)
 	blockGasLimit := common.MaxBlockGasLimit
 
+	senderSet := map[string]struct{}{}
 L:
 	for tn.Before(to) {
 		isolator.ClearTx()
@@ -156,6 +157,11 @@ L:
 		if t.GasLimit > blockGasLimit {
 			continue L
 		}
+		_, ok := senderSet[t.Publisher]
+		if ok {
+			continue L
+		}
+		senderSet[t.Publisher] = struct{}{}
 		err := isolator.PrepareTx(t, limit)
 		if err != nil {
 			ilog.Errorf("PrepareTx failed. tx %v limit %v err %v", t.String(), limit, err)