Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release/pre prod #714

Merged
merged 96 commits into from
Aug 15, 2024
Merged

Release/pre prod #714

merged 96 commits into from
Aug 15, 2024

Commits on Dec 27, 2021

  1. Develop (#648) 

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

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

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

* 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

* beta 跨链合约更新

* verser

* update beta setting

* extend transaction sync time out

* beta setting

* smart contract 5G mem

* version

* smart contract 3G mem

* update config

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

* 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 <[email protected]>

* fix bug about nuls-api in testnet

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* update error log

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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

* 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 <[email protected]>

* update api

* update ncf

* 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 <[email protected]>

* 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 <[email protected]>

* add getBalanceList

* add getBalanceList (#644)

* test disable asset

* test disable asset

* test disable asset

* test disable asset

* 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 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

* Prod api (#647)

* add getBalanceList

* update getBalanceList

* remove h2

Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>
    @niels1286 @lijunzhou
    @MIMIEYES @zhouwei1985 @lichao23 @NaboxAdmin
    6 people authored Dec 27, 2021
    Configuration menu
    Copy the full SHA
    1fce7a5 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2022

  1. Bump gson from 2.8.5 to 2.8.9 in /module/nuls-transaction (#665) 

    Bumps [gson](https:/google/gson) from 2.8.5 to 2.8.9.
- [Release notes](https:/google/gson/releases)
- [Changelog](https:/google/gson/blob/master/CHANGELOG.md)
- [Commits](google/gson@gson-parent-2.8.5...gson-parent-2.8.9)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored May 25, 2022
    Configuration menu
    Copy the full SHA
    70f3156 View commit details
    Browse the repository at this point in the history

  2. Bump junit from 4.12 to 4.13.1 in /module/nuls-smart-contract (#666) 

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

---
updated-dependencies:
- dependency-name: junit:junit
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored May 25, 2022
    Configuration menu
    Copy the full SHA
    095618b View commit details
    Browse the repository at this point in the history

  3. Bump junit from 4.12 to 4.13.1 in /test/nuls-test (#668) 

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

---
updated-dependencies:
- dependency-name: junit:junit
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored May 25, 2022
    Configuration menu
    Copy the full SHA
    b3fd642 View commit details
    Browse the repository at this point in the history

  4. Bump junit from 4.12 to 4.13.1 in /module/nuls-cross-chain/base-lib (#… 

    …667)

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

---
updated-dependencies:
- dependency-name: junit:junit
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored May 25, 2022
    Configuration menu
    Copy the full SHA
    37b5543 View commit details
    Browse the repository at this point in the history

  5. Bump commons-io from 2.6 to 2.7 in /module/nuls-smart-contract (#669) 

    Bumps commons-io from 2.6 to 2.7.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    @dependabot
    dependabot[bot] authored May 25, 2022
    Configuration menu
    Copy the full SHA
    fc998ff View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. Pre master (#673) 

    * 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

* beta 跨链合约更新

* verser

* update beta setting

* extend transaction sync time out

* beta setting

* smart contract 5G mem

* version

* smart contract 3G mem

* update config

* version 290

* update array list limit

* update test case

* update

* update

* update

* u

* update max limit

* args bug

* update version control

* remove log

* version

* 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 <[email protected]>

* fix bug about nuls-api in testnet

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* update error log

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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

* 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 <[email protected]>

* update api

* update ncf

* 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 <[email protected]>

* 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 <[email protected]>

* add getBalanceList

* add getBalanceList (#644)

* test disable asset

* test disable asset

* test disable asset

* test disable asset

* 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 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

* update getBalanceList

* 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

* Develop-v2.10.2 (#649)

* 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 <[email protected]>

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

* update  getblock  api

* update  getblock  api

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

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

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

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

Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

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

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

Signed-off-by: dependabot[bot] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Niels <[email protected]>

* 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 <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* update dependen version

Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* fix pro bug

* fix pro bug

* fix pro bug

* remove h2

* remove mybatis

* remove mybatis

* remove vm log

Co-authored-by: lijunzhou <[email protected]>
Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* remove vm log

* 2.10.2 (#650)

* 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 <[email protected]>

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

* update  getblock  api

* update  getblock  api

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

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

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

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

Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

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

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

Signed-off-by: dependabot[bot] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Niels <[email protected]>

* 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 <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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 …
    @niels1286 @MIMIEYES
    @zhouwei1985 @lijunzhou @lichao23 @NaboxAdmin @tag0313 @dependabot
    8 people authored Jul 1, 2022
    Configuration menu
    Copy the full SHA
    b3de73e View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. 2.16.1

    @niels1286
    niels1286 committed May 15, 2023
    Configuration menu
    Copy the full SHA
    80fdec5 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. add api of contract code (#684) 

    Co-authored-by: MIMIEYES <[email protected]>
    @niels1286 @MIMIEYES
    niels1286 and MIMIEYES authored May 16, 2023
    Configuration menu
    Copy the full SHA
    f53fb08 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Master update (#690) 

    * 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

* Prod api (#647)

* add getBalanceList

* update getBalanceList

* Develop-v2.10.2 (#649)

* 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 <[email protected]>

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

* update  getblock  api

* update  getblock  api

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

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

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

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

Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

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

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

Signed-off-by: dependabot[bot] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Niels <[email protected]>

* 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 <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* update dependen version

Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* fix pro bug

* fix pro bug

* fix pro bug

* remove h2

* remove mybatis

* remove mybatis

* remove vm log

Co-authored-by: lijunzhou <[email protected]>
Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* 2.10.2 (#650)

* 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 <[email protected]>

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

* update  getblock  api

* update  getblock  api

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

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

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

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

Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

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

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

Signed-off-by: dependabot[bot] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Niels <[email protected]>

* 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 <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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 deci…
    @niels1286 @lijunzhou
    @zhouwei1985 @MIMIEYES @lichao23 @NaboxAdmin @tag0313 @dependabot
    8 people authored Jul 18, 2023
    Configuration menu
    Copy the full SHA
    e31894f View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Cross-chain transactions with a high lag of more than one day are no … 

    …longer broadcast
    @lijunzhou
    lijunzhou committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    ddfb046 View commit details
    Browse the repository at this point in the history

  2. Cross-chain transactions with a high lag of more than one day are no … 

    …longer broadcast
    @lijunzhou
    lijunzhou committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    9d68c2b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release/prod' of github.com:nuls-io/nuls-v2 into releas… 

    …e/prod
    @lijunzhou
    lijunzhou committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    cab7232 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2023

  1. Pre master 1011 (#694) 

    * 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

* Prod api (#647)

* add getBalanceList

* update getBalanceList

* Develop-v2.10.2 (#649)

* 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 <[email protected]>

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

* update  getblock  api

* update  getblock  api

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

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

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

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

Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

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

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

Signed-off-by: dependabot[bot] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Niels <[email protected]>

* 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 <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* update dependen version

Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* fix pro bug

* fix pro bug

* fix pro bug

* remove h2

* remove mybatis

* remove mybatis

* remove vm log

Co-authored-by: lijunzhou <[email protected]>
Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* 2.10.2 (#650)

* 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 <[email protected]>

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

* update  getblock  api

* update  getblock  api

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

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

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

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

Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

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

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

Signed-off-by: dependabot[bot] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Niels <[email protected]>

* 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 <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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依赖provi…
    @niels1286 @MIMIEYES
    @zhouwei1985 @lijunzhou @lichao23 @NaboxAdmin @tag0313 @dependabot
    8 people authored Oct 11, 2023
    Configuration menu
    Copy the full SHA
    7c29097 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Merge branch 'develop' into release/beta 

    # Conflicts:
#	version
    @niels1286
    niels1286 committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    e1138a5 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Pre master (#696) 

    * 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

* Prod api (#647)

* add getBalanceList

* update getBalanceList

* Develop-v2.10.2 (#649)

* 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 <[email protected]>

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

* update  getblock  api

* update  getblock  api

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

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

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

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

Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

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

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

Signed-off-by: dependabot[bot] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Niels <[email protected]>

* 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 <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* update dependen version

Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* fix pro bug

* fix pro bug

* fix pro bug

* remove h2

* remove mybatis

* remove mybatis

* remove vm log

Co-authored-by: lijunzhou <[email protected]>
Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* 2.10.2 (#650)

* 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 <[email protected]>

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

* update  getblock  api

* update  getblock  api

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

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

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

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

Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

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

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

Signed-off-by: dependabot[bot] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Niels <[email protected]>

* 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 <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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

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

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

*…
    @niels1286 @zhouwei1985
    @MIMIEYES @lijunzhou @lichao23 @NaboxAdmin @tag0313 @dependabot
    8 people authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    df0110b View commit details
    Browse the repository at this point in the history

  2. Pre master (#697) 

    * 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

* Prod api (#647)

* add getBalanceList

* update getBalanceList

* Develop-v2.10.2 (#649)

* 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 <[email protected]>

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

* update  getblock  api

* update  getblock  api

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

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

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

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

Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

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

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

Signed-off-by: dependabot[bot] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Niels <[email protected]>

* 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 <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* update dependen version

Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* Release/pre prod (#629)

* update fastjson version

* update dependen version

* update nuls.ncf (#634)

Co-authored-by: NaboxAdmin <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* fix pro bug

* fix pro bug

* fix pro bug

* remove h2

* remove mybatis

* remove mybatis

* remove vm log

Co-authored-by: lijunzhou <[email protected]>
Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: NaboxAdmin <[email protected]>

* 2.10.2 (#650)

* 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 <[email protected]>

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

* update  getblock  api

* update  getblock  api

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

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

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

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

Co-authored-by: tag0313 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>

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

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

Signed-off-by: dependabot[bot] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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] <[email protected]>

* 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 <[email protected]>

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

* 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 <[email protected]>
Co-authored-by: zhouwei1985 <[email protected]>
Co-authored-by: MIMIEYES <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: Niels <[email protected]>

* 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 <[email protected]>
Co-authored-by: lijun.zhou <[email protected]>
Co-authored-by: Charlie <[email protected]>
Co-authored-by: niels1286 <[email protected]>
Co-authored-by: niels1286 <[email protected]>

* 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

* 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

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

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

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

* 跨链重新进行拜赞庭签名
…
    @niels1286 @zhouwei1985
    @MIMIEYES @lijunzhou @lichao23 @NaboxAdmin @tag0313 @dependabot
    8 people authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    0074800 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2023

  1. Merge branch 'release/prod' 

    # Conflicts:
#	common/nuls-base-protocol-update/src/main/java/io/nuls/base/protocol/ProtocolGroupManager.java
#	genesis-block.json
#	module.ncf
#	module/nuls-cores/module.ncf
#	module/nuls-cores/src/main/java/io/nuls/transaction/constant/TxContext.java
#	module/nuls-cores/src/main/resources/protocol-config.json
#	module/nuls-cores/src/main/resources/protocol/versions.json
#	version
    @niels1286
    niels1286 committed Dec 25, 2023
    Configuration menu
    Copy the full SHA
    b88f295 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. Update README.md (#706)

    @reagost
    reagost authored Jan 3, 2024
    Configuration menu
    Copy the full SHA
    1aa6ef7 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Merge remote-tracking branch 'origin/release/prod' into release/prod

    @lijunzhou
    lijunzhou committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    83e5b58 View commit details
    Browse the repository at this point in the history

  2. Modify a document

    @jasonchou82111
    jasonchou82111 committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    763fc4d View commit details
    Browse the repository at this point in the history

  3. en

    @jasonchou82111
    jasonchou82111 committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    e39826b View commit details
    Browse the repository at this point in the history

  4. en

    @jasonchou82111
    jasonchou82111 committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    0b2f717 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. Merge remote-tracking branch 'origin/master'

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    54e383d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/release/beta' 

    # Conflicts:
#	README.md
    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    ccb7a71 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #707 from nuls-io/master_pre 

    Master pre
    @Nicholas-MacLeod
    Nicholas-MacLeod authored Jan 10, 2024
    Configuration menu
    Copy the full SHA
    3357b7e View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Update README.md

    @reagost
    reagost authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    9b6d937 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Update README.md

    @reagost
    reagost authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    bb37cab View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2024

  1. p19

    @cobble586
    cobble586 committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    dc11c6a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into release/beta

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    15180e8 View commit details
    Browse the repository at this point in the history

  3. 2.19.0

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    cb15f09 View commit details
    Browse the repository at this point in the history

  4. 2.19.0

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    4fa8337 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #708 from nuls-io/reagost-patch-1 

    Update README.md
    @Nicholas-MacLeod
    Nicholas-MacLeod authored Feb 18, 2024
    Configuration menu
    Copy the full SHA
    ec9a5d6 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into reagost-patch-4

    @Nicholas-MacLeod
    Nicholas-MacLeod authored Feb 18, 2024
    Configuration menu
    Copy the full SHA
    6e28351 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #709 from nuls-io/reagost-patch-4 

    Update README.md
    @Nicholas-MacLeod
    Nicholas-MacLeod authored Feb 18, 2024
    Configuration menu
    Copy the full SHA
    a991309 View commit details
    Browse the repository at this point in the history

  8. add cross asset cmd check

    @cobble586
    cobble586 committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    c4d33fb View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into release/beta 

    # Conflicts:
#	module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/AssetCmd.java
    @Nicholas-MacLeod
    Nicholas-MacLeod committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    734d368 View commit details
    Browse the repository at this point in the history

  10. 2.19.0

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    a74fb60 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2024

  1. update version

    @cobble586
    cobble586 committed Feb 21, 2024
    Configuration menu
    Copy the full SHA
    336352c View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

  1. 2.19.0

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    548240d View commit details
    Browse the repository at this point in the history

  2. update beta config

    JasonChou committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    06ce9cf View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. base fee mod

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7a52599 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. base fee mod

    @Nicholas-MacLeod
    Nicholas-MacLeod committed May 24, 2024
    Configuration menu
    Copy the full SHA
    7cf01af View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop-fee' into release/beta 

    # Conflicts:
#	module.ncf
#	module/nuls-cores/src/main/java/io/nuls/account/service/impl/AliasServiceImpl.java
#	module/nuls-cores/src/main/java/io/nuls/account/service/impl/TransactionServiceImpl.java
#	module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/BaseChainCmd.java
#	module/nuls-cores/src/main/java/io/nuls/common/ConfigBean.java
#	module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/CoinDataManager.java
#	module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/RoundManager.java
#	module/nuls-cores/src/main/java/io/nuls/contract/callable/ContractTxCallableV14.java
#	module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractNewTxHandler.java
#	module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java
#	module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramExecutorImpl.java
#	module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/ResetLocalVerifierServiceImpl.java
#	module/nuls-cores/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java
#	module/nuls-cores/src/main/resources/protocol/versions.json
#	version
    @Nicholas-MacLeod
    Nicholas-MacLeod committed May 24, 2024
    Configuration menu
    Copy the full SHA
    b99fbee View commit details
    Browse the repository at this point in the history

  3. 2.20.0

    @Nicholas-MacLeod
    Nicholas-MacLeod committed May 24, 2024
    Configuration menu
    Copy the full SHA
    c7af524 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2024

  1. 2.20.0

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    6d60b51 View commit details
    Browse the repository at this point in the history

  2. 2.20.0

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    848ca2b View commit details
    Browse the repository at this point in the history

  3. 2.20.0pre

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 16, 2024
    Configuration menu
    Copy the full SHA
    17d060b View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. fix cross bug

    JasonChou committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    bc69a6c View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/release/prod' into release/prod

    JasonChou committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    c5de280 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release/prod' into ccc

    JasonChou committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    0347156 View commit details
    Browse the repository at this point in the history

  4. 2.20.0pre

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    519034c View commit details
    Browse the repository at this point in the history

  5. 2.20.0-pre

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    23e46d4 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Cross-chain transactions add backpass signature messages

    JasonChou committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    ebd32c7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into release/pre_prod 

    # Conflicts:
#	common/nuls-base/src/main/java/io/nuls/base/basic/TransactionFeeCalculator.java
#	config/nuls.beta.ncf
#	config/nuls.ncf
#	module.ncf
#	module/nuls-cores/src/main/java/io/nuls/account/service/impl/AliasServiceImpl.java
#	module/nuls-cores/src/main/java/io/nuls/account/service/impl/TransactionServiceImpl.java
#	module/nuls-cores/src/main/java/io/nuls/chain/rpc/cmd/BaseChainCmd.java
#	module/nuls-cores/src/main/java/io/nuls/common/ConfigBean.java
#	module/nuls-cores/src/main/java/io/nuls/consensus/utils/manager/CoinDataManager.java
#	module/nuls-cores/src/main/java/io/nuls/contract/callable/ContractTxCallableV14.java
#	module/nuls-cores/src/main/java/io/nuls/contract/config/ContractContext.java
#	module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractNewTxHandler.java
#	module/nuls-cores/src/main/java/io/nuls/contract/vm/natives/io/nuls/contract/sdk/NativeUtils.java
#	module/nuls-cores/src/main/java/io/nuls/contract/vm/program/impl/ProgramExecutorImpl.java
#	module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/BlockServiceImpl.java
#	module/nuls-cores/src/main/java/io/nuls/crosschain/servive/impl/NulsProtocolServiceImpl.java
#	module/nuls-cores/src/main/java/io/nuls/crosschain/utils/thread/handler/SignMessageByzantineHandler.java
#	module/nuls-cores/src/main/java/io/nuls/transaction/service/impl/TxServiceImpl.java
#	module/nuls-cores/src/main/resources/protocol-config.json
#	module/nuls-cores/src/main/resources/protocol/versions.json
#	module/nuls-cores/src/test/java/io/nuls/contract/tx/offline/ContractMultyAssetOfflineTest.java
#	version
    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    49b296a View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Merge remote-tracking branch 'origin/ccc' into release/pre_prod

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    bbe250c View commit details
    Browse the repository at this point in the history

  2. fix errors

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    761e4f6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'ccc' into develop

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    f5bb7fa View commit details
    Browse the repository at this point in the history

  4. fix errors

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    dc4b4e1 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. fix errors

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    442f9f1 View commit details
    Browse the repository at this point in the history

  2. fix errors

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    a756efc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into release/pre_prod 

    # Conflicts:
#	genesis-block.json
    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    d53e90f View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. fix errors

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    faa6dc5 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. fix errors

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    426f76b View commit details
    Browse the repository at this point in the history

  2. fix errors

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    145e5e4 View commit details
    Browse the repository at this point in the history

  3. fix errors

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    6dcb958 View commit details
    Browse the repository at this point in the history

  4. fix errors

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    5355d26 View commit details
    Browse the repository at this point in the history

  5. fix errors

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    2889916 View commit details
    Browse the repository at this point in the history

  6. test

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    38fbc43 View commit details
    Browse the repository at this point in the history

  7. test

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    74a5349 View commit details
    Browse the repository at this point in the history

  8. test

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    a975b79 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. test a

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    fa5e4b0 View commit details
    Browse the repository at this point in the history

  2. test a

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    b5c43a2 View commit details
    Browse the repository at this point in the history

  3. test a

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    270a902 View commit details
    Browse the repository at this point in the history

  4. test a

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    7f3a166 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. test b

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    a023bb5 View commit details
    Browse the repository at this point in the history

  2. test b

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    dfd9e95 View commit details
    Browse the repository at this point in the history

  3. test b

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    2f1fff8 View commit details
    Browse the repository at this point in the history

  4. test b

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    5edcacb View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. test b

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    d957cdb View commit details
    Browse the repository at this point in the history

  2. test b

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    8d7d5c3 View commit details
    Browse the repository at this point in the history

  3. test b

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    b0fd095 View commit details
    Browse the repository at this point in the history

  4. test b

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    52da03a View commit details
    Browse the repository at this point in the history

  5. test b

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    a8a0035 View commit details
    Browse the repository at this point in the history

  6. test b

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    410d9cd View commit details
    Browse the repository at this point in the history

  7. test c

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    cd749d2 View commit details
    Browse the repository at this point in the history

  8. test c

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    e8bcd79 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. add logs

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    405b674 View commit details
    Browse the repository at this point in the history

  2. add logs

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    c7c8ffd View commit details
    Browse the repository at this point in the history

  3. Adding restrictions

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    37ebc7a View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. fix getBalance bug

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    45c6593 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. Merge branch 'release/beta' into release/pre_prod 

    # Conflicts:
#	genesis-block.json
#	version
    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    c3b41cb View commit details
    Browse the repository at this point in the history

  2. fix getBalance bug

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    0ed949c View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. 2.20.0

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    f81037b View commit details
    Browse the repository at this point in the history

  2. http->https

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    da532ee View commit details
    Browse the repository at this point in the history

  3. dependency upgrade

    @Nicholas-MacLeod
    Nicholas-MacLeod committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    58a5519 View commit details
    Browse the repository at this point in the history