Skip to content

Commit ca4773b

Browse files
authored
Merge pull request #774 from tronprotocol/set_witness_count
Set max active witness number to 27
2 parents 964a351 + 3943c30 commit ca4773b

File tree

2 files changed

+123
-38
lines changed

2 files changed

+123
-38
lines changed

src/main/java/org/tron/core/config/Parameter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ interface ChainConstant {
99
long VOTE_WITNESS_FEE = 10000; // 10000 drop
1010
long CREATE_ACCOUNT_FEE = 10000; // 10000 drop
1111
long WITNESS_PAY_PER_BLOCK = 32000000; // 32trx
12-
double SOLIDIFIED_THRESHOLD = 0.6;
12+
double SOLIDIFIED_THRESHOLD = 0.7;
1313
int PRIVATE_KEY_LENGTH = 64;
14-
int MAX_ACTIVE_WITNESS_NUM = 15;
14+
int MAX_ACTIVE_WITNESS_NUM = 27;
1515
int TRXS_SIZE = 2_000_000; // < 2MiB
1616
int BLOCK_PRODUCED_INTERVAL = 3000; //ms,produce block period, must be divisible by 60. millisecond
1717
long CLOCK_MAX_DELAY = 3600 * 1000; //ms

src/main/resources/config.conf

Lines changed: 121 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ node {
4242
# "ip:port"
4343
]
4444

45-
maxActiveNodes = 20
45+
maxActiveNodes = 30
4646

4747
minParticipationRate = 33
4848

4949
p2p {
50-
version = 64 # 64: testnet; 101: debug
50+
version = 65 # 65: testnet; 101: debug
5151
}
5252

5353
}
@@ -88,7 +88,7 @@ genesis.block = {
8888
accountName = "Devaccount"
8989
accountType = "AssetIssue"
9090
address = "27d3byPxZXKQWfXX7sJvemJJuv5M65F3vjS"
91-
balance = "10000000000000000"
91+
balance = "75000000000000000"
9292
},
9393
{
9494
accountName = "Zion"
@@ -112,59 +112,144 @@ genesis.block = {
112112

113113
witnesses = [
114114
{
115-
address: 27cEZa99jVaDkujPwzZuHYgkYNqv6zzYLSP
116-
url = "http://Mercury.org",
117-
voteCount = 105
115+
address: 27PxykS4kNvH8wAkTLmVFrjUY3XMVif1mCT,
116+
url= "http://Alioth.com",
117+
voteCount = 0
118+
},
119+
{
120+
address: 27g8LmoFZqreoGA7DXMBACYUrtHJhwDtRN8,
121+
url= "http://Aries.com",
122+
voteCount = 0
123+
},
124+
{
125+
address: 27gxPESdqo13bbmsUymAS56NSWBVYwRcGPD,
126+
url= "http://Cancer.com",
127+
voteCount = 0
128+
},
129+
{
130+
address: 27gMPgPAqoD81px3dCGzaSskBxD2P8hnoUX,
131+
url= "http://Capricorn.com",
132+
voteCount = 0
133+
},
134+
{
135+
address: 27SHRr2cEpY7sqyMqHD8aq1nkgziPZs7WPi,
136+
url= "http://Cassiopeia.com",
137+
voteCount = 0
138+
},
139+
{
140+
address: 27SmZHo9VuLanV9ki3rCQUcsLM3uSAhd7Wf,
141+
url= "http://Crux.com",
142+
voteCount = 0
143+
},
144+
{
145+
address: 27QPMhs5Yp7bUwm8E49As42NSTEzk2NS9RX,
146+
url= "http://Delphinus.com",
147+
voteCount = 0
148+
},
149+
{
150+
address: 27YYha9VR2V2YrBxeVWESCyg5GtSsk5GRa1,
151+
url= "http://Dorado.com",
152+
voteCount = 0
153+
},
154+
{
155+
address: 27ZczAb5knuHj6vdMTdkJbLFmfKLvPW7GsA,
156+
url= "http://Dubhe.com",
157+
voteCount = 0
158+
},
159+
{
160+
address: 27heA398dbFCPK1Th1LZfk2qr9zQVT9ULwW,
161+
url= "http://Eridanus.com",
162+
voteCount = 0
163+
},
164+
{
165+
address: 27Zu6f5dV99wqLSpz9udzn5TMG8XZPJpVog,
166+
url= "http://Gemini.com",
167+
voteCount = 0
168+
},
169+
{
170+
address: 27WEvZPj4MTjgFVgftuZHwXDZ4GvERJ1EBT,
171+
url= "http://Hercules.com",
172+
voteCount = 0
173+
},
174+
{
175+
address: 27fuGHVLq7d6S45UBtpUNvezHa3mzZN1ZhT,
176+
url= "http://Leo.com",
177+
voteCount = 0
178+
},
179+
{
180+
address: 27gGphfLygRpiMTjwquk2hfBqYKByr1x3YF,
181+
url= "http://Libra.com",
182+
voteCount = 0
183+
},
184+
{
185+
address: 27mAGvEWMHdiEg3xPyQXJZiPko4E7DaNyNW,
186+
url= "http://Lupus.com",
187+
voteCount = 0
188+
},
189+
{
190+
address: 27QxTvaLoGfg6Tor9C5wYrar1Uq4nYhnA8N,
191+
url= "http://Lyra.com",
192+
voteCount = 0
193+
},
194+
{
195+
address: 27Yj5prhYkM2PSWyXjhKV6MQmPD7hdsnAio,
196+
url= "http://Monoceros.com",
197+
voteCount = 0
198+
},
199+
{
200+
address: 27ecHtfLXQE6J6FKG7UdDpfpAJkaKwqCdZ8,
201+
url= "http://Norma.com",
202+
voteCount = 0
118203
},
119204
{
120-
address: 27anh4TDZJGYpsn4BjXzb7uEArNALxwiZZW
121-
url = "http://Venus.org",
122-
voteCount = 104
205+
address: 27ULHaikTqKxmC9sYtauy3i6wuf1Rf2facG,
206+
url= "http://Orion.com",
207+
voteCount = 0
123208
},
124209
{
125-
address: 27Wkfa5iEJtsKAKdDzSmF1b2gDm5s49kvdZ
126-
url = "http://Earth.org",
127-
voteCount = 103
210+
address: 27ioeNwMjNNtAvqiBSWHkMSyAhDpszRWibh,
211+
url= "http://Pavo.com",
212+
voteCount = 0
128213
},
129214
{
130-
address: 27bqKYX9Bgv7dgTY7xBw5SUHZ8EGaPSikjx
131-
url = "http://Mars.org",
132-
voteCount = 102
215+
address: 27fuyWmVArGDfQ8TS3NvzunN19ZJjxSV1Dx,
216+
url= "http://Perseus.com",
217+
voteCount = 0
133218
},
134219
{
135-
address: 27fASUY6qKtsaAEPz6QxhZac2KYVz2ZRTXW
136-
url = "http://Jupiter.org",
137-
voteCount = 101
220+
address: 27RPg4Mx1MVZPpmfaJgRQWksqAgySQ3HaRU,
221+
url= "http://Phecda.com",
222+
voteCount = 0
138223
},
139224
{
140-
address: 27Q3RSbiqm59VXcF8shQWHKbyztfso5FwvP
141-
url = "http://Saturn.org",
142-
voteCount = 100
225+
address: 27SwT5aMxZKRoysXMLwZb9HziJZHEwu7Bpv,
226+
url= "http://Phoenix.com",
227+
voteCount = 0
143228
},
144229
{
145-
address: 27YkUVSuvCK3K84DbnFnxYUxozpi793PTqZ
146-
url = "http://Uranus.org",
147-
voteCount = 99
230+
address: 27Uqj6VqqasApPBZgnB9qows3GkKUZ7wJai,
231+
url= "http://Pyxis.com",
232+
voteCount = 0
148233
},
149234
{
150-
address: 27kdTBTDJ16hK3Xqr8PpCuQJmje1b94CDJU
151-
url = "http://Neptune.org",
152-
voteCount = 98
235+
address: 27hCKyn6oZR8EVadSximYAyeE279okY9oqp,
236+
url= "http://Scutum.com",
237+
voteCount = 0
153238
},
154239
{
155-
address: 27mw9UpRy7inTMQ5kUzsdTc2QZ6KvtCX4uB
156-
url = "http://Pluto.org",
157-
voteCount = 97
240+
address: 27WHVfnh7AZCzga3w8UP9psoVRd9J2Cghkd,
241+
url= "http://Taurus.com",
242+
voteCount = 0
158243
},
159244
{
160-
address: 27QzC4PeQZJ2kFMUXiCo4S8dx3VWN5U9xcg
161-
url = "http://Altair.org",
162-
voteCount = 96
245+
address: 27b8A6vaakeCEqQ6a6uVPLKSeyUAUsuin6i,
246+
url= "http://Volans.com",
247+
voteCount = 0
163248
},
164249
{
165-
address: 27VZHn9PFZwNh7o2EporxmLkpe157iWZVkh
166-
url = "http://AlphaLyrae.org",
167-
voteCount = 95
250+
address: 27fA4k6h3XLxTiC63Ke4c5YeEuwgM7d2toV,
251+
url= "http://Vulpecula.com",
252+
voteCount = 0
168253
}
169254
]
170255

0 commit comments

Comments
 (0)