update test

33cn · Jan 17, 2024 · 094437e · 094437e
1 parent 20c804d
commit 094437e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/cmd/chain33/chain33.fork.toml b/cmd/chain33/chain33.fork.toml
@@ -27,7 +27,6 @@ ForkFormatAddressKey=0
 ForkCheckEthTxSort=0
 ForkProxyExec=0
 ForkMaxTxFeeV1=0
-
 [fork.sub.none]
 ForkUseTimeDelay=0
 

diff --git a/types/config.go b/types/config.go
@@ -541,13 +541,15 @@ func (c *Chain33Config) GetMaxTxFeeRate() int64 {
 
 // GetMaxTxFee get max transaction fee by blockheight
 func (c *Chain33Config) GetMaxTxFee(height int64) int64 {
+
 	if c.IsFork(height, "ForkMaxTxFeeV1") {
 		conf := Conf(c, "mver.mempool")
-		return conf.MGInt("maxTxFee", height)
-	}
+		if conf.MGInt("maxTxFee", height) != 0 {
+			return conf.MGInt("maxTxFee", height)
+		}
 
+	}
 	return c.GInt("MaxTxFee")
-
 }
 
 // SetTxFeeConfig 设置交易费相关配置

diff --git a/types/fork.go b/types/fork.go
@@ -145,7 +145,7 @@ func (f *Forks) SetTestNetFork() {
 	f.setFork("ForkCheckEthTxSort", 0)
 	f.setFork("ForkProxyExec", 0)
 	f.setFork("ForkMaxTxFeeV1", 0)
-	f.setFork("ForkMaxTxFeeV2", 0)
+
 }
 
 func (f *Forks) setLocalFork() {