Commit 25edc591 authored by vipwzw's avatar vipwzw

add config of maxTxFee

parent cab37049
...@@ -37,7 +37,7 @@ singleMode=false ...@@ -37,7 +37,7 @@ singleMode=false
batchsync=false batchsync=false
isRecordBlockSequence=true isRecordBlockSequence=true
isParaChain=false isParaChain=false
enableTxQuickIndex=false enableTxQuickIndex=true
[p2p] [p2p]
seeds=[] seeds=[]
...@@ -66,6 +66,7 @@ name="timeline" ...@@ -66,6 +66,7 @@ name="timeline"
poolCacheSize=10240 poolCacheSize=10240
minTxFee=100000 minTxFee=100000
maxTxNumPerAccount=100 maxTxNumPerAccount=100
maxTxFee=1000000000
[mempool.sub.timeline] [mempool.sub.timeline]
poolCacheSize=10240 poolCacheSize=10240
...@@ -140,6 +141,10 @@ enableMavlPrefix=false ...@@ -140,6 +141,10 @@ enableMavlPrefix=false
enableMVCC=false enableMVCC=false
enableMavlPrune=false enableMavlPrune=false
pruneHeight=10000 pruneHeight=10000
# 是否使能mavl数据载入内存
enableMemTree=true
# 是否使能mavl叶子节点数据载入内存
enableMemVal=true
[wallet] [wallet]
minFee=100000 minFee=100000
......
...@@ -519,7 +519,6 @@ func createCrossParaTx(s suite.Suite, to []byte) (*types.Transaction, error) { ...@@ -519,7 +519,6 @@ func createCrossParaTx(s suite.Suite, to []byte) (*types.Transaction, error) {
} }
func createTxsGroup(s suite.Suite, txs []*types.Transaction) ([]*types.Transaction, error) { func createTxsGroup(s suite.Suite, txs []*types.Transaction) ([]*types.Transaction, error) {
group, err := types.CreateTxGroup(txs) group, err := types.CreateTxGroup(txs)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -532,7 +531,6 @@ func createTxsGroup(s suite.Suite, txs []*types.Transaction) ([]*types.Transacti ...@@ -532,7 +531,6 @@ func createTxsGroup(s suite.Suite, txs []*types.Transaction) ([]*types.Transacti
for i := range group.Txs { for i := range group.Txs {
group.SignN(i, int32(types.SECP256K1), privKey) group.SignN(i, int32(types.SECP256K1), privKey)
} }
return group.Txs, nil return group.Txs, nil
} }
......
...@@ -138,7 +138,7 @@ func (e *executor) checkTx(tx *types.Transaction, index int) error { ...@@ -138,7 +138,7 @@ func (e *executor) checkTx(tx *types.Transaction, index int) error {
//如果已经过期 //如果已经过期
return types.ErrTxExpire return types.ErrTxExpire
} }
if err := tx.Check(e.height, types.GInt("MinFee"), types.GInt("MaxFee")); err != nil { if err := tx.Check(e.height, types.GInt("MinFee"), types.GInt("MaxTxFee")); err != nil {
return err return err
} }
//允许重写的情况 //允许重写的情况
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment