Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update chain33 #1283

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+25 −3
Open

update chain33 #1283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
253cffe
update config
libangzhu Feb 20, 2024
5731c70
update test configfile
libangzhu Feb 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions chain33.fork.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ ForkFormatAddressKey=0
ForkCheckEthTxSort=0
ForkProxyExec=0
ForkMaxTxFeeV1=0
ForkMaxTxFeeV2=0
ForkMaxBlockFee=0

[fork.sub.none]
ForkUseTimeDelay=0
Expand Down
8 changes: 8 additions & 0 deletions chain33.para.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ maxTxNumPerAccount=10000
# 单笔交易最大的手续费, 50 coins
maxTxFee=5000000000

[mver.mempool.ForkMaxTxFeeV2]
# 单笔交易最大的手续费, 10 coins
maxTxFee=1000000000



[consensus]
name="para"
genesisBlockTime=1514533390
Expand Down Expand Up @@ -324,6 +330,8 @@ ForkFormatAddressKey=0
ForkCheckEthTxSort=0
ForkProxyExec=0
ForkMaxTxFeeV1=0
ForkMaxTxFeeV2=0
ForkMaxBlockFee=0

[fork.sub.none]
ForkUseTimeDelay=0
Expand Down
4 changes: 4 additions & 0 deletions chain33.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ isLevelFee=true
# 单笔交易最大的手续费, 50 coins
maxTxFee=5000000000

[mver.mempool.ForkMaxTxFeeV2]
# 单笔交易最大的手续费, 10 coins
maxTxFee=1000000000

[mempool.sub.timeline]
poolCacheSize=10240

Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
7 changes: 7 additions & 0 deletions plugin/dapp/evm/cmd/ci2/chain33.proxyminer.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@ isLevelFee=true
# 单笔交易最大的手续费, 50 coins
maxTxFee=5000000000

[mver.mempool.ForkMaxTxFeeV2]
# 单笔交易最大的手续费, 10 coins
maxTxFee=1000000000


[mempool.sub.timeline]
poolCacheSize=10240

Expand Down Expand Up @@ -521,6 +526,8 @@ ForkFormatAddressKey=0
ForkCheckEthTxSort=0
ForkProxyExec=0
ForkMaxTxFeeV1=0
ForkMaxBlockFee=0
ForkMaxTxFeeV2=0

[fork.sub.none]
ForkUseTimeDelay=0
Expand Down
Loading