diff --git a/chain33.fork.toml b/chain33.fork.toml index cb53192b2..dfe930749 100644 --- a/chain33.fork.toml +++ b/chain33.fork.toml @@ -28,6 +28,8 @@ ForkFormatAddressKey=0 ForkCheckEthTxSort=0 ForkProxyExec=0 ForkMaxTxFeeV1=0 +ForkMaxTxFeeV2=0 +ForkMaxBlockFee=0 [fork.sub.none] ForkUseTimeDelay=0 diff --git a/chain33.para.toml b/chain33.para.toml index 960a467b1..96870cb68 100644 --- a/chain33.para.toml +++ b/chain33.para.toml @@ -103,6 +103,12 @@ maxTxNumPerAccount=10000 # 单笔交易最大的手续费, 50 coins maxTxFee=5000000000 +[mver.mempool.ForkMaxTxFeeV2] +# 单笔交易最大的手续费, 10 coins +maxTxFee=1000000000 + + + [consensus] name="para" genesisBlockTime=1514533390 @@ -324,6 +330,8 @@ ForkFormatAddressKey=0 ForkCheckEthTxSort=0 ForkProxyExec=0 ForkMaxTxFeeV1=0 +ForkMaxTxFeeV2=0 +ForkMaxBlockFee=0 [fork.sub.none] ForkUseTimeDelay=0 diff --git a/chain33.toml b/chain33.toml index c3d96315c..0c30ef538 100644 --- a/chain33.toml +++ b/chain33.toml @@ -135,6 +135,10 @@ isLevelFee=true # 单笔交易最大的手续费, 50 coins maxTxFee=5000000000 +[mver.mempool.ForkMaxTxFeeV2] +# 单笔交易最大的手续费, 10 coins +maxTxFee=1000000000 + [mempool.sub.timeline] poolCacheSize=10240 diff --git a/go.mod b/go.mod index a73293a30..b912d170d 100644 --- a/go.mod +++ b/go.mod @@ -2,9 +2,10 @@ module github.com/33cn/plugin go 1.19 +replace github.com/33cn/chain33 => github.com/libangzhu/chain33 v0.0.0-20240204084841-69d03c474512 require ( - github.com/33cn/chain33 v1.68.2-0.20240117085747-5de6bc4d527f + github.com/33cn/chain33 v1.68.2-0.20240117085747-5de6bc4d527f github.com/BurntSushi/toml v1.1.0 github.com/NebulousLabs/Sia v1.3.7 github.com/bitly/go-simplejson v0.5.0 diff --git a/go.sum b/go.sum index a3b5a5554..21da29896 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,6 @@ dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBr dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= -github.com/33cn/chain33 v1.68.2-0.20240117085747-5de6bc4d527f h1:hFhX36MNyKhCTvBgaIhjfucnLE7yA3outLj32XSch5s= -github.com/33cn/chain33 v1.68.2-0.20240117085747-5de6bc4d527f/go.mod h1:9nwINei+dK/pztPobQSwJpeawYbR2o6UR01QM+AwBC8= github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M= github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/Azure/azure-sdk-for-go v41.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= @@ -816,6 +814,8 @@ github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lib/pq v1.0.0 h1:X5PMW56eZitiTeO7tKzZxFCSpbFZJtkMMooicw2us9A= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/libangzhu/chain33 v0.0.0-20240204084841-69d03c474512 h1:Ngsjc8B0EFThrurQeXf8ko3I90hfS2Rj3Na7aTyzIwM= +github.com/libangzhu/chain33 v0.0.0-20240204084841-69d03c474512/go.mod h1:9nwINei+dK/pztPobQSwJpeawYbR2o6UR01QM+AwBC8= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/libp2p/go-cidranger v1.1.0 h1:ewPN8EZ0dd1LSnrtuwd4709PXVcITVeuwbag38yPW7c= diff --git a/plugin/dapp/evm/cmd/ci2/chain33.proxyminer.toml b/plugin/dapp/evm/cmd/ci2/chain33.proxyminer.toml index f0923216e..2f45b9de6 100644 --- a/plugin/dapp/evm/cmd/ci2/chain33.proxyminer.toml +++ b/plugin/dapp/evm/cmd/ci2/chain33.proxyminer.toml @@ -135,6 +135,11 @@ isLevelFee=true # 单笔交易最大的手续费, 50 coins maxTxFee=5000000000 +[mver.mempool.ForkMaxTxFeeV2] +# 单笔交易最大的手续费, 10 coins +maxTxFee=1000000000 + + [mempool.sub.timeline] poolCacheSize=10240 @@ -521,6 +526,8 @@ ForkFormatAddressKey=0 ForkCheckEthTxSort=0 ForkProxyExec=0 ForkMaxTxFeeV1=0 +ForkMaxBlockFee=0 +ForkMaxTxFeeV2=0 [fork.sub.none] ForkUseTimeDelay=0