add gas limit set for permission blockchain and fee free

chain33.toml

@@ -278,6 +278,11 @@ paraConsensusStopBlocks=30000
 total="16htvcBNSEA7fZhAdLJphDwQRQJaHpyHTp"
 useBalance=false
 
+[exec.sub.evm]
+#免交易费模式联盟链允许的最大gas，该配置只对不收取交易费部署方式有效，其他部署方式下该配置不会产生作用
+#当前最大为200万
+evmGasLimit=2000000
+
 [metrics]
 #是否使能发送metrics数据的发送
 enableMetrics=false

plugin/dapp/evm/executor/exec.go

@@ -213,6 +213,15 @@ func (evm *EVMExecutor) GetMessage(tx *types.Transaction, index int, fromPtr *co
 	gasPrice := action.GasPrice
 	if gasLimit == 0 {
 		gasLimit = uint64(evm.GetTxFee(tx, index))
+		//如果未设置交易费，则尝试读取免交易费联盟链模式下的gas设置
+		if 0 == gasLimit {
+			cfg := evm.GetAPI().GetConfig()
+			conf := types.ConfSub(cfg, evmtypes.ExecutorName)
+			gasLimit = uint64(conf.GInt("evmGasLimit"))
+			if 0 == gasLimit {
+				panic("evmGasLimit is not configured for permission blockchain")
+			}
+		}
 	}
 	if gasPrice == 0 {
 		gasPrice = uint32(1)