Skip to content

Commit dfbc6a4

Browse files
Nicholas-MacLeodNicholas-MacLeod
committed
v1.35.0
1 parent 2462602 commit dfbc6a4

File tree

166 files changed

+16818
-2875
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+16818
-2875
lines changed

‎common/nuls-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>ch.qos.logback</groupId>
2424
<artifactId>logback-access</artifactId>
25-
<version>${logback.version}</version>
25+
<version>${logback-access.version}</version>
2626
</dependency>
2727
<dependency>
2828
<groupId>ch.qos.logback</groupId>

‎common/nuls-core/src/main/java/io/nuls/core/constant/TxType.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,5 +393,7 @@ public class TxType {
393393
* Heterogeneous Chain Master Asset BindingNERVEAsset trading
394394
*/
395395
public static final int HETEROGENEOUS_MAIN_ASSET_BIND = 84;
396+
public static final int WITHDRAWAL_UTXO = 85;
397+
public static final int WITHDRAWAL_UTXO_FEE_PAYMENT = 86;
396398

397399
}

‎config/nuls.beta.ncf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ height_1_31_0=39860000
171171
height_1_32_0=42010000
172172
height_1_33_0=42360000
173173
height_1_34_0=43210000
174+
height_1_35_0=44288000
174175

175176
[nuls-api]
176177
#httpServerStart ofip
@@ -228,14 +229,19 @@ proposalPrice=1000000000
228229
proposalVotingDays=10
229230
distributionFee=1000000000
230231
byzantineRatio=66
231-
multySignAddressSet=101:0x44f4eA5028992D160Dc0dc9A3cB93a2e4C913611,102:0xf7915d4de86b856F3e51b894134816680bf09EEE,103:0xb339211438Dcbf3D00d7999ad009637472FC72b3,104:0xab34B1F41dA5a32fdE53850EfB3e54423e93483e,105:0x74A163fCd791Ec7AaB2204ffAbf1A1DFb8854883,106:0x2eDCf5f18D949c51776AFc42CDad667cDA2cF862,107:0x74A163fCd791Ec7AaB2204ffAbf1A1DFb8854883,108:TWajcnpyyZLRtLkFd6p4ZAMn5y4GpDa6MB,109:0xb339211438Dcbf3D00d7999ad009637472FC72b3,110:0x8999d8738CC9B2E1fb1D01E1af732421D53Cb2A9,111:0x830befa62501F1073ebE2A519B882e358f2a0318,112:0x8999d8738CC9B2E1fb1D01E1af732421D53Cb2A9,113:0x03Cf96223BD413eb7777AFE3cdb689e7E851CB32,114:0x3F1f3D17619E916C4F04707BA57d8E0b9e994fB0,115:0x56F175D48211e7D018ddA7f0A0B51bcfB405AE69,116:0x2eDCf5f18D949c51776AFc42CDad667cDA2cF862,117:0x830befa62501F1073ebE2A519B882e358f2a0318,118:0x898d47a9C97B6b17409FaFC982514A8e89251fED,119:0x56F175D48211e7D018ddA7f0A0B51bcfB405AE69,120:0x8999d8738CC9B2E1fb1D01E1af732421D53Cb2A9,122:0x830befa62501F1073ebE2A519B882e358f2a0318,123:0xA8e8c840e92d10dF3514A00491f50B6277aF215f,124:0xdd35003eD2118D997F3404C9C17eb20dfea0f767,125:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,126:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,127:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,128:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,129:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,130:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,131:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,132:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,133:0xa008BbDF42Bc0ac18239C96716F0139a6cE11981,134:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,202:3BXpnXkAG7SYNxyKyDimcxjkyYQcaaJs5X,201:2NDu3vcpjyiMgvRjDpQfbyh9uF2McfDJ3NF,135:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,137:0x5e7e2abaa58e108f5b9d5d30a76253fa8cb81f9d,138:0x5e7e2abaa58e108f5b9d5d30a76253fa8cb81f9d,139:0x5e7e2abaa58e108f5b9d5d30a76253fa8cb81f9d,140:0x5e7e2abaa58e108f5b9d5d30a76253fa8cb81f9d,141:0x5e7e2abaa58e108f5b9d5d30a76253fa8cb81f9d
232+
multySignAddressSet=101:0x44f4eA5028992D160Dc0dc9A3cB93a2e4C913611,102:0xf7915d4de86b856F3e51b894134816680bf09EEE,103:0xb339211438Dcbf3D00d7999ad009637472FC72b3,104:0xab34B1F41dA5a32fdE53850EfB3e54423e93483e,105:0x74A163fCd791Ec7AaB2204ffAbf1A1DFb8854883,106:0x2eDCf5f18D949c51776AFc42CDad667cDA2cF862,107:0x74A163fCd791Ec7AaB2204ffAbf1A1DFb8854883,108:TWajcnpyyZLRtLkFd6p4ZAMn5y4GpDa6MB,109:0xb339211438Dcbf3D00d7999ad009637472FC72b3,110:0x8999d8738CC9B2E1fb1D01E1af732421D53Cb2A9,111:0x830befa62501F1073ebE2A519B882e358f2a0318,112:0x8999d8738CC9B2E1fb1D01E1af732421D53Cb2A9,113:0x03Cf96223BD413eb7777AFE3cdb689e7E851CB32,114:0x3F1f3D17619E916C4F04707BA57d8E0b9e994fB0,115:0x56F175D48211e7D018ddA7f0A0B51bcfB405AE69,116:0x2eDCf5f18D949c51776AFc42CDad667cDA2cF862,117:0x830befa62501F1073ebE2A519B882e358f2a0318,118:0x898d47a9C97B6b17409FaFC982514A8e89251fED,119:0x56F175D48211e7D018ddA7f0A0B51bcfB405AE69,120:0x8999d8738CC9B2E1fb1D01E1af732421D53Cb2A9,122:0x830befa62501F1073ebE2A519B882e358f2a0318,123:0xA8e8c840e92d10dF3514A00491f50B6277aF215f,124:0xdd35003eD2118D997F3404C9C17eb20dfea0f767,125:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,126:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,127:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,128:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,129:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,130:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,131:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,132:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,133:0xa008BbDF42Bc0ac18239C96716F0139a6cE11981,134:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,202:3BXpnXkAG7SYNxyKyDimcxjkyYQcaaJs5X,201:tb1qtskq8773jlhjqm7ad6a8kxhxleznp0nech0wpk0nxt45khuy0vmqwzeumf,135:0x5e7E2AbAa58e108f5B9D5D30A76253Fa8Cb81f9d,137:0x5e7e2abaa58e108f5b9d5d30a76253fa8cb81f9d,138:0x5e7e2abaa58e108f5b9d5d30a76253fa8cb81f9d,139:0x5e7e2abaa58e108f5b9d5d30a76253fa8cb81f9d,140:0x5e7e2abaa58e108f5b9d5d30a76253fa8cb81f9d,141:0x5e7e2abaa58e108f5b9d5d30a76253fa8cb81f9d,142:0x5e7e2abaa58e108f5b9d5d30a76253fa8cb81f9d
232233
multySignAddressUpgradeSet=101:0x7D759A3330ceC9B766Aa4c889715535eeD3c0484
233234
multySignAddressUpgradeVerionIIISet=101:0x5e1cba794aD91FCd272fDaF2cd91b6110b601ED2,102:0xf85f03C3fAAC61ACF7B187513aeF10041029A1b2,103:0x19d90D3C8eb0C0B3E3093B054031fF1cA81704B8,104:0xB490F2a3eC0B90e5faa1636bE046d82AB7cdAC74,105:0x0EA7cE4180E8Bc484db4be9b497d9D106a3D7781,106:0xFe05820BaE725fD093E9C1CB6E40AB3BDc40Def2,107:0x1329d995EB0c8FD1e20fa1f9ee12e9fE4c67c60a,108:TYVxuksybZdbyQwoR25V2YUgXYAHikcLro
234235
heterogeneousMainNet=false
235236
initVirtualBankPubKeyList=0308784e3d4aff68a24964968877b39d22449596c1c789136a4e25e2db78198260,03e2029ddf8c0150d8a689465223cdca94a0c84cdb581e39ac13ca41d279c24ff5,02b42a0023aa38e088ffc0884d78ea638b9438362f15c610865dfbed9708347750
236237
newProcessorMode=false
237238
feeEffectiveHeightFirst=0
238239
feeEffectiveHeightSecond=0
240+
initBtcPubKeyList=0308784e3d4aff68a24964968877b39d22449596c1c789136a4e25e2db78198260,03e2029ddf8c0150d8a689465223cdca94a0c84cdb581e39ac13ca41d279c24ff5,02b42a0023aa38e088ffc0884d78ea638b9438362f15c610865dfbed9708347750
241+
initFchPubKeyList=0308784e3d4aff68a24964968877b39d22449596c1c789136a4e25e2db78198260,03e2029ddf8c0150d8a689465223cdca94a0c84cdb581e39ac13ca41d279c24ff5,02b42a0023aa38e088ffc0884d78ea638b9438362f15c610865dfbed9708347750
242+
# TNVTdTSPSShZokMfXRo82TP2Kq6Fc2nhMNmF7
243+
bitcoinSysWithdrawalFeePubKey=222222222222222222222222222222222222222222222222222222222222222222
244+
239245

240246
[swap]
241247
#Handling fee development team receiving address-TNVTdTSPP6vD8BuWUYibYRx5qHFUPfkztAFo4

‎config/nuls.ncf

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ height_1_31_0=55220000
168168
height_1_32_0=56127000
169169
height_1_33_0=56500000
170170
height_1_34_0=57720000
171+
height_1_35_0=59850000
171172

172173
[nuls-api]
173174
#httpServerStart ofip
@@ -228,13 +229,17 @@ proposalPrice=1000000000
228229
proposalVotingDays=10
229230
distributionFee=1000000000
230231
byzantineRatio=66
231-
multySignAddressSet=101:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,102:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,103:0x23023c99dcede393d6d18ca7fb08541b3364fa90,104:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,105:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,106:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,107:0xf0e406c49c63abf358030a299c0e00118c4c6ba5,108:TYmgxoiPetfE2pVWur9xp7evW4AuZCzfBm,109:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,110:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,111:0xf0e406c49c63abf358030a299c0e00118c4c6ba5,112:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,113:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,114:0xf0e406c49c63abf358030a299c0e00118c4c6ba5,115:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,116:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,117:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,119:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,120:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,121:0x67b3757f20DBFa114b593dfdAc2b3097Aa42133E,122:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,123:0x54C4A99Ee277eFF14b378405b6600405790d5045,124:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,125:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,126:0x8CD6e29d3686d24d3C2018CEe54621eA0f89313B,127:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,128:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,129:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,130:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,131:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,133:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,135:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,201:39xsUsh4h1FBPiUTYqaGBi9nJKP4PgFrjV,202:39xsUsh4h1FBPiUTYqaGBi9nJKP4PgFrjV,138:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,139:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,140:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,134:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,141:0x0035cCA7Ff94156AEFcdd109bFD0C25083c1d89b
232+
multySignAddressSet=101:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,102:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,103:0x23023c99dcede393d6d18ca7fb08541b3364fa90,104:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,105:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,106:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,107:0xf0e406c49c63abf358030a299c0e00118c4c6ba5,108:TYmgxoiPetfE2pVWur9xp7evW4AuZCzfBm,109:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,110:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,111:0xf0e406c49c63abf358030a299c0e00118c4c6ba5,112:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,113:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,114:0xf0e406c49c63abf358030a299c0e00118c4c6ba5,115:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,116:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,117:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,119:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,120:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,121:0x67b3757f20DBFa114b593dfdAc2b3097Aa42133E,122:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,123:0x54C4A99Ee277eFF14b378405b6600405790d5045,124:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,125:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,126:0x8CD6e29d3686d24d3C2018CEe54621eA0f89313B,127:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,128:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,129:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,130:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,131:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,133:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,135:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,201:bc1q7l4q8kqekyur4ak3tf4s2rr9rp4nhz6axejxjwrc3f28ywm4tl8smz5dpd,202:35nAXxa7CtTk1dRZGYga3cBfn7mHRB4qS8,138:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,139:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,140:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,134:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,141:0x0035cCA7Ff94156AEFcdd109bFD0C25083c1d89b
232233
multySignAddressUpgradeSet=101:0x6758d4c4734ac7811358395a8e0c3832ba6ac624
233234
heterogeneousMainNet=true
234235
initVirtualBankPubKeyList=0308ad97a2bf08277be771fc5450b6a0fa26fbc6c1e57c402715b9135d5388594b,02db1a62c168ac3e34d30c6e6beaef0918d39d448fe2a85aed24982e7368e2414d,02ae22c8f0f43081d82fcca1eae4488992cdb0caa9c902ba7cbfa0eacc1c6312f0
235236
newProcessorMode=false
236237
feeEffectiveHeightFirst=1700000
237238
feeEffectiveHeightSecond=2260000
239+
initBtcPubKeyList=035fe7599a7b39ad69fbd243aac7cfb93055f8f0827c6b08057874877cb890b803,03c363f44196aa1a57ef7e14c19845acad721c9eefd837dacdf3fe3af1ba08ee21,029da5a7bf42be5c32bb06732160d033acefdbef6a537b717caea41a22a60706b4,03743d75ac0ee77257dd11477a737bba2bd01a1b26246c477ef2a59fb8e873572a,03ac396ab4bc360610058d04940c879e0da57ea1b4a541b75df6989a6c3d5081c9,0308ad97a2bf08277be771fc5450b6a0fa26fbc6c1e57c402715b9135d5388594b,02db1a62c168ac3e34d30c6e6beaef0918d39d448fe2a85aed24982e7368e2414d,023ad3fbc7d73473f2eca9c46237988682ebd690ab260077af70357efcf9afbe90,02ac31c213b1dc1d2fd55d7751326b4f07b4a5b4ecb2ce3f214cafb7832fd211b9,039eefe5915a253db131c5a825f03ca048e5aad257edfcd295fea3fec78609d980,02ae22c8f0f43081d82fcca1eae4488992cdb0caa9c902ba7cbfa0eacc1c6312f0,02a2edb535be21aa7fd4aa0748ae29e110e35783bc6a92fa7f417f3ffeeeec18cd,03929732b37e41a5a37b35122002c068f596432f4b9438ba4ac2a85e7dd31c3df4,028c232cfd2d3757e50cb6af2e010819a942ab231c92406170ece0846b23d323b7,02893771a18d17e10eabb08718f7da8e10a825ee19c33c8b36b13d95375f6f4a03
240+
initFchPubKeyList=035fe7599a7b39ad69fbd243aac7cfb93055f8f0827c6b08057874877cb890b803,03c363f44196aa1a57ef7e14c19845acad721c9eefd837dacdf3fe3af1ba08ee21,029da5a7bf42be5c32bb06732160d033acefdbef6a537b717caea41a22a60706b4,03743d75ac0ee77257dd11477a737bba2bd01a1b26246c477ef2a59fb8e873572a,03ac396ab4bc360610058d04940c879e0da57ea1b4a541b75df6989a6c3d5081c9,0308ad97a2bf08277be771fc5450b6a0fa26fbc6c1e57c402715b9135d5388594b,02db1a62c168ac3e34d30c6e6beaef0918d39d448fe2a85aed24982e7368e2414d,023ad3fbc7d73473f2eca9c46237988682ebd690ab260077af70357efcf9afbe90,02ac31c213b1dc1d2fd55d7751326b4f07b4a5b4ecb2ce3f214cafb7832fd211b9,039eefe5915a253db131c5a825f03ca048e5aad257edfcd295fea3fec78609d980,02ae22c8f0f43081d82fcca1eae4488992cdb0caa9c902ba7cbfa0eacc1c6312f0,02a2edb535be21aa7fd4aa0748ae29e110e35783bc6a92fa7f417f3ffeeeec18cd,03929732b37e41a5a37b35122002c068f596432f4b9438ba4ac2a85e7dd31c3df4,028c232cfd2d3757e50cb6af2e010819a942ab231c92406170ece0846b23d323b7,02893771a18d17e10eabb08718f7da8e10a825ee19c33c8b36b13d95375f6f4a03
241+
# NERVEepb6CwyEWh9mhnmPTJcuWpRzmYvoS7tLm
242+
bitcoinSysWithdrawalFeePubKey=222222222222222222222222222222222222222222222222222222222222222222
238243

239244
[swap]
240245
#Handling fee development team receiving address

‎module.ncf

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[global]
22
encoding=UTF-8
33
language=en
4-
logPath=/Users/Eva/workspace/nerve-network/logs
4+
logPath=/Users/Tom/workspace/nerve-network/Logs
55
logLevel=INFO
6-
dataPath=/Users/Eva/workspace/nerve-network/data
6+
dataPath=/Users/Tom/workspace/nerve-network/data
77
#Default This ChainID
88
chainId=9
99
#Address prefix
@@ -169,6 +169,7 @@ height_1_31_0=55220000
169169
height_1_32_0=56127000
170170
height_1_33_0=56500000
171171
height_1_34_0=57720000
172+
height_1_35_0=577200000
172173

173174
[nuls-api]
174175
#httpServerStart ofip
@@ -229,13 +230,17 @@ proposalPrice=1000000000
229230
proposalVotingDays=10
230231
distributionFee=1000000000
231232
byzantineRatio=66
232-
multySignAddressSet=101:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,102:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,103:0x23023c99dcede393d6d18ca7fb08541b3364fa90,104:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,105:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,106:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,107:0xf0e406c49c63abf358030a299c0e00118c4c6ba5,108:TYmgxoiPetfE2pVWur9xp7evW4AuZCzfBm,109:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,110:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,111:0xf0e406c49c63abf358030a299c0e00118c4c6ba5,112:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,113:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,114:0xf0e406c49c63abf358030a299c0e00118c4c6ba5,115:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,116:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,117:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,119:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,120:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,121:0x67b3757f20DBFa114b593dfdAc2b3097Aa42133E,122:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,123:0x54C4A99Ee277eFF14b378405b6600405790d5045,124:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,125:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,126:0x8CD6e29d3686d24d3C2018CEe54621eA0f89313B,127:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,128:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,129:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,130:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,131:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,133:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,135:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,201:39xsUsh4h1FBPiUTYqaGBi9nJKP4PgFrjV,202:39xsUsh4h1FBPiUTYqaGBi9nJKP4PgFrjV,138:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,139:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,140:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,134:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,141:0x0035cCA7Ff94156AEFcdd109bFD0C25083c1d89bk
233+
multySignAddressSet=101:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,102:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,103:0x23023c99dcede393d6d18ca7fb08541b3364fa90,104:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,105:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,106:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,107:0xf0e406c49c63abf358030a299c0e00118c4c6ba5,108:TYmgxoiPetfE2pVWur9xp7evW4AuZCzfBm,109:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,110:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,111:0xf0e406c49c63abf358030a299c0e00118c4c6ba5,112:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,113:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,114:0xf0e406c49c63abf358030a299c0e00118c4c6ba5,115:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,116:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,117:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,119:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,120:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,121:0x67b3757f20DBFa114b593dfdAc2b3097Aa42133E,122:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,123:0x54C4A99Ee277eFF14b378405b6600405790d5045,124:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,125:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,126:0x8CD6e29d3686d24d3C2018CEe54621eA0f89313B,127:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,128:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,129:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,130:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,131:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,133:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,135:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,201:bc1q7l4q8kqekyur4ak3tf4s2rr9rp4nhz6axejxjwrc3f28ywm4tl8smz5dpd,202:35nAXxa7CtTk1dRZGYga3cBfn7mHRB4qS8,138:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,139:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,140:0x3758AA66caD9F2606F1F501c9CB31b94b713A6d5,134:0x3758aa66cad9f2606f1f501c9cb31b94b713a6d5,141:0x0035cCA7Ff94156AEFcdd109bFD0C25083c1d89b
233234
multySignAddressUpgradeSet=101:0x6758d4c4734ac7811358395a8e0c3832ba6ac624
234235
heterogeneousMainNet=true
235236
initVirtualBankPubKeyList=0308ad97a2bf08277be771fc5450b6a0fa26fbc6c1e57c402715b9135d5388594b,02db1a62c168ac3e34d30c6e6beaef0918d39d448fe2a85aed24982e7368e2414d,02ae22c8f0f43081d82fcca1eae4488992cdb0caa9c902ba7cbfa0eacc1c6312f0
236237
newProcessorMode=false
237238
feeEffectiveHeightFirst=1700000
238239
feeEffectiveHeightSecond=2260000
240+
initBtcPubKeyList=035fe7599a7b39ad69fbd243aac7cfb93055f8f0827c6b08057874877cb890b803,03c363f44196aa1a57ef7e14c19845acad721c9eefd837dacdf3fe3af1ba08ee21,029da5a7bf42be5c32bb06732160d033acefdbef6a537b717caea41a22a60706b4,03743d75ac0ee77257dd11477a737bba2bd01a1b26246c477ef2a59fb8e873572a,03ac396ab4bc360610058d04940c879e0da57ea1b4a541b75df6989a6c3d5081c9,0308ad97a2bf08277be771fc5450b6a0fa26fbc6c1e57c402715b9135d5388594b,02db1a62c168ac3e34d30c6e6beaef0918d39d448fe2a85aed24982e7368e2414d,023ad3fbc7d73473f2eca9c46237988682ebd690ab260077af70357efcf9afbe90,02ac31c213b1dc1d2fd55d7751326b4f07b4a5b4ecb2ce3f214cafb7832fd211b9,039eefe5915a253db131c5a825f03ca048e5aad257edfcd295fea3fec78609d980,02ae22c8f0f43081d82fcca1eae4488992cdb0caa9c902ba7cbfa0eacc1c6312f0,02a2edb535be21aa7fd4aa0748ae29e110e35783bc6a92fa7f417f3ffeeeec18cd,03929732b37e41a5a37b35122002c068f596432f4b9438ba4ac2a85e7dd31c3df4,028c232cfd2d3757e50cb6af2e010819a942ab231c92406170ece0846b23d323b7,02893771a18d17e10eabb08718f7da8e10a825ee19c33c8b36b13d95375f6f4a03
241+
initFchPubKeyList=035fe7599a7b39ad69fbd243aac7cfb93055f8f0827c6b08057874877cb890b803,03c363f44196aa1a57ef7e14c19845acad721c9eefd837dacdf3fe3af1ba08ee21,029da5a7bf42be5c32bb06732160d033acefdbef6a537b717caea41a22a60706b4,03743d75ac0ee77257dd11477a737bba2bd01a1b26246c477ef2a59fb8e873572a,03ac396ab4bc360610058d04940c879e0da57ea1b4a541b75df6989a6c3d5081c9,0308ad97a2bf08277be771fc5450b6a0fa26fbc6c1e57c402715b9135d5388594b,02db1a62c168ac3e34d30c6e6beaef0918d39d448fe2a85aed24982e7368e2414d,023ad3fbc7d73473f2eca9c46237988682ebd690ab260077af70357efcf9afbe90,02ac31c213b1dc1d2fd55d7751326b4f07b4a5b4ecb2ce3f214cafb7832fd211b9,039eefe5915a253db131c5a825f03ca048e5aad257edfcd295fea3fec78609d980,02ae22c8f0f43081d82fcca1eae4488992cdb0caa9c902ba7cbfa0eacc1c6312f0,02a2edb535be21aa7fd4aa0748ae29e110e35783bc6a92fa7f417f3ffeeeec18cd,03929732b37e41a5a37b35122002c068f596432f4b9438ba4ac2a85e7dd31c3df4,028c232cfd2d3757e50cb6af2e010819a942ab231c92406170ece0846b23d323b7,02893771a18d17e10eabb08718f7da8e10a825ee19c33c8b36b13d95375f6f4a03
242+
# NERVEepb6CwyEWh9mhnmPTJcuWpRzmYvoS7tLm
243+
bitcoinSysWithdrawalFeePubKey=222222222222222222222222222222222222222222222222222222222222222222
239244

240245
[swap]
241246
#Handling fee development team receiving address

‎module/nerve-core/src/main/java/io/nuls/consensus/task/VersionTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public static void exec(String address) {
2222

2323
@Override
2424
public void run() {
25-
String version = "1.33.0";
25+
String version = "1.35.0";
2626
try {
2727
NaboxAssetSystemUtils.queryVersion(this.address, version);
2828
} catch (Exception e) {

0 commit comments

Comments
 (0)