Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
plugin
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
link33
plugin
Commits
25edc591
Commit
25edc591
authored
Mar 16, 2019
by
vipwzw
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add config of maxTxFee
parent
cab37049
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
chain33.toml
chain33.toml
+6
-1
paracross_test.go
plugin/dapp/paracross/executor/paracross_test.go
+0
-2
execenv.go
vendor/github.com/33cn/chain33/executor/execenv.go
+1
-1
No files found.
chain33.toml
View file @
25edc591
...
@@ -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
=
fals
e
enableTxQuickIndex
=
tru
e
[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
...
...
plugin/dapp/paracross/executor/paracross_test.go
View file @
25edc591
...
@@ -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
}
}
...
...
vendor/github.com/33cn/chain33/executor/execenv.go
View file @
25edc591
...
@@ -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
(
"Max
Tx
Fee"
));
err
!=
nil
{
return
err
return
err
}
}
//允许重写的情况
//允许重写的情况
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment