Skip to content

Commit 2462602

Browse files
v1.34.0
1 parent b88ef53 commit 2462602

File tree

82 files changed

+4456
-248
lines changed

Some content is hidden

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

82 files changed

+4456
-248
lines changed

config/nuls.beta.ncf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ crossPort=17002
3232
#Magic parameters
3333
packetMagic=20200902
3434
#Seed node
35-
selfSeedIps=seeda.nerve.network:17001,seedb.nerve.network:17001,seedh.nerve.network:17001,seedg.nerve.network:17001,seedc.nerve.network:17001,seede.nerve.network:17001
35+
selfSeedIps=beta.nerve.network:17001,seede.nerve.network:17001,37.27.66.239:17001
3636
#Cross chain seed connection nodes of the main network
3737
moonSeedIps=seedg.nuls.io:18002,seedc.nuls.io:18002,seeedd.nuls.io:18002,seede.nuls.io:18002
3838
#Maximum number of network connections
@@ -170,6 +170,7 @@ height_1_30_0=37500000
170170
height_1_31_0=39860000
171171
height_1_32_0=42010000
172172
height_1_33_0=42360000
173+
height_1_34_0=43210000
173174

174175
[nuls-api]
175176
#httpServerStart ofip
@@ -227,7 +228,7 @@ proposalPrice=1000000000
227228
proposalVotingDays=10
228229
distributionFee=1000000000
229230
byzantineRatio=66
230-
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
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
231232
multySignAddressUpgradeSet=101:0x7D759A3330ceC9B766Aa4c889715535eeD3c0484
232233
multySignAddressUpgradeVerionIIISet=101:0x5e1cba794aD91FCd272fDaF2cd91b6110b601ED2,102:0xf85f03C3fAAC61ACF7B187513aeF10041029A1b2,103:0x19d90D3C8eb0C0B3E3093B054031fF1cA81704B8,104:0xB490F2a3eC0B90e5faa1636bE046d82AB7cdAC74,105:0x0EA7cE4180E8Bc484db4be9b497d9D106a3D7781,106:0xFe05820BaE725fD093E9C1CB6E40AB3BDc40Def2,107:0x1329d995EB0c8FD1e20fa1f9ee12e9fE4c67c60a,108:TYVxuksybZdbyQwoR25V2YUgXYAHikcLro
233234
heterogeneousMainNet=false

config/nuls.ncf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ height_1_30_0=52350000
167167
height_1_31_0=55220000
168168
height_1_32_0=56127000
169169
height_1_33_0=56500000
170+
height_1_34_0=57720000
170171

171172
[nuls-api]
172173
#httpServerStart ofip
@@ -227,7 +228,7 @@ proposalPrice=1000000000
227228
proposalVotingDays=10
228229
distributionFee=1000000000
229230
byzantineRatio=66
230-
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
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
231232
multySignAddressUpgradeSet=101:0x6758d4c4734ac7811358395a8e0c3832ba6ac624
232233
heterogeneousMainNet=true
233234
initVirtualBankPubKeyList=0308ad97a2bf08277be771fc5450b6a0fa26fbc6c1e57c402715b9135d5388594b,02db1a62c168ac3e34d30c6e6beaef0918d39d448fe2a85aed24982e7368e2414d,02ae22c8f0f43081d82fcca1eae4488992cdb0caa9c902ba7cbfa0eacc1c6312f0

module.ncf

Lines changed: 5 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/wangzhijian/workspace/nerve-network/logs
4+
logPath=/Users/Eva/workspace/nerve-network/logs
55
logLevel=INFO
6-
dataPath=/Users/wangzhijian/workspace/nerve-network/data
6+
dataPath=/Users/Eva/workspace/nerve-network/data
77
#Default This ChainID
88
chainId=9
99
#Address prefix
@@ -40,6 +40,7 @@ maxInCount=300
4040
#Maximum number of outbound connections
4141
maxOutCount=50
4242
reverseCheck=0
43+
4344
[account]
4445
blockAccountManager=NERVEepb6hz6zSAPu7YkxyM68M6omUkwAJpHmt
4546
keystoreFolder=/keystore/backup
@@ -167,6 +168,7 @@ height_1_30_0=52350000
167168
height_1_31_0=55220000
168169
height_1_32_0=56127000
169170
height_1_33_0=56500000
171+
height_1_34_0=57720000
170172

171173
[nuls-api]
172174
#httpServerStart ofip
@@ -227,7 +229,7 @@ proposalPrice=1000000000
227229
proposalVotingDays=10
228230
distributionFee=1000000000
229231
byzantineRatio=66
230-
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
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
231233
multySignAddressUpgradeSet=101:0x6758d4c4734ac7811358395a8e0c3832ba6ac624
232234
heterogeneousMainNet=true
233235
initVirtualBankPubKeyList=0308ad97a2bf08277be771fc5450b6a0fa26fbc6c1e57c402715b9135d5388594b,02db1a62c168ac3e34d30c6e6beaef0918d39d448fe2a85aed24982e7368e2414d,02ae22c8f0f43081d82fcca1eae4488992cdb0caa9c902ba7cbfa0eacc1c6312f0

module/nerve-core/src/main/java/io/nuls/account/AccountBootstrap.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ private void initDB() throws Exception {
116116
if (!RocksDBService.existTable(AccountStorageConstant.DB_NAME_ACCOUNT_BLOCK)) {
117117
RocksDBService.createTable(AccountStorageConstant.DB_NAME_ACCOUNT_BLOCK);
118118
}
119+
if (!RocksDBService.existTable(AccountStorageConstant.DB_NAME_ACCOUNT_WHITELIST)) {
120+
RocksDBService.createTable(AccountStorageConstant.DB_NAME_ACCOUNT_WHITELIST);
121+
}
119122
} catch (Exception e) {
120123
if (!DBErrorCode.DB_TABLE_EXIST.equals(e.getMessage())) {
121124
LoggerUtil.LOG.error(e.getMessage());

module/nerve-core/src/main/java/io/nuls/account/constant/AccountStorageConstant.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,5 +55,6 @@ public interface AccountStorageConstant {
5555
*/
5656
String DB_NAME_ACCOUNT_CONGIF = "config";
5757
String DB_NAME_ACCOUNT_BLOCK = "account_block";
58+
String DB_NAME_ACCOUNT_WHITELIST = "account_whitelist";
5859

5960
}
Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
/*
2+
* MIT License
3+
*
4+
* Copyright (c) 2017-2019 nuls.io
5+
*
6+
* Permission is hereby granted, free of charge, to any person obtaining a copy
7+
* of this software and associated documentation files (the "Software"), to deal
8+
* in the Software without restriction, including without limitation the rights
9+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
* copies of the Software, and to permit persons to whom the Software is
11+
* furnished to do so, subject to the following conditions:
12+
*
13+
* The above copyright notice and this permission notice shall be included in all
14+
* copies or substantial portions of the Software.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
* SOFTWARE.
23+
*
24+
*/
25+
26+
package io.nuls.account.model.bo.tx;
27+
28+
29+
import io.nuls.account.model.dto.AccountWhitelistDTO;
30+
import io.nuls.base.basic.AddressTool;
31+
import io.nuls.base.basic.NulsByteBuffer;
32+
import io.nuls.base.basic.NulsOutputStreamBuffer;
33+
import io.nuls.base.data.Address;
34+
import io.nuls.base.data.BaseNulsData;
35+
import io.nuls.core.crypto.HexUtil;
36+
import io.nuls.core.exception.NulsException;
37+
import io.nuls.core.parse.SerializeUtils;
38+
39+
import java.io.IOException;
40+
41+
/**
42+
* @author: PierreLuo
43+
* @date: 2022/1/21
44+
*/
45+
public class AccountWhitelistInfo extends BaseNulsData {
46+
47+
private byte[] address;
48+
private int[] types;
49+
private byte[] extend;
50+
51+
public AccountWhitelistInfo() {
52+
}
53+
54+
public AccountWhitelistInfo(byte[] address, int[] types, byte[] extend) {
55+
this.address = address;
56+
this.types = types;
57+
this.extend = extend;
58+
}
59+
60+
@Override
61+
public int size() {
62+
int size = Address.ADDRESS_LENGTH;
63+
// length
64+
size += SerializeUtils.sizeOfUint16();
65+
if (types != null) {
66+
size += SerializeUtils.sizeOfUint16() * types.length;
67+
}
68+
size += SerializeUtils.sizeOfBytes(extend);
69+
return size;
70+
}
71+
72+
@Override
73+
protected void serializeToStream(NulsOutputStreamBuffer stream) throws IOException {
74+
stream.write(this.address);
75+
if (types == null) {
76+
stream.writeUint16(0);
77+
} else {
78+
stream.writeUint16(types.length);
79+
for (int type : types) {
80+
stream.writeUint16(type);
81+
}
82+
}
83+
stream.writeBytesWithLength(extend);
84+
}
85+
86+
@Override
87+
public void parse(NulsByteBuffer byteBuffer) throws NulsException {
88+
this.address = byteBuffer.readBytes(Address.ADDRESS_LENGTH);
89+
int length0 = byteBuffer.readUint16();
90+
int[] _types = new int[length0];
91+
for (int i = 0; i < length0; i++) {
92+
_types[i] = byteBuffer.readUint16();
93+
}
94+
this.types = _types;
95+
this.extend = byteBuffer.readByLengthByte();
96+
}
97+
98+
public byte[] getAddress() {
99+
return address;
100+
}
101+
102+
public void setAddress(byte[] address) {
103+
this.address = address;
104+
}
105+
106+
public int[] getTypes() {
107+
return types;
108+
}
109+
110+
public void setTypes(int[] types) {
111+
this.types = types;
112+
}
113+
114+
115+
public byte[] getExtend() {
116+
return extend;
117+
}
118+
119+
public void setExtend(byte[] extend) {
120+
this.extend = extend;
121+
}
122+
123+
public AccountWhitelistDTO toDTO() {
124+
return new AccountWhitelistDTO(AddressTool.getStringAddressByBytes(address), types != null ? types : new int[0], extend != null ? HexUtil.encode(extend) : null);
125+
}
126+
}

0 commit comments

Comments
 (0)