Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 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]> * 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](https:/google/gson/compare/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> * 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](https:/junit-team/junit4/compare/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> * 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](https:/junit-team/junit4/compare/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> * 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](https:/junit-team/junit4/compare/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> * 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> * 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 …
- Loading branch information
15 people
authored
Aug 21, 2024
1 parent
bb0ea57
commit 7b4a038