v1.33.0

Author: Nicholas-MacLeod

common/nuls-core-rpc/pom.xml

@@ -72,13 +72,6 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.42.Final</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.protobuf</groupId>
-                    <artifactId>protobuf-java</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

config/nuls.beta.ncf

@@ -169,6 +169,7 @@ height_1_29_0=36600000
 height_1_30_0=37500000
 height_1_31_0=39860000
 height_1_32_0=42010000
+height_1_33_0=42360000
 
 [nuls-api]
 #httpServerStart ofip
@@ -226,7 +227,7 @@ proposalPrice=1000000000
 proposalVotingDays=10
 distributionFee=1000000000
 byzantineRatio=66
-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
+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
 multySignAddressUpgradeSet=101:0x7D759A3330ceC9B766Aa4c889715535eeD3c0484
 multySignAddressUpgradeVerionIIISet=101:0x5e1cba794aD91FCd272fDaF2cd91b6110b601ED2,102:0xf85f03C3fAAC61ACF7B187513aeF10041029A1b2,103:0x19d90D3C8eb0C0B3E3093B054031fF1cA81704B8,104:0xB490F2a3eC0B90e5faa1636bE046d82AB7cdAC74,105:0x0EA7cE4180E8Bc484db4be9b497d9D106a3D7781,106:0xFe05820BaE725fD093E9C1CB6E40AB3BDc40Def2,107:0x1329d995EB0c8FD1e20fa1f9ee12e9fE4c67c60a,108:TYVxuksybZdbyQwoR25V2YUgXYAHikcLro
 heterogeneousMainNet=false