Release/pre prod (#698)

* v2.9.2

* Pre master (#637)

* 修改跨链协议

* 修改跨链协议

* test

* update calc totalsSupply

* add crossTx transfer api

* add crossTx transfer api

* add crossTx transfer api

* add x

* update api offline.sh

* locked balance of nrc20

* update ps getAssetRanking

* update total balance of nrc20 in ps

* account token balance

* dev

* 修改nerve链名称

* 修复卡块BUG

* fixed npe

* stop脚本

* 修改停止脚本

* 停止脚本

* update ps document

* fix NPE about contract tx rollback

* commit local config files

* update ps coinData decimals

* commit local config files

* test code

* commit local config files

* contract database prune disabled

* 跨链交易不验证签名部分

* 跨链交易验证资产是否已经注册成跨链资产

* test

* add bool

* update config

* update config

* update config

* update config

* add test logs

* add test logs

* add test logs

* update ps coinData decimals

* single thread pool

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* recovery

* add boolean of contract cross asset

* fix red punish bug

* update ps-module getBlockTxList

* update ps-module getBlockTxList

* add boolean of contract cross asset

* update ps-module getTxList

* update ps-module getAcctTxs

* 测试验证人列表异常问题

* update corsschain tx

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修改协议号

* update disable asset

* beta config

* 兼容验证人恢复的交易

* 兼容验证人恢复的交易

* 配置文件

* 修复nuls-api依赖provider接口版本错误问题

* 修复nulstar在window上启动问题

* update config

* update ps-module getContract

* contract multi-asset transfer

* contract multi-asset test and fix bug

* fix bug about balance of contract

* fix bug and update test case

* test case updated

* update ps-module getAccountTokenInfo

* update ps-module getAccountTokenInfo

* update ps-module getAccountTokenInfo

* fix bug about contract transfer merge

* update test case

* add cmd error log

* update test case

* add ImportKeyStoreFilesProcessor cmd

* dev

* dev

* fix bug about contract transfer locked

* update contract call validation

* update contract call validation

* update module connection

* optimize ledger

* transaction block height update

* recovery versions

* update vm sdk classes

* update package

* 优化跨链交易重新处理机制

* 优化跨链交易重新处理机制

* 优化跨链交易重新处理机制

* version

* update validation of contract args

* fix bug

* add CrossChainAssetRegMngRepository cmd

* v2.7.3

* update multi-asset in contract

* v2.7.3

* update package

* single thread in contract

* revert

* update

* update max count

* 暂时关闭跨链交易

* 暂时关闭跨链交易

* 暂时关闭跨链交易

* support many assets transfer to contract

* update vm cache settings

* update setting

* remove debug logs

* update log

* 重置本链验证人列表交易

* update data source in contract

* 重置本链验证人列表交易

* 重置本链验证人列表交易

* 重置本链验证人列表交易

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易）

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* rm

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。

* update MongoAccountServiceImpl change AddressLIst

* 打开跨链交易

* update config

* gas price coding

* update vm class code load

* update mongodb.estimatedDocumentCount()

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* fix bug about contract multi-asset

* 修改回滚逻辑，临时，后续需要仔细重构

* remove ps module

* update contract execution way

* update package logic of contract transactions

* test case

* 尝试修改切换分叉链失败时，区块模块停止的问题

* fix bug about multi-asset transfer into contract

* update contract db and transfer

* fix NPE

* update memory rule in contract

* update result

* update contract transfer back tx

* update ChainAssetCmd

* 启动脚本增加动态JVM参数

* nrc721 support coding in contract module

* 启动脚本增加动态JVM参数

* 调整window启动脚本

* nrc721 parse

* update validation of call in nuls-api

* update nuls api

* fix bug about  token cross chain

* recovery package count (#614)

* 修改协议升级的延迟块数 (#615)

* update test case

* add log trace

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* add log trace

* update 3g mem of contract module

* contract db query optimize

* update log

* remove log trace

* add txType

* contract db query optimize testing

* update cross token system contract

* 调试主网配置

* es commit

* version

* 优化协议版本切换逻辑

* update

* support multy asset with contract in nuls api module

* update offline contract transaction

* add contract time out

* 测试日志

* clear old cache

* update

* test

* update

* update db initial

* fix bug

* fix bug about conflict contract transaction

* 去掉多余日志

* fix bug about setContractGenerateTxTypes

* 修复本地验证人丢失的问题

* add time out

* remove test code

* remove test log

* remove unused code

* remove test code

* extend transaction sync time out

* beta setting

* smart contract 5G mem

* version

* smart contract 3G mem

* update config

* 2.9.0 (#622)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* V2.9.1 (#626)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

* update rpc-api文档

* update rpc-api文档

* 解决有节点提前出块的问题

* version

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: niels1286 <niels@nuls.io>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <naboxer@nabox.io>

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

Co-authored-by: lijun.zhou <zhouj.172@gmail.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: Charlie <29900478@qq.com>
Co-authored-by: NaboxAdmin <naboxer@nabox.io>

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

* update api

* update ncf

* add getBalanceList

* test disable asset

* test disable asset

* test disable asset

* test disable asset

* test case

* 通过编译

* 通过编译

* 通过编译

* 通过编译

* 通过编译

* Master merge 2.10.0 (#646)

* update calc totalsSupply

* add crossTx transfer api

* add crossTx transfer api

* add crossTx transfer api

* add x

* update api offline.sh

* locked balance of nrc20

* update ps getAssetRanking

* update total balance of nrc20 in ps

* account token balance

* dev

* 修改nerve链名称

* 修复卡块BUG

* fixed npe

* stop脚本

* 修改停止脚本

* 停止脚本

* update ps document

* fix NPE about contract tx rollback

* commit local config files

* update ps coinData decimals

* commit local config files

* test code

* commit local config files

* contract database prune disabled

* 跨链交易不验证签名部分

* 跨链交易验证资产是否已经注册成跨链资产

* test

* add bool

* update config

* update config

* update config

* update config

* add test logs

* add test logs

* add test logs

* update ps coinData decimals

* single thread pool

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* recovery

* add boolean of contract cross asset

* fix red punish bug

* update ps-module getBlockTxList

* update ps-module getBlockTxList

* add boolean of contract cross asset

* update ps-module getTxList

* update ps-module getAcctTxs

* 测试验证人列表异常问题

* update corsschain tx

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修改协议号

* update disable asset

* beta config

* 兼容验证人恢复的交易

* 兼容验证人恢复的交易

* 配置文件

* 修复nuls-api依赖provider接口版本错误问题

* 修复nulstar在window上启动问题

* update config

* update ps-module getContract

* contract multi-asset transfer

* contract multi-asset test and fix bug

* fix bug about balance of contract

* fix bug and update test case

* test case updated

* update ps-module getAccountTokenInfo

* update ps-module getAccountTokenInfo

* update ps-module getAccountTokenInfo

* fix bug about contract transfer merge

* update test case

* add cmd error log

* update test case

* add ImportKeyStoreFilesProcessor cmd

* dev

* dev

* fix bug about contract transfer locked

* update contract call validation

* update contract call validation

* update module connection

* optimize ledger

* transaction block height update

* recovery versions

* update vm sdk classes

* update package

* 优化跨链交易重新处理机制

* 优化跨链交易重新处理机制

* 优化跨链交易重新处理机制

* version

* update validation of contract args

* fix bug

* add CrossChainAssetRegMngRepository cmd

* v2.7.3

* update multi-asset in contract

* v2.7.3

* update package

* single thread in contract

* revert

* update

* update max count

* 暂时关闭跨链交易

* 暂时关闭跨链交易

* 暂时关闭跨链交易

* support many assets transfer to contract

* update vm cache settings

* update setting

* remove debug logs

* update log

* 重置本链验证人列表交易

* update data source in contract

* 重置本链验证人列表交易

* 重置本链验证人列表交易

* 重置本链验证人列表交易

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易）

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* rm

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。

* update MongoAccountServiceImpl change AddressLIst

* 打开跨链交易

* update config

* gas price coding

* update vm class code load

* update mongodb.estimatedDocumentCount()

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* fix bug about contract multi-asset

* 修改回滚逻辑，临时，后续需要仔细重构

* remove ps module

* update contract execution way

* update package logic of contract transactions

* test case

* 尝试修改切换分叉链失败时，区块模块停止的问题

* fix bug about multi-asset transfer into contract

* update contract db and transfer

* fix NPE

* update memory rule in contract

* update result

* update contract transfer back tx

* update ChainAssetCmd

* 启动脚本增加动态JVM参数

* nrc721 support coding in contract module

* 启动脚本增加动态JVM参数

* 调整window启动脚本

* nrc721 parse

* update validation of call in nuls-api

* update nuls api

* fix bug about  token cross chain

* recovery package count (#614)

* 修改协议升级的延迟块数 (#615)

* update test case

* add log trace

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* add log trace

* update 3g mem of contract module

* contract db query optimize

* update log

* remove log trace

* add txType

* contract db query optimize testing

* update cross token system contract

* 调试主网配置

* es commit

* version

* 优化协议版本切换逻辑

* update

* support multy asset with contract in nuls api module

* update offline contract transaction

* add contract time out

* 测试日志

* clear old cache

* update

* test

* update

* update db initial

* fix bug

* fix bug about conflict contract transaction

* 去掉多余日志

* fix bug about setContractGenerateTxTypes

* 修复本地验证人丢失的问题

* add time out

* remove test code

* remove test log

* remove unused code

* remove test code

* extend transaction sync time out

* beta setting

* smart contract 5G mem

* version

* smart contract 3G mem

* update config

* 2.9.0 (#622)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* V2.9.1 (#626)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

* update rpc-api文档

* update rpc-api文档

* 解决有节点提前出块的问题

* version

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: niels1286 <niels@nuls.io>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <naboxer@nabox.io>

* Develop (#640)

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* Develop (#641)

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

* update api

* update ncf

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* Prod limit (#643)

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

* update api

* update ncf

* Access frequency limit.

Co-authored-by: niels1286 <niels@nuls.io>

* add getBalanceList (#644)

* V2.10.0 (#645)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

* fix bug about nuls-api in testnet

* update error log

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

* update api

* update ncf

* add getBalanceList

* test disable asset

* test disable asset

* test disable asset

* test disable asset

* test case

* 通过编译

* 通过编译

* 通过编译

* 通过编译

* 通过编译

Co-authored-by: lijun.zhou <zhouj.172@gmail.com>
Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>

Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: lijun.zhou <zhouj.172@gmail.com>
Co-authored-by: Charlie <29900478@qq.com>
Co-authored-by: NaboxAdmin <naboxer@nabox.io>

* update getBalanceList

* fix pro bug

* fix pro bug

* fix pro bug

* remove h2

* remove mybatis

* remove mybatis

* remove vm log

* remove vm log

* update api of  token balance about locked amount

* Develop (#651)

* 2.6.0 merge to master (#606)

* 修改chainid强转short的bug

* 修复cmd依赖问题

* broad cross chain info change tx remove main chain

* cross chain info change handler update

* chainManager cross asset record update

* 单元测试

* 修改忽略文件配置

* 修改版本号 (#600)

* 修改版本号 (#601)

* 2.6.0 修改协议版本号 (#602)

* 修改版本号

* protocal config update

Co-authored-by: tag0313 <981602228@qq.com>

* 命令行支持动态执行功能

* update  getblock  api

* update  getblock  api

* nuls-api增加链内转平行链资产的离线交易组装接口

* 修改平行链资产小数位错误的问题。

* 修复链管理在注销资产时验证资产占比时小数位错误的问题

* 修复增加跨链资产时小数位错误的问题

Co-authored-by: tag0313 <981602228@qq.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>

* Bump junit from 4.12 to 4.13.1 in /common/nuls-core

Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>

* 2.7.0 merge to master (#610)

* 修改chainid强转short的bug

* 修复cmd依赖问题

* broad cross chain info change tx remove main chain

* cross chain info change handler update

* chainManager cross asset record update

* 单元测试

* 修改忽略文件配置

* 修改版本号 (#600)

* 修改版本号 (#601)

* 2.6.0 修改协议版本号 (#602)

* 修改版本号

* protocal config update

Co-authored-by: tag0313 <981602228@qq.com>

* 命令行支持动态执行功能

* update  getblock  api

* update  getblock  api

* nuls-api增加链内转平行链资产的离线交易组装接口

* 修改平行链资产小数位错误的问题。

* 修复链管理在注销资产时验证资产占比时小数位错误的问题

* 修复增加跨链资产时小数位错误的问题

* 优化网络模块连接时间服务器逻辑

* 优化网络模块连接时间服务器逻辑

* 新增可配置的起始协议号。
当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1.
修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。

* update public-service add cross tx query

* fixed NPE

* update public-service add cross tx query

* 回滚上一个提交

* 去掉对chainid强转short

* update public-service add cross tx query

* update public-service add cross tx query

* 增加快照功能
区块模块根据配置的高度停止保存区块。

* update public-service add cross tx query

* update public-service add cross tx query

* api module add query Assets interface

* 增加beta配置文件

* api module add query Assets interface

* ps增加NRC20资产快照接口

* 修改打包配置

* 修改打包配置

* nuls-api增加链内平行链资产转账功能

* update public-service query other chainInfo

* Fix a bug where you get the chainId by address

* update public-service query acctTxs

* 修改停止脚本。
修改手续费计算错误问题

* merge from 2.6.1-beta public service

* update public service crossTxList api

* update ps calc crossTx fee

* update ps calc crossTx fee

* update ps get cross asset info

* 跨链增加查询方法

* update

* update ps get cross asset info

* test

* update ps get cross asset info

* update ps get cross asset info

* update getAccountCrossLedgerList

* update documents

* update public-service getTxlist

* update balance of contract token

* update createOfflineAccount signOffline

* locked balance of nrc20

* update createOfflineAccount signOffline

* 跨链增加来源链和中间链信息

* 跨链增加来源链和中间链信息

* 跨链增加来源链和中间链信息

* 跨链增加来源链和中间链信息

* update query ledger raking

* update createOfflineAccount signOffline

* 修改跨链协议

* 修改跨链协议

* 修改跨链协议

* test

* update calc totalsSupply

* add crossTx transfer api

* add crossTx transfer api

* add crossTx transfer api

* add x

* update api offline.sh

* locked balance of nrc20

* update ps getAssetRanking

* update total balance of nrc20 in ps

* account token balance

* dev

* 修改nerve链名称

* 修复卡块BUG

* fixed npe

* stop脚本

* 修改停止脚本

* 停止脚本

* update ps document

* fix NPE about contract tx rollback

* commit local config files

* update ps coinData decimals

* commit local config files

* test code

* commit local config files

* contract database prune disabled

* 跨链交易不验证签名部分

* 跨链交易验证资产是否已经注册成跨链资产

* test

* add bool

* update config

* update config

* update config

* update config

* add test logs

* add test logs

* add test logs

* update ps coinData decimals

* single thread pool

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* recovery

* add boolean of contract cross asset

* fix red punish bug

* update ps-module getBlockTxList

* update ps-module getBlockTxList

* add boolean of contract cross asset

* update ps-module getTxList

* update ps-module getAcctTxs

* 测试验证人列表异常问题

* update corsschain tx

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修改协议号

* update disable asset

* beta config

* 兼容验证人恢复的交易

* 兼容验证人恢复的交易

* 配置文件

* 修复nuls-api依赖provider接口版本错误问题

* 修复nulstar在window上启动问题

Co-authored-by: tag0313 <981602228@qq.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: Charlie <29900478@qq.com>
Co-authored-by: niels1286 <niels0519@gmail.com>

* Bump commons-beanutils from 1.9.3 to 1.9.4 in /module/nuls-api

Bumps commons-beanutils from 1.9.3 to 1.9.4.

Signed-off-by: dependabot[bot] <support@github.com>

* Master push (#612)

* 修改chainid强转short的bug

* 修复cmd依赖问题

* broad cross chain info change tx remove main chain

* cross chain info change handler update

* chainManager cross asset record update

* 单元测试

* 修改忽略文件配置

* 修改版本号 (#600)

* 修改版本号 (#601)

* 2.6.0 修改协议版本号 (#602)

* 修改版本号

* protocal config update

Co-authored-by: tag0313 <981602228@qq.com>

* 命令行支持动态执行功能

* update  getblock  api

* update  getblock  api

* nuls-api增加链内转平行链资产的离线交易组装接口

* 修改平行链资产小数位错误的问题。

* 修复链管理在注销资产时验证资产占比时小数位错误的问题

* 修复增加跨链资产时小数位错误的问题

* 优化网络模块连接时间服务器逻辑

* 优化网络模块连接时间服务器逻辑

* 新增可配置的起始协议号。
当程序已经支持到某一个高协议号，比如6，但高度1时默认使用的协议版本号依然是1.
修改为可在nuls.ncf的global配置组下配置beginProtocolVersion配置项修改起始的默认协议号。比如直接从6开始。

* update public-service add cross tx query

* fixed NPE

* update public-service add cross tx query

* 回滚上一个提交

* 去掉对chainid强转short

* update public-service add cross tx query

* update public-service add cross tx query

* 增加快照功能
区块模块根据配置的高度停止保存区块。

* update public-service add cross tx query

* update public-service add cross tx query

* api module add query Assets interface

* 增加beta配置文件

* api module add query Assets interface

* ps增加NRC20资产快照接口

* 修改打包配置

* 修改打包配置

* nuls-api增加链内平行链资产转账功能

* update public-service query other chainInfo

* Fix a bug where you get the chainId by address

* update public-service query acctTxs

* 修改停止脚本。
修改手续费计算错误问题

* merge from 2.6.1-beta public service

* update public service crossTxList api

* update ps calc crossTx fee

* update ps calc crossTx fee

* update ps get cross asset info

* 跨链增加查询方法

* update

* update ps get cross asset info

* test

* update ps get cross asset info

* update ps get cross asset info

* update getAccountCrossLedgerList

* update documents

* update public-service getTxlist

* update balance of contract token

* update createOfflineAccount signOffline

* locked balance of nrc20

* update createOfflineAccount signOffline

* 跨链增加来源链和中间链信息

* 跨链增加来源链和中间链信息

* 跨链增加来源链和中间链信息

* 跨链增加来源链和中间链信息

* update query ledger raking

* update createOfflineAccount signOffline

* 修改跨链协议

* 修改跨链协议

* 修改跨链协议

* test

* update calc totalsSupply

* add crossTx transfer api

* add crossTx transfer api

* add crossTx transfer api

* add x

* update api offline.sh

* locked balance of nrc20

* update ps getAssetRanking

* update total balance of nrc20 in ps

* account token balance

* dev

* 修改nerve链名称

* 修复卡块BUG

* fixed npe

* stop脚本

* 修改停止脚本

* 停止脚本

* update ps document

* fix NPE about contract tx rollback

* commit local config files

* update ps coinData decimals

* commit local config files

* test code

* commit local config files

* contract database prune disabled

* 跨链交易不验证签名部分

* 跨链交易验证资产是否已经注册成跨链资产

* test

* add bool

* update config

* update config

* update config

* update config

* add test logs

* add test logs

* add test logs

* update ps coinData decimals

* single thread pool

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* recovery

* add boolean of contract cross asset

* fix red punish bug

* update ps-module getBlockTxList

* update ps-module getBlockTxList

* add boolean of contract cross asset

* update ps-module getTxList

* update ps-module getAcctTxs

* 测试验证人列表异常问题

* update corsschain tx

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修改协议号

* update disable asset

* beta config

* 兼容验证人恢复的交易

* 兼容验证人恢复的交易

* 配置文件

* 修复nuls-api依赖provider接口版本错误问题

* 修复nulstar在window上启动问题

* rm testfile

* merge

* merge

* merge

* merge

* 优化release脚本

Co-authored-by: tag0313 <981602228@qq.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: Charlie <29900478@qq.com>
Co-authored-by: niels1286 <niels0519@gmail.com>
Co-authored-by: Niels <niels@nuls.io>

* merger 2.8.2 to master (#619)

* api module add query Assets interface

* 增加beta配置文件

* api module add query Assets interface

* ps增加NRC20资产快照接口

* 修改打包配置

* 修改打包配置

* nuls-api增加链内平行链资产转账功能

* update public-service query other chainInfo

* Fix a bug where you get the chainId by address

* update public-service query acctTxs

* 修改停止脚本。
修改手续费计算错误问题

* merge from 2.6.1-beta public service

* update public service crossTxList api

* update ps calc crossTx fee

* update ps calc crossTx fee

* update ps get cross asset info

* 跨链增加查询方法

* update

* update ps get cross asset info

* test

* update ps get cross asset info

* update ps get cross asset info

* update getAccountCrossLedgerList

* update documents

* update public-service getTxlist

* update balance of contract token

* update createOfflineAccount signOffline

* locked balance of nrc20

* update createOfflineAccount signOffline

* 跨链增加来源链和中间链信息

* 跨链增加来源链和中间链信息

* 跨链增加来源链和中间链信息

* 跨链增加来源链和中间链信息

* update query ledger raking

* update createOfflineAccount signOffline

* 修改跨链协议

* 修改跨链协议

* 修改跨链协议

* test

* update calc totalsSupply

* add crossTx transfer api

* add crossTx transfer api

* add crossTx transfer api

* add x

* update api offline.sh

* locked balance of nrc20

* update ps getAssetRanking

* update total balance of nrc20 in ps

* account token balance

* dev

* 修改nerve链名称

* 修复卡块BUG

* fixed npe

* stop脚本

* 修改停止脚本

* 停止脚本

* update ps document

* fix NPE about contract tx rollback

* commit local config files

* update ps coinData decimals

* commit local config files

* test code

* commit local config files

* contract database prune disabled

* 跨链交易不验证签名部分

* 跨链交易验证资产是否已经注册成跨链资产

* test

* add bool

* update config

* update config

* update config

* update config

* add test logs

* add test logs

* add test logs

* update ps coinData decimals

* single thread pool

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* recovery

* add boolean of contract cross asset

* fix red punish bug

* update ps-module getBlockTxList

* update ps-module getBlockTxList

* add boolean of contract cross asset

* update ps-module getTxList

* update ps-module getAcctTxs

* 测试验证人列表异常问题

* update corsschain tx

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修改协议号

* update disable asset

* beta config

* 兼容验证人恢复的交易

* 兼容验证人恢复的交易

* 配置文件

* 修复nuls-api依赖provider接口版本错误问题

* 修复nulstar在window上启动问题

* update config

* update ps-module getContract

* contract multi-asset transfer

* contract multi-asset test and fix bug

* fix bug about balance of contract

* fix bug and update test case

* test case updated

* update ps-module getAccountTokenInfo

* update ps-module getAccountTokenInfo

* update ps-module getAccountTokenInfo

* fix bug about contract transfer merge

* update test case

* add cmd error log

* update test case

* add ImportKeyStoreFilesProcessor cmd

* dev

* dev

* fix bug about contract transfer locked

* update contract call validation

* update contract call validation

* update module connection

* optimize ledger

* transaction block height update

* recovery versions

* update vm sdk classes

* update package

* 优化跨链交易重新处理机制

* 优化跨链交易重新处理机制

* 优化跨链交易重新处理机制

* version

* update validation of contract args

* fix bug

* add CrossChainAssetRegMngRepository cmd

* v2.7.3

* update multi-asset in contract

* v2.7.3

* update package

* single thread in contract

* revert

* update

* update max count

* 暂时关闭跨链交易

* 暂时关闭跨链交易

* 暂时关闭跨链交易

* support many assets transfer to contract

* update vm cache settings

* update setting

* remove debug logs

* update log

* 重置本链验证人列表交易

* update data source in contract

* 重置本链验证人列表交易

* 重置本链验证人列表交易

* 重置本链验证人列表交易

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易）

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* rm

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。

* update MongoAccountServiceImpl change AddressLIst

* 打开跨链交易

* update config

* gas price coding

* update vm class code load

* update mongodb.estimatedDocumentCount()

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* fix bug about contract multi-asset

* 修改回滚逻辑，临时，后续需要仔细重构

* remove ps module

* update contract execution way

* update package logic of contract transactions

* test case

* 尝试修改切换分叉链失败时，区块模块停止的问题

* fix bug about multi-asset transfer into contract

* update contract db and transfer

* fix NPE

* update memory rule in contract

* update result

* update contract transfer back tx

* update ChainAssetCmd

* 启动脚本增加动态JVM参数

* nrc721 support coding in contract module

* 启动脚本增加动态JVM参数

* 调整window启动脚本

* nrc721 parse

* update validation of call in nuls-api

* update nuls api

* fix bug about  token cross chain

* recovery package count (#614)

* 修改协议升级的延迟块数 (#615)

* update test case

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* update 3g mem of contract module

* add txType

* update cross token system contract

* 调试主网配置

* es commit

* version

* support multy asset with contract in nuls api module

* update offline contract transaction

Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: lijun.zhou <zhouj.172@gmail.com>
Co-authored-by: Charlie <29900478@qq.com>
Co-authored-by: niels1286 <niels0519@gmail.com>
Co-authored-by: niels1286 <niels@nuls.io>

* Pre master (#631)

* update query ledger raking

* update createOfflineAccount signOffline

* 修改跨链协议

* 修改跨链协议

* 修改跨链协议

* test

* update calc totalsSupply

* add crossTx transfer api

* add crossTx transfer api

* add crossTx transfer api

* add x

* update api offline.sh

* locked balance of nrc20

* update ps getAssetRanking

* update total balance of nrc20 in ps

* account token balance

* dev

* 修改nerve链名称

* 修复卡块BUG

* fixed npe

* stop脚本

* 修改停止脚本

* 停止脚本

* update ps document

* fix NPE about contract tx rollback

* commit local config files

* update ps coinData decimals

* commit local config files

* test code

* commit local config files

* contract database prune disabled

* 跨链交易不验证签名部分

* 跨链交易验证资产是否已经注册成跨链资产

* test

* add bool

* update config

* update config

* update config

* update config

* add test logs

* add test logs

* add test logs

* update ps coinData decimals

* single thread pool

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* recovery

* add boolean of contract cross asset

* fix red punish bug

* update ps-module getBlockTxList

* update ps-module getBlockTxList

* add boolean of contract cross asset

* update ps-module getTxList

* update ps-module getAcctTxs

* 测试验证人列表异常问题

* update corsschain tx

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修改协议号

* update disable asset

* beta config

* 兼容验证人恢复的交易

* 兼容验证人恢复的交易

* 配置文件

* 修复nuls-api依赖provider接口版本错误问题

* 修复nulstar在window上启动问题

* update config

* update ps-module getContract

* contract multi-asset transfer

* contract multi-asset test and fix bug

* fix bug about balance of contract

* fix bug and update test case

* test case updated

* update ps-module getAccountTokenInfo

* update ps-module getAccountTokenInfo

* update ps-module getAccountTokenInfo

* fix bug about contract transfer merge

* update test case

* add cmd error log

* update test case

* add ImportKeyStoreFilesProcessor cmd

* dev

* dev

* fix bug about contract transfer locked

* update contract call validation

* update contract call validation

* update module connection

* optimize ledger

* transaction block height update

* recovery versions

* update vm sdk classes

* update package

* 优化跨链交易重新处理机制

* 优化跨链交易重新处理机制

* 优化跨链交易重新处理机制

* version

* update validation of contract args

* fix bug

* add CrossChainAssetRegMngRepository cmd

* v2.7.3

* update multi-asset in contract

* v2.7.3

* update package

* single thread in contract

* revert

* update

* update max count

* 暂时关闭跨链交易

* 暂时关闭跨链交易

* 暂时关闭跨链交易

* support many assets transfer to contract

* update vm cache settings

* update setting

* remove debug logs

* update log

* 重置本链验证人列表交易

* update data source in contract

* 重置本链验证人列表交易

* 重置本链验证人列表交易

* 重置本链验证人列表交易

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易）

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* rm

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。

* update MongoAccountServiceImpl change AddressLIst

* 打开跨链交易

* update config

* gas price coding

* update vm class code load

* update mongodb.estimatedDocumentCount()

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* fix bug about contract multi-asset

* 修改回滚逻辑，临时，后续需要仔细重构

* remove ps module

* update contract execution way

* update package logic of contract transactions

* test case

* 尝试修改切换分叉链失败时，区块模块停止的问题

* fix bug about multi-asset transfer into contract

* update contract db and transfer

* fix NPE

* update memory rule in contract

* update result

* update contract transfer back tx

* update ChainAssetCmd

* 启动脚本增加动态JVM参数

* nrc721 support coding in contract module

* 启动脚本增加动态JVM参数

* 调整window启动脚本

* nrc721 parse

* update validation of call in nuls-api

* update nuls api

* fix bug about  token cross chain

* recovery package count (#614)

* 修改协议升级的延迟块数 (#615)

* update test case

* add log trace

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* add log trace

* update 3g mem of contract module

* contract db query optimize

* update log

* remove log trace

* add txType

* contract db query optimize testing

* update cross token system contract

* 调试主网配置

* es commit

* version

* 优化协议版本切换逻辑

* update

* support multy asset with contract in nuls api module

* update offline contract transaction

* add contract time out

* 测试日志

* clear old cache

* update

* test

* update

* update db initial

* fix bug

* fix bug about conflict contract transaction

* 去掉多余日志

* fix bug about setContractGenerateTxTypes

* 修复本地验证人丢失的问题

* add time out

* remove test code

* remove test log

* remove unused code

* remove test code

* extend transaction sync time out

* beta setting

* smart contract 5G mem

* version

* smart contract 3G mem

* update config

* 2.9.0 (#622)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* V2.9.1 (#626)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

* update rpc-api文档

* update rpc-api文档

* 解决有节点提前出块的问题

* version

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: niels1286 <niels@nuls.io>

* update dependen version

Co-authored-by: lijun.zhou <zhouj.172@gmail.com>
Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: niels1286 <niels0519@gmail.com>
Co-authored-by: Charlie <29900478@qq.com>
Co-authored-by: niels1286 <niels@nuls.io>

* Pre master (#637)

* 修改跨链协议

* 修改跨链协议

* test

* update calc totalsSupply

* add crossTx transfer api

* add crossTx transfer api

* add crossTx transfer api

* add x

* update api offline.sh

* locked balance of nrc20

* update ps getAssetRanking

* update total balance of nrc20 in ps

* account token balance

* dev

* 修改nerve链名称

* 修复卡块BUG

* fixed npe

* stop脚本

* 修改停止脚本

* 停止脚本

* update ps document

* fix NPE about contract tx rollback

* commit local config files

* update ps coinData decimals

* commit local config files

* test code

* commit local config files

* contract database prune disabled

* 跨链交易不验证签名部分

* 跨链交易验证资产是否已经注册成跨链资产

* test

* add bool

* update config

* update config

* update config

* update config

* add test logs

* add test logs

* add test logs

* update ps coinData decimals

* single thread pool

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* recovery

* add boolean of contract cross asset

* fix red punish bug

* update ps-module getBlockTxList

* update ps-module getBlockTxList

* add boolean of contract cross asset

* update ps-module getTxList

* update ps-module getAcctTxs

* 测试验证人列表异常问题

* update corsschain tx

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修改协议号

* update disable asset

* beta config

* 兼容验证人恢复的交易

* 兼容验证人恢复的交易

* 配置文件

* 修复nuls-api依赖provider接口版本错误问题

* 修复nulstar在window上启动问题

* update config

* update ps-module getContract

* contract multi-asset transfer

* contract multi-asset test and fix bug

* fix bug about balance of contract

* fix bug and update test case

* test case updated

* update ps-module getAccountTokenInfo

* update ps-module getAccountTokenInfo

* update ps-module getAccountTokenInfo

* fix bug about contract transfer merge

* update test case

* add cmd error log

* update test case

* add ImportKeyStoreFilesProcessor cmd

* dev

* dev

* fix bug about contract transfer locked

* update contract call validation

* update contract call validation

* update module connection

* optimize ledger

* transaction block height update

* recovery versions

* update vm sdk classes

* update package

* 优化跨链交易重新处理机制

* 优化跨链交易重新处理机制

* 优化跨链交易重新处理机制

* version

* update validation of contract args

* fix bug

* add CrossChainAssetRegMngRepository cmd

* v2.7.3

* update multi-asset in contract

* v2.7.3

* update package

* single thread in contract

* revert

* update

* update max count

* 暂时关闭跨链交易

* 暂时关闭跨链交易

* 暂时关闭跨链交易

* support many assets transfer to contract

* update vm cache settings

* update setting

* remove debug logs

* update log

* 重置本链验证人列表交易

* update data source in contract

* 重置本链验证人列表交易

* 重置本链验证人列表交易

* 重置本链验证人列表交易

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易）

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* rm

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。

* update MongoAccountServiceImpl change AddressLIst

* 打开跨链交易

* update config

* gas price coding

* update vm class code load

* update mongodb.estimatedDocumentCount()

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* fix bug about contract multi-asset

* 修改回滚逻辑，临时，后续需要仔细重构

* remove ps module

* update contract execution way

* update package logic of contract transactions

* test case

* 尝试修改切换分叉链失败时，区块模块停止的问题

* fix bug about multi-asset transfer into contract

* update contract db and transfer

* fix NPE

* update memory rule in contract

* update result

* update contract transfer back tx

* update ChainAssetCmd

* 启动脚本增加动态JVM参数

* nrc721 support coding in contract module

* 启动脚本增加动态JVM参数

* 调整window启动脚本

* nrc721 parse

* update validation of call in nuls-api

* update nuls api

* fix bug about  token cross chain

* recovery package count (#614)

* 修改协议升级的延迟块数 (#615)

* update test case

* add log trace

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* add log trace

* update 3g mem of contract module

* contract db query optimize

* update log

* remove log trace

* add txType

* contract db query optimize testing

* update cross token system contract

* 调试主网配置

* es commit

* version

* 优化协议版本切换逻辑

* update

* support multy asset with contract in nuls api module

* update offline contract transaction

* add contract time out

* 测试日志

* clear old cache

* update

* test

* update

* update db initial

* fix bug

* fix bug about conflict contract transaction

* 去掉多余日志

* fix bug about setContractGenerateTxTypes

* 修复本地验证人丢失的问题

* add time out

* remove test code

* remove test log

* remove unused code

* remove test code

* extend transaction sync time out

* beta setting

* smart contract 5G mem

* version

* smart contract 3G mem

* update config

* 2.9.0 (#622)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* V2.9.1 (#626)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

* update rpc-api文档

* update rpc-api文档

* 解决有节点提前出块的问题

* version

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: niels1286 <niels@nuls.io>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <naboxer@nabox.io>

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

Co-authored-by: lijun.zhou <zhouj.172@gmail.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: Charlie <29900478@qq.com>
Co-authored-by: NaboxAdmin <naboxer@nabox.io>

* Develop (#640)

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* Develop (#641)

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

* update api

* update ncf

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* Prod limit (#643)

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

* update api

* update ncf

* Access frequency limit.

Co-authored-by: niels1286 <niels@nuls.io>

* add getBalanceList (#644)

* test case

* V2.10.0 (#645)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

* fix bug about nuls-api in testnet

* update error log

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

* update api

* update ncf

* add getBalanceList

* test disable asset

* test disable asset

* test disable asset

* test disable asset

* test case

* 通过编译

* 通过编译

* 通过编译

* 通过编译

* 通过编译

Co-authored-by: lijun.zhou <zhouj.172@gmail.com>
Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>

* Master merge 2.10.0 (#646)

* update calc totalsSupply

* add crossTx transfer api

* add crossTx transfer api

* add crossTx transfer api

* add x

* update api offline.sh

* locked balance of nrc20

* update ps getAssetRanking

* update total balance of nrc20 in ps

* account token balance

* dev

* 修改nerve链名称

* 修复卡块BUG

* fixed npe

* stop脚本

* 修改停止脚本

* 停止脚本

* update ps document

* fix NPE about contract tx rollback

* commit local config files

* update ps coinData decimals

* commit local config files

* test code

* commit local config files

* contract database prune disabled

* 跨链交易不验证签名部分

* 跨链交易验证资产是否已经注册成跨链资产

* test

* add bool

* update config

* update config

* update config

* update config

* add test logs

* add test logs

* add test logs

* update ps coinData decimals

* single thread pool

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* 跨链重新进行拜赞庭签名

* recovery

* add boolean of contract cross asset

* fix red punish bug

* update ps-module getBlockTxList

* update ps-module getBlockTxList

* add boolean of contract cross asset

* update ps-module getTxList

* update ps-module getAcctTxs

* 测试验证人列表异常问题

* update corsschain tx

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修复因变更跨链资产造成的平行链验证人列表重置问题。

* 修改协议号

* update disable asset

* beta config

* 兼容验证人恢复的交易

* 兼容验证人恢复的交易

* 配置文件

* 修复nuls-api依赖provider接口版本错误问题

* 修复nulstar在window上启动问题

* update config

* update ps-module getContract

* contract multi-asset transfer

* contract multi-asset test and fix bug

* fix bug about balance of contract

* fix bug and update test case

* test case updated

* update ps-module getAccountTokenInfo

* update ps-module getAccountTokenInfo

* update ps-module getAccountTokenInfo

* fix bug about contract transfer merge

* update test case

* add cmd error log

* update test case

* add ImportKeyStoreFilesProcessor cmd

* dev

* dev

* fix bug about contract transfer locked

* update contract call validation

* update contract call validation

* update module connection

* optimize ledger

* transaction block height update

* recovery versions

* update vm sdk classes

* update package

* 优化跨链交易重新处理机制

* 优化跨链交易重新处理机制

* 优化跨链交易重新处理机制

* version

* update validation of contract args

* fix bug

* add CrossChainAssetRegMngRepository cmd

* v2.7.3

* update multi-asset in contract

* v2.7.3

* update package

* single thread in contract

* revert

* update

* update max count

* 暂时关闭跨链交易

* 暂时关闭跨链交易

* 暂时关闭跨链交易

* support many assets transfer to contract

* update vm cache settings

* update setting

* remove debug logs

* update log

* 重置本链验证人列表交易

* update data source in contract

* 重置本链验证人列表交易

* 重置本链验证人列表交易

* 重置本链验证人列表交易

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* 交易模块基础验证中验证手续费获取交易size时, 去掉交易签名的size（针对所有交易）

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* rm

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 重置本链验证人后创建一笔初始化验证人交易重置平行链存储的主链验证人列表

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* 普通跨链交易饱和签名数在最少签名数的基础上上浮5%。

* update MongoAccountServiceImpl change AddressLIst

* 打开跨链交易

* update config

* gas price coding

* update vm class code load

* update mongodb.estimatedDocumentCount()

* 普通跨链交易饱和签名数在最少签名数的基础上上浮30%。

* fix bug about contract multi-asset

* 修改回滚逻辑，临时，后续需要仔细重构

* remove ps module

* update contract execution way

* update package logic of contract transactions

* test case

* 尝试修改切换分叉链失败时，区块模块停止的问题

* fix bug about multi-asset transfer into contract

* update contract db and transfer

* fix NPE

* update memory rule in contract

* update result

* update contract transfer back tx

* update ChainAssetCmd

* 启动脚本增加动态JVM参数

* nrc721 support coding in contract module

* 启动脚本增加动态JVM参数

* 调整window启动脚本

* nrc721 parse

* update validation of call in nuls-api

* update nuls api

* fix bug about  token cross chain

* recovery package count (#614)

* 修改协议升级的延迟块数 (#615)

* update test case

* add log trace

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* 重新处理跨链交易增加token跨链

* add log trace

* update 3g mem of contract module

* contract db query optimize

* update log

* remove log trace

* add txType

* contract db query optimize testing

* update cross token system contract

* 调试主网配置

* es commit

* version

* 优化协议版本切换逻辑

* update

* support multy asset with contract in nuls api module

* update offline contract transaction

* add contract time out

* 测试日志

* clear old cache

* update

* test

* update

* update db initial

* fix bug

* fix bug about conflict contract transaction

* 去掉多余日志

* fix bug about setContractGenerateTxTypes

* 修复本地验证人丢失的问题

* add time out

* remove test code

* remove test log

* remove unused code

* remove test code

* extend transaction sync time out

* beta setting

* smart contract 5G mem

* version

* smart contract 3G mem

* update config

* 2.9.0 (#622)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* V2.9.1 (#626)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

* update rpc-api文档

* update rpc-api文档

* 解决有节点提前出块的问题

* version

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: niels1286 <niels@nuls.io>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <naboxer@nabox.io>

* Develop (#640)

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* Develop (#641)

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

* update api

* update ncf

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* Prod limit (#643)

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

* update api

* update ncf

* Access frequency limit.

Co-authored-by: niels1286 <niels@nuls.io>

* add getBalanceList (#644)

* V2.10.0 (#645)

* beta 跨链合约更新

* verser

* update beta setting

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

* fix bug about nuls-api in testnet

* update error log

* Merge branch 'release/prod'

# Conflicts:
#	config/nuls.ncf
#	module.ncf
#	module/nuls-api/documents/nuls-api_JSONRPC.md
#	module/nuls-api/documents/nuls-api_RESTFUL.md
#	module/nuls-api/src/main/java/io/nuls/provider/ApiBootstrap.java
#	module/nuls-api/src/main/java/io/nuls/provider/api/jsonrpc/controller/TransactionController.java
#	version

* v2.9.2

* add some cmds

* update message to data

* test file

* update contract info

* v2.9.3

* update contract info

* v2.9.3

* fix pr 638

* update api

* update ncf

* add getBalanceList

* test disable asset

* test disable asset

* test disable asset

* test disable asset

* test case

* 通过编译

* 通过编译

* 通过编译

* 通过编译

* 通过编译

Co-authored-by: lijun.zhou <zhouj.172@gmail.com>
Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>

Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: lijun.zhou <zhouj.172@gmail.com>
Co-authored-by: Charlie <29900478@qq.com>
Co-authored-by: NaboxAdmin <naboxer@nabox.io>

* fix pro bug

* fix pro bug

* fix pro bug

* Prod api (#647)

* add getBalanceList

* update getBalanceList

* remove h2

* remove mybatis

* remove mybatis

* remove vm log

* remove vm log

* update api of  token balance about locked amount

Co-authored-by: lijunzhou <zhouj.172@gmail.com>
Co-authored-by: tag0313 <981602228@qq.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: Charlie <29900478@qq.com>
Co-authored-by: NaboxAdmin <naboxer@nabox.io>

* add  api blackAddressList

* 黑名单列表

* 黑名单列表

* add  api blackAddressList

* blacklist

* add  api blackAddressList

* add  api blackAddressList

* add  api blackAddressList

* 提交协议升级配置

* update block

* blacklist

* blacklist

* recovery contract api

* update pom of contract

* update api of contract

* update pom

* add  api blackAddressList

* add  api blackAddressList

* 提交协议升级配置

* update test case

* update errormsg

* 每分钟重置黑名单地址

* 每分钟重置黑名单地址

* 每分钟重置黑名单地址

* update get contractLockBalance

* 提交12协议升级配置--允许资产重新注册跨链

* 恢复transfer

* update test case

* update get contractLockBalance

* v2 coding

* add api for block account

* account block v2 coding

* config

* update addcrossasset cmd

* account block signature validation coding completed

* test completed

* update get contractLockBalance

* update test case

* 2.12.1

* update api doc

* add decimals for rpc

* 2.12.2

* update rpc

* update api of account balance

* support nuls transfer on contract call

* completed to support nuls transfer on contract call

* update test case

* 2.13.0-beta

* optimize the api of broadcast tx

* 2.12.3

* 2.12.3

* 2.12.5

* settings

* 还原本地特殊处理代码

* fix ignore

* fix v12 sync bugs

* fix v12 sync bugs

* Delay stop agent tx

* Delay stop agent tx

* dev config

* update cmd

* 增加api接口

* local-test success

* local-test success

* fix tx validator bug

* fix tx validator bug

* modify nulstar oss url

* v2.13.0-whole

* v2.13.0-whole

* v2.13.0-whole

* 增加查看跨链交易签名信息功能

* 增加查看跨链交易签名信息功能

* v2.13.1 remove dependency-fastjson

* v2.13.1 remove dependency-fastjson

* coding initial

* remove unused packages

* coding for internal-create

* optimize code

* add computeAddress for internal-create

* update gas used of contract create on protocol 14

* update gas cost for contract execution failure

* test settings

* update multi address for contract call

* test setting

* test

* test

* update test case

* v2.14.0

* v2.14.0

* v2.14.0

* add internal-create data to the contract result

* update the validation of token name

* upgrade jar

* upgrade jar

* update internal create

* v2.15.0-beta

* update nrc20 initial totalsupply

* update nrc20 initial totalsupply (#675)

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* v2.15.0-beta

* v2.15.0-beta

* v2.15.0-beta： Modify asset name restriction. The restriction name cannot contain NULS to be NULS.

* v2.15.0-beta： add getAddressesAndVerifySignature method

* v2.15.0-beta： add getAddressesAndVerifySignature method

* add address by key in contract vm sdk

* add api for contract tx

* add api for contract tx (#679)

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* fix: Remove unnecessary code

* add ctx rehandle interface

* add ctx rehandle interface

* 2.15.2-beta

* 2.15.2-beta

* 2.15.2-beta

* 2.15.2

* update api

* nrc1155

* nrc1155 bugs

* 2.16.0

* add api of compute contract address

* add api of code hash

* 2.16.1

* add api of contract code

* add api of contract code (#684)

Co-authored-by: MIMIEYES <pierreluohao@gmail.com>

* api of code hash

* 2.15.3

* nrc1155

* 增加nuls交易预警

* merge init

* merge coding

* merge coding

* cmd annotation

* remove nrc20 record

* block save bug

* module transaction group

* test settings

* test case

* load file bug

* log trace

* txs commit bug

* log trace

* bug about cross chain duplication commit

* bug for duplication commit

* cross chain bug

* log trace

* remove log trace

* merge version

* merge version

* merge version

* merge version

* cmd bug

* merge version

* merge version

* test case

* add logs

* add logs

* add logs

* change name of the duplicate cmd

* add keccak in nvm

* 2.17.0-testnet

* fix protocol update bug

* fix protocol update bug

* 2.17.1

---------

Co-authored-by: lijun.zhou <zhouj.172@gmail.com>
Co-authored-by: zhouwei1985 <251556768@qq.com>
Co-authored-by: MIMIEYES <pierreluohao@gmail.com>
Co-authored-by: Charlie <29900478@qq.com>
Co-authored-by: NaboxAdmin <naboxer@nabox.io>
Co-authored-by: tag0313 <981602228@qq.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroupManager.java

@@ -66,6 +66,7 @@ public static void init(int chainId, Map<Short, Protocol> protocolMap, short ver
 
     /**
      * 获取当前生效的协议版本号
+     *
      * @param chainId
      * @return
      */
@@ -75,6 +76,7 @@ public static Short getCurrentVersion(int chainId) {
 
     /**
      * 获取当前生效的协议版本(包含消息、交易详细信息)
+     *
      * @param chainId
      * @return
      */
@@ -103,13 +105,13 @@ public static void updateProtocol(int chainId, short protocolVersion) {
             ProtocolGroup protocolGroup = protocolGroupMap.get(chainId);
             Protocol protocol = protocolGroup.getProtocolsMap().get(protocolVersion);
             //如果不存在给定版本号的协议信息，则取比当前版本号小的最大的一个协议
-            if(protocol == null){
+            if (protocol == null) {
                 Set<Short> sortKey = new TreeSet<>(protocolGroup.getProtocolsMap().keySet());
                 short effectiveVersion = 1;
-                for (Short version : sortKey){
-                    if(version <= protocolVersion){
+                for (Short version : sortKey) {
+                    if (version <= protocolVersion) {
                         effectiveVersion = version;
-                    }else{
+                    } else {
                         break;
                     }
                 }
@@ -132,13 +134,11 @@ public static void updateProtocol(int chainId, short protocolVersion) {
                     }
                 });
                 messageDispatcher.setProcessors(messageProcessors);
-                //try {
-                //    if (ConnectManager.getConnectByRole(ModuleE.TX.abbr) != null) {
-                //        RegisterHelper.registerTx(chainId, protocol);
-                //    }
-                //} catch (Exception e) {
-                //    Log.warn(e.getMessage());
-                //}
+                try {
+                    RegisterHelper.registerTx(chainId, protocol);
+                } catch (Exception e) {
+                    Log.warn(e.getMessage());
+                }
             }
         }
     }

module/nuls-cores/src/main/resources/protocol-config.json

@@ -1,4 +1,12 @@
 [
+  {
+    "version": "17",
+    "extend": "16",
+    "validTxs": [],
+    "validMsgs": [],
+    "invalidTxs": "",
+    "invalidMsgs": ""
+  },
   {
     "version": "16",
     "extend": "15",
@@ -115,7 +123,6 @@
     "invalidTxs": "",
     "invalidMsgs": ""
   },
-
   {
     "version": "12",
     "extend": "11",
@@ -141,7 +148,6 @@
     "invalidTxs": "",
     "invalidMsgs": ""
   },
-
   {
     "version": "11",
     "extend": "10",
@@ -373,7 +379,6 @@
     "invalidTxs": "",
     "invalidMsgs": ""
   },
-
   {
     "version": "3",
     "extend": "2",
@@ -429,7 +434,6 @@
     "invalidTxs": "",
     "invalidMsgs": ""
   },
-
   {
     "version": "2",
     "extend": "1",

version

@@ -1 +1 @@
-2.17.0
+2.17.1