diff --git a/cmd/chain33/chain33.fork.toml b/cmd/chain33/chain33.fork.toml index 089e0083b..f73c0a932 100644 --- 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 index 4b8972723..360bb74a9 100644 --- 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 index 8e6aa0f30..b01b6c78e 100644 --- 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() {