Release/pre prod #705
Merged
Release/pre prod #705
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* release/prod: update config
* 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]>
# 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
* 修改跨链协议 * 修改跨链协议 * 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]>
# Conflicts: # module/nuls-smart-contract/pom.xml # module/nuls-smart-contract/src/main/java/io/nuls/contract/helper/ContractHelper.java # version
* merge: (35 commits) test case merge version merge version cmd bug merge version merge version merge version merge version remove log trace log trace cross chain bug bug for duplication commit bug about cross chain duplication commit log trace txs commit bug log trace load file bug test case test settings module transaction group ... # Conflicts: # module.ncf # module/nuls-account/pom.xml # module/nuls-chain-manager/src/main/resources/protocol-config.json # module/nuls-consensus/nuls-consensus-poc/src/main/java/io/nuls/poc/ConsensusBootStrap.java # module/nuls-cores/pom.xml # module/nuls-cores/src/main/java/io/nuls/block/constant/Constant.java # module/nuls-cores/src/main/java/io/nuls/chain/ChainManagerBootstrap.java # module/nuls-cores/src/main/java/io/nuls/consensus/utils/compare/AgentComparator.java # module/nuls-cores/src/main/java/io/nuls/contract/SmartContractBootStrap.java # module/nuls-cores/src/main/java/io/nuls/contract/callable/ContractTxCallableV14.java # module/nuls-cores/src/main/java/io/nuls/contract/helper/ContractHelper.java # module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractCreate.java # module/nuls-cores/src/main/java/io/nuls/contract/model/bo/ContractInternalCreate.java # module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractInternalCreateDto.java # module/nuls-cores/src/main/java/io/nuls/contract/model/dto/ContractToken1155TransferDto.java # module/nuls-cores/src/main/java/io/nuls/contract/processor/CallContractTxProcessor.java # module/nuls-cores/src/main/java/io/nuls/contract/service/impl/ContractTxServiceImpl.java # module/nuls-cores/src/main/java/io/nuls/contract/util/VMContext.java # module/nuls-cores/src/main/java/io/nuls/contract/vm/code/ClassCodeLoader.java # module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramCreateData.java # module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramEncodePacked.java # module/nuls-cores/src/main/java/io/nuls/contract/vm/program/ProgramInternalCreate.java # module/nuls-cores/src/main/resources/contract/nrc1155.json # module/nuls-cores/src/main/resources/contract/used_classes_sdk_v14 # module/nuls-cores/src/main/resources/contract/used_classes_sdk_v15 # module/nuls-cores/src/test/java/io/nuls/contract/tx/nrc20/ContractNRC20TokenSendTxTest.java # module/nuls-cores/src/test/java/io/nuls/contract/tx/pocm/ContractPOCMSendTxTest.java # module/nuls-cores/src/test/java/io/nuls/contract/util/LedgerTestUtil.java # module/nuls-cross-chain/base-lib/pom.xml # module/nuls-ledger/src/main/resources/protocol-config.json # module/nuls-network/pom.xml # module/nuls-smart-contract/src/main/resources/protocol-config.json # module/nuls-transaction/pom.xml # version
# Conflicts: # module.ncf
# Conflicts: # module/nuls-cores/src/main/resources/protocol-config.json # version
# Conflicts: # version
niels1286
approved these changes
Dec 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.